From 57ecb34cee8f4253f9c91c939735617d8d2c6532 Mon Sep 17 00:00:00 2001
From: xindan <2499232802@qq.com>
Date: Sat, 9 Oct 2021 17:44:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=90=9C=E7=B4=A2=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91+=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/css/common.css                         |   23 +-
 components/popup/popup.vue                    |   20 +-
 pages/buy/buy.vue                             |  107 +-
 .../extraction-address/extraction-address.css |   15 +
 .../extraction-address/extraction-address.vue |  559 ++++---
 pages/goods-detail/goods-detail.vue           |   32 +-
 pages/goods-search/goods-search.css           |  147 ++
 pages/goods-search/goods-search.vue           | 1321 +++++++----------
 static/images/quick-submit-icon.png           |  Bin 1246 -> 0 bytes
 static/images/search-asc-icon.png             |  Bin 3041 -> 0 bytes
 static/images/search-default-icon.png         |  Bin 2900 -> 0 bytes
 static/images/search-desc-icon.png            |  Bin 2979 -> 0 bytes
 static/images/search-submit-icon.png          |  Bin 3718 -> 0 bytes
 13 files changed, 1073 insertions(+), 1151 deletions(-)
 create mode 100644 pages/extraction-address/extraction-address.css
 create mode 100644 pages/goods-search/goods-search.css
 delete mode 100644 static/images/quick-submit-icon.png
 delete mode 100755 static/images/search-asc-icon.png
 delete mode 100755 static/images/search-default-icon.png
 delete mode 100755 static/images/search-desc-icon.png
 delete mode 100755 static/images/search-submit-icon.png

diff --git a/common/css/common.css b/common/css/common.css
index 0a40c4ec..d00b92eb 100644
--- a/common/css/common.css
+++ b/common/css/common.css
@@ -242,17 +242,8 @@ button[disabled]..button-main {
 
 /**
  * 统一颜色
- * 文本主色、次主色、搭配色、基础色、白色、绿色、黑色、灰色、浅灰色、红色
+ * 文本基础色、白色、绿色、黑色、灰色、浅灰色、红色、搭配色、次主色、主色
  */
-.cr-main {
-    color: #f6c133 !important;
-}
-.cr-main-light {
-    color: #ffebd2 !important;
-}
-.cr-main-pair {
-    color: #795548 !important;
-}
 .cr-base {
     color: #666 !important;
 }
@@ -274,6 +265,15 @@ button[disabled]..button-main {
 .cr-red {
     color: #f00 !important;
 }
+.cr-main-pair {
+    color: #795548 !important;
+}
+.cr-main-light {
+    color: #ffebd2 !important;
+}
+.cr-main {
+    color: #f6c133 !important;
+}
 
 /**
  * 统一背景色
@@ -299,6 +299,9 @@ button[disabled]..button-main {
 }
 .bg-gray {
     background-color: #d6d6d6 !important;
+}
+.bg-base {
+    background-color: #f5f5f5 !important;
 }
 button[disabled].bg-main {
     background-color: #fdd178 !important;
diff --git a/components/popup/popup.vue b/components/popup/popup.vue
index 810f4ef1..aea51460 100644
--- a/components/popup/popup.vue
+++ b/components/popup/popup.vue
@@ -34,9 +34,7 @@
         position: fixed;
         background: #fff;
         z-index: 101;
-        overflow: hidden;
-        border-top-right-radius: 20rpx;
-        border-top-left-radius: 20rpx;
+        overflow: hidden;
     }
     .popup-mask {
         position: fixed;
@@ -83,5 +81,21 @@
     }
     .popup.animation .popup-mask {
         transition: all 0.25s linear;
+    }
+    .popup-top {
+        border-bottom-right-radius: 20rpx;
+        border-bottom-left-radius: 20rpx;
+    }
+    .popup-bottom {
+        border-top-right-radius: 20rpx;
+        border-top-left-radius: 20rpx;
+    }
+    .popup-left {
+        border-top-right-radius: 20rpx;
+        border-bottom-right-radius: 20rpx;
+    }
+    .popup-right {
+        border-top-left-radius: 20rpx;
+        border-bottom-left-radius: 20rpx;
     }
 </style>
diff --git a/pages/buy/buy.vue b/pages/buy/buy.vue
index f582e129..6fa2ca49 100644
--- a/pages/buy/buy.vue
+++ b/pages/buy/buy.vue
@@ -23,7 +23,7 @@
                                     <text class="fr">{{address.tel}}</text>
                                 </view>
                                 <view class="address-detail oh margin-top-lg">
-                                    <image class="icon fl" src="/static/images/user-address.png" mode="widthFix"></image>
+                                    <image class="icon fl" :src="common_static_url+'map-icon.png'" mode="widthFix"></image>
                                     <view class="text fr">
                                         {{address.province_name || ''}}{{address.city_name || ''}}{{address.county_name || ''}}{{address.address || ''}}
                                     </view>
@@ -234,26 +234,24 @@
 
         onLoad(params) {
             //params['data'] = '{"buy_type":"goods","goods_id":"1","stock":"1","spec":"[]"}';
-            if ((params.data || null) != null && app.globalData.get_length(JSON.parse(decodeURIComponent(params
-                .data))) > 0) {
+            if ((params.data || null) != null && app.globalData.get_length(JSON.parse(decodeURIComponent(params.data))) > 0) {
                 this.setData({
                     params: JSON.parse(decodeURIComponent(params.data))
-                }); // 删除地址缓存
-
+                });
+
+                // 删除地址缓存
                 uni.removeStorageSync(app.globalData.data.cache_buy_user_address_select_key);
             }
         },
 
-        onShow() {
-            uni.setNavigationBarTitle({
-                title: app.globalData.data.common_pages_title.buy
-            }); // 数据加载
-
+        onShow() {
+            // 数据加载
             this.init();
             this.setData({
                 is_first: 0
-            }); // 初始化配置
-
+            });
+
+            // 初始化配置
             this.init_config();
         },
 
@@ -285,21 +283,20 @@
                     });
                     uni.stopPullDownRefresh();
                     return false;
-                } // 本地缓存地址
-
+                }
 
+                // 本地缓存地址
                 if (this.is_first == 0) {
                     var cache_address = uni.getStorageSync(app.globalData.data.cache_buy_user_address_select_key);
-
                     if ((cache_address || null) != null) {
                         this.setData({
                             address: cache_address,
                             address_id: cache_address.id
                         });
                     }
-                } // 加载loding
-
+                }
 
+                // 加载loding
                 uni.showLoading({
                     title: '加载中...'
                 });
@@ -318,7 +315,6 @@
                     success: res => {
                         uni.stopPullDownRefresh();
                         uni.hideLoading();
-
                         if (res.data.code == 0) {
                             var data = res.data.data;
 
@@ -336,46 +332,38 @@
                                     extraction_address: data.base.extraction_address || [],
                                     plugins_coupon_data: data.plugins_coupon_data || null,
                                     plugins_points_data: data.plugins_points_data || null
-                                }); // 优惠劵选择处理
-
+                                });
+
+                                // 优惠劵选择处理
                                 if ((data.plugins_coupon_data || null) != null) {
                                     var plugins_choice_coupon_value = [];
-
                                     for (var i in data.plugins_coupon_data) {
                                         var cupk = data.plugins_coupon_data[i]['warehouse_id'];
 
-                                        if ((data.plugins_coupon_data[i]['coupon_data']['coupon_choice'] ||
-                                                null) != null) {
-                                            plugins_choice_coupon_value[cupk] = data.plugins_coupon_data[i][
-                                                'coupon_data'
-                                            ]['coupon_choice']['coupon']['desc'];
+                                        if ((data.plugins_coupon_data[i]['coupon_data']['coupon_choice'] || null) != null) {
+                                            plugins_choice_coupon_value[cupk] = data.plugins_coupon_data[i]['coupon_data']['coupon_choice']['coupon']['desc'];
                                         } else {
-                                            var coupon_count = (data.plugins_coupon_data[i]['coupon_data'][
-                                                'coupon_list'
-                                            ] || null) != null ? data.plugins_coupon_data[i][
-                                                'coupon_data'
-                                            ].coupon_list.length : 0;
-                                            plugins_choice_coupon_value[cupk] = coupon_count > 0 ? '可选优惠劵' +
-                                                coupon_count + '张' : '暂无可用优惠劵';
+                                            var coupon_count = (data.plugins_coupon_data[i]['coupon_data']['coupon_list'] || null) != null ? data.plugins_coupon_data[i]['coupon_data'].coupon_list.length : 0;
+                                            plugins_choice_coupon_value[cupk] = coupon_count > 0 ? '可选优惠劵' +coupon_count + '张' : '暂无可用优惠劵';
                                         }
                                     }
 
                                     this.setData({
                                         plugins_choice_coupon_value: plugins_choice_coupon_value
                                     });
-                                } // 地址
-
+                                }
 
+                                // 地址
                                 this.setData({
                                     address: data.base.address || null,
-                                    address_id: (data.base.address || null) != null ? data.base
-                                        .address.id : null
+                                    address_id: (data.base.address || null) != null ? data.base.address.id : null
                                 });
                                 uni.setStorage({
                                     key: app.globalData.data.cache_buy_user_address_select_key,
                                     data: data.base.address || null
-                                }); // 支付方式
-
+                                });
+
+                                // 支付方式
                                 this.payment_list_data(data.payment_list);
                             }
                         } else {
@@ -383,7 +371,6 @@
                                 data_list_loding_status: 2,
                                 data_list_loding_msg: res.data.msg
                             });
-
                             if (app.globalData.is_login_check(res.data, this, 'init')) {
                                 app.globalData.showToast(res.data.msg);
                             }
@@ -444,10 +431,10 @@
                 data['address_id'] = this.address_id;
                 data['payment_id'] = this.payment_id;
                 data['user_note'] = this.user_note_value;
-                data['site_model'] = this.site_model; // 数据验证
-
+                data['site_model'] = this.site_model;
+
+                // 数据验证
                 var validation = [];
-
                 if (this.common_site_type == 0 || this.common_site_type == 2 || this.common_site_type == 4) {
                     validation.push({
                         fields: 'address_id',
@@ -482,8 +469,7 @@
                             if (res.data.code == 0) {
                                 if (res.data.data.order_status == 1) {
                                     uni.redirectTo({
-                                        url: '/pages/user-order/user-order?is_pay=1&order_ids=' +
-                                            res.data.data.order_ids.join(',')
+                                        url: '/pages/user-order/user-order?is_pay=1&order_ids=' + res.data.data.order_ids.join(',')
                                     });
                                 } else {
                                     uni.redirectTo({
@@ -520,15 +506,10 @@
             // 支付方式数据处理
             payment_list_data(data) {
                 if (this.payment_id != 0) {
-                    for (var i in data) {
-                        if (data[i]['id'] == this.payment_id) {
-                            data[i]['selected'] = 'cr-main br-main';
-                        } else {
-                            data[i]['selected'] = '';
-                        }
+                    for (var i in data) {
+                        data[i]['selected'] = (data[i]['id'] == this.payment_id) ? 'cr-main br-main' : '';
                     }
                 }
-
                 this.setData({
                     payment_list: data || []
                 });
@@ -623,17 +604,18 @@
             // 销售+自提 模式选择事件
             buy_header_nav_event(e) {
                 var value = e.currentTarget.dataset.value || 0;
-
                 if (value != this.site_model) {
                     // 数据设置
                     this.setData({
                         address: null,
                         address_id: null,
                         site_model: value
-                    }); // 删除地址缓存
-
-                    uni.removeStorageSync(app.globalData.data.cache_buy_user_address_select_key); // 数据初始化
-
+                    });
+
+                    // 删除地址缓存
+                    uni.removeStorageSync(app.globalData.data.cache_buy_user_address_select_key);
+                    
+                    // 数据初始化
                     this.init();
                 }
             },
@@ -642,16 +624,14 @@
             map_event(e) {
                 var index = e.currentTarget.dataset.index || 0;
                 var data = this.goods_list[index] || null;
-
                 if (data == null) {
                     app.globalData.showToast("地址有误");
                     return false;
-                } // 打开地图
-
+                }
 
+                // 打开地图
                 var name = data.alias || data.name || '';
-                var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data
-                    .address || '');
+                var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || '');
                 app.globalData.open_location(data.lng, data.lat, name, address);
             },
 
@@ -667,10 +647,9 @@
             warehouse_group_event(e) {
                 app.globalData.url_event(e);
             }
-
         }
     };
 </script>
 <style>
     @import './buy.css';
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/extraction-address/extraction-address.css b/pages/extraction-address/extraction-address.css
new file mode 100644
index 00000000..b5aa17cf
--- /dev/null
+++ b/pages/extraction-address/extraction-address.css
@@ -0,0 +1,15 @@
+.address-logo {
+    width: 140rpx;
+    height: 140rpx !important;
+}
+.address .item-icon {
+    width: 30rpx;
+    height: 35rpx !important;
+}
+.address-alias {
+    padding: 2rpx 10rpx;
+}
+.address .text {
+    line-height: 44rpx;
+    width: calc(100% - 40rpx);
+}
\ No newline at end of file
diff --git a/pages/extraction-address/extraction-address.vue b/pages/extraction-address/extraction-address.vue
index efb8d796..4ccc5aac 100644
--- a/pages/extraction-address/extraction-address.vue
+++ b/pages/extraction-address/extraction-address.vue
@@ -1,309 +1,262 @@
-<template>
-<view>
-<view class="page">
-  <view v-if="data_list.length > 0">
-    <view v-for="(item, index) in data_list" :key="index" class="item bg-white spacing-mb">
-      <view @tap="address_conent_event" :data-index="index" class="oh">
-        <view v-if="(item.logo || null) != null" class="fl oh margin-right-lg">
-          <image class="dis-block address-logo" :src="item.logo" mode="widthFix"></image>
-        </view>
-        <view class="oh">
-          <view class="base oh">
-            <text v-if="(item.alias || null) != null" class="address-alias">{{item.alias}}</text>
-            <text>{{item.name}}</text>
-            <text class="fr">{{item.tel}}</text>
-          </view>
-          <view class="address oh">
-            <image class="item-icon fl" src="/static/images/user-address.png" mode="widthFix"></image>
-            <view class="text fr">{{item.province_name || ''}}{{item.city_name || ''}}{{item.county_name || ''}}{{item.address || ''}}</view>
-          </view>
-        </view>
-      </view>
-      <view class="operation br-t oh">
-        <view v-if="(item.distance_value || null) != null && (item.distance_unit || null) != null" class="fl margin-top-lg">
-          <text class="cr-gray">距离</text>
-          <text class="cr-base">{{item.distance_value}}</text>
-          <text class="cr-gray">{{item.distance_unit}}</text>
-        </view>
-        <button v-if="(item.lng || null) != null && (item.lat || null) != null && item.lng != 0 && item.lat != 0" class="fr cr-base map-submit br" type="default" size="mini" @tap="address_map_event" :data-index="index" hover-class="none">查看地图</button>
-      </view>
-    </view>
-  </view>
+<template>
+    <view>
+        <view class="page">
+            <view v-if="data_list.length > 0" class="padding-main">
+                <view v-for="(item, index) in data_list" :key="index" class="item bg-white padding-main border-radius-main spacing-mb">
+                    <view @tap="address_conent_event" :data-index="index" class="oh">
+                        <view v-if="(item.logo || null) != null" class="fl oh margin-right-lg">
+                            <image class="dis-block address-logo radius" :src="item.logo" mode="widthFix"></image>
+                        </view>
+                        <view class="oh">
+                            <view class="base oh padding-vertical-main">
+                                <text v-if="(item.alias || null) != null" class="address-alias br-main cr-main round margin-right-sm">{{item.alias}}</text>
+                                <text>{{item.name}}</text>
+                                <text class="fr">{{item.tel}}</text>
+                            </view>
+                            <view class="address oh padding-vertical-main">
+                                <image class="item-icon fl" :src="common_static_url+'map-icon.png'" mode="widthFix"></image>
+                                <view class="text fr">
+                                    {{item.province_name || ''}}{{item.city_name || ''}}{{item.county_name || ''}}{{item.address || ''}}
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                    <view v-if="((item.distance_value || null) != null && (item.distance_unit || null) != null) || ((item.lng || 0) != 0 && (item.lat || 0) != 0)" class="operation br-t oh padding-vertical-main">
+                        <view v-if="(item.distance_value || null) != null && (item.distance_unit || null) != null" class="fl margin-top-lg">
+                            <text class="cr-gray">距离</text>
+                            <text class="cr-base">{{item.distance_value}}</text>
+                            <text class="cr-gray">{{item.distance_unit}}</text>
+                        </view>
+                        <button v-if="(item.lng || 0) != 0 && (item.lat || 0) != 0" class="fr cr-base br margin-left-lg" type="default" size="mini" @tap="address_map_event" :data-index="index" hover-class="none">查看地图</button>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :prop-status="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :prop-status="data_bottom_line_status"></component-bottom-line>
+        </view>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import componentNoData from "../../components/no-data/no-data";
+    import componentBottomLine from "../../components/bottom-line/bottom-line";
 
-  <view v-if="data_list.length == 0">
-    <!--<import src="/pages/common/nodata.wxml"></import>-->
-    <block data-type="template" data-is="nodata" data-attr="status: data_list_loding_status">
-  <!-- 1 加载中 -->
-  <view v-if="0 == 1" class="no-data-loding tc">
-    <text>加载中...</text>
-  </view>
+    var common_static_url = app.globalData.get_static_url('common');
+    export default {
+        data() {
+            return {
+                common_static_url: common_static_url,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_list: [],
+                params: null,
+                is_default: 0,
+                user_location_cache_key: app.globalData.data.cache_userlocation_key,
+                user_location: null,
+                is_first: 1,
+                home_extraction_address_position: 0
+            };
+        },
+
+        components: {
+            componentNoData,
+            componentBottomLine
+        },
+        props: {},
+
+        onLoad(params) {
+            this.setData({
+                params: params,
+                home_extraction_address_position: app.globalData.get_config('config.home_extraction_address_position', 0)
+            });
+        },
+
+        onReady: function() {
+            // 清除位置缓存信息
+            uni.removeStorage({
+                key: this.user_location_cache_key
+            });
 
-  <!-- 2 处理错误 -->
-  <view v-else-if="0 == 2" class="no-data-box tc">
-    <image src="/static/images/error.png" mode="widthFix"></image>
-    <view class="no-data-tips">{{msg || '处理错误'}}</view>
-  </view>
+            // 是否获取位置
+            if ((this.params.is_buy || 0) == 1 && this.home_extraction_address_position == 1) {
+                uni.navigateTo({
+                    url: '/pages/common/open-setting-location/open-setting-location'
+                });
+            }
+        },
+
+        onShow() {
+            uni.setNavigationBarTitle({
+                title: app.globalData.data.common_pages_title.extraction_address
+            });
 
-  <!-- 0 默认没有数据 -->
-  <view v-else-if="0 == 0" class="no-data-box tc">
-    <image src="/static/images/empty.png" mode="widthFix"></image>
-    <view class="no-data-tips">{{msg || '没有相关数据'}}</view>
-  </view>
-</block>
-  </view>
-    
-  <!--<import src="/pages/common/bottom_line.wxml"></import>-->
-  <block data-type="template" data-is="bottom_line" data-attr="status: data_bottom_line_status">
-    <view v-if="(status || false)" class="data-bottom-line">
-        <view class="left fl"></view>
-        <view class="msg fl">我是有底线的</view>
-        <view class="right fr"></view>
-    </view>
-</block>
-</view>
-</view>
-</template>
+            // 是否需要选择地理位置
+            if (this.home_extraction_address_position == 1) {
+                // 首次不请求数据
+                if (this.is_first == 0) {
+                    this.user_location_init();
+                    this.init();
+                }
+            } else {
+                this.init();
+            }
+
+            this.setData({
+                is_first: 0
+            });
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.get_data_list();
+        },
+
+        methods: {
+            // 初始化
+            init() {
+                var user = app.globalData.get_user_info(this, "init");
+                if (user != false) {
+                    // 用户未绑定用户则转到登录页面
+                    if (app.globalData.user_is_need_login(user)) {
+                        uni.redirectTo({
+                            url: "/pages/login/login?event_callback=init"
+                        });
+                        return false;
+                    } else {
+                        // 获取数据
+                        this.get_data_list();
+                    }
+                } else {
+                    this.setData({
+                        data_list_loding_status: 0,
+                        data_bottom_line_status: false
+                    });
+                }
+            },
+
+            // 地址信息初始化
+            user_location_init() {
+                var result = uni.getStorageSync(this.user_location_cache_key) || null;
+                var data = null;
+                if (result != null) {
+                    data = {
+                        name: result.name || null,
+                        address: result.address || null,
+                        lat: result.latitude || null,
+                        lng: result.longitude || null
+                    };
+                }
+                this.setData({
+                    user_location: data
+                });
+            },
+
+            // 获取数据列表
+            get_data_list() {
+                // 加载loding
+                uni.showLoading({
+                    title: "加载中..."
+                });
+                this.setData({
+                    data_list_loding_status: 1
+                });
 
-<script>
-const app = getApp();
+                // 获取数据
+                var data = {};
 
-export default {
-  data() {
-    return {
-      data_list_loding_status: 1,
-      data_bottom_line_status: false,
-      data_list: [],
-      params: null,
-      is_default: 0,
-      user_location_cache_key: app.globalData.data.cache_userlocation_key,
-      user_location: null,
-      is_first: 1,
-      home_extraction_address_position: 0
-    };
-  },
-
-  components: {},
-  props: {},
-
-  onLoad(params) {
-    this.setData({
-      params: params,
-      home_extraction_address_position: app.globalData.get_config('config.home_extraction_address_position', 0)
-    });
-  },
-
-  onReady: function () {
-    // 清除位置缓存信息
-    uni.removeStorage({
-      key: this.user_location_cache_key
-    }); // 是否获取位置
-
-    if ((this.params.is_buy || 0) == 1 && this.home_extraction_address_position == 1) {
-      uni.navigateTo({
-        url: '/pages/common/open-setting-location/open-setting-location'
-      });
-    }
-  },
-
-  onShow() {
-    uni.setNavigationBarTitle({
-      title: app.globalData.data.common_pages_title.extraction_address
-    }); // 是否需要选择地理位置
-
-    if (this.home_extraction_address_position == 1) {
-      // 首次不请求数据
-      if (this.is_first == 0) {
-        this.user_location_init();
-        this.init();
-      }
-    } else {
-      this.init();
-    }
-
-    this.setData({
-      is_first: 0
-    });
-  },
-
-  // 下拉刷新
-  onPullDownRefresh() {
-    this.get_data_list();
-  },
-
-  methods: {
-    // 初始化
-    init() {
-      var user = app.globalData.get_user_info(this, "init");
-
-      if (user != false) {
-        // 用户未绑定用户则转到登录页面
-        if (app.globalData.user_is_need_login(user)) {
-          uni.redirectTo({
-            url: "/pages/login/login?event_callback=init"
-          });
-          return false;
-        } else {
-          // 获取数据
-          this.get_data_list();
-        }
-      } else {
-        this.setData({
-          data_list_loding_status: 0,
-          data_bottom_line_status: false
-        });
-      }
-    },
-
-    // 地址信息初始化
-    user_location_init() {
-      var result = uni.getStorageSync(this.user_location_cache_key) || null;
-      var data = null;
-
-      if (result != null) {
-        data = {
-          name: result.name || null,
-          address: result.address || null,
-          lat: result.latitude || null,
-          lng: result.longitude || null
-        };
-      }
-
-      this.setData({
-        user_location: data
-      });
-    },
-
-    // 获取数据列表
-    get_data_list() {
-      // 加载loding
-      uni.showLoading({
-        title: "加载中..."
-      });
-      this.setData({
-        data_list_loding_status: 1
-      }); // 获取数据
-
-      var data = {}; // 是否有坐标
-
-      if ((this.user_location || null) != null) {
-        data['lng'] = this.user_location.lng;
-        data['lat'] = this.user_location.lat;
-      } // 请求接口
-
-
-      uni.request({
-        url: app.globalData.get_request_url("extraction", "useraddress"),
-        method: "POST",
-        data: data,
-        dataType: "json",
-        success: res => {
-          uni.hideLoading();
-          uni.stopPullDownRefresh();
-
-          if (res.data.code == 0) {
-            if (res.data.data.length > 0) {
-              // 获取当前默认地址
-              var is_default = 0;
-
-              for (var i in res.data.data) {
-                if (res.data.data[i]['is_default'] == 1) {
-                  is_default = res.data.data[i]['id'];
-                }
-              } // 设置数据
-
-
-              this.setData({
-                data_list: res.data.data,
-                is_default: is_default,
-                data_list_loding_status: 3,
-                data_bottom_line_status: true
-              });
-            } else {
-              this.setData({
-                data_list_loding_status: 0
-              });
-            }
-          } else {
-            this.setData({
-              data_list_loding_status: 0
-            });
-
-            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
-              app.globalData.showToast(res.data.msg);
-            }
-          }
-        },
-        fail: () => {
-          uni.hideLoading();
-          uni.stopPullDownRefresh();
-          this.setData({
-            data_list_loding_status: 2
-          });
-          app.globalData.showToast("服务器请求出错");
-        }
-      });
-    },
-
-    // 地图查看
-    address_map_event(e) {
-      var index = e.currentTarget.dataset.index || 0;
-      var data = this.data_list[index] || null;
-
-      if (data == null) {
-        app.globalData.showToast("地址有误");
-        return false;
-      } // 打开地图
-
-
-      var name = data.alias || data.name || '';
-      var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || '');
-      app.globalData.open_location(data.lng, data.lat, name, address);
-    },
-
-    // 地址内容事件
-    address_conent_event(e) {
-      var index = e.currentTarget.dataset.index || 0;
-      var is_back = this.params.is_back || 0;
-
-      if (is_back == 1) {
-        uni.setStorage({
-          key: app.globalData.data.cache_buy_user_address_select_key,
-          data: this.data_list[index]
-        });
-        uni.navigateBack();
-      }
-    }
-
-  }
-};
-</script>
-<style>
-.item {
-  padding: 10rpx 10rpx 0 10rpx;
-}
-.address-logo {
-  width: 140rpx;
-  height: 140rpx !important;
-}
-.base, .address, .operation {
-  padding: 20rpx 0;
-}
-.address .item-icon {
-  width: 30rpx;
-  height: 35rpx !important;
-}
-.address-alias {
-  border: 1px solid #d2364c;
-  color: #d2364c;
-  padding: 2rpx 10rpx;
-  border-radius: 6rpx;
-  margin-right: 10rpx;
-}
-.address .text {
-  line-height: 44rpx;
-  width: calc(100% - 40rpx);
-}
-.operation .map-submit {
-  margin-left: 20rpx;
-}
+                // 是否有坐标
+                if ((this.user_location || null) != null) {
+                    data['lng'] = this.user_location.lng;
+                    data['lat'] = this.user_location.lat;
+                }
+
+                // 请求接口
+                uni.request({
+                    url: app.globalData.get_request_url("extraction", "useraddress"),
+                    method: "POST",
+                    data: data,
+                    dataType: "json",
+                    success: res => {
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            if (res.data.data.length > 0) {
+                                // 获取当前默认地址
+                                var is_default = 0;
+                                for (var i in res.data.data) {
+                                    if (res.data.data[i]['is_default'] == 1) {
+                                        is_default = res.data.data[i]['id'];
+                                    }
+                                }
+
+                                // 设置数据
+                                this.setData({
+                                    data_list: res.data.data,
+                                    is_default: is_default,
+                                    data_list_loding_status: 3,
+                                    data_bottom_line_status: true
+                                });
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0
+                                });
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0
+                            });
+                            if (app.globalData.is_login_check(res.data, this, 'get_data_list')) {
+                                app.globalData.showToast(res.data.msg);
+                            }
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2
+                        });
+                        app.globalData.showToast("服务器请求出错");
+                    }
+                });
+            },
+
+            // 地图查看
+            address_map_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var data = this.data_list[index] || null;
+                if (data == null) {
+                    app.globalData.showToast("地址有误");
+                    return false;
+                }
+
+                // 打开地图
+                var name = data.alias || data.name || '';
+                var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || '');
+                app.globalData.open_location(data.lng, data.lat, name, address);
+            },
+
+            // 地址内容事件
+            address_conent_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var is_back = this.params.is_back || 0;
+                if (is_back == 1) {
+                    uni.setStorage({
+                        key: app.globalData.data.cache_buy_user_address_select_key,
+                        data: this.data_list[index]
+                    });
+                    uni.navigateBack();
+                }
+            }
+        }
+    };
+</script>
+<style>
+    @import './extraction-address.css';
 </style>
\ No newline at end of file
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index 68884168..775eebc9 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -22,8 +22,7 @@
             <swiper :indicator-dots="indicator_dots" :indicator-color="indicator_color" :indicator-active-color="indicator_active_color" :autoplay="autoplay" :circular="circular" class="goods-photo bg-white" v-if="goods_photo.length > 0" :style="'height: ' + photo_height + ' !important;'">
                 <block v-for="(item, index) in goods_photo" :key="index">
                     <swiper-item>
-                        <image class="swiper-item wh-auto" @tap="goods_photo_view_event" :data-index="index" :src="item.images" mode="scaleToFill" :style="'height: ' + photo_height + ' !important;'">
-                        </image>
+                        <image class="swiper-item wh-auto" @tap="goods_photo_view_event" :data-index="index" :src="item.images" mode="scaleToFill" :style="'height: ' + photo_height + ' !important;'"></image>
                     </swiper-item>
                 </block>
             </swiper>
@@ -148,8 +147,7 @@
                                 <text v-if="plugins_shop_data.auth_type == 1" class="plugins-shop-auth-icon">{{plugins_shop_data.auth_type_name}}</text>
                                 <text>{{plugins_shop_data.name}}</text>
                             </view>
-                            <view class="plugins-shop-desc multi-text cr-gray margin-top-sm">{{plugins_shop_data.describe}}
-                            </view>
+                            <view class="plugins-shop-desc multi-text cr-gray margin-top-sm">{{plugins_shop_data.describe}}</view>
                         </view>
                     </navigator>
                 </view>
@@ -270,17 +268,17 @@
                     </view>
                 </view>
                 <view :class="'btn-items fr goods-buy-nav-btn-number-' + buy_button.count || 0">
-                        <block v-if="(buy_button.data || null) != null && buy_button.data.length > 0">
-                            <block v-for="(item, index) in buy_button.data" :key="index">
-                                <block v-if="(item.name || null) != null && (item.type || null) != null">
-                                    <button :class="'item fl cr-white round bg-' + ((item.color || 'main') == 'main' ? 'main' : 'main-pair')" type="default" @tap="nav_buy_submit_event" :data-type="item.type" :data-value="item.value || ''" hover-class="none">{{item.name}}</button>
-                                </block>
+                    <block v-if="(buy_button.data || null) != null && buy_button.data.length > 0">
+                        <block v-for="(item, index) in buy_button.data" :key="index">
+                            <block v-if="(item.name || null) != null && (item.type || null) != null">
+                                <button :class="'item fl cr-white round bg-' + ((item.color || 'main') == 'main' ? 'main' : 'main-pair')" type="default" @tap="nav_buy_submit_event" :data-type="item.type" :data-value="item.value || ''" hover-class="none">{{item.name}}</button>
                             </block>
                         </block>
-                        <block v-else>
-                            <button class="item bg-gray round tc" type="default" disabled>{{buy_button.error || '暂停销售'}}</button>
-                        </block>
-                    </view>
+                    </block>
+                    <block v-else>
+                        <button class="item bg-gray round tc" type="default" disabled>{{buy_button.error || '暂停销售'}}</button>
+                    </block>
+                </view>
             </view>
 
             <!-- 购买弹层 -->
@@ -385,10 +383,8 @@
                                             <text class="price">{{item.discount_value}}</text>
                                             <text class="unit">{{item.type_unit}}</text>
                                         </view>
-                                        <view v-if="(item.use_limit_type_name || null) != null"
-                                            class="base-tips cr-base single-text">{{item.use_limit_type_name}}</view>
-                                        <view v-if="(item.desc || null) != null" class="desc margin-top-xs cr-gray single-text">{{item.desc}}
-                                        </view>
+                                        <view v-if="(item.use_limit_type_name || null) != null" class="base-tips cr-base single-text">{{item.use_limit_type_name}}</view>
+                                        <view v-if="(item.desc || null) != null" class="desc margin-top-xs cr-gray single-text">{{item.desc}}</view>
                                     </view>
                                     <view class="v-right fr" @tap="coupon_receive_event" :data-index="index" :data-value="item.id" :style="'background:' + item.bg_color_value + ';'">
                                         <text class="circle"></text>
@@ -427,9 +423,9 @@
     import componentQuickNav from "../../components/quick-nav/quick-nav";
     import componentPopup from "../../components/popup/popup";
     import componentBadge from "../../components/badge/badge";
+    import componentTrnNav from "../../components/trn-nav/trn-nav";
     import componentCountdown from "../../components/countdown/countdown";
     import componentNoData from "../../components/no-data/no-data";
-    import componentTrnNav from "../../components/trn-nav/trn-nav";
     import componentBottomLine from "../../components/bottom-line/bottom-line";
     import componentOnlineService from "../../components/online-service/online-service";
 
diff --git a/pages/goods-search/goods-search.css b/pages/goods-search/goods-search.css
new file mode 100644
index 00000000..eecda1b0
--- /dev/null
+++ b/pages/goods-search/goods-search.css
@@ -0,0 +1,147 @@
+/**
+* 排序导航
+*/
+.nav-sort {
+    background: #eee;
+}
+.nav-sort-content .item {
+    height: 80rpx;
+    line-height: 80rpx;
+    width: 130rpx;
+}
+.nav-sort-content .item .icon {
+    width: 30rpx;
+    height: 30rpx;
+}
+.nav-sort-content .item text,
+.nav-sort-content .item image {
+    vertical-align: middle;
+}
+.screening-submit {
+    width: 50rpx;
+    height: 50rpx;
+    position: absolute;
+    top: 15rpx;
+    right: 20rpx;
+}
+
+/**
+* 商品列表
+*/
+.scroll-box {
+    height: calc(100vh - 80rpx);
+}
+.data-list {
+    overflow: hidden;
+}
+.data-list .items {
+    width: calc(50% - 50rpx);
+}
+.data-list .items:nth-child(2n) {
+    float: right;
+}
+.data-list .items:nth-child(2n+1) {
+    float: left;
+}
+.data-list .items image {
+    width: 100%;
+    height: 300rpx !important;
+}
+
+/**
+* 条件
+*/
+.search-map {
+    height: calc(100vh - 118rpx);
+    width: 660rpx;
+    overflow-y: scroll;
+    overflow-x: hidden;
+}
+.map-keywords {
+    padding: 0 20rpx;
+    line-height: 66rpx;
+    height: 66rpx;
+    font-size: 26rpx;
+    box-sizing: border-box;
+}
+.map-nav {
+    position: relative;
+}
+.map-nav text:first-child {
+    font-weight: bold;
+}
+.map-nav .arrow-bottom {
+    position: absolute;
+    top: 0;
+    right: 10rpx;
+    padding-right: 46rpx;
+    color: #999;
+}
+.map-item {
+    line-height: 66rpx;
+}
+.map-content {
+    line-height: 60rpx;
+}
+.map-content .item {
+    margin-bottom: 20rpx;
+}
+.map-content .item:not(:last-child) {
+    margin-right: 20rpx;
+}
+.map-text-items .item,
+.map-images-text-items .item {
+    padding: 0 15rpx;
+    border: 1px solid transparent;
+}
+.map-images-text-items .item {
+    vertical-align: middle;
+    border: 1px solid #eee;
+    width: 150rpx;
+    height: 72rpx;
+    line-height: 72rpx;
+}
+.map-images-text-items .item image {
+    width: 150rpx;
+    height: calc(100% - 8rpx);
+    display: block;
+    margin: 0 auto;
+    margin-top: 4rpx;
+}
+.search-map .search-submit {
+    height: 80rpx;
+    line-height: 80rpx;
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    font-size: 32rpx;
+}
+
+/**
+* 品牌基础信息
+*/
+.brand-info {
+    height: 160rpx;
+}
+.brand-info image,
+.brand-info .info-logo-empty {
+    width: 300rpx;
+    height: 130rpx;
+    border: 1px solid #eee;
+}
+.brand-info .info-logo-empty {
+    line-height: 130rpx;
+    font-weight: bold;
+}
+.brand-info .info-right {
+    width: calc(100% - 330rpx);
+}
+.brand-info .info-name {
+    line-height: 56rpx;
+    font-weight: bold;
+}
+.brand-info .info-desc {
+    font-size: 28rpx;
+    line-height: 40rpx;
+    min-height: 80rpx;
+}
\ No newline at end of file
diff --git a/pages/goods-search/goods-search.vue b/pages/goods-search/goods-search.vue
index 8272758d..475b170e 100644
--- a/pages/goods-search/goods-search.vue
+++ b/pages/goods-search/goods-search.vue
@@ -1,760 +1,575 @@
-<template>
-<view>
-<!-- 排序 -->
-<view class="nav-sort oh">
-  <view class="nav-sort-content">
-    <block v-for="(item, index) in search_nav_sort_list" :key="index">
-      <view class="item tc fl" :data-index="index" @tap="nav_sort_event">
-        <text class="cr-base">{{item.name}}</text>
-        <image v-if="(item.icon || null) != null" class="icon" :src="'/images/search-' + item.icon + '-icon.png'" mode="aspectFill"></image>
-      </view>
-    </block>
-  </view>
-  <image class="screening-submit" src="/static/images/search-submit-icon.png" mode="aspectFill" @tap="popup_form_event_show"></image>
-</view>
+<template>
+    <view>
+        <!-- 排序 -->
+        <view class="nav-sort oh">
+            <view class="nav-sort-content">
+                <block v-for="(item, index) in search_nav_sort_list" :key="index">
+                    <view class="item tc fl" :data-index="index" @tap="nav_sort_event">
+                        <text class="cr-base">{{item.name}}</text>
+                        <image v-if="(item.icon || null) != null" class="icon" :src="static_url+ item.icon + '-icon.png'" mode="aspectFill"></image>
+                    </view>
+                </block>
+            </view>
+            <image class="screening-submit" :src="static_url+'submit-icon.png'" mode="aspectFill" @tap="popup_form_event_show"></image>
+        </view>
+
+        <!-- 列表 -->
+        <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="30">
+            <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
+                <view v-for="(item, index) in data_list" :key="index" class="items padding-main border-radius-main bg-white margin-bottom-main oh">
+                    <navigator :url="'/pages/goods-detail/goods-detail?goods_id=' + item.id" hover-class="none">
+                        <image :src="item.images" mode="aspectFit"></image>
+                        <view class="base margin-top tl">
+                            <view class="multi-text">{{item.title}}</view>
+                            <view class="price margin-top">
+                                <text class="sales-price">{{currency_symbol}}{{item.min_price}}</text>
+                            </view>
+                        </view>
+                    </navigator>
+                </view>
+            </view>
+            <view v-else>
+                <!-- 提示信息 -->
+                <component-no-data :prop-status="data_list_loding_status"></component-no-data>
+            </view>
+
+            <!-- 结尾 -->
+            <component-bottom-line :prop-status="data_bottom_line_status"></component-bottom-line>
+        </scroll-view>
+
+        <!-- 筛选条件 popup -->
+        <component-popup :prop-show="is_show_popup_form" prop-position="left" @onclose="popup_form_event_close">
+            <form @submit="form_submit_event" class="popup-form oh">
+                <view class="search-map padding-main bg-base">
+                    <view class="padding-main border-radius-main bg-white">
+                        <view class="map-item map-base br-b">
+                            <text>筛选出</text>
+                            <text class="cr-main"> {{data_total}} </text>
+                            <text>条数据</text>
+                            <text class="fr cr-red" @tap="map_remove_event">清除</text>
+                        </view>
+                        <!-- 搜索关键字 -->
+                        <input type="text" confirm-type="done" placeholder="其实搜索很简单^_^ !" name="wd" :value="(post_data.wd || '')" class="map-keywords wh-auto round bg-base margin-top-lg" placeholder-class="cr-grey">
+                    </view>
+
+                    <!-- 品牌 -->
+                    <view v-if="((search_map_list.brand_list || null) != null && search_map_list.brand_list.length > 0) || ((search_map_info.brand || null) != null)" class="map-item padding-horizontal-main padding-top-main border-radius-main bg-white spacing-mt">
+                        <view class="map-nav br-b">
+                            <text>品牌</text>
+                            <text class="arrow-bottom" v-if="search_map_list.brand_list.length > 3" @tap="more_event" data-value="brand_list">更多</text>
+                        </view>
+                        <view v-if="(search_map_info.brand || null) != null" class="map-content brand-info oh margin-top-lg">
+                            <image v-if="(search_map_info.brand.logo || null) != null" :src="search_map_info.brand.logo" mode="aspectFit" class="fl"></image>
+                            <view v-else class="info-logo-empty tc fl">{{search_map_info.brand.name}}</view>
+                            <view class="info-right fr">
+                                <view v-if="(search_map_info.brand.logo || null) != null" class="info-name">{{search_map_info.brand.name}}</view>
+                                <view v-if="(search_map_info.brand.describe || null) != null" class="info-desc multi-text cr-grey">{{search_map_info.brand.describe}}</view>
+                            </view>
+                        </view>
+                        <view v-else class="map-content map-images-text-items map-brand-container oh margin-top-lg" :style="'height:' + map_fields_list.brand_list.height + ';'">
+                            <block v-for="(item, index) in search_map_list.brand_list" :key="index">
+                                <view :class="'item fl cr-base radius single-text tc ' + (item.active == 1 ? 'cr-main br-main' : '')" @tap="map_item_event" :data-index="index" data-field="brand_list">
+                                    <image v-if="(item.logo || null) != null" :src="item.logo" mode="aspectFit"></image>
+                                    <text v-else>{{item.name}}</text>
+                                </view>
+                            </block>
+                        </view>
+                    </view>
+
+                    <!-- 分类 -->
+                    <view v-if="(search_map_list.category_list || null) != null && search_map_list.category_list.length > 0" class="map-item padding-horizontal-main padding-top-main border-radius-main bg-white spacing-mt">
+                        <view class="map-nav br-b">
+                            <text>分类</text>
+                            <text class="arrow-bottom" v-if="search_map_list.category_list.length > 3" @tap="more_event" data-value="category_list">更多</text>
+                        </view>
+                        <view class="map-content map-text-items map-category-container oh margin-top-lg" :style="'height:' + map_fields_list.category_list.height + ';'">
+                            <block v-for="(item, index) in search_map_list.category_list" :key="index">
+                                <view :class="'item fl cr-base radius ' + (item.active == 1 ? 'cr-main br-main' : '')" @tap="map_item_event" :data-index="index" data-field="category_list">{{item.name}}</view>
+                            </block>
+                        </view>
+                    </view>
+
+                    <!-- 价格 -->
+                    <view v-if="(search_map_list.screening_price_list || null) != null && search_map_list.screening_price_list.length > 0" class="map-item padding-horizontal-main padding-top-main border-radius-main bg-white spacing-mt">
+                        <view class="map-nav br-b">
+                            <text>价格</text>
+                            <text class="arrow-bottom" v-if="search_map_list.screening_price_list.length > 3" @tap="more_event" data-value="screening_price_list">更多</text>
+                        </view>
+                        <view class="map-content map-text-items screening-price-container oh margin-top-lg" :style="'height:' + map_fields_list.screening_price_list.height + ';'">
+                            <block v-for="(item, index) in search_map_list.screening_price_list" :key="index">
+                                <view :class="'item fl cr-base radius ' + (item.active == 1 ? 'cr-main br-main' : '')" @tap="map_item_event" :data-index="index" data-field="screening_price_list">{{item.name}}</view>
+                            </block>
+                        </view>
+                    </view>
+
+                    <!-- 属性 -->
+                    <view v-if="(search_map_list.goods_params_list || null) != null && search_map_list.goods_params_list.length > 0" class="map-item padding-horizontal-main padding-top-main border-radius-main bg-white spacing-mt">
+                        <view class="map-nav br-b">
+                            <text>属性</text>
+                            <text class="arrow-bottom" v-if="search_map_list.goods_params_list.length > 3" @tap="more_event" data-value="goods_params_list">更多</text>
+                        </view>
+                        <view class="map-content map-text-items goods-params-container oh margin-top-lg" :style="'height:' + map_fields_list.goods_params_list.height + ';'">
+                            <block v-for="(item, index) in search_map_list.goods_params_list" :key="index">
+                                <view :class="'item fl cr-base radius ' + (item.active == 1 ? 'cr-main br-main' : '')" @tap="map_item_event" :data-index="index" data-field="goods_params_list">{{item.value}}</view>
+                            </block>
+                        </view>
+                    </view>
+
+                    <!-- 规格 -->
+                    <view v-if="(search_map_list.goods_spec_list || null) != null && search_map_list.goods_spec_list.length > 0" class="map-item padding-horizontal-main padding-top-main border-radius-main bg-white spacing-mt">
+                        <view class="map-nav br-b">
+                            <text>规格</text>
+                            <text class="arrow-bottom" v-if="search_map_list.goods_spec_list.length > 3" @tap="more_event" data-value="goods_spec_list">更多</text>
+                        </view>
+                        <view class="map-content map-text-items goods-spec-container oh margin-top-lg" :style="'height:' + map_fields_list.goods_spec_list.height + ';'">
+                            <block v-for="(item, index) in search_map_list.goods_spec_list" :key="index">
+                                <view :class="'item fl cr-base radius ' + (item.active == 1 ? 'cr-main br-main' : '')" @tap="map_item_event" :data-index="index" data-field="goods_spec_list">{{item.value}}</view>
+                            </block>
+                        </view>
+                    </view>
+
+                    <button form-type="submit" class="bg-main search-submit wh-auto radius-0 cr-white" :disabled="popup_form_loading_status" hover-class="none">确认</button>
+                </view>
+            </form>
+        </component-popup>
+
+        <!-- 快捷导航 -->
+        <component-quick-nav></component-quick-nav>
+    </view>
+</template>
+
+<script>
+    const app = getApp();
+    import componentQuickNav from "../../components/quick-nav/quick-nav";
+    import componentPopup from "../../components/popup/popup";
+    import componentNoData from "../../components/no-data/no-data";
+    import componentBottomLine from "../../components/bottom-line/bottom-line";
 
-<!-- 列表 -->
-<scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="30">
-  <view class="data-list">
-    <view v-for="(item, index) in data_list" :key="index" class="items bg-white">
-      <navigator :url="'/pages/goods-detail/goods-detail?goods_id=' + item.id" hover-class="none">
-        <image :src="item.images" mode="aspectFit"></image>
-        <view class="base">
-          <view class="multi-text">{{item.title}}</view>
-          <view class="price">
-            <text class="sales-price">{{currency_symbol}}{{item.min_price}}</text>
-          </view>
-        </view>
-      </navigator>
-    </view>
-  </view>
-  
-  <view v-if="data_list.length == 0">
-    <!--<import src="/pages/common/nodata.wxml"></import>-->
-    <block data-type="template" data-is="nodata" data-attr="status: data_list_loding_status">
-  <!-- 1 加载中 -->
-  <view v-if="0 == 1" class="no-data-loding tc">
-    <text>加载中...</text>
-  </view>
+    var static_url = app.globalData.get_static_url('goods_search');
+    export default {
+        data() {
+            return {
+                static_url: static_url,
+                data_list_loding_status: 1,
+                data_bottom_line_status: false,
+                data_list: [],
+                data_total: 0,
+                data_page_total: 0,
+                data_page: 1,
+                params: null,
+                post_data: {},
+                is_show_popup_form: false,
+                popup_form_loading_status: false,
+                search_nav_sort_list: [{
+                    name: "综合",
+                    field: "default",
+                    sort: "asc",
+                    "icon": null
+                }, {
+                    name: "销量",
+                    field: "sales_count",
+                    sort: "asc",
+                    "icon": "default"
+                }, {
+                    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.globalData.data.currency_symbol,
+                // 搜素条件
+                search_map_list: {
+                    "brand_list": [],
+                    "category_list": [],
+                    "screening_price_list": [],
+                    "goods_params_list": [],
+                    "goods_spec_list": []
+                },
+                search_map_info: [],
+                map_fields_list: {
+                    "brand_list": {
+                        "height": "100rpx",
+                        "default": "100rpx",
+                        "form_key": "brand_ids"
+                    },
+                    "category_list": {
+                        "height": "80rpx",
+                        "default": "80rpx",
+                        "form_key": "category_ids"
+                    },
+                    "screening_price_list": {
+                        "height": "80rpx",
+                        "default": "80rpx",
+                        "form_key": "screening_price_values"
+                    },
+                    "goods_params_list": {
+                        "height": "80rpx",
+                        "default": "80rpx",
+                        "form_key": "goods_params_values"
+                    },
+                    "goods_spec_list": {
+                        "height": "80rpx",
+                        "default": "80rpx",
+                        "form_key": "goods_spec_values"
+                    }
+                }
+            };
+        },
+
+        components: {
+            componentQuickNav,
+            componentPopup,
+            componentNoData,
+            componentBottomLine
+        },
+        props: {},
+
+        onLoad(params) {
+            // 启动参数处理
+            params = app.globalData.launch_params_handle(params);
+            
+            // 初始参数
+            this.setData({
+                params: params,
+                post_data: {
+                    wd: params.keywords || ''
+                }
+            });
 
-  <!-- 2 处理错误 -->
-  <view v-else-if="0 == 2" class="no-data-box tc">
-    <image src="/static/images/error.png" mode="widthFix"></image>
-    <view class="no-data-tips">{{msg || '处理错误'}}</view>
-  </view>
-
-  <!-- 0 默认没有数据 -->
-  <view v-else-if="0 == 0" class="no-data-box tc">
-    <image src="/static/images/empty.png" mode="widthFix"></image>
-    <view class="no-data-tips">{{msg || '没有相关数据'}}</view>
-  </view>
-</block>
-  </view>
-    
-  <!--<import src="/pages/common/bottom_line.wxml"></import>-->
-  <block data-type="template" data-is="bottom_line" data-attr="status: data_bottom_line_status">
-    <view v-if="(status || false)" class="data-bottom-line">
-        <view class="left fl"></view>
-        <view class="msg fl">我是有底线的</view>
-        <view class="right fr"></view>
-    </view>
-</block>
-</scroll-view>
-
-<!-- 筛选条件 popup -->
-<component-popup :prop-show="is_show_popup_form" prop-position="left" @onclose="popup_form_event_close">
-  <form @submit="form_submit_event" class="popup-form oh bg-white">
-    <view class="search-map">
-      <view class="map-item map-base">
-        <text>筛选出</text>
-        <text class="cr-main"> {{data_total}} </text>
-        <text>条数据</text>
-        <text class="map-remove-submit fr" @tap="map_remove_event">清除</text>
-      </view>
-
-      <!-- 搜索关键字 -->
-      <input type="text" placeholder="其实搜索很简单^_^ !" name="wd" :value="(post_data.wd || '')" class="map-keywords wh-auto" placeholder-class="cr-grey">
-
-      <!-- 品牌 -->
-      <view v-if="((brand_list || null) != null && brand_list.length > 0) || ((search_map_info.brand || null) != null)" class="map-item">
-        <view class="map-nav tc">
-          <text>品牌</text>
-          <text class="arrow-bottom" v-if="brand_list.length > 3" @tap="more_event" data-value="brand_list">更多</text>
-        </view>
-        <view v-if="(search_map_info.brand || null) != null" class="map-content brand-info oh bg-white">
-          <image v-if="(search_map_info.brand.logo || null) != null" :src="search_map_info.brand.logo" mode="aspectFit" class="fl"></image>
-          <view v-else class="info-logo-empty tc fl">{{search_map_info.brand.name}}</view>
-          <view class="info-right fr">
-            <view v-if="(search_map_info.brand.logo || null) != null" class="info-name">{{search_map_info.brand.name}}</view>
-            <view v-if="(search_map_info.brand.describe || null) != null" class="info-desc multi-text">{{search_map_info.brand.describe}}</view>
-          </view>
-        </view>
-        <view v-else class="map-content map-images-text-items map-brand-container oh bg-white" :style="'height:' + map_fields_list.brand_list.height + ';'">
-          <block v-for="(item, index) in brand_list" :key="index">
-            <view :class="'fl tc single-text ' + (item.active == 1 ? 'active' : '')" @tap="map_item_event" :data-index="index" data-field="brand_list">
-              <image v-if="(item.logo || null) != null" :src="item.logo" mode="aspectFit"></image>
-              <text v-else>{{item.name}}</text>
-            </view>
-          </block>
-        </view>
-      </view>
-
-      <!-- 分类 -->
-      <view v-if="(category_list || null) != null && category_list.length > 0" class="map-item">
-        <view class="map-nav tc">
-          <text>分类</text>
-          <text class="arrow-bottom" v-if="category_list.length > 3" @tap="more_event" data-value="category_list">更多</text>
-        </view>
-        <view class="map-content map-text-items map-category-container oh bg-white" :style="'height:' + map_fields_list.category_list.height + ';'">
-          <block v-for="(item, index) in category_list" :key="index">
-            <view :class="'fl ' + (item.active == 1 ? 'active' : '')" @tap="map_item_event" :data-index="index" data-field="category_list">{{item.name}}</view>
-          </block>
-        </view>
-      </view>
-
-      <!-- 价格 -->
-      <view v-if="(screening_price_list || null) != null && screening_price_list.length > 0" class="map-item">
-        <view class="map-nav tc">
-          <text>价格</text>
-          <text class="arrow-bottom" v-if="screening_price_list.length > 3" @tap="more_event" data-value="screening_price_list">更多</text>
-        </view>
-        <view class="map-content map-text-items screening-price-container oh bg-white" :style="'height:' + map_fields_list.screening_price_list.height + ';'">
-          <block v-for="(item, index) in screening_price_list" :key="index">
-            <view :class="'fl ' + (item.active == 1 ? 'active' : '')" @tap="map_item_event" :data-index="index" data-field="screening_price_list">{{item.name}}</view>
-          </block>
-        </view>
-      </view>
-
-      <!-- 属性 -->
-      <view v-if="(goods_params_list || null) != null && goods_params_list.length > 0" class="map-item">
-        <view class="map-nav tc">
-          <text>属性</text>
-          <text class="arrow-bottom" v-if="goods_params_list.length > 3" @tap="more_event" data-value="goods_params_list">更多</text>
-        </view>
-        <view class="map-content map-text-items goods-params-container oh bg-white" :style="'height:' + map_fields_list.goods_params_list.height + ';'">
-          <block v-for="(item, index) in goods_params_list" :key="index">
-            <view :class="'fl ' + (item.active == 1 ? 'active' : '')" @tap="map_item_event" :data-index="index" data-field="goods_params_list">{{item.value}}</view>
-          </block>
-        </view>
-      </view>
-
-      <!-- 规格 -->
-      <view v-if="(goods_spec_list || null) != null && goods_spec_list.length > 0" class="map-item">
-        <view class="map-nav tc">
-          <text>规格</text>
-          <text class="arrow-bottom" v-if="goods_spec_list.length > 3" @tap="more_event" data-value="goods_spec_list">更多</text>
-        </view>
-        <view class="map-content map-text-items goods-spec-container oh bg-white" :style="'height:' + map_fields_list.goods_spec_list.height + ';'">
-          <block v-for="(item, index) in goods_spec_list" :key="index">
-            <view :class="'fl ' + (item.active == 1 ? 'active' : '')" @tap="map_item_event" :data-index="index" data-field="goods_spec_list">{{item.value}}</view>
-          </block>
-        </view>
-      </view>
-
-      <button form-type="submit" class="bg-main search-submit wh-auto" :disabled="popup_form_loading_status" hover-class="none">确认</button>
-    </view>
-  </form>
-</component-popup>
-
-<!-- 快捷导航 -->
-<component-quick-nav></component-quick-nav>
-</view>
-</template>
-
-<script>
-const app = getApp();
-import componentQuickNav from "../../components/quick-nav/quick-nav";
-import componentPopup from "../../components/popup/popup";
-
-export default {
-  data() {
-    return {
-      data_list_loding_status: 1,
-      data_bottom_line_status: false,
-      data_list: [],
-      data_total: 0,
-      data_page_total: 0,
-      data_page: 1,
-      params: null,
-      post_data: {},
-      is_show_popup_form: false,
-      popup_form_loading_status: false,
-      search_nav_sort_list: [{
-        name: "综合",
-        field: "default",
-        sort: "asc",
-        "icon": null
-      }, {
-        name: "销量",
-        field: "sales_count",
-        sort: "asc",
-        "icon": "default"
-      }, {
-        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.globalData.data.currency_symbol,
-      // 搜素条件
-      search_map_info: [],
-      brand_list: [],
-      category_list: [],
-      screening_price_list: [],
-      goods_params_list: [],
-      goods_spec_list: [],
-      map_fields_list: {
-        "brand_list": {
-          "height": "100rpx",
-          "default": "100rpx",
-          "form_key": "brand_ids"
-        },
-        "category_list": {
-          "height": "82rpx",
-          "default": "82rpx",
-          "form_key": "category_ids"
-        },
-        "screening_price_list": {
-          "height": "82rpx",
-          "default": "82rpx",
-          "form_key": "screening_price_values"
-        },
-        "goods_params_list": {
-          "height": "82rpx",
-          "default": "82rpx",
-          "form_key": "goods_params_values"
-        },
-        "goods_spec_list": {
-          "height": "82rpx",
-          "default": "82rpx",
-          "form_key": "goods_spec_values"
-        }
-      }
-    };
-  },
-
-  components: {
-    componentQuickNav,
-    componentPopup
-  },
-  props: {},
-
-  onLoad(params) {
-    // 启动参数处理
-    params = app.globalData.launch_params_handle(params); // 初始参数
-
-    this.setData({
-      params: params,
-      post_data: {
-        wd: params.keywords || ''
-      }
-    }); // 显示分享菜单
-
-    app.globalData.show_share_menu();
-  },
-
-  onShow() {
-    uni.setNavigationBarTitle({
-      title: app.globalData.data.common_pages_title.goods_search
-    }); // 数据加载
-
-    this.init(); // 初始化配置
-
-    this.init_config();
-  },
-
-  // 下拉刷新
-  onPullDownRefresh() {
-    this.setData({
-      data_page: 1
-    });
-    this.get_data_list(1);
-  },
-
-  // 自定义分享
-  onShareAppMessage() {
-    var user_id = app.globalData.get_user_cache_info('id', 0) || 0;
-    var category_id = this.params['category_id'] || 0;
-    var brand_id = this.params['brand_id'] || 0;
-    var keywords = this.params['keywords'] || '';
-    return {
-      title: app.globalData.data.application_title,
-      desc: app.globalData.data.application_describe,
-      path: '/pages/goods-search/goods-search?referrer=' + user_id + '&category_id=' + category_id + '&brand_id=' + brand_id + '&keywords=' + keywords
-    };
-  },
-
-  // 分享朋友圈
-  onShareTimeline() {
-    var user_id = app.globalData.get_user_cache_info('id', 0) || 0;
-    var category_id = this.params['category_id'] || 0;
-    var brand_id = this.params['brand_id'] || 0;
-    var keywords = this.params['keywords'] || '';
-    return {
-      title: app.globalData.data.application_title,
-      query: 'referrer=' + user_id + '&category_id=' + category_id + '&brand_id=' + brand_id + '&keywords=' + keywords
-    };
-  },
-
-  methods: {
-    // 初始化配置
-    init_config(status) {
-      if ((status || false) == true) {
-        this.setData({
-          currency_symbol: app.globalData.get_config('currency_symbol')
-        });
-      } else {
-        app.globalData.is_config(this, 'init_config');
-      }
-    },
-
-    // 获取数据
-    init() {
-      // 获取数据
-      this.get_data_list();
-    },
-
-    // 搜索
-    search_event() {
-      this.setData({
-        data_list: [],
-        data_page: 1
-      });
-      this.get_data_list(1);
-    },
-
-    // 获取数据列表
-    get_data_list(is_mandatory) {
-      // 分页是否还有数据
-      if ((is_mandatory || 0) == 0) {
-        if (this.data_bottom_line_status == true) {
-          return false;
-        }
-      } // 加载loding
-
-
-      uni.showLoading({
-        title: "加载中..."
-      }); // 参数
-
-      var post_data = this.request_map_handle(); // 获取数据
-
-      uni.request({
-        url: app.globalData.get_request_url("index", "search"),
-        method: "POST",
-        data: post_data,
-        dataType: "json",
-        header: {
-          'content-type': 'application/x-www-form-urlencoded'
-        },
-        success: res => {
-          uni.hideLoading();
-          uni.stopPullDownRefresh();
-
-          if (res.data.code == 0) {
-            var data = res.data.data; // 仅首次请求赋值条件数据
-
-            if (this.data_list_loding_status == 1) {
-              this.setData({
-                search_map_info: data.search_map_info || [],
-                brand_list: data.brand_list || [],
-                category_list: data.category_list || [],
-                screening_price_list: data.screening_price_list || [],
-                goods_params_list: data.goods_params_list || [],
-                goods_spec_list: data.goods_spec_list || []
-              });
-            } // 列表数据处理
-
-
-            if (data.data.length > 0) {
-              if (this.data_page <= 1) {
-                var temp_data_list = data.data;
-              } else {
-                var temp_data_list = this.data_list;
-                var temp_data = data.data;
-
-                for (var i in temp_data) {
-                  temp_data_list.push(temp_data[i]);
+            // 分享菜单
+            app.globalData.show_share_menu();
+        },
+
+        onShow() {
+            // 数据加载
+            this.init();
+            
+            // 初始化配置
+            this.init_config();
+        },
+
+        // 下拉刷新
+        onPullDownRefresh() {
+            this.setData({
+                data_page: 1
+            });
+            this.get_data_list(1);
+        },
+
+        // 自定义分享
+        onShareAppMessage() {
+            var user_id = app.globalData.get_user_cache_info('id', 0) || 0;
+            var category_id = this.params['category_id'] || 0;
+            var brand_id = this.params['brand_id'] || 0;
+            var keywords = this.params['keywords'] || '';
+            return {
+                title: app.globalData.data.application_title,
+                desc: app.globalData.data.application_describe,
+                path: '/pages/goods-search/goods-search?referrer=' + user_id + '&category_id=' + category_id + '&brand_id=' + brand_id + '&keywords=' + keywords
+            };
+        },
+
+        // 分享朋友圈
+        onShareTimeline() {
+            var user_id = app.globalData.get_user_cache_info('id', 0) || 0;
+            var category_id = this.params['category_id'] || 0;
+            var brand_id = this.params['brand_id'] || 0;
+            var keywords = this.params['keywords'] || '';
+            return {
+                title: app.globalData.data.application_title,
+                query: 'referrer=' + user_id + '&category_id=' + category_id + '&brand_id=' + brand_id + '&keywords=' + keywords
+            };
+        },
+
+        methods: {
+            // 初始化配置
+            init_config(status) {
+                if ((status || false) == true) {
+                    this.setData({
+                        currency_symbol: app.globalData.get_config('currency_symbol')
+                    });
+                } else {
+                    app.globalData.is_config(this, 'init_config');
+                }
+            },
+
+            // 获取数据
+            init() {
+                // 获取数据
+                this.get_data_list();
+            },
+
+            // 搜索
+            search_event() {
+                this.setData({
+                    data_list: [],
+                    data_page: 1
+                });
+                this.get_data_list(1);
+            },
+
+            // 获取数据列表
+            get_data_list(is_mandatory) {
+                // 分页是否还有数据
+                if ((is_mandatory || 0) == 0) {
+                    if (this.data_bottom_line_status == true) {
+                        return false;
+                    }
                 }
-              }
+                
+                // 获取数据
+                uni.showLoading({
+                    title: "加载中..."
+                });
+                var post_data = this.request_map_handle();
+                uni.request({
+                    url: app.globalData.get_request_url("index", "search"),
+                    method: "POST",
+                    data: post_data,
+                    dataType: "json",
+                    success: res => {
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
+                        if (res.data.code == 0) {
+                            var data = res.data.data;
+                            // 仅首次请求赋值条件数据
+                            if (this.data_list_loding_status == 1) {
+                                this.setData({
+                                    search_map_info: data.search_map_info || [],
+                                    search_map_list: {
+                                        brand_list: data.brand_list || [],
+                                        category_list: data.category_list || [],
+                                        screening_price_list: data.screening_price_list || [],
+                                        goods_params_list: data.goods_params_list || [],
+                                        goods_spec_list: data.goods_spec_list || []
+                                    }
+                                });
+                            }
+                            
+                            // 列表数据处理
+                            if (data.data.length > 0) {
+                                if (this.data_page <= 1) {
+                                    var temp_data_list = data.data;
+                                } else {
+                                    var temp_data_list = this.data_list;
+                                    var temp_data = data.data;
+                                    for (var i in temp_data) {
+                                        temp_data_list.push(temp_data[i]);
+                                    }
+                                }
+
+                                this.setData({
+                                    data_list: temp_data_list,
+                                    data_total: data.total,
+                                    data_page_total: data.page_total,
+                                    data_list_loding_status: 3,
+                                    data_page: this.data_page + 1
+                                });
 
-              this.setData({
-                data_list: temp_data_list,
-                data_total: data.total,
-                data_page_total: data.page_total,
-                data_list_loding_status: 3,
-                data_page: this.data_page + 1
-              }); // 是否还有数据
+                                // 是否还有数据
+                                if (this.data_page > 1 && this.data_page > this.data_page_total) {
+                                    this.setData({
+                                        data_bottom_line_status: true
+                                    });
+                                } else {
+                                    this.setData({
+                                        data_bottom_line_status: false
+                                    });
+                                }
+                            } else {
+                                this.setData({
+                                    data_list_loding_status: 0,
+                                    data_total: 0
+                                });
+                                if (this.data_page <= 1) {
+                                    this.setData({
+                                        data_list: [],
+                                        data_bottom_line_status: false
+                                    });
+                                }
+                            }
+                        } else {
+                            this.setData({
+                                data_list_loding_status: 0
+                            });
+                            app.globalData.showToast(res.data.msg);
+                        }
+                    },
+                    fail: () => {
+                        uni.hideLoading();
+                        uni.stopPullDownRefresh();
+                        this.setData({
+                            data_list_loding_status: 2
+                        });
+                        app.globalData.showToast("服务器请求出错");
+                    }
+                });
+            },
+
+            // 搜索条件处理
+            request_map_handle() {
+                var params = this.params;
+                var post_data = this.post_data;
+                post_data['page'] = this.data_page;
 
-              if (this.data_page > 1 && this.data_page > this.data_page_total) {
+                // 指定分类、品牌
+                post_data['category_id'] = params['category_id'] || 0;
+                post_data['brand_id'] = params['brand_id'] || 0;
+
+                // 搜索条件
+                var temp_field = this.map_fields_list;
+                var temp_list = this.search_map_list;
+                for (var i in temp_field) {
+                    if (temp_list[i] != null != null && temp_list[i].length > 0) {
+                        var temp = {};
+                        var index = 0;
+                        for (var k in temp_list[i]) {
+                            if ((temp_list[i][k]['active'] || 0) == 1) {
+                                switch (i) {
+                                    // 价格
+                                    case 'screening_price_list':
+                                        temp[index] = temp_list[i][k]['min_price'] + '-' + temp_list[i][k]['max_price'];
+                                        break;
+                                    // 属性、规格
+                                    case 'goods_params_list':
+                                    case 'goods_spec_list':
+                                        temp[index] = temp_list[i][k]['value'];
+                                        break;
+                                    // 默认取值id
+                                    default:
+                                        temp[index] = temp_list[i][k]['id'];
+                                }
+                                index++;
+                            }
+                        }
+                        post_data[temp_field[i]['form_key']] = app.globalData.get_length(temp) > 0 ? JSON.stringify(temp) : '';
+                    }
+                }
+                return post_data;
+            },
+
+            // 滚动加载
+            scroll_lower(e) {
+                this.get_data_list();
+            },
+
+            // 搜索条件
+            form_submit_event(e) {
+                this.setData({
+                    post_data: e.detail.value,
+                    data_page: 1
+                });
+                this.popup_form_event_close();
+                this.get_data_list(1);
+            },
+
+            // 筛选条件关闭
+            popup_form_event_close(e) {
+                this.setData({
+                    is_show_popup_form: false
+                });
+            },
+
+            // 筛选条件开启
+            popup_form_event_show(e) {
+                this.setData({
+                    is_show_popup_form: true
+                });
+            },
+
+            // 排序事件
+            nav_sort_event(e) {
+                var index = e.currentTarget.dataset.index || 0;
+                var temp_post_data = this.post_data;
+                var temp_search_nav_sort = this.search_nav_sort_list;
+                var temp_sort = temp_search_nav_sort[index]['sort'] == 'desc' ? 'asc' : 'desc';
+                for (var i in temp_search_nav_sort) {
+                    if (i != index) {
+                        if (temp_search_nav_sort[i]['icon'] != null) {
+                            temp_search_nav_sort[i]['icon'] = 'default';
+                        }
+                        temp_search_nav_sort[i]['sort'] = 'desc';
+                    }
+                }
+                temp_search_nav_sort[index]['sort'] = temp_sort;
+                if (temp_search_nav_sort[index]['icon'] != null) {
+                    temp_search_nav_sort[index]['icon'] = temp_sort;
+                }
+                temp_post_data['order_by_field'] = temp_search_nav_sort[index]['field'];
+                temp_post_data['order_by_type'] = temp_sort;
+                this.setData({
+                    post_data: temp_post_data,
+                    search_nav_sort_list: temp_search_nav_sort,
+                    data_page: 1
+                });
+                this.get_data_list(1);
+            },
+
+            // 条件-更多数据展示事件
+            more_event(e) {
+                var value = e.currentTarget.dataset.value || null;
+                var temp_more = this.map_fields_list;
+                if (value != null && (temp_more[value] || null) != null) {
+                    temp_more[value]['height'] = temp_more[value]['height'] == 'auto' ? temp_more[value]['default'] : 'auto';
+                    this.setData({
+                        map_fields_list: temp_more
+                    });
+                }
+            },
+
+            // 条件-选择事件
+            map_item_event(e) {
+                var index = e.currentTarget.dataset.index;
+                var field = e.currentTarget.dataset.field;
+                var temp_list = this.search_map_list;                
+                if ((temp_list[field] || null) != null && (temp_list[field][index] || null) != null) {
+                    temp_list[field][index]['active'] = (temp_list[field][index]['active'] || 0) == 0 ? 1 : 0;
+                    this.setData({
+                        search_map_list: temp_list
+                    });
+                }
+            },
+
+            // 条件-清空
+            map_remove_event(e) {
+                var temp_list = this.search_map_list;
+                var temp_post = this.post_data;
+                
+                // 关键字
+                temp_post['wd'] = '';
+                
+                // 品牌、分类、价格、属性、规格
+                for (var i in temp_list) {
+                    if((temp_list[i] || null) != null && temp_list[i].length > 0) {
+                        for(var k in temp_list[i]) {
+                            temp_list[i][k]['active'] = 0;
+                        }
+                    }
+                }
+                
+                // 关闭弹窗、分页恢复1页、重新获取数据
                 this.setData({
-                  data_bottom_line_status: true
-                });
-              } else {
-                this.setData({
-                  data_bottom_line_status: false
-                });
-              }
-            } else {
-              this.setData({
-                data_list_loding_status: 0
-              });
-
-              if (this.data_page <= 1) {
-                this.setData({
-                  data_list: [],
-                  data_bottom_line_status: false
-                });
-              }
-            }
-          } else {
-            this.setData({
-              data_list_loding_status: 0
-            });
-            app.globalData.showToast(res.data.msg);
-          }
-        },
-        fail: () => {
-          uni.hideLoading();
-          uni.stopPullDownRefresh();
-          this.setData({
-            data_list_loding_status: 2
-          });
-          app.globalData.showToast("服务器请求出错");
-        }
-      });
-    },
-
-    // 搜索条件处理
-    request_map_handle() {
-      var params = this.params;
-      var post_data = this.post_data;
-      post_data['page'] = this.data_page; // 指定分类、品牌
-
-      post_data['category_id'] = params['category_id'] || 0;
-      post_data['brand_id'] = params['brand_id'] || 0; // 搜索条件
-
-      var data = this;
-
-      for (var i in data.map_fields_list) {
-        if (data[i] != null != null && data[i].length > 0) {
-          var temp = {};
-          var index = 0;
-
-          for (var k in data[i]) {
-            if ((data[i][k]['active'] || 0) == 1) {
-              switch (i) {
-                // 价格
-                case 'screening_price_list':
-                  temp[index] = data[i][k]['min_price'] + '-' + data[i][k]['max_price'];
-                  break;
-                // 属性、规格
-
-                case 'goods_params_list':
-                case 'goods_spec_list':
-                  temp[index] = data[i][k]['value'];
-                  break;
-                // 默认取值id
-
-                default:
-                  temp[index] = data[i][k]['id'];
-              }
-
-              index++;
-            }
-          }
-
-          post_data[data.map_fields_list[i]['form_key']] = app.globalData.get_length(temp) > 0 ? JSON.stringify(temp) : '';
-        }
-      }
-
-      return post_data;
-    },
-
-    // 滚动加载
-    scroll_lower(e) {
-      this.get_data_list();
-    },
-
-    // 搜索条件
-    form_submit_event(e) {
-      this.setData({
-        post_data: e.detail.value,
-        data_page: 1
-      });
-      this.popup_form_event_close();
-      this.get_data_list(1);
-    },
-
-    // 筛选条件关闭
-    popup_form_event_close(e) {
-      this.setData({
-        is_show_popup_form: false
-      });
-    },
-
-    // 筛选条件开启
-    popup_form_event_show(e) {
-      this.setData({
-        is_show_popup_form: true
-      });
-    },
-
-    // 排序事件
-    nav_sort_event(e) {
-      var index = e.currentTarget.dataset.index || 0;
-      var temp_post_data = this.post_data;
-      var temp_search_nav_sort = this.search_nav_sort_list;
-      var temp_sort = temp_search_nav_sort[index]['sort'] == 'desc' ? 'asc' : 'desc';
-
-      for (var i in temp_search_nav_sort) {
-        if (i != index) {
-          if (temp_search_nav_sort[i]['icon'] != null) {
-            temp_search_nav_sort[i]['icon'] = 'default';
-          }
-
-          temp_search_nav_sort[i]['sort'] = 'desc';
-        }
-      }
-
-      temp_search_nav_sort[index]['sort'] = temp_sort;
-
-      if (temp_search_nav_sort[index]['icon'] != null) {
-        temp_search_nav_sort[index]['icon'] = temp_sort;
-      }
-
-      temp_post_data['order_by_field'] = temp_search_nav_sort[index]['field'];
-      temp_post_data['order_by_type'] = temp_sort;
-      this.setData({
-        post_data: temp_post_data,
-        search_nav_sort_list: temp_search_nav_sort,
-        data_page: 1
-      });
-      this.get_data_list(1);
-    },
-
-    // 条件-更多数据展示事件
-    more_event(e) {
-      var value = e.currentTarget.dataset.value || null;
-      var temp_more = this.map_fields_list;
-
-      if (value != null && (temp_more[value] || null) != null) {
-        temp_more[value]['height'] = temp_more[value]['height'] == 'auto' ? temp_more[value]['default'] : 'auto';
-        this.setData({
-          map_fields_list: temp_more
-        });
-      }
-    },
-
-    // 条件-选择事件
-    map_item_event(e) {
-      var index = e.currentTarget.dataset.index;
-      var field = e.currentTarget.dataset.field;
-      var data = this;
-
-      if ((data[field] || null) != null && (data[field][index] || null) != null) {
-        data[field][index]['active'] = (data[field][index]['active'] || 0) == 0 ? 1 : 0;
-        this.setData(data);
-      }
-    },
-
-    // 条件-清空
-    map_remove_event(e) {
-      var data = this; // 关键字
-
-      data['post_data']['wd'] = ''; // 品牌、分类、价格、属性、规格
-
-      for (var i in data.map_fields_list) {
-        if (data[i] != null != null && data[i].length > 0) {
-          for (var k in data[i]) {
-            data[i][k]['active'] = 0;
-          }
-        }
-      } // 关闭条件弹层
-
-
-      data['is_show_popup_form'] = false; // 分页恢复1页、重新获取数据
-
-      data['data_page'] = 1;
-      this.setData(data);
-      this.get_data_list(1);
-    }
-
-  }
-};
-</script>
-<style>
-/**
- * 排序导航
- */
- .nav-sort {
-   background: #eee;
- }
-.nav-sort-content .item {
-  height: 80rpx;
-  line-height: 80rpx;
-  width: 130rpx;
-}
-.nav-sort-content .item .icon {
-  width: 30rpx;
-  height: 30rpx;
-}
-.nav-sort-content .item text, .nav-sort-content .item image {
-  vertical-align:middle;
-}
-.screening-submit {
-  width: 50rpx;
-  height: 50rpx;
-  position: absolute;
-  top: 15rpx;
-  right: 20rpx;
-}
-
-/**
- * 商品列表
- */
- .scroll-box {
-   height: calc(100vh - 80rpx);
- }
-.data-list {
-    overflow: hidden;
-}
-.data-list .items {
-    width: calc(50% - 5rpx);
-    margin-bottom: 10rpx;
-    padding-bottom: 20rpx;
-}
-.data-list .items:nth-child(2n) {
-    float: right;
-}
-.data-list .items:nth-child(2n+1) {
-    float: left;
-}
-.data-list .items image {
-    width: 100%;
-    height: 200px !important;
-}
-.data-list .items .base {
-    text-align: left;
-    font-size: 32rpx;
-    padding: 0 15rpx;
-}
-.data-list .items .base,
-.data-list .items .base .price {
-    margin-top: 15rpx;
-}
-
-/**
- * 条件
- */
-.search-map {
-  height: calc(100vh - 80rpx);
-  width: 680rpx;
-  overflow-y: scroll;
-  overflow-x: hidden;
-}
-.map-keywords {
-  border-radius: 0 !important;
-  padding: 0 10rpx;
-  line-height: 66rpx;
-  height: 66rpx;
-  font-size: 26rpx;
-  box-sizing: border-box;
-}
-.map-nav {
-  position: relative;
-}
-.map-nav .arrow-bottom {
-  position: absolute;
-  top: 0;
-  right: 10rpx;
-  padding-right: 46rpx;
-  color: #999;
-}
-.map-item {
-  background: #f0f0f0;
-  line-height: 76rpx;
-}
-.map-base,
-.map-nav {
-  padding: 0 10rpx;
-}
-.map-content {
-  padding: 15rpx;
-  line-height: 60rpx;
-}
-.map-text-items view,
-.map-images-text-items view {
-  padding: 0 15rpx;
-  border-radius: 2px;
-  margin: 15rpx;
-  border: 1px solid transparent;
-}
-.map-images-text-items view {
-  vertical-align: middle;
-  border: 1px solid #eee;
-  width: 150rpx;
-  height: 72rpx;
-  line-height: 72rpx;
-}
-.map-images-text-items view image {
-  width: 150rpx;
-  height: calc(100% - 8rpx);
-  display: block;
-  margin: 0 auto;
-  margin-top: 4rpx;
-}
-.map-text-items view.active,
-.map-images-text-items view.active {
-  border: 1px solid #e23f36;
-  color: #e23f36;
-  font-weight: bold;
-}
-.search-map .search-submit {
-  height: 80rpx;
-  line-height: 80rpx;
-  position: absolute;
-  left: 0;
-  bottom: 0;
-  border-radius: 0;
-}
-.map-remove-submit {
-  color: #e23f36;
-}
-
-/**
- * 品牌基础信息
- */
-.brand-info {
-  padding: 35rpx 15rpx;
-}
-.brand-info image,
-.brand-info .info-logo-empty {
-  width: 300rpx;
-  height: 130rpx;
-  border: 1px solid #eee;
-}
-.brand-info .info-logo-empty {
-  line-height: 130rpx;
-}
-.brand-info .info-right {
-  width: calc(100% - 330rpx);
-}
-.brand-info .info-desc {
-  color: #999;
-  font-size: 28rpx;
-  line-height: 40rpx;
-  min-height: 80rpx;
-}
+                    search_map_list: temp_list,
+                    post_data: temp_post,
+                    is_show_popup_form: false,
+                    data_page: 1
+                });
+                this.get_data_list(1);
+            }
+        }
+    };
+</script>
+<style>
+    @import './goods-search.css';
 </style>
\ No newline at end of file
diff --git a/static/images/quick-submit-icon.png b/static/images/quick-submit-icon.png
deleted file mode 100644
index b3cab1bf47fb54067142e96ba2f0941f5208cdc7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1246
zcmV<41R?v0P)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk000D~Nkl<ZXhZFr
zU8rVL7{`DATS97N2ty|2Yb0WDfg}+rGWp6!!;B^~b3-m%FvW#&H`9<Yq6QOF(#T8=
zGDTvTVrGbZrVxtB=jEg4wDz&z^{##1wcmNqdDrfor_Rke&syvG?X~x_p7merh*@Tu
zWxNaoHnUTJ(}AOb`M~p%zUu0OY6Ld3mB4ktB?-74z!piHy9S;FHnW$38!}+lN_rr}
zuNap;;1;kI#3o617eh24kRD(&TLwHeMDU9w?Hi)qj5mpaKLXB4MDZ)|I&eorgf9Y5
z&v^8C1AZv!@5*%&*vzg3wkP^nBk5uPy_uZ|Yyhsx8><K}pR6U4c6l^)V4uBbqY(cB
z7D)Q7`n{Q@{E8r(B8U$pEslZj2i8W7CTF(>d=&6Y>4Z^y2P7RC178iimH?SA>E{~o
zitt)@iFvD}B|X658~p(|HX`vNV~3>mX6E1W#ff5M;`=Dn_DH&~FKGqfb%0k`ZS7=9
z-?VKs4*z&rIs*6@@NArGFG;#F*LmE2sY>fiU~gt%pN5qGS*HKk-I{9YV*oEEQX7XV
z=smz~k~#z1m$c%?AClA}z<-VdJgNN%Y?icf?9(+w00Z~KL-bj6lR4m`r)LDg&CT!#
z9^%NlFf(5*mIp0u0q|!?n)@Yf8fKtkXE>}7uB61JZpHZ)uujspHsD192iS))K~_uh
zk~qtX12(gJf%RF@|L?Rsw=O6V_<P{^mcYIvIya|Hym>gyYvY`T)990WmA?bl0G`CI
z0WL_4?|+Z&9ZCMJPg-5#aUI(A=+f*3Nw-!(nc3OEyTBotf%d32b>Lj_J#(Cqxm_>m
zm3nVxwiCEKbA*3@d6NEh|2puKz&)9r%%s~wNnc06zLUGDMG%Ke@-@5%_@eNtwCHC>
zT(?QOw)RSUo_QZQEOYb?l05TISe&$6g!iN{E;|o!eLOb*W}g9EYW0aZBjJ-uTDvMe
zIte^3%4qgnMQLk&a&l7#C9cD+jOJEZ71ybfKF@hd#Q}TJX674%r8xjWQ`?&9JNO1b
zZbzf`GqXp5)xe<*eY>Xin51mjzN9tkpbxe`GxOwh3vfc%HT@p8hkJ8t=QxHUU+IH=
zP*b&^1D?*OTSDJ+Gh8bI&JR^jEVH-(|EeTERqUKK9kt{v{=Q>bCFzSUQKt^ma$qY)
zKPX?;R!AG?1By2fO}7B1iqY4^v&IS0X6zW)CC_1YODiP#e!6(83jmh^Zzdvs0`T(9
zcQGyl`A>X|>cU&8HvqOvdc5MQ1N$ldmI(MK;6h0*qD`2YJpw#f{8aV^*ng>|K@WaT
z(w+6T;d0uy9RvPDl3(ZOk$6(sd8ec+B4B@=-|iUjdy-r!=>c8{e3<~bw311}?D_>Z
zzpK?1I}rBFZ}b3%@6+#ErZlD9fZyft*>*8Jw%Y+uTqT;HN=zu0Dd4+?xD~rwl9!>K
zuvDexOOr2Ax#l-jTd5AY9Z!c}Q!Twe{A0(UF*^m@_e$64%<N{s*W8m5)V^cdD9LrD
zPT7?EVKZ|9&6R%tH=cRnhTbRj+qIpdjZYrB7W^>r&N{{8KMuWHOgR^Py8r+H07*qo
IM6N<$g5&jFhyVZp

diff --git a/static/images/search-asc-icon.png b/static/images/search-asc-icon.png
deleted file mode 100755
index 0b16b29ca9b01ee5ae30d204bd0e8e83bbf6da1c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3041
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
Q;I;0+$j}TfGoVHNA4t@Gy#N3J

diff --git a/static/images/search-default-icon.png b/static/images/search-default-icon.png
deleted file mode 100755
index d91a76411e25c600b21126eb2bf1c338e2c23275..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2900
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
Z1B8bc7epFE?0MZXFga_ED>rh9`X9suQV{?E

diff --git a/static/images/search-desc-icon.png b/static/images/search-desc-icon.png
deleted file mode 100755
index 9e79244e980730cf0ada2ee25b59e1bcc24f945a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2979
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
Kj#_W(lk`7{N;J&?

diff --git a/static/images/search-submit-icon.png b/static/images/search-submit-icon.png
deleted file mode 100755
index af52059811973ec56982a2db531629e25fd8b34a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3718
zcmcIn`8(9#7k|%~G($2Y(gztcvW!HDD3rz<S<Bdc5F%tJOR`Liyk*HUk}XnW%~IAv
z6tb0dvW;CR`x24xoxcCU_lNI&o_o)I?sK2lIrrRiUiaL{8+sZXY<z400B~qt14&Ft
z{@anP%(3yZO$PuR)zt*A8v0u;SvtpAsPSBOxGird&pw$?aeyO3YYl}E@eyPU22D{(
zVl#S_a|$g{qd4k!>;nd;I9g^C)r^E;#idc4Vc7^aZnk(}J)w&2B^(7>X|{G!7CV*u
zUoVsL{co1_`Q4ryV;Jo^*K}Rn%W(g_^`pg!QhtgLrgL|tuTxcvOi2_HQDF+<xYgxc
z;s5h&qG#{Hg9k-gv|d?oB>4cacE=CHfXc(<CA6n9rj8vrfRTBi?F3hbwD43Jsof;?
z(AT>N4<$9wRPy*^1i26TegafFVNGwDHR0+B13a#aCYmL5%&@jd;JB`ncQ)o$x_f(j
zb-{6BQwH9{Fa_F=YqKlvnDP3hAyh9KA1R{p+B97Sv;>3zYof0BLl+&e3pX`Gg#J~%
z5Ls(Jg=|o*>;EkP(t*{;R*bL7s`Z65<=n!;g&5W!2d1vs$gGOXPoZLsrZ7GZCE&<#
zrE<%gR||Yj+IZx|pLuDo;LRdApmThq3hgO}aSewO0c!@|HyGy3Yu8;xWo2b79q&-?
zT8LM9e&cB@G>5}SsOl$Ixia4Oy?NDKA>KZ>G0k8w+*!yaMmPr~@C4p4UFmw|0dyL2
zOtLp~mQOx+_H1eM#KgoYaO4n%6Kqn2O`HZwZ}I##X4*3P<`r*&<E@u>9N~^d_wp`v
zLH!aGbk7W_9c$e4ZMwk3!n3(jRaNyDehOzZe5^+i@|VL)eV*|W7=K(KX<nY^Gy2ZQ
z0n;M@Y+Ibbfj@EhXOa|uah)IoA0kG@Ip{d>r=Qv@F@we|;b|5|x;0FPyC;9SjlJ3w
z6grIQ@d9qRy1Le<D&ODIxVl-mQ%{;V1)fGgE#Z#xc8o2jC-!^iKuckxk6aUcz*8r1
z`a4C3mpH;(Nr>=g9y1!s<Zx{4l#0b(*_Y{y9k+0QZK{+66~oDvdoK8F4#1<Fy1rJr
zS46WChl|ss)S9B4^$oTE1(k%7JCw2N56@3d+Z<5Hze^aEK?U|^UE%T0*|Dmh(=cmP
z;GVNYQu}k}6&zf6K5$)K94={EYCSMHImwIm?8xKriVvwr<6Bd(@_ptTfs<k|Un!C7
ze@N||{M}e_Zng}_6l{u44#o$(vyj3*>6(jpQGSjaHVDwT-62T?IUgDnr0K^lR>3BU
zN%{1Yt~qU+p9I=b7P7`3`4IW^$rRrcDf(Xt$D>*pm3xZd;%ZNi7^PLso~46Bmn<H0
z7MJEQ=G_149tQJkeaC21i!hhk?Lbt2enSC{!KyT^S*@ejAPcEqd8i;a8Cz9A(D;1H
zXE-)1m_XTfGgOH+c4KbEU{<#HDxmL4UT<qd3^PMb(OD%W?z>vF_0%qbnG{mKtXyW7
zyFk&4Y?oYWyYSTGz`GWblxj&fe%q@+QH7W9=EzwI6N#j~fPesner%#hW|zb8@UZ{#
zNAD9=ZyrLvQMSFqKM~(oR>lLSKgGEF>*he$t`VYc^=_n{pi!p|70zK^H#hbR;=m7g
zucST$wDO}cYb1GV=zBQ9AV)y<)~D!4P7~R2xfT280E?-f<gW%fIzvNuZ>FXKo!MPl
z4kn!(Rp%*aKXCGuxSa&eKO=m1x?;>L8yza2ADxsV3aseemib3oWk0E7X6q^_^U(Mt
z!l~#!tYQ6z&kOVvL-dQ|9cE~3d$hb2B;RGj{niaN;xyCB&p@x~R>|>=os&%NV5A;F
zrDXsm!c*VAoKyvUX`~^~<&n25^hT!~AIBmrK$d>nCRcZsUXJKC-*^yJrPNSz=b)jS
z#W{&-_hmqGJ?{K<<hgp|lfp}BPk?aZ<f4wKcT`LCy<%!YJx$lFygw684hc9>Z;15F
z&X1Kl11s;Zou2a{eZPil63$V%LlL0S8PK*S?`R1-ZtJYQK_8b2!G|CJY?8H!f;v{2
zF6Z1IU?3z%j3v!qE;-MUD0bcLT!mowUxTi&1Bc(~04ACQKQ~IB&OF_m6KDu`lPMco
zyliP{X_W~Te0IDIf90WQr3QAqr1ljMZH^clYx&@8Gc`_m_)8_<|4bRu)dpzvU8p*y
z1L;vhO?YfC??d2b8}G1_83@qvdYnx1$}{zLGXF~>&I3ycEhmY{fwxz`IDXY9k88T%
zFX?K%ZK7QKFG^NRPkBu^S}YC7jhCU4=I~RSf)~<HQMMCNyQwKaq0)s1f?Py_Tkv%C
z_8VH3WGFCtq)0%7;y*|UVgeLxY6GiIyl5+KV&Er)LJW1%Pph?ZDeO$glz853?`K3c
zFYtabv_XT2>{5LqCu}SR)5`xBz2?H{lSn}a-g!6MTaIAjhC{s7xEuL~TZ=z_+$*|$
zmrq=Uut{Zn5yhKJ(`0?Gyl_HgRm`e!SxN5HheG2_(vz3(4w1{B<^RIutUxpRlK<c>
zBGl+iD%G6M`R_ZS4u)(1Q|35OctxiF8<s{#LEi&-6QE#GTDnnUr~<m7ZNAy0W?#CV
z6H`Z^3>FRPvBYev5h?(T;%K@K=%7V#FHwZe2gyZ4#==t>G*Uie;m%Xiyi{h?lNS1J
zaUCjGL8IxOShpNX!`XS^g7@ravs*;o4&)|^nPZu<va&yA02g~LPad!3V?-Ul!j&ou
zHsDiNmyyjzUZDg{?`l(xQt;kmZ9;CWc{L-D5MBB@Ksj*oWBAFiu&|YyGpJ)d9!%hG
zot>RYHop~&=N*d<*npd>r7hbRTW$!GN%M2iVCj9ITIuB^JAH!BVf?e@wWxpMNLI4O
z>HKyP{i!Fr5FSgN-QC?U?`_N$9ZfL!a?r?SeF1M}7GrJTvvX>(+H=}><M%Rw7OM&l
z97$JV0~+?f#MSt%O*IeAbR=JC+zN=>@g>Zp<anHnKlTXF%PA78jXv*6hm^!D+s#Pr
z<GVkYQT-z+I#N{)*A#zC8NbRnm^0`EN^f$5N7Vq<E16wY%;x7E3SFWZ2NjU=|HyuR
z^sGPi*TKpf9)*edp_<)n>lwnR%mkY}1?%_uUsC75HC1*du~O5h`Bd{qP;pP_2H~kF
z?N5znhN#^dXJJv%k`p+>P#x0%%QY&@dOr>y7lSXt0qLC)u3%0~E*s8@gI$llxxN#q
zegD2<F2$Qc=hF{KLF3;bEMMb*7d#%%L;Kzom%8o_p3O|UbTQLgI=E3|pfG(vq5T)D
ztr`%4sMVQANnnChz+BTOGdyl;OZUGoEscsMwt1L86%L#|v%t*R=cA*ewE(YK<Vjfi
z>Hc&_8+j~Uf!8A${c)j5*N)7~7S58Mt`fZE=}Yg^&Dh;o&{;$_WX!nmL)Axs%A>2_
ziW(am%Vs+>cCG9L{Sb<2CV{~Z%930#Su1cHBKKQVZBqhp6m?X!=}H9B?Bao*-&>3Q
ziZ<tgv;aMVkAhg%(L{w*s5p_dKGXe<I>^<4`+$R5HCo`_zr8Q{gOcUt<s<Z=p|)Li
zIi5M*5H4VKxUI(sdH)3|U%;^B7mKYf;6SPt16D;IjjCRHK2^KzBL+z3U)Wz>SYXtV
z@=K@Zwnd7Ll+MIQ9upH(^q$puRtTEgUI)~>QhdhA(BjiO9f@F*^I;`oZL{=40Km4U
zx3=^~LN_@k2R?0oKz8a0DhyL(v!ob9kwOi~3G)Rk05}|TW&c4@H|ap(ELIMu%1G)X
zJk-P5hFrGPGnM@e1_RnBE0Ex~KdgZtk}}IYH(A`_m>v@*rQFjwCE|&&=FUJ3@6>8?
z_uPsv?wnFaffn@MUaz)R@Vt1PGM1(5c9}s<P0h{dP*~)t24tMD`|e<6(DUo5{i&XF
z=b3egfws1GJ)<tTNbXAXOw|C^%r4Fm?lM0#Ha1o#lX9d!=BE$%Cvb2hA$U;;|Ngy?
zF4O5T<7tQgtPeiq;NLFB)+@{!;UkZb;MEOZb|RRq{u)?oTrZ7TW1kYxyB#FZw8E);
z2<UKO%o?@YKe1nvzic=uAI%Jyvdd=I&0^PDnN_>^uRkj)Iyo<1gsIjpxiZFLp}|R|
z@{qxvp4XkA9zJ-88`ypmb(3l<D{~EnP5?FwW(C;izH$2eRZQ<FGy0zIU>C=g#nwVE
zyHke`qXL^h@9?~v=lSO)BJU$%v)KG`YnB9@zO(6J;Lm?Ae1v-LYkTA+8Kf>*y-v{T
zjJ4IK^WRmD7fHwL?a+?^j$q}$@@m&HH^Y*+G?G<edLBNk6yf-DVX|UMzW05BNvkeF
zPDJccs}MJgFGzWWoBXww=%$scc~Ku^eU9v&7--bB8Kjp$(PV3;8a2S!YK8k;PVKV5
zc)>i6SJ*pY43CTq(x+TW7KZ<!DRGyMM5wU>t8V#*!+$HARf7aBYr2$UU}IKm!&{T>
z$5bHZmyzA^Z8g>uo!b%1%gcTSaF8`*`jBG$hns-)h6$<oI58b-XY(6{B<7*^yBzoj
ziY*yxpa#yCAHR=J?pSM^Ye?V{LTCG%Fn#ELz`7+Rq9O#Y6~}Q2jqP(RT56G1peak7
zh)V4q|6mOjcz|xMA!?ERcjZg{2rxMAkzY6!Sle>9ULnB|MD7(f0&Hq&ykU%nKvKlV
zcu4RjM*V|2Z4?@*Uwir`0;&pOxu5*MD*PA%d-~Su^Ew-PocX^5G}ZLLVxo2Ee*lzt
B@I?Rs