From 22b27f3c471189d7540da37aff8db549f0c400e8 Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Fri, 27 Nov 2020 14:12:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9C=B0=E5=9D=80[=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE/=E8=BA=AB=E4=BB=BD=E8=AF=81]=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=BC=80=E5=85=B3=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/default/site/siteset/extends.html    |  25 +++++
 .../view/default/useraddress/save_info.html   | 106 ++++++++++--------
 application/service/BaseService.php           |   2 +
 application/service/UserAddressService.php    |   6 +-
 changelog.txt                                 |   1 +
 .../user-address-save/user-address-save.axml  |   4 +-
 .../user-address-save/user-address-save.js    |  17 +++
 sourcecode/alipay/default/pages/user/user.js  |   2 +-
 .../user-address-save/user-address-save.js    |  17 +++
 .../user-address-save/user-address-save.swan  |   4 +-
 sourcecode/baidu/default/pages/user/user.js   |   2 +-
 .../user-address-save/user-address-save.js    |  17 +++
 .../user-address-save/user-address-save.qml   |   4 +-
 sourcecode/qq/default/pages/user/user.js      |   2 +-
 .../user-address-save/user-address-save.js    |  17 +++
 .../user-address-save/user-address-save.ttml  |   4 +-
 sourcecode/toutiao/default/pages/user/user.js |   2 +-
 .../user-address-save/user-address-save.js    |  20 ++++
 .../user-address-save/user-address-save.wxml  |   8 +-
 sourcecode/weixin/default/pages/user/user.js  |   2 +-
 20 files changed, 192 insertions(+), 70 deletions(-)

diff --git a/application/admin/view/default/site/siteset/extends.html b/application/admin/view/default/site/siteset/extends.html
index 6bfedf485..4fd48d846 100644
--- a/application/admin/view/default/site/siteset/extends.html
+++ b/application/admin/view/default/site/siteset/extends.html
@@ -34,6 +34,31 @@
                 </div>
             </div>
 
+            <!-- 用户地址 -->
+            <div class="am-panel am-panel-default am-margin-top-sm">
+                <div class="am-panel-hd">
+                    <h3 class="am-panel-title">用户地址</h3>
+                </div>
+                <div class="am-panel-bd">
+                    <div class="am-form-group">
+                        <label>{{$data.home_user_address_map_status.name}}<span class="am-form-group-label-tips">{{$data.home_user_address_map_status.describe}}</span></label>
+                        <select name="{{$data.home_user_address_map_status.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_user_address_map_status.error_tips}}" required>
+                            {{foreach $site_site_state_list as $v}}
+                                <option value="{{$v.value}}" {{if isset($data['home_user_address_map_status']['value']) and $data['home_user_address_map_status']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                            {{/foreach}}
+                        </select>
+                    </div>
+                    <div class="am-form-group">
+                        <label>{{$data.home_user_address_idcard_status.name}}<span class="am-form-group-label-tips">{{$data.home_user_address_idcard_status.describe}}</span></label>
+                        <select name="{{$data.home_user_address_idcard_status.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_user_address_idcard_status.error_tips}}" required>
+                            {{foreach $site_site_state_list as $v}}
+                                <option value="{{$v.value}}" {{if isset($data['home_user_address_idcard_status']['value']) and $data['home_user_address_idcard_status']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                            {{/foreach}}
+                        </select>
+                    </div>
+                </div>
+            </div>
+
             <div class="am-form-group am-form-group-refreshing am-margin-top-lg am-padding-left-0">
                 <input type="hidden" name="nav_type" value="{{$nav_type}}" />
                 <input type="hidden" name="view_type" value="{{$view_type}}" />
diff --git a/application/index/view/default/useraddress/save_info.html b/application/index/view/default/useraddress/save_info.html
index 7ebd087c3..58417794d 100755
--- a/application/index/view/default/useraddress/save_info.html
+++ b/application/index/view/default/useraddress/save_info.html
@@ -4,6 +4,10 @@
 <div class="am-g am-padding-sm">
     <!-- form start -->
     <form class="am-form form-validation" method="post" action="{{:MyUrl('index/useraddress/save')}}" request-type="ajax-fun" request-value="ViewModalBack">
+        <div class="am-form-group">
+            <label>别名<span class="am-form-group-label-tips">选填</span></label>
+            <input type="text" name="alias" placeholder="别名" minlength="0" maxlength="16" data-validation-message="别名格式最多 16 个字符" class="am-radius" {{if !empty($data['alias'])}} value="{{$data.alias}}"{{/if}} />
+        </div>
         <div class="am-form-group">
             <label>姓名<span class="am-form-group-label-tips-must">必填</span></label>
             <input type="text" name="name" placeholder="姓名" minlength="2" maxlength="16" data-validation-message="姓名格式 2~16 个字符之间" class="am-radius" {{if !empty($data['name'])}} value="{{$data.name}}"{{/if}} required />
@@ -16,62 +20,64 @@
         {{include file="lib/region_linkage" /}}
         <div class="am-form-group">
             <label>详细地址<span class="am-form-group-label-tips-must">必填</span></label>
-            <div class="am-input-group am-input-group-sm">
-                <input type="hidden" name="lng" id="form-lng" {{if !empty($data['lng'])}} value="{{$data.lng}}"{{/if}} />
-                <input type="hidden" name="lat" id="form-lat" {{if !empty($data['lat'])}} value="{{$data.lat}}"{{/if}} />
-                <input type="text" name="address" id="form-address" placeholder="详细地址" minlength="2" maxlength="80" data-validation-message="详细地址格式 1~80 个字符之间" class="am-radius" {{if !empty($data['address'])}} value="{{$data.address}}"{{/if}} required />
-                <span class="am-input-group-btn">
-                    <button type="button" class="am-btn am-btn-default am-radius" id="map-location-submit"><span class="am-icon-map-marker"></span> 定位</button>
-                </span>
-            </div>
-            <div id="map" data-level="17" class="am-margin-top-xs"></div>
+            {{if MyC('home_user_address_map_status') eq 1}}
+                <div class="am-input-group am-input-group-sm">
+                    <input type="hidden" name="lng" id="form-lng" {{if !empty($data['lng'])}} value="{{$data.lng}}"{{/if}} />
+                    <input type="hidden" name="lat" id="form-lat" {{if !empty($data['lat'])}} value="{{$data.lat}}"{{/if}} />
+                    <input type="text" name="address" id="form-address" placeholder="详细地址" minlength="2" maxlength="80" data-validation-message="详细地址格式 1~80 个字符之间" class="am-radius" {{if !empty($data['address'])}} value="{{$data.address}}"{{/if}} required />
+                    <span class="am-input-group-btn">
+                        <button type="button" class="am-btn am-btn-default am-radius" id="map-location-submit"><span class="am-icon-map-marker"></span> 定位</button>
+                    </span>
+                </div>
+                <div id="map" data-level="17" class="am-margin-top-xs"></div>
+            {{else /}}
+                 <input type="text" name="address" id="form-address" placeholder="详细地址" minlength="2" maxlength="80" data-validation-message="详细地址格式 1~80 个字符之间" class="am-radius" {{if !empty($data['address'])}} value="{{$data.address}}"{{/if}} required />
+            {{/if}}
         </div>
 
-        <div class="am-form-group">
-            <label>别名<span class="am-form-group-label-tips">选填</span></label>
-            <input type="text" name="alias" placeholder="别名" minlength="0" maxlength="16" data-validation-message="别名格式最多 16 个字符" class="am-radius" {{if !empty($data['alias'])}} value="{{$data.alias}}"{{/if}} />
-        </div>
         <div class="am-form-group">
             <label class="block">是否默认</label>
             <input name="is_default" value="1" type="checkbox" data-off-text="否" data-on-text="是" data-size="xs" data-on-color="success" data-off-color="default" data-handle-width="49" data-am-switch {{if isset($data['is_default']) and $data['is_default'] eq 1}}checked="true"{{/if}} />
         </div>
-        <div class="am-alert am-alert-secondary">
-            <div class="am-form-group">
-                <label>身份证姓名<span class="am-form-group-label-tips">选填，请务必与上传的身份证件姓名保持一致</span></label>
-                <input type="text" name="idcard_name" placeholder="身份证姓名" minlength="0" maxlength="16" data-validation-message="身份证姓名格式最多 16 个字符" class="am-radius" {{if !empty($data['idcard_name'])}} value="{{$data.idcard_name}}"{{/if}} />
-            </div>
-            <div class="am-form-group">
-                <label>身份证号码<span class="am-form-group-label-tips">选填，请务必与上传的身份证件号码保持一致</span></label>
-                <input type="text" name="idcard_number" placeholder="身份证号码" minlength="0" maxlength="18" data-validation-message="身份证号码格式最多 18 个字符" class="am-radius" {{if !empty($data['idcard_number'])}} value="{{$data.idcard_number}}"{{/if}} />
-            </div>
-            <div class="am-form-group plug-file-upload-view">
-                <label>身份证照片<span class="am-form-group-label-tips">选填，请使用身份证原件拍摄，图片要清晰</span></label>
-                <div class="am-nbfc user-address-idcard-images">
-                    <div class="am-fl">
-                        <ul class="plug-file-upload-view images-idcard_front" data-form-name="idcard_front" data-max-number="1" data-dialog-type="images">
-                            <li>
-                                {{if !empty($data['idcard_front_old'])}}
-                                    <input type="text" name="idcard_front" value="{{$data.idcard_front_old}}" />
-                                {{/if}}
-                                <img src="{{if empty($data['idcard_front'])}}{{$attachment_host}}/static/common/images/default-idcard-front.jpg{{else /}}{{$data.idcard_front}}{{/if}}" />
-                            </li>
-                        </ul>
-                        <div class="plug-file-upload-submit" data-view-tag="ul.images-idcard_front">+上传人像面图片</div>
-                    </div>
-                    <div class="am-fl am-margin-left-lg">
-                        <ul class="plug-file-upload-view images-idcard_back" data-form-name="idcard_back" data-max-number="1" data-dialog-type="images">
-                            <li>
-                                {{if !empty($data['idcard_back_old'])}}
-                                    <input type="text" name="idcard_back" value="{{$data.idcard_back_old}}" />
-                                {{/if}}
-                                <img src="{{if empty($data['idcard_back'])}}{{$attachment_host}}/static/common/images/default-idcard-back.jpg{{else /}}{{$data.idcard_back}}{{/if}}" />
-                            </li>
-                        </ul>
-                        <div class="plug-file-upload-submit" data-view-tag="ul.images-idcard_back">+上传国微面图片</div>
+        {{if MyC('home_user_address_idcard_status') eq 1}}
+            <div class="am-alert am-alert-secondary">
+                <div class="am-form-group">
+                    <label>身份证姓名<span class="am-form-group-label-tips">选填，请务必与上传的身份证件姓名保持一致</span></label>
+                    <input type="text" name="idcard_name" placeholder="身份证姓名" minlength="0" maxlength="16" data-validation-message="身份证姓名格式最多 16 个字符" class="am-radius" {{if !empty($data['idcard_name'])}} value="{{$data.idcard_name}}"{{/if}} />
+                </div>
+                <div class="am-form-group">
+                    <label>身份证号码<span class="am-form-group-label-tips">选填，请务必与上传的身份证件号码保持一致</span></label>
+                    <input type="text" name="idcard_number" placeholder="身份证号码" minlength="0" maxlength="18" data-validation-message="身份证号码格式最多 18 个字符" class="am-radius" {{if !empty($data['idcard_number'])}} value="{{$data.idcard_number}}"{{/if}} />
+                </div>
+                <div class="am-form-group plug-file-upload-view">
+                    <label>身份证照片<span class="am-form-group-label-tips">选填，请使用身份证原件拍摄，图片要清晰</span></label>
+                    <div class="am-nbfc user-address-idcard-images">
+                        <div class="am-fl">
+                            <ul class="plug-file-upload-view images-idcard_front" data-form-name="idcard_front" data-max-number="1" data-dialog-type="images">
+                                <li>
+                                    {{if !empty($data['idcard_front_old'])}}
+                                        <input type="text" name="idcard_front" value="{{$data.idcard_front_old}}" />
+                                    {{/if}}
+                                    <img src="{{if empty($data['idcard_front'])}}{{$attachment_host}}/static/common/images/default-idcard-front.jpg{{else /}}{{$data.idcard_front}}{{/if}}" />
+                                </li>
+                            </ul>
+                            <div class="plug-file-upload-submit" data-view-tag="ul.images-idcard_front">+上传人像面图片</div>
+                        </div>
+                        <div class="am-fl am-margin-left-lg">
+                            <ul class="plug-file-upload-view images-idcard_back" data-form-name="idcard_back" data-max-number="1" data-dialog-type="images">
+                                <li>
+                                    {{if !empty($data['idcard_back_old'])}}
+                                        <input type="text" name="idcard_back" value="{{$data.idcard_back_old}}" />
+                                    {{/if}}
+                                    <img src="{{if empty($data['idcard_back'])}}{{$attachment_host}}/static/common/images/default-idcard-back.jpg{{else /}}{{$data.idcard_back}}{{/if}}" />
+                                </li>
+                            </ul>
+                            <div class="plug-file-upload-submit" data-view-tag="ul.images-idcard_back">+上传国微面图片</div>
+                        </div>
                     </div>
                 </div>
             </div>
-        </div>
+        {{/if}}
 
         <div class="am-form-group am-form-group-refreshing">
             <input type="hidden" name="id" {{if !empty($data['id'])}} value="{{$data.id}}"{{/if}} />
@@ -89,8 +95,10 @@
 <script type="text/javascript">
 $(function()
 {
-    // 百度地图初始化
-    MapInit({{if !empty($data['lng'])}}{{$data['lng']}}{{else /}}116.400244{{/if}},{{if !empty($data['lat'])}}{{$data['lat']}}{{else /}}39.92556{{/if}});
+    {{if MyC('home_user_address_map_status') eq 1}}
+        // 百度地图初始化
+        MapInit({{if !empty($data['lng'])}}{{$data['lng']}}{{else /}}116.400244{{/if}},{{if !empty($data['lat'])}}{{$data['lat']}}{{else /}}39.92556{{/if}});
+    {{/if}}
 });
 
 // 返回处理
diff --git a/application/service/BaseService.php b/application/service/BaseService.php
index 4f0ec7fcb..496e82808 100644
--- a/application/service/BaseService.php
+++ b/application/service/BaseService.php
@@ -51,6 +51,8 @@ class BaseService
             'common_user_is_mandatory_bind_mobile'=> (int) MyC('common_user_is_mandatory_bind_mobile', 0),
             'common_user_is_onekey_bind_mobile' => (int) MyC('common_user_is_onekey_bind_mobile', 0),
             'home_navigation_main_quick_status' => (int) MyC('home_navigation_main_quick_status', 0),
+            'home_user_address_map_status'      => (int) MyC('home_user_address_map_status', 0),
+            'home_user_address_idcard_status'   => (int) MyC('home_user_address_idcard_status', 0),
 
             // 订单相关
             'home_is_enable_order_bulk_pay'     => (int) MyC('home_is_enable_order_bulk_pay', 0),
diff --git a/application/service/UserAddressService.php b/application/service/UserAddressService.php
index 7341a9d6e..78ecd788d 100644
--- a/application/service/UserAddressService.php
+++ b/application/service/UserAddressService.php
@@ -346,6 +346,8 @@ class UserAddressService
         // 操作数据
         $is_default = isset($params['is_default']) ? intval($params['is_default']) : 0;
         $data = [
+            'alias'             => empty($params['alias']) ? '' : $params['alias'],
+            'address'           => $params['address'],
             'name'              => $params['name'],
             'tel'               => $params['tel'],
             'province'          => intval($params['province']),
@@ -358,10 +360,6 @@ class UserAddressService
             'idcard_back'       => $attachment['data']['idcard_back'],
             'is_default'        => $is_default,
         ];
-        if(!empty($params['alias']))
-        {
-            $data['alias'] = $params['alias'];
-        }
         if(!empty($params['lng']))
         {
             $data['lng'] = floatval($params['lng']);
diff --git a/changelog.txt b/changelog.txt
index f856e3cdd..3166c76d3 100755
--- a/changelog.txt
+++ b/changelog.txt
@@ -5,6 +5,7 @@
 	1. 首页商品支持自定义配置
 	2. 首页左侧二级商品分类支持自定义配置
 	3. 快捷导航新增开关控制
+	4. 用户地址[地图/身份证]新增开关控制
 
 web端
 	1. 后台管理小程序列表新增主题管理
diff --git a/sourcecode/alipay/default/pages/user-address-save/user-address-save.axml b/sourcecode/alipay/default/pages/user-address-save/user-address-save.axml
index 89d99740f..88834ab06 100755
--- a/sourcecode/alipay/default/pages/user-address-save/user-address-save.axml
+++ b/sourcecode/alipay/default/pages/user-address-save/user-address-save.axml
@@ -43,7 +43,7 @@
             <input type="text" name="address" value="{{address_data.address || ''}}" maxlength="80" placeholder-class="cr-ccc" class="cr-666" placeholder="详细地址格式 1~80 个字符之间" />
         </view>
 
-        <view class="form-gorup bg-white">
+        <view a:if="{{home_user_address_map_status == 1}}" class="form-gorup bg-white">
             <view class="form-gorup-title">地理位置<text class="form-group-tips-must">必选</text></view>
             <view onTap="choose_location_event" class="form-gorup-text">
             <view a:if="{{(user_location || null) == null && (address_data.address || null) == null}}" class="cr-888">请选择地理位置</view>
@@ -59,7 +59,7 @@
         </view>
 
         <!-- 身份证信息 -->
-        <view class="idcard-container">
+        <view a:if="{{home_user_address_idcard_status == 1}}" class="idcard-container">
             <view class="form-gorup bg-white">
                 <view class="form-gorup-title">身份证姓名<text class="form-group-tips">选填，请务必与上传的身份证件姓名保持一致</text></view>
                 <input type="text" name="idcard_name" value="{{address_data.idcard_name || ''}}" maxlength="16" placeholder-class="cr-ccc" class="cr-666" placeholder="身份证姓名格式 2~16 个字符之间" />
diff --git a/sourcecode/alipay/default/pages/user-address-save/user-address-save.js b/sourcecode/alipay/default/pages/user-address-save/user-address-save.js
index e8b0d616a..de913e7ca 100644
--- a/sourcecode/alipay/default/pages/user-address-save/user-address-save.js
+++ b/sourcecode/alipay/default/pages/user-address-save/user-address-save.js
@@ -26,6 +26,10 @@ Page({
     user_location: null,
 
     form_submit_disabled_status: false,
+
+    // 基础配置
+    home_user_address_map_status: 0,
+    home_user_address_idcard_status : 0,
   },
 
   onLoad(params) {
@@ -50,6 +54,19 @@ Page({
     this.user_location_init();
   },
 
+  // 初始化配置
+  init_config(status) {
+    if((status || false) == true) {
+      this.setData({
+        home_user_address_map_status: app.get_config('config.home_user_address_map_status'),
+        home_user_address_idcard_status: app.get_config('config.home_user_address_idcard_status')
+      });
+    } else {
+      app.is_config(this, 'init_config');
+    }
+  },
+
+  // 获取数据
   init() {
     var user = app.get_user_info(this, "init");
     if (user != false) {
diff --git a/sourcecode/alipay/default/pages/user/user.js b/sourcecode/alipay/default/pages/user/user.js
index 8ea99fc19..ec7a10139 100644
--- a/sourcecode/alipay/default/pages/user/user.js
+++ b/sourcecode/alipay/default/pages/user/user.js
@@ -138,7 +138,7 @@ Page({
           this.setData({
             user_order_status_list: temp_user_order_status_list,
             avatar: ((data.avatar || null) != null) ? data.avatar : ((this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar),
-            nickname: (data.nickname != null) ? data.nickname : this.data.nickname,
+            nickname: ((data.nickname || null) != null) ? data.nickname : this.data.nickname,
             message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total,
             head_nav_list: temp_head_nav_list,
             navigation: data.navigation || [],
diff --git a/sourcecode/baidu/default/pages/user-address-save/user-address-save.js b/sourcecode/baidu/default/pages/user-address-save/user-address-save.js
index 0e31fd9a8..831ffe3f2 100755
--- a/sourcecode/baidu/default/pages/user-address-save/user-address-save.js
+++ b/sourcecode/baidu/default/pages/user-address-save/user-address-save.js
@@ -26,6 +26,10 @@ Page({
     user_location: null,
 
     form_submit_disabled_status: false,
+
+    // 基础配置
+    home_user_address_map_status: 0,
+    home_user_address_idcard_status : 0,
   },
 
   onLoad(params) {
@@ -50,6 +54,19 @@ Page({
     this.user_location_init();
   },
 
+  // 初始化配置
+  init_config(status) {
+    if((status || false) == true) {
+      this.setData({
+        home_user_address_map_status: app.get_config('config.home_user_address_map_status'),
+        home_user_address_idcard_status: app.get_config('config.home_user_address_idcard_status')
+      });
+    } else {
+      app.is_config(this, 'init_config');
+    }
+  },
+
+  // 获取数据
   init() {
     var user = app.get_user_info(this, "init");
     if (user != false) {
diff --git a/sourcecode/baidu/default/pages/user-address-save/user-address-save.swan b/sourcecode/baidu/default/pages/user-address-save/user-address-save.swan
index f3317f694..2313ce99f 100755
--- a/sourcecode/baidu/default/pages/user-address-save/user-address-save.swan
+++ b/sourcecode/baidu/default/pages/user-address-save/user-address-save.swan
@@ -43,7 +43,7 @@
             <input type="text" name="address" value="{{address_data.address || ''}}" maxlength="80" placeholder-class="cr-ccc" class="cr-666" placeholder="详细地址格式 1~80 个字符之间" />
         </view>
 
-        <view class="form-gorup bg-white">
+        <view s-if="home_user_address_map_status == 1" class="form-gorup bg-white">
             <view class="form-gorup-title">地理位置<text class="form-group-tips-must">必选</text></view>
             <view bindtap="choose_location_event" class="form-gorup-text">
             <view s-if="(user_location || null) == null && (address_data.address || null) == null" class="cr-888">请选择地理位置</view>
@@ -59,7 +59,7 @@
         </view>
 
         <!-- 身份证信息 -->
-        <view class="idcard-container">
+        <view s-if="home_user_address_idcard_status == 1" class="idcard-container">
             <view class="form-gorup bg-white">
                 <view class="form-gorup-title">身份证姓名<text class="form-group-tips">选填，请务必与上传的身份证件姓名保持一致</text></view>
                 <input type="text" name="idcard_name" value="{{address_data.idcard_name || ''}}" maxlength="16" placeholder-class="cr-ccc" class="cr-666" placeholder="身份证姓名格式 2~16 个字符之间" />
diff --git a/sourcecode/baidu/default/pages/user/user.js b/sourcecode/baidu/default/pages/user/user.js
index b1bfa4da7..7bb56e608 100755
--- a/sourcecode/baidu/default/pages/user/user.js
+++ b/sourcecode/baidu/default/pages/user/user.js
@@ -129,7 +129,7 @@ Page({
           this.setData({
             user_order_status_list: temp_user_order_status_list,
             avatar: (data.avatar || null) != null ? data.avatar : (this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar,
-            nickname: data.nickname != null ? data.nickname : this.data.nickname,
+            nickname: ((data.nickname || null) != null) ? data.nickname : this.data.nickname,
             message_total: (data.common_message_total || 0) == 0 ? 0 : data.common_message_total,
             head_nav_list: temp_head_nav_list,
             navigation: data.navigation || [],
diff --git a/sourcecode/qq/default/pages/user-address-save/user-address-save.js b/sourcecode/qq/default/pages/user-address-save/user-address-save.js
index 7d16afec4..c1d7e3e40 100755
--- a/sourcecode/qq/default/pages/user-address-save/user-address-save.js
+++ b/sourcecode/qq/default/pages/user-address-save/user-address-save.js
@@ -26,6 +26,10 @@ Page({
     user_location: null,
 
     form_submit_disabled_status: false,
+
+    // 基础配置
+    home_user_address_map_status: 0,
+    home_user_address_idcard_status : 0,
   },
 
   onLoad(params) {
@@ -50,6 +54,19 @@ Page({
     this.user_location_init();
   },
 
+  // 初始化配置
+  init_config(status) {
+    if((status || false) == true) {
+      this.setData({
+        home_user_address_map_status: app.get_config('config.home_user_address_map_status'),
+        home_user_address_idcard_status: app.get_config('config.home_user_address_idcard_status')
+      });
+    } else {
+      app.is_config(this, 'init_config');
+    }
+  },
+
+  // 获取数据
   init() {
     var user = app.get_user_info(this, "init");
     if (user != false) {
diff --git a/sourcecode/qq/default/pages/user-address-save/user-address-save.qml b/sourcecode/qq/default/pages/user-address-save/user-address-save.qml
index 22c7c0f76..a9937e8a6 100755
--- a/sourcecode/qq/default/pages/user-address-save/user-address-save.qml
+++ b/sourcecode/qq/default/pages/user-address-save/user-address-save.qml
@@ -43,7 +43,7 @@
             <input type="text" name="address" value="{{address_data.address || ''}}" maxlength="80" placeholder-class="cr-ccc" class="cr-666" placeholder="详细地址格式 1~80 个字符之间" />
         </view>
 
-        <view class="form-gorup bg-white">
+        <view qq:if="{{home_user_address_map_status == 1}}" class="form-gorup bg-white">
             <view class="form-gorup-title">地理位置<text class="form-group-tips-must">必选</text></view>
             <view bindtap="choose_location_event" class="form-gorup-text">
             <view qq:if="{{(user_location || null) == null && (address_data.address || null) == null}}" class="cr-888">请选择地理位置</view>
@@ -59,7 +59,7 @@
         </view>
 
         <!-- 身份证信息 -->
-        <view class="idcard-container">
+        <view qq:if="{{home_user_address_idcard_status == 1}}" class="idcard-container">
             <view class="form-gorup bg-white">
                 <view class="form-gorup-title">身份证姓名<text class="form-group-tips">选填，请务必与上传的身份证件姓名保持一致</text></view>
                 <input type="text" name="idcard_name" value="{{address_data.idcard_name || ''}}" maxlength="16" placeholder-class="cr-ccc" class="cr-666" placeholder="身份证姓名格式 2~16 个字符之间" />
diff --git a/sourcecode/qq/default/pages/user/user.js b/sourcecode/qq/default/pages/user/user.js
index 45350721b..7281f7b62 100755
--- a/sourcecode/qq/default/pages/user/user.js
+++ b/sourcecode/qq/default/pages/user/user.js
@@ -124,7 +124,7 @@ Page({
           this.setData({
             user_order_status_list: temp_user_order_status_list,
             avatar: ((data.avatar || null) != null) ? data.avatar : ((this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar),
-            nickname: (data.nickname != null) ? data.nickname : this.data.nickname,
+            nickname: ((data.nickname || null) != null) ? data.nickname : this.data.nickname,
             message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total,
             head_nav_list: temp_head_nav_list,
             navigation: data.navigation || [],
diff --git a/sourcecode/toutiao/default/pages/user-address-save/user-address-save.js b/sourcecode/toutiao/default/pages/user-address-save/user-address-save.js
index 84c9f7145..e89f68055 100755
--- a/sourcecode/toutiao/default/pages/user-address-save/user-address-save.js
+++ b/sourcecode/toutiao/default/pages/user-address-save/user-address-save.js
@@ -26,6 +26,10 @@ Page({
     user_location: null,
 
     form_submit_disabled_status: false,
+
+    // 基础配置
+    home_user_address_map_status: 0,
+    home_user_address_idcard_status : 0,
   },
 
   onLoad(params) {
@@ -50,6 +54,19 @@ Page({
     this.user_location_init();
   },
 
+  // 初始化配置
+  init_config(status) {
+    if((status || false) == true) {
+      this.setData({
+        home_user_address_map_status: app.get_config('config.home_user_address_map_status'),
+        home_user_address_idcard_status: app.get_config('config.home_user_address_idcard_status')
+      });
+    } else {
+      app.is_config(this, 'init_config');
+    }
+  },
+
+  // 获取数据
   init() {
     var user = app.get_user_info(this, "init");
     if (user != false) {
diff --git a/sourcecode/toutiao/default/pages/user-address-save/user-address-save.ttml b/sourcecode/toutiao/default/pages/user-address-save/user-address-save.ttml
index 2ce132a1c..5fe5b4d94 100755
--- a/sourcecode/toutiao/default/pages/user-address-save/user-address-save.ttml
+++ b/sourcecode/toutiao/default/pages/user-address-save/user-address-save.ttml
@@ -43,7 +43,7 @@
             <input type="text" name="address" value="{{address_data.address || ''}}" maxlength="80" placeholder-class="cr-ccc" class="cr-666" placeholder="详细地址格式 1~80 个字符之间" />
         </view>
 
-        <!-- <view class="form-gorup bg-white">
+        <!-- <view tt:if="{{home_user_address_map_status == 1}}" class="form-gorup bg-white">
             <view class="form-gorup-title">地理位置<text class="form-group-tips-must">必选</text></view>
             <view bindtap="choose_location_event" class="form-gorup-text">
             <view tt:if="{{(user_location || null) == null && (address_data.address || null) == null}}" class="cr-888">请选择地理位置</view>
@@ -59,7 +59,7 @@
         </view>
 
         <!-- 身份证信息 -->
-        <view class="idcard-container">
+        <view tt:if="{{home_user_address_idcard_status == 1}}" class="idcard-container">
             <view class="form-gorup bg-white">
                 <view class="form-gorup-title">身份证姓名<text class="form-group-tips">选填，请务必与上传的身份证件姓名保持一致</text></view>
                 <input type="text" name="idcard_name" value="{{address_data.idcard_name || ''}}" maxlength="16" placeholder-class="cr-ccc" class="cr-666" placeholder="身份证姓名格式 2~16 个字符之间" />
diff --git a/sourcecode/toutiao/default/pages/user/user.js b/sourcecode/toutiao/default/pages/user/user.js
index c9985bcae..d612ee2bc 100755
--- a/sourcecode/toutiao/default/pages/user/user.js
+++ b/sourcecode/toutiao/default/pages/user/user.js
@@ -124,7 +124,7 @@ Page({
           this.setData({
             user_order_status_list: temp_user_order_status_list,
             avatar: ((data.avatar || null) != null) ? data.avatar : ((this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar),
-            nickname: (data.nickname != null) ? data.nickname : this.data.nickname,
+            nickname: ((data.nickname || null) != null) ? data.nickname : this.data.nickname,
             message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total,
             head_nav_list: temp_head_nav_list,
             navigation: data.navigation || [],
diff --git a/sourcecode/weixin/default/pages/user-address-save/user-address-save.js b/sourcecode/weixin/default/pages/user-address-save/user-address-save.js
index b0b76df71..65bf6c1c7 100755
--- a/sourcecode/weixin/default/pages/user-address-save/user-address-save.js
+++ b/sourcecode/weixin/default/pages/user-address-save/user-address-save.js
@@ -26,6 +26,10 @@ Page({
     user_location: null,
 
     form_submit_disabled_status: false,
+
+    // 基础配置
+    home_user_address_map_status: 0,
+    home_user_address_idcard_status : 0,
   },
 
   onLoad(params) {
@@ -41,6 +45,9 @@ Page({
     }
     wx.setNavigationBarTitle({title: title});
 
+    // 初始化配置
+    this.init_config();
+
     // 清除位置缓存信息
     wx.removeStorage({key: this.data.user_location_cache_key});
     this.init();
@@ -50,6 +57,19 @@ Page({
     this.user_location_init();
   },
 
+  // 初始化配置
+  init_config(status) {
+    if((status || false) == true) {
+      this.setData({
+        home_user_address_map_status: app.get_config('config.home_user_address_map_status'),
+        home_user_address_idcard_status: app.get_config('config.home_user_address_idcard_status')
+      });
+    } else {
+      app.is_config(this, 'init_config');
+    }
+  },
+
+  // 获取数据
   init() {
     var user = app.get_user_info(this, "init");
     if (user != false) {
diff --git a/sourcecode/weixin/default/pages/user-address-save/user-address-save.wxml b/sourcecode/weixin/default/pages/user-address-save/user-address-save.wxml
index e69ec2e66..f521eeb78 100755
--- a/sourcecode/weixin/default/pages/user-address-save/user-address-save.wxml
+++ b/sourcecode/weixin/default/pages/user-address-save/user-address-save.wxml
@@ -43,11 +43,11 @@
             <input type="text" name="address" value="{{address_data.address || ''}}" maxlength="80" placeholder-class="cr-ccc" class="cr-666" placeholder="详细地址格式 1~80 个字符之间" />
         </view>
 
-        <view class="form-gorup bg-white">
+        <view wx:if="{{home_user_address_map_status == 1}}" class="form-gorup bg-white">
             <view class="form-gorup-title">地理位置<text class="form-group-tips-must">必选</text></view>
             <view bindtap="choose_location_event" class="form-gorup-text">
-            <view wx:if="{{(user_location || null) == null && (address_data.address || null) == null}}" class="cr-888">请选择地理位置</view>
-            <view wx:else class="cr-666">{{((user_location || null) != null && (user_location.name || null) != null) ? user_location.name+' ' : ''}}{{user_location.address || address_data.address || ''}}</view>
+                <view wx:if="{{(user_location || null) == null && (address_data.address || null) == null}}" class="cr-888">请选择地理位置</view>
+                <view wx:else class="cr-666">{{((user_location || null) != null && (user_location.name || null) != null) ? user_location.name+' ' : ''}}{{user_location.address || address_data.address || ''}}</view>
             </view>
         </view>
 
@@ -59,7 +59,7 @@
         </view>
 
         <!-- 身份证信息 -->
-        <view class="idcard-container">
+        <view wx:if="{{home_user_address_idcard_status == 1}}" class="idcard-container">
             <view class="form-gorup bg-white">
                 <view class="form-gorup-title">身份证姓名<text class="form-group-tips">选填，请务必与上传的身份证件姓名保持一致</text></view>
                 <input type="text" name="idcard_name" value="{{address_data.idcard_name || ''}}" maxlength="16" placeholder-class="cr-ccc" class="cr-666" placeholder="身份证姓名格式 2~16 个字符之间" />
diff --git a/sourcecode/weixin/default/pages/user/user.js b/sourcecode/weixin/default/pages/user/user.js
index 87cc55c7f..81f29df4e 100755
--- a/sourcecode/weixin/default/pages/user/user.js
+++ b/sourcecode/weixin/default/pages/user/user.js
@@ -124,7 +124,7 @@ Page({
           this.setData({
             user_order_status_list: temp_user_order_status_list,
             avatar: ((data.avatar || null) != null) ? data.avatar : ((this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar),
-            nickname: (data.nickname != null) ? data.nickname : this.data.nickname,
+            nickname: ((data.nickname || null) != null) ? data.nickname : this.data.nickname,
             message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total,
             head_nav_list: temp_head_nav_list,
             navigation: data.navigation || [],