From cab1e5586552146b326aeaa34668ee2837a24891 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 09 十月 2024 15:43:21 +0800
Subject: [PATCH] update 公告转发、地址定位选择、支付测试
---
pages/order/order-detail.vue | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 3da6543..24a86bb 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -18,6 +18,19 @@
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)
},
@@ -111,6 +124,13 @@
},
methods: {
+ // 商品评论
+ commentButtonClick(){
+ // 跳转的到评论列表
+ uni.navigateTo({
+ url: '/pages/order/comment/order-comment?orderId='+this.id
+ })
+ },
openbrand(item) {
//也要判断一下是否重复进入
@@ -334,6 +354,8 @@
if (code === 0) {
//微信接口
let that = this
+ // #ifndef PUB_CUSTOMER_DEV
+
wx.requestPayment({
...data,
async success(res) {
@@ -346,6 +368,32 @@
that.$message.showToast('支付失败')
}
})
+ // #endif
+ // #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
+ }
+ wx.openEmbeddedMiniProgram({
+ appId: 'wxef277996acc166c3',
+ extraData: param
+ })
+ // #endif
+
}
@@ -850,8 +898,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="buttonClick('evaluate')" v-if=" dto.status === 'EVALUATE'"> 评价
- </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> -->
<!-- ||dto.status=='COMPLETED' -->
<!-- 在外面申请了，里面不允许了 -->
<!-- <view class="button button-1" @click="buttonClick('sales')" v-if=" dto.status === 'RECEIVE'"> 申请售后
--
Gitblit v1.9.3