From-wh пре 2 година
родитељ
комит
cef6c368ed

Разлика између датотеке није приказан због своје велике величине
+ 334 - 323
template/uni-app/pages/activity/goods_bargain/index.vue


+ 6 - 0
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,

+ 5 - 6
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
 					});

+ 3 - 0
template/uni-app/pages/users/user_integral/index.vue

@@ -417,4 +417,7 @@
 		align-items: center;
 		justify-content: center;
 	}
+	.empty-box{
+		padding-bottom:  300rpx;
+	}
 </style>

+ 1 - 1
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 {