diff --git a/pages/goods/goods.vue b/pages/goods/goods.vue index bb5efca..dcd213f 100644 --- a/pages/goods/goods.vue +++ b/pages/goods/goods.vue @@ -323,6 +323,13 @@ }, buy() { let that = this; + if(this.goodsData[0].stockCount == 0){ + uni.showToast({ + title: '库存不足', + icon: "none" + }); + return; + } uni.showToast({ title: '提交订单...', icon: 'none', diff --git a/pages/goods/refuel-details/refuel-details.vue b/pages/goods/refuel-details/refuel-details.vue index b0d330e..4ce4a27 100644 --- a/pages/goods/refuel-details/refuel-details.vue +++ b/pages/goods/refuel-details/refuel-details.vue @@ -87,9 +87,8 @@ - - + + @@ -292,6 +291,13 @@ this.discountPrice = parseFloat(gbprice - this.totalPrice).toFixed(0); } }, + //跳转手机授权 + jumpPhone(){ + uni.navigateTo({ + url:'../../userLogin/userLogin' + }) + }, + //去支付 toPay() { if (this.inputMoney == '' || this.inputMoney < 1) { uni.showToast({ diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue index ae3753b..1439110 100644 --- a/pages/order/confirmation.vue +++ b/pages/order/confirmation.vue @@ -362,6 +362,9 @@ app.globalData.userInfo = res.return_data .object .highUser; + this.user = res.return_data + .object + .highUser; uni.setStorage({ key: "user", data: res.return_data diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue index 97c380b..1d83b62 100644 --- a/pages/tabBar/home/home.vue +++ b/pages/tabBar/home/home.vue @@ -159,7 +159,8 @@ categoryList: [], homeCateList: [], //切换状态 - cpStuats: 1 + cpStuats: 1, + jumpType:'' }; }, @@ -287,6 +288,7 @@ this.showPopup(); this.imgadres3 = res.return_data[0].imgData; this.webUrl = res.return_data[0].ext1; + this.jumpType = res.return_data[0].jumpType; } }); }, @@ -306,11 +308,18 @@ * 跳转外链 */ jumpWeb() { - if (this.webUrl) { + if(this.jumpType == 1){ + if (this.webUrl) { + uni.navigateTo({ + url: '../order/webUrl/webUrl?url=' + this.webUrl + }) + } + }else{ uni.navigateTo({ - url: '../order/webUrl/webUrl?url=' + this.webUrl + url: this.webUrl }) } + this.closePopup(); }, /**