diff --git a/litemall-wx/pages/about/about.wxml b/litemall-wx/pages/about/about.wxml index 6ba35a9e..50ae10c1 100644 --- a/litemall-wx/pages/about/about.wxml +++ b/litemall-wx/pages/about/about.wxml @@ -13,7 +13,7 @@ {{address}} - + @@ -23,7 +23,7 @@ {{phone}} - + @@ -33,7 +33,7 @@ {{qq}} - + diff --git a/litemall-wx/pages/auth/accountLogin/accountLogin.wxml b/litemall-wx/pages/auth/accountLogin/accountLogin.wxml index c9d0c664..26a78fe9 100644 --- a/litemall-wx/pages/auth/accountLogin/accountLogin.wxml +++ b/litemall-wx/pages/auth/accountLogin/accountLogin.wxml @@ -3,18 +3,18 @@ - + - + diff --git a/litemall-wx/pages/auth/accountLogin/accountLogin.wxss b/litemall-wx/pages/auth/accountLogin/accountLogin.wxss index 5d111385..c2eadeba 100644 --- a/litemall-wx/pages/auth/accountLogin/accountLogin.wxss +++ b/litemall-wx/pages/auth/accountLogin/accountLogin.wxss @@ -47,13 +47,11 @@ .form-item .clear { position: absolute; - top: 26rpx; + top: 32rpx; right: 18rpx; z-index: 2; display: block; background: #fff; - height: 44rpx; - width: 44rpx; } .login-btn { diff --git a/litemall-wx/pages/auth/register/register.wxml b/litemall-wx/pages/auth/register/register.wxml index 06964963..c9522ea5 100644 --- a/litemall-wx/pages/auth/register/register.wxml +++ b/litemall-wx/pages/auth/register/register.wxml @@ -3,28 +3,28 @@ - + - + - + - + - + 获取验证码 diff --git a/litemall-wx/pages/auth/register/register.wxss b/litemall-wx/pages/auth/register/register.wxss index 6878ce64..f762d7af 100644 --- a/litemall-wx/pages/auth/register/register.wxss +++ b/litemall-wx/pages/auth/register/register.wxss @@ -49,13 +49,11 @@ .form-item .clear { position: absolute; - top: 26rpx; + top: 32rpx; right: 18rpx; z-index: 2; display: block; background: #fff; - height: 44rpx; - width: 44rpx; } .register-btn { diff --git a/litemall-wx/pages/auth/reset/reset.wxml b/litemall-wx/pages/auth/reset/reset.wxml index 35f29cf3..a3a62515 100644 --- a/litemall-wx/pages/auth/reset/reset.wxml +++ b/litemall-wx/pages/auth/reset/reset.wxml @@ -3,25 +3,25 @@ - + - + 获取验证码 - + - + diff --git a/litemall-wx/pages/auth/reset/reset.wxss b/litemall-wx/pages/auth/reset/reset.wxss index 4f61be72..c432696e 100644 --- a/litemall-wx/pages/auth/reset/reset.wxss +++ b/litemall-wx/pages/auth/reset/reset.wxss @@ -47,13 +47,11 @@ .form-item .clear { position: absolute; - top: 26rpx; + top: 32rpx; right: 18rpx; z-index: 2; display: block; background: #fff; - height: 44rpx; - width: 44rpx; } .reset-btn { diff --git a/litemall-wx/pages/checkout/checkout.wxml b/litemall-wx/pages/checkout/checkout.wxml index 4810a175..f842c10a 100644 --- a/litemall-wx/pages/checkout/checkout.wxml +++ b/litemall-wx/pages/checkout/checkout.wxml @@ -10,7 +10,7 @@ {{checkedAddress.addressDetail}} - + @@ -18,7 +18,7 @@ 还没有收货地址,去添加 - + @@ -38,7 +38,7 @@ -¥{{couponPrice}}元 - + diff --git a/litemall-wx/pages/commentPost/commentPost.wxml b/litemall-wx/pages/commentPost/commentPost.wxml index a4067d54..7c217965 100644 --- a/litemall-wx/pages/commentPost/commentPost.wxml +++ b/litemall-wx/pages/commentPost/commentPost.wxml @@ -14,8 +14,8 @@ 评分 - - + + {{starText}} diff --git a/litemall-wx/pages/goods/goods.js b/litemall-wx/pages/goods/goods.js index 460a1f97..b9744fd0 100644 --- a/litemall-wx/pages/goods/goods.js +++ b/litemall-wx/pages/goods/goods.js @@ -26,9 +26,7 @@ Page({ checkedSpecPrice: 0, openAttr: false, openShare: false, - noCollectImage: '/static/images/icon_collect.png', - hasCollectImage: '/static/images/icon_collect_checked.png', - collectImage: '/static/images/icon_collect.png', + collect: false, shareImage: '', isGroupon: false, //标识是否是一个参团购买 soldout: false, @@ -189,11 +187,11 @@ Page({ if (res.data.userHasCollect == 1) { that.setData({ - collectImage: that.data.hasCollectImage + collect: true }); } else { that.setData({ - collectImage: that.data.noCollectImage + collect: false }); } @@ -471,12 +469,12 @@ Page({ .then(function(res) { if (that.data.userHasCollect == 1) { that.setData({ - collectImage: that.data.noCollectImage, + collect: false, userHasCollect: 0 }); } else { that.setData({ - collectImage: that.data.hasCollectImage, + collect: true, userHasCollect: 1 }); } @@ -497,10 +495,7 @@ Page({ //提示选择完整规格 if (!this.isCheckedAllSpec()) { - wx.showToast({ - image: '/static/images/icon_error.png', - title: '请选择完整规格' - }); + util.showErrorToast('请选择完整规格'); return false; } @@ -508,20 +503,14 @@ Page({ let checkedProductArray = this.getCheckedProductItem(this.getCheckedSpecKey()); if (!checkedProductArray || checkedProductArray.length <= 0) { //找不到对应的product信息,提示没有库存 - wx.showToast({ - image: '/static/images/icon_error.png', - title: '没有库存' - }); + util.showErrorToast('没有库存'); return false; } let checkedProduct = checkedProductArray[0]; //验证库存 if (checkedProduct.number <= 0) { - wx.showToast({ - image: '/static/images/icon_error.png', - title: '没有库存' - }); + util.showErrorToast('没有库存'); return false; } @@ -548,11 +537,7 @@ Page({ } catch (e) {} } else { - wx.showToast({ - image: '/static/images/icon_error.png', - title: res.errmsg, - mask: true - }); + util.showErrorToast(res.errmsg); } }); } @@ -572,10 +557,7 @@ Page({ //提示选择完整规格 if (!this.isCheckedAllSpec()) { - wx.showToast({ - image: '/static/images/icon_error.png', - title: '请选择完整规格' - }); + util.showErrorToast('请选择完整规格'); return false; } @@ -583,20 +565,14 @@ Page({ let checkedProductArray = this.getCheckedProductItem(this.getCheckedSpecKey()); if (!checkedProductArray || checkedProductArray.length <= 0) { //找不到对应的product信息,提示没有库存 - wx.showToast({ - image: '/static/images/icon_error.png', - title: '没有库存' - }); + util.showErrorToast('没有库存'); return false; } let checkedProduct = checkedProductArray[0]; //验证库存 if (checkedProduct.number <= 0) { - wx.showToast({ - image: '/static/images/icon_error.png', - title: '没有库存' - }); + util.showErrorToast('没有库存'); return false; } @@ -618,19 +594,15 @@ Page({ }); if (that.data.userHasCollect == 1) { that.setData({ - collectImage: that.data.hasCollectImage + collect: true }); } else { that.setData({ - collectImage: that.data.noCollectImage + collect: false }); } } else { - wx.showToast({ - image: '/static/images/icon_error.png', - title: _res.errmsg, - mask: true - }); + util.showErrorToast(_res.errmsg); } }); diff --git a/litemall-wx/pages/goods/goods.wxml b/litemall-wx/pages/goods/goods.wxml index c61ee742..c677b27b 100644 --- a/litemall-wx/pages/goods/goods.wxml +++ b/litemall-wx/pages/goods/goods.wxml @@ -12,7 +12,7 @@ diff --git a/litemall-wx/static/images/about_us.png b/litemall-wx/static/images/about.png similarity index 100% rename from litemall-wx/static/images/about_us.png rename to litemall-wx/static/images/about.png diff --git a/litemall-wx/static/images/address_right.png b/litemall-wx/static/images/address_right.png deleted file mode 100644 index bea650c8..00000000 Binary files a/litemall-wx/static/images/address_right.png and /dev/null differ diff --git a/litemall-wx/static/images/clear_input.png b/litemall-wx/static/images/clear_input.png deleted file mode 100644 index 08557d53..00000000 Binary files a/litemall-wx/static/images/clear_input.png and /dev/null differ diff --git a/litemall-wx/static/images/icon_collect.png b/litemall-wx/static/images/collect.png similarity index 100% rename from litemall-wx/static/images/icon_collect.png rename to litemall-wx/static/images/collect.png diff --git a/litemall-wx/static/images/complete.png b/litemall-wx/static/images/complete.png deleted file mode 100644 index ae63d42a..00000000 Binary files a/litemall-wx/static/images/complete.png and /dev/null differ diff --git a/litemall-wx/static/images/delete.png b/litemall-wx/static/images/delete.png deleted file mode 100644 index 0ec236e4..00000000 Binary files a/litemall-wx/static/images/delete.png and /dev/null differ diff --git a/litemall-wx/static/images/detail_back.png b/litemall-wx/static/images/detail_back.png deleted file mode 100644 index 20e290c3..00000000 Binary files a/litemall-wx/static/images/detail_back.png and /dev/null differ diff --git a/litemall-wx/static/images/down.png b/litemall-wx/static/images/down.png deleted file mode 100644 index a621b1a7..00000000 Binary files a/litemall-wx/static/images/down.png and /dev/null differ diff --git a/litemall-wx/static/images/edit.png b/litemall-wx/static/images/edit.png deleted file mode 100644 index 8e0bd48a..00000000 Binary files a/litemall-wx/static/images/edit.png and /dev/null differ diff --git a/litemall-wx/static/images/go.png b/litemall-wx/static/images/go.png deleted file mode 100644 index b7af4e73..00000000 Binary files a/litemall-wx/static/images/go.png and /dev/null differ diff --git a/litemall-wx/static/images/goright.png b/litemall-wx/static/images/goright.png deleted file mode 100644 index 9573779a..00000000 Binary files a/litemall-wx/static/images/goright.png and /dev/null differ diff --git a/litemall-wx/static/images/ic_menu_topic_nor.png b/litemall-wx/static/images/help.png similarity index 100% rename from litemall-wx/static/images/ic_menu_topic_nor.png rename to litemall-wx/static/images/help.png diff --git a/litemall-wx/static/images/ic_menu_shoping_nor.png b/litemall-wx/static/images/ic_menu_shoping_nor.png deleted file mode 100644 index 79596560..00000000 Binary files a/litemall-wx/static/images/ic_menu_shoping_nor.png and /dev/null differ diff --git a/litemall-wx/static/images/ic_menu_topic_pressed.png b/litemall-wx/static/images/ic_menu_topic_pressed.png deleted file mode 100644 index 8208ae60..00000000 Binary files a/litemall-wx/static/images/ic_menu_topic_pressed.png and /dev/null differ diff --git a/litemall-wx/static/images/ico-addr.png b/litemall-wx/static/images/ico-addr.png deleted file mode 100644 index 1b143e1d..00000000 Binary files a/litemall-wx/static/images/ico-addr.png and /dev/null differ diff --git a/litemall-wx/static/images/icon_close.png b/litemall-wx/static/images/icon_close.png deleted file mode 100644 index 0c923584..00000000 Binary files a/litemall-wx/static/images/icon_close.png and /dev/null differ diff --git a/litemall-wx/static/images/icon_collect_checked.png b/litemall-wx/static/images/icon_collect_checked.png deleted file mode 100644 index 56e68eba..00000000 Binary files a/litemall-wx/static/images/icon_collect_checked.png and /dev/null differ diff --git a/litemall-wx/static/images/icon_go_more.png b/litemall-wx/static/images/icon_go_more.png deleted file mode 100644 index d7c33f29..00000000 Binary files a/litemall-wx/static/images/icon_go_more.png and /dev/null differ diff --git a/litemall-wx/static/images/share.png b/litemall-wx/static/images/share.png deleted file mode 100644 index acb184b9..00000000 Binary files a/litemall-wx/static/images/share.png and /dev/null differ diff --git a/litemall-wx/static/images/telephone.png b/litemall-wx/static/images/telephone.png deleted file mode 100644 index 86500a2f..00000000 Binary files a/litemall-wx/static/images/telephone.png and /dev/null differ diff --git a/litemall-wx/static/images/wxpay.png b/litemall-wx/static/images/wxpay.png deleted file mode 100644 index 1fb53e5d..00000000 Binary files a/litemall-wx/static/images/wxpay.png and /dev/null differ