From f63307c52e66f3463cf3c2517c80d5c5b0f60140 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期六, 05 十月 2024 18:05:38 +0800
Subject: [PATCH] update 更新支付

---
 pages/order/order.vue |   63 +++++++++++++++++++++++++++----
 1 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/pages/order/order.vue b/pages/order/order.vue
index 1a11356..2551a87 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -92,6 +92,19 @@
 			await this.getList()
 			uni.stopPullDownRefresh()
 		},
+		async onShow() {
+			// 支付回调
+			// #ifdef PUB_CUSTOMER_DEV
+			let options = wx.getEnterOptionsSync();
+			if (options.scene == '1038' && options.referrerInfo.appId == 'wxef277996acc166c3') {
+				// 代表从收银台小程序返回
+				let extraData = options.referrerInfo.extraData;
+				this.$store.dispatch('sign_add', 'order')
+				this.refreshList()
+				return
+			}
+			// #endif
+		},
 		methods: {
 
 
@@ -330,6 +343,40 @@
 									that.$message.showToast('支付失败')
 								}
 							})
+							// #ifdef PUB_CUSTOMER_DEV
+							var param = {
+								cusid: "平台分配的商户号",
+								appid: "平台分配的appid",
+								orgid: "平台分配的机构号",
+								version: "12",
+								trxamt: "1",
+								reqsn: "商户唯一订单号",
+								notify_url: "服务器异步通知页面路径",
+								body: "标题",
+								remark: "备注",
+								validtime: "订单有效时间",
+								limit_pay: "no_credit",
+								randomstr: "随机字符串",
+								paytype: "W06",
+								signtype: "签名方式",
+								sign: "签名,参考2.1",
+								...data
+							}
+							if (compareVersion(version, '2.26.2') >= 0) {
+
+								wx.openEmbeddedMiniProgram({
+									appId: 'wxef277996acc166c3',
+									extraData: param
+								})
+
+							} else {
+								wx.navigateToMiniProgram({
+									appId: 'wxef277996acc166c3',
+									extraData: param
+								})
+
+							}
+							// #endif
 
 						}
 
@@ -486,22 +533,22 @@
 				<view class="flower-info m-b-5 m-t-8 br-4" v-for="(item,j) of dto.items" :key="j">
 					<!-- <view class="line-gray"></view> -->
 
-					<view class="supplier-name " @click.stop="openbrand(item)">
+					<view class="supplier-name w-fit m-l-0 m-r-a" @click.stop="openbrand(item)">
 						<image class="icon-dp br-4" src="/static/common/icon-dp.png"></image>
-						{{ item.supplierName }}
+						{{ item.supplierName|| '' }} >
 					</view>
 					<view class="flex m-t-12 flex-wrap-normal">
-						<image class="flower-img img100 m-r-6" :src="item.flowerCover"
-							@click="previewImg(item.flowerCover)">
+						<!-- @click="previewImg(item.flowerCover)" -->
+						<image class="flower-img img100 m-r-6" :src="item.flowerCover" @click.stop="toDetail(dto)">
 						</image>
 						<!-- <view class="flex1" @click.stop="toFlowerDetail(item)"> -->
-						<view class="flex1" @click.stop="toDetail(dto)">
+						<view class="flex1">
 
 							<view class=" flex">
 								<view class="title flex flex1">
 									<!-- <span class="level">{{ item.flowerCategory }}</span> -->
-									<span class="m-r-10">{{ item.flowerName }}</span>
-									<span class="level">{{ item.flowerLevelStr }}</span>
+									<span class="m-r-10" @click.stop="toDetail(dto)">{{ item.flowerName }}</span>
+									<span class="level" @click.stop="toDetail(dto)">{{ item.flowerLevelStr }}</span>
 									<view class="m-l-a m-r-10 flex">
 										<view class="m-r-10 button-icon" @click="toOrderItemDetail(item,'lack','缺货')"
 											v-if="item.lackNum">
@@ -514,7 +561,7 @@
 									</view>
 								</view>
 							</view>
-							<view class="each-list">
+							<view class="each-list" @click.stop="toDetail(dto)">
 								<view class="each-item">
 									<view class="label">颜色</view>
 									<view class="value">{{ item.flowerColor || '-' }}</view>

--
Gitblit v1.9.3