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 @@
-
+
{{checkedSpecText}}
-
+