From bd128fca7a171e415fb0638424ab822d9261eced Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Wed, 6 Apr 2022 13:22:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9C=B0=E5=9D=80=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=B7=9D=E7=A6=BB=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=92=8C=E8=AE=A2=E5=8D=95=E5=8F=91=E8=B4=A7=E5=94=AE=E5=90=8E?=
 =?UTF-8?q?=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/view/default/order/module/operate.html | 4 ++--
 app/service/BuyService.php                       | 2 +-
 app/service/UserAddressService.php               | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/admin/view/default/order/module/operate.html b/app/admin/view/default/order/module/operate.html
index 9420ed612..2121940c2 100644
--- a/app/admin/view/default/order/module/operate.html
+++ b/app/admin/view/default/order/module/operate.html
@@ -18,12 +18,12 @@
     {{/if}}
     {{if $module_data['operate_data']['is_delivery'] eq 1}}
         {{if $module_data['order_model'] eq 2}}
-            <button type="button" class="am-btn am-btn-secondary am-btn-xs am-radius am-btn-block submit-take" data-id="{{$module_data.id}}" data-user-id="{{$module_data.user_id}}" data-am-modal="{target: '#order-take-modal', closeViaDimmer: 0, width: 200, height: 160}">
+            <button type="button" class="am-btn am-btn-secondary am-btn-xs am-radius am-btn-block submit-take" data-id="{{$module_data.id}}" data-user-id="{{$module_data.user_id}}" data-am-modal="{target: '#order-take-modal', closeViaDimmer: 0, width: 200, height: 160}" {{if !empty($module_data) and !empty($module_data['aftersale_first'])}}data-am-modal="{target: '#order-delivery-popup'}" data-am-popover="{content: '订单有售后、请注意核对', trigger: 'hover focus', theme: 'danger sm'}"{{/if}}>
                 <i class="am-icon-check"></i>
                 <span>取货</span>
             </button>
         {{else /}}
-           <button type="button" class="am-btn am-btn-secondary am-btn-xs am-radius am-btn-block submit-delivery" data-url="{{:MyUrl('admin/order/delivery')}}" data-id="{{$module_data.id}}" data-user-id="{{$module_data.user_id}}" data-express-id="{{$module_data.express_id}}" data-am-modal="{target: '#order-delivery-popup'}">
+           <button type="button" class="am-btn am-btn-secondary am-btn-xs am-radius am-btn-block submit-delivery" data-url="{{:MyUrl('admin/order/delivery')}}" data-id="{{$module_data.id}}" data-user-id="{{$module_data.user_id}}" data-express-id="{{$module_data.express_id}}" {{if !empty($module_data) and !empty($module_data['aftersale_first'])}}data-am-modal="{target: '#order-delivery-popup'}" data-am-popover="{content: '订单有售后、请注意核对', trigger: 'hover focus', theme: 'danger sm'}"{{/if}}>
                 <i class="am-icon-send-o"></i>
                 <span>发货</span>
             </button>
diff --git a/app/service/BuyService.php b/app/service/BuyService.php
index f89c13210..fbe2bbdec 100755
--- a/app/service/BuyService.php
+++ b/app/service/BuyService.php
@@ -554,7 +554,7 @@ class BuyService
                 'is_delete_time'    => 0,
                 'is_shelves'        => 1,
             ],
-            'field' => 'id AS goods_id, title, images, inventory_unit, buy_min_number, buy_max_number, model',
+            'field' => 'id,id AS goods_id, title, images, inventory_unit, buy_min_number, buy_max_number, model',
         ]);
         $ret = GoodsService::GoodsList($goods_params);
         if(empty($ret['data'][0]))
diff --git a/app/service/UserAddressService.php b/app/service/UserAddressService.php
index 08705e107..2bf549e60 100644
--- a/app/service/UserAddressService.php
+++ b/app/service/UserAddressService.php
@@ -193,6 +193,10 @@ class UserAddressService
                 {
                     $is_default = true;
                 }
+
+                // 地理位置距离字段
+                $v['distance_value'] = null;
+                $v['distance_unit'] = null;
             }
 
             // 是否处理默认地址,没有默认地址将第一个设置为默认地址