From 6d2ed02113ca14df030522264d68ac4fec369b3f Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 04 十一月 2024 09:52:15 +0800
Subject: [PATCH] 1.微信支付

---
 pages/order/order-detail.vue |   56 +++-----------------------------------------------------
 1 files changed, 3 insertions(+), 53 deletions(-)

diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 43f9a37..3da6543 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -18,19 +18,6 @@
 				salesTypeList: [],
 			};
 		},
-		
-		async onShow() {
-			// 支付回调
-			// #ifdef PUB_CUSTOMER
-			let options = wx.getEnterOptionsSync();
-			if (options.scene == '1038' && options.referrerInfo.appId == 'wxef277996acc166c3') {
-				// 代表从收银台小程序返回
-				let extraData = options.referrerInfo.extraData;
-				this.getDetail()
-				return
-			}
-			// #endif
-		},
 		onUnload() {
 			this.timer && clearTimeout(this.timer)
 		},
@@ -124,13 +111,6 @@
 
 		},
 		methods: {
-			// 商品评论
-			commentButtonClick(){
-				// 跳转的到评论列表
-				uni.navigateTo({
-					url: '/pages/order/comment/order-comment?orderId='+this.id
-				})
-			},
 
 			openbrand(item) {
 				//也要判断一下是否重复进入
@@ -264,7 +244,7 @@
 						await this.$message.confirm('是否确定收货')
 
 						var tryCallWx = false
-						// #ifdef MPOLD
+						// #ifdef MP
 						let tmp = this
 						if (wx.openBusinessView && tmp.dto && tmp.dto.paymentTrId) {
 							tryCallWx = true
@@ -332,8 +312,6 @@
 							this.$message.hideLoading()
 							if (code === 0) {
 								this.getDetail()
-								this.$store.dispatch('getCurrentInfo')
-								this.$message.showToast('收货成功')
 							}
 						}
 
@@ -356,8 +334,6 @@
 						if (code === 0) {
 							//微信接口
 							let that = this
-							// #ifndef PUB_CUSTOMER
-							
 							wx.requestPayment({
 								...data,
 								async success(res) {
@@ -370,32 +346,6 @@
 									that.$message.showToast('支付失败')
 								}
 							})
-							// #endif
-							// #ifdef PUB_CUSTOMER
-							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
-							}
-							wx.openEmbeddedMiniProgram({
-								appId: 'wxef277996acc166c3',
-								extraData: param
-							})
-							// #endif
-							
 
 						}
 
@@ -900,8 +850,8 @@
 			<view class="button button-1" @click="buttonClick('payAgain')" v-if=" dto.status === 'PENDING'"> 重新支付<span
 					v-if="dto.bctime">({{dto.bctime}})</span>
 			</view>
-			<!-- <view class="button button-1" @click="commentButtonClick('evaluate')" v-if=" dto.status === 'EVALUATE'"> 评价 </view> -->
-			<!-- <view class="button button-1" @click="buttonClick('evaluate')" v-if=" dto.status === 'EVALUATE'"> 评价 </view> -->
+			<view class="button button-1" @click="buttonClick('evaluate')" v-if=" dto.status === 'EVALUATE'"> 评价
+			</view>
 			<!-- ||dto.status=='COMPLETED' -->
 			<!-- 在外面申请了,里面不允许了 -->
 			<!-- 	<view class="button button-1" @click="buttonClick('sales')" v-if=" dto.status === 'RECEIVE'"> 申请售后

--
Gitblit v1.9.3