diff --git a/pages/user-order/user-order.vue b/pages/user-order/user-order.vue index cb8c2e09..50722281 100644 --- a/pages/user-order/user-order.vue +++ b/pages/user-order/user-order.vue @@ -71,7 +71,7 @@ class="item-operation tr br-t padding-top-main"> - + @@ -520,6 +520,44 @@ // 收货 collect_event(e) { + var transactionid = e.currentTarget.dataset.transactionid || null; + if(transactionid == null || !uni.openBusinessView) { + this.collect_hand_handle(e); + } else { + // 存在微信单号收货数据,则拉起微信确认收货组件、失败则调用手动收货模式 + var self = this; + uni.openBusinessView({ + businessType: 'weappOrderConfirm', + extraData: { + transaction_id: transactionid + }, + success() { + self.collect_handle(e); + }, + fail() { + self.collect_hand_handle(e); + } + }); + } + }, + + // 手动收货 + collect_hand_handle(e) { + uni.showModal({ + title: this.$t('common.warm_tips'), + content: this.$t('orderallot-list.orderallot-list.o3ouqv'), + confirmText: this.$t('common.confirm'), + cancelText: this.$t('recommend-list.recommend-list.w9460o'), + success: (result) => { + if (result.confirm) { + this.collect_handle(e); + } + }, + }); + }, + + // 收货处理 + collect_handle(e) { uni.showModal({ title: this.$t('common.warm_tips'), content: this.$t('orderallot-list.orderallot-list.o3ouqv'), @@ -530,7 +568,7 @@ // 参数 var id = e.currentTarget.dataset.value; var index = e.currentTarget.dataset.index; - + // 加载loding uni.showLoading({ title: this.$t('common.processing_in_text'),