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 @@ - - - - - - {{item.add_time}} - {{item.status_name}} - - - - 订单号 - {{item.order_no}} + + + + + + + {{item.add_time}} + {{item.status_name}} - - 支付金额 - {{item.pay_price}} - 元 + + + 订单号 + {{item.order_no}} + + + 支付金额 + {{item.pay_price}} + 元 + + + + + - - + + + - - - - + + + - - - - + + + + + @@ -52,4 +59,17 @@ + + + + + + + 搜索条件 + + + + + + \ 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 @@ {{user_level.name}} - + 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 || '用户名', });