From 5cf245d1c1f489852aa242a56ca9642ed9281d5d Mon Sep 17 00:00:00 2001 From: XiaoXinPro 14 IAH5R <568170040@qq.com> Date: Mon, 26 Dec 2022 11:14:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E5=9C=BA=E7=AD=9B=E9=80=89=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/itemImg/filter-golden.png | Bin 0 -> 3856 bytes assets/itemImg/filter.png | Bin 0 -> 3594 bytes components/shop/shop.ttml | 2 -- pages/couponorder/index/index.js | 8 +++++--- pages/couponorder/index/index.ttml | 2 +- pages/couponorder/index/index.ttss | 8 ++++++-- pages/order/index/index.js | 7 ++++--- pages/order/index/index.ttml | 2 +- pages/order/index/index.ttss | 8 ++++++-- 9 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 assets/itemImg/filter-golden.png create mode 100644 assets/itemImg/filter.png diff --git a/assets/itemImg/filter-golden.png b/assets/itemImg/filter-golden.png new file mode 100644 index 0000000000000000000000000000000000000000..7b8c62e03f64956681a4d56284b6c64975e3600a GIT binary patch literal 3856 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 XT>R$?!ub}gFD_tw)dJag1w;4`&e;nY literal 0 HcmV?d00001 diff --git a/assets/itemImg/filter.png b/assets/itemImg/filter.png new file mode 100644 index 0000000000000000000000000000000000000000..b5653471f00c45bd0b3befaab920e929143807ed GIT binary patch literal 3594 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 QZ2$lO07*qoM6N<$f@q|a0ssI2 literal 0 HcmV?d00001 diff --git a/components/shop/shop.ttml b/components/shop/shop.ttml index c57e84f..0d7e7ee 100644 --- a/components/shop/shop.ttml +++ b/components/shop/shop.ttml @@ -25,8 +25,6 @@ - - diff --git a/pages/couponorder/index/index.js b/pages/couponorder/index/index.js index 6f55f9e..921e12e 100644 --- a/pages/couponorder/index/index.js +++ b/pages/couponorder/index/index.js @@ -49,8 +49,8 @@ Page({ bindPickerChange(e) { const index = e.detail.value const mallTenantId = this.data.shopList[index].tenantId - tt.setStorageSync('mallTenantId', mallTenantId) - tt.setStorageSync('mallIndex', index) + // tt.setStorageSync('mallTenantId', mallTenantId) + // tt.setStorageSync('mallIndex', index) this.setData({ index: index, mallTenantId: mallTenantId, @@ -138,9 +138,11 @@ Page({ }).then(res => { this.setData({ shopList: res.data, - mallTenantId: tt.getStorageSync('mallTenantId') || res.data[0].tenantId + // tt.getStorageSync('mallTenantId') || + mallTenantId: res.data[0].tenantId }); console.log(this.data.shopList, 'list'); + }).catch(err => { console.log(err, 'err'); }) diff --git a/pages/couponorder/index/index.ttml b/pages/couponorder/index/index.ttml index 334b9ae..95935ec 100644 --- a/pages/couponorder/index/index.ttml +++ b/pages/couponorder/index/index.ttml @@ -19,7 +19,7 @@ {{shopList[index].name}} - + diff --git a/pages/couponorder/index/index.ttss b/pages/couponorder/index/index.ttss index 90da3f8..3c4de38 100644 --- a/pages/couponorder/index/index.ttss +++ b/pages/couponorder/index/index.ttss @@ -34,7 +34,7 @@ .picker { margin-top: 25rpx; - padding: 25rpx 45rpx; + padding: 17rpx 45rpx; margin-bottom: 15rpx; background-color: #fff; } @@ -44,8 +44,12 @@ justify-content: space-between; } +.picker .inside .picker_item { + font-size: 35rpx; +} + .picker .inside .img { - width: 20rpx; + width: 40rpx; height: 40rpx; } diff --git a/pages/order/index/index.js b/pages/order/index/index.js index 0f05b03..db4bf82 100644 --- a/pages/order/index/index.js +++ b/pages/order/index/index.js @@ -79,8 +79,8 @@ Page({ bindPickerChange(e) { const index = e.detail.value const mallTenantId = this.data.shopList[index].tenantId - tt.setStorageSync('mallTenantId', mallTenantId) - tt.setStorageSync('mallIndex', index) + // tt.setStorageSync('mallTenantId', mallTenantId) + // tt.setStorageSync('mallIndex', index) this.setData({ index: index, mallTenantId: mallTenantId, @@ -101,7 +101,8 @@ Page({ // current_scroll: e.id // }); this.setData({ - index: tt.getStorageSync('mallIndex') || 0, + // tt.getStorageSync('mallIndex') || + index: 0, }) }, onShow() { diff --git a/pages/order/index/index.ttml b/pages/order/index/index.ttml index d3c7a27..962f77d 100644 --- a/pages/order/index/index.ttml +++ b/pages/order/index/index.ttml @@ -19,7 +19,7 @@ {{shopList[index].name}} - + diff --git a/pages/order/index/index.ttss b/pages/order/index/index.ttss index 192874d..49e8456 100644 --- a/pages/order/index/index.ttss +++ b/pages/order/index/index.ttss @@ -42,7 +42,7 @@ .picker { margin-top: 120rpx; - padding: 25rpx 45rpx; + padding: 17rpx 45rpx; margin-bottom: 28rpx; background-color: #fff; } @@ -52,8 +52,12 @@ justify-content: space-between; } +.picker .inside .picker_item { + font-size: 35rpx; +} + .picker .inside .img { - width: 20rpx; + width: 40rpx; height: 40rpx; }