diff --git a/common/css/common.css b/common/css/common.css
index 43c9ade1..78089aaf 100644
--- a/common/css/common.css
+++ b/common/css/common.css
@@ -247,7 +247,8 @@ button[disabled]..button-main {
     left: 0;
     bottom: 0;
     border: none;
-    width: 100%;
+    width: 100%;
+    box-sizing: border-box;
 }
 
 /**
diff --git a/common/css/page.css b/common/css/page.css
index 1e23cbad..d9d27b42 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -49,10 +49,10 @@
     margin-bottom: 20rpx;
     border-radius: 20rpx;
 }
-.form-container .form-gorup:last-child {
+.form-container .form-gorup-submit {
     padding: 20rpx 0;
 }
-.form-container .form-gorup:not(:last-child) {
+.form-container .form-gorup:not(.form-gorup-submit) {
     background: #fff;
 }
 .form-container .form-gorup-title {
diff --git a/pages/buy/buy.css b/pages/buy/buy.css
index 29fc15fc..ae07647e 100644
--- a/pages/buy/buy.css
+++ b/pages/buy/buy.css
@@ -75,23 +75,19 @@
     bottom: 0;
 }
 .buy-nav,
-.nav-base,
-.nav-submit button {
-    height: 100rpx;
-}
-.nav-base,
-.nav-submit button {
+.nav-base {
+    height: 100rpx;
     line-height: 100rpx;
 }
+.nav-submit button {
+    height: 72rpx;
+    line-height: 72rpx;
+}
 .nav-base {
     width: calc(60% - 20rpx);
-    padding: 0 10rpx;
 }
 .nav-submit {
-    width: 40%;
-}
-.nav-submit button {
-    border-radius: 0;
+    width: calc(40% - 40rpx);
 }
 
 /**
diff --git a/pages/buy/buy.vue b/pages/buy/buy.vue
index 4db7abfb..4ee5aab9 100644
--- a/pages/buy/buy.vue
+++ b/pages/buy/buy.vue
@@ -120,13 +120,13 @@
                 </view>
                 
                 <!-- 导航 -->
-                <view class="buy-nav oh wh-auto">
-                    <view class="nav-base bg-white fl br-t single-text">
+                <view class="buy-nav oh wh-auto bg-white br-t">
+                    <view class="nav-base fl single-text padding-left-main">
                         <text>合计：</text>
                         <text class="sales-price">{{currency_symbol}}{{total_price}}</text>
                     </view>
-                    <view class="fr nav-submit">
-                        <button class="bg-main cr-white wh-auto" type="default" @tap="buy_submit_event" :disabled="buy_submit_disabled_status" hover-class="none">提交订单</button>
+                    <view class="fr nav-submit padding-top padding-bottom padding-horizontal-main">
+                        <button class="bg-main cr-white round text-size-lg" type="default" @tap="buy_submit_event" :disabled="buy_submit_disabled_status" hover-class="none">提交订单</button>
                     </view>
                 </view>
             </view>
diff --git a/pages/cart/cart.css b/pages/cart/cart.css
index daea7335..9a55bec9 100644
--- a/pages/cart/cart.css
+++ b/pages/cart/cart.css
@@ -100,20 +100,19 @@
     z-index: 2;
 }
 .buy-nav,
-.nav-base,
-.nav-submit button {
-    height: 100rpx;
-}
-.nav-base,
-.nav-submit button {
+.nav-base {
+    height: 100rpx;
     line-height: 100rpx;
 }
+.nav-submit button {
+    height: 72rpx;
+    line-height: 72rpx;
+}
 .nav-base {
     width: calc(75% - 20rpx);
-    padding: 0 10rpx;
 }
 .nav-submit {
-    width: 25%;
+    width: calc(25% - 40rpx);
 }
 .nav-submit button {
     border-radius: 0;
diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue
index 12206f6c..20d66cd0 100644
--- a/pages/cart/cart.vue
+++ b/pages/cart/cart.vue
@@ -56,20 +56,18 @@
             <!-- 操作导航 -->
             <view v-if="data_list.length > 0" class="buy-nav oh wh-auto">
                 <!-- 展示型 -->
-                <block v-if="common_site_type == 1">
-                    <view class="exhibition-mode padding-horizontal-main">
-                        <button class="bg-main cr-white round wh-auto text-size" type="default" @tap="exhibition_submit_event" hover-class="none">
-                            <view class="dis-inline-block va-m margin-right-xl">
-                                <uni-icons type="phone" size="14" color="#fff" />
-                            </view>
-                            <text class="va-m">{{common_is_exhibition_mode_btn_text}}</text>
-                        </button>
-                    </view>
-                </block>
+                <view v-if="common_site_type == 1" class="exhibition-mode padding-horizontal-main">
+                    <button class="bg-main cr-white round wh-auto text-size" type="default" @tap="exhibition_submit_event" hover-class="none">
+                        <view class="dis-inline-block va-m margin-right-xl">
+                            <uni-icons type="phone" size="14" color="#fff" />
+                        </view>
+                        <text class="va-m">{{common_is_exhibition_mode_btn_text}}</text>
+                    </button>
+                </view>
 
                 <!-- 销售,自提,虚拟销售 -->
-                <block v-else>
-                    <view class="nav-base bg-white fl br-t single-text">
+                <view v-else class="br-t bg-white wh-auto ht-auto">
+                    <view class="nav-base fl single-text padding-left">
                         <view @tap="selected_event" data-type="all" class="fl selected">
                             <image class="icon va-m" :src="common_static_url+'select' + (is_selected_all ? '-active' : '') + '-icon.png'" mode="widthFix"></image>
                             <text v-if="!already_selected_status" class="va-m cr-base">全选</text>
@@ -80,10 +78,10 @@
                             <view class="fr">合计：</view>
                         </view>
                     </view>
-                    <view class="fr nav-submit">
-                        <button class="bg-main wh-auto cr-white" type="default" @tap="buy_submit_event" :disabled="!already_selected_status" hover-class="none">结算</button>
+                    <view class="fr nav-submit padding-top padding-bottom padding-horizontal-main">
+                        <button class="bg-main cr-white round text-size-lg" type="default" @tap="buy_submit_event" :disabled="!already_selected_status" hover-class="none">结算</button>
                     </view>
-                </block>
+                </view>
             </view>
         </view>
 
diff --git a/pages/extraction-address/extraction-address.css b/pages/extraction-address/extraction-address.css
index 0138b278..5450138a 100644
--- a/pages/extraction-address/extraction-address.css
+++ b/pages/extraction-address/extraction-address.css
@@ -14,7 +14,6 @@
     width: calc(100% - 40rpx);
 }
 .operation button {
-    font-size: 22rpx;
-    padding: 5rpx 20rpx;
-    line-height: 40rpx;
+    padding: 0 35rpx;
+    display: inline-flex;
 }
\ No newline at end of file
diff --git a/pages/extraction-address/extraction-address.vue b/pages/extraction-address/extraction-address.vue
index fdd85269..a417649a 100644
--- a/pages/extraction-address/extraction-address.vue
+++ b/pages/extraction-address/extraction-address.vue
@@ -14,7 +14,7 @@
                                 <text class="fr">{{item.tel}}</text>
                             </view>
                             <view class="address oh padding-top-sm">
-                                <image class="item-icon fl" :src="common_static_url+'map-icon.png'" mode="widthFix"></image>
+                                <image class="item-icon fl margin-top-xs" :src="common_static_url+'map-icon.png'" mode="widthFix"></image>
                                 <view class="text fr">
                                     {{item.province_name || ''}}{{item.city_name || ''}}{{item.county_name || ''}}{{item.address || ''}}
                                 </view>
@@ -22,7 +22,7 @@
                         </view>
                     </view>
                     <view v-if="((item.distance_value || null) != null && (item.distance_unit || null) != null) || ((item.lng || 0) != 0 && (item.lat || 0) != 0)" class="operation br-t oh padding-top-main margin-top-main">
-                        <view v-if="(item.distance_value || null) != null && (item.distance_unit || null) != null" class="fl margin-top-sm">
+                        <view v-if="(item.distance_value || null) != null && (item.distance_unit || null) != null" class="fl margin-top-lg">
                             <text class="cr-gray">距离</text>
                             <text class="cr-base">{{item.distance_value}}</text>
                             <text class="cr-gray">{{item.distance_unit}}</text>
diff --git a/pages/user-address-save/user-address-save.css b/pages/user-address-save/user-address-save.css
new file mode 100644
index 00000000..331f8963
--- /dev/null
+++ b/pages/user-address-save/user-address-save.css
@@ -0,0 +1,38 @@
+/*
+* 表单
+*/
+.page {
+    padding-bottom: 110rpx;
+}
+.submit-fixed {
+    z-index: 2;
+}
+
+/*
+* 三级联动
+*/
+.select-address {
+    box-sizing: border-box;
+    height: 70rpx;
+    line-height: 70rpx;
+    padding: 0 10rpx;
+}
+.select-address .section {
+    width: 33.33%;
+    box-sizing: border-box;
+}
+.select-address .section:not(:first-child) {
+    padding: 0 5rpx;
+}
+
+/*
+* 身份信息
+*/
+.idcard-container {
+    background: #e6e6e6;
+}
+.idcard-container .form-upload-data .item image {
+    width: 256rpx;
+    height: 170rpx;
+    border: 1px dashed #c2c2c2;
+}
\ No newline at end of file
diff --git a/pages/user-address-save/user-address-save.vue b/pages/user-address-save/user-address-save.vue
index 1203aa41..b33b7959 100644
--- a/pages/user-address-save/user-address-save.vue
+++ b/pages/user-address-save/user-address-save.vue
@@ -1,732 +1,657 @@
-<template>
-<view class="page">
-    <form @submit="form_submit" class="form-container oh">
-        <view class="form-gorup bg-white">
-            <view class="form-gorup-title">别名<text class="form-group-tips">选填</text></view>
-            <input type="text" name="alias" :value="address_data.alias || ''" maxlength="16" placeholder-class="cr-grey" class="cr-base" placeholder="别名格式最多 16 个字符">
-        </view>
-
-        <view class="form-gorup bg-white">
-            <view class="form-gorup-title">联系人<text class="form-group-tips-must">必填</text></view>
-            <input type="text" name="name" :value="address_data.name || ''" maxlength="16" placeholder-class="cr-grey" class="cr-base" placeholder="联系人格式 2~16 个字符之间">
-        </view>
-
-        <view class="form-gorup bg-white">
-            <view class="form-gorup-title">联系电话<text class="form-group-tips-must">必填</text></view>
-            <input type="text" name="tel" :value="address_data.tel || ''" maxlength="30" placeholder-class="cr-grey" class="cr-base" placeholder="座机 或 手机">
-        </view>
-
-        <view class="form-gorup bg-white">
-            <view class="form-gorup-title">省市区<text class="form-group-tips-must">必选</text></view>
-            <view class="select-address oh">
-            <view class="section fl">
-                <picker name="province" @change="select_province_event" :value="province_value" :range="province_list" range-key="name">
-                    <view :class="'name ' + ((province_value == null) ? 'cr-grey' : 'cr-base' )">{{province_list[province_value].name || default_province}}</view>
-                </picker>
-            </view>
-            <view class="section fl">
-                <picker v-if="(province_id || null) != null" name="city" @change="select_city_event" :value="city_value" :range="city_list" range-key="name">
-                    <view :class="'name ' + ((city_value == null) ? 'cr-grey' : 'cr-base' )">{{city_list[city_value].name || default_city}}</view>
-                </picker>
-                <text v-else class="cr-grey" @tap="region_select_error_event" data-value="请先选择省份">请先选择省份</text>
-            </view>
-            <view class="section fl">
-                <picker v-if="(city_id || null) != null" name="county" @change="select_county_event" :value="county_value" :range="county_list" range-key="name">
-                    <view :class="'name ' + ((county_value == null) ? 'cr-grey' : 'cr-base' )">{{county_list[county_value].name || default_county}}</view>
-                </picker>
-                <text v-else class="cr-grey" @tap="region_select_error_event" data-value="请先选择城市">请先选择城市</text>
-            </view>
-            </view>
-        </view>
-
-        <view class="form-gorup bg-white">
-            <view class="form-gorup-title">详细地址<text class="form-group-tips-must">必填</text></view>
-            <input type="text" name="address" :value="address_data.address || ''" maxlength="80" placeholder-class="cr-grey" class="cr-base" placeholder="详细地址格式 1~80 个字符之间">
-        </view>
-
-        <view v-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 @tap="choose_location_event" class="form-gorup-text">
-                <view v-if="(user_location || null) == null && (address_data.address || null) == null" class="cr-gray">请选择地理位置</view>
-                <view v-else class="cr-base">{{((user_location || null) != null && (user_location.name || null) != null) ? user_location.name+' ' : ''}}{{user_location.address || address_data.address || ''}}</view>
-            </view>
-        </view>
-
-        <view class="form-gorup bg-white">
-            <view class="form-gorup-title">是否默认<text class="form-group-tips">选填</text></view>
-            <view class="switch">
-                <switch name="is_default" :checked="address_data.is_default == 1 ? true : false" color="#04BE02"></switch>
-            </view>
-        </view>
-
-        <!-- 身份证信息 -->
-        <view v-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-must">必填</text><text class="form-group-tips">请务必与上传的身份证件姓名保持一致</text></view>
-                <input type="text" name="idcard_name" :value="address_data.idcard_name || ''" maxlength="16" placeholder-class="cr-grey" class="cr-base" placeholder="身份证姓名格式 2~16 个字符之间">
-            </view>
-            <view class="form-gorup bg-white">
-                <view class="form-gorup-title">身份证号码<text class="form-group-tips-must">必填</text><text class="form-group-tips">请务必与上传的身份证件号码保持一致</text></view>
-                <input type="idcard" name="idcard_number" :value="address_data.idcard_number || ''" maxlength="18" placeholder-class="cr-grey" class="cr-base" placeholder="身份证号码格式最多18个字符">
-            </view>
-            <view class="form-gorup bg-white form-container-upload oh">
-                <view class="form-gorup-title">身份证照片<text class="form-group-tips-must">必传</text><text class="form-group-tips">请使用身份证原件拍摄，图片要清晰</text></view>
-                <view class="form-upload-data">
-                    <view class="item fl">
-                        <text v-if="(idcard_images_data.idcard_front || null) != null" class="delete-icon" @tap="upload_delete_event" data-value="idcard_front">x</text>
-                        <image :src="(idcard_images_data.idcard_front || null) != null ? idcard_images_data.idcard_front : '/static/images/default-idcard-front.jpg'" data-value="idcard_front" mode="aspectFill" @tap="file_upload_event"></image>
-                    </view>
-                    <view class="item fl">
-                        <text v-if="(idcard_images_data.idcard_back || null) != null" class="delete-icon" @tap="upload_delete_event" data-value="idcard_back">x</text>
-                        <image :src="(idcard_images_data.idcard_back || null) != null ? idcard_images_data.idcard_back : '/static/images/default-idcard-back.jpg'" data-value="idcard_back" mode="aspectFill" @tap="file_upload_event"></image>
-                    </view>
+<template>
+    <view class="page">
+        <form @submit="form_submit" class="form-container">
+            <view class="padding-main oh">
+                <view class="form-gorup bg-white">
+                    <view class="form-gorup-title">别名<text class="form-group-tips">选填</text></view>
+                    <input type="text" name="alias" :value="address_data.alias || ''" maxlength="16" placeholder-class="cr-grey" class="cr-base" placeholder="别名格式最多 16 个字符">
+                </view>
+
+                <view class="form-gorup bg-white">
+                    <view class="form-gorup-title">联系人<text class="form-group-tips-must">必填</text></view>
+                    <input type="text" name="name" :value="address_data.name || ''" maxlength="16" placeholder-class="cr-grey" class="cr-base" placeholder="联系人格式 2~16 个字符之间">
+                </view>
+
+                <view class="form-gorup bg-white">
+                    <view class="form-gorup-title">联系电话<text class="form-group-tips-must">必填</text></view>
+                    <input type="text" name="tel" :value="address_data.tel || ''" maxlength="30" placeholder-class="cr-grey" class="cr-base" placeholder="座机 或 手机">
+                </view>
+
+                <view class="form-gorup bg-white">
+                    <view class="form-gorup-title">省市区<text class="form-group-tips-must">必选</text></view>
+                    <view class="select-address oh">
+                        <view class="section fl">
+                            <picker name="province" @change="select_province_event" :value="province_value" :range="province_list" range-key="name">
+                                <view :class="'name ' + ((province_value == null) ? 'cr-grey' : 'cr-base' )">{{province_list[province_value].name || default_province}}</view>
+                            </picker>
+                        </view>
+                        <view class="section fl">
+                            <picker v-if="(province_id || null) != null" name="city" @change="select_city_event" :value="city_value" :range="city_list" range-key="name">
+                                <view :class="'name ' + ((city_value == null) ? 'cr-grey' : 'cr-base' )">{{city_list[city_value].name || default_city}}</view>
+                            </picker>
+                            <text v-else class="cr-grey" @tap="region_select_error_event" data-value="请先选择省份">请先选择省份</text>
+                        </view>
+                        <view class="section fl">
+                            <picker v-if="(city_id || null) != null" name="county" @change="select_county_event" :value="county_value" :range="county_list" range-key="name">
+                                <view :class="'name ' + ((county_value == null) ? 'cr-grey' : 'cr-base' )">{{county_list[county_value].name || default_county}}</view>
+                            </picker>
+                            <text v-else class="cr-grey" @tap="region_select_error_event" data-value="请先选择城市">请先选择城市</text>
+                        </view>
+                    </view>
+                </view>
+
+                <view class="form-gorup bg-white">
+                    <view class="form-gorup-title">详细地址<text class="form-group-tips-must">必填</text></view>
+                    <input type="text" name="address" :value="address_data.address || ''" maxlength="80" placeholder-class="cr-grey" class="cr-base" placeholder="详细地址格式 1~80 个字符之间">
+                </view>
+
+                <view v-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 @tap="choose_location_event" class="form-gorup-text">
+                        <view v-if="(user_location || null) == null" class="cr-gray">请选择地理位置</view>
+                        <view v-else class="cr-base">{{user_location.lng}}, {{user_location.lat}}</view>
+                    </view>
+                </view>
+
+                <view class="form-gorup bg-white">
+                    <view class="form-gorup-title">是否默认<text class="form-group-tips">选填</text></view>
+                    <view class="switch">
+                        <switch name="is_default" :checked="address_data.is_default == 1 ? true : false" color="#04BE02"></switch>
+                    </view>
+                </view>
+
+                <!-- 身份证信息 -->
+                <view v-if="home_user_address_idcard_status == 1" class="idcard-container padding-horizontal-main padding-top-main border-radius-main oh">
+                    <view class="form-gorup bg-white">
+                        <view class="form-gorup-title">身份证姓名<text class="form-group-tips-must">必填</text><text class="form-group-tips">请务必与上传的身份证件姓名保持一致</text></view>
+                        <input type="text" name="idcard_name" :value="address_data.idcard_name || ''" maxlength="16" placeholder-class="cr-grey" class="cr-base" placeholder="身份证姓名格式 2~16 个字符之间">
+                    </view>
+                    <view class="form-gorup bg-white">
+                        <view class="form-gorup-title">身份证号码<text class="form-group-tips-must">必填</text><text class="form-group-tips">请务必与上传的身份证件号码保持一致</text></view>
+                        <input type="idcard" name="idcard_number" :value="address_data.idcard_number || ''" maxlength="18" placeholder-class="cr-grey" class="cr-base" placeholder="身份证号码格式最多18个字符">
+                    </view>
+                    <view class="form-gorup bg-white form-container-upload oh">
+                        <view class="form-gorup-title">身份证照片<text class="form-group-tips-must">必传</text><text class="form-group-tips">请使用身份证原件拍摄，图片要清晰</text></view>
+                        <view class="form-upload-data">
+                            <view class="item fl">
+                                <text v-if="(idcard_images_data.idcard_front || null) != null" class="delete-icon" @tap="upload_delete_event" data-value="idcard_front">x</text>
+                                <image :src="(idcard_images_data.idcard_front || null) != null ? idcard_images_data.idcard_front : '/static/images/default-idcard-front.jpg'" data-value="idcard_front" mode="aspectFill" @tap="file_upload_event"></image>
+                            </view>
+                            <view class="item fl">
+                                <text v-if="(idcard_images_data.idcard_back || null) != null" class="delete-icon" @tap="upload_delete_event" data-value="idcard_back">x</text>
+                                <image :src="(idcard_images_data.idcard_back || null) != null ? idcard_images_data.idcard_back : '/static/images/default-idcard-back.jpg'" data-value="idcard_back" mode="aspectFill" @tap="file_upload_event"></image>
+                            </view>
+                        </view>
+                    </view>
                 </view>
-            </view>
-        </view>
-
-        <button class="submit-fixed submit-bottom" type="default" form-type="submit" hover-class="none" :disabled="form_submit_disabled_status">保存</button>
-    </form>
-</view>
-</template>
-
-<script>
-const app = getApp();
-
-export default {
-  data() {
-    return {
-      params: null,
-      data_list_loding_status: 1,
-      data_list_loding_msg: '',
-      editor_path_type: '',
-      address_data: null,
-      province_list: [],
-      city_list: [],
-      county_list: [],
-      province_id: null,
-      city_id: null,
-      county_id: null,
-      idcard_images_data: {},
-      default_province: "请选择省",
-      default_city: "请选择市",
-      default_county: "请选择区/县",
-      province_value: null,
-      city_value: null,
-      county_value: null,
-      user_location_cache_key: app.globalData.data.cache_userlocation_key,
-      user_location: null,
-      form_submit_disabled_status: false,
-      // 基础配置
-      home_user_address_map_status: 0,
-      home_user_address_idcard_status: 0
-    };
-  },
-
-  components: {},
-  props: {},
-
-  onLoad(params) {
-    this.setData({
-      params: params
-    });
-  },
-
-  onReady: function () {
-    if ((this.params.id || null) == null) {
-      var title = app.globalData.data.common_pages_title.user_address_save_add;
-    } else {
-      var title = app.globalData.data.common_pages_title.user_address_save_edit;
-    }
-
-    uni.setNavigationBarTitle({
-      title: title
-    }); // 初始化配置
-
-    this.init_config(); // 清除位置缓存信息
-
-    uni.removeStorage({
-      key: this.user_location_cache_key
-    });
-    this.init();
-  },
-
-  onShow() {
-    this.user_location_init();
-  },
-
-  methods: {
-    // 初始化配置
-    init_config(status) {
-      if ((status || false) == true) {
-        this.setData({
-          home_user_address_map_status: app.globalData.get_config('config.home_user_address_map_status'),
-          home_user_address_idcard_status: app.globalData.get_config('config.home_user_address_idcard_status')
-        });
-      } else {
-        app.globalData.is_config(this, 'init_config');
-      }
-    },
-
-    // 获取数据
-    init() {
-      var user = app.globalData.get_user_info(this, "init");
-
-      if (user != false) {
-        // 用户未绑定用户则转到登录页面
-        if (app.globalData.user_is_need_login(user)) {
-          uni.redirectTo({
-            url: "/pages/login/login?event_callback=init"
-          });
-          this.setData({
-            data_list_loding_status: 2,
-            data_list_loding_msg: '请先绑定手机号码'
-          });
-          return false;
-        } else {
-          this.get_province_list();
-          this.get_data();
-        }
-      } else {
-        this.setData({
-          data_list_loding_status: 2,
-          data_list_loding_msg: '请先授权用户信息'
-        });
-      }
-    },
-
-    // 获取数据
-    get_data() {
-      var self = this;
-      uni.request({
-        url: app.globalData.get_request_url("detail", "useraddress"),
-        method: "POST",
-        data: self.params,
-        dataType: "json",
-        header: {
-          'content-type': 'application/x-www-form-urlencoded'
-        },
-        success: res => {
-          if (res.data.code == 0) {
-            var data = res.data.data || null;
-            var ads_data = data.data || null;
-            var idcard_images = {
-              idcard_front: ads_data == null ? '' : ads_data.idcard_front || '',
-              idcard_back: ads_data == null ? '' : ads_data.idcard_back || ''
-            };
-            self.setData({
-              address_data: ads_data,
-              idcard_images_data: idcard_images,
-              editor_path_type: data.editor_path_type || ''
-            }); // 数据设置
-
-            if (ads_data != null) {
-              self.setData({
-                province_id: ads_data.province || null,
-                city_id: ads_data.city || null,
-                county_id: ads_data.county || null
-              }); // 地理位置
-
-              var lng = ads_data.lng || null;
-              var lat = ads_data.lat || null;
-
-              if (lng != null && lat != null && lng != 0 && lat != 0) {
-                self.setData({
-                  user_location: {
-                    lng: lng,
-                    lat: lat,
-                    address: ads_data.address || ''
-                  }
-                });
-              }
-            } // 获取城市、区县
-
-
-            self.get_city_list();
-            self.get_county_list(); // 半秒后初始化数据
-
-            setTimeout(function () {
-              self.init_region_value();
-            }, 500);
-          } else {
-            if (app.globalData.is_login_check(res.data)) {
-              app.globalData.showToast(res.data.msg);
-            }
-          }
-        },
-        fail: () => {
-          app.globalData.showToast("省份信息失败");
-        }
-      });
-    },
-
-    // 地区数据初始化
-    init_region_value() {
-      this.setData({
-        province_value: this.get_region_value("province_list", "province_id"),
-        city_value: this.get_region_value("city_list", "city_id"),
-        county_value: this.get_region_value("county_list", "county_id")
-      });
-    },
-
-    // 地区初始化匹配索引
-    get_region_value(list, id) {
-      var data = this[list];
-      var data_id = this[id];
-      var value = null;
-      data.forEach((d, i) => {
-        if (d.id == data_id) {
-          value = i;
-          return false;
-        }
-      });
-      return value;
-    },
-
-    // 获取省份
-    get_province_list() {
-      var self = this;
-      uni.request({
-        url: app.globalData.get_request_url("index", "region"),
-        method: "POST",
-        data: {},
-        dataType: "json",
-        header: {
-          'content-type': 'application/x-www-form-urlencoded'
-        },
-        success: res => {
-          if (res.data.code == 0) {
-            var data = res.data.data;
-            self.setData({
-              province_list: data
+                <view class="submit-fixed padding-main">
+                    <button class="submit-bottom bg-main cr-white round" type="default" form-type="submit" hover-class="none" :disabled="form_submit_disabled_status">保存</button>
+                </view>
+            </view>
+        </form>
+    </view>
+</template>
+<script>
+    const app = getApp();
+
+    export default {
+        data() {
+            return {
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                editor_path_type: '',
+                address_data: null,
+                province_list: [],
+                city_list: [],
+                county_list: [],
+                province_id: null,
+                city_id: null,
+                county_id: null,
+                idcard_images_data: {},
+                default_province: "请选择省",
+                default_city: "请选择市",
+                default_county: "请选择区/县",
+                province_value: null,
+                city_value: null,
+                county_value: null,
+                user_location_cache_key: app.globalData.data.cache_userlocation_key,
+                user_location: null,
+                form_submit_disabled_status: false,
+                // 基础配置
+                home_user_address_map_status: 0,
+                home_user_address_idcard_status: 0
+            };
+        },
+
+        components: {},
+        props: {},
+
+        onLoad(params) {
+            this.setData({
+                params: params
+            });
+        },
+
+        onReady: function() {
+            uni.setNavigationBarTitle({
+                title: '地址'+(((this.params.id || null) == null) ? '添加' : '编辑')
             });
-          } else {
-            app.globalData.showToast(res.data.msg);
-          }
-        },
-        fail: () => {
-          app.globalData.showToast("省份获取失败");
-        }
-      });
-    },
-
-    // 获取市
-    get_city_list() {
-      var self = this;
-
-      if (self.province_id) {
-        uni.request({
-          url: app.globalData.get_request_url("index", "region"),
-          method: "POST",
-          data: {
-            pid: self.province_id
-          },
-          dataType: "json",
-          header: {
-            'content-type': 'application/x-www-form-urlencoded'
-          },
-          success: res => {
-            if (res.data.code == 0) {
-              var data = res.data.data;
-              self.setData({
-                city_list: data
-              });
-            } else {
-              app.globalData.showToast(res.data.msg);
-            }
-          },
-          fail: () => {
-            app.globalData.showToast("城市获取失败");
-          }
-        });
-      }
-    },
-
-    // 获取区/县
-    get_county_list() {
-      var self = this;
-
-      if (self.city_id) {
-        // 加载loding
-        uni.request({
-          url: app.globalData.get_request_url("index", "region"),
-          method: "POST",
-          data: {
-            pid: self.city_id
-          },
-          dataType: "json",
-          header: {
-            'content-type': 'application/x-www-form-urlencoded'
-          },
-          success: res => {
-            if (res.data.code == 0) {
-              var data = res.data.data;
-              self.setData({
-                county_list: data
-              });
-            } else {
-              app.globalData.showToast(res.data.msg);
-            }
-          },
-          fail: () => {
-            app.globalData.showToast("区/县获取失败");
-          }
-        });
-      }
-    },
-
-    // 省份事件
-    select_province_event(e) {
-      var index = e.detail.value || 0;
-
-      if (index >= 0) {
-        var data = this.province_list[index];
-        this.setData({
-          province_value: index,
-          province_id: data.id,
-          city_value: null,
-          county_value: null,
-          city_id: null,
-          county_id: null
-        });
-        this.get_city_list();
-      }
-    },
-
-    // 市事件
-    select_city_event(e) {
-      var index = e.detail.value || 0;
-
-      if (index >= 0) {
-        var data = this.city_list[index];
-        this.setData({
-          city_value: index,
-          city_id: data.id,
-          county_value: null,
-          county_id: null
-        });
-        this.get_county_list();
-      }
-    },
-
-    // 区/县事件
-    select_county_event(e) {
-      var index = e.detail.value || 0;
-
-      if (index >= 0) {
-        var data = this.county_list[index];
-        this.setData({
-          county_value: index,
-          county_id: data.id
-        });
-      }
-    },
-
-    // 省市区未按照顺序选择提示
-    region_select_error_event(e) {
-      var value = e.currentTarget.dataset.value || null;
-
-      if (value != null) {
-        app.globalData.showToast(value);
-      }
-    },
-
-    // 选择地理位置
-    choose_location_event(e) {
-      uni.navigateTo({
-        url: '/pages/common/open-setting-location/open-setting-location'
-      });
-    },
-
-    // 地址信息初始化
-    user_location_init() {
-      var result = uni.getStorageSync(this.user_location_cache_key) || null;
-      var data = null;
-
-      if (result != null) {
-        data = {
-          name: result.name || null,
-          address: result.address || null,
-          lat: result.latitude || null,
-          lng: result.longitude || null
-        };
-      }
-
-      this.setData({
-        user_location: data
-      });
-    },
-
-    // 文件上传
-    file_upload_event(e) {
-      var form_name = e.currentTarget.dataset.value || null;
-
-      if (form_name == null) {
-        app.globalData.showToast('表单名称类型有误');
-        return false;
-      }
-
-      var self = this;
-      uni.chooseImage({
-        count: 1,
-
-        success(res) {
-          var success = 0;
-          var fail = 0;
-          var length = res.tempFilePaths.length;
-          var count = 0;
-          self.upload_one_by_one(res.tempFilePaths, success, fail, count, length, form_name);
-        }
-
-      });
-    },
-
-    // 采用递归的方式上传多张
-    upload_one_by_one(img_paths, success, fail, count, length, form_name) {
-      var self = this;
-      uni.uploadFile({
-        url: app.globalData.get_request_url("index", "ueditor"),
-        filePath: img_paths[count],
-        name: 'upfile',
-        formData: {
-          action: 'uploadimage',
-          path_type: self.editor_path_type
-        },
-        success: function (res) {
-          success++;
-
-          if (res.statusCode == 200) {
-            var data = typeof res.data == 'object' ? res.data : JSON.parse(res.data);
-
-            if (data.code == 0 && (data.data.url || null) != null) {
-              var temp_idcard_images_data = self.idcard_images_data || {};
-              temp_idcard_images_data[form_name] = data.data.url;
-              self.setData({
-                idcard_images_data: temp_idcard_images_data
-              });
-            } else {
-              app.globalData.showToast(data.msg);
-            }
-          }
-        },
-        fail: function (e) {
-          fail++;
-        },
-        complete: function (e) {
-          count++; // 下一张
-
-          if (count >= length) {// 上传完毕，作一下提示
-            //app.showToast('上传成功' + success +'张', 'success');
-          } else {
-            // 递归调用，上传下一张
-            self.upload_one_by_one(img_paths, success, fail, count, length, form_name);
-          }
-        }
-      });
-    },
-
-    // 图片删除
-    upload_delete_event(e) {
-      var form_name = e.currentTarget.dataset.value || null;
-
-      if (form_name == null) {
-        app.globalData.showToast('表单名称类型有误');
-        return false;
-      }
-
-      var self = this;
-      uni.showModal({
-        title: '温馨提示',
-        content: '删除后不可恢复、继续吗？',
-
-        success(res) {
-          if (res.confirm) {
-            var temp_idcard_images_data = self.idcard_images_data || {};
-            temp_idcard_images_data[form_name] = '';
-            self.setData({
-              idcard_images_data: temp_idcard_images_data
-            });
-          }
-        }
-
-      });
-    },
-
-    // 数据提交
-    form_submit(e) {
-      var self = this; // 表单数据
-
-      var form_data = e.detail.value; // 数据校验
-
-      var validation = [{
-        fields: "name",
-        msg: "请填写联系人"
-      }, {
-        fields: "tel",
-        msg: "请填写联系电话"
-      }, {
-        fields: "province",
-        msg: "请选择省份"
-      }, {
-        fields: "city",
-        msg: "请选择城市"
-      }, {
-        fields: "county",
-        msg: "请选择区县"
-      }, {
-        fields: "address",
-        msg: "请填写详细地址"
-      }]; // 是否开启了地理位置选择
-
-      if (self.home_user_address_map_status == 1) {
-        validation.push({
-          fields: "lng",
-          msg: "请选择地理位置"
-        });
-        validation.push({
-          fields: "lat",
-          msg: "请选择地理位置"
-        });
-      } // 是否开启了用户身份证信息
-
-
-      if (self.home_user_address_idcard_status == 1) {
-        // 验证
-        validation.push({
-          fields: "idcard_name",
-          msg: "请填写身份证姓名"
-        });
-        validation.push({
-          fields: "idcard_number",
-          msg: "请填写身份证号码"
-        });
-        validation.push({
-          fields: "idcard_front",
-          msg: "请上传身份证正面照片"
-        });
-        validation.push({
-          fields: "idcard_back",
-          msg: "请上传身份证背面照片"
-        }); // 数据
-
-        form_data['idcard_front'] = self.idcard_images_data.idcard_front || '';
-        form_data['idcard_back'] = self.idcard_images_data.idcard_back || '';
-      }
-
-      form_data['province'] = self.province_id;
-      form_data['city'] = self.city_id;
-      form_data['county'] = self.county_id;
-      form_data['id'] = self.params.id || 0;
-      form_data['is_default'] = form_data.is_default == true ? 1 : 0; // 地理位置
-
-      var lng = 0;
-      var lat = 0;
-
-      if ((self.user_location || null) != null) {
-        lng = self.user_location.lng || 0;
-        lat = self.user_location.lat || 0;
-      }
-
-      if ((self.address_data || null) != null) {
-        if ((lng || null) == null) {
-          lng = self.address_data.lng || 0;
-        }
-
-        if ((lat || null) == null) {
-          lat = self.address_data.lat || 0;
-        }
-      }
-
-      form_data['lng'] = lng;
-      form_data['lat'] = lat; // 验证提交表单
-
-      if (app.globalData.fields_check(form_data, validation)) {
-        // 数据保存
-        self.setData({
-          form_submit_disabled_status: true
-        });
-        uni.showLoading({
-          title: "处理中..."
-        });
-        uni.request({
-          url: app.globalData.get_request_url("save", "useraddress"),
-          method: "POST",
-          data: form_data,
-          dataType: "json",
-          header: {
-            'content-type': 'application/x-www-form-urlencoded'
-          },
-          success: res => {
-            uni.hideLoading();
-
-            if (res.data.code == 0) {
-              app.globalData.showToast(res.data.msg, "success");
-              setTimeout(function () {
-                uni.navigateBack();
-              }, 1000);
-            } else {
-              self.setData({
-                form_submit_disabled_status: false
-              });
-
-              if (app.globalData.is_login_check(res.data)) {
-                app.globalData.showToast(res.data.msg);
-              } else {
-                app.globalData.showToast('提交失败，请重试！');
-              }
-            }
-          },
-          fail: () => {
-            self.setData({
-              form_submit_disabled_status: false
-            });
-            uni.hideLoading();
-            app.globalData.showToast("服务器请求出错");
-          }
-        });
-      }
-    }
-
-  }
-};
-</script>
-<style>
-/*
- * 三级联动
- */
-.select-address {
-    box-sizing: border-box;
-    height: 70rpx;
-    line-height: 70rpx;
-    padding: 0 10rpx;
-}
-.select-address .section {
-    width: 33.33%;
-    box-sizing: border-box;
-}
-.select-address .section:not(:first-child) {
-    padding: 0 5rpx;
-}
-  
-/*
- * 表单
- */
-.page {
-    padding-bottom: 85rpx;
-}
-.submit-bottom {
-    z-index: 2;
-}
-
-/*
- * 身份信息
- */
-.idcard-container {
-    background: #e0e0e0;
-    padding: 30rpx;
-}
-.idcard-container .form-upload-data .item image {
-    width: 256rpx;
-    height: 170rpx;
-    border: 1px dashed #c2c2c2;
-}
+            
+            // 初始化配置
+            this.init_config();
+            
+            // 清除位置缓存信息
+            uni.removeStorage({
+                key: this.user_location_cache_key
+            });
+            this.init();
+        },
+
+        onShow() {
+            this.user_location_init();
+        },
+
+        methods: {
+            // 初始化配置
+            init_config(status) {
+                if ((status || false) == true) {
+                    this.setData({
+                        home_user_address_map_status: app.globalData.get_config('config.home_user_address_map_status'),
+                        home_user_address_idcard_status: app.globalData.get_config('config.home_user_address_idcard_status')
+                    });
+                } else {
+                    app.globalData.is_config(this, 'init_config');
+                }
+            },
+
+            // 获取数据
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    // 用户未绑定用户则转到登录页面
+                    if (app.globalData.user_is_need_login(user)) {
+                        uni.redirectTo({
+                            url: "/pages/login/login?event_callback=init"
+                        });
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: '请先绑定手机号码'
+                        });
+                        return false;
+                    } else {
+                        this.get_province_list();
+                        this.get_data();
+                    }
+                } else {
+                    this.setData({
+                        data_list_loding_status: 2,
+                        data_list_loding_msg: '请先授权用户信息'
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                var self = this;
+                uni.request({
+                    url: app.globalData.get_request_url("detail", "useraddress"),
+                    method: "POST",
+                    data: self.params,
+                    dataType: "json",
+                    success: res => {
+                        if (res.data.code == 0) {
+                            var data = res.data.data || null;
+                            var ads_data = data.data || null;
+                            var idcard_images = {
+                                idcard_front: ads_data == null ? '' : ads_data.idcard_front || '',
+                                idcard_back: ads_data == null ? '' : ads_data.idcard_back || ''
+                            };
+                            self.setData({
+                                address_data: ads_data,
+                                idcard_images_data: idcard_images,
+                                editor_path_type: data.editor_path_type || ''
+                            });
+                            
+                            // 数据设置
+                            if (ads_data != null) {
+                                self.setData({
+                                    province_id: ads_data.province || null,
+                                    city_id: ads_data.city || null,
+                                    county_id: ads_data.county || null
+                                });
+                                
+                                // 地理位置
+                                var lng = ads_data.lng || 0;
+                                var lat = ads_data.lat || 0;
+                                if (lng != 0 && lat != 0) {
+                                    self.setData({
+                                        user_location: {
+                                            lng: lng,
+                                            lat: lat,
+                                            address: ads_data.address || ''
+                                        }
+                                    });
+                                }
+                            }
+                            
+                            // 获取城市、区县
+                            self.get_city_list();
+                            self.get_county_list();
+                            
+                            // 半秒后初始化数据
+                            setTimeout(function() {
+                                self.init_region_value();
+                            }, 500);
+                        } else {
+                            if (app.globalData.is_login_check(res.data)) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        app.globalData.showToast("省份信息失败");
+                    }
+                });
+            },
+
+            // 地区数据初始化
+            init_region_value() {
+                this.setData({
+                    province_value: this.get_region_value("province_list", "province_id"),
+                    city_value: this.get_region_value("city_list", "city_id"),
+                    county_value: this.get_region_value("county_list", "county_id")
+                });
+            },
+
+            // 地区初始化匹配索引
+            get_region_value(list, id) {
+                var data = this[list];
+                var data_id = this[id];
+                var value = null;
+                data.forEach((d, i) => {
+                    if (d.id == data_id) {
+                        value = i;
+                        return false;
+                    }
+                });
+                return value;
+            },
+
+            // 获取省份
+            get_province_list() {
+                uni.request({
+                    url: app.globalData.get_request_url("index", "region"),
+                    method: "POST",
+                    data: {},
+                    dataType: "json",
+                    success: res => {
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                province_list: data
+                            });
+                        } else {
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        app.globalData.showToast("省份获取失败");
+                    }
+                });
+            },
+
+            // 获取市
+            get_city_list() {
+                if (this.province_id) {
+                    uni.request({
+                        url: app.globalData.get_request_url("index", "region"),
+                        method: "POST",
+                        data: {
+                            pid: this.province_id
+                        },
+                        dataType: "json",
+                        success: res => {
+                            if (res.data.code == 0) {
+                                var data = res.data.data;
+                                this.setData({
+                                    city_list: data
+                                });
+                            } else {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        },
+                        fail: () => {
+                            app.globalData.showToast("城市获取失败");
+                        }
+                    });
+                }
+            },
+
+            // 获取区/县
+            get_county_list() {
+                if (this.city_id) {
+                    // 加载loding
+                    uni.request({
+                        url: app.globalData.get_request_url("index", "region"),
+                        method: "POST",
+                        data: {
+                            pid: this.city_id
+                        },
+                        dataType: "json",
+                        success: res => {
+                            if (res.data.code == 0) {
+                                var data = res.data.data;
+                                this.setData({
+                                    county_list: data
+                                });
+                            } else {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        },
+                        fail: () => {
+                            app.globalData.showToast("区/县获取失败");
+                        }
+                    });
+                }
+            },
+
+            // 省份事件
+            select_province_event(e) {
+                var index = e.detail.value || 0;
+                if (index >= 0) {
+                    var data = this.province_list[index];
+                    this.setData({
+                        province_value: index,
+                        province_id: data.id,
+                        city_value: null,
+                        county_value: null,
+                        city_id: null,
+                        county_id: null
+                    });
+                    this.get_city_list();
+                }
+            },
+
+            // 市事件
+            select_city_event(e) {
+                var index = e.detail.value || 0;
+                if (index >= 0) {
+                    var data = this.city_list[index];
+                    this.setData({
+                        city_value: index,
+                        city_id: data.id,
+                        county_value: null,
+                        county_id: null
+                    });
+                    this.get_county_list();
+                }
+            },
+
+            // 区/县事件
+            select_county_event(e) {
+                var index = e.detail.value || 0;
+                if (index >= 0) {
+                    var data = this.county_list[index];
+                    this.setData({
+                        county_value: index,
+                        county_id: data.id
+                    });
+                }
+            },
+
+            // 省市区未按照顺序选择提示
+            region_select_error_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                if (value != null) {
+                    app.globalData.showToast(value);
+                }
+            },
+
+            // 选择地理位置
+            choose_location_event(e) {
+                uni.navigateTo({
+                    url: '/pages/common/open-setting-location/open-setting-location'
+                });
+            },
+
+            // 地址信息初始化
+            user_location_init() {
+                var result = uni.getStorageSync(this.user_location_cache_key) || null;
+                var data = null;
+                if (result != null) {
+                    data = {
+                        name: result.name || null,
+                        address: result.address || null,
+                        lat: result.latitude || null,
+                        lng: result.longitude || null
+                    };
+                }
+                this.setData({
+                    user_location: data
+                });
+            },
+
+            // 文件上传
+            file_upload_event(e) {
+                var form_name = e.currentTarget.dataset.value || null;
+                if (form_name == null) {
+                    app.globalData.showToast('表单名称类型有误');
+                    return false;
+                }
+
+                var self = this;
+                uni.chooseImage({
+                    count: 1,
+                    success(res) {
+                        var success = 0;
+                        var fail = 0;
+                        var length = res.tempFilePaths.length;
+                        var count = 0;
+                        self.upload_one_by_one(res.tempFilePaths, success, fail, count, length, form_name);
+                    }
+                });
+            },
+
+            // 采用递归的方式上传多张
+            upload_one_by_one(img_paths, success, fail, count, length, form_name) {
+                var self = this;
+                uni.uploadFile({
+                    url: app.globalData.get_request_url("index", "ueditor"),
+                    filePath: img_paths[count],
+                    name: 'upfile',
+                    formData: {
+                        action: 'uploadimage',
+                        path_type: self.editor_path_type
+                    },
+                    success: function(res) {
+                        success++;
+                        if (res.statusCode == 200) {
+                            var data = typeof res.data == 'object' ? res.data : JSON.parse(res.data);
+                            if (data.code == 0 && (data.data.url || null) != null) {
+                                var temp_idcard_images_data = self.idcard_images_data || {};
+                                temp_idcard_images_data[form_name] = data.data.url;
+                                self.setData({
+                                    idcard_images_data: temp_idcard_images_data
+                                });
+                            } else {
+                                app.globalData.showToast(data.msg);
+                            }
+                        }
+                    },
+                    fail: function(e) {
+                        fail++;
+                    },
+                    complete: function(e) {
+                        count++;
+                        // 下一张
+                        if (count >= length) { // 上传完毕，作一下提示
+                            //app.showToast('上传成功' + success +'张', 'success');
+                        } else {
+                            // 递归调用，上传下一张
+                            self.upload_one_by_one(img_paths, success, fail, count, length, form_name);
+                        }
+                    }
+                });
+            },
+
+            // 图片删除
+            upload_delete_event(e) {
+                var form_name = e.currentTarget.dataset.value || null;
+                if (form_name == null) {
+                    app.globalData.showToast('表单名称类型有误');
+                    return false;
+                }
+
+                var self = this;
+                uni.showModal({
+                    title: '温馨提示',
+                    content: '删除后不可恢复、继续吗？',
+                    success(res) {
+                        if (res.confirm) {
+                            var temp_idcard_images_data = self.idcard_images_data || {};
+                            temp_idcard_images_data[form_name] = '';
+                            self.setData({
+                                idcard_images_data: temp_idcard_images_data
+                            });
+                        }
+                    }
+
+                });
+            },
+
+            // 数据提交
+            form_submit(e) {                
+                // 表单数据
+                var form_data = e.detail.value;
+                
+                // 数据校验
+                var validation = [{
+                    fields: "name",
+                    msg: "请填写联系人"
+                }, {
+                    fields: "tel",
+                    msg: "请填写联系电话"
+                }, {
+                    fields: "province",
+                    msg: "请选择省份"
+                }, {
+                    fields: "city",
+                    msg: "请选择城市"
+                }, {
+                    fields: "county",
+                    msg: "请选择区县"
+                }, {
+                    fields: "address",
+                    msg: "请填写详细地址"
+                }];
+                
+                // 是否开启了地理位置选择
+                if (this.home_user_address_map_status == 1) {
+                    validation.push({
+                        fields: "lng",
+                        msg: "请选择地理位置"
+                    });
+                    validation.push({
+                        fields: "lat",
+                        msg: "请选择地理位置"
+                    });
+                }
+                
+                // 是否开启了用户身份证信息
+                if (this.home_user_address_idcard_status == 1) {
+                    // 验证
+                    validation.push({
+                        fields: "idcard_name",
+                        msg: "请填写身份证姓名"
+                    });
+                    validation.push({
+                        fields: "idcard_number",
+                        msg: "请填写身份证号码"
+                    });
+                    validation.push({
+                        fields: "idcard_front",
+                        msg: "请上传身份证正面照片"
+                    });
+                    validation.push({
+                        fields: "idcard_back",
+                        msg: "请上传身份证背面照片"
+                    });
+                    
+                    // 数据
+                    form_data['idcard_front'] = this.idcard_images_data.idcard_front || '';
+                    form_data['idcard_back'] = this.idcard_images_data.idcard_back || '';
+                }
+
+                form_data['province'] = this.province_id;
+                form_data['city'] = this.city_id;
+                form_data['county'] = this.county_id;
+                form_data['id'] = this.params.id || 0;
+                form_data['is_default'] = form_data.is_default == true ? 1 : 0;
+                
+                // 地理位置
+                var lng = 0;
+                var lat = 0;
+                if ((this.user_location || null) != null) {
+                    lng = this.user_location.lng || 0;
+                    lat = this.user_location.lat || 0;
+                }
+                if ((this.address_data || null) != null) {
+                    if ((lng || null) == null) {
+                        lng = this.address_data.lng || 0;
+                    }
+                    if ((lat || null) == null) {
+                        lat = this.address_data.lat || 0;
+                    }
+                }
+                form_data['lng'] = lng;
+                form_data['lat'] = lat;
+                
+                // 验证提交表单
+                if (app.globalData.fields_check(form_data, validation)) {
+                    // 数据保存
+                    this.setData({
+                        form_submit_disabled_status: true
+                    });
+                    uni.showLoading({
+                        title: "处理中..."
+                    });
+                    uni.request({
+                        url: app.globalData.get_request_url("save", "useraddress"),
+                        method: "POST",
+                        data: form_data,
+                        dataType: "json",
+                        success: res => {
+                            uni.hideLoading();
+                            if (res.data.code == 0) {
+                                app.globalData.showToast(res.data.msg, "success");
+                                setTimeout(function() {
+                                    uni.navigateBack();
+                                }, 1000);
+                            } else {
+                                this.setData({
+                                    form_submit_disabled_status: false
+                                });
+                                if (app.globalData.is_login_check(res.data)) {
+                                    app.globalData.showToast(res.data.msg);
+                                } else {
+                                    app.globalData.showToast('提交失败，请重试！');
+                                }
+                            }
+                        },
+                        fail: () => {
+                            this.setData({
+                                form_submit_disabled_status: false
+                            });
+                            uni.hideLoading();
+                            app.globalData.showToast("服务器请求出错");
+                        }
+                    });
+                }
+            }
+        }
+    };
+</script>
+<style>
+    @import './user-address-save.css';
 </style>
\ No newline at end of file
diff --git a/pages/user-address/user-address.css b/pages/user-address/user-address.css
new file mode 100644
index 00000000..490e8655
--- /dev/null
+++ b/pages/user-address/user-address.css
@@ -0,0 +1,28 @@
+.page {
+    padding-bottom: 120rpx;
+}
+.address .item-icon {
+    width: 30rpx;
+    height: 35rpx !important;
+}
+.address-alias {
+    padding: 2rpx 10rpx;
+}
+.address .text {
+    line-height: 44rpx;
+    width: calc(100% - 40rpx);
+}
+.operation .default image {
+    width: 35rpx;
+    height: 35rpx !important;
+}
+.operation button {
+    padding: 0 35rpx;
+    display: inline-flex;
+}
+.operation .submit-items button:not(:first-child) {
+    margin-left: 20rpx;
+}
+.submit-list button {
+    width: calc(50% - 10rpx);
+}
\ No newline at end of file
diff --git a/pages/user-address/user-address.vue b/pages/user-address/user-address.vue
index d38b6d24..e01fbb0d 100644
--- a/pages/user-address/user-address.vue
+++ b/pages/user-address/user-address.vue
@@ -1,468 +1,398 @@
-<template>
-<view>
-<view class="page">
-  <view v-if="data_list.length > 0">
-    <view v-for="(item, index) in data_list" :key="index" class="item bg-white spacing-mb">
-      <view @tap="address_conent_event" :data-index="index">
-        <view class="base oh">
-          <text v-if="(item.alias || null) != null" class="address-alias">{{item.alias}}</text>
-          <text>{{item.name}}</text>
-          <text class="fr">{{item.tel}}</text>
+<template>
+    <view>
+        <view class="page padding-main">
+            <view v-if="data_list.length > 0">
+                <view v-for="(item, index) in data_list" :key="index" class="item padding-horizontal-main border-radius-main bg-white spacing-mb">
+                    <view @tap="address_conent_event" :data-index="index">
+                        <view class="oh padding-vertical-main">
+                            <text v-if="(item.alias || null) != null" class="address-alias br-main cr-main round margin-right-sm">{{item.alias}}</text>
+                            <text>{{item.name}}</text>
+                            <text class="fr">{{item.tel}}</text>
+                        </view>
+                        <view class="address oh padding-bottom-lg">
+                            <image class="item-icon fl margin-top-xs" :src="common_static_url+'map-icon.png'" mode="widthFix"></image>
+                            <view class="text fr">
+                                {{item.province_name || ''}}{{item.city_name || ''}}{{item.county_name || ''}}{{item.address || ''}}
+                            </view>
+                        </view>
+                    </view>
+                    <view class="operation br-t oh padding-vertical-main">
+                        <view class="default fl margin-top-sm" @tap="address_default_event" :data-value="item.id">
+                            <image class="va-m" :src="common_static_url+'select' + (is_default == item.id ? '-active' : '') + '-icon.png'" mode="widthFix"></image>
+                            <text class="va-m margin-left-sm">设为默认地址</text>
+                        </view>
+                        <view class="fr oh submit-items">
+                            <button v-if="(item.lng || 0) != 0 && (item.lat || 0) != 0" class="round bg-white cr-base br" type="default" size="mini" @tap="address_map_event" :data-index="index" hover-class="none">位置</button>
+                            <button class="round bg-white cr-green br-green" type="default" size="mini" @tap="address_edit_event" :data-index="index" hover-class="none">编辑</button>
+                            <button class="round bg-white cr-red br-red" type="default" size="mini" @tap="address_delete_event" :data-index="index" :data-value="item.id" hover-class="none">删除</button>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :prop-status="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :prop-status="data_bottom_line_status"></component-bottom-line>
         </view>
-        <view class="address oh">
-          <image class="item-icon fl" src="/static/images/user-address.png" mode="widthFix"></image>
-          <view class="text fr">{{item.province_name || ''}}{{item.city_name || ''}}{{item.county_name || ''}}{{item.address || ''}}</view>
-        </view>
-      </view>
-      <view class="operation br-t oh">
-        <view class="default fl" @tap="address_default_event" :data-value="item.id">
-          <image v-if="is_default == item.id" class="item-icon" src="/static/images/default-select-active-icon.png" mode="widthFix"></image>
-          <image v-else class="item-icon" src="/static/images/default-select-icon.png" mode="widthFix"></image>
-          <text>设为默认地址</text>
-        </view>
-        <view class="fr oh submit-items">
-          <button v-if="(item.lng || null) != null && (item.lat || null) != null && item.lng != 0 && item.lat != 0" class="cr-base br" type="default" size="mini" @tap="address_map_event" :data-index="index" hover-class="none">位置</button>
-          <button class="cr-base br" type="default" size="mini" @tap="address_edit_event" :data-index="index" hover-class="none">编辑</button>
-          <button class="cr-base br" type="default" size="mini" @tap="address_delete_event" :data-index="index" :data-value="item.id" hover-class="none">删除</button>
-        </view>
-      </view>
-    </view>
-  </view>
 
-  <view v-if="data_list.length == 0">
-    <!--<import src="/pages/common/nodata.wxml"></import>-->
-    <block data-type="template" data-is="nodata" data-attr="status: data_list_loding_status">
-  <!-- 1 加载中 -->
-  <view v-if="0 == 1" class="no-data-loding tc">
-    <text>加载中...</text>
-  </view>
+        <!-- 底部操作 -->
+        <view class="submit-list submit-fixed padding-main">
+            <button class="submit-bottom bg-main cr-white round dis-inline-block tc fl" type="default" hover-class="none" @tap="address_add_event">添加新地址</button>
+            <button class="submit-bottom bg-green cr-white round dis-inline-block tc fr" type="default" hover-class="none" @tap="choose_system_address_event">导入微信地址</button>
+        </view>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import componentNoData from "../../components/no-data/no-data";
+    import componentBottomLine from "../../components/bottom-line/bottom-line";
 
-  <!-- 2 处理错误 -->
-  <view v-else-if="0 == 2" class="no-data-box tc">
-    <image src="/static/images/error.png" mode="widthFix"></image>
-    <view class="no-data-tips">{{msg || '处理错误'}}</view>
-  </view>
-
-  <!-- 0 默认没有数据 -->
-  <view v-else-if="0 == 0" class="no-data-box tc">
-    <image src="/static/images/empty.png" mode="widthFix"></image>
-    <view class="no-data-tips">{{msg || '没有相关数据'}}</view>
-  </view>
-</block>
-  </view>
-    
-  <!--<import src="/pages/common/bottom_line.wxml"></import>-->
-  <block data-type="template" data-is="bottom_line" data-attr="status: data_bottom_line_status">
-    <view v-if="(status || false)" class="data-bottom-line">
-        <view class="left fl"></view>
-        <view class="msg fl">我是有底线的</view>
-        <view class="right fr"></view>
-    </view>
-</block>
-
-  <view class="submit-list">
-    <navigator url="/pages/user-address-save/user-address-save" open-type="navigate" hover-class="none">
-      <button class="submit-fixed submit-bottom" type="default" hover-class="none">添加新地址</button>
-    </navigator>
-    <button class="submit-fixed submit-bottom import-system-address-submit" type="default" hover-class="none" @tap="choose_system_address_event">导入微信地址</button>
-  </view>
-</view>
-</view>
-</template>
-
-<script>
-const app = getApp();
-
-export default {
-  data() {
-    return {
-      data_list_loding_status: 1,
-      data_bottom_line_status: false,
-      data_list: [],
-      params: null,
-      is_default: 0
-    };
-  },
-
-  components: {},
-  props: {},
-
-  onLoad(params) {
-    this.setData({
-      params: params
-    });
-  },
-
-  onShow() {
-    uni.setNavigationBarTitle({
-      title: app.globalData.data.common_pages_title.user_address
-    });
-    this.init();
-  },
-
-  // 下拉刷新
-  onPullDownRefresh() {
-    this.get_data_list();
-  },
-
-  methods: {
-    // 初始化
-    init() {
-      var user = app.globalData.get_user_info(this, "init");
-
-      if (user != false) {
-        // 用户未绑定用户则转到登录页面
-        if (app.globalData.user_is_need_login(user)) {
-          uni.redirectTo({
-            url: "/pages/login/login?event_callback=init"
-          });
-          return false;
-        } else {
-          // 获取数据
-          this.get_data_list();
-        }
-      } else {
-        this.setData({
-          data_list_loding_status: 0,
-          data_bottom_line_status: false
-        });
-      }
-    },
-
-    // 获取数据列表
-    get_data_list() {
-      // 加载loding
-      uni.showLoading({
-        title: "加载中..."
-      });
-      this.setData({
-        data_list_loding_status: 1
-      }); // 获取数据
-
-      uni.request({
-        url: app.globalData.get_request_url("index", "useraddress"),
-        method: "POST",
-        data: {},
-        dataType: "json",
-        success: res => {
-          uni.hideLoading();
-          uni.stopPullDownRefresh();
-
-          if (res.data.code == 0) {
-            var data = res.data.data;
-
-            if (data.data.length > 0) {
-              // 获取当前默认地址
-              var is_default = 0;
-
-              for (var i in data.data) {
-                if (data.data[i]['is_default'] == 1) {
-                  is_default = data.data[i]['id'];
+    var common_static_url = app.globalData.get_static_url('common');
+    export default {
+        data() {
+            return {
+                common_static_url: common_static_url,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_list: [],
+                params: null,
+                is_default: 0
+            };
+        },
+
+        components: {
+            componentNoData,
+            componentBottomLine
+        },
+        props: {},
+
+        onLoad(params) {
+            this.setData({
+                params: params
+            });
+        },
+
+        onShow() {
+            this.init();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data_list();
+        },
+
+        methods: {
+            // 初始化
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    // 用户未绑定用户则转到登录页面
+                    if (app.globalData.user_is_need_login(user)) {
+                        uni.redirectTo({
+                            url: "/pages/login/login?event_callback=init"
+                        });
+                        return false;
+                    } else {
+                        // 获取数据
+                        this.get_data_list();
+                    }
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false
+                    });
+                }
+            },
+
+            // 获取数据列表
+            get_data_list() {
+                // 加载loding
+                uni.showLoading({
+                    title: "加载中..."
+                });
+                this.setData({
+                    data_list_loding_status: 1
+                });
+                
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("index", "useraddress"),
+                    method: "POST",
+                    data: {},
+                    dataType: "json",
+                    success: res => {
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            if (data.data.length > 0) {
+                                // 获取当前默认地址
+                                var is_default = 0;
+
+                                for (var i in data.data) {
+                                    if (data.data[i]['is_default'] == 1) {
+                                        is_default = data.data[i]['id'];
+                                    }
+                                }
+                                
+                                // 设置数据
+                                this.setData({
+                                    data_list: data.data,
+                                    is_default: is_default,
+                                    data_list_loding_status: 3,
+                                    data_bottom_line_status: true
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2
+                        });
+                        app.globalData.showToast("服务器请求出错");
+                    }
+                });
+            },
+
+            // 删除地址
+            address_delete_event(e) {
+                var index = e.currentTarget.dataset.index;
+                var value = e.currentTarget.dataset.value || null;
+                if (value == null) {
+                    app.globalData.showToast("地址ID有误");
+                    return false;
+                }
+
+                var self = this;
+                uni.showModal({
+                    title: "温馨提示",
+                    content: "删除后不可恢复，确定继续吗?",
+                    confirmText: "确认",
+                    cancelText: "不了",
+                    success: result => {
+                        if (result.confirm) {
+                            // 加载loding
+                            uni.showLoading({
+                                title: "处理中..."
+                            });
+                            
+                            // 获取数据
+                            uni.request({
+                                url: app.globalData.get_request_url("delete", "useraddress"),
+                                method: "POST",
+                                data: {
+                                    id: value
+                                },
+                                dataType: "json",
+                                success: res => {
+                                    uni.hideLoading();
+                                    if (res.data.code == 0) {
+                                        var temp_data = self.data_list;
+                                        temp_data.splice(index, 1);
+                                        self.setData({
+                                            data_list: temp_data,
+                                            data_list_loding_status: temp_data.length == 0 ? 0 : 3,
+                                            data_bottom_line_status: temp_data.length == 0 ? false : true
+                                        });
+                                        app.globalData.showToast(res.data.msg, "success");
+                                        
+                                        // 当前删除是否存在缓存中，存在则删除
+                                        var cache_address = uni.getStorageSync(app.globalData.data.cache_buy_user_address_select_key);
+                                        if ((cache_address.data || null) != null) {
+                                            if (cache_address.data.id == value) {
+                                                // 删除地址缓存
+                                                uni.removeStorageSync(app.globalData.data.cache_buy_user_address_select_key);
+                                            }
+                                        }
+                                    } else {
+                                        if (app.globalData.is_login_check(res.data)) {
+                                            app.globalData.showToast(res.data.msg);
+                                        } else {
+                                            app.globalData.showToast('提交失败，请重试！');
+                                        }
+                                    }
+                                },
+                                fail: () => {
+                                    uni.hideLoading();
+                                    app.globalData.showToast("服务器请求出错");
+                                }
+                            });
+                        }
+                    }
+                });
+            },
+
+            // 默认地址设置
+            address_default_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                if (value == null) {
+                    app.globalData.showToast("地址ID有误");
+                    return false;
+                }
+                var self = this;
+                if (value == self.is_default) {
+                    app.globalData.showToast("设置成功", "success");
+                    return false;
                 }
-              } // 设置数据
-
-
-              this.setData({
-                data_list: data.data,
-                is_default: is_default,
-                data_list_loding_status: 3,
-                data_bottom_line_status: true
-              });
-            } else {
-              this.setData({
-                data_list_loding_status: 0
-              });
-            }
-          } else {
-            this.setData({
-              data_list_loding_status: 0
-            });
-
-            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
-              app.globalData.showToast(res.data.msg);
-            }
-          }
-        },
-        fail: () => {
-          uni.hideLoading();
-          uni.stopPullDownRefresh();
-          this.setData({
-            data_list_loding_status: 2
-          });
-          app.globalData.showToast("服务器请求出错");
-        }
-      });
-    },
-
-    // 删除地址
-    address_delete_event(e) {
-      var index = e.currentTarget.dataset.index;
-      var value = e.currentTarget.dataset.value || null;
-
-      if (value == null) {
-        app.globalData.showToast("地址ID有误");
-        return false;
-      }
-
-      var self = this;
-      uni.showModal({
-        title: "温馨提示",
-        content: "删除后不可恢复，确定继续吗?",
-        confirmText: "确认",
-        cancelText: "不了",
-        success: result => {
-          if (result.confirm) {
-            // 加载loding
-            uni.showLoading({
-              title: "处理中..."
-            }); // 获取数据
-
-            uni.request({
-              url: app.globalData.get_request_url("delete", "useraddress"),
-              method: "POST",
-              data: {
-                id: value
-              },
-              dataType: "json",
-              success: res => {
-                uni.hideLoading();
-
-                if (res.data.code == 0) {
-                  var temp_data = self.data_list;
-                  temp_data.splice(index, 1);
-                  self.setData({
-                    data_list: temp_data,
-                    data_list_loding_status: temp_data.length == 0 ? 0 : 3,
-                    data_bottom_line_status: temp_data.length == 0 ? false : true
-                  });
-                  app.globalData.showToast(res.data.msg, "success"); // 当前删除是否存在缓存中，存在则删除
-
-                  var cache_address = uni.getStorageSync(app.globalData.data.cache_buy_user_address_select_key);
-
-                  if ((cache_address.data || null) != null) {
-                    if (cache_address.data.id == value) {
-                      // 删除地址缓存
-                      uni.removeStorageSync(app.globalData.data.cache_buy_user_address_select_key);
-                    }
-                  }
-                } else {
-                  if (app.globalData.is_login_check(res.data)) {
-                    app.globalData.showToast(res.data.msg);
-                  } else {
-                    app.globalData.showToast('提交失败，请重试！');
-                  }
+                
+                // 加载loding
+                uni.showLoading({
+                    title: "处理中..."
+                });
+                
+                // 获取数据
+                uni.request({
+                    url: app.globalData.get_request_url("setdefault", "useraddress"),
+                    method: "POST",
+                    data: {
+                        id: value
+                    },
+                    dataType: "json",
+                    success: res => {
+                        uni.hideLoading();
+                        if (res.data.code == 0) {
+                            self.setData({
+                                is_default: value
+                            });
+                            app.globalData.showToast(res.data.msg, "success");
+                        } else {
+                            if (app.globalData.is_login_check(res.data)) {
+                                app.globalData.showToast(res.data.msg);
+                            } else {
+                                app.globalData.showToast('提交失败，请重试！');
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        app.globalData.showToast("服务器请求出错");
+                    }
+                });
+            },
+
+            // 地址内容事件
+            address_conent_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var is_back = this.params.is_back || 0;
+                if (is_back == 1) {
+                    uni.setStorage({
+                        key: app.globalData.data.cache_buy_user_address_select_key,
+                        data: this.data_list[index]
+                    });
+                    uni.navigateBack();
+                }
+            },
+
+            // 获取系统地址事件
+            choose_system_address_event(e) {
+                var self = this;
+                uni.authorize({
+                    scope: 'scope.address',
+                    success: function(res) {
+                        uni.chooseAddress({
+                            success(res) {
+                                var data = {
+                                    "name": res.userName || '',
+                                    "tel": res.telNumber || '',
+                                    "province": res.provinceName || '',
+                                    "city": res.cityName || '',
+                                    "county": res.countyName || '',
+                                    "address": res.detailInfo || ''
+                                };
+                                
+                                // 加载loding
+                                uni.showLoading({
+                                    title: "处理中..."
+                                });
+                                
+                                // 获取数据
+                                uni.request({
+                                    url: app.globalData.get_request_url("outsystemadd", "useraddress"),
+                                    method: "POST",
+                                    data: data,
+                                    dataType: "json",
+                                    success: res => {
+                                        uni.hideLoading();
+                                        if (res.data.code == 0) {
+                                            self.get_data_list();
+                                        } else {
+                                            if (app.globalData.is_login_check(res.data)) {
+                                                app.globalData.showToast(res.data.msg);
+                                            } else {
+                                                app.globalData.showToast('提交失败，请重试！');
+                                            }
+                                        }
+                                    },
+                                    fail: () => {
+                                        uni.hideLoading();
+                                        app.globalData.showToast("服务器请求出错");
+                                    }
+                                });
+                            }
+                        });
+                    },
+                    fail: function(res) {
+                        app.globalData.showToast('取消选择');
+                    }
+                });
+            },
+            
+            // 添加地址事件
+            address_add_event(e) {
+                uni.navigateTo({
+                    url: '/pages/user-address-save/user-address-save'
+                });
+            },
+
+            // 地址编辑
+            address_edit_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var data = this.data_list[index] || null;
+                if (data == null) {
+                    app.globalData.showToast("地址有误");
+                    return false;
                 }
-              },
-              fail: () => {
-                uni.hideLoading();
-                app.globalData.showToast("服务器请求出错");
-              }
-            });
-          }
-        }
-      });
-    },
-
-    // 默认地址设置
-    address_default_event(e) {
-      var value = e.currentTarget.dataset.value || null;
-
-      if (value == null) {
-        app.globalData.showToast("地址ID有误");
-        return false;
-      }
-
-      var self = this;
-
-      if (value == self.is_default) {
-        app.globalData.showToast("设置成功", "success");
-        return false;
-      } // 加载loding
-
-
-      uni.showLoading({
-        title: "处理中..."
-      }); // 获取数据
-
-      uni.request({
-        url: app.globalData.get_request_url("setdefault", "useraddress"),
-        method: "POST",
-        data: {
-          id: value
-        },
-        dataType: "json",
-        success: res => {
-          uni.hideLoading();
-
-          if (res.data.code == 0) {
-            self.setData({
-              is_default: value
-            });
-            app.globalData.showToast(res.data.msg, "success");
-          } else {
-            if (app.globalData.is_login_check(res.data)) {
-              app.globalData.showToast(res.data.msg);
-            } else {
-              app.globalData.showToast('提交失败，请重试！');
-            }
-          }
-        },
-        fail: () => {
-          uni.hideLoading();
-          app.globalData.showToast("服务器请求出错");
-        }
-      });
-    },
-
-    // 地址内容事件
-    address_conent_event(e) {
-      var index = e.currentTarget.dataset.index || 0;
-      var is_back = this.params.is_back || 0;
-
-      if (is_back == 1) {
-        uni.setStorage({
-          key: app.globalData.data.cache_buy_user_address_select_key,
-          data: this.data_list[index]
-        });
-        uni.navigateBack();
-      }
-    },
-
-    // 获取系统地址
-    choose_system_address_event(e) {
-      var self = this;
-      uni.authorize({
-        scope: 'scope.address',
-        success: function (res) {
-          uni.chooseAddress({
-            success(res) {
-              var data = {
-                "name": res.userName || '',
-                "tel": res.telNumber || '',
-                "province": res.provinceName || '',
-                "city": res.cityName || '',
-                "county": res.countyName || '',
-                "address": res.detailInfo || ''
-              }; // 加载loding
-
-              uni.showLoading({
-                title: "处理中..."
-              }); // 获取数据
-
-              uni.request({
-                url: app.globalData.get_request_url("outsystemadd", "useraddress"),
-                method: "POST",
-                data: data,
-                dataType: "json",
-                headers: {
-                  'content-type': 'application/x-www-form-urlencoded'
-                },
-                success: res => {
-                  uni.hideLoading();
-
-                  if (res.data.code == 0) {
-                    self.get_data_list();
-                  } else {
-                    if (app.globalData.is_login_check(res.data)) {
-                      app.globalData.showToast(res.data.msg);
-                    } else {
-                      app.globalData.showToast('提交失败，请重试！');
-                    }
-                  }
-                },
-                fail: () => {
-                  uni.hideLoading();
-                  app.globalData.showToast("服务器请求出错");
+                
+                // 进入编辑页面
+                uni.navigateTo({
+                    url: '/pages/user-address-save/user-address-save?id=' + data.id
+                });
+            },
+
+            // 地图查看
+            address_map_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var data = this.data_list[index] || null;
+                if (data == null) {
+                    app.globalData.showToast("地址有误");
+                    return false;
                 }
-              });
-            }
 
-          });
-        },
-        fail: function (res) {
-          app.globalData.showToast('取消选择');
-        }
-      });
-    },
-
-    // 地址编辑
-    address_edit_event(e) {
-      var index = e.currentTarget.dataset.index || 0;
-      var data = this.data_list[index] || null;
-
-      if (data == null) {
-        app.globalData.showToast("地址有误");
-        return false;
-      } // 进入编辑页面
-
-
-      uni.navigateTo({
-        url: '/pages/user-address-save/user-address-save?id=' + data.id
-      });
-    },
-
-    // 地图查看
-    address_map_event(e) {
-      var index = e.currentTarget.dataset.index || 0;
-      var data = this.data_list[index] || null;
-
-      if (data == null) {
-        app.globalData.showToast("地址有误");
-        return false;
-      } // 打开地图
-
-
-      var name = data.alias || data.name || '';
-      var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || '');
-      app.globalData.open_location(data.lng, data.lat, name, address);
-    }
-
-  }
-};
-</script>
-<style>
-.item {
-    padding: 10rpx 10rpx 0 10rpx;
-}
-.base, .address, .operation {
-    padding: 20rpx 0;
-}
-.address .item-icon {
-    width: 30rpx;
-    height: 35rpx !important;
-}
-.address-alias {
-  border: 1px solid #d2364c;
-  color: #d2364c;
-  padding: 2rpx 10rpx;
-  border-radius: 6rpx;
-  margin-right: 10rpx;
-}
-.address .text {
-    line-height: 44rpx;
-    width: calc(100% - 40rpx);
-}
-.operation .default {
-    margin-top: 5rpx;
-}
-.operation .default .item-icon {
-    width: 50rpx;
-    height: 50rpx !important;
-    margin-right: 10rpx;
-    vertical-align: middle;
-}
-.operation .submit-items button:not(:last-child) {
-    margin-right: 20rpx;
-}
-.page {
-    padding-bottom: 85rpx;
-}
-.submit-list button {
-    width: 50%;
-}
-.submit-list .import-system-address-submit {
-    background: #07c160 !important;
-    right: 0;
-    left: auto;
-}
+                // 打开地图
+                var name = data.alias || data.name || '';
+                var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || '');
+                app.globalData.open_location(data.lng, data.lat, name, address);
+            }
+        }
+    };
+</script>
+<style>
+    @import './user-address.css';
 </style>
\ No newline at end of file
diff --git a/pages/user-order-comments/user-order-comments.vue b/pages/user-order-comments/user-order-comments.vue
index 2528f3bb..bccff0f5 100644
--- a/pages/user-order-comments/user-order-comments.vue
+++ b/pages/user-order-comments/user-order-comments.vue
@@ -37,8 +37,8 @@
                         <text class="fr cr-gray margin-top-lg">{{anonymous_msg_list[anonymous_value]}}</text>
                     </view>
 
-                    <view class="form-gorup">
-                        <button form-type="submit" class="bg-main cr-white radius submit-bottom" type="default" hover-class="none" :disabled="form_button_disabled">提交</button>
+                    <view class="form-gorup form-gorup-submit">
+                        <button form-type="submit" class="bg-main cr-white round submit-bottom" type="default" hover-class="none" :disabled="form_button_disabled">提交</button>
                     </view>
                 </form>
             </view>
diff --git a/pages/user-order/user-order.vue b/pages/user-order/user-order.vue
index 76eb6d4c..5b4c4e9d 100644
--- a/pages/user-order/user-order.vue
+++ b/pages/user-order/user-order.vue
@@ -98,7 +98,8 @@
         data() {
             return {
                 common_static_url: common_static_url,
-                data_list: [],
+                data_list: [],
+                data_total: 0,
                 data_page_total: 0,
                 data_page: 1,
                 data_list_loding_status: 1,
@@ -121,8 +122,7 @@
                 nav_status_index: 0,
                 order_select_ids: [],
                 // 基础配置
-                home_is_enable_order_bulk_pay: 0,
-                data_total: ""
+                home_is_enable_order_bulk_pay: 0
             };
         },
 
diff --git a/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue b/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue
index b5cb4500..72bb0023 100644
--- a/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue
+++ b/pages/user-orderaftersale-detail/user-orderaftersale-detail.vue
@@ -135,8 +135,8 @@
                             <image v-if="form_images_list.length < 3" class="upload-icon" src="/static/images/default-upload-icon.png" mode="aspectFill" @tap="file_upload_event"></image>
                         </view>
                     </view>
-                    <view class="form-gorup">
-                        <button class="bg-main cr-white radius submit-bottom" type="default" @tap="form_submit_event" hover-class="none" :disabled="form_button_disabled">提交</button>
+                    <view class="form-gorup form-gorup-submit">
+                        <button class="bg-main cr-white round submit-bottom" type="default" @tap="form_submit_event" hover-class="none" :disabled="form_button_disabled">提交</button>
                     </view>
                 </view>
             </view>
@@ -169,8 +169,8 @@
                             <view class="form-gorup-title">快递单号<text class="form-group-tips-must">必填</text></view>
                             <input type="text" @input="form_express_number_event" placeholder-class="cr-grey" class="cr-base" placeholder="请输入快递单号" :value="form_express_number">
                         </view>
-                        <view class="form-gorup">
-                            <button class="bg-main cr-white radius submit-bottom" type="default" @tap="form_delivery_submit_event" hover-class="none" :disabled="form_button_disabled">提交</button>
+                        <view class="form-gorup form-gorup-submit">
+                            <button class="bg-main cr-white round submit-bottom" type="default" @tap="form_delivery_submit_event" hover-class="none" :disabled="form_button_disabled">提交</button>
                         </view>
                     </view>
                 </view>