twt 6 months ago
parent
commit
01f216bf89
5 changed files with 26 additions and 7 deletions
  1. 11 4
      pages/activity/jkDetail.vue
  2. 3 1
      pages/index/paintShopList.vue
  3. 3 1
      pages/shop/ckshopList.vue
  4. 6 0
      utils/common.js
  5. 3 1
      utils/request.js

+ 11 - 4
pages/activity/jkDetail.vue

@@ -413,6 +413,7 @@
 				this.queryActivityInfo();
 				this.queryActivityInfo();
 				this.queryGoodsLook()
 				this.queryGoodsLook()
 			}
 			}
+			
 		   	
 		   	
 		   }else{
 		   }else{
 		   	this.$common.automaticlogin().then(val => {
 		   	this.$common.automaticlogin().then(val => {
@@ -782,14 +783,18 @@
 			signUp(){
 			signUp(){
 				this.groupOwner=0;
 				this.groupOwner=0;
 				if(this.userInfo){
 				if(this.userInfo){
+					console.log(this.wxOpenData)
 					/* this.info.shopList.forEach(item=>{
 					/* this.info.shopList.forEach(item=>{
 						if(item.id == this.shopInfo.id){
 						if(item.id == this.shopInfo.id){
 							this.ckshopdata=item;
 							this.ckshopdata=item;
 							this.shopName=item.shopName;
 							this.shopName=item.shopName;
 						}
 						}
 					}) */
 					}) */
-					
-					
+					this.mobilePhone= this.userInfo.mobilePhone
+					if(this.wxOpenData.loginInfo.customerInfo){
+						this.customerName=this.wxOpenData.loginInfo.customerInfo.customerName
+					}
+					this.plateNumber=this.$store.state.carInfo.plateNumber;
 					this.bmShow=true;
 					this.bmShow=true;
 				}else{
 				}else{
 					this.authorizShow=true
 					this.authorizShow=true
@@ -884,8 +889,10 @@
 						   this.bgmMusic = uni.createInnerAudioContext();
 						   this.bgmMusic = uni.createInnerAudioContext();
 						   this.bgmMusic.autoplay = true;//自动播放
 						   this.bgmMusic.autoplay = true;//自动播放
 						   this.bgmMusic.loop = true;//循环播放
 						   this.bgmMusic.loop = true;//循环播放
-						   this.mp3Url='http://dmsimg.66km.com/music/sakuratears.mp3';
-						   this.bgmMusic.src ='http://dmsimg.66km.com/music/sakuratears.mp3'//, mp3Url;//背景音乐地址
+						   //this.mp3Url='http://dmsimg.66km.com/music/sakuratears.mp3';
+						   //this.bgmMusic.src ='http://dmsimg.66km.com/music/sakuratears.mp3'//, mp3Url;//背景音乐地址 
+						   this.mp3Url=this.info.music.music;
+						   this.bgmMusic.src =this.info.music.music; // 
 						   this.bgmMusic.onPlay(function(){
 						   this.bgmMusic.onPlay(function(){
 							  console.log('背景音乐播放中');
 							  console.log('背景音乐播放中');
 						   });
 						   });

+ 3 - 1
pages/index/paintShopList.vue

@@ -151,7 +151,9 @@
 				})
 				})
 				this.$http('openSheetMetalSprayPaint/queryBpshopList', {
 				this.$http('openSheetMetalSprayPaint/queryBpshopList', {
                       city:this.cityCode,
                       city:this.cityCode,
-                      area:this.area
+                      area:this.area,
+					  lat: this.location.lat ? this.location.lat : '',
+					  lng: this.location.lng ? this.location.lng : '',
 				}, 'GET').then(res => {
 				}, 'GET').then(res => {
 					uni.hideLoading();
 					uni.hideLoading();
 					this.queryShopList = res.data
 					this.queryShopList = res.data

+ 3 - 1
pages/shop/ckshopList.vue

@@ -181,7 +181,9 @@
 						var	params = {
 						var	params = {
 								collectingID:this.goodsId,
 								collectingID:this.goodsId,
 								city:this.cityCode,
 								city:this.cityCode,
-								area:this.area
+								area:this.area,
+								lat: this.location.lat ? this.location.lat : '',
+								lng: this.location.lng ? this.location.lng : '',
 							}
 							}
 				}
 				}
 				else{
 				else{

+ 6 - 0
utils/common.js

@@ -97,6 +97,12 @@ function getExtStoreId(type){
 				 "unionId":"C3748B46-B778-40AA-8C60-A9B0F2FA23A7",
 				 "unionId":"C3748B46-B778-40AA-8C60-A9B0F2FA23A7",
 				 "appId":"wxc023ff04deb28f2d"
 				 "appId":"wxc023ff04deb28f2d"
 		  } */
 		  } */
+	 /* extConfig={
+			 "shopId": "4490D0C9-176B-4C34-BE50-111CA3FA4DC1",
+			 "url":"https://apidms.jcatt.cn/",
+			 "unionId":"9DE2D6D6-D59A-401B-8275-F5DACC99AC22",
+			 "appId":"wx575a8b1339951f27"
+		  } */
 		  
 		  
 		console.log(extConfig,'extJson对象');
 		console.log(extConfig,'extJson对象');
 		//return extConfig[type];
 		//return extConfig[type];

+ 3 - 1
utils/request.js

@@ -14,10 +14,12 @@ const baseUrl=extConfig.url+'/'
 //const baseUrl='http://192.168.0.18:20187/' 
 //const baseUrl='http://192.168.0.18:20187/' 
 //const baseUrl='https://store-api.qdbtl.cn/'
 //const baseUrl='https://store-api.qdbtl.cn/'
 //const baseUrl='https://apidms.66km.com/'
 //const baseUrl='https://apidms.66km.com/'
-
+//京猫虎
+//const baseUrl='https://apidms.jcatt.cn/'
 //	wx2c6f04c0dcd15984正式  wx33053a645546ec31 E37BB296-5A08-4534-859D-B351BA611AF9 EEADACCD-8A19-499D-8AD7-6975D2C93243 
 //	wx2c6f04c0dcd15984正式  wx33053a645546ec31 E37BB296-5A08-4534-859D-B351BA611AF9 EEADACCD-8A19-499D-8AD7-6975D2C93243 
 //测试地址
 //测试地址
 //const webUrl = 'http://dms.32che.cn/'
 //const webUrl = 'http://dms.32che.cn/'
+
 //正式
 //正式
 const webUrl = 'https://webwx.66km.com/'
 const webUrl = 'https://webwx.66km.com/'
 console.log(baseUrl)
 console.log(baseUrl)