From 5fea00c827d8c7a6015dc2ae2f25ff128d8f8f71 Mon Sep 17 00:00:00 2001 From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com> Date: Sat, 20 Apr 2024 14:32:35 +0800 Subject: [PATCH] 1 --- components/payment/index.vue | 24 +++++++++++++------- pages/index/index.vue | 34 ++++++++++++++++------------ pages/users/order_list/index.vue | 37 ++++++++++++++++--------------- pages/whole_sale/index.vue | 24 +++++++++++++++++++- static/tabbar_icon/back_a.png | Bin 0 -> 3332 bytes 5 files changed, 78 insertions(+), 41 deletions(-) create mode 100644 static/tabbar_icon/back_a.png diff --git a/components/payment/index.vue b/components/payment/index.vue index 4ac99b3..44e3e26 100644 --- a/components/payment/index.vue +++ b/components/payment/index.vue @@ -82,6 +82,10 @@ returnUrl: { type: String, default: '' + }, + sale_type: { + type: String, + default: '' } }, data() { @@ -235,7 +239,7 @@ icon: 'success' }, { tab: 5, - url: goPages + '?status=1' + url: goPages + '?status=1&sale_type=' + that.sale_type }); break; case 'alipay': @@ -267,7 +271,7 @@ icon: 'success' }, { tab: 5, - url: goPages + 'status=1' + url: goPages + 'status=1&sale_type=' + that.saleType }); }).catch(res => { console.log('测试支付数据无效的catch：' + res.data) @@ -281,7 +285,7 @@ title: '取消支付' }, { tab: 5, - url: goPages + '?status=0' + url: goPages + '?status=0&sale_type=' + that.sale_type }); } } @@ -306,7 +310,7 @@ icon: 'success' }, { tab: 5, - url: goPages + 'status=1' + url: goPages + 'status=1&sale_type=' + that.sale_type }); }, fail: (e) => { @@ -319,7 +323,8 @@ title: '取消支付' }, { tab: 5, - url: goPages + '?status=0' + url: goPages + '?status=0&sale_type=' + that + .sale_type }); } }, @@ -354,7 +359,8 @@ icon: 'success' }, { tab: 5, - url: goPages + '?status=1' + url: goPages + '?status=1&sale_type=' + that + .sale_type }); return that.$util.Tips({ @@ -362,7 +368,8 @@ icon: 'success' }, { tab: 5, - url: goPages + '?status=1' + url: goPages + '?status=1&sale_type=' + that + .sale_type }); }, fail: function(e) { @@ -434,7 +441,8 @@ icon: 'success' }, { tab: 5, - url: goPages + 'status=1' + url: goPages + 'status=1&sale_type=' + that + .sale_type }); }, diff --git a/pages/index/index.vue b/pages/index/index.vue index bca8934..8405a05 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -521,27 +521,20 @@ overflow: false, diyId: 0, preview: false, - isSupport: true + isSupport: true, }; }, onTabItemTap(e) { - + uni.pageScrollTo({ + scrollTop: 0, + duration: 300 + }); }, // 滚动监听 onPageScroll(e) { - this.isFixed = e.scrollTop > 40; - - // uni.setTabBarItem({ - // index: 0, - // text: "123", - // selectedIconPath: "/static/tabbar_icon/b-a.png" - // }) - - // this.$forceUpdate(); - if (this.isHeaderSerch) { let isScroll = false isScroll = e.scrollTop > 50 @@ -551,6 +544,21 @@ } // 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件 uni.$emit('scroll'); + + + if (e.scrollTop >= 100) { + uni.setTabBarItem({ + index: 0, + text: "首页", + selectedIconPath: "/static/tabbar_icon/back_a.png" + }) + } else { + uni.setTabBarItem({ + index: 0, + text: "首页", + selectedIconPath: "/static/tabbar_icon/a-a.png" + }) + } }, /** @@ -627,9 +635,7 @@ onHide() { uni.setStorageSync('isIntegral', false) }, - onReady() { - }, watch: { globalDatas(nVal, oVal) { // #ifdef H5 diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue index f6121bf..4b3e9e4 100644 --- a/pages/users/order_list/index.vue +++ b/pages/users/order_list/index.vue @@ -73,7 +73,8 @@ {{orderData.noComment || 0}} --> - + 搜索我的订单 @@ -345,7 +346,7 @@ + :totalPrice='totalPrice' :sale_type="sale_type"> @@ -511,21 +512,19 @@ if (options.status) this.orderStatus = options.status; let user = this.$store.state.app.userInfo; if (user.mer_info) this.initMerInfo(user); - if (this.isLogin) { - this.page = 1; - this.loadend = false; - this.loading = false; - this.getOrderData(); - this.getOrderList(); - this.getUserInfo(); - this.getpreSellOrderList(); - } else { - toLogin() - } - }, - onShow() { - + if (this.isLogin) { + this.page = 1; + this.loadend = false; + this.loading = false; + this.getOrderData(); + this.getOrderList(); + this.getUserInfo(); + this.getpreSellOrderList(); + } else { + toLogin() + } }, + onReady: function() { // #ifdef H5 this.$nextTick(() => { @@ -731,11 +730,13 @@ uni.hideLoading(); if (self.orderStatus == 0) { uni.navigateTo({ - url: '/pages/order_details/stay?order_id=' + order_id + '&sale_type=' + this.sale_type + url: '/pages/order_details/stay?order_id=' + order_id + '&sale_type=' + + this.sale_type }) } else { uni.navigateTo({ - url: '/pages/order_details/index?order_id=' + order_id + '&sale_type=' + this.sale_type + url: '/pages/order_details/index?order_id=' + order_id + '&sale_type=' + + this.sale_type }) } }).catch(() => { diff --git a/pages/whole_sale/index.vue b/pages/whole_sale/index.vue index fe31a5b..9049334 100644 --- a/pages/whole_sale/index.vue +++ b/pages/whole_sale/index.vue @@ -571,8 +571,30 @@ this.getNav(); this.initData(); }, - onPageScroll() { + + onTabItemTap(e) { + uni.pageScrollTo({ + scrollTop: 0, + duration: 300 + }); + }, + + onPageScroll(e) { uni.$emit('scroll'); + + if (e.scrollTop >= 100) { + uni.setTabBarItem({ + index: 1, + text: "批发", + selectedIconPath: "/static/tabbar_icon/back_a.png" + }) + } else { + uni.setTabBarItem({ + index: 1, + text: "批发", + selectedIconPath: "/static/tabbar_icon/b-a.png" + }) + } }, onPullDownRefresh() { this.initData(true, true); diff --git a/static/tabbar_icon/back_a.png b/static/tabbar_icon/back_a.png new file mode 100644 index 0000000000000000000000000000000000000000..56faa97ff2c6be99dcd64d9de7863a17f34d9423 GIT binary patch literal 3332 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 O0000