门店选择

pages/integral/integralgoodsDetail.vue

@@ -81,7 +81,7 @@
 				<view class="buySHop" @click="ckShop" style="border-bottom: 1px solid #EEEEEE;">
 					<view>服务门店</view>
 					<view class="buyShopRight" >
-						<view v-if="shopInfo.shopId">{{shopInfo.ShopName}}</view>
+						<view v-if="shopInfo.shopId">{{shopInfo.shopName}}</view>
 						<view v-else>请选择</view>
 						<image src="../../static/timg/icon_arrow_right.png" mode="" class="buyShopRightJt"></image>
 					</view>
@@ -196,7 +196,7 @@
 		onShow() {
 			this.shopInfo=this.$store.state.ckshopInfo;
 			
-			//console.log(this.shopInfo)
+			console.log(this.shopInfo)
 		},
 		onPullDownRefresh(){
 			this.openGoodsDetailById();
@@ -316,7 +316,7 @@
 				 	data: that.info,
 				 	 success: function () {
 					   uni.navigateTo({
-				 	   	url:'integralConfirm?shopID='+that.shopInfo.shopId+'&shopName='+that.shopInfo.ShopName+'&goodsnum='+that.goodsnum+'&avaIntegral='+that.avaIntegral
+				 	   	url:'integralConfirm?shopID='+that.shopInfo.shopId+'&shopName='+that.shopInfo.shopName+'&goodsnum='+that.goodsnum+'&avaIntegral='+that.avaIntegral
 				 	   })
 				 	 }
 				 }); 

pages/shop/ckshopList.vue

@@ -284,7 +284,7 @@
 	.box {
 		min-height: 100vh;
 		background-color: #F4F5F7;
-		padding-top: 20rpx;
+		/* padding-top: 20rpx; */
 		padding-bottom: 60rpx;
 	}
 

pages/user/user.vue

@@ -526,11 +526,14 @@
 				})
 			},
 			getVersionInfo() {
-				this.$http('miniApp2/sys/getVersionInfo', {
+				this.$http('miniApp2/sys/getVersionInfov2', {
 					appId: this.ext.appId,
 
 				}, 'POST').then(res => {
-					this.release_version = res.data.release_version
+					if( res.data){
+						this.release_version = res.data
+					}
+					
 				})
 			},
 			updateUserInfo() {

utils/request.js

@@ -9,8 +9,8 @@ import $store from '../store'
 const extConfig = uni.getExtConfigSync();		
 console.log(extConfig)
 const baseUrl=extConfig.url+'/'
-//const baseUrl='http://192.168.0.127:20189/'
-//const baseUrl='http://192.168.0.146:20187/'
+//const baseUrl='http://192.168.0.147:20187/'
+//const baseUrl='http://192.168.0.129:20189/'
 //const baseUrl='http://dms.66km.com.cn/'
 
 //wx2c6f04c0dcd15984正式  wx33053a645546ec31 E37BB296-5A08-4534-859D-B351BA611AF9 EEADACCD-8A19-499D-8AD7-6975D2C93243