From f5744014cd37fa0769941a03d82ef1453ef8edb7 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Mon, 21 Aug 2023 23:18:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E8=AE=A2=E5=8D=95=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=AF=A6=E6=83=85=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       | 20 +++++++++-
 pages/plugins/distribution/map/map.vue        | 21 ++++------
 .../order-detail/order-detail.css             | 23 +++++++++++
 .../order-detail/order-detail.vue             | 38 ++++++++++++++++---
 pages/plugins/distribution/team/team.vue      | 26 ++++++++-----
 pages/user-order-detail/user-order-detail.css |  3 --
 6 files changed, 99 insertions(+), 32 deletions(-)

diff --git a/App.vue b/App.vue
index 942d85d6..ecfe47c8 100644
--- a/App.vue
+++ b/App.vue
@@ -787,7 +787,7 @@
 
             // 拨打电话
             call_tel(data) {
-                var value = (typeof(data) == 'object') ? (data.currentTarget.dataset.value || null) : (value || null);
+                var value = (typeof(data) == 'object') ? (data.currentTarget.dataset.value || null) : (data || null);
                 if (value != null) {
                     uni.makePhoneCall({
                         phoneNumber: value.toString()
@@ -1211,6 +1211,24 @@
                         }
                     }
                 }
+            },
+
+            // 文本事件
+            text_event_handle(e) {
+                var event = e.currentTarget.dataset.event || null;
+                if(event != null) {
+                    var value = e.currentTarget.dataset.value;
+                    switch(event) {
+                        // 拨打电话
+                        case 'tel' :
+                            this.call_tel(value);
+                            break;
+                        // 复制文本
+                        case 'copy' :
+                            this.text_copy_event(value);
+                            break;
+                    }
+                }
             },
 
             // 剪贴板
diff --git a/pages/plugins/distribution/map/map.vue b/pages/plugins/distribution/map/map.vue
index 45a9e950..44560d81 100644
--- a/pages/plugins/distribution/map/map.vue
+++ b/pages/plugins/distribution/map/map.vue
@@ -24,13 +24,13 @@
                                 <view class="base-top oh br-b-dashed padding-bottom-xs">
                                     <view class="single-text cr-base fl view-name">{{item.user_name_view}}</view>
                                     <view class="fr base-top-icon">
-                                        <view v-if="(item.username || null) != null" class="dis-inline-block va-m" :data-value="item.username" @tap.stop="text_copy_event">
+                                        <view v-if="(item.username || null) != null" class="dis-inline-block va-m" data-event="copy" :data-value="item.username" @tap.stop="text_event">
                                             <uni-icons type="person" size="34rpx" color="#999"></uni-icons>
                                         </view>
-                                        <view v-if="(item.mobile || null) != null" class="dis-inline-block va-m" :data-value="item.mobile" @tap.stop="call_tel">
+                                        <view v-if="(item.mobile || null) != null" class="dis-inline-block va-m" data-event="tel" :data-value="item.mobile" @tap.stop="text_event">
                                             <uni-icons type="phone" size="34rpx" color="#999"></uni-icons>
                                         </view>
-                                        <view v-if="(item.email || null) != null" class="dis-inline-block va-m" :data-value="item.email" @tap.stop="text_copy_event">
+                                        <view v-if="(item.email || null) != null" class="dis-inline-block va-m" data-event="copy" :data-value="item.email" @tap.stop="text_event">
                                             <uni-icons type="email" size="34rpx" color="#999"></uni-icons>
                                         </view>
                                     </view>
@@ -38,10 +38,10 @@
                                 <view class="base-bottom cr-grey text-size-xs margin-top-sm oh">
                                     <text class="single-text fl address">{{item.address}}</text>
                                     <view class="fr">
-                                        <view class="dis-inline-block va-m" :data-value="item.address" @tap.stop="text_copy_event">
+                                        <view class="dis-inline-block va-m" data-event="copy" :data-value="item.address" @tap.stop="text_event">
                                             <uni-icons type="chatboxes" size="34rpx" color="#999"></uni-icons>
                                         </view>
-                                        <view class="dis-inline-block va-m margin-left-xxl" :data-value="item.address" :data-lng="item.lng" :data-lat="item.lat" @tap.stop="map_route_event">
+                                        <view class="dis-inline-block va-m margin-left-xxl" data-event="copy" :data-value="item.address" :data-lng="item.lng" :data-lat="item.lat" @tap.stop="map_route_event">
                                             <uni-icons type="paperplane" size="34rpx" color="#999"></uni-icons>
                                         </view>
                                     </view>
@@ -179,14 +179,9 @@
                 });
             },
 
-            // 文本复制
-            text_copy_event(e) {
-                app.globalData.text_copy_event(e);
-            },
-
-            // 拨打电话
-            call_tel(e) {
-                app.globalData.call_tel(e);
+            // 文本事件
+            text_event(e) {
+                app.globalData.text_event_handle(e);
             },
 
             // 地址导航
diff --git a/pages/plugins/distribution/order-detail/order-detail.css b/pages/plugins/distribution/order-detail/order-detail.css
index d1ffe075..5233e973 100644
--- a/pages/plugins/distribution/order-detail/order-detail.css
+++ b/pages/plugins/distribution/order-detail/order-detail.css
@@ -19,4 +19,27 @@
 .goods-image {
     width: 160rpx;
     height: 160rpx;
+}
+
+/*
+* 地址信息
+*/
+.address-base,
+.address-detail {
+    padding: 10rpx 0;
+}
+.address-detail .icon {
+    width: 30rpx;
+    height: 35rpx !important;
+}
+.address-detail .text {
+    width: calc(100% - 40rpx);
+}
+.address-detail .text {
+    line-height: 36rpx;
+}
+.address-alias,
+.address-map-submit {
+    padding: 0 15rpx;
+    line-height: 40rpx;
 }
\ No newline at end of file
diff --git a/pages/plugins/distribution/order-detail/order-detail.vue b/pages/plugins/distribution/order-detail/order-detail.vue
index 657000c7..a6371399 100644
--- a/pages/plugins/distribution/order-detail/order-detail.vue
+++ b/pages/plugins/distribution/order-detail/order-detail.vue
@@ -1,7 +1,23 @@
 <template>
     <view>
         <view v-if="detail != null">
-            <view class="padding-horizontal-main padding-top-main">
+            <view class="padding-horizontal-main padding-top-main">
+                <!-- 地址 -->
+                <view v-if="(detail.address_data || null) != null" class="goods bg-white padding-main border-radius-main spacing-mb">
+                    <view class="address-base oh">
+                        <text v-if="(detail.address_data.alias || null) != null" class="address-alias round br-main cr-main bg-white margin-right-sm">{{detail.address_data.alias}}</text>
+                        <text data-event="copy" :data-value="detail.address_data.name" @tap="text_event">{{detail.address_data.name}}</text>
+                        <text class="fr" data-event="tel" :data-value="detail.address_data.tel" @tap="text_event">{{detail.address_data.tel}}</text>
+                    </view>
+                    <view class="address-detail oh margin-bottom-main">
+                        <image class="icon fl" :src="common_static_url+'map-icon.png'" mode="widthFix"></image>
+                        <view class="text fr">
+                            <text data-event="copy" :data-value="detail.address_data.province_name+detail.address_data.city_name+detail.address_data.county_name+detail.address_data.address" @tap="text_event">{{detail.address_data.province_name}}{{detail.address_data.city_name}}{{detail.address_data.county_name}}{{detail.address_data.address}}</text>
+                        </view>
+                    </view>
+                    <view class="address-divider spacing-mb"></view>
+                </view>
+
                 <!-- 基础信息 -->
                 <view v-if="detail_list.length > 0" class="panel-item padding-main border-radius-main bg-white spacing-mb">
                     <view class="br-b padding-bottom-main fw-b text-size">基础信息</view>
@@ -18,7 +34,7 @@
                         </view>
                     </view>
                 </view>
-                
+
                 <!-- 商品列表 -->
                 <view v-if="detail.items.length > 0" class="goods bg-white padding-main border-radius-main spacing-mb">
                     <view class="br-b padding-bottom-main fw-b text-size">商品信息</view>
@@ -90,6 +106,11 @@
         onShow() {
             // 分享菜单处理
             app.globalData.page_share_handle();
+        },
+        
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
         },
 
         methods: {
@@ -108,7 +129,8 @@
                     },
                     dataType: 'json',
                     success: res => {
-                        uni.hideLoading();
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
                         if (res.data.code == 0) {
                             var data = res.data.data;
                             this.setData({
@@ -140,7 +162,8 @@
                         }
                     },
                     fail: () => {
-                        uni.hideLoading();
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
                         this.setData({
                             data_list_loding_status: 2,
                             data_bottom_line_status: false,
@@ -162,7 +185,12 @@
                 } else {
                     app.globalData.showToast('头像地址有误');
                 }
-            }
+            },
+
+            // 文本事件
+            text_event(e) {
+                app.globalData.text_event_handle(e);
+            },
         }
     };
 </script>
diff --git a/pages/plugins/distribution/team/team.vue b/pages/plugins/distribution/team/team.vue
index b42c2e77..f7a421b8 100644
--- a/pages/plugins/distribution/team/team.vue
+++ b/pages/plugins/distribution/team/team.vue
@@ -66,12 +66,14 @@
                         <block v-for="(fv,fi) in content_list" :key="fi">
                             <view class="single-text margin-top-xs">
                                 <text class="cr-gray margin-right-xl">{{fv.name}}</text>
-                                <text class="cr-base">{{item[fv.field] || fv.default}}</text>
+                                <text class="cr-base" :data-event="fv.event" :data-value="item[fv.field]" @tap="text_event">{{item[fv.field] || fv.default}}</text>
                                 <text v-if="(fv.unit || null) != null" class="cr-gray">{{fv.unit}}</text>
                             </view>
                         </block>
                     </view>
                     <view class="item-operation tr br-t padding-top-main margin-top-main">
+                        <button v-if="(item.email || null) != null" class="round bg-white br cr-base" type="default" size="mini" hover-class="none" @tap="text_event" data-event="copy" :data-value="item.email">邮箱</button>
+                        <button v-if="(item.mobile || null) != null" class="round bg-white br cr-base" type="default" size="mini" hover-class="none" @tap="text_event" data-event="tel" :data-value="item.mobile">电话</button>
                         <button class="round bg-white br cr-base" type="default" size="mini" hover-class="none" @tap="user_order_event" :data-value="item.id">用户订单</button>
                     </view>
                 </view>
@@ -103,15 +105,14 @@
                 data_is_loading: 0,
                 params: null,
                 content_list: [
-                    {name: "消费订单", field: "order_count", unit: "条", default: 0},
-                    {name: "消费金额", field: "order_total", unit: "元", default: 0},
-                    {name: "最后下单时间", field: "order_last_time", default: ''},
-                    {name: "下级订单", field: "find_order_count", unit: "条", default: 0},
-                    {name: "下级消费", field: "find_order_total", unit: "元", default: 0},
-                    {name: "下级最后下单时间", field: "find_order_last_time", default: ''},
-                    {name: "下级用户", field: "referrer_count", unit: "个", default: 0}
-                    
-                ],                
+                    {name: '消费订单', field: 'order_count', unit: '', default: 0},
+                    {name: '消费金额', field: 'order_total', unit: '', default: 0},
+                    {name: '最后下单时间', field: 'order_last_time', default: ''},
+                    {name: '下级订单', field: 'find_order_count', unit: '', default: 0},
+                    {name: '下级消费', field: 'find_order_total', unit: '', default: 0},
+                    {name: '下级最后下单时间', field: 'find_order_last_time', default: ''},
+                    {name: '下级用户', field: 'referrer_count', unit: '', default: 0}
+                ],
                 nav_search_buy_type_list: [
                     {value: -1, name: '全部'},
                     {value: 0, name: '未下单'},
@@ -355,6 +356,11 @@
                     data_page: 1
                 });
                 this.get_data_list(1);
+            },
+
+            // 文本事件
+            text_event(e) {
+                app.globalData.text_event_handle(e);
             }
         }
     };
diff --git a/pages/user-order-detail/user-order-detail.css b/pages/user-order-detail/user-order-detail.css
index 52848c0d..41bd18a0 100644
--- a/pages/user-order-detail/user-order-detail.css
+++ b/pages/user-order-detail/user-order-detail.css
@@ -23,9 +23,6 @@
 .address-map-submit {
     padding: 0 15rpx;
     line-height: 40rpx;
-}
-.address-map-submit {
-    
 }
 
 /*