diff --git a/template/uni-app/pages/activity/goods_bargain/index.vue b/template/uni-app/pages/activity/goods_bargain/index.vue
index 207a25042..3922758a8 100644
--- a/template/uni-app/pages/activity/goods_bargain/index.vue
+++ b/template/uni-app/pages/activity/goods_bargain/index.vue
@@ -1,324 +1,335 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.title}}
- {{item.people}}{{$t(`人正在参与`)}}
- {{$t(`最低`)}} : {{$t(`￥`)}}{{item.min_price}}
-
- {{$t(`参与砍价`)}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/template/uni-app/pages/goods_cate/goods_cate3.vue b/template/uni-app/pages/goods_cate/goods_cate3.vue
index d9800904a..63d7386ba 100644
--- a/template/uni-app/pages/goods_cate/goods_cate3.vue
+++ b/template/uni-app/pages/goods_cate/goods_cate3.vue
@@ -561,6 +561,12 @@
title: that.$t(`该产品没有更多库存了`)
});
}
+ if (that.attr.productSelect.cart_num == 0) {
+ return that.$util.Tips({
+ title: that.$t(`不能输入0喔`)
+ });
+ }
+ console.log(that.attr.productSelect.cart_num, 'that.attr.productSelect.cart_num')
let q = {
product_id: id,
num: duo ? that.attr.productSelect.cart_num : 1,
diff --git a/template/uni-app/pages/order_addcart/order_addcart.vue b/template/uni-app/pages/order_addcart/order_addcart.vue
index 2ac829e13..63ed85267 100644
--- a/template/uni-app/pages/order_addcart/order_addcart.vue
+++ b/template/uni-app/pages/order_addcart/order_addcart.vue
@@ -249,14 +249,12 @@
onLoad(options) {
uni.hideTabBar()
let that = this;
- if (that.isLogin == false) {
- toLogin();
- }
let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
let curRoute = routes[routes.length - 1].route //获取当前页面路由
this.activeRouter = '/' + curRoute
},
onShow() {
+ if (!this.isLogin) toLogin();
this.canShow = false
if (this.isLogin == true) {
this.hotPage = 1;
@@ -701,7 +699,7 @@
that.cartList.valid[index] = item;
that.getCartNum();
that.switchSelect();
- }).catch(err => {
+ }, () => {
item.cart_num = Number(item.cart_num) + 1
})
}
@@ -724,15 +722,16 @@
that.cartList.valid[index] = item;
that.getCartNum();
that.switchSelect();
- }).catch(err => {
+ }, () => {
item.cart_num = Number(item.cart_num) - 1
})
},
- setCartNum(cartId, cartNum, successCallback) {
+ setCartNum(cartId, cartNum, successCallback, errorCallback) {
let that = this;
changeCartNum(cartId, cartNum).then(res => {
successCallback && successCallback(res.data);
}).catch(err => {
+ errorCallback && errorCallback()
return that.$util.Tips({
title: err
});
diff --git a/template/uni-app/pages/users/user_integral/index.vue b/template/uni-app/pages/users/user_integral/index.vue
index 4fff13146..da020006f 100644
--- a/template/uni-app/pages/users/user_integral/index.vue
+++ b/template/uni-app/pages/users/user_integral/index.vue
@@ -417,4 +417,7 @@
align-items: center;
justify-content: center;
}
+ .empty-box{
+ padding-bottom: 300rpx;
+ }
diff --git a/template/uni-app/pages/users/user_invoice_list/index.vue b/template/uni-app/pages/users/user_invoice_list/index.vue
index 5cf72d5ee..840313c84 100644
--- a/template/uni-app/pages/users/user_invoice_list/index.vue
+++ b/template/uni-app/pages/users/user_invoice_list/index.vue
@@ -246,7 +246,7 @@
.list {
padding: 14rpx 32rpx;
margin-top: 90rpx;
- margin-bottom: 140rpx;
+ padding-bottom: 180rpx;
}
.list .item {