From c4b433fe951c831519a784bed4f914845b686ed5 Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Sun, 19 Jan 2020 11:46:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/appmini/old/alipay/app.acss            |  1 +
 .../plugins/membershiplevelvip/user/user.js   |  4 +-
 public/appmini/old/baidu/app.css              |  1 +
 public/appmini/old/qq/app.qss                 |  1 +
 public/appmini/old/toutiao/app.ttss           |  1 +
 public/appmini/old/weixin/app.json            | 10 +--
 public/appmini/old/weixin/app.wxss            |  1 +
 .../extraction-order/extraction-order.js      | 29 ++++++++
 .../extraction-order/extraction-order.wxml    | 74 ++++++++++++-------
 .../extraction-order/extraction-order.wxss    | 14 ++++
 .../pages/plugins/distribution/user/user.js   |  9 ++-
 .../pages/plugins/distribution/user/user.wxml |  2 +-
 .../plugins/membershiplevelvip/user/user.js   |  4 +-
 13 files changed, 110 insertions(+), 41 deletions(-)

diff --git a/public/appmini/old/alipay/app.acss b/public/appmini/old/alipay/app.acss
index 589256348..2cd49254e 100644
--- a/public/appmini/old/alipay/app.acss
+++ b/public/appmini/old/alipay/app.acss
@@ -86,6 +86,7 @@ textarea {
 .fr { float: right; }
 .bg-white { background-color: #fff; }
 .wh-auto { width: 100%; }
+.ht-auto { height: 100%; }
 .tc { text-align: center; }
 .tl { text-align: left; }
 .tr { text-align: right; }
diff --git a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/user/user.js b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/user/user.js
index d275b9779..99039c7b8 100644
--- a/public/appmini/old/alipay/pages/plugins/membershiplevelvip/user/user.js
+++ b/public/appmini/old/alipay/pages/plugins/membershiplevelvip/user/user.js
@@ -40,14 +40,14 @@ Page({
               });
             }
             self.setData({
-              avatar: user.avatar || app.data.default_user_head_src,
+              avatar: ((self.data.avatar || null) == null) ? (user.avatar || app.data.default_user_head_src) : self.data.avatar,
               nickname: user.nickname || '用户名',
             });
           },
         });
       } else {
         self.setData({
-          avatar: user.avatar || app.data.default_user_head_src,
+          avatar: ((self.data.avatar || null) == null) ? (user.avatar || app.data.default_user_head_src) : self.data.avatar,
           nickname: user.nickname || '用户名',
         });
         
diff --git a/public/appmini/old/baidu/app.css b/public/appmini/old/baidu/app.css
index ba162e3a1..be4fd6b14 100755
--- a/public/appmini/old/baidu/app.css
+++ b/public/appmini/old/baidu/app.css
@@ -93,6 +93,7 @@ textarea {
 .fr { float: right; }
 .bg-white { background-color: #fff; }
 .wh-auto { width: 100%; }
+.ht-auto { height: 100%; }
 .tc { text-align: center; }
 .tl { text-align: left; }
 .tr { text-align: right; }
diff --git a/public/appmini/old/qq/app.qss b/public/appmini/old/qq/app.qss
index 4b67f5d96..9a113a827 100755
--- a/public/appmini/old/qq/app.qss
+++ b/public/appmini/old/qq/app.qss
@@ -93,6 +93,7 @@ textarea {
 .fr { float: right; }
 .bg-white { background-color: #fff; }
 .wh-auto { width: 100%; }
+.ht-auto { height: 100%; }
 .tc { text-align: center; }
 .tl { text-align: left; }
 .tr { text-align: right; }
diff --git a/public/appmini/old/toutiao/app.ttss b/public/appmini/old/toutiao/app.ttss
index 6a2cd4078..0fd518c33 100755
--- a/public/appmini/old/toutiao/app.ttss
+++ b/public/appmini/old/toutiao/app.ttss
@@ -94,6 +94,7 @@ textarea {
 .fr { float: right; }
 .bg-white { background-color: #fff; }
 .wh-auto { width: 100%; }
+.ht-auto { height: 100%; }
 .tc { text-align: center; }
 .tl { text-align: left; }
 .tr { text-align: right; }
diff --git a/public/appmini/old/weixin/app.json b/public/appmini/old/weixin/app.json
index 87fe7c8df..73924c445 100755
--- a/public/appmini/old/weixin/app.json
+++ b/public/appmini/old/weixin/app.json
@@ -1,8 +1,5 @@
 {
   "pages": [
-    "pages/plugins/distribution/extraction/extraction",
-    "pages/plugins/distribution/extraction-apply/extraction-apply",
-    "pages/plugins/distribution/extraction-order/extraction-order",
     "pages/plugins/distribution/user/user",
     "pages/index/index",
     "pages/goods-category/goods-category",
@@ -31,6 +28,7 @@
     "pages/user-orderaftersale/user-orderaftersale",
     "pages/user-orderaftersale-detail/user-orderaftersale-detail",
     "pages/extraction-address/extraction-address",
+    "pages/common/open-setting-location/open-setting-location",
     "pages/plugins/coupon/index/index",
     "pages/plugins/coupon/user/user",
     "pages/plugins/membershiplevelvip/index/index",
@@ -50,8 +48,10 @@
     "pages/plugins/distribution/statistics/statistics",
     "pages/plugins/distribution/poster/poster",
     "pages/plugins/distribution/team/team",
-    "pages/plugins/distribution/introduce/introduce",
-    "pages/common/open-setting-location/open-setting-location"
+    "pages/plugins/distribution/extraction/extraction",
+    "pages/plugins/distribution/extraction-apply/extraction-apply",
+    "pages/plugins/distribution/extraction-order/extraction-order",
+    "pages/plugins/distribution/introduce/introduce"
   ],
   "permission": {
     "scope.userLocation": {
diff --git a/public/appmini/old/weixin/app.wxss b/public/appmini/old/weixin/app.wxss
index 4b67f5d96..9a113a827 100755
--- a/public/appmini/old/weixin/app.wxss
+++ b/public/appmini/old/weixin/app.wxss
@@ -93,6 +93,7 @@ textarea {
 .fr { float: right; }
 .bg-white { background-color: #fff; }
 .wh-auto { width: 100%; }
+.ht-auto { height: 100%; }
 .tc { text-align: center; }
 .tl { text-align: left; }
 .tr { text-align: right; }
diff --git a/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.js b/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.js
index 7b6b61848..b322215f0 100644
--- a/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.js
+++ b/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.js
@@ -19,6 +19,9 @@ Page({
     extraction_value: null,
     extraction_code: '',
     form_submit_disabled_status: false,
+
+    is_show_search_popup: false,
+    search_keywords_value: '',
   },
 
   onLoad(params) {
@@ -89,6 +92,7 @@ Page({
       data: {
         page: this.data.data_page,
         status: status || 0,
+        keywords: this.data.search_keywords_value || '',
       },
       dataType: "json",
       success: res => {
@@ -213,6 +217,7 @@ Page({
       extraction_code: self.data.extraction_code,
     };
     self.setData({ form_submit_disabled_status: true });
+    wx.showLoading({ title: "处理中..." });
     wx.request({
       url: app.get_request_url("take", "extraction", "distribution"),
       method: "POST",
@@ -242,4 +247,28 @@ Page({
       }
     });
   },
+
+  // 搜索弹层-开启
+  drag_event(e) {
+    this.setData({ is_show_search_popup: true});
+  },
+
+  // 搜索弹层-关闭
+  search_popup_event_close() {
+    this.setData({ is_show_search_popup: false });
+  },
+
+  // 搜索关键字输入事件
+  search_input_keywords_event(e) {
+    this.setData({ search_keywords_value: e.detail.value || '' });
+  },
+
+  // 搜索确认事件
+  search_submit_event(e) {
+    this.setData({
+      is_show_search_popup: false,
+      data_page: 1,
+    });
+    this.get_data_list(1);
+  },
 });
\ No newline at end of file
diff --git a/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.wxml b/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.wxml
index 53e9ff664..c960a8f81 100644
--- a/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.wxml
+++ b/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.wxml
@@ -5,41 +5,48 @@
   </block>
 </view>
 
-<!-- 列表 -->
-<scroll-view scroll-y="{{true}}" class="scroll-box" bindscrolltolower="scroll_lower" lower-threshold="30">
-  <view class="data-list">
-    <view class="item bg-white spacing-mb" wx:if="{{data_list.length > 0}}" wx:for="{{data_list}}" wx:key="key">
-      <view class="base oh br-b">
-        <text class="fl cr-666">{{item.add_time}}</text>
-        <text class="fr nickname cr-888">{{item.status_name}}</text>
-      </view>
-      <view class="content">
-        <view class="multi-text">
-          <text class="title cr-666">订单号</text>
-          <text class="value">{{item.order_no}}</text>
+<movable-area class="wh-auto ht-auto">
+  <!-- 列表 -->
+  <scroll-view scroll-y="{{true}}" class="scroll-box" bindscrolltolower="scroll_lower" lower-threshold="30">
+    <view class="data-list">
+      <view class="item bg-white spacing-mb" wx:if="{{data_list.length > 0}}" wx:for="{{data_list}}" wx:key="key">
+        <view class="base oh br-b">
+          <text class="fl cr-666">{{item.add_time}}</text>
+          <text class="fr nickname cr-888">{{item.status_name}}</text>
         </view>
-        <view class="multi-text">
-          <text class="title cr-666">支付金额</text>
-          <text class="value">{{item.pay_price}}</text>
-          <text class="unit cr-888">元</text>
+        <view class="content">
+          <view class="multi-text">
+            <text class="title cr-666">订单号</text>
+            <text class="value">{{item.order_no}}</text>
+          </view>
+          <view class="multi-text">
+            <text class="title cr-666">支付金额</text>
+            <text class="value">{{item.pay_price}}</text>
+            <text class="unit cr-888">元</text>
+          </view>
+        </view>
+
+        <view wx:if="{{item.status == 0}}" class="operation tr br-t-dashed">
+          <button class="cr-888 br" type="default" size="mini" hover-class="none" class="br" data-index="{{index}}" data-oid="{{item.order_id}}" data-uid="{{item.order_user_id}}" bindtap="list_submit_take_event">取货</button>
         </view>
       </view>
 
-      <view wx:if="{{item.status == 0}}" class="operation tr br-t-dashed">
-        <button class="cr-888 br" type="default" size="mini" hover-class="none" class="br" data-index="{{index}}" data-oid="{{item.order_id}}" data-uid="{{item.order_user_id}}" bindtap="list_submit_take_event">取货</button>
+      <view wx:if="{{data_list.length == 0}}">
+        <import src="/pages/common/nodata.wxml" />
+        <template is="nodata" data="{{status: data_list_loding_status}}">
+        </template>
       </view>
-    </view>
 
-    <view wx:if="{{data_list.length == 0}}">
-      <import src="/pages/common/nodata.wxml" />
-      <template is="nodata" data="{{status: data_list_loding_status}}">
-      </template>
+      <import src="/pages/common/bottom_line.wxml" />
+      <template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
     </view>
+  </scroll-view>
 
-    <import src="/pages/common/bottom_line.wxml" />
-    <template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
-  </view>
-</scroll-view>
+  <!-- 拖拽按钮 -->
+  <movable-view class="search-drag tc" direction="all" bindtap="drag_event">
+    <icon type="search" size="30"/>
+  </movable-view>
+</movable-area>
 
 <!-- 取货 popup -->
 <component-popup prop-show="{{is_show_take_popup}}" prop-position="bottom" bindonclose="take_popup_event_close">
@@ -52,4 +59,17 @@
       <button class="submit-bottom" type="default" hover-class="none" disabled="{{form_submit_disabled_status}}" bindtap="form_submit_take_event">确认</button>
     </view>
   </view>
+</component-popup>
+
+<!-- 搜索 popup -->
+<component-popup prop-show="{{is_show_search_popup}}" prop-position="bottom" bindonclose="search_popup_event_close">
+  <view class="form-container spacing-mt">
+    <view class="form-gorup tc">
+      <view class="form-gorup-title">搜索条件</view>
+      <input type="number" value="{{search_keywords_value}}" placeholder-class="cr-ccc" class="cr-666 br-b spacing-mt" placeholder="订单号/取货码" bindinput="search_input_keywords_event" />
+    </view>
+    <view class="form-gorup">
+      <button class="submit-bottom" type="default" hover-class="none" disabled="{{form_submit_disabled_status}}" bindtap="search_submit_event">搜索</button>
+    </view>
+  </view>
 </component-popup>
\ No newline at end of file
diff --git a/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.wxss b/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.wxss
index 2a3d9fdd1..a3a6ca628 100644
--- a/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.wxss
+++ b/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.wxss
@@ -62,4 +62,18 @@
 .submit-bottom {
   background-color: #ff6a80 !important;
   color: #fff !important;
+}
+
+/*
+ * 搜索
+ */
+.search-drag {
+  width: 30px;
+  height: 30px;
+  padding: 10px;
+  background: hsla(0, 0%, 0%, 0.1);
+  border-radius: 50%;
+  margin-top: calc(100vh - 120px);
+  margin-left: calc(50% - 25px);
+  box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.3);
 }
\ No newline at end of file
diff --git a/public/appmini/old/weixin/pages/plugins/distribution/user/user.js b/public/appmini/old/weixin/pages/plugins/distribution/user/user.js
index c6d0ae126..b554645fc 100644
--- a/public/appmini/old/weixin/pages/plugins/distribution/user/user.js
+++ b/public/appmini/old/weixin/pages/plugins/distribution/user/user.js
@@ -15,10 +15,11 @@ Page({
     nav_list: [],
   },
 
-  onLoad(params) {},
+  onLoad(params) {
+    this.setData({ nav_list: this.nav_list_data() });
+  },
 
   onShow() {
-    this.setData({ nav_list: this.nav_list_data()});
     this.init();
   },
 
@@ -41,14 +42,14 @@ Page({
               });
             }
             self.setData({
-              avatar: user.avatar || app.data.default_user_head_src,
+              avatar: ((self.data.avatar || null) == null) ? (user.avatar || app.data.default_user_head_src) : self.data.avatar,
               nickname: user.nickname || '用户名',
             });
           },
         });
       } else {
         self.setData({
-          avatar: user.avatar || app.data.default_user_head_src,
+          avatar: ((self.data.avatar || null) == null) ? (user.avatar || app.data.default_user_head_src) : self.data.avatar,
           nickname: user.nickname || '用户名',
         });
         
diff --git a/public/appmini/old/weixin/pages/plugins/distribution/user/user.wxml b/public/appmini/old/weixin/pages/plugins/distribution/user/user.wxml
index 4059d1922..8d25e5ed7 100644
--- a/public/appmini/old/weixin/pages/plugins/distribution/user/user.wxml
+++ b/public/appmini/old/weixin/pages/plugins/distribution/user/user.wxml
@@ -10,7 +10,7 @@
     <view wx:if="{{(user_level || null) != null && (user_level.name || null) != null}}" class="single-text level-name spacing-mt">{{user_level.name}}</view>
     <block wx:if="{{(data_base || null) != null && (data_base.is_enable_self_extraction || 0) == 1}}">
       <navigator url="/pages/plugins/distribution/extraction/extraction" hover-class="none">
-        <button size="mini" type="default" hover-class="none" class="head-base-submit">{{(extraction_data || null) == null ? '申请' : ''}}取货点</button>
+        <button size="mini" type="default" hover-class="none" class="head-base-submit">{{(extraction || null) == null ? '申请' : ''}}取货点</button>
       </navigator>
     </block>
   </view>
diff --git a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.js b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.js
index 12879df16..09ee074de 100644
--- a/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.js
+++ b/public/appmini/old/weixin/pages/plugins/membershiplevelvip/user/user.js
@@ -39,14 +39,14 @@ Page({
               });
             }
             self.setData({
-              avatar: user.avatar || app.data.default_user_head_src,
+              avatar: ((self.data.avatar || null) == null) ? (user.avatar || app.data.default_user_head_src) : self.data.avatar,
               nickname: user.nickname || '用户名',
             });
           },
         });
       } else {
         self.setData({
-          avatar: user.avatar || app.data.default_user_head_src,
+          avatar: ((self.data.avatar || null) == null) ? (user.avatar || app.data.default_user_head_src) : self.data.avatar,
           nickname: user.nickname || '用户名',
         });