From f35f76598687150e0ab5346899aa8a240b633900 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Thu, 10 Feb 2022 17:17:10 +0800
Subject: [PATCH] v2.2.4

---
 app/admin/view/default/appconfig/app.html |   9 --
 app/admin/view/default/order/detail.html  | 108 ++++++++++------------
 app/index/view/default/config.json        |   2 +-
 app/service/ConstService.php              |   1 +
 app/service/OrderService.php              |   2 +-
 app/service/SystemBaseService.php         |   1 -
 public/core.php                           |   2 +-
 7 files changed, 54 insertions(+), 71 deletions(-)

diff --git a/app/admin/view/default/appconfig/app.html b/app/admin/view/default/appconfig/app.html
index 55c560a45..ffee14baa 100644
--- a/app/admin/view/default/appconfig/app.html
+++ b/app/admin/view/default/appconfig/app.html
@@ -66,15 +66,6 @@
                 </select>
             </div>
 
-            <div class="am-form-group">
-                <label>{{$data.common_app_is_poster_share.name}}<span class="am-form-group-label-tips">{{$data.common_app_is_poster_share.describe}}</span></label>
-                <select name="{{$data.common_app_is_poster_share.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_app_is_poster_share.error_tips}}" required>
-                    {{foreach $common_is_text_list as $v}}
-                        <option value="{{$v.id}}" {{if isset($data['common_app_is_poster_share']['value']) and $data['common_app_is_poster_share']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
-                    {{/foreach}}
-                </select>
-            </div>
-
             <div class="am-form-group">
                 <label>{{$data.common_app_is_header_nav_fixed.name}}<span class="am-form-group-label-tips">{{$data.common_app_is_header_nav_fixed.describe}}</span></label>
                 <select name="{{$data.common_app_is_header_nav_fixed.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_app_is_header_nav_fixed.error_tips}}" required>
diff --git a/app/admin/view/default/order/detail.html b/app/admin/view/default/order/detail.html
index ccbcc708a..e967d31f0 100644
--- a/app/admin/view/default/order/detail.html
+++ b/app/admin/view/default/order/detail.html
@@ -19,17 +19,58 @@
     </div>
 
     <!-- 销售订单 - 收货地址 -->
-    {{if $data['order_model'] eq 0}}
+    {{if $data['order_model'] eq 0 and !empty($data['address_data'])}}
         <div class="am-panel am-panel-default">
             <div class="am-panel-hd">收货地址</div>
             <div class="am-panel-bd">
-                {{if !empty($data['address_data'])}}
+                <p>
+                    <span>收件人：</span>
+                    <span>{{$data.address_data.name}}</span>
+                </p>
+                <p>
+                    <span>收件电话：</span>
+                    <span>{{$data.address_data.tel}}</span>
+                </p>
+                <p>
+                    <span>详细地址：</span>
+                    <span>{{$data.address_data.province_name}}</span>
+                    <span>{{$data.address_data.city_name}}</span>
+                    <span>{{$data.address_data.county_name}}</span>
+                    <span>{{$data.address_data.address}}</span>
+                </p>
+                {{if !empty($data['address_data']['idcard_name']) or !empty($data['address_data']['idcard_number']) or !empty($data['address_data']['idcard_front']) or !empty($data['address_data']['idcard_back'])}}
+                    <div class="am-alert am-alert-secondary">
+                        <p class="am-margin-bottom-xs"><strong>身份证信息</strong></p>
+                        <hr data-am-widget="divider" style="" class="am-divider am-divider-dashed am-margin-vertical-0" />
+                        <div class="am-margin-top-xs">
+                            <p>姓名：{{$data.address_data.idcard_name}}</p>
+                            <p>号码：{{$data.address_data.idcard_number}}</p>
+                            {{if !empty($data['address_data']['idcard_front']) or !empty($module_data['address_data']['idcard_back'])}}
+                                <p class="am-nbfc"><span class="am-fl">照片：</span>{{if !empty($data['address_data']['idcard_front'])}}<a href="{{$data.address_data.idcard_front}}" target="_blank" class="am-fl"><img width="100" height="68" src="{{$data.address_data.idcard_front}}" alt="身份证人像面" class="am-img-thumbnail am-radius am-block" /></a>{{/if}} {{if !empty($data['address_data']['idcard_back'])}}<a href="{{$data.address_data.idcard_back}}" target="_blank" class="am-fl am-margin-left-xs"><img width="100" height="68" src="{{$data.address_data.idcard_back}}" alt="身份证人像面" class="am-img-thumbnail am-radius am-block" /></a>{{/if}}</p>
+                            {{/if}}
+                        </div>
+                    </div>
+                {{/if}}
+                {{if !empty($data['address_data']['lng']) and !empty($data['address_data']['lat']) and $data['address_data']['lng'] neq 0 and $data['address_data']['lat'] neq 0}}
+                    <div class="am-margin-top-xs">
+                        <button type="button" class="am-btn am-btn-success am-btn-xs am-radius am-icon-map-marker am-padding-xs submit-map-popup" data-lng="{{$data.address_data.lng}}" data-lat="{{$data.address_data.lat}}"> 查看位置</button>
+                    </div>
+                {{/if}}
+            </div>
+        </div>
+    {{/if}}
+
+    <!-- 自提订单 - 取货信息 -->
+    {{if $data['order_model'] eq 2 and !empty($data['address_data'])}}
+        <div class="am-panel am-panel-default">
+            <div class="am-panel-hd">取货信息</div>
+            <div class="am-panel-bd">
+                <!-- 取货地址 -->
+                <div class="am-alert am-alert-warning">
                     <p>
-                        <span>收件人：</span>
+                        <span>联系信息：</span>
                         <span>{{$data.address_data.name}}</span>
-                    </p>
-                    <p>
-                        <span>收件电话：</span>
+                        <span> / </span>
                         <span>{{$data.address_data.tel}}</span>
                     </p>
                     <p>
@@ -39,63 +80,14 @@
                         <span>{{$data.address_data.county_name}}</span>
                         <span>{{$data.address_data.address}}</span>
                     </p>
-                    {{if !empty($data['address_data']['idcard_name']) or !empty($data['address_data']['idcard_number']) or !empty($data['address_data']['idcard_front']) or !empty($data['address_data']['idcard_back'])}}
-                        <div class="am-alert am-alert-secondary">
-                            <p class="am-margin-bottom-xs"><strong>身份证信息</strong></p>
-                            <hr data-am-widget="divider" style="" class="am-divider am-divider-dashed am-margin-vertical-0" />
-                            <div class="am-margin-top-xs">
-                                <p>姓名：{{$data.address_data.idcard_name}}</p>
-                                <p>号码：{{$data.address_data.idcard_number}}</p>
-                                {{if !empty($data['address_data']['idcard_front']) or !empty($module_data['address_data']['idcard_back'])}}
-                                    <p class="am-nbfc"><span class="am-fl">照片：</span>{{if !empty($data['address_data']['idcard_front'])}}<a href="{{$data.address_data.idcard_front}}" target="_blank" class="am-fl"><img width="100" height="68" src="{{$data.address_data.idcard_front}}" alt="身份证人像面" class="am-img-thumbnail am-radius am-block" /></a>{{/if}} {{if !empty($data['address_data']['idcard_back'])}}<a href="{{$data.address_data.idcard_back}}" target="_blank" class="am-fl am-margin-left-xs"><img width="100" height="68" src="{{$data.address_data.idcard_back}}" alt="身份证人像面" class="am-img-thumbnail am-radius am-block" /></a>{{/if}}</p>
-                                {{/if}}
-                            </div>
-                        </div>
-                    {{/if}}
                     {{if !empty($data['address_data']['lng']) and !empty($data['address_data']['lat']) and $data['address_data']['lng'] neq 0 and $data['address_data']['lat'] neq 0}}
                         <div class="am-margin-top-xs">
                             <button type="button" class="am-btn am-btn-success am-btn-xs am-radius am-icon-map-marker am-padding-xs submit-map-popup" data-lng="{{$data.address_data.lng}}" data-lat="{{$data.address_data.lat}}"> 查看位置</button>
                         </div>
                     {{/if}}
-                {{else /}}
-                    {{include file="public/not_data" /}}
-                {{/if}}
-            </div>
-        </div>
-    {{/if}}
-
-    <!-- 自提订单 - 取货信息 -->
-    {{if $data['order_model'] eq 2}}
-        <div class="am-panel am-panel-default">
-            <div class="am-panel-hd">取货信息</div>
-            <div class="am-panel-bd">
-                {{if !empty($data['address_data'])}}
-                    <!-- 取货地址 -->
-                    <div class="am-alert am-alert-warning">
-                        <p>
-                            <span>联系信息：</span>
-                            <span>{{$data.address_data.name}}</span>
-                            <span> / </span>
-                            <span>{{$data.address_data.tel}}</span>
-                        </p>
-                        <p>
-                            <span>详细地址：</span>
-                            <span>{{$data.address_data.province_name}}</span>
-                            <span>{{$data.address_data.city_name}}</span>
-                            <span>{{$data.address_data.county_name}}</span>
-                            <span>{{$data.address_data.address}}</span>
-                        </p>
-                        {{if !empty($data['address_data']['lng']) and !empty($data['address_data']['lat']) and $data['address_data']['lng'] neq 0 and $data['address_data']['lat'] neq 0}}
-                            <div class="am-margin-top-xs">
-                                <button type="button" class="am-btn am-btn-success am-btn-xs am-radius am-icon-map-marker am-padding-xs submit-map-popup" data-lng="{{$data.address_data.lng}}" data-lat="{{$data.address_data.lat}}"> 查看位置</button>
-                            </div>
-                        {{/if}}
-                    </div>
-                    <!-- 取货码 -->
-                    {{:ModuleInclude('order/module/take', $data)}}
-                {{else /}}
-                    {{include file="public/not_data" /}}
-                {{/if}}
+                </div>
+                <!-- 取货码 -->
+                {{:ModuleInclude('order/module/take', $data)}}
             </div>
         </div>
     {{/if}}
diff --git a/app/index/view/default/config.json b/app/index/view/default/config.json
index 5d42fc4c3..b1082ea1b 100755
--- a/app/index/view/default/config.json
+++ b/app/index/view/default/config.json
@@ -1,6 +1,6 @@
 {
 	"name":"默认主题",
-	"ver":"2.2.3",
+	"ver":"2.2.4",
 	"author":"Devil",
 	"home":"https://shopxo.net/"
 }
\ No newline at end of file
diff --git a/app/service/ConstService.php b/app/service/ConstService.php
index fe596c410..b4a31ffc6 100644
--- a/app/service/ConstService.php
+++ b/app/service/ConstService.php
@@ -89,6 +89,7 @@ class ConstService
                 '2.2.1' => ['value' => '2.2.1', 'name' => 'v2.2.1'],
                 '2.2.2' => ['value' => '2.2.2', 'name' => 'v2.2.2'],
                 '2.2.3' => ['value' => '2.2.3', 'name' => 'v2.2.3'],
+                '2.2.4' => ['value' => '2.2.4', 'name' => 'v2.2.4'],
             ],
 
             // 用户注册类型列表
diff --git a/app/service/OrderService.php b/app/service/OrderService.php
index d6cc54b77..3224ac3a8 100755
--- a/app/service/OrderService.php
+++ b/app/service/OrderService.php
@@ -1308,7 +1308,7 @@ class OrderService
                 if(in_array($v['order_model'], [0,2]))
                 {
                     // 销售模式+自提模式 地址信息
-                    $v['address_data'] = (!empty($address_data) && array_key_exists($v['id'], $address_data)) ? $address_data[$v['id']] : [];
+                    $v['address_data'] = (!empty($address_data) && array_key_exists($v['id'], $address_data)) ? $address_data[$v['id']] : null;
                     
                     // 自提模式 添加订单取货码
                     if($v['order_model'] == 2)
diff --git a/app/service/SystemBaseService.php b/app/service/SystemBaseService.php
index 70ee5c003..156062aa5 100644
--- a/app/service/SystemBaseService.php
+++ b/app/service/SystemBaseService.php
@@ -155,7 +155,6 @@ class SystemBaseService
             // 商品相关
             'common_app_is_use_mobile_detail'   => (int) MyC('common_app_is_use_mobile_detail'),
             'common_app_is_good_thing'          => (int) MyC('common_app_is_good_thing'),
-            'common_app_is_poster_share'        => (int) MyC('common_app_is_poster_share'),
             'common_is_show_goods_comments'     => (int) MyC('common_is_show_goods_comments', 1),
             'common_is_goods_detail_show_photo' => (int) MyC('common_is_goods_detail_show_photo', 0, true),
             'common_is_exhibition_mode_btn_text'=> MyC('common_is_exhibition_mode_btn_text', '立即咨询', true),
diff --git a/public/core.php b/public/core.php
index ec3d0cf34..7a15666f6 100755
--- a/public/core.php
+++ b/public/core.php
@@ -10,7 +10,7 @@
 // +----------------------------------------------------------------------
 
 // 系统版本
-define('APPLICATION_VERSION', 'v2.2.3');
+define('APPLICATION_VERSION', 'v2.2.4');
 
 // 检测PHP环境
 if(version_compare(PHP_VERSION,'7.4.0','<'))