Pārlūkot izejas kodu

Merge branch 'dev' into atsMaster

# Conflicts:
#	utils/common.js
#	utils/request.js
twt 7 mēneši atpakaļ
vecāks
revīzija
01c2883e7b

+ 13 - 3
pages/activity/jkDetail.vue

@@ -413,6 +413,7 @@
 				this.queryActivityInfo();
 				this.queryGoodsLook()
 			}
+			
 		   	
 		   }else{
 		   	this.$common.automaticlogin().then(val => {
@@ -784,13 +785,20 @@
 			signUp(){
 				this.groupOwner=0;
 				if(this.userInfo){
+					console.log(this.wxOpenData)
 					/* this.info.shopList.forEach(item=>{
 						if(item.id == this.shopInfo.id){
 							this.ckshopdata=item;
 							this.shopName=item.shopName;
 						}
 					}) */
-					
+					this.mobilePhone= this.userInfo.mobilePhone
+					if(this.wxOpenData.loginInfo.customerInfo){
+						this.customerName=this.wxOpenData.loginInfo.customerInfo.customerName
+					}
+					if(this.$store.state.carInfo){
+						this.plateNumber=this.$store.state.carInfo.plateNumber;
+					}
 					
 					this.bmShow=true;
 				}else{
@@ -886,8 +894,10 @@
 						   this.bgmMusic = uni.createInnerAudioContext();
 						   this.bgmMusic.autoplay = 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(){
 							  console.log('背景音乐播放中');
 						   });

+ 3 - 1
pages/index/paintShopList.vue

@@ -151,7 +151,9 @@
 				})
 				this.$http('openSheetMetalSprayPaint/queryBpshopList', {
                       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 => {
 					uni.hideLoading();
 					this.queryShopList = res.data

+ 5 - 1
pages/shop/ckshopList.vue

@@ -171,6 +171,8 @@
 					var url='openIntegralMall/getShopList'
 					var	params = {
 							id:this.goodsId,
+							lat: this.location.lat ? this.location.lat : '',
+							lng: this.location.lng ? this.location.lng : '',
 							city:this.cityCode,
 							area:this.area
 						}
@@ -179,7 +181,9 @@
 						var	params = {
 								collectingID:this.goodsId,
 								city:this.cityCode,
-								area:this.area
+								area:this.area,
+								lat: this.location.lat ? this.location.lat : '',
+								lng: this.location.lng ? this.location.lng : '',
 							}
 				}
 				else{