diff --git a/assets/itemImg/filter-golden.png b/assets/itemImg/filter-golden.png new file mode 100644 index 0000000..7b8c62e Binary files /dev/null and b/assets/itemImg/filter-golden.png differ diff --git a/assets/itemImg/filter.png b/assets/itemImg/filter.png new file mode 100644 index 0000000..b565347 Binary files /dev/null and b/assets/itemImg/filter.png differ 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; }