From bbbfad2f05fbd60a540eb66b362e92c8e85c807a Mon Sep 17 00:00:00 2001
From: xindan <2499232802@qq.com>
Date: Wed, 13 Oct 2021 23:34:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E4=BB=8B=E7=BB=8D+=E8=87=AA?=
 =?UTF-8?q?=E6=8F=90=E7=82=B9=E7=94=B3=E8=AF=B7=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |    3 -
 common/css/page.css                           |    8 +
 pages.json                                    |    7 +-
 .../extraction-apply/extraction-apply.css     |   26 +
 .../extraction-apply/extraction-apply.vue     | 1261 ++++++++---------
 .../distribution/extraction/extraction.css    |  117 ++
 .../distribution/extraction/extraction.vue    |  596 +++-----
 .../distribution/introduce/introduce.css      |    4 +
 .../distribution/introduce/introduce.vue      |  360 ++---
 pages/plugins/distribution/user/user.css      |    9 -
 pages/plugins/distribution/user/user.vue      |   18 +-
 pages/user-address-save/user-address-save.vue |   57 +-
 12 files changed, 1161 insertions(+), 1305 deletions(-)
 create mode 100644 pages/plugins/distribution/extraction-apply/extraction-apply.css
 create mode 100644 pages/plugins/distribution/extraction/extraction.css
 create mode 100644 pages/plugins/distribution/introduce/introduce.css

diff --git a/App.vue b/App.vue
index d6e11c0f..f1774984 100644
--- a/App.vue
+++ b/App.vue
@@ -940,12 +940,10 @@
             // 剪贴板
             text_copy_event(e) {
                 var value = e.currentTarget.dataset.value || null;
-
                 if (value != null) {
                     var self = this;
                     uni.setClipboardData({
                         data: value,
-
                         success(res) {
                             uni.getClipboardData({
                                 success(res) {
@@ -954,7 +952,6 @@
 
                             });
                         }
-
                     });
                 } else {
                     this.showToast('复制内容为空');
diff --git a/common/css/page.css b/common/css/page.css
index d9d27b42..f7ecb48c 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -145,6 +145,14 @@
     font-size: 26rpx;
     border-radius: 20rpx;
 }
+.notice-content-blue {
+    background: #def2fd;
+    border: 1px solid #cfeeff;
+    color: #1490d2;
+    padding: 10rpx 20rpx;
+    font-size: 26rpx;
+    border-radius: 22rpx;
+}
 
 /**
  * 箭头符号
diff --git a/pages.json b/pages.json
index 5954925c..e5f919c6 100644
--- a/pages.json
+++ b/pages.json
@@ -406,17 +406,14 @@
 		{
 			"path": "pages/plugins/distribution/extraction-switch/extraction-switch",
 			"style": {
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": true,
+                "navigationBarTitleText": "取货点切换"
 			}
 		},
 		{
 			"path": "pages/plugins/distribution/introduce/introduce",
 			"style": {
 				"enablePullDownRefresh": true,
-				"navigationBarBackgroundColor": "#ff6a80",
-				"backgroundColorTop": "#ff6a80",
-				"backgroundColorBottom": "#f5f5f5",
-				"backgroundTextStyle": "light",
 				"navigationBarTitleText": "等级介绍"
 			}
 		},
diff --git a/pages/plugins/distribution/extraction-apply/extraction-apply.css b/pages/plugins/distribution/extraction-apply/extraction-apply.css
new file mode 100644
index 00000000..15769712
--- /dev/null
+++ b/pages/plugins/distribution/extraction-apply/extraction-apply.css
@@ -0,0 +1,26 @@
+/*
+* 表单
+*/
+.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;
+}
\ No newline at end of file
diff --git a/pages/plugins/distribution/extraction-apply/extraction-apply.vue b/pages/plugins/distribution/extraction-apply/extraction-apply.vue
index 14ecbf82..8efd0124 100644
--- a/pages/plugins/distribution/extraction-apply/extraction-apply.vue
+++ b/pages/plugins/distribution/extraction-apply/extraction-apply.vue
@@ -1,654 +1,609 @@
-<template>
-<view>
-<form @submit="form_submit" class="form-container oh">
-  <view class="form-gorup bg-white form-container-upload oh">
-    <view class="form-gorup-title">logo图片<text class="form-group-tips">选传，建议300x300px</text></view>
-    <view class="form-upload-data fl">
-      <block v-if="(extraction_data.logo || null) != null">
-        <view class="item fl">
-          <text class="delete-icon" @tap="upload_delete_event">x</text>
-          <image :src="extraction_data.logo" @tap="upload_show_event" mode="aspectFill"></image>
-        </view>
-      </block>
-    </view>
-    <image class="upload-icon" src="/static/images/default-upload-icon.png" mode="aspectFill" @tap="file_upload_event"></image>
-  </view>
-
-  <view class="form-gorup bg-white">
-    <view class="form-gorup-title">别名<text class="form-group-tips">选填</text></view>
-    <input type="text" name="alias" :value="extraction_data.alias || ''" 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="extraction_data.name || ''" 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="extraction_data.tel || ''" 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="extraction_data.address || ''" placeholder-class="cr-grey" class="cr-base" placeholder="详细地址格式 1~80 个字符之间">
-  </view>
-
-  <view 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 || null) != null && (user_location.name || null) != null) ? user_location.name+' ' : ''}}{{user_location.address || ''}}</view>
-    </view>
-  </view>
-
-  <view class="form-gorup">
-    <view v-if="(extraction_data || null) != null && (extraction_data.status || 0) == 1" class="tips spacing-mb">
-      注意：编辑信息将重新审核后方可生效
-    </view>
-    <button class="submit-bottom" type="default" form-type="submit" hover-class="none" :disabled="form_submit_disabled_status">提交</button>
-  </view>
-</form>
-</view>
-</template>
-
-<script>
-const app = getApp();
-
-export default {
-  data() {
-    return {
-      params: null,
-      data_list_loding_status: 1,
-      data_list_loding_msg: '',
-      extraction_data: null,
-      province_list: [],
-      city_list: [],
-      county_list: [],
-      province_id: null,
-      city_id: null,
-      county_id: null,
-      editor_path_type: '',
-      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
-    };
-  },
-
-  components: {},
-  props: {},
-
-  onLoad(params) {
-    this.setData({
-      params: params
-    });
-  },
-
-  onReady: function () {
-    // 清除位置缓存信息
-    uni.removeStorage({
-      key: this.user_location_cache_key
-    });
-    this.init();
-  },
-
-  onShow() {
-    this.user_location_init();
-  },
-
-  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"
-          });
-          this.setData({
-            data_list_loding_status: 2,
-            data_list_loding_msg: '请先绑定手机号码'
-          });
-          return false;
-        } else {
-          this.get_province_list();
-          this.applyinfo_init();
-        }
-      } else {
-        this.setData({
-          data_list_loding_status: 2,
-          data_list_loding_msg: '请先授权用户信息'
-        });
-      }
-    },
-
-    // 自提点信息
-    applyinfo_init() {
-      var self = this;
-      uni.request({
-        url: app.globalData.get_request_url("applyinfo", "extraction", "distribution"),
-        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;
-            var extraction_data = data.extraction_data || null;
-            self.setData({
-              extraction_data: extraction_data || null,
-              editor_path_type: data.editor_path_type || ''
-            }); // 数据设置
-
-            if (extraction_data != null) {
-              self.setData({
-                province_id: extraction_data.province || null,
-                city_id: extraction_data.city || null,
-                county_id: extraction_data.county || null
-              }); // 地理位置
-
-              var lng = extraction_data.lng || null;
-              var lat = extraction_data.lat || null;
-
-              if (lng != null && lat != null && lng != 0 && lat != 0) {
-                self.setData({
-                  user_location: {
-                    lng: lng,
-                    lat: lat,
-                    address: extraction_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
-            });
-          } 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
-      });
-    },
-
-    // 数据提交
-    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: "请填写详细地址"
-      }, {
-        fields: "lng",
-        msg: "请选择地理位置"
-      }, {
-        fields: "lat",
-        msg: "请选择地理位置"
-      }]; // logo
-
-      form_data['logo'] = (this.extraction_data || null) != null ? this.extraction_data.logo || '' : ''; // 地区
-
-      form_data["province"] = self.province_id;
-      form_data["city"] = self.city_id;
-      form_data["county"] = self.county_id; // 地理位置
-
-      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.extraction_data || null) != null) {
-        if ((lng || null) == null) {
-          lng = self.extraction_data.lng || 0;
-        }
-
-        if ((lat || null) == null) {
-          lat = self.extraction_data.lat || 0;
-        }
-      }
-
-      form_data["lng"] = lng;
-      form_data["lat"] = lat; // 验证提交表单
-
-      if (app.globalData.fields_check(form_data, validation)) {
-        if ((self.extraction_data || null) != null && (self.extraction_data.status || 0) == 1) {
-          uni.showModal({
-            title: '温馨提示',
-            content: '数据需重新审核后方可生效',
-            confirmText: '确认',
-            cancelText: '暂不',
-            success: result => {
-              if (result.confirm) {
-                self.request_data_save(form_data);
-              }
-            }
-          });
-        } else {
-          self.request_data_save(form_data);
-        }
-      }
-    },
-
-    // 数据保存
-    request_data_save(data) {
-      var self = this;
-      self.setData({
-        form_submit_disabled_status: true
-      });
-      uni.showLoading({
-        title: "处理中..."
-      });
-      uni.request({
-        url: app.globalData.get_request_url("applysave", "extraction", "distribution"),
-        method: "POST",
-        data: 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("服务器请求出错");
-        }
-      });
-    },
-
-    // 上传图片预览
-    upload_show_event(e) {
-      uni.previewImage({
-        current: this.extraction_data.logo,
-        urls: [this.extraction_data.logo]
-      });
-    },
-
-    // 图片删除
-    upload_delete_event(e) {
-      var self = this;
-      uni.showModal({
-        title: '温馨提示',
-        content: '删除后不可恢复、继续吗？',
-
-        success(res) {
-          if (res.confirm) {
-            var temp_data = self.extraction_data || {};
-            temp_data['logo'] = '';
-            self.setData({
-              extraction_data: temp_data
-            });
-          }
-        }
-
-      });
-    },
-
-    // 文件上传
-    file_upload_event(e) {
-      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);
-        }
-
-      });
-    },
-
-    // 采用递归的方式上传多张
-    upload_one_by_one(img_paths, success, fail, count, length) {
-      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_data = self.extraction_data || {};
-              temp_data['logo'] = data.data.url;
-              self.setData({
-                extraction_data: temp_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);
-          }
-        }
-      });
-    }
-
-  }
-};
-</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;
-}
-
-/*
- * 表单
- */
-.submit-bottom {
-  background-color: #ff6a80 !important;
-  color: #fff !important;
-}
+<template>
+    <view class="page">
+        <form @submit="form_submit" class="form-container">
+            <view class="padding-main oh">
+                <view class="form-gorup bg-white form-container-upload oh">
+                    <view class="form-gorup-title">logo图片<text class="form-group-tips">选传，建议300x300px</text></view>
+                    <view class="oh">
+                        <view class="form-upload-data fl">
+                            <block v-if="(extraction_data.logo || null) != null">
+                                <view class="item fl">
+                                    <text class="delete-icon" @tap="upload_delete_event">x</text>
+                                    <image :src="extraction_data.logo" @tap="upload_show_event" mode="aspectFill"></image>
+                                </view>
+                            </block>
+                        </view>
+                        <image class="upload-icon" :src="common_static_url+'upload-icon.png'" mode="aspectFill" @tap="file_upload_event"></image>
+                    </view>
+                </view>
+
+                <view class="form-gorup bg-white">
+                    <view class="form-gorup-title">别名<text class="form-group-tips">选填</text></view>
+                    <input type="text" name="alias" :value="extraction_data.alias || ''" 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="extraction_data.name || ''" 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="extraction_data.tel || ''" 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="extraction_data.address || ''" placeholder-class="cr-grey" class="cr-base" placeholder="详细地址格式 1~80 个字符之间">
+                </view>
+
+                <view 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 v-if="(extraction_data || null) != null && (extraction_data.status || 0) == 1" class="notice-content-blue spacing-mb">
+                    注意：编辑信息将重新审核后方可生效
+                </view>
+                <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();
+
+    var common_static_url = app.globalData.get_static_url('common');
+    export default {
+        data() {
+            return {
+                common_static_url: common_static_url,
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                extraction_data: null,
+                province_list: [],
+                city_list: [],
+                county_list: [],
+                province_id: null,
+                city_id: null,
+                county_id: null,
+                editor_path_type: '',
+                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
+            };
+        },
+
+        components: {},
+        props: {},
+
+        onLoad(params) {
+            this.setData({
+                params: params
+            });
+        },
+
+        onReady: function() {
+            // 清除位置缓存信息
+            uni.removeStorage({
+                key: this.user_location_cache_key
+            });
+            this.init();
+        },
+
+        onShow() {
+            this.user_location_init();
+        },
+
+        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"
+                        });
+                        this.setData({
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: '请先绑定手机号码'
+                        });
+                        return false;
+                    } else {
+                        this.get_province_list();
+                        this.applyinfo_init();
+                    }
+                } else {
+                    this.setData({
+                        data_list_loding_status: 2,
+                        data_list_loding_msg: '请先授权用户信息'
+                    });
+                }
+            },
+
+            // 自提点信息
+            applyinfo_init() {
+                var self = this;
+                uni.request({
+                    url: app.globalData.get_request_url("applyinfo", "extraction", "distribution"),
+                    method: "POST",
+                    data: {},
+                    dataType: "json",
+                    success: res => {
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var extraction_data = data.extraction_data || null;
+                            self.setData({
+                                extraction_data: extraction_data || null,
+                                editor_path_type: data.editor_path_type || ''
+                            });
+                            
+                            // 数据设置
+                            if (extraction_data != null) {
+                                self.setData({
+                                    province_id: extraction_data.province || null,
+                                    city_id: extraction_data.city || null,
+                                    county_id: extraction_data.county || null
+                                });
+                                
+                                // 地理位置
+                                var lng = extraction_data.lng || 0;
+                                var lat = extraction_data.lat || 0;
+                                if (lng != 0 && lat != 0) {
+                                    self.setData({
+                                        user_location: {
+                                            lng: lng,
+                                            lat: lat,
+                                            address: extraction_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
+                            });
+                        } 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
+                });
+            },
+
+            // 数据提交
+            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: "请填写详细地址" },
+                    { fields: "lng", msg: "请选择地理位置" },
+                    { fields: "lat", msg: "请选择地理位置" }
+                ];
+                
+                // logo
+                form_data['logo'] = (this.extraction_data || null) != null ? this.extraction_data.logo || '' : '';
+                
+                // 地区
+                form_data["province"] = self.province_id;
+                form_data["city"] = self.city_id;
+                form_data["county"] = self.county_id;
+                
+                // 地理位置
+                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.extraction_data || null) != null) {
+                    if ((lng || null) == null) {
+                        lng = self.extraction_data.lng || 0;
+                    }
+                    if ((lat || null) == null) {
+                        lat = self.extraction_data.lat || 0;
+                    }
+                }
+                form_data["lng"] = lng;
+                form_data["lat"] = lat;
+                
+                // 验证提交表单
+                if (app.globalData.fields_check(form_data, validation)) {
+                    if ((self.extraction_data || null) != null && (self.extraction_data.status || 0) == 1) {
+                        uni.showModal({
+                            title: '温馨提示',
+                            content: '数据需重新审核后方可生效',
+                            confirmText: '确认',
+                            cancelText: '暂不',
+                            success: result => {
+                                if (result.confirm) {
+                                    self.request_data_save(form_data);
+                                }
+                            }
+                        });
+                    } else {
+                        self.request_data_save(form_data);
+                    }
+                }
+            },
+
+            // 数据保存
+            request_data_save(data) {
+                var self = this;
+                self.setData({
+                    form_submit_disabled_status: true
+                });
+                uni.showLoading({
+                    title: "处理中..."
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("applysave", "extraction", "distribution"),
+                    method: "POST",
+                    data: 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 {
+                            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("服务器请求出错");
+                    }
+                });
+            },
+
+            // 上传图片预览
+            upload_show_event(e) {
+                uni.previewImage({
+                    current: this.extraction_data.logo,
+                    urls: [this.extraction_data.logo]
+                });
+            },
+
+            // 图片删除
+            upload_delete_event(e) {
+                var self = this;
+                uni.showModal({
+                    title: '温馨提示',
+                    content: '删除后不可恢复、继续吗？',
+                    success(res) {
+                        if (res.confirm) {
+                            var temp_data = self.extraction_data || {};
+                            temp_data['logo'] = '';
+                            self.setData({
+                                extraction_data: temp_data
+                            });
+                        }
+                    }
+                });
+            },
+
+            // 文件上传
+            file_upload_event(e) {
+                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);
+                    }
+                });
+            },
+
+            // 采用递归的方式上传多张
+            upload_one_by_one(img_paths, success, fail, count, length) {
+                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_data = self.extraction_data || {};
+                                temp_data['logo'] = data.data.url;
+                                self.setData({
+                                    extraction_data: temp_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);
+                        }
+                    }
+                });
+            }
+        }
+    };
+</script>
+<style>
+    @import './extraction-apply.css';
 </style>
\ No newline at end of file
diff --git a/pages/plugins/distribution/extraction/extraction.css b/pages/plugins/distribution/extraction/extraction.css
new file mode 100644
index 00000000..43271f5a
--- /dev/null
+++ b/pages/plugins/distribution/extraction/extraction.css
@@ -0,0 +1,117 @@
+/*
+* 公共
+*/
+.operation {
+    margin-top: 30rpx;
+}
+.title-msg {
+    font-size: 46rpx;
+    margin-top: 5%;
+}
+.mini-msg {
+    color: #0e90d2;
+}
+.to-submit {
+    margin-top: 15rpx;
+}
+.waiting-audit,
+.refuse {
+    padding: 10% 10rpx 60rpx 10rpx;
+}
+
+/*
+* 未申请
+*/
+.apply-not {
+    padding: 10rpx 10rpx 60rpx 10rpx;
+}
+.apply-not .apply-desc {
+    margin: 30rpx 30rpx 0 30rpx;
+}
+.apply-not .to-submit {
+    margin-top: 10%;
+}
+
+/*
+* 待审核
+*/
+.waiting-audit .title-msg {
+    color: #f37b1d;
+}
+
+/*
+* 已审核
+*/
+.valid .base {
+    padding: 20rpx 10rpx;
+}
+.valid .base-title {
+    font-weight: 500;
+}
+.valid .alias {
+    border: 1px solid #ff6a80;
+    color: #ff6a80;
+    padding: 2rpx 10rpx;
+    border-radius: 6rpx;
+    margin-right: 10rpx;
+}
+.valid .edit-submit {
+    color: #0e90d2;
+}
+.valid .content {
+    line-height: 46rpx;
+}
+.valid .content,
+.valid .statistics .item {
+    padding: 30rpx 10rpx;
+}
+.valid .extraction-notice {
+    padding: 0 20rpx;
+}
+.valid .statistics .item {
+    width: calc(50% - 1px);
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+}
+.valid .statistics .item .value {
+    font-weight: bold;
+    font-size: 36rpx;
+    margin-top: 10rpx;
+}
+.valid .statistics .item .order-wait-value {
+    color: #f00;
+}
+.valid .statistics .item .order-already-value {
+    color: #2ba245;
+}
+.valid .relieve {
+    padding: 0 10rpx;
+}
+
+/*
+* 拒绝
+*/
+.refuse .title-msg {
+    color: #dd514c;
+}
+.refuse .fail-tips {
+    padding-left: 10rpx;
+    background: #ffffeb;
+    margin-top: 10rpx;
+}
+.refuse .mini-msg {
+    margin-top: 50rpx;
+}
+
+/*
+* 介绍
+*/
+.apply-desc {
+    background: #def2fd;
+    border: 1px solid #cfeeff;
+    color: #1490d2;
+    padding: 10rpx;
+    font-size: 26rpx;
+    border-radius: 2px;
+}
\ No newline at end of file
diff --git a/pages/plugins/distribution/extraction/extraction.vue b/pages/plugins/distribution/extraction/extraction.vue
index 11c07f0d..9a9e1cad 100644
--- a/pages/plugins/distribution/extraction/extraction.vue
+++ b/pages/plugins/distribution/extraction/extraction.vue
@@ -1,369 +1,229 @@
-<template>
-<view>
-<view v-if="data_list_loding_status == 0">
-  <!-- 未申请 -->
-  <view v-if="extraction == null" class="apply-not bg-white">
-    <view v-if="(data_base || null) != null && (data_base.self_extraction_apply_desc || null) != null && data_base.self_extraction_apply_desc.length > 0" class="apply-desc">
-      <view v-for="(item, index) in data_base.self_extraction_apply_desc" :key="index" class="item">
-        {{item}}
-      </view>
-    </view>
-
-    <view class="to-submit tc">
-      <navigator url="/pages/plugins/distribution/extraction-apply/extraction-apply" hover-class="none">
-        <button type="primary" size="mini" hover-class="none">立即申请</button>
-      </navigator>
-    </view>
-  </view>
-
-  <!-- 已存在申请信息 -->
-  <view v-else class="apply-already">
-    <!-- status 状态（0待审核, 1已通过, 2已拒绝 -->
-    <!-- 审核中 -->
-    <view v-if="extraction.status == 0" class="waiting-audit bg-white">
-      <view class="title-msg tc">申请信息正在审核中...</view>
-      <view class="operation oh tc">
-        <view class="cr-base mini-msg">你可以</view>
-        <view class="to-submit tc">
-          <navigator url="/pages/plugins/distribution/extraction-apply/extraction-apply" hover-class="none">
-            <button type="primary" size="mini" hover-class="none">编辑信息</button>
-          </navigator>
-        </view>
-      </view>
-      
-    </view>
-
-    <!-- 审核通过 -->
-    <view v-else-if="extraction.status == 1 || extraction.status == 3" class="valid">
-      <view class="base br-b oh bg-white">
-        <view class="base-title fl">取货点信息</view>
-        <view class="fr edit-submit">
-          <navigator url="/pages/plugins/distribution/extraction-apply/extraction-apply" hover-class="none">编辑信息</navigator>
-        </view>
-      </view>
-      <view class="content bg-white" @tap="address_map_event">
-        <text v-if="(extraction.alias || null) != null" class="alias">{{extraction.alias}}</text>
-        <text class="cr-base">{{extraction.province_name}}{{extraction.city_name}}{{extraction.county_name}}{{extraction.address}}</text>
-      </view>
-
-      <view v-if="extraction.status == 1">
-        <view class="base br-b oh bg-white spacing-mt">
-          <view class="base-title fl">取货订单统计</view>
-          <view class="fr edit-submit">
-            <navigator url="/pages/plugins/distribution/extraction-order/extraction-order" hover-class="none">查看取货订单</navigator>
-          </view>
-        </view>
-        <view class="content bg-white statistics oh">
-          <view class="item fl tc" data-value="0" @tap="order_event">
-            <view class="title cr-base">待处理</view>
-            <view class="value single-text order-wait-value">{{statistical.order_wait || 0}}</view>
-          </view>
-          <view class="item fl tc br-l" data-value="1" @tap="order_event">
-            <view class="title cr-base">已处理</view>
-            <view class="value single-text order-already-value">{{statistical.order_already || 0}}</view>
-          </view>
-        </view>
-      </view>
-      <view v-else class="spacing-mt relieve">
-        <view class="tips">
-          当前状态也解约，可重新编辑数据提交审核。
-        </view>
-      </view>
-      
-      <view v-if="extraction.status == 1 && (data_base || null) != null && (data_base.self_extraction_common_notice || null) != null && data_base.self_extraction_common_notice.length > 0" class="extraction-notice spacing-mt">
-        <view class="tips">
-          <view v-for="(item, index) in data_base.self_extraction_common_notice" :key="index" class="item">
-            {{item}}
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 审核失败 -->
-    <view v-else="extraction.status == 2" class="refuse bg-white">
-      <view class="title-msg tc">申请信息审核失败</view>
-      <view v-if="(extraction.fail_reason || null) != null" class="fail-tips tips">原因：{{extraction.fail_reason}}</view>
-      <view class="operation oh tc">
-        <view class="cr-base mini-msg">你可以重新编辑信息提交</view>
-        <view class="to-submit tc">
-          <navigator url="/pages/plugins/distribution/extraction-apply/extraction-apply" hover-class="none">
-            <button type="primary" size="mini" hover-class="none">编辑信息</button>
-          </navigator>
-        </view>
-      </view>
-    </view>
-  </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>
-<view v-else>
-  <!--<import src="/pages/common/nodata.wxml"></import>-->
-  <block data-type="template" data-is="nodata" data-attr="status: data_list_loding_status, msg: data_list_loding_msg">
-  <!-- 1 加载中 -->
-  <view v-if="0 == 1" class="no-data-loding tc">
-    <text>加载中...</text>
-  </view>
-
-  <!-- 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>
-</view>
-</template>
-
-<script>
-const app = getApp();
-
-export default {
-  data() {
-    return {
-      data_bottom_line_status: false,
-      data_list_loding_status: 1,
-      data_list_loding_msg: '',
-      data_base: null,
-      extraction: null,
-      statistical: null
-    };
-  },
-
-  components: {},
-  props: {},
-
-  onLoad(params) {},
-
-  onShow() {
-    this.init();
-  },
-
-  // 下拉刷新
-  onPullDownRefresh() {
-    this.get_data();
-  },
-
-  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();
-        }
-      } else {
-        this.setData({
-          data_list_loding_status: 0,
-          data_bottom_line_status: false
-        });
-      }
-    },
-
-    // 获取数据
-    get_data() {
-      var self = this;
-      uni.request({
-        url: app.globalData.get_request_url("index", "extraction", "distribution"),
-        method: "POST",
-        data: {},
-        dataType: "json",
-        success: res => {
-          uni.hideLoading();
-          uni.stopPullDownRefresh();
-
-          if (res.data.code == 0) {
-            var data = res.data.data;
-            self.setData({
-              data_base: data.base || null,
-              extraction: data.extraction || null,
-              statistical: data.statistical || null,
-              data_list_loding_msg: '',
-              data_list_loding_status: 0,
-              data_bottom_line_status: true
-            });
-          } else {
-            self.setData({
-              data_bottom_line_status: false,
-              data_list_loding_status: 2,
-              data_list_loding_msg: res.data.msg
-            });
-
-            if (app.globalData.is_login_check(res.data, self, 'get_data')) {
-              app.globalData.showToast(res.data.msg);
-            }
-          }
-        },
-        fail: () => {
-          uni.hideLoading();
-          uni.stopPullDownRefresh();
-          self.setData({
-            data_bottom_line_status: false,
-            data_list_loding_status: 2,
-            data_list_loding_msg: '服务器请求出错'
-          });
-          app.globalData.showToast("服务器请求出错");
-        }
-      });
-    },
-
-    // 地图查看
-    address_map_event(e) {
-      if ((this.extraction || null) == null) {
-        return false;
-      }
-
-      var data = this.extraction; // 打开地图
-
-      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);
-    },
-
-    // 进入取货订单管理
-    order_event(e) {
-      var value = e.currentTarget.dataset.value || 0;
-      uni.navigateTo({
-        url: '/pages/plugins/distribution/extraction-order/extraction-order?status=' + value
-      });
-    }
-
-  }
-};
-</script>
-<style>
-/*
- * 公共
- */
-.operation {
-  margin-top: 30rpx;
-}
-.title-msg {
-  font-size: 46rpx;
-  margin-top: 5%;
-}
-.mini-msg {
-  color: #0e90d2;
-}
-.to-submit {
-  margin-top: 15rpx;
-}
-.waiting-audit, .refuse {
-  padding: 10% 10rpx 60rpx 10rpx;
-}
-
-/*
- * 未申请
- */
-.apply-not {
-  padding: 10rpx 10rpx 60rpx 10rpx; 
-}
-.apply-not .apply-desc {
-  margin: 30rpx 30rpx 0 30rpx;
-}
-.apply-not .to-submit {
-  margin-top: 10%;
-}
-
-/*
- * 待审核
- */
-.waiting-audit .title-msg {
-  color: #f37b1d;
-}
-
-/*
- * 已审核
- */
-.valid .base {
-  padding: 20rpx 10rpx;
-}
-.valid .base-title {
-  font-weight: 500;
-}
-.valid .alias {
-  border: 1px solid #ff6a80;
-  color: #ff6a80;
-  padding: 2rpx 10rpx;
-  border-radius: 6rpx;
-  margin-right: 10rpx;
-}
-.valid .edit-submit {
-  color: #0e90d2;
-}
-.valid .content {
-  line-height: 46rpx;
-}
-.valid .content, .valid .statistics .item  {
-  padding: 30rpx 10rpx;
-}
-.valid .extraction-notice {
-  padding: 0 20rpx;
-}
-.valid .statistics .item {
-  width: calc(50% - 1px);
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-}
-.valid .statistics .item .value {
-  font-weight: bold;
-  font-size: 36rpx;
-  margin-top: 10rpx;
-}
-.valid .statistics .item .order-wait-value {
-  color: #f00;
-}
-.valid .statistics .item .order-already-value {
-  color: #2ba245;
-}
-.valid .relieve {
-  padding: 0 10rpx;
-}
-
-/*
- * 拒绝
- */
-.refuse .title-msg {
-  color: #dd514c;
-}
-.refuse .fail-tips {
-  padding-left: 10rpx;
-  background: #ffffeb;
-  margin-top: 10rpx;
-}
-.refuse .mini-msg {
-  margin-top: 50rpx;
-}
-
-/*
- * 介绍
- */
-.apply-desc {
-  background: #def2fd;
-  border: 1px solid #cfeeff;
-  color: #1490d2;
-  padding: 10rpx;
-  font-size: 26rpx;
-  border-radius: 2px;
-}
+<template>
+    <view>
+        <view v-if="data_base != null">
+            <view class="padding-main">
+                <!-- 未申请 -->
+                <view v-if="extraction == null">
+                    <view v-if="(data_base.self_extraction_apply_desc || null) != null && data_base.self_extraction_apply_desc.length > 0" class="notice-content-blue spacing-mb">
+                        <view v-for="(item, index) in data_base.self_extraction_apply_desc" :key="index" class="item">
+                            {{item}}
+                        </view>
+                    </view>
+                    <view class="margin-top-xxxl">
+                        <navigator url="/pages/plugins/distribution/extraction-apply/extraction-apply" hover-class="none">
+                            <button class="bg-main cr-white br-main round wh-auto" type="default" size="mini" hover-class="none">立即申请</button>
+                        </navigator>
+                    </view>
+                </view>
+
+                <!-- 已存在申请信息 -->
+                <view v-else class="apply-already">
+                    <!-- status 状态（0待审核, 1已通过, 2已拒绝 -->
+                    <!-- 审核中 -->
+                    <view v-if="extraction.status == 0" class="waiting-audit bg-white">
+                        <view class="title-msg tc">申请信息正在审核中...</view>
+                        <view class="operation oh tc">
+                            <view class="cr-base mini-msg">你可以</view>
+                            <view class="to-submit tc">
+                                <navigator url="/pages/plugins/distribution/extraction-apply/extraction-apply" hover-class="none">
+                                    <button type="primary" size="mini" hover-class="none">编辑信息</button>
+                                </navigator>
+                            </view>
+                        </view>
+
+                    </view>
+
+                    <!-- 审核通过 -->
+                    <view v-else-if="extraction.status == 1 || extraction.status == 3" class="valid">
+                        <view class="base br-b oh bg-white">
+                            <view class="base-title fl">取货点信息</view>
+                            <view class="fr edit-submit">
+                                <navigator url="/pages/plugins/distribution/extraction-apply/extraction-apply" hover-class="none">编辑信息</navigator>
+                            </view>
+                        </view>
+                        <view class="content bg-white" @tap="address_map_event">
+                            <text v-if="(extraction.alias || null) != null" class="alias">{{extraction.alias}}</text>
+                            <text class="cr-base">{{extraction.province_name}}{{extraction.city_name}}{{extraction.county_name}}{{extraction.address}}</text>
+                        </view>
+
+                        <view v-if="extraction.status == 1">
+                            <view class="base br-b oh bg-white spacing-mt">
+                                <view class="base-title fl">取货订单统计</view>
+                                <view class="fr edit-submit">
+                                    <navigator url="/pages/plugins/distribution/extraction-order/extraction-order" hover-class="none">查看取货订单</navigator>
+                                </view>
+                            </view>
+                            <view class="content bg-white statistics oh">
+                                <view class="item fl tc" data-value="0" @tap="order_event">
+                                    <view class="title cr-base">待处理</view>
+                                    <view class="value single-text order-wait-value">{{statistical.order_wait || 0}}</view>
+                                </view>
+                                <view class="item fl tc br-l" data-value="1" @tap="order_event">
+                                    <view class="title cr-base">已处理</view>
+                                    <view class="value single-text order-already-value">{{statistical.order_already || 0}}</view>
+                                </view>
+                            </view>
+                        </view>
+                        <view v-else class="spacing-mt relieve">
+                            <view class="tips">当前状态也解约，可重新编辑数据提交审核。</view>
+                        </view>
+                        <view v-if="extraction.status == 1 && (data_base || null) != null && (data_base.self_extraction_common_notice || null) != null && data_base.self_extraction_common_notice.length > 0" class="extraction-notice spacing-mt">
+                            <view class="tips">
+                                <view v-for="(item, index) in data_base.self_extraction_common_notice" :key="index" class="item">
+                                    {{item}}
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+
+                    <!-- 审核失败 -->
+                    <view v-else="extraction.status == 2" class="refuse bg-white">
+                        <view class="title-msg tc">申请信息审核失败</view>
+                        <view v-if="(extraction.fail_reason || null) != null" class="fail-tips tips">原因：{{extraction.fail_reason}}</view>
+                        <view class="operation oh tc">
+                            <view class="cr-base mini-msg">你可以重新编辑信息提交</view>
+                            <view class="to-submit tc">
+                                <navigator url="/pages/plugins/distribution/extraction-apply/extraction-apply" hover-class="none">
+                                    <button type="primary" size="mini" hover-class="none">编辑信息</button>
+                                </navigator>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :prop-status="data_bottom_line_status"></component-bottom-line>
+        </view>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :prop-status="data_list_loding_status" :prop-msg="data_list_loding_msg"></component-no-data>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentNoData from "../../../../components/no-data/no-data";
+    import componentBottomLine from "../../../../components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                data_bottom_line_status: false,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_base: null,
+                extraction: null,
+                statistical: null
+            };
+        },
+
+        components: {
+            componentNoData,
+            componentBottomLine
+        },
+        props: {},
+
+        onLoad(params) {},
+
+        onShow() {
+            this.init();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data();
+        },
+
+        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();
+                    }
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false
+                    });
+                }
+            },
+
+            // 获取数据
+            get_data() {
+                uni.request({
+                    url: app.globalData.get_request_url("index", "extraction", "distribution"),
+                    method: "POST",
+                    data: {},
+                    dataType: "json",
+                    success: res => {
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            this.setData({
+                                data_base: data.base || null,
+                                extraction: data.extraction || null,
+                                statistical: data.statistical || null,
+                                data_list_loding_msg: '',
+                                data_list_loding_status: 0,
+                                data_bottom_line_status: true
+                            });
+                        } else {
+                            this.setData({
+                                data_bottom_line_status: false,
+                                data_list_loding_status: 2,
+                                data_list_loding_msg: res.data.msg
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_bottom_line_status: false,
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: '服务器请求出错'
+                        });
+                        app.globalData.showToast("服务器请求出错");
+                    }
+                });
+            },
+
+            // 地图查看
+            address_map_event(e) {
+                if ((this.extraction || null) == null) {
+                    return false;
+                }
+                var data = this.extraction;
+                
+                // 打开地图
+                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);
+            },
+
+            // 进入取货订单管理
+            order_event(e) {
+                var value = e.currentTarget.dataset.value || 0;
+                uni.navigateTo({
+                    url: '/pages/plugins/distribution/extraction-order/extraction-order?status=' + value
+                });
+            }
+        }
+    };
+</script>
+<style>
+    @import './extraction.css';
 </style>
\ No newline at end of file
diff --git a/pages/plugins/distribution/introduce/introduce.css b/pages/plugins/distribution/introduce/introduce.css
new file mode 100644
index 00000000..f5d726eb
--- /dev/null
+++ b/pages/plugins/distribution/introduce/introduce.css
@@ -0,0 +1,4 @@
+.panel-item .level-icon {
+    width: 50rpx;
+    height: 50rpx !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/distribution/introduce/introduce.vue b/pages/plugins/distribution/introduce/introduce.vue
index 8578713e..8faad6cc 100644
--- a/pages/plugins/distribution/introduce/introduce.vue
+++ b/pages/plugins/distribution/introduce/introduce.vue
@@ -1,216 +1,146 @@
-<template>
-<view>
-<view v-if="data_base != null">
-  <!-- 等级信息 -->
-  <view v-if="level_list.length > 0" class="panel-item">
-    <view v-for="(item, index) in level_list" :key="index" class="bg-white spacing-mb">
-      <view class="panel-title">{{item.name}}</view>
-      <view class="panel-content">
-        <view class="item br-b oh">
-          <view class="title fl">等级证书</view>
-          <view class="content cr-gray fl br-l images">
-            <image :src="item.images_url" class="avatar dis-block fl" mode="widthFix"></image>
-          </view>
-        </view>
-        <view class="item br-b oh">
-          <view class="title fl">返佣比例</view>
-          <view class="content fl br-l">
-            <view>一级 {{item.level_rate_one}}%</view>
-            <view v-if="data_base.level == undefined || data_base.level > 0">二级 {{item.level_rate_two}}%</view>
-            <view v-if="data_base.level == undefined || data_base.level > 1">三级 {{item.level_rate_three}}%</view>
-          </view>
-        </view>
-        <view class="item br-b oh">
-          <view class="title fl">消费金额</view>
-          <view class="content fl br-l">{{item.rules_msg}}</view>
-        </view>
-      </view>
-    </view>
-  </view>
-
-  <!-- 等级介绍 -->
-  <view v-if="(data_base.user_center_level_desc || null) != null && data_base.user_center_level_desc.length > 0" class="spacing-mt user-center-level-desc">
-    <view class="tips-desc">
-      <view v-for="(item, index) in data_base.user_center_level_desc" :key="index" class="item">
-        {{item}}
-      </view>
-    </view>
-  </view>
-  
-  <view v-if="((data_base.user_center_level_desc || null) != null && data_base.user_center_level_desc.length > 0) || level_list.length > 0">
-    <!--<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>
-</view>
-
-<view v-if="level_list.length <= 0 && ((data_base.user_center_level_desc || null) == null || data_base.user_center_level_desc.length <= 0)">
-  <!--<import src="/pages/common/nodata.wxml"></import>-->
-  <block data-type="template" data-is="nodata" data-attr="status: data_list_loding_status, msg: data_list_loding_msg">
-  <!-- 1 加载中 -->
-  <view v-if="0 == 1" class="no-data-loding tc">
-    <text>加载中...</text>
-  </view>
-
-  <!-- 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>
-</view>
-</template>
-
-<script>
-const app = getApp();
-
-export default {
-  data() {
-    return {
-      params: null,
-      data_list_loding_status: 1,
-      data_list_loding_msg: '',
-      data_bottom_line_status: false,
-      data_base: null,
-      level_list: []
-    };
-  },
-
-  components: {},
-  props: {},
-
-  onLoad(params) {
-    this.setData({
-      params: params
-    });
-    this.init();
-  },
-
-  onShow() {},
-
-  // 下拉刷新
-  onPullDownRefresh() {
-    this.init();
-  },
-
-  methods: {
-    init() {
-      var self = this;
-      uni.showLoading({
-        title: "加载中..."
-      });
-      this.setData({
-        data_list_loding_status: 1
-      });
-      uni.request({
-        url: app.globalData.get_request_url("index", "introduce", "distribution"),
-        method: "POST",
-        data: {
-          id: this.params.id
-        },
-        dataType: "json",
-        success: res => {
-          uni.hideLoading();
-          uni.stopPullDownRefresh();
-
-          if (res.data.code == 0) {
-            var data = res.data.data;
-            var data_base = data.base || null;
-            var level_list = (data.level_list || null) != null && data.level_list.length > 0 ? data.level_list : [];
-            self.setData({
-              data_base: data_base,
-              level_list: level_list,
-              data_list_loding_status: data_base == null || level_list.length <= 0 ? 0 : 3,
-              data_bottom_line_status: true,
-              data_list_loding_msg: ''
-            });
-          } else {
-            self.setData({
-              data_list_loding_status: 2,
-              data_bottom_line_status: false,
-              data_list_loding_msg: res.data.msg
-            });
-
-            if (app.globalData.is_login_check(res.data, self, 'init')) {
-              app.globalData.showToast(res.data.msg);
-            }
-          }
-        },
-        fail: () => {
-          uni.hideLoading();
-          uni.stopPullDownRefresh();
-          self.setData({
-            data_list_loding_status: 2,
-            data_bottom_line_status: false,
-            data_list_loding_msg: '服务器请求出错'
-          });
-          app.globalData.showToast("服务器请求出错");
-        }
-      });
-    }
-
-  }
-};
-</script>
-<style>
-/*
- * 等级信息
- */
-.panel-item .panel-title {
-  background: #fff;
-  font-weight: bold;
-  padding: 15rpx;
-  border-bottom: 2px solid #eee;
-  font-size: 34rpx;
-}
-.panel-item .panel-content .item {
-    padding: 20rpx 0;
-}
-.panel-item .panel-content .item:last-child {
-  border: 0;
-}
-.panel-item .panel-content .item .title {
-    width: 25%;
-    padding-left: 20rpx;
-}
-.panel-item .panel-content .item .content {
-    width: calc(75% - 50rpx);
-    padding-left: 20rpx;
-    min-height: 46rpx;
-}
-.panel-item .panel-content .item view {
-    line-height: 46rpx;
-}
-.panel-item .panel-content .item .images image {
-  width: 60rpx;
-  height: 60rpx;
-}
-
-
-/*
- * 等级介绍
- */
-.user-center-level-desc {
-  padding: 0 10rpx;
-}
-.user-center-level-desc .tips-desc {
-  background: #def2fd;
-  border: 1px solid #cfeeff;
-  color: #1490d2;
-  padding: 10rpx;
-  font-size: 26rpx;
-  border-radius: 2px;
-}
+<template>
+    <view>
+        <view v-if="data_base != null">
+            <view class="padding-horizontal-main padding-top-main">
+                <!-- 等级信息 -->
+                <view v-if="level_list.length > 0" class="panel-item spacing-mb">
+                    <view v-for="(item, index) in level_list" :key="index" class="padding-main border-radius-main bg-white spacing-mb">
+                        <view class="br-b padding-bottom-main fw-b text-size">{{item.name}}</view>
+                        <view class="panel-content oh padding-top-main">
+                            <view class="item br-b oh padding-vertical-main">
+                                <view class="title fl padding-right-main cr-gray">等级证书</view>
+                                <view class="content fl br-l padding-left-main">
+                                    <image :src="item.images_url" class="dis-block fl level-icon" mode="widthFix"></image>
+                                </view>
+                            </view>
+                            <view class="item br-b oh padding-vertical-main">
+                                <view class="title fl padding-right-main cr-gray">返佣比例</view>
+                                <view class="content fl br-l padding-left-main">
+                                    <view>一级 {{item.level_rate_one}}%</view>
+                                    <view v-if="data_base.level == undefined || data_base.level > 0">二级{{item.level_rate_two}}%</view>
+                                    <view v-if="data_base.level == undefined || data_base.level > 1">三级{{item.level_rate_three}}%</view>
+                                </view>
+                            </view>
+                            <view class="item br-b oh padding-vertical-main">
+                                <view class="title fl padding-right-main cr-gray">消费金额</view>
+                                <view class="content fl br-l padding-left-main">{{item.rules_msg}}</view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+
+                <!-- 等级介绍 -->
+                <view v-if="(data_base.user_center_level_desc || null) != null && data_base.user_center_level_desc.length > 0" class="spacing-mb">
+                    <view class="notice-content-blue">
+                        <view v-for="(item, index) in data_base.user_center_level_desc" :key="index" class="item">
+                            {{item}}
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :prop-status="data_bottom_line_status"></component-bottom-line>
+        </view>
+        <view v-else>
+            <!-- 提示信息 -->
+            <component-no-data :prop-status="data_list_loding_status" :prop-msg="data_list_loding_msg"></component-no-data>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    import componentNoData from "../../../../components/no-data/no-data";
+    import componentBottomLine from "../../../../components/bottom-line/bottom-line";
+
+    export default {
+        data() {
+            return {
+                params: null,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
+                data_bottom_line_status: false,
+                data_base: null,
+                level_list: []
+            };
+        },
+
+        components: {
+            componentNoData,
+            componentBottomLine
+        },
+        props: {},
+
+        onLoad(params) {
+            this.setData({
+                params: params
+            });
+            this.init();
+        },
+
+        onShow() {},
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                var self = this;
+                uni.showLoading({
+                    title: "加载中..."
+                });
+                this.setData({
+                    data_list_loding_status: 1
+                });
+                uni.request({
+                    url: app.globalData.get_request_url("index", "introduce", "distribution"),
+                    method: "POST",
+                    data: {
+                        id: this.params.id
+                    },
+                    dataType: "json",
+                    success: res => {
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            var data_base = data.base || null;
+                            var level_list = (data.level_list || null) != null && data.level_list.length > 0 ? data.level_list : [];
+                            self.setData({
+                                data_base: data_base,
+                                level_list: level_list,
+                                data_list_loding_status: data_base == null || level_list.length <= 0 ? 0 : 3,
+                                data_bottom_line_status: true,
+                                data_list_loding_msg: ''
+                            });
+                        } else {
+                            self.setData({
+                                data_list_loding_status: 2,
+                                data_bottom_line_status: false,
+                                data_list_loding_msg: res.data.msg
+                            });
+                            if (app.globalData.is_login_check(res.data, self, 'init')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
+                        self.setData({
+                            data_list_loding_status: 2,
+                            data_bottom_line_status: false,
+                            data_list_loding_msg: '服务器请求出错'
+                        });
+                        app.globalData.showToast("服务器请求出错");
+                    }
+                });
+            }
+        }
+    };
+</script>
+<style>
+    @import './introduce.css';
 </style>
\ No newline at end of file
diff --git a/pages/plugins/distribution/user/user.css b/pages/plugins/distribution/user/user.css
index 8ae6c2c5..68078e4d 100644
--- a/pages/plugins/distribution/user/user.css
+++ b/pages/plugins/distribution/user/user.css
@@ -47,13 +47,4 @@
     width: 80rpx;
     height: 80rpx;
     margin: 0 auto;
-}
-
-
-/*
-* 提示信息
-*/
-.not-vip-desc {
-    background: #ffffeb;
-    padding-left: 20rpx;
 }
\ No newline at end of file
diff --git a/pages/plugins/distribution/user/user.vue b/pages/plugins/distribution/user/user.vue
index 3ad38211..59621372 100644
--- a/pages/plugins/distribution/user/user.vue
+++ b/pages/plugins/distribution/user/user.vue
@@ -22,6 +22,13 @@
                 </view>
             </view>
         </view>
+        
+        <!-- 会员中心通知 -->
+        <view v-if="(user_level || null) != null && (data_base.user_center_notice || null) != null && data_base.user_center_notice.length > 0" class="padding-horizontal-main padding-bottom-main">
+            <view class="notice-content">
+                <view v-for="(item, index) in data_base.user_center_notice" :key="index" class="item">{{item}}</view>
+            </view>
+        </view>
 
         <!-- 导航 -->
         <view v-if="nav_list.length > 0" class="nav oh">
@@ -34,17 +41,10 @@
                 </view>
             </block>
         </view>
-        
-        <!-- 会员中心通知 -->
-        <view v-if="(user_level || null) != null && (data_base.user_center_notice || null) != null && data_base.user_center_notice.length > 0" class="padding-horizontal-main padding-bottom-main">
-            <view class="notice-content">
-                <view v-for="(item, index) in data_base.user_center_notice" :key="index" class="item">{{item}}</view>
-            </view>
-        </view>
-        
+
         <!-- 不符合分销条件描述 -->
         <view v-if="(data_base.non_conformity_desc || null) != null && data_base.non_conformity_desc.length > 0" class="padding-horizontal-main padding-bottom-main">
-            <view class="notice-content not-vip-desc">
+            <view class="notice-content-blue">
                 <view v-for="(item, index) in data_base.non_conformity_desc" :key="index" class="item">{{item}}</view>
             </view>
         </view>
diff --git a/pages/user-address-save/user-address-save.vue b/pages/user-address-save/user-address-save.vue
index 2c23443f..84d01377 100644
--- a/pages/user-address-save/user-address-save.vue
+++ b/pages/user-address-save/user-address-save.vue
@@ -528,57 +528,28 @@
                 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: "请填写详细地址"
-                }];
+                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: "请选择地理位置"
-                    });
+                    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: "请上传身份证背面照片"
-                    });
+                    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 || '';