diff --git a/member/order/detail.vue b/member/order/detail.vue index bcf0dad..65e476b 100644 --- a/member/order/detail.vue +++ b/member/order/detail.vue @@ -5,7 +5,7 @@ :border="false" :left-width="'400rpx'" :statusBar="true" - :height="'34px'" + :height="'34px'" > @@ -168,7 +168,7 @@ OrderInfo.kind_id == 1201 && OrderInfo.order_state_id == StateCode.ORDER_STATE_SHIPPED " - @click="confirmReceipt" + @click="confirmReceipt(OrderInfo, $event)" >{{ __("确认收货") }} { + console.log("e1", e); + if (e.extraData.status === "success") { + // 用户确认收货成功,再执行自己的代码 + that.$.request({ + url: that.Config.URL.user.order_receive, + data: params, + success: function (data, status, msg, code) { + if (status == 200) { + that.$.alert(that.__("收货成功!"), function () { + that.notice.postNotificationName("RefreshMessage", e); + }); + } + }, + }); + } else if (e.extraData.status === "fail") { + // 用户确认收货失败 + uni.showToast({ + title: "确认收货失败", + icon: "none", + }); + } else if (e.extraData.status === "cancel") { + // 用户取消 + uni.showToast({ + title: "取消确认收货", + icon: "none", + }); + } + }, + fail: (e) => { + console.log("e2", e); + uni.showToast({ + title: "确认收货失败", + icon: "none", }); - } - }, - true - ); + }, + complete: (e) => { + console.log("e3", e); + console.log("无论是否成功都会执行"); + }, + }); + } else { + //引导用户升级微信版本 + uni.showToast({ + title: "请升级微信版本", + icon: "none", + }); + that.$.confirm( + that.__("是否确认收货?"), + function (e) { + if (e.confirm) { + that.$.request({ + url: that.Config.URL.user.order_receive, + data: params, + success: function (data, status, msg, code) { + if (status == 200) { + that.$.alert(that.__("收货成功!"), function () { + that.notice.postNotificationName("RefreshMessage", e); + }); + } + }, + }); + } + }, + true + ); + } + + var that = this; + + // that.$.confirm( + // that.__("是否确认收货?"), + // function (e) { + // if (e.confirm) { + // that.$.request({ + // url: that.Config.URL.user.order_receive, + // data: params, + // success: function (data, status, msg, code) { + // if (status == 200) { + // that.$.alert(that.__("收货成功!"), function () { + // that.notice.postNotificationName("RefreshMessage", e); + // }); + // } + // }, + // }); + // } + // }, + // true + // ); }, gotopay: async function (e) { var that = this; @@ -2176,7 +2255,6 @@ export default { }; - \ No newline at end of file + diff --git a/member/order/list.vue b/member/order/list.vue index dd265f0..e59ff98 100644 --- a/member/order/list.vue +++ b/member/order/list.vue @@ -803,9 +803,10 @@ export default { wx.openBusinessView({ businessType: "weappOrderConfirm", extraData: { - merchant_id: data.lkl_merchant_no,//用户交易商户号 - merchant_trade_no: data.order_id,//商户订单号 - // transaction_id: data.lkl_trade_no, //用户交易单号 + // merchant_id: data.lkl_merchant_no,//用户交易商户号 + // merchant_trade_no: data.order_id,//商户订单号 + transaction_id: data.lkl_trade_no, //用户交易单号 + // transaction_id: "4200002884202509154936380358", //用户交易单号 }, success: (e) => { console.log("e1", e);