From 15a2e01790ec2682e10632ec444c3eb4ae3879f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com> Date: Sat, 9 Oct 2021 10:17:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/lf-indexFind/lf-indexFind.vue | 2 ++ .../lf-indexShopMatrix/lf-indexShopMatrix.vue | 2 ++ components/lf-multiColumnAd/lf-multiColumnAd.vue | 1 + components/lf-seckill/lf-seckill.vue | 4 ++-- components/lf-shopGoodsCard/lf-shopGoodsCard.vue | 1 + pages/address/add/add.vue | 14 +++++++------- pages/address/list/list.vue | 4 ++-- pages/coupon/index/index1.vue | 2 +- pages/index/category/category.vue | 2 +- pages/index/index/index.vue | 6 +++--- pages/point/shoppingMall/shoppingMall.vue | 2 +- pages/recharge/balance/balance - 副本.vue | 2 +- pages/recharge/balance/balance.vue | 2 +- pages/shop/goodsdetail.vue | 1 + pages/shop/seckillList.vue | 2 +- pages/shop/shopdetail.vue | 1 + pages/store/cart/carttemplate.vue | 10 +++++----- pages/user/register/register - 副本.vue | 2 +- 18 files changed, 34 insertions(+), 26 deletions(-) diff --git a/components/lf-indexFind/lf-indexFind.vue b/components/lf-indexFind/lf-indexFind.vue index 5f293d7..4c604c9 100644 --- a/components/lf-indexFind/lf-indexFind.vue +++ b/components/lf-indexFind/lf-indexFind.vue @@ -90,6 +90,8 @@ background: #FFFFFF; box-shadow: 0rpx 2rpx 8rpx 1rpx rgba(0, 0, 0, 0.1); margin-right: 20rpx; + overflow: hidden; + border-radius: 20rpx; .img{ width: 380rpx; height: 380rpx; diff --git a/components/lf-indexShopMatrix/lf-indexShopMatrix.vue b/components/lf-indexShopMatrix/lf-indexShopMatrix.vue index eccb9f9..93d523f 100644 --- a/components/lf-indexShopMatrix/lf-indexShopMatrix.vue +++ b/components/lf-indexShopMatrix/lf-indexShopMatrix.vue @@ -66,6 +66,8 @@ border: 1rpx solid #979797; margin-right: 9rpx; position: relative; + overflow: hidden; + border-radius: 5rpx; &:nth-child(4n){ margin-right: 0rpx; } diff --git a/components/lf-multiColumnAd/lf-multiColumnAd.vue b/components/lf-multiColumnAd/lf-multiColumnAd.vue index 2aa7ee0..7371c77 100644 --- a/components/lf-multiColumnAd/lf-multiColumnAd.vue +++ b/components/lf-multiColumnAd/lf-multiColumnAd.vue @@ -50,6 +50,7 @@ width: 228rpx; height: 208rpx; background: #D8D8D8; + overflow: hidden; &:nth-child(1n){ border-radius: 0rpx 20rpx 0rpx 0rpx; } diff --git a/components/lf-seckill/lf-seckill.vue b/components/lf-seckill/lf-seckill.vue index 586c2e9..b866139 100644 --- a/components/lf-seckill/lf-seckill.vue +++ b/components/lf-seckill/lf-seckill.vue @@ -10,8 +10,8 @@ {{ item.associate.goods.name }} - ¥{{ item.associate.goods.market_price }} - ¥{{ item.associate.goods.max_price }} + ¥{{ item.associate.seckill_price }} + ¥{{ item.associate.goods.sell_price }} diff --git a/components/lf-shopGoodsCard/lf-shopGoodsCard.vue b/components/lf-shopGoodsCard/lf-shopGoodsCard.vue index 3aab9f1..79c1e90 100644 --- a/components/lf-shopGoodsCard/lf-shopGoodsCard.vue +++ b/components/lf-shopGoodsCard/lf-shopGoodsCard.vue @@ -63,6 +63,7 @@ .img{ width: 100%; height: 100%; + border-radius: 20rpx 20rpx 0rpx 0rpx; } } .scroll-view{ diff --git a/pages/address/add/add.vue b/pages/address/add/add.vue index ee78734..a398968 100644 --- a/pages/address/add/add.vue +++ b/pages/address/add/add.vue @@ -383,13 +383,13 @@ export default { } else { wx.showToast({ title: res.message, - image: '../../../static/error.png' + icon: 'error' }); } } else { wx.showToast({ title: '获取信息失败', - image: '../../../static/error.png' + icon: 'error' }); } uni.hideLoading(); @@ -436,7 +436,7 @@ export default { } else { wx.showToast({ title: '新增收货地址失败', - image: '../../../static/error.png', + icon: 'error', complete: err => { setTimeout(() => { wx.navigateBack(); @@ -447,7 +447,7 @@ export default { } else { wx.showToast({ title: '请求错误', - image: '../../../static/error.png', + icon: 'error', complete: err => { setTimeout(() => { wx.navigateBack(); @@ -506,7 +506,7 @@ export default { } else { wx.showToast({ title: '修改收货地址失败', - image: '../../../static/error.png', + icon: 'error', complete: err => { setTimeout(() => { wx.navigateBack(); @@ -552,7 +552,7 @@ export default { } else { wx.showToast({ title: '删除收货地址失败', - image: '../../../static/error.png', + icon: 'error', complete: err => { setTimeout(() => { wx.navigateBack(); @@ -563,7 +563,7 @@ export default { } else { wx.showToast({ title: '请求错误', - image: '../../../static/error.png', + icon: 'error', complete: err => { setTimeout(() => { wx.navigateBack(); diff --git a/pages/address/list/list.vue b/pages/address/list/list.vue index d20dbc9..697a150 100644 --- a/pages/address/list/list.vue +++ b/pages/address/list/list.vue @@ -225,13 +225,13 @@ export default { } else { wx.showToast({ title: res.message, - image: '../../../static/error.png' + icon: 'error' }); } } else { wx.showToast({ title: '获取信息失败', - image: '../../../static/error.png' + icon: 'error' }); } this.is_load = false; diff --git a/pages/coupon/index/index1.vue b/pages/coupon/index/index1.vue index 84867ed..1b2f56f 100644 --- a/pages/coupon/index/index1.vue +++ b/pages/coupon/index/index1.vue @@ -229,7 +229,7 @@ this.queryCouponList(status, page); } else { wx.showToast({ - image: '../../../static/error.png', + icon: 'error', title: '再拉也没有啦' }); } diff --git a/pages/index/category/category.vue b/pages/index/category/category.vue index b74d5d4..d1a70f2 100644 --- a/pages/index/category/category.vue +++ b/pages/index/category/category.vue @@ -535,7 +535,7 @@ .img{ width: 150rpx; height: 150rpx; - border-radius: 4rpx; + border-radius: 5rpx; margin-right: 20rpx; } .info{ diff --git a/pages/index/index/index.vue b/pages/index/index/index.vue index 67eac28..c91919c 100644 --- a/pages/index/index/index.vue +++ b/pages/index/index/index.vue @@ -681,21 +681,21 @@ } else { wx.showToast({ title: res.message || '领取失败', - image: '../../../static/error.png' + icon: 'error' }); } wx.hideLoading(); } else { wx.showToast({ title: '领取失败', - image: '../../../static/error.png' + icon: 'error' }); wx.hideLoading(); } }).catch(rej => { wx.showToast({ title: '领取失败', - image: '../../../static/error.png' + icon: 'error' }); wx.hideLoading(); }); diff --git a/pages/point/shoppingMall/shoppingMall.vue b/pages/point/shoppingMall/shoppingMall.vue index 9ecd367..b71b838 100644 --- a/pages/point/shoppingMall/shoppingMall.vue +++ b/pages/point/shoppingMall/shoppingMall.vue @@ -6,7 +6,7 @@ - + {{ point.point }} diff --git a/pages/recharge/balance/balance - 副本.vue b/pages/recharge/balance/balance - 副本.vue index 2003053..bc056b9 100644 --- a/pages/recharge/balance/balance - 副本.vue +++ b/pages/recharge/balance/balance - 副本.vue @@ -112,7 +112,7 @@ export default { this.queryBalanceList(token, status, page); } else { wx.showToast({ - image: '../../../static/error.png', + icon: 'error', title: '再拉也没有啦' }); } diff --git a/pages/recharge/balance/balance.vue b/pages/recharge/balance/balance.vue index e373f81..3c7d369 100644 --- a/pages/recharge/balance/balance.vue +++ b/pages/recharge/balance/balance.vue @@ -231,7 +231,7 @@ // this.queryBalanceList(token, status, page); } else { wx.showToast({ - image: '../../../static/error.png', + icon: 'error', title: '再拉也没有啦' }); } diff --git a/pages/shop/goodsdetail.vue b/pages/shop/goodsdetail.vue index b4db4d1..9c6c2e5 100644 --- a/pages/shop/goodsdetail.vue +++ b/pages/shop/goodsdetail.vue @@ -45,6 +45,7 @@ {{ goods_detail.redeem_point }} 个积分兑换 + diff --git a/pages/shop/seckillList.vue b/pages/shop/seckillList.vue index 59ad96a..06f42ff 100644 --- a/pages/shop/seckillList.vue +++ b/pages/shop/seckillList.vue @@ -67,7 +67,7 @@ ¥{{ item.seckill_price }} - ¥{{ item.goods.market_price }} + ¥{{ item.goods.sell_price }} 立即秒杀 diff --git a/pages/shop/shopdetail.vue b/pages/shop/shopdetail.vue index 39e948d..242562f 100644 --- a/pages/shop/shopdetail.vue +++ b/pages/shop/shopdetail.vue @@ -376,6 +376,7 @@ width: 90rpx; height: 90rpx; margin-right: 15rpx; + border-radius: 5rpx; } .shop-function { width: 80rpx; diff --git a/pages/store/cart/carttemplate.vue b/pages/store/cart/carttemplate.vue index cb731b4..8dc952d 100644 --- a/pages/store/cart/carttemplate.vue +++ b/pages/store/cart/carttemplate.vue @@ -534,7 +534,7 @@ export default { item.total = item.qty * Number(item.price); wx.showToast({ title: '超过最大库存', - image: '../../../static/error.png' + icon: 'error' }); } @@ -654,7 +654,7 @@ export default { } else { wx.showToast({ title: '超过最大库存', - image: '../../../static/error.png' + icon: 'error' }); } } @@ -771,7 +771,7 @@ export default { } else { wx.showToast({ title: '删除购物车商品失败！', - image: '../../../static/error.png' + icon: 'error' }); } }, @@ -866,13 +866,13 @@ export default { } else { wx.showToast({ title: res.message, - image: '../../../static/error.png' + icon: 'error' }); } } else { wx.showToast({ title: '领取失败', - image: '../../../static/error.png' + icon: 'error' }); } }); diff --git a/pages/user/register/register - 副本.vue b/pages/user/register/register - 副本.vue index 7dc7c62..f3b09e8 100644 --- a/pages/user/register/register - 副本.vue +++ b/pages/user/register/register - 副本.vue @@ -390,7 +390,7 @@ } else { wx.showToast({ title: '获取code失败', - image: '../../../static/error.png' + icon: 'error' }); } },