From 91a1f256fe972fb344e51a17dc744f5e3fa870bc Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Fri, 18 Sep 2020 14:04:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BE=E5=BA=A6=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/goods-detail/goods-detail.acss      |  14 +-
 .../pages/goods-search/goods-search.acss      |   5 +-
 .../pages/goods-search/goods-search.axml      |  10 +-
 .../distribution/introduce/introduce.axml     |   4 +-
 .../order-detail/order-detail.axml            |   4 +-
 .../profit-detail/profit-detail.axml          |   2 +-
 .../order-detail/order-detail.axml            |   2 +-
 .../profit-detail/profit-detail.axml          |   2 +-
 .../user-cash-detail/user-cash-detail.axml    |   2 +-
 .../user-recharge-detail.axml                 |   2 +-
 .../wallet-log-detail/wallet-log-detail.axml  |   2 +-
 sourcecode/baidu/.wx2swaninfo                 |   5 -
 sourcecode/baidu/app.js                       | 237 ++++++++++++++----
 sourcecode/baidu/app.json                     |   3 +-
 .../baidu/components/quick-nav/quick-nav.css  | 101 ++++++++
 .../baidu/components/quick-nav/quick-nav.js   |  56 +++++
 .../baidu/components/quick-nav/quick-nav.json |   6 +
 .../baidu/components/quick-nav/quick-nav.swan |  31 +++
 sourcecode/baidu/pages/buy/buy.js             |  43 ++--
 sourcecode/baidu/pages/buy/buy.json           |   1 +
 sourcecode/baidu/pages/buy/buy.swan           |  22 +-
 sourcecode/baidu/pages/cart/cart.js           |  33 ++-
 sourcecode/baidu/pages/cart/cart.json         |   1 +
 sourcecode/baidu/pages/cart/cart.swan         |   7 +-
 .../extraction-address/extraction-address.js  |  17 +-
 .../pages/goods-category/goods-category.js    |  20 +-
 .../pages/goods-category/goods-category.json  |   7 +-
 .../pages/goods-category/goods-category.swan  |   7 +-
 .../baidu/pages/goods-detail/goods-detail.css |   4 +-
 .../baidu/pages/goods-detail/goods-detail.js  | 102 ++++----
 .../pages/goods-detail/goods-detail.json      |   1 +
 .../pages/goods-detail/goods-detail.swan      |   7 +-
 .../baidu/pages/goods-search/goods-search.css |   5 +-
 .../baidu/pages/goods-search/goods-search.js  |  37 ++-
 .../pages/goods-search/goods-search.json      |   1 +
 .../pages/goods-search/goods-search.swan      |  19 +-
 sourcecode/baidu/pages/index/index.js         |  35 ++-
 sourcecode/baidu/pages/index/index.json       |   1 +
 sourcecode/baidu/pages/index/index.swan       |   5 +-
 .../baidu/pages/plugins/coupon/index/index.js |  27 +-
 .../pages/plugins/coupon/index/index.json     |   3 +-
 .../baidu/pages/plugins/coupon/user/user.js   |  32 ++-
 .../baidu/pages/plugins/coupon/user/user.json |   3 +-
 .../distribution/extraction/extraction.js     |  15 +-
 .../distribution/introduce/introduce.swan     |   4 +-
 .../order-detail/order-detail.swan            |   4 +-
 .../profit-detail/profit-detail.swan          |   2 +-
 .../distribution/statistics/statistics.js     |  22 +-
 .../exchangerate/currency/currency.css        |  14 ++
 .../plugins/exchangerate/currency/currency.js | 126 ++++++++++
 .../exchangerate/currency/currency.json       |   4 +
 .../exchangerate/currency/currency.swan       |  19 ++
 .../baidu/pages/user-faovr/user-faovr.js      |  23 +-
 .../user-goods-browse/user-goods-browse.js    |  23 +-
 .../user-order-detail/user-order-detail.js    |  21 +-
 .../user-order-detail/user-order-detail.swan  |   8 +-
 .../baidu/pages/user-order/user-order.js      |  15 +-
 .../baidu/pages/user-order/user-order.swan    |   4 +-
 .../user-orderaftersale-detail.js             |   6 +-
 .../user-orderaftersale-detail.swan           |   8 +-
 .../user-orderaftersale.js                    |  16 +-
 .../user-orderaftersale.swan                  |   6 +-
 sourcecode/baidu/pages/user/user.js           |  47 +++-
 sourcecode/baidu/pages/user/user.json         |   1 +
 sourcecode/baidu/pages/user/user.swan         |   5 +-
 .../qq/pages/goods-detail/goods-detail.qss    |   4 +-
 .../qq/pages/goods-search/goods-search.qml    |  10 +-
 .../qq/pages/goods-search/goods-search.qss    |   5 +-
 .../user-cash-detail/user-cash-detail.qml     |   2 +-
 .../user-recharge-detail.qml                  |   2 +-
 .../wallet-log-detail/wallet-log-detail.qml   |   2 +-
 .../user-order-detail/user-order-detail.qml   |   4 +-
 .../user-orderaftersale-detail.qml            |   4 +-
 .../pages/goods-detail/goods-detail.ttss      |   4 +-
 .../pages/goods-search/goods-search.ttml      |  10 +-
 .../pages/goods-search/goods-search.ttss      |   5 +-
 .../distribution/introduce/introduce.ttml     |   4 +-
 .../order-detail/order-detail.ttml            |   4 +-
 .../profit-detail/profit-detail.ttml          |   2 +-
 .../order-detail/order-detail.ttml            |   2 +-
 .../profit-detail/profit-detail.ttml          |   2 +-
 .../user-cash-detail/user-cash-detail.ttml    |   2 +-
 .../user-recharge-detail.ttml                 |   2 +-
 .../wallet-log-detail/wallet-log-detail.ttml  |   2 +-
 .../user-order-detail/user-order-detail.ttml  |   4 +-
 .../user-orderaftersale-detail.ttml           |   4 +-
 .../pages/goods-detail/goods-detail.wxss      |   4 +-
 .../pages/goods-search/goods-search.wxml      |  10 +-
 .../pages/goods-search/goods-search.wxss      |   5 +-
 .../distribution/introduce/introduce.wxml     |   4 +-
 .../order-detail/order-detail.wxml            |   4 +-
 .../profit-detail/profit-detail.wxml          |   2 +-
 .../order-detail/order-detail.wxml            |   2 +-
 .../profit-detail/profit-detail.wxml          |   2 +-
 .../user-cash-detail/user-cash-detail.wxml    |   2 +-
 .../user-recharge-detail.wxml                 |   2 +-
 .../wallet-log-detail/wallet-log-detail.wxml  |   2 +-
 .../user-orderaftersale-detail.wxml           |   2 +-
 98 files changed, 1080 insertions(+), 362 deletions(-)
 delete mode 100644 sourcecode/baidu/.wx2swaninfo
 create mode 100644 sourcecode/baidu/components/quick-nav/quick-nav.css
 create mode 100644 sourcecode/baidu/components/quick-nav/quick-nav.js
 create mode 100644 sourcecode/baidu/components/quick-nav/quick-nav.json
 create mode 100644 sourcecode/baidu/components/quick-nav/quick-nav.swan
 create mode 100644 sourcecode/baidu/pages/plugins/exchangerate/currency/currency.css
 create mode 100644 sourcecode/baidu/pages/plugins/exchangerate/currency/currency.js
 create mode 100644 sourcecode/baidu/pages/plugins/exchangerate/currency/currency.json
 create mode 100644 sourcecode/baidu/pages/plugins/exchangerate/currency/currency.swan

diff --git a/sourcecode/alipay/pages/goods-detail/goods-detail.acss b/sourcecode/alipay/pages/goods-detail/goods-detail.acss
index 1764c7686..8241a08bc 100644
--- a/sourcecode/alipay/pages/goods-detail/goods-detail.acss
+++ b/sourcecode/alipay/pages/goods-detail/goods-detail.acss
@@ -154,13 +154,19 @@
 {
     height: 100rpx;
 }
-.goods-buy-nav .collect { border-left: 1px solid #e1e1e1; }
-.goods-buy-nav .fl image { width: 25px; height: 25px; margin: 0 auto; }
+.goods-buy-nav .collect {
+  border-left: 1px solid #e1e1e1;
+}
+.goods-buy-nav .fl image {
+  width: 25px;
+  height: 25px;
+  margin: 0 auto;
+}
 .goods-title {
   font-size: 32rpx;
-  line-height: 44rpx;
+  line-height: 48rpx;
   font-weight: 500;
-  padding: 8rpx 10rpx;
+  padding: 5rpx 10rpx;
 }
 .goods-base {
     padding: 15rpx 10rpx;
diff --git a/sourcecode/alipay/pages/goods-search/goods-search.acss b/sourcecode/alipay/pages/goods-search/goods-search.acss
index 9caa480a3..04e3a4408 100644
--- a/sourcecode/alipay/pages/goods-search/goods-search.acss
+++ b/sourcecode/alipay/pages/goods-search/goods-search.acss
@@ -70,11 +70,10 @@
   border-radius: 6rpx;
 }
 .screening-price input {
-  width: calc(50% - 45rpx);
+  width: calc(50% - 20px);
 }
 .screening-price .separator {
-  margin-top: 20rpx;
-  width: 30rpx;
+  line-height: 50rpx;
 }
 .popup-form .item {
   width: 480rpx;
diff --git a/sourcecode/alipay/pages/goods-search/goods-search.axml b/sourcecode/alipay/pages/goods-search/goods-search.axml
index 4d3569474..d7ac670e7 100755
--- a/sourcecode/alipay/pages/goods-search/goods-search.axml
+++ b/sourcecode/alipay/pages/goods-search/goods-search.axml
@@ -41,12 +41,12 @@
 <component-popup prop-show="{{is_show_popup_form}}" prop-position="right" onClose="popup_form_event_close">
   <form onSubmit="form_submit_event" class="popup-form oh bg-white">
     <view class="item oh screening-price">
-      <view class="title cr-666">价格区间(元)
+      <view class="title cr-666">价格区间(元)</view>
+      <view class="tc oh">
+        <input type="digit" placeholder="最低价" name="min_price" class="br fl" />
+        <text class="cr-888 separator">~</text>
+        <input type="digit" placeholder="最高价" name="max_price" class="br fr" />
       </view>
-      <input type="digit" placeholder="最低价" name="min_price" class="br fl" />
-      <view class="cr-888 fl tc separator">~
-      </view>
-      <input type="digit" placeholder="最高价" name="max_price" class="br fl" />
     </view>
     <view class="item keywords">
       <view class="title cr-666">关键字</view>
diff --git a/sourcecode/alipay/pages/plugins/distribution/introduce/introduce.axml b/sourcecode/alipay/pages/plugins/distribution/introduce/introduce.axml
index b756fea39..10d91d5ae 100644
--- a/sourcecode/alipay/pages/plugins/distribution/introduce/introduce.axml
+++ b/sourcecode/alipay/pages/plugins/distribution/introduce/introduce.axml
@@ -12,7 +12,7 @@
         </view>
         <view class="item br-b oh">
           <view class="title fl">返佣比例</view>
-          <view class="content cr-888 fl br-l">
+          <view class="content fl br-l">
             <view>一级 {{item.level_rate_one}}%</view>
             <view a:if="{{data_base.level == undefined || data_base.level > 0}}">二级 {{item.level_rate_two}}%</view>
             <view a:if="{{data_base.level == undefined || data_base.level > 1}}">三级 {{item.level_rate_three}}%</view>
@@ -20,7 +20,7 @@
         </view>
         <view class="item br-b oh">
           <view class="title fl">消费金额</view>
-          <view class="content cr-888 fl br-l">{{item.rules_msg}}</view>
+          <view class="content fl br-l">{{item.rules_msg}}</view>
         </view>
       </view>
     </view>
diff --git a/sourcecode/alipay/pages/plugins/distribution/order-detail/order-detail.axml b/sourcecode/alipay/pages/plugins/distribution/order-detail/order-detail.axml
index 7382316f9..8067f79c3 100644
--- a/sourcecode/alipay/pages/plugins/distribution/order-detail/order-detail.axml
+++ b/sourcecode/alipay/pages/plugins/distribution/order-detail/order-detail.axml
@@ -3,14 +3,14 @@
     <view class="panel-content bg-white">
       <view class="item br-b oh">
         <view class="title fl">用户头像</view>
-        <view class="content cr-888 fl br-l">
+        <view class="content fl br-l">
           <image src="{{detail.avatar}}" class="avatar dis-block fl" mode="widthFix" onTap="avatar_event" data-value="{{detail.avatar}}" />
         </view>
       </view>
 
       <view a:for="{{detail_list}}" a:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/alipay/pages/plugins/distribution/profit-detail/profit-detail.axml b/sourcecode/alipay/pages/plugins/distribution/profit-detail/profit-detail.axml
index 63074a2b2..c44d5d246 100644
--- a/sourcecode/alipay/pages/plugins/distribution/profit-detail/profit-detail.axml
+++ b/sourcecode/alipay/pages/plugins/distribution/profit-detail/profit-detail.axml
@@ -3,7 +3,7 @@
     <view class="panel-content bg-white">
       <view a:for="{{detail_list}}" a:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/alipay/pages/plugins/membershiplevelvip/order-detail/order-detail.axml b/sourcecode/alipay/pages/plugins/membershiplevelvip/order-detail/order-detail.axml
index 63074a2b2..c44d5d246 100644
--- a/sourcecode/alipay/pages/plugins/membershiplevelvip/order-detail/order-detail.axml
+++ b/sourcecode/alipay/pages/plugins/membershiplevelvip/order-detail/order-detail.axml
@@ -3,7 +3,7 @@
     <view class="panel-content bg-white">
       <view a:for="{{detail_list}}" a:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/alipay/pages/plugins/membershiplevelvip/profit-detail/profit-detail.axml b/sourcecode/alipay/pages/plugins/membershiplevelvip/profit-detail/profit-detail.axml
index 63074a2b2..c44d5d246 100644
--- a/sourcecode/alipay/pages/plugins/membershiplevelvip/profit-detail/profit-detail.axml
+++ b/sourcecode/alipay/pages/plugins/membershiplevelvip/profit-detail/profit-detail.axml
@@ -3,7 +3,7 @@
     <view class="panel-content bg-white">
       <view a:for="{{detail_list}}" a:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/alipay/pages/plugins/wallet/user-cash-detail/user-cash-detail.axml b/sourcecode/alipay/pages/plugins/wallet/user-cash-detail/user-cash-detail.axml
index 63074a2b2..c44d5d246 100644
--- a/sourcecode/alipay/pages/plugins/wallet/user-cash-detail/user-cash-detail.axml
+++ b/sourcecode/alipay/pages/plugins/wallet/user-cash-detail/user-cash-detail.axml
@@ -3,7 +3,7 @@
     <view class="panel-content bg-white">
       <view a:for="{{detail_list}}" a:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/alipay/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.axml b/sourcecode/alipay/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.axml
index 63074a2b2..c44d5d246 100644
--- a/sourcecode/alipay/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.axml
+++ b/sourcecode/alipay/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.axml
@@ -3,7 +3,7 @@
     <view class="panel-content bg-white">
       <view a:for="{{detail_list}}" a:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/alipay/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.axml b/sourcecode/alipay/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.axml
index 63074a2b2..c44d5d246 100644
--- a/sourcecode/alipay/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.axml
+++ b/sourcecode/alipay/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.axml
@@ -3,7 +3,7 @@
     <view class="panel-content bg-white">
       <view a:for="{{detail_list}}" a:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/baidu/.wx2swaninfo b/sourcecode/baidu/.wx2swaninfo
deleted file mode 100644
index 2d30a9388..000000000
--- a/sourcecode/baidu/.wx2swaninfo
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    'toolName': 'wx2swan',
-    'toolCliVersion': '1.2.8',
-    'createTime': '1563280015494'
-}
\ No newline at end of file
diff --git a/sourcecode/baidu/app.js b/sourcecode/baidu/app.js
index cd10f49ab..e7d6e9d59 100755
--- a/sourcecode/baidu/app.js
+++ b/sourcecode/baidu/app.js
@@ -71,7 +71,7 @@ App({
     // 请求地址
     request_url: "{{request_url}}",
     // request_url: 'http://shopxo.com/',
-    // request_url: 'https://dev.shopxo.net/',
+     request_url: 'https://dev.shopxo.net/',
 
     // 基础信息
     application_title: "{{application_title}}",
@@ -84,64 +84,36 @@ App({
   /**
    * 小程序初始化
    */
-  onLaunch(options) {
+  onLaunch(params) {
+    // 启动参数处理
+    params = this.launch_params_handle(params);
+
     // 设置设备信息
     this.set_system_info();
 
-    // 启动query参数处理
-    this.startup_query(options);
-
     // 初始化配置
     this.init_config();
   },
 
   /**
-   * 启动query参数处理
+   * 启动参数处理
    */
-  startup_query(params) {
-    // 没有启动参数则返回
-    if ((params || null) == null) {
-      return false;
+  launch_params_handle(params) {
+    // 启动参数处理
+    if ((params.query || null) != null) {
+      params = params.query;
     }
 
-    // 启动处理类型
-    var type = params.type || null;
-    switch (type) {
-      // type=page
-      case "page":
-        // 页面
-        var page = params.page || null;
-
-        // 参数名
-        var params_field = params.params_field || null;
-
-        // 参数值
-        var params_value = params.params_value || null;
-
-        // 页面跳转
-        if (page != null) {
-          swan.navigateTo({
-            url: "/pages/" + page + "/" + page + "?" + params_field + "=" + params_value
-          });
-        }
-        break;
-
-      // type=view
-      case "view":
-        var url = params.url || null;
-
-        // 页面跳转
-        if (url != null) {
-          swan.navigateTo({
-            url: '/pages/web-view/web-view?url=' + url
-          });
-        }
-        break;
-
-      // 默认
-      default:
-        break;
+    if ((params.scene || null) != null) {
+      params = this.url_params_to_json(decodeURIComponent(params.scene));
     }
+
+    // 缓存启动参数
+    swan.setStorage({
+      key: this.data.cache_launch_info_key,
+      data: params
+    });
+    return params;
   },
 
   /**
@@ -198,12 +170,13 @@ App({
     // 用户信息
     var user = this.get_user_cache_info();
     var token = (user == false) ? '' : user.token || '';
+    var uuid = this.request_uuid();
     return this.data.request_url +
       "index.php?s=/api/" + c + "/" + a + plugins_params+
       "&application=app&application_client_type=baidu" +
-      "&token=" +
-      token +
+      "&token=" + token +
       "&ajax=ajax" +
+      "&uuid="+ uuid +
       params;
   },
 
@@ -554,12 +527,7 @@ App({
             return false;
           }
 
-          swan.openLocation({
-            name: values[0],
-            address: values[1],
-            longitude: parseFloat(values[2]),
-            latitude: parseFloat(values[3])
-          });
+          this.open_location(values[2], values[3], values[0], values[1]);
           break;
 
         // 拨打电话
@@ -722,4 +690,163 @@ App({
     }
   },
 
+  /**
+   * 获取配置信息、可指定默认值
+   * key              数据key（支持多级读取、以 . 分割key名称）
+   * default_value    默认值
+   */
+  get_config(key, default_value) {
+    var value = null;
+    var config = swan.getStorageSync(this.data.cache_config_info_key) || null;
+
+    if (config != null) {
+      // 数据读取
+      var arr = key.split('.');
+
+      if (arr.length == 1) {
+        value = config[key] == undefined ? null : config[key];
+      } else {
+        value = config;
+
+        for (var i in arr) {
+          if (value[arr[i]] != undefined) {
+            value = value[arr[i]];
+          } else {
+            value = null;
+            break;
+          }
+        }
+      }
+    }
+
+    return value === null ? default_value === undefined ? value : default_value : value;
+  },
+
+  // 初始化 配置信息
+  init_config() {
+    var self = this;
+    swan.request({
+      url: this.get_request_url('common', 'base'),
+      method: 'POST',
+      data: {},
+      dataType: 'json',
+      header: {
+        'content-type': 'application/x-www-form-urlencoded'
+      },
+      success: res => {
+        if (res.data.code == 0) {
+          swan.setStorage({
+            key: this.data.cache_config_info_key,
+            data: res.data.data,
+            fail: () => {
+              this.showToast('配置信息缓存失败');
+            }
+          });
+        } else {
+          this.showToast(res.data.msg);
+        }
+      },
+      fail: () => {
+        this.showToast('服务器请求出错');
+      }
+    });
+  },
+
+  /**
+   * 配置是否有效(100毫秒检验一次、最多检验100次)
+   * object     回调操作对象
+   * method     回调操作对象的函数
+   */
+  is_config(object, method) {
+    var self = this;
+    var count = 0;
+    var timer = setInterval(function () {
+      if (self.get_config('status') == 1) {
+        clearInterval(timer);
+
+        if (typeof object === 'object' && (method || null) != null) {
+          object[method](true);
+        }
+      }
+
+      count++;
+
+      if (count >= 100) {
+        clearInterval(timer);
+      }
+    }, 100);
+  },
+
+  /**
+   * 百度坐标BD-09到火星坐标GCJ02(高德，谷歌，腾讯坐标)
+   * object     回调操作对象
+   * method     回调操作对象的函数
+   */
+  map_bd_to_gcj(lng, lat) {
+    let x_pi = 3.14159265358979324 * 3000.0 / 180.0;
+    let x = lng - 0.0065;
+    let y = lat - 0.006;
+    let z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * x_pi);
+    let theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * x_pi);
+    let lngs = z * Math.cos(theta);
+    let lats = z * Math.sin(theta);
+    return {
+      lng: lngs,
+      lat: lats
+    };
+  },
+
+  /**
+   * 百度坐标BD-09到火星坐标GCJ02(高德，谷歌，腾讯坐标)
+   * lng        经度
+   * lat        纬度
+   * name       地图上面显示的名称
+   * address    地图上面显示的详细地址
+   * scale      缩放比例，范围5~18
+   */
+  open_location(lng, lat, name, address, scale) {
+    if (lng == undefined || lat == undefined || lng == '' || lat == '') {
+      this.showToast('坐标有误');
+      return false;
+    }
+
+    // 转换坐标打开位置
+    var position = this.map_bd_to_gcj(parseFloat(lng), parseFloat(lat));
+    swan.openLocation({
+      name: name || '',
+      address: address || '',
+      scale: scale || 18,
+      longitude: position.lng,
+      latitude: position.lat
+    });
+  },
+
+  // uuid生成
+  uuid() {
+    var d = new Date().getTime();
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+      var r = (d + Math.random() * 16) % 16 | 0;
+      d = Math.floor(d / 16);
+      return (c == 'x' ? r : r & 0x3 | 0x8).toString(16);
+    });
+  },
+
+  // 获取当前uuid
+  request_uuid() {
+    var uuid = swan.getStorageSync(this.data.cache_user_uuid_key) || null;
+
+    if (uuid == null) {
+      uuid = this.uuid();
+      swan.setStorage({
+        key: this.data.cache_user_uuid_key,
+        data: uuid,
+        fail: () => {
+          this.showToast('uuid缓存失败');
+        }
+      });
+    }
+
+    return uuid;
+  }
+
 });
\ No newline at end of file
diff --git a/sourcecode/baidu/app.json b/sourcecode/baidu/app.json
index aad8e4eeb..b15ce9bc5 100755
--- a/sourcecode/baidu/app.json
+++ b/sourcecode/baidu/app.json
@@ -40,7 +40,8 @@
     "pages/plugins/distribution/extraction/extraction",
     "pages/plugins/distribution/extraction-apply/extraction-apply",
     "pages/plugins/distribution/extraction-order/extraction-order",
-    "pages/plugins/distribution/introduce/introduce"
+    "pages/plugins/distribution/introduce/introduce",
+    "pages/plugins/exchangerate/currency/currency"
   ],
   "window": {
     "navigationBarTitleText": "{{application_title}}",
diff --git a/sourcecode/baidu/components/quick-nav/quick-nav.css b/sourcecode/baidu/components/quick-nav/quick-nav.css
new file mode 100644
index 000000000..3171674c0
--- /dev/null
+++ b/sourcecode/baidu/components/quick-nav/quick-nav.css
@@ -0,0 +1,101 @@
+/**
+ * 按钮
+ */
+ .quick-nav-movable-container {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  top: 150rpx;
+  left: 0;
+  background:transparent;
+  pointer-events: none;
+  z-index: 2;
+}
+.quick-nav-event-submit {
+  pointer-events: auto;
+  position: fixed;
+  bottom: 150rpx;
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 50%;
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
+  background-color: rgb(210 54 76 / 80%);
+}
+.quick-nav-event-submit image {
+  width: 50rpx;
+  height: 50rpx;
+  margin: 25rpx auto 25rpx auto;
+  display: block;
+}
+
+/**
+ * 弹窗
+ */
+.quick-nav-popup-container {
+  padding: 20rpx 10rpx 0 10rpx;
+  background: #fff;
+}
+.quick-nav-popup-container .close {
+  overflow: hidden;
+}
+.quick-nav-popup-container .close .icon-right {
+  float: right;
+}
+.quick-nav-popup-content {
+  max-height: 80vh;
+  overflow-y: scroll;
+  overflow-x: hidden;
+  padding-bottom: 20rpx;
+}
+
+/**
+ * 内容
+ */
+.quick-nav-data-list {
+  overflow: hidden;
+  background: #fff;
+}
+.quick-nav-data-list .items {
+  width: calc(25% - 60rpx);
+  float: left;
+  padding: 30rpx;
+}
+.quick-nav-data-list .items-content {
+  border-radius: 50%;
+  padding: 20rpx;
+  text-align: center;
+  width: 70rpx;
+  height: 70rpx;
+  margin: 0 auto;
+}
+.quick-nav-data-list .items image {
+  width: 60rpx !important;
+  height: 60rpx !important;
+  margin-top: 5rpx;
+}
+.quick-nav-data-list .items .title {
+  margin-top: 10rpx;
+  font-size: 28rpx !important;
+  text-align:center;
+  -o-text-overflow: ellipsis;
+  text-overflow: ellipsis;	  
+  overflow: hidden;
+  white-space: nowrap;
+  max-width: 100%;
+}
+
+/*
+ * 没有数据
+ */
+.quick-nav-popup-container .no-data-box {
+  padding: 80rpx 0;
+  text-align: center;
+}
+.quick-nav-popup-container .no-data-box image {
+  width: 160rpx;
+  margin-bottom: 30rpx;
+}
+.quick-nav-popup-container .no-data-box .no-data-tips {
+  font-size: 28rpx;
+  color: #a6a6a6;
+}
\ No newline at end of file
diff --git a/sourcecode/baidu/components/quick-nav/quick-nav.js b/sourcecode/baidu/components/quick-nav/quick-nav.js
new file mode 100644
index 000000000..9158b4ede
--- /dev/null
+++ b/sourcecode/baidu/components/quick-nav/quick-nav.js
@@ -0,0 +1,56 @@
+const app = getApp();
+Component({
+  data: {
+    popup_status: false,
+    data_list: [],
+    system: null,
+    x: 0,
+    y: 0,
+    is_first: 1,
+  },
+  pageLifetimes: {
+    // 页面被展示
+    show: function() {
+      this.init_config();
+
+      // 非首次进入则重新初始化配置接口
+      if(this.data.is_first == 0) {
+        app.init_config();
+      }
+
+      // 数据设置
+      var system = app.get_system_info();
+      this.setData({
+        is_first: 0,
+        system: system,
+        x: 5,
+        y: (system.windowHeight || 450)-160,
+      });
+    },
+  },
+  methods: {
+    // 初始化配置
+    init_config(status) {
+      if((status || false) == true) {
+        this.setData({ data_list: app.get_config('quick_nav') || [] });
+      } else {
+        app.is_config(this, 'init_config');
+      }
+    },
+
+    // 弹层开启
+    quick_open_event(e) {
+      this.setData({popup_status: true, data_list: app.get_config('quick_nav') || []});
+    },
+
+    // 弹层关闭
+    quick_close_event(e) {
+      this.setData({ popup_status: false });
+    },
+
+    // 操作事件
+    navigation_event(e) {
+      app.operation_event(e);
+    },
+  },
+});
diff --git a/sourcecode/baidu/components/quick-nav/quick-nav.json b/sourcecode/baidu/components/quick-nav/quick-nav.json
new file mode 100644
index 000000000..66d926bfe
--- /dev/null
+++ b/sourcecode/baidu/components/quick-nav/quick-nav.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "component-popup": "/components/popup/popup"
+  }
+}
\ No newline at end of file
diff --git a/sourcecode/baidu/components/quick-nav/quick-nav.swan b/sourcecode/baidu/components/quick-nav/quick-nav.swan
new file mode 100644
index 000000000..07b7897b9
--- /dev/null
+++ b/sourcecode/baidu/components/quick-nav/quick-nav.swan
@@ -0,0 +1,31 @@
+<!-- 开启事件 -->
+<movable-area class="quick-nav-movable-container">
+  <movable-view direction="all" x="{{x}}" y="{{y}}" animation="{{false}}" class="quick-nav-event-submit" bindtap="quick_open_event">
+    <image src="/images/quick-submit-icon.png" mode="widthFix"></image>
+  </movable-view>
+</movable-area>
+
+<!-- 弹窗 -->
+<component-popup status="{{popup_status}}" position="bottom" bindonclose="quick_close_event">
+  <view class="quick-nav-popup-container">
+    <view class="close oh">
+      <view class="icon-right" catchtap="quick_close_event">
+        <icon type="clear" size="20" />
+      </view>
+    </view>
+    <view class="quick-nav-popup-content">
+      <view s-if="data_list.length > 0" class="quick-nav-data-list">
+        <view class="items" s-for="item, index in data_list" s-key="item">
+          <view class="items-content" data-value="{{item.event_value}}" data-type="{{item.event_type}}" bindtap="navigation_event" style="background-color:{{item.bg_color}}">
+            <image src="{{item.images_url}}" mode="aspectFit" />
+          </view>
+          <view class="title">{{item.name}}</view>
+        </view>
+      </view>
+      <view s-else>
+        <import src="/pages/common/nodata.swan" />
+        <template is="nodata" data="{{status: 0}}"></template>
+      </view>
+    </view>
+  </view>
+</component-popup>
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/buy/buy.js b/sourcecode/baidu/pages/buy/buy.js
index 3f997c234..76b679d0f 100755
--- a/sourcecode/baidu/pages/buy/buy.js
+++ b/sourcecode/baidu/pages/buy/buy.js
@@ -1,7 +1,6 @@
 const app = getApp();
 Page({
   data: {
-    currency_symbol: app.data.currency_symbol,
     data_list_loding_status: 1,
     buy_submit_disabled_status: false,
     data_list_loding_msg: '',
@@ -16,11 +15,17 @@ Page({
     is_first: 1,
     extension_data: [],
     payment_id: 0,
-    common_order_is_booking: 0,
     common_site_type: 0,
     extraction_address: [],
     site_model: 0,
-    buy_header_nav: [{ name: "快递邮寄", value: 0 }, { name: "自提点取货", value: 2 }],
+    buy_header_nav: [
+        { name: "快递邮寄", value: 0 },
+        { name: "自提点取货", value: 2 }
+      ],
+
+    // 基础配置
+    currency_symbol: app.data.currency_symbol,
+    common_order_is_booking: 0,
 
     // 优惠劵
     plugins_coupon_data: null,
@@ -40,11 +45,27 @@ Page({
   },
 
   onShow() {
+    // 数据加载
     this.init();
     this.setData({ is_first: 0 });
+
+    // 初始化配置
+    this.init_config();
   },
 
-  // 获取数据列表
+  // 初始化配置
+  init_config(status) {
+    if((status || false) == true) {
+      this.setData({
+        currency_symbol: app.get_config('currency_symbol'),
+        common_order_is_booking: app.get_config('config.common_order_is_booking'),
+      });
+    } else {
+      app.is_config(this, 'init_config');
+    }
+  },
+
+  // 获取数据
   init() {
     // 订单参数信息是否正确
     if (this.data.params == null) {
@@ -95,7 +116,6 @@ Page({
               total_price: data.base.actual_price,
               extension_data: data.extension_data || [],
               data_list_loding_status: 3,
-              common_order_is_booking: data.common_order_is_booking || 0,
               common_site_type: data.common_site_type || 0,
               extraction_address: data.base.extraction_address || [],
               plugins_coupon_data: data.plugins_coupon_data || null
@@ -341,14 +361,9 @@ Page({
       return false;
     }
 
-    var lng = parseFloat(data.lng || 0);
-    var lat = parseFloat(data.lat || 0);
-    swan.openLocation({
-      latitude: lat,
-      longitude: lng,
-      scale: 18,
-      name: data.name || data.alias || '',
-      address: (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || '')
-    });
+    // 打开地图
+    var name = data.name || data.alias || '';
+    var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || '');
+    app.open_location(data.lng, data.lat, name, address);
   }
 });
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/buy/buy.json b/sourcecode/baidu/pages/buy/buy.json
index 7d179bfd5..1ea7faef3 100755
--- a/sourcecode/baidu/pages/buy/buy.json
+++ b/sourcecode/baidu/pages/buy/buy.json
@@ -1,6 +1,7 @@
 {
   "enablePullDownRefresh": true,
   "usingComponents": {
+    "component-quick-nav": "/components/quick-nav/quick-nav",
     "component-popup": "/components/popup/popup"
   }
 }
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/buy/buy.swan b/sourcecode/baidu/pages/buy/buy.swan
index 1a1edddfd..8aebd345c 100755
--- a/sourcecode/baidu/pages/buy/buy.swan
+++ b/sourcecode/baidu/pages/buy/buy.swan
@@ -10,7 +10,7 @@
           <view class="item fl {{site_model == item.value ? 'cr-main' : 'cr-666'}}" data-value="{{item.value}}" bindtap="buy_header_nav_event">{{item.name}}</view>
         </block>
       </view>
-  
+
       <!-- 地址 -->
       <block s-if="common_site_type == 0 || common_site_type == 2 || common_site_type == 4">
         <view class="address bg-white arrow-right" bindtap="address_event">
@@ -31,7 +31,7 @@
         </view>
         <view class="address-divider spacing-mb"></view>
       </block>
-  
+
       <!-- 商品数据 -->
       <view class="goods-group-list bg-white spacing-mb" s-for="group, index in goods_list" s-key="key">
         <!-- 仓库分组 -->
@@ -83,16 +83,13 @@
           <text class="sales-price">{{currency_symbol}}{{group.order_base.actual_price}}</text>
         </view>
       </view>
-  
+
       <!-- 留言 -->
-      <view class="content-textarea-view bg-white spacing-mb">
-        <textarea bindblur="bind_user_note_blur_event" bindinput="bind_user_note_event" bindinput="bind_user_note_event" value="{=user_note_value=}" maxlength="60" placeholder="留言" focus="{{!user_note_disabled}}" disabled="{{user_note_disabled}}" />
-      </view>
       <view class="content-textarea-container bg-white spacing-mb">
         <textarea s-if="user_note_status" bindblur="bind_user_note_blur_event" bindinput="bind_user_note_event" focus="{{true}}" value="{{user_note_value}}" maxlength="60" placeholder="留言" />
         <view s-else bindtap="bind_user_note_tap_event" class="{{(user_note_value || null) == null ? 'cr-888' : ''}}">{{user_note_value || '留言'}}</view>
       </view>
-  
+
       <!-- 支付方式 -->
       <view s-if="payment_list.length > 0 && common_order_is_booking != 1" class="payment-list bg-white oh">
         <view class="item tc fl" s-for="item, index in payment_list" s-key="key">
@@ -102,7 +99,7 @@
           </view>
         </view>
       </view>
-  
+
       <!-- 导航 -->
       <view class="buy-nav oh wh-auto">
         <view class="nav-base bg-white fl br-t single-text">
@@ -114,12 +111,12 @@
         </view>
       </view>
     </view>
-  
+
     <view s-if="goods_list.length == 0">
         <import src="/pages/common/nodata.swan" />
         <template is="nodata" data="{{{status: data_list_loding_status, msg: data_list_loding_msg}}}"></template>
     </view>
-  
+
     <!-- 优惠劵选择 -->
     <component-popup status="{{popup_plugins_coupon_status}}" position="bottom" bindonclose="plugins_coupon_close_event">
       <import-sjs src="../../utils/tools.sjs" module="tools" />
@@ -154,4 +151,7 @@
         </view>
       </view>
     </component-popup>
-  </block>
\ No newline at end of file
+  </block>
+
+  <!-- 快捷导航 -->
+<component-quick-nav></component-quick-nav>
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/cart/cart.js b/sourcecode/baidu/pages/cart/cart.js
index 331da3fb5..b20571d87 100755
--- a/sourcecode/baidu/pages/cart/cart.js
+++ b/sourcecode/baidu/pages/cart/cart.js
@@ -1,7 +1,6 @@
 const app = getApp();
 Page({
   data: {
-    currency_symbol: app.data.currency_symbol,
     data_list_loding_status: 1,
     data_list_loding_msg: '',
     data_bottom_line_status: false,
@@ -11,17 +10,38 @@ Page({
     is_selected_all: false,
     buy_submit_disabled_status: true,
 
-    // 站点模式
+    // 基础配置
+    currency_symbol: app.data.currency_symbol,
     common_site_type: 0,
     common_is_exhibition_mode_btn_text: null,
-    customer_service_tel: null,
+    common_app_customer_service_tel: null,
   },
 
   onShow() {
     swan.setNavigationBarTitle({ title: app.data.common_pages_title.cart });
+
+    // 数据加载
     this.init();
+
+    // 初始化配置
+    this.init_config();
   },
 
+  // 初始化配置
+  init_config(status) {
+    if((status || false) == true) {
+      this.setData({
+        currency_symbol: app.get_config('currency_symbol'),
+        common_site_type: app.get_config('config.common_site_type'),
+        common_is_exhibition_mode_btn_text: app.get_config('config.common_is_exhibition_mode_btn_text', '立即咨询'),
+        common_app_customer_service_tel: app.get_config('config.common_app_customer_service_tel'),
+      });
+    } else {
+      app.is_config(this, 'init_config');
+    }
+  },
+
+  // 获取数据
   init(e) {
     var user = app.get_user_info(this, "init");
     if (user != false) {
@@ -84,11 +104,6 @@ Page({
             data_list_loding_status: data.data.length == 0 ? 0 : 3,
             data_bottom_line_status: true,
             data_list_loding_msg: '购物车空空如也',
-
-            // 站点模式
-            common_site_type: data.common_site_type || 0,
-            common_is_exhibition_mode_btn_text: data.common_is_exhibition_mode_btn_text || '立即咨询',
-            customer_service_tel: data.customer_service_tel || null,
           });
 
           // 导航购物车处理
@@ -382,7 +397,7 @@ Page({
 
   // 展示型事件
   exhibition_submit_event(e) {
-    app.call_tel(this.data.customer_service_tel);
+    app.call_tel(this.data.common_app_customer_service_tel);
   },
 
 });
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/cart/cart.json b/sourcecode/baidu/pages/cart/cart.json
index 312ca36b1..057eb057a 100755
--- a/sourcecode/baidu/pages/cart/cart.json
+++ b/sourcecode/baidu/pages/cart/cart.json
@@ -1,5 +1,6 @@
 {
     "enablePullDownRefresh": true,
     "usingComponents": {
+        "component-quick-nav": "/components/quick-nav/quick-nav"
     }
 }
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/cart/cart.swan b/sourcecode/baidu/pages/cart/cart.swan
index c2d2feca3..9faa02747 100755
--- a/sourcecode/baidu/pages/cart/cart.swan
+++ b/sourcecode/baidu/pages/cart/cart.swan
@@ -39,7 +39,7 @@
         <view class="fr remove" data-id="{{item.id}}" data-goodsid="{{item.goods_id}}" data-index="{{index}}" bindtap="cart_remove_event">移除</view>
       </view>
 
-      
+
     </view>
   </view>
 
@@ -83,4 +83,7 @@
 <view s-if="data_list.length == 0 && data_list_loding_status != 0">
   <import src="/pages/common/nodata.swan" />
   <template is="nodata" data="{{{status: data_list_loding_status, msg: data_list_loding_msg}}}"></template>
-</view>
\ No newline at end of file
+</view>
+
+<!-- 快捷导航 -->
+<component-quick-nav></component-quick-nav>
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/extraction-address/extraction-address.js b/sourcecode/baidu/pages/extraction-address/extraction-address.js
index eaf69847a..81f5c639c 100644
--- a/sourcecode/baidu/pages/extraction-address/extraction-address.js
+++ b/sourcecode/baidu/pages/extraction-address/extraction-address.js
@@ -107,21 +107,16 @@ Page({
   // 地图查看
   address_map_event(e) {
     var index = e.currentTarget.dataset.index || 0;
-    var ads = this.data.data_list[index] || null;
-    if (ads == null) {
+    var data = this.data.data_list[index] || null;
+    if (data == null) {
       app.showToast("地址有误");
       return false;
     }
 
-    var lng = parseFloat(ads.lng || 0);
-    var lat = parseFloat(ads.lat || 0);
-    swan.openLocation({
-      latitude: lat,
-      longitude: lng,
-      scale: 18,
-      name: ads.alias || '',
-      address: (ads.province_name || '') + (ads.city_name || '') + (ads.county_name || '') + (ads.address || '')
-    });
+    // 打开地图
+    var name = data.name || data.alias || '';
+    var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || '');
+    app.open_location(data.lng, data.lat, name, address);
   },
 
   // 地址内容事件
diff --git a/sourcecode/baidu/pages/goods-category/goods-category.js b/sourcecode/baidu/pages/goods-category/goods-category.js
index 62a3fe04d..9ecfd19bd 100755
--- a/sourcecode/baidu/pages/goods-category/goods-category.js
+++ b/sourcecode/baidu/pages/goods-category/goods-category.js
@@ -4,13 +4,31 @@ Page({
     data_list_loding_status: 1,
     nav_active_index: 0,
     data_list: [],
+    data_content: null,
+
+    // 基础配置
     category_show_level: 3,
-    data_content: null
   },
 
   onShow() {
     swan.setNavigationBarTitle({ title: app.data.common_pages_title.goods_category });
+
+    // 数据加载
     this.init();
+
+    // 初始化配置
+    this.init_config();
+  },
+
+  // 初始化配置
+  init_config(status) {
+    if((status || false) == true) {
+      this.setData({
+        category_show_level: app.get_config('config.category_show_level'),
+      });
+    } else {
+      app.is_config(this, 'init_config');
+    }
   },
 
   // 获取数据
diff --git a/sourcecode/baidu/pages/goods-category/goods-category.json b/sourcecode/baidu/pages/goods-category/goods-category.json
index 3bd5ed8a4..c2a415ed6 100755
--- a/sourcecode/baidu/pages/goods-category/goods-category.json
+++ b/sourcecode/baidu/pages/goods-category/goods-category.json
@@ -1,3 +1,6 @@
 {
-    "enablePullDownRefresh": true
-}
\ No newline at end of file
+    "enablePullDownRefresh": true,
+    "usingComponents": {
+      "component-quick-nav": "/components/quick-nav/quick-nav"
+    }
+  }
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/goods-category/goods-category.swan b/sourcecode/baidu/pages/goods-category/goods-category.swan
index fb050d63d..2cb672e0d 100755
--- a/sourcecode/baidu/pages/goods-category/goods-category.swan
+++ b/sourcecode/baidu/pages/goods-category/goods-category.swan
@@ -70,8 +70,11 @@
       </view>
     </block>
   </view>
-  
+
   <view s-if="data_list.length == 0 && data_list_loding_status != 0">
     <import src="/pages/common/nodata.swan" />
     <template is="nodata" data="{{{status: data_list_loding_status}}}"></template>
-  </view>
\ No newline at end of file
+  </view>
+
+  <!-- 快捷导航 -->
+<component-quick-nav></component-quick-nav>
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/goods-detail/goods-detail.css b/sourcecode/baidu/pages/goods-detail/goods-detail.css
index 971813056..ac7ccd827 100755
--- a/sourcecode/baidu/pages/goods-detail/goods-detail.css
+++ b/sourcecode/baidu/pages/goods-detail/goods-detail.css
@@ -164,9 +164,9 @@
 }
 .goods-title {
   font-size: 32rpx;
-  line-height: 44rpx;
+  line-height: 48rpx;
   font-weight: 500;
-  padding: 8rpx 10rpx;
+  padding: 5rpx 10rpx;
 }
 .goods-base {
     padding: 15rpx 10rpx;
diff --git a/sourcecode/baidu/pages/goods-detail/goods-detail.js b/sourcecode/baidu/pages/goods-detail/goods-detail.js
index a98920d52..df861a4ea 100755
--- a/sourcecode/baidu/pages/goods-detail/goods-detail.js
+++ b/sourcecode/baidu/pages/goods-detail/goods-detail.js
@@ -1,8 +1,6 @@
 const app = getApp();
 Page({
   data: {
-    currency_symbol: app.data.currency_symbol,
-    
     indicator_dots: false,
     indicator_color: 'rgba(0, 0, 0, .3)',
     indicator_active_color: '#e31c55',
@@ -17,7 +15,6 @@ Page({
     goods_photo: [],
     goods_specifications_choose: [],
     goods_content_app: [],
-
     popup_status: false,
     goods_favor_text: '收藏',
     goods_favor_icon: '/images/goods-detail-favor-icon-0.png',
@@ -25,6 +22,8 @@ Page({
     buy_event_type: 'buy',
     nav_submit_text: '立即购买',
     nav_submit_is_disabled: true,
+    common_site_type: 0,
+    is_goods_site_type_consistent: 0,
 
     goods_spec_base_price: 0,
     goods_spec_base_original_price: 0,
@@ -32,12 +31,18 @@ Page({
     goods_spec_base_images: '',
 
     show_field_price_text: null,
-
     goods_video_is_autoplay: false,
-    common_app_is_use_mobile_detail: 1,
-    common_is_goods_detail_show_photo: 0,
+    popup_share_status: false,
 
+    // 购物车快捷导航
+    quick_nav_cart_count: 0,
+
+    // 基础配置
+    currency_symbol: app.data.currency_symbol,
     common_app_is_online_service: 0,
+    common_app_is_use_mobile_detail: 0,
+    common_is_goods_detail_show_photo: 0,
+    common_app_customer_service_tel: null,
 
     // 限时秒杀插件
     plugins_limitedtimediscount_is_valid: 0,
@@ -49,31 +54,45 @@ Page({
 
     // 优惠劵
     plugins_coupon_data: null,
-
-    // 购物车快捷导航
-    quick_nav_cart_count: 0,
-
-    // 站点类型
-    common_site_type: 0,
-    is_goods_site_type_consistent: 0,
-    customer_service_tel: null,
-
-    // 优惠劵领取
     temp_coupon_receive_index: null,
     temp_coupon_receive_value: null,
   },
 
   onLoad(params) {
-    //params['goods_id']=2;
-    this.setData({ params: params });
-    this.init();
+    // 启动参数处理
+    params = app.launch_params_handle(params);
+
+    // 参数赋值,初始化
+    //params['goods_id']=12;
+    this.setData({params: params});
   },
 
   onShow() {
     swan.setNavigationBarTitle({ title: this.data.goods == null ? app.data.common_pages_title.goods_detail : this.data.goods.title });
+
+    // 数据加载
+    this.init();
+
+    // 初始化配置
+    this.init_config();
   },
 
-  // 获取数据列表
+  // 初始化配置
+  init_config(status) {
+    if((status || false) == true) {
+      this.setData({
+        currency_symbol: app.get_config('currency_symbol'),
+        common_app_is_use_mobile_detail: app.get_config('config.common_app_is_use_mobile_detail'),
+        common_is_goods_detail_show_photo: app.get_config('config.common_is_goods_detail_show_photo'),
+        common_app_is_online_service: app.get_config('config.common_app_is_online_service'),
+        common_app_customer_service_tel: app.get_config('config.common_app_customer_service_tel'),
+      });
+    } else {
+      app.is_config(this, 'init_config');
+    }
+  },
+
+  // 获取数据
   init() {
     // 参数校验
     if ((this.data.params.goods_id || null) == null) {
@@ -104,6 +123,8 @@ Page({
           if (res.data.code == 0) {
             var data = res.data.data;
             self.setData({
+              data_bottom_line_status: true,
+              data_list_loding_status: 3,
               goods: data.goods,
               indicator_dots: data.goods.photo.length > 1,
               autoplay: data.goods.photo.length > 1,
@@ -113,18 +134,17 @@ Page({
               temp_buy_number: data.goods.buy_min_number || 1,
               goods_favor_text: data.goods.is_favor == 1 ? '已收藏' : '收藏',
               goods_favor_icon: '/images/goods-detail-favor-icon-' + data.goods.is_favor + '.png',
-              data_bottom_line_status: true,
-              data_list_loding_status: 3,
+
+              nav_submit_text: data.nav_submit_text,
+              nav_submit_is_disabled: data.nav_submit_is_disabled,
+              common_site_type: data.common_site_type || 0,
+              is_goods_site_type_consistent: data.is_goods_site_type_consistent || 0,
 
               goods_spec_base_price: data.goods.price,
               goods_spec_base_original_price: data.goods.original_price,
               goods_spec_base_inventory: data.goods.inventory,
               goods_spec_base_images: data.goods.images,
-
               show_field_price_text: data.goods.show_field_price_text == '销售价' ? null : data.goods.show_field_price_text.replace(/<[^>]+>/g, "") || null,
-              common_app_is_use_mobile_detail: data.common_app_is_use_mobile_detail || 0,
-              common_is_goods_detail_show_photo: data.common_is_goods_detail_show_photo || 0,
-              common_app_is_online_service: data.common_app_is_online_service || 0,
 
               plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null,
               plugins_limitedtimediscount_is_valid: ((data.plugins_limitedtimediscount_data || null) != null && (data.plugins_limitedtimediscount_data.is_valid || 0) == 1) ? 1 : 0,
@@ -145,34 +165,6 @@ Page({
             // 不能选择规格处理
             this.goods_specifications_choose_handle_dont(0);
 
-            // 购买按钮处理
-            var nav_submit_text = ((data.common_order_is_booking || 0) == 0) ? '立即购买' : '立即预约';
-            var nav_submit_is_disabled = (data.goods.is_shelves == 1 && data.goods.inventory > 0) ? false : true;
-            if (data.goods.is_shelves != 1) {
-              nav_submit_text = '已下架';
-              nav_submit_is_disabled = true;
-            } else {
-              if(data.goods.inventory <= 0) {
-                nav_submit_text = '卖光了';
-                nav_submit_is_disabled = true;
-              }
-            }
-
-            // 站点模式 - 是否展示型
-            var common_site_type = data.common_site_type || 0;
-            if (common_site_type == 1) {
-              nav_submit_text = data.common_is_exhibition_mode_btn_text || '立即咨询';
-            }
-
-            // 数据赋值
-            this.setData({
-              nav_submit_text: nav_submit_text,
-              nav_submit_is_disabled: nav_submit_is_disabled,
-              common_site_type: common_site_type,
-              is_goods_site_type_consistent: data.is_goods_site_type_consistent || 0,
-              customer_service_tel: data.customer_service_tel || null,
-            });
-
             // 页面信息设置
             this.set_page_info();
           } else {
@@ -758,7 +750,7 @@ Page({
 
   // 展示型事件
   exhibition_submit_event(e) {
-    app.call_tel(this.data.customer_service_tel);
+    app.call_tel(this.data.common_app_customer_service_tel);
   },
 
   // 自定义分享
diff --git a/sourcecode/baidu/pages/goods-detail/goods-detail.json b/sourcecode/baidu/pages/goods-detail/goods-detail.json
index bdfdb2f27..0b69a1075 100755
--- a/sourcecode/baidu/pages/goods-detail/goods-detail.json
+++ b/sourcecode/baidu/pages/goods-detail/goods-detail.json
@@ -1,6 +1,7 @@
 {
   "enablePullDownRefresh": true,
   "usingComponents": {
+    "component-quick-nav": "/components/quick-nav/quick-nav",
     "component-popup": "/components/popup/popup",
     "component-badge": "/components/badge/badge"
   }
diff --git a/sourcecode/baidu/pages/goods-detail/goods-detail.swan b/sourcecode/baidu/pages/goods-detail/goods-detail.swan
index ddaee203a..4cd8cd4bb 100755
--- a/sourcecode/baidu/pages/goods-detail/goods-detail.swan
+++ b/sourcecode/baidu/pages/goods-detail/goods-detail.swan
@@ -35,7 +35,7 @@
       <view class="goods-share tc" bindtap="popup_share_event">
       <button class="goods-share tc" type="default" size="mini" open-type="share" hover-class="none">
         <image src="/images/goods-detail-share-icon.png" mode="scaleToFill" class="dis-block" />
-        <view class="cr-888">分享</view>        
+        <view class="cr-888">分享</view>
       </view>
       <text s-if="(show_field_price_text || null) != null" class="price-icon">{{show_field_price_text}}</text>
       <text class="sales-price">{{currency_symbol}}{{goods.price}}</text>
@@ -241,4 +241,7 @@
     </view>
     <image src="/images/default-cart-icon.png" class="dis-block"></image>
   </view>
-</navigator>
\ No newline at end of file
+</navigator>
+
+<!-- 快捷导航 -->
+<component-quick-nav></component-quick-nav>
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/goods-search/goods-search.css b/sourcecode/baidu/pages/goods-search/goods-search.css
index 77d21ce3e..ab366edb2 100755
--- a/sourcecode/baidu/pages/goods-search/goods-search.css
+++ b/sourcecode/baidu/pages/goods-search/goods-search.css
@@ -73,11 +73,10 @@
   padding: 0 6rpx;
 }
 .screening-price input {
-  width: calc(50% - 16rpx);
+  width: calc(50% - 20px);
 }
 .screening-price .separator {
-  margin-top: 10rpx;
-  width: 30rpx;
+  line-height: 50rpx;
 }
 .popup-form .item {
   width: 480rpx;
diff --git a/sourcecode/baidu/pages/goods-search/goods-search.js b/sourcecode/baidu/pages/goods-search/goods-search.js
index 6eb7c807c..f488123fb 100755
--- a/sourcecode/baidu/pages/goods-search/goods-search.js
+++ b/sourcecode/baidu/pages/goods-search/goods-search.js
@@ -1,7 +1,6 @@
 const app = getApp();
 Page({
   data: {
-    currency_symbol: app.data.currency_symbol,
     data_list_loding_status: 1,
     data_bottom_line_status: false,
     data_list: [],
@@ -17,19 +16,47 @@ Page({
       { name: "热度", field: "access_count", sort: "asc", "icon": "default" },
       { name: "价格", field: "min_price", sort: "asc", "icon": "default" },
       { name: "最新", field: "id", sort: "asc", "icon": "default" }
-    ]
+    ],
+
+    // 基础配置
+    currency_symbol: app.data.currency_symbol,
   },
 
   onLoad(params) {
-    this.setData({ params: params, post_data: params });
-    this.init();
+    // 启动参数处理
+    params = app.launch_params_handle(params);
+
+    // 初始参数
+    this.setData({
+      params: params,
+      post_data: {
+        keywords: params.keywords || ''
+      }
+    });
   },
 
   onShow() {
     swan.setNavigationBarTitle({ title: app.data.common_pages_title.goods_search });
+
+    // 数据加载
+    this.init();
+
+    // 初始化配置
+    this.init_config();
   },
 
-  // 初始化
+  // 初始化配置
+  init_config(status) {
+    if((status || false) == true) {
+      this.setData({
+        currency_symbol: app.get_config('currency_symbol'),
+      });
+    } else {
+      app.is_config(this, 'init_config');
+    }
+  },
+
+  // 获取数据
   init() {
     // 获取数据
     this.get_data_list();
diff --git a/sourcecode/baidu/pages/goods-search/goods-search.json b/sourcecode/baidu/pages/goods-search/goods-search.json
index 7d179bfd5..1ea7faef3 100755
--- a/sourcecode/baidu/pages/goods-search/goods-search.json
+++ b/sourcecode/baidu/pages/goods-search/goods-search.json
@@ -1,6 +1,7 @@
 {
   "enablePullDownRefresh": true,
   "usingComponents": {
+    "component-quick-nav": "/components/quick-nav/quick-nav",
     "component-popup": "/components/popup/popup"
   }
 }
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/goods-search/goods-search.swan b/sourcecode/baidu/pages/goods-search/goods-search.swan
index de129d938..2465dc0b9 100755
--- a/sourcecode/baidu/pages/goods-search/goods-search.swan
+++ b/sourcecode/baidu/pages/goods-search/goods-search.swan
@@ -26,12 +26,12 @@
       </navigator>
     </view>
   </view>
-  
+
   <view s-if="data_list.length == 0">
     <import src="/pages/common/nodata.swan" />
     <template is="nodata" data="{{{status: data_list_loding_status}}}"></template>
   </view>
-    
+
   <import src="/pages/common/bottom_line.swan" />
   <template is="bottom_line" data="{{{status: data_bottom_line_status}}}"></template>
 </scroll-view>
@@ -40,12 +40,12 @@
 <component-popup status="{{is_show_popup_form}}" position="right" bindonclose="popup_form_event_close">
   <form bindsubmit="form_submit_event" class="popup-form oh bg-white">
     <view class="item oh screening-price">
-      <view class="title cr-666">价格区间(元)
+      <view class="title cr-666">价格区间(元)</view>
+      <view class="tc oh">
+        <input type="digit" placeholder="最低价" name="min_price" class="br fl" />
+        <text class="cr-888 separator">~</text>
+        <input type="digit" placeholder="最高价" name="max_price" class="br fr" />
       </view>
-      <input type="digit" placeholder="最低价" name="min_price" class="br fl" />
-      <view class="cr-888 fl tc separator">~
-      </view>
-      <input type="digit" placeholder="最高价" name="max_price" class="br fl" />
     </view>
     <view class="item keywords">
       <view class="title cr-666">关键字</view>
@@ -53,4 +53,7 @@
     </view>
     <button formType="submit" class="bg-main form-submit wh-auto" disabled="{{popup_form_loading_status}}" hover-class="none">确认</button>
   </form>
-</component-popup>
\ No newline at end of file
+</component-popup>
+
+<!-- 快捷导航 -->
+<component-quick-nav></component-quick-nav>
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/index/index.js b/sourcecode/baidu/pages/index/index.js
index f3e4e9d7d..23d2ca124 100755
--- a/sourcecode/baidu/pages/index/index.js
+++ b/sourcecode/baidu/pages/index/index.js
@@ -1,16 +1,18 @@
 const app = getApp();
 Page({
   data: {
-    currency_symbol: app.data.currency_symbol,
     load_status: 0,
     data_list_loding_status: 1,
     data_bottom_line_status: false,
     data_list: [],
     banner_list: [],
     navigation: [],
+
+    // 基础配置
+    currency_symbol: app.data.currency_symbol,
     common_shop_notice: null,
-    common_app_is_enable_search: 1,
-    common_app_is_enable_answer: 1,
+    common_app_is_enable_search: 0,
+    common_app_is_enable_answer: 0,
     common_app_is_header_nav_fixed: 0,
     common_app_is_online_service: 0,
 
@@ -23,10 +25,30 @@ Page({
   },
 
   onShow() {
+    // 数据加载
     this.init();
+
+    // 初始化配置
+    this.init_config();
   },
 
-  // 获取数据列表
+  // 初始化配置
+  init_config(status) {
+    if((status || false) == true) {
+      this.setData({
+        currency_symbol: app.get_config('currency_symbol'),
+        common_shop_notice: app.get_config('config.common_shop_notice'),
+        common_app_is_enable_search: app.get_config('config.common_app_is_enable_search'),
+        common_app_is_enable_answer: app.get_config('config.common_app_is_enable_answer'),
+        common_app_is_header_nav_fixed: app.get_config('config.common_app_is_header_nav_fixed'),
+        common_app_is_online_service: app.get_config('config.common_app_is_online_service'),
+      });
+    } else {
+      app.is_config(this, 'init_config');
+    }
+  },
+
+  // 获取数据
   init() {
     var self = this;
 
@@ -52,12 +74,7 @@ Page({
             banner_list: data.banner_list || [],
             navigation: data.navigation || [],
             data_list: data.data_list,
-            common_shop_notice: data.common_shop_notice || null,
-            common_app_is_enable_search: data.common_app_is_enable_search,
-            common_app_is_enable_answer: data.common_app_is_enable_answer,
-            common_app_is_header_nav_fixed: data.common_app_is_header_nav_fixed,
             data_list_loding_status: data.data_list.length == 0 ? 0 : 3,
-            common_app_is_online_service: data.common_app_is_online_service || 0,
             plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null,
             plugins_limitedtimediscount_is_valid: ((data.plugins_limitedtimediscount_data || null) != null && (data.plugins_limitedtimediscount_data.is_valid || 0) == 1) ? 1 : 0,
           });
diff --git a/sourcecode/baidu/pages/index/index.json b/sourcecode/baidu/pages/index/index.json
index facc6d737..73eb10b00 100755
--- a/sourcecode/baidu/pages/index/index.json
+++ b/sourcecode/baidu/pages/index/index.json
@@ -3,6 +3,7 @@
     "navigationBarBackgroundColor": "#d2364c",
     "backgroundColorTop": "#d2364c",
     "usingComponents": {
+        "component-quick-nav": "/components/quick-nav/quick-nav",
         "component-icon-nav": "/components/icon-nav/icon-nav",
         "component-banner": "/components/slider/slider"
     }
diff --git a/sourcecode/baidu/pages/index/index.swan b/sourcecode/baidu/pages/index/index.swan
index 9465a1140..3961fe4c7 100755
--- a/sourcecode/baidu/pages/index/index.swan
+++ b/sourcecode/baidu/pages/index/index.swan
@@ -8,7 +8,7 @@
 </view>
 
 <!-- 商城公告 -->
-<view s-if="common_shop_notice != null">
+<view s-if="(common_shop_notice || null) != null">
   <view class="tips">{{common_shop_notice}}</view>
 </view>
 
@@ -81,6 +81,9 @@
   <template is="online_service"></template>
 </view>
 
+<!-- 快捷导航 -->
+<component-quick-nav></component-quick-nav>
+
 <view s-if="load_status == 1">
   <import src="/pages/common/copyright.swan" />
   <template is="copyright"></template>
diff --git a/sourcecode/baidu/pages/plugins/coupon/index/index.js b/sourcecode/baidu/pages/plugins/coupon/index/index.js
index 4de0d86cf..d3475c5ea 100644
--- a/sourcecode/baidu/pages/plugins/coupon/index/index.js
+++ b/sourcecode/baidu/pages/plugins/coupon/index/index.js
@@ -1,7 +1,6 @@
 const app = getApp();
 Page({
   data: {
-    currency_symbol: app.data.currency_symbol,
     data_bottom_line_status: false,
     data_list_loding_status: 1,
     data_list_loding_msg: '',
@@ -10,19 +9,33 @@ Page({
 
     // 优惠劵领取
     temp_coupon_receive_index: null,
-    temp_coupon_receive_value: null
-  },
+    temp_coupon_receive_value: null,
 
-  onLoad(params) {
-    this.init();
+    // 基础配置
+    currency_symbol: app.data.currency_symbol,
   },
 
   onShow() {
-    swan.setNavigationBarTitle({ title: app.data.common_pages_title.coupon });
+    // 数据加载
+    this.init();
+
+    // 初始化配置
+    this.init_config();
   },
 
+  // 初始化配置
+  init_config(status) {
+    if((status || false) == true) {
+      this.setData({
+        currency_symbol: app.get_config('currency_symbol'),
+      });
+    } else {
+      app.is_config(this, 'init_config');
+    }
+  },
+
+  // 获取数据
   init() {
-    // 获取数据
     this.get_data_list();
   },
 
diff --git a/sourcecode/baidu/pages/plugins/coupon/index/index.json b/sourcecode/baidu/pages/plugins/coupon/index/index.json
index 331ad4f3d..2ba4ed159 100644
--- a/sourcecode/baidu/pages/plugins/coupon/index/index.json
+++ b/sourcecode/baidu/pages/plugins/coupon/index/index.json
@@ -1,3 +1,4 @@
 {
-  "enablePullDownRefresh": true
+  "enablePullDownRefresh": true,
+  "navigationBarTitleText": "领劵中心"
 }
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/plugins/coupon/user/user.js b/sourcecode/baidu/pages/plugins/coupon/user/user.js
index 320353d26..e4bd25670 100644
--- a/sourcecode/baidu/pages/plugins/coupon/user/user.js
+++ b/sourcecode/baidu/pages/plugins/coupon/user/user.js
@@ -1,24 +1,42 @@
 const app = getApp();
 Page({
   data: {
-    currency_symbol: app.data.currency_symbol,
     data_bottom_line_status: false,
     data_list_loding_status: 1,
     data_list_loding_msg: '',
     data_list: null,
 
-    nav_tabs_list: [{ name: "未使用", value: "not_use" }, { name: "已使用", value: "already_use" }, { name: "已过期", value: "already_expire" }],
-    nav_tabs_value: 'not_use'
-  },
+    nav_tabs_list: [
+      { name: "未使用", value: "not_use" },
+      { name: "已使用", value: "already_use" },
+      { name: "已过期", value: "already_expire" },
+    ],
+    nav_tabs_value: 'not_use',
 
-  onLoad(params) {
-    this.init();
+    // 基础配置
+    currency_symbol: app.data.currency_symbol,
   },
 
   onShow() {
-    swan.setNavigationBarTitle({ title: app.data.common_pages_title.user_coupon });
+    // 数据加载
+    this.init();
+
+    // 初始化配置
+    this.init_config();
   },
 
+  // 初始化配置
+  init_config(status) {
+    if((status || false) == true) {
+      this.setData({
+        currency_symbol: app.get_config('currency_symbol'),
+      });
+    } else {
+      app.is_config(this, 'init_config');
+    }
+  },
+
+  // 获取数据
   init() {
     var user = app.get_user_info(this, "init");
     if (user != false) {
diff --git a/sourcecode/baidu/pages/plugins/coupon/user/user.json b/sourcecode/baidu/pages/plugins/coupon/user/user.json
index 331ad4f3d..2a5d55f78 100644
--- a/sourcecode/baidu/pages/plugins/coupon/user/user.json
+++ b/sourcecode/baidu/pages/plugins/coupon/user/user.json
@@ -1,3 +1,4 @@
 {
-  "enablePullDownRefresh": true
+  "enablePullDownRefresh": true,
+  "navigationBarTitleText": "优惠券"
 }
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/plugins/distribution/extraction/extraction.js b/sourcecode/baidu/pages/plugins/distribution/extraction/extraction.js
index 92ffc8a2b..547dd467c 100644
--- a/sourcecode/baidu/pages/plugins/distribution/extraction/extraction.js
+++ b/sourcecode/baidu/pages/plugins/distribution/extraction/extraction.js
@@ -91,17 +91,12 @@ Page({
     if ((this.data.extraction || null) == null) {
       return false;
     }
+    var data = this.data.extraction;
 
-    var ads = this.data.extraction;
-    var lng = parseFloat(ads.lng || 0);
-    var lat = parseFloat(ads.lat || 0);
-    swan.openLocation({
-      latitude: lat,
-      longitude: lng,
-      scale: 18,
-      name: ads.alias || '',
-      address: (ads.province_name || '') + (ads.city_name || '') + (ads.county_name || '') + (ads.address || '')
-    });
+    // 打开地图
+    var name = data.name || data.alias || '';
+    var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || '');
+    app.open_location(data.lng, data.lat, name, address);
   },
 
   // 进入取货订单管理
diff --git a/sourcecode/baidu/pages/plugins/distribution/introduce/introduce.swan b/sourcecode/baidu/pages/plugins/distribution/introduce/introduce.swan
index d1c2d7d9a..1e33b24d3 100644
--- a/sourcecode/baidu/pages/plugins/distribution/introduce/introduce.swan
+++ b/sourcecode/baidu/pages/plugins/distribution/introduce/introduce.swan
@@ -12,7 +12,7 @@
         </view>
         <view class="item br-b oh">
           <view class="title fl">返佣比例</view>
-          <view class="content cr-888 fl br-l">
+          <view class="content fl br-l">
             <view>一级 {{item.level_rate_one}}%</view>
             <view s-if="data_base.level == undefined || data_base.level > 0">二级 {{item.level_rate_two}}%</view>
             <view s-if="data_base.level == undefined || data_base.level > 1">三级 {{item.level_rate_three}}%</view>
@@ -20,7 +20,7 @@
         </view>
         <view class="item br-b oh">
           <view class="title fl">消费金额</view>
-          <view class="content cr-888 fl br-l">{{item.rules_msg}}</view>
+          <view class="content fl br-l">{{item.rules_msg}}</view>
         </view>
       </view>
     </view>
diff --git a/sourcecode/baidu/pages/plugins/distribution/order-detail/order-detail.swan b/sourcecode/baidu/pages/plugins/distribution/order-detail/order-detail.swan
index b71620fc8..95eaf0c00 100644
--- a/sourcecode/baidu/pages/plugins/distribution/order-detail/order-detail.swan
+++ b/sourcecode/baidu/pages/plugins/distribution/order-detail/order-detail.swan
@@ -3,14 +3,14 @@
     <view class="panel-content bg-white">
       <view class="item br-b oh">
         <view class="title fl">用户头像</view>
-        <view class="content cr-888 fl br-l">
+        <view class="content fl br-l">
           <image src="{{detail.avatar}}" class="avatar dis-block fl" mode="widthFix" bindtap="avatar_event" data-value="{{detail.avatar}}" />
         </view>
       </view>
 
       <view s-for="item, index in detail_list" s-key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/baidu/pages/plugins/distribution/profit-detail/profit-detail.swan b/sourcecode/baidu/pages/plugins/distribution/profit-detail/profit-detail.swan
index 21d918c40..826754bdb 100644
--- a/sourcecode/baidu/pages/plugins/distribution/profit-detail/profit-detail.swan
+++ b/sourcecode/baidu/pages/plugins/distribution/profit-detail/profit-detail.swan
@@ -3,7 +3,7 @@
     <view class="panel-content bg-white">
       <view s-for="item, index in detail_list" s-key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/baidu/pages/plugins/distribution/statistics/statistics.js b/sourcecode/baidu/pages/plugins/distribution/statistics/statistics.js
index 39143b047..b69695d0c 100644
--- a/sourcecode/baidu/pages/plugins/distribution/statistics/statistics.js
+++ b/sourcecode/baidu/pages/plugins/distribution/statistics/statistics.js
@@ -1,7 +1,6 @@
 const app = getApp();
 Page({
   data: {
-    currency_symbol: app.data.currency_symbol,
     data_list_loding_status: 1,
     data_list_loding_msg: '加载中...',
     data_bottom_line_status: false,
@@ -16,13 +15,32 @@ Page({
 
     // 图表
     profit_chart: {},
-    user_chart: {}
+    user_chart: {},
+
+    // 基础配置
+    currency_symbol: app.data.currency_symbol,
   },
 
   onShow() {
+    // 数据加载
     this.init();
+
+    // 初始化配置
+    this.init_config();
   },
 
+  // 初始化配置
+  init_config(status) {
+    if((status || false) == true) {
+      this.setData({
+        currency_symbol: app.get_config('currency_symbol'),
+      });
+    } else {
+      app.is_config(this, 'init_config');
+    }
+  },
+
+  // 获取数据
   init() {
     var self = this;
     swan.showLoading({ title: "加载中..." });
diff --git a/sourcecode/baidu/pages/plugins/exchangerate/currency/currency.css b/sourcecode/baidu/pages/plugins/exchangerate/currency/currency.css
new file mode 100644
index 000000000..b0fc4eb85
--- /dev/null
+++ b/sourcecode/baidu/pages/plugins/exchangerate/currency/currency.css
@@ -0,0 +1,14 @@
+.exchangerate-container .item {
+  padding: 20rpx 10rpx;
+  font-size: 36rpx;
+}
+.exchangerate-container .item .icon image {
+  width: 50rpx;
+  height: 50rpx !important;
+  margin: 0 10rpx;
+  vertical-align: middle;
+}
+.exchangerate-container .item .single-text {
+  width: calc(100% - 80rpx);
+  line-height: 50rpx;
+}
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/plugins/exchangerate/currency/currency.js b/sourcecode/baidu/pages/plugins/exchangerate/currency/currency.js
new file mode 100644
index 000000000..8def9fd7a
--- /dev/null
+++ b/sourcecode/baidu/pages/plugins/exchangerate/currency/currency.js
@@ -0,0 +1,126 @@
+const app = getApp();
+Page({
+  data: {
+    data_bottom_line_status: false,
+    data_list_loding_status: 1,
+    data_list_loding_msg: '',
+    data_list: [],
+    data_default: null,
+    data_base: null,
+  },
+
+  onShow() {
+    // 数据加载
+    this.init();
+  },
+
+  // 获取数据
+  init() {
+    this.get_data_list();
+  },
+
+  // 获取数据
+  get_data_list() {
+    var self = this;
+    swan.showLoading({ title: "加载中..." });
+    if (self.data.data_list.length <= 0)
+    {
+      self.setData({
+        data_list_loding_status: 1
+      });
+    }
+
+    swan.request({
+      url: app.get_request_url("index", "index", "exchangerate"),
+      method: "POST",
+      data: {},
+      dataType: "json",
+      success: res => {
+        swan.hideLoading();
+        swan.stopPullDownRefresh();
+        if (res.data.code == 0) {
+          var data = res.data.data;
+          var status = ((data.data.data || []).length > 0);
+          this.setData({
+            data_base: data.base || null,
+            data_default: data.data.default || null,
+            data_list: data.data.data || [],
+            data_list_loding_msg: '',
+            data_list_loding_status: status ? 3 : 0,
+            data_bottom_line_status: status,
+          });
+        } else {
+          self.setData({
+            data_bottom_line_status: false,
+            data_list_loding_status: 2,
+            data_list_loding_msg: res.data.msg,
+          });
+          app.showToast(res.data.msg);
+        }
+      },
+      fail: () => {
+        swan.hideLoading();
+        swan.stopPullDownRefresh();
+        self.setData({
+          data_bottom_line_status: false,
+          data_list_loding_status: 2,
+          data_list_loding_msg: '服务器请求出错',
+        });
+        app.showToast("服务器请求出错");
+      }
+    });
+  },
+
+  // 选择事件
+  selected_event(e) {
+    // 参数处理
+    var index = e.currentTarget.dataset.index;
+    var temp_list = this.data.data_list;
+    var data = temp_list[index] || null;
+    if(data == null)
+    {
+      app.showToast('数据有误');
+      return false;
+    }
+
+    // id与当前默认一致则不处理
+    if (data.id != this.data.data_default.id)
+    {
+      var self = this;
+      swan.showLoading({ title: "处理中..." });
+      swan.request({
+        url: app.get_request_url("setcurrency", "index", "exchangerate"),
+        method: "POST",
+        data: { "currency": data.id },
+        dataType: "json",
+        header: { 'content-type': 'application/x-www-form-urlencoded' },
+        success: res => {
+          swan.hideLoading();
+          if (res.data.code == 0) {
+            app.showToast(res.data.msg, "success");
+            self.setData({ data_default: data });
+            // 重新初始化配置
+            app.init_config();
+
+            // 返回上一页
+            setTimeout(function () {
+              swan.navigateBack();
+            }, 1500);
+          } else {
+            app.showToast(res.data.msg);
+          }
+        },
+        fail: () => {
+          swan.hideLoading();
+          app.showToast("服务器请求出错");
+        }
+      });
+    }
+  },
+
+  // 下拉刷新
+  onPullDownRefresh() {
+    this.get_data_list();
+  },
+
+});
diff --git a/sourcecode/baidu/pages/plugins/exchangerate/currency/currency.json b/sourcecode/baidu/pages/plugins/exchangerate/currency/currency.json
new file mode 100644
index 000000000..eac1d0379
--- /dev/null
+++ b/sourcecode/baidu/pages/plugins/exchangerate/currency/currency.json
@@ -0,0 +1,4 @@
+{
+  "enablePullDownRefresh": true,
+  "navigationBarTitleText": "货币切换"
+}
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/plugins/exchangerate/currency/currency.swan b/sourcecode/baidu/pages/plugins/exchangerate/currency/currency.swan
new file mode 100644
index 000000000..b0186886b
--- /dev/null
+++ b/sourcecode/baidu/pages/plugins/exchangerate/currency/currency.swan
@@ -0,0 +1,19 @@
+<!-- 货币列表 -->
+<view s-if="data_list.length > 0" class="exchangerate-container">
+  <block s-for="item, index in data_list" s-key="item">
+    <view class="item oh spacing-mb bg-white" bindtap="selected_event" data-index="{{index}}">
+      <view s-if="common_site_type != 1"  class="fl icon">
+        <image src="/images/default-select{{item.id == data_default.id ? '-active' : ''}}-icon.png" mode="widthFix" />
+      </view>
+      <view class="fl single-text {{item.id == data_default.id ? 'cr-main' : 'cr-666'}}">{{item.name}} / {{item.symbol}}</view>
+    </view>
+  </block>
+</view>
+
+<view s-if="data_list_loding_status != 3">
+  <import src="/pages/common/nodata.swan" />
+  <template is="nodata" data="{{status: data_list_loding_status, msg: data_list_loding_msg}}"></template>
+</view>
+
+<import src="/pages/common/bottom_line.swan" />
+<template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/user-faovr/user-faovr.js b/sourcecode/baidu/pages/user-faovr/user-faovr.js
index 51c275f6a..872447458 100755
--- a/sourcecode/baidu/pages/user-faovr/user-faovr.js
+++ b/sourcecode/baidu/pages/user-faovr/user-faovr.js
@@ -1,19 +1,38 @@
 const app = getApp();
 Page({
   data: {
-    currency_symbol: app.data.currency_symbol,
     data_list: [],
     data_page_total: 0,
     data_page: 1,
     data_list_loding_status: 1,
-    data_bottom_line_status: false
+    data_bottom_line_status: false,
+
+    // 基础配置
+    currency_symbol: app.data.currency_symbol,
   },
 
   onShow() {
     swan.setNavigationBarTitle({ title: app.data.common_pages_title.user_favor });
+
+    // 数据加载
     this.init();
+
+    // 初始化配置
+    this.init_config();
   },
 
+  // 初始化配置
+  init_config(status) {
+    if((status || false) == true) {
+      this.setData({
+        currency_symbol: app.get_config('currency_symbol'),
+      });
+    } else {
+      app.is_config(this, 'init_config');
+    }
+  },
+
+  // 获取数据
   init() {
     var user = app.get_user_info(this, "init");
     if (user != false) {
diff --git a/sourcecode/baidu/pages/user-goods-browse/user-goods-browse.js b/sourcecode/baidu/pages/user-goods-browse/user-goods-browse.js
index 51435a50a..29dec34e7 100755
--- a/sourcecode/baidu/pages/user-goods-browse/user-goods-browse.js
+++ b/sourcecode/baidu/pages/user-goods-browse/user-goods-browse.js
@@ -1,19 +1,38 @@
 const app = getApp();
 Page({
   data: {
-    currency_symbol: app.data.currency_symbol,
     data_list: [],
     data_page_total: 0,
     data_page: 1,
     data_list_loding_status: 1,
-    data_bottom_line_status: false
+    data_bottom_line_status: false,
+
+    // 基础配置
+    currency_symbol: app.data.currency_symbol,
   },
 
   onShow() {
     swan.setNavigationBarTitle({ title: app.data.common_pages_title.user_goods_browse });
+
+    // 数据加载
     this.init();
+
+    // 初始化配置
+    this.init_config();
   },
 
+  // 初始化配置
+  init_config(status) {
+    if((status || false) == true) {
+      this.setData({
+        currency_symbol: app.get_config('currency_symbol'),
+      });
+    } else {
+      app.is_config(this, 'init_config');
+    }
+  },
+
+  // 获取数据
   init() {
     var user = app.get_user_info(this, "init");
     if (user != false) {
diff --git a/sourcecode/baidu/pages/user-order-detail/user-order-detail.js b/sourcecode/baidu/pages/user-order-detail/user-order-detail.js
index 6668172aa..9072c7411 100755
--- a/sourcecode/baidu/pages/user-order-detail/user-order-detail.js
+++ b/sourcecode/baidu/pages/user-order-detail/user-order-detail.js
@@ -1,7 +1,6 @@
 const app = getApp();
 Page({
   data: {
-    currency_symbol: app.data.currency_symbol,
     params: null,
     data_list_loding_status: 1,
     data_list_loding_msg: '',
@@ -15,13 +14,16 @@ Page({
 
   onLoad(params) {
     this.setData({ params: params });
-    this.init();
   },
 
   onShow() {
     swan.setNavigationBarTitle({ title: app.data.common_pages_title.user_order_detail });
+
+    // 数据加载
+    this.init();
   },
 
+  // 获取数据
   init() {
     var self = this;
     swan.showLoading({ title: "加载中..." });
@@ -103,17 +105,12 @@ Page({
       app.showToast("地址有误");
       return false;
     }
+    var data = this.data.detail.address_data;
 
-    var ads = this.data.detail.address_data;
-    var lng = parseFloat(ads.lng || 0);
-    var lat = parseFloat(ads.lat || 0);
-    swan.openLocation({
-      latitude: lat,
-      longitude: lng,
-      scale: 18,
-      name: ads.alias || '',
-      address: (ads.province_name || '') + (ads.city_name || '') + (ads.county_name || '') + (ads.address || '')
-    });
+    // 打开地图
+    var name = data.name || data.alias || '';
+    var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || '');
+    app.open_location(data.lng, data.lat, name, address);
   },
 
   // 下拉刷新
diff --git a/sourcecode/baidu/pages/user-order-detail/user-order-detail.swan b/sourcecode/baidu/pages/user-order-detail/user-order-detail.swan
index dd2f8ea8b..f4ad1ff34 100755
--- a/sourcecode/baidu/pages/user-order-detail/user-order-detail.swan
+++ b/sourcecode/baidu/pages/user-order-detail/user-order-detail.swan
@@ -29,8 +29,8 @@
             </block>
           </view>
           <view class="oh goods-price">
-            <text class="sales-price">{{currency_symbol}}{{item.price}}</text>
-            <text s-if="item.original_price > 0" class="original-price">{{currency_symbol}}{{item.original_price}}</text>
+            <text class="sales-price">{{detail.currency_data.currency_symbol}}{{item.price}}</text>
+            <text s-if="item.original_price > 0" class="original-price">{{detail.currency_data.currency_symbol}}{{item.original_price}}</text>
             <text class="buy-number">x{{item.buy_number}}</text>
           </view>
         </navigator>
@@ -75,7 +75,7 @@
     <view class="panel-content bg-white">
       <view s-for="item, index in detail_list" s-key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
@@ -86,7 +86,7 @@
     <view class="panel-content bg-white">
       <view s-for="item, index in extension_data" s-key="item" class="item br-b oh">
       <text class="title">{{item.name}}</text>
-      <text class="content cr-888 br-l">{{item.tips}}</text>
+      <text class="content br-l">{{item.tips}}</text>
     </view>
     </view>
   </view>
diff --git a/sourcecode/baidu/pages/user-order/user-order.js b/sourcecode/baidu/pages/user-order/user-order.js
index fd7281f22..b7cee92c8 100755
--- a/sourcecode/baidu/pages/user-order/user-order.js
+++ b/sourcecode/baidu/pages/user-order/user-order.js
@@ -1,7 +1,6 @@
 const app = getApp();
 Page({
   data: {
-    currency_symbol: app.data.currency_symbol,
     data_list: [],
     data_page_total: 0,
     data_page: 1,
@@ -14,7 +13,14 @@ Page({
     payment_list: [],
     payment_id: 0,
     temp_pay_value: '',
-    nav_status_list: [{ name: "全部", value: "-1" }, { name: "待付款", value: "1" }, { name: "待发货", value: "2" }, { name: "待收货", value: "3" }, { name: "已完成", value: "4" }, { name: "已失效", value: "5,6" }],
+    nav_status_list: [
+      { name: "全部", value: "-1" },
+      { name: "待付款", value: "1" },
+      { name: "待发货", value: "2" },
+      { name: "待收货", value: "3" },
+      { name: "已完成", value: "4" },
+      { name: "已失效", value: "5,6" },
+    ],
     nav_status_index: 0,
     order_select_ids: []
   },
@@ -35,13 +41,16 @@ Page({
       params: params,
       nav_status_index: nav_status_index
     });
-    this.init();
   },
 
   onShow() {
     swan.setNavigationBarTitle({ title: app.data.common_pages_title.user_order });
+
+    // 数据加载
+    this.init();
   },
 
+  // 获取数据
   init() {
     var user = app.get_user_info(this, 'init');
     if (user != false) {
diff --git a/sourcecode/baidu/pages/user-order/user-order.swan b/sourcecode/baidu/pages/user-order/user-order.swan
index d4dbec0a3..ee1dd43ca 100755
--- a/sourcecode/baidu/pages/user-order/user-order.swan
+++ b/sourcecode/baidu/pages/user-order/user-order.swan
@@ -33,8 +33,8 @@
             <view s-if="(item.is_can_launch_aftersale == 1 || (detail.orderaftersale || null) != null) && (detail.orderaftersale_btn_text || null) != null" class="orderaftersale-btn-text" catchtap="orderaftersale_event" data-oid="{{item.id}}" data-did="{{detail.id}}">{{detail.orderaftersale_btn_text}}</view>
           </view>
           <view class="oh goods-price">
-            <text class="sales-price">{{currency_symbol}}{{detail.price}}</text>
-            <text s-if="detail.original_price > 0" class="original-price">{{currency_symbol}}{{detail.original_price}}</text>
+            <text class="sales-price">{{item.currency_data.currency_symbol}}{{detail.price}}</text>
+            <text s-if="detail.original_price > 0" class="original-price">{{item.currency_data.currency_symbol}}{{detail.original_price}}</text>
             <text class="buy-number">x{{detail.buy_number}}</text>
           </view>
         </navigator>
diff --git a/sourcecode/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.js b/sourcecode/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
index ee00990f8..a2d0ce065 100644
--- a/sourcecode/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
+++ b/sourcecode/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
@@ -1,7 +1,6 @@
 const app = getApp();
 Page({
   data: {
-    currency_symbol: app.data.currency_symbol,
     params: null,
     data_list_loding_status: 1,
     data_list_loding_msg: '',
@@ -97,13 +96,16 @@ Page({
       params: params,
       popup_delivery_status: (params.is_delivery_popup || 0) == 1
     });
-    this.init();
   },
 
   onShow() {
     swan.setNavigationBarTitle({ title: app.data.common_pages_title.user_orderaftersale_detail });
+
+    // 数据加载
+    this.init();
   },
 
+  // 获取数据
   init() {
     var self = this;
     swan.showLoading({ title: "加载中..." });
diff --git a/sourcecode/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.swan b/sourcecode/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.swan
index d2802bd7a..08f44aeac 100644
--- a/sourcecode/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.swan
+++ b/sourcecode/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.swan
@@ -13,8 +13,8 @@
             </block>
           </view>
           <view class="oh goods-price">
-            <text class="sales-price">{{currency_symbol}}{{order_data.items.price}}</text>
-            <text s-if="order_data.items.original_price > 0" class="original-price">{{currency_symbol}}{{order_data.items.original_price}}</text>
+            <text class="sales-price">{{order_data.currency_data.currency_symbol}}{{order_data.items.price}}</text>
+            <text s-if="order_data.items.original_price > 0" class="original-price">{{order_data.currency_data.currency_symbol}}{{order_data.items.original_price}}</text>
             <text class="buy-number">x{{order_data.items.buy_number}}</text>
           </view>
         </navigator>
@@ -54,7 +54,7 @@
         <view class="panel-content">
           <view s-for="item, index in panel_base_data_list" s-key="item" class="item br-b oh">
             <view class="title fl">{{item.name}}</view>
-            <view class="content cr-888 fl br-l">{{new_aftersale_data[item.field] || ''}}</view>
+            <view class="content fl br-l">{{new_aftersale_data[item.field] || ''}}</view>
           </view>
         </view>
       </view>
@@ -65,7 +65,7 @@
         <view class="panel-content">
           <view s-for="item, index in panel_express_data_list" s-key="item" class="item br-b oh">
             <view class="title fl">{{item.name}}</view>
-            <view class="content cr-888 fl br-l">{{new_aftersale_data[item.field] || ''}}</view>
+            <view class="content fl br-l">{{new_aftersale_data[item.field] || ''}}</view>
           </view>
         </view>
       </view>
diff --git a/sourcecode/baidu/pages/user-orderaftersale/user-orderaftersale.js b/sourcecode/baidu/pages/user-orderaftersale/user-orderaftersale.js
index 604487ac3..9fa502244 100644
--- a/sourcecode/baidu/pages/user-orderaftersale/user-orderaftersale.js
+++ b/sourcecode/baidu/pages/user-orderaftersale/user-orderaftersale.js
@@ -1,7 +1,6 @@
 const app = getApp();
 Page({
   data: {
-    currency_symbol: app.data.currency_symbol,
     params: null,
     data_list_loding_status: 1,
     data_list_loding_msg: '',
@@ -15,7 +14,15 @@ Page({
 
     // 导航
     // 状态（0待确认, 1待退货, 2待审核, 3已完成, 4已拒绝, 5已取消）
-    nav_status_list: [{ name: "全部", value: "-1" }, { name: "待确认", value: "0" }, { name: "待退货", value: "1" }, { name: "待审核", value: "2" }, { name: "已完成", value: "3" }, { name: "已拒绝", value: "4" }, { name: "已取消", value: "5" }],
+    nav_status_list: [
+      { name: "全部", value: "-1" },
+      { name: "待确认", value: "0" },
+      { name: "待退货", value: "1" },
+      { name: "待审核", value: "2" },
+      { name: "已完成", value: "3" },
+      { name: "已拒绝", value: "4" },
+      { name: "已取消", value: "5" },
+    ],
     nav_status_index: 0
   },
 
@@ -36,13 +43,16 @@ Page({
       form_keyword_value: params.keywords || '',
       nav_status_index: nav_status_index
     });
-    this.init();
   },
 
   onShow() {
     swan.setNavigationBarTitle({ title: app.data.common_pages_title.user_orderaftersale });
+
+    // 数据加载
+    this.init();
   },
 
+  // 获取数据
   init() {
     var user = app.get_user_info(this, "init");
     if (user != false) {
diff --git a/sourcecode/baidu/pages/user-orderaftersale/user-orderaftersale.swan b/sourcecode/baidu/pages/user-orderaftersale/user-orderaftersale.swan
index 067892560..03e74a625 100644
--- a/sourcecode/baidu/pages/user-orderaftersale/user-orderaftersale.swan
+++ b/sourcecode/baidu/pages/user-orderaftersale/user-orderaftersale.swan
@@ -27,8 +27,8 @@
             <view class="orderaftersale-btn-text" catchtap="orderaftersale_event" data-oid="{{item.id}}" data-did="{{item.order_data.items.id}}">{{item.order_data.items.orderaftersale_btn_text}}</view>
           </view>
           <view class="oh goods-price">
-            <text class="sales-price">{{currency_symbol}}{{item.order_data.items.price}}</text>
-            <text s-if="item.order_data.items.original_price > 0" class="original-price">{{currency_symbol}}{{item.order_data.items.original_price}}</text>
+            <text class="sales-price">{{item.order_data.currency_data.currency_symbol}}{{item.order_data.items.price}}</text>
+            <text s-if="item.order_data.items.original_price > 0" class="original-price">{{item.order_data.currency_data.currency_symbol}}{{item.order_data.items.original_price}}</text>
             <text class="buy-number">x{{item.order_data.items.buy_number}}</text>
           </view>
         </navigator>
@@ -38,7 +38,7 @@
         <text class="cr-ccc ds">/</text>
         <text class="cr-666">{{item.reason}}</text>
         <text s-if="item.price > 0" class="cr-ccc ds">/</text>
-        <text s-if="item.price > 0" class="sales-price">{{currency_symbol}}{{item.price}}</text>
+        <text s-if="item.price > 0" class="sales-price">{{item.order_data.currency_data.currency_symbol}}{{item.price}}</text>
         <text s-if="item.number > 0" class="cr-main"> x{{item.number}}</text>
       </view>
       <view s-if="item.status <= 2 || item.status == 4" class="item-operation tr br-t">
diff --git a/sourcecode/baidu/pages/user/user.js b/sourcecode/baidu/pages/user/user.js
index 2624377c4..b1bfa4da7 100755
--- a/sourcecode/baidu/pages/user/user.js
+++ b/sourcecode/baidu/pages/user/user.js
@@ -3,8 +3,6 @@ Page({
   data: {
     avatar: app.data.default_user_head_src,
     nickname: "用户名",
-    customer_service_tel: null,
-    common_user_center_notice: null,
     message_total: 0,
     head_nav_list: [
       { name: "订单总数", url: "user-order", count: 0 },
@@ -28,15 +26,38 @@ Page({
     // 远程自定义导航
     navigation: [],
 
+    // 基础配置
+    common_app_customer_service_tel: null,
+    common_user_center_notice: null,
     common_app_is_online_service: 0,
     common_app_is_head_vice_nav: 0,
   },
 
   onShow() {
     swan.setNavigationBarTitle({ title: app.data.common_pages_title.user });
+
+    // 数据加载
     this.init();
+
+    // 初始化配置
+    this.init_config();
   },
 
+  // 初始化配置
+  init_config(status) {
+    if((status || false) == true) {
+      this.setData({
+        common_app_customer_service_tel: app.get_config('config.common_app_customer_service_tel'),
+        common_user_center_notice: app.get_config('config.common_user_center_notice'),
+        common_app_is_online_service: app.get_config('config.common_app_is_online_service'),
+        common_app_is_head_vice_nav: app.get_config('config.common_app_is_head_vice_nav'),
+      });
+    } else {
+      app.is_config(this, 'init_config');
+    }
+  },
+
+  // 获取数据
   init(e) {
     var user = app.get_user_info(this, "init"),
       self = this;
@@ -66,7 +87,7 @@ Page({
           avatar: user.avatar || app.data.default_user_head_src,
           nickname: user.nickname || '用户名',
         });
-        
+
         self.get_data();
       }
     }
@@ -107,15 +128,11 @@ Page({
 
           this.setData({
             user_order_status_list: temp_user_order_status_list,
-            customer_service_tel: data.customer_service_tel || null,
-            common_user_center_notice: data.common_user_center_notice || null,
             avatar: (data.avatar || null) != null ? data.avatar : (this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar,
             nickname: data.nickname != null ? data.nickname : this.data.nickname,
             message_total: (data.common_message_total || 0) == 0 ? 0 : data.common_message_total,
             head_nav_list: temp_head_nav_list,
             navigation: data.navigation || [],
-            common_app_is_online_service: data.common_app_is_online_service || 0,
-            common_app_is_head_vice_nav: data.common_app_is_head_vice_nav || 0,
           });
 
           // 导航购物车处理
@@ -141,16 +158,28 @@ Page({
 
   // 清除缓存
   clear_storage(e) {
+    // 获取uuid重新存储缓存，一定情况下确保用户的uuid不改变
+    var uuid = swan.getStorageSync(this.data.cache_user_uuid_key) || null;
+
+    // 清除所有缓存
     swan.clearStorage();
     app.showToast("清除缓存成功", "success");
+
+    // 重新存储用户uuid缓存
+    if(uuid != null) {
+      swan.setStorage({
+        key: app.data.cache_user_uuid_key,
+        data: uuid
+      });
+    }
   },
 
   // 客服电话
   call_event() {
-    if (this.data.customer_service_tel == null) {
+    if (this.data.common_app_customer_service_tel == null) {
       app.showToast("客服电话有误");
     } else {
-      app.call_tel(this.data.customer_service_tel);
+      app.call_tel(this.data.common_app_customer_service_tel);
     }
   },
 
diff --git a/sourcecode/baidu/pages/user/user.json b/sourcecode/baidu/pages/user/user.json
index daa19778d..ef54e254e 100755
--- a/sourcecode/baidu/pages/user/user.json
+++ b/sourcecode/baidu/pages/user/user.json
@@ -3,6 +3,7 @@
     "navigationBarBackgroundColor": "#d2364c",
     "backgroundColorTop": "#d2364c",
     "usingComponents": {
+        "component-quick-nav": "/components/quick-nav/quick-nav",
         "component-badge": "/components/badge/badge"
     }
 }
\ No newline at end of file
diff --git a/sourcecode/baidu/pages/user/user.swan b/sourcecode/baidu/pages/user/user.swan
index 4bdef1aa8..ab83633c0 100755
--- a/sourcecode/baidu/pages/user/user.swan
+++ b/sourcecode/baidu/pages/user/user.swan
@@ -69,7 +69,7 @@
 </view>
 
 <!-- 用户中心公告 -->
-<view s-if="common_user_center_notice != null" class="user-notice">
+<view s-if="(common_user_center_notice || null) != null" class="user-notice">
     <view class="tips">{{common_user_center_notice}}</view>
 </view>
 
@@ -79,5 +79,8 @@
   <template is="online_service"></template>
 </view>
 
+<!-- 快捷导航 -->
+<component-quick-nav></component-quick-nav>
+
 <import src="/pages/common/copyright.swan" />
 <template is="copyright"></template>
diff --git a/sourcecode/qq/pages/goods-detail/goods-detail.qss b/sourcecode/qq/pages/goods-detail/goods-detail.qss
index c107937df..3e049bda1 100755
--- a/sourcecode/qq/pages/goods-detail/goods-detail.qss
+++ b/sourcecode/qq/pages/goods-detail/goods-detail.qss
@@ -164,9 +164,9 @@
 }
 .goods-title {
   font-size: 32rpx;
-  line-height: 44rpx;
+  line-height: 48rpx;
   font-weight: 500;
-  padding: 8rpx 10rpx;
+  padding: 5rpx 10rpx;
 }
 .goods-base {
     padding: 15rpx 10rpx;
diff --git a/sourcecode/qq/pages/goods-search/goods-search.qml b/sourcecode/qq/pages/goods-search/goods-search.qml
index ae899374a..003a7373a 100755
--- a/sourcecode/qq/pages/goods-search/goods-search.qml
+++ b/sourcecode/qq/pages/goods-search/goods-search.qml
@@ -40,12 +40,12 @@
 <component-popup prop-show="{{is_show_popup_form}}" prop-position="right" bindonclose="popup_form_event_close">
   <form bindsubmit="form_submit_event" class="popup-form oh bg-white">
     <view class="item oh screening-price">
-      <view class="title cr-666">价格区间(元)
+      <view class="title cr-666">价格区间(元)</view>
+      <view class="tc oh">
+        <input type="digit" placeholder="最低价" name="min_price" class="br fl" />
+        <text class="cr-888 separator">~</text>
+        <input type="digit" placeholder="最高价" name="max_price" class="br fr" />
       </view>
-      <input type="digit" placeholder="最低价" name="min_price" class="br fl" />
-      <view class="cr-888 fl tc separator">~
-      </view>
-      <input type="digit" placeholder="最高价" name="max_price" class="br fl" />
     </view>
     <view class="item keywords">
       <view class="title cr-666">关键字</view>
diff --git a/sourcecode/qq/pages/goods-search/goods-search.qss b/sourcecode/qq/pages/goods-search/goods-search.qss
index 77d21ce3e..ab366edb2 100755
--- a/sourcecode/qq/pages/goods-search/goods-search.qss
+++ b/sourcecode/qq/pages/goods-search/goods-search.qss
@@ -73,11 +73,10 @@
   padding: 0 6rpx;
 }
 .screening-price input {
-  width: calc(50% - 16rpx);
+  width: calc(50% - 20px);
 }
 .screening-price .separator {
-  margin-top: 10rpx;
-  width: 30rpx;
+  line-height: 50rpx;
 }
 .popup-form .item {
   width: 480rpx;
diff --git a/sourcecode/qq/pages/plugins/wallet/user-cash-detail/user-cash-detail.qml b/sourcecode/qq/pages/plugins/wallet/user-cash-detail/user-cash-detail.qml
index c506ed43c..815b62c9d 100644
--- a/sourcecode/qq/pages/plugins/wallet/user-cash-detail/user-cash-detail.qml
+++ b/sourcecode/qq/pages/plugins/wallet/user-cash-detail/user-cash-detail.qml
@@ -3,7 +3,7 @@
     <view class="panel-content bg-white">
       <view qq:for="{{detail_list}}" qq:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/qq/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.qml b/sourcecode/qq/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.qml
index c506ed43c..815b62c9d 100644
--- a/sourcecode/qq/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.qml
+++ b/sourcecode/qq/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.qml
@@ -3,7 +3,7 @@
     <view class="panel-content bg-white">
       <view qq:for="{{detail_list}}" qq:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/qq/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.qml b/sourcecode/qq/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.qml
index c506ed43c..815b62c9d 100644
--- a/sourcecode/qq/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.qml
+++ b/sourcecode/qq/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.qml
@@ -3,7 +3,7 @@
     <view class="panel-content bg-white">
       <view qq:for="{{detail_list}}" qq:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/qq/pages/user-order-detail/user-order-detail.qml b/sourcecode/qq/pages/user-order-detail/user-order-detail.qml
index f705e4b4b..9f7971fec 100755
--- a/sourcecode/qq/pages/user-order-detail/user-order-detail.qml
+++ b/sourcecode/qq/pages/user-order-detail/user-order-detail.qml
@@ -73,7 +73,7 @@
     <view class="panel-content bg-white">
       <view qq:for="{{detail_list}}" qq:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
@@ -84,7 +84,7 @@
     <view class="panel-content bg-white">
       <view qq:for="{{extension_data}}" qq:key="item" class="item br-b oh">
       <text class="title">{{item.name}}</text>
-      <text class="content cr-888 br-l">{{item.tips}}</text>
+      <text class="content br-l">{{item.tips}}</text>
     </view>
     </view>
   </view>
diff --git a/sourcecode/qq/pages/user-orderaftersale-detail/user-orderaftersale-detail.qml b/sourcecode/qq/pages/user-orderaftersale-detail/user-orderaftersale-detail.qml
index 9314aad81..cfae5cf39 100644
--- a/sourcecode/qq/pages/user-orderaftersale-detail/user-orderaftersale-detail.qml
+++ b/sourcecode/qq/pages/user-orderaftersale-detail/user-orderaftersale-detail.qml
@@ -54,7 +54,7 @@
         <view class="panel-content">
           <view qq:for="{{panel_base_data_list}}" qq:key="item" class="item br-b oh">
             <view class="title fl">{{item.name}}</view>
-            <view class="content cr-888 fl br-l">{{new_aftersale_data[item.field] || ''}}</view>
+            <view class="content fl br-l">{{new_aftersale_data[item.field] || ''}}</view>
           </view>
         </view>
       </view>
@@ -65,7 +65,7 @@
         <view class="panel-content">
           <view qq:for="{{panel_express_data_list}}" qq:key="item" class="item br-b oh">
             <view class="title fl">{{item.name}}</view>
-            <view class="content cr-888 fl br-l">{{new_aftersale_data[item.field] || ''}}</view>
+            <view class="content fl br-l">{{new_aftersale_data[item.field] || ''}}</view>
           </view>
         </view>
       </view>
diff --git a/sourcecode/toutiao/pages/goods-detail/goods-detail.ttss b/sourcecode/toutiao/pages/goods-detail/goods-detail.ttss
index c107937df..3e049bda1 100755
--- a/sourcecode/toutiao/pages/goods-detail/goods-detail.ttss
+++ b/sourcecode/toutiao/pages/goods-detail/goods-detail.ttss
@@ -164,9 +164,9 @@
 }
 .goods-title {
   font-size: 32rpx;
-  line-height: 44rpx;
+  line-height: 48rpx;
   font-weight: 500;
-  padding: 8rpx 10rpx;
+  padding: 5rpx 10rpx;
 }
 .goods-base {
     padding: 15rpx 10rpx;
diff --git a/sourcecode/toutiao/pages/goods-search/goods-search.ttml b/sourcecode/toutiao/pages/goods-search/goods-search.ttml
index 69d38041c..0578d8214 100755
--- a/sourcecode/toutiao/pages/goods-search/goods-search.ttml
+++ b/sourcecode/toutiao/pages/goods-search/goods-search.ttml
@@ -40,12 +40,12 @@
 <component-popup prop-show="{{is_show_popup_form}}" prop-position="right" bindonclose="popup_form_event_close">
   <form bindsubmit="form_submit_event" class="popup-form oh bg-white">
     <view class="item oh screening-price">
-      <view class="title cr-666">价格区间(元)
+      <view class="title cr-666">价格区间(元)</view>
+      <view class="tc oh">
+        <input type="digit" placeholder="最低价" name="min_price" class="br fl" />
+        <text class="cr-888 separator">~</text>
+        <input type="digit" placeholder="最高价" name="max_price" class="br fr" />
       </view>
-      <input type="digit" placeholder="最低价" name="min_price" class="br fl" />
-      <view class="cr-888 fl tc separator">~
-      </view>
-      <input type="digit" placeholder="最高价" name="max_price" class="br fl" />
     </view>
     <view class="item keywords">
       <view class="title cr-666">关键字</view>
diff --git a/sourcecode/toutiao/pages/goods-search/goods-search.ttss b/sourcecode/toutiao/pages/goods-search/goods-search.ttss
index 77d21ce3e..ab366edb2 100755
--- a/sourcecode/toutiao/pages/goods-search/goods-search.ttss
+++ b/sourcecode/toutiao/pages/goods-search/goods-search.ttss
@@ -73,11 +73,10 @@
   padding: 0 6rpx;
 }
 .screening-price input {
-  width: calc(50% - 16rpx);
+  width: calc(50% - 20px);
 }
 .screening-price .separator {
-  margin-top: 10rpx;
-  width: 30rpx;
+  line-height: 50rpx;
 }
 .popup-form .item {
   width: 480rpx;
diff --git a/sourcecode/toutiao/pages/plugins/distribution/introduce/introduce.ttml b/sourcecode/toutiao/pages/plugins/distribution/introduce/introduce.ttml
index f1b420391..cb9136f17 100644
--- a/sourcecode/toutiao/pages/plugins/distribution/introduce/introduce.ttml
+++ b/sourcecode/toutiao/pages/plugins/distribution/introduce/introduce.ttml
@@ -12,7 +12,7 @@
         </view>
         <view class="item br-b oh">
           <view class="title fl">返佣比例</view>
-          <view class="content cr-888 fl br-l">
+          <view class="content fl br-l">
             <view>一级 {{item.level_rate_one}}%</view>
             <view tt:if="{{data_base.level == undefined || data_base.level > 0}}">二级 {{item.level_rate_two}}%</view>
             <view tt:if="{{data_base.level == undefined || data_base.level > 1}}">三级 {{item.level_rate_three}}%</view>
@@ -20,7 +20,7 @@
         </view>
         <view class="item br-b oh">
           <view class="title fl">消费金额</view>
-          <view class="content cr-888 fl br-l">{{item.rules_msg}}</view>
+          <view class="content fl br-l">{{item.rules_msg}}</view>
         </view>
       </view>
     </view>
diff --git a/sourcecode/toutiao/pages/plugins/distribution/order-detail/order-detail.ttml b/sourcecode/toutiao/pages/plugins/distribution/order-detail/order-detail.ttml
index 2618fbdec..ac0738576 100644
--- a/sourcecode/toutiao/pages/plugins/distribution/order-detail/order-detail.ttml
+++ b/sourcecode/toutiao/pages/plugins/distribution/order-detail/order-detail.ttml
@@ -3,14 +3,14 @@
     <view class="panel-content bg-white">
       <view class="item br-b oh">
         <view class="title fl">用户头像</view>
-        <view class="content cr-888 fl br-l">
+        <view class="content fl br-l">
           <image src="{{detail.avatar}}" class="avatar dis-block fl" mode="widthFix" bindtap="avatar_event" data-value="{{detail.avatar}}" />
         </view>
       </view>
 
       <view tt:for="{{detail_list}}" tt:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/toutiao/pages/plugins/distribution/profit-detail/profit-detail.ttml b/sourcecode/toutiao/pages/plugins/distribution/profit-detail/profit-detail.ttml
index 957813abd..9331d6a91 100644
--- a/sourcecode/toutiao/pages/plugins/distribution/profit-detail/profit-detail.ttml
+++ b/sourcecode/toutiao/pages/plugins/distribution/profit-detail/profit-detail.ttml
@@ -3,7 +3,7 @@
     <view class="panel-content bg-white">
       <view tt:for="{{detail_list}}" tt:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/toutiao/pages/plugins/membershiplevelvip/order-detail/order-detail.ttml b/sourcecode/toutiao/pages/plugins/membershiplevelvip/order-detail/order-detail.ttml
index 957813abd..9331d6a91 100644
--- a/sourcecode/toutiao/pages/plugins/membershiplevelvip/order-detail/order-detail.ttml
+++ b/sourcecode/toutiao/pages/plugins/membershiplevelvip/order-detail/order-detail.ttml
@@ -3,7 +3,7 @@
     <view class="panel-content bg-white">
       <view tt:for="{{detail_list}}" tt:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/toutiao/pages/plugins/membershiplevelvip/profit-detail/profit-detail.ttml b/sourcecode/toutiao/pages/plugins/membershiplevelvip/profit-detail/profit-detail.ttml
index 957813abd..9331d6a91 100644
--- a/sourcecode/toutiao/pages/plugins/membershiplevelvip/profit-detail/profit-detail.ttml
+++ b/sourcecode/toutiao/pages/plugins/membershiplevelvip/profit-detail/profit-detail.ttml
@@ -3,7 +3,7 @@
     <view class="panel-content bg-white">
       <view tt:for="{{detail_list}}" tt:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/toutiao/pages/plugins/wallet/user-cash-detail/user-cash-detail.ttml b/sourcecode/toutiao/pages/plugins/wallet/user-cash-detail/user-cash-detail.ttml
index 957813abd..9331d6a91 100644
--- a/sourcecode/toutiao/pages/plugins/wallet/user-cash-detail/user-cash-detail.ttml
+++ b/sourcecode/toutiao/pages/plugins/wallet/user-cash-detail/user-cash-detail.ttml
@@ -3,7 +3,7 @@
     <view class="panel-content bg-white">
       <view tt:for="{{detail_list}}" tt:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/toutiao/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.ttml b/sourcecode/toutiao/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.ttml
index 957813abd..9331d6a91 100644
--- a/sourcecode/toutiao/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.ttml
+++ b/sourcecode/toutiao/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.ttml
@@ -3,7 +3,7 @@
     <view class="panel-content bg-white">
       <view tt:for="{{detail_list}}" tt:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/toutiao/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.ttml b/sourcecode/toutiao/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.ttml
index 957813abd..9331d6a91 100644
--- a/sourcecode/toutiao/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.ttml
+++ b/sourcecode/toutiao/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.ttml
@@ -3,7 +3,7 @@
     <view class="panel-content bg-white">
       <view tt:for="{{detail_list}}" tt:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/toutiao/pages/user-order-detail/user-order-detail.ttml b/sourcecode/toutiao/pages/user-order-detail/user-order-detail.ttml
index da18d8e31..d7ab1f561 100755
--- a/sourcecode/toutiao/pages/user-order-detail/user-order-detail.ttml
+++ b/sourcecode/toutiao/pages/user-order-detail/user-order-detail.ttml
@@ -73,7 +73,7 @@
     <view class="panel-content bg-white">
       <view tt:for="{{detail_list}}" tt:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
@@ -84,7 +84,7 @@
     <view class="panel-content bg-white">
       <view tt:for="{{extension_data}}" tt:key="item" class="item br-b oh">
       <text class="title">{{item.name}}</text>
-      <text class="content cr-888 br-l">{{item.tips}}</text>
+      <text class="content br-l">{{item.tips}}</text>
     </view>
     </view>
   </view>
diff --git a/sourcecode/toutiao/pages/user-orderaftersale-detail/user-orderaftersale-detail.ttml b/sourcecode/toutiao/pages/user-orderaftersale-detail/user-orderaftersale-detail.ttml
index a63cd2b05..0d26ee35d 100644
--- a/sourcecode/toutiao/pages/user-orderaftersale-detail/user-orderaftersale-detail.ttml
+++ b/sourcecode/toutiao/pages/user-orderaftersale-detail/user-orderaftersale-detail.ttml
@@ -54,7 +54,7 @@
         <view class="panel-content">
           <view tt:for="{{panel_base_data_list}}" tt:key="item" class="item br-b oh">
             <view class="title fl">{{item.name}}</view>
-            <view class="content cr-888 fl br-l">{{new_aftersale_data[item.field] || ''}}</view>
+            <view class="content fl br-l">{{new_aftersale_data[item.field] || ''}}</view>
           </view>
         </view>
       </view>
@@ -65,7 +65,7 @@
         <view class="panel-content">
           <view tt:for="{{panel_express_data_list}}" tt:key="item" class="item br-b oh">
             <view class="title fl">{{item.name}}</view>
-            <view class="content cr-888 fl br-l">{{new_aftersale_data[item.field] || ''}}</view>
+            <view class="content fl br-l">{{new_aftersale_data[item.field] || ''}}</view>
           </view>
         </view>
       </view>
diff --git a/sourcecode/weixin/pages/goods-detail/goods-detail.wxss b/sourcecode/weixin/pages/goods-detail/goods-detail.wxss
index c3478c547..fd0140542 100755
--- a/sourcecode/weixin/pages/goods-detail/goods-detail.wxss
+++ b/sourcecode/weixin/pages/goods-detail/goods-detail.wxss
@@ -164,9 +164,9 @@
 }
 .goods-title {
   font-size: 32rpx;
-  line-height: 44rpx;
+  line-height: 48rpx;
   font-weight: 500;
-  padding: 8rpx 10rpx;
+  padding: 5rpx 10rpx;
 }
 .goods-base {
     padding: 15rpx 10rpx;
diff --git a/sourcecode/weixin/pages/goods-search/goods-search.wxml b/sourcecode/weixin/pages/goods-search/goods-search.wxml
index 79d835efb..4be0fdffd 100755
--- a/sourcecode/weixin/pages/goods-search/goods-search.wxml
+++ b/sourcecode/weixin/pages/goods-search/goods-search.wxml
@@ -40,12 +40,12 @@
 <component-popup prop-show="{{is_show_popup_form}}" prop-position="right" bindonclose="popup_form_event_close">
   <form bindsubmit="form_submit_event" class="popup-form oh bg-white">
     <view class="item oh screening-price">
-      <view class="title cr-666">价格区间(元)
+      <view class="title cr-666">价格区间(元)</view>
+      <view class="tc oh">
+        <input type="digit" placeholder="最低价" name="min_price" class="br fl" />
+        <text class="cr-888 separator">~</text>
+        <input type="digit" placeholder="最高价" name="max_price" class="br fr" />
       </view>
-      <input type="digit" placeholder="最低价" name="min_price" class="br fl" />
-      <view class="cr-888 fl tc separator">~
-      </view>
-      <input type="digit" placeholder="最高价" name="max_price" class="br fl" />
     </view>
     <view class="item keywords">
       <view class="title cr-666">关键字</view>
diff --git a/sourcecode/weixin/pages/goods-search/goods-search.wxss b/sourcecode/weixin/pages/goods-search/goods-search.wxss
index 77d21ce3e..ab366edb2 100755
--- a/sourcecode/weixin/pages/goods-search/goods-search.wxss
+++ b/sourcecode/weixin/pages/goods-search/goods-search.wxss
@@ -73,11 +73,10 @@
   padding: 0 6rpx;
 }
 .screening-price input {
-  width: calc(50% - 16rpx);
+  width: calc(50% - 20px);
 }
 .screening-price .separator {
-  margin-top: 10rpx;
-  width: 30rpx;
+  line-height: 50rpx;
 }
 .popup-form .item {
   width: 480rpx;
diff --git a/sourcecode/weixin/pages/plugins/distribution/introduce/introduce.wxml b/sourcecode/weixin/pages/plugins/distribution/introduce/introduce.wxml
index d36bf1d46..d29a096ed 100644
--- a/sourcecode/weixin/pages/plugins/distribution/introduce/introduce.wxml
+++ b/sourcecode/weixin/pages/plugins/distribution/introduce/introduce.wxml
@@ -12,7 +12,7 @@
         </view>
         <view class="item br-b oh">
           <view class="title fl">返佣比例</view>
-          <view class="content cr-888 fl br-l">
+          <view class="content fl br-l">
             <view>一级 {{item.level_rate_one}}%</view>
             <view wx:if="{{data_base.level == undefined || data_base.level > 0}}">二级 {{item.level_rate_two}}%</view>
             <view wx:if="{{data_base.level == undefined || data_base.level > 1}}">三级 {{item.level_rate_three}}%</view>
@@ -20,7 +20,7 @@
         </view>
         <view class="item br-b oh">
           <view class="title fl">消费金额</view>
-          <view class="content cr-888 fl br-l">{{item.rules_msg}}</view>
+          <view class="content fl br-l">{{item.rules_msg}}</view>
         </view>
       </view>
     </view>
diff --git a/sourcecode/weixin/pages/plugins/distribution/order-detail/order-detail.wxml b/sourcecode/weixin/pages/plugins/distribution/order-detail/order-detail.wxml
index cb06ea6c6..35f874c7e 100644
--- a/sourcecode/weixin/pages/plugins/distribution/order-detail/order-detail.wxml
+++ b/sourcecode/weixin/pages/plugins/distribution/order-detail/order-detail.wxml
@@ -3,14 +3,14 @@
     <view class="panel-content bg-white">
       <view class="item br-b oh">
         <view class="title fl">用户头像</view>
-        <view class="content cr-888 fl br-l">
+        <view class="content fl br-l">
           <image src="{{detail.avatar}}" class="avatar dis-block fl" mode="widthFix" bindtap="avatar_event" data-value="{{detail.avatar}}" />
         </view>
       </view>
 
       <view wx:for="{{detail_list}}" wx:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/weixin/pages/plugins/distribution/profit-detail/profit-detail.wxml b/sourcecode/weixin/pages/plugins/distribution/profit-detail/profit-detail.wxml
index be77c4377..586eaae63 100644
--- a/sourcecode/weixin/pages/plugins/distribution/profit-detail/profit-detail.wxml
+++ b/sourcecode/weixin/pages/plugins/distribution/profit-detail/profit-detail.wxml
@@ -3,7 +3,7 @@
     <view class="panel-content bg-white">
       <view wx:for="{{detail_list}}" wx:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/weixin/pages/plugins/membershiplevelvip/order-detail/order-detail.wxml b/sourcecode/weixin/pages/plugins/membershiplevelvip/order-detail/order-detail.wxml
index be77c4377..586eaae63 100644
--- a/sourcecode/weixin/pages/plugins/membershiplevelvip/order-detail/order-detail.wxml
+++ b/sourcecode/weixin/pages/plugins/membershiplevelvip/order-detail/order-detail.wxml
@@ -3,7 +3,7 @@
     <view class="panel-content bg-white">
       <view wx:for="{{detail_list}}" wx:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/weixin/pages/plugins/membershiplevelvip/profit-detail/profit-detail.wxml b/sourcecode/weixin/pages/plugins/membershiplevelvip/profit-detail/profit-detail.wxml
index be77c4377..586eaae63 100644
--- a/sourcecode/weixin/pages/plugins/membershiplevelvip/profit-detail/profit-detail.wxml
+++ b/sourcecode/weixin/pages/plugins/membershiplevelvip/profit-detail/profit-detail.wxml
@@ -3,7 +3,7 @@
     <view class="panel-content bg-white">
       <view wx:for="{{detail_list}}" wx:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/weixin/pages/plugins/wallet/user-cash-detail/user-cash-detail.wxml b/sourcecode/weixin/pages/plugins/wallet/user-cash-detail/user-cash-detail.wxml
index be77c4377..586eaae63 100644
--- a/sourcecode/weixin/pages/plugins/wallet/user-cash-detail/user-cash-detail.wxml
+++ b/sourcecode/weixin/pages/plugins/wallet/user-cash-detail/user-cash-detail.wxml
@@ -3,7 +3,7 @@
     <view class="panel-content bg-white">
       <view wx:for="{{detail_list}}" wx:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/weixin/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.wxml b/sourcecode/weixin/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.wxml
index be77c4377..586eaae63 100644
--- a/sourcecode/weixin/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.wxml
+++ b/sourcecode/weixin/pages/plugins/wallet/user-recharge-detail/user-recharge-detail.wxml
@@ -3,7 +3,7 @@
     <view class="panel-content bg-white">
       <view wx:for="{{detail_list}}" wx:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/weixin/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.wxml b/sourcecode/weixin/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.wxml
index be77c4377..586eaae63 100644
--- a/sourcecode/weixin/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.wxml
+++ b/sourcecode/weixin/pages/plugins/wallet/wallet-log-detail/wallet-log-detail.wxml
@@ -3,7 +3,7 @@
     <view class="panel-content bg-white">
       <view wx:for="{{detail_list}}" wx:key="item" class="item br-b oh">
         <view class="title fl">{{item.name}}</view>
-        <view class="content cr-888 fl br-l">{{item.value}}</view>
+        <view class="content fl br-l">{{item.value}}</view>
       </view>
     </view>
   </view>
diff --git a/sourcecode/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxml b/sourcecode/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxml
index d9a9318aa..acddab27a 100644
--- a/sourcecode/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxml
+++ b/sourcecode/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxml
@@ -65,7 +65,7 @@
         <view class="panel-content">
           <view wx:for="{{panel_express_data_list}}" wx:key="item" class="item br-b oh">
             <view class="title fl">{{item.name}}</view>
-            <view class="content cr-888 fl br-l">{{new_aftersale_data[item.field] || ''}}</view>
+            <view class="content fl br-l">{{new_aftersale_data[item.field] || ''}}</view>
           </view>
         </view>
       </view>