1,。修改团油订单 手机号未获取

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',

pages/goods/refuel-details/refuel-details.vue

@@ -87,9 +87,8 @@
 			</view>
 
 			<!-- #ifdef MP -->
-	<!-- 		<button class="reBtn flright" open-type="getPhoneNumber" v-if="user.phone == null"
-				@getphonenumber="getPhoneNumber">去支付</button> -->
-			<button class="reBtn flright" @click="toPay">去支付</button>
+			<button class="reBtn flright"  v-if="user.phone == null" @click="jumpPhone">去支付</button>
+			<button class="reBtn flright" v-else @click="toPay">去支付</button>
 			<!-- #endif -->
 			<!-- #ifdef H5 -->
 			<button class="reBtn flright" v-if="user.phone == null" @click="jumpH5Bding">去支付</button>
@@ -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({

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

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.jumpType == 1){
 					if (this.webUrl) {
 						uni.navigateTo({
 							url: '../order/webUrl/webUrl?url=' + this.webUrl
 						})
 					}
+				}else{
+					uni.navigateTo({
+						url: this.webUrl
+					})
+				}
+				
 				this.closePopup();
 			},
 			/**