From 15ae4a0daffaa7fdec2566a2fc96409b90822a09 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 12 十一月 2024 13:13:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-2.0' into master-2.0
---
pages/order/order-detail.vue | 55 ++++---------------------------------------------------
1 files changed, 4 insertions(+), 51 deletions(-)
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 3b6c0b3..465a721 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -18,19 +18,6 @@
salesTypeList: [],
};
},
-
- async onShow() {
- // 支付回调
- // #ifdef PUB_CUSTOMER_DEV
- 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)
},
@@ -131,7 +118,6 @@
url: '/pages/order/comment/order-comment?orderId='+this.id
})
},
-
openbrand(item) {
//也要判断一下是否重复进入
//判断堆栈，如果是店铺，就直接返回
@@ -332,6 +318,8 @@
this.$message.hideLoading()
if (code === 0) {
this.getDetail()
+ this.$store.dispatch('getCurrentInfo')
+ this.$message.showToast('收货成功')
}
}
@@ -366,41 +354,6 @@
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
-
}
@@ -905,8 +858,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