From 6f40b8242b22b5d9c48462f5f2e78f12fad64fd2 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sun, 3 Nov 2024 15:06:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BE=AE=E4=BF=A1=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E6=94=B6=E8=B4=A7=E7=BB=84=E4=BB=B6=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user-order/user-order.vue | 42 +++++++++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

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">
                             <button v-if="item.operate_data.is_cancel == 1" class="round bg-white cr-yellow br-yellow margin-bottom-main" type="default" size="mini" @tap="cancel_event" :data-value="item.id" :data-index="index" hover-class="none">{{$t('common.cancel')}}</button>
                             <button v-if="item.operate_data.is_pay == 1" class="round bg-white cr-green br-green margin-bottom-main" type="default" size="mini" @tap="pay_event" :data-value="item.id" :data-index="index" :data-price="item.total_price" :data-payment="item.payment_id" :data-currency-symbol="item.currency_data.currency_symbol" hover-class="none">{{$t('order.order.1i873j')}}</button>
-                            <button v-if="item.operate_data.is_collect == 1" class="round bg-white cr-green br-green margin-bottom-main" type="default" size="mini" @tap="collect_event" :data-value="item.id" :data-index="index" hover-class="none">{{$t('orderallot-list.orderallot-list.w2w2w4')}}</button>
+                            <button v-if="item.operate_data.is_collect == 1" class="round bg-white cr-green br-green margin-bottom-main" type="default" size="mini" @tap="collect_event" :data-transactionid="item.weixin_collect_data || ''" :data-value="item.id" :data-index="index" hover-class="none">{{$t('orderallot-list.orderallot-list.w2w2w4')}}</button>
                             <button v-if="(item.plugins_express_data || 0) == 1 && (item.express_data || null) != null" class="round bg-white cr-main br-main margin-bottom-main" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/express/detail/detail?oid=' + item.id" hover-class="none">{{$t('orderallot-list.orderallot-list.w2t242')}}</button>
                             <button v-if="(item.plugins_delivery_data || 0) > 0" class="round bg-white cr-main br-main margin-bottom-main" type="default" size="mini" @tap="url_event" :data-value="'/pages/plugins/delivery/logistics/logistics?id=' + item.plugins_delivery_data" hover-class="none">{{$t('orderallot-list.orderallot-list.w2t242')}}</button>
                             <button v-if="item.operate_data.is_comments == 1" class="round bg-white cr-green br-green margin-bottom-main" type="default" size="mini" @tap="comments_event" :data-value="item.id" :data-index="index" hover-class="none">{{$t('user-order.user-order.twc3r7')}}</button>
@@ -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'),