Merge branch 'dev'

pages/activity/jkDetail.vue

@@ -413,6 +413,7 @@
 				this.queryActivityInfo();
 				this.queryGoodsLook()
 			}
+			
 		   	
 		   }else{
 		   	this.$common.automaticlogin().then(val => {
@@ -782,13 +783,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{
@@ -884,8 +892,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('背景音乐播放中');
 						   });

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

pages/index/receiveCoupon.vue

@@ -5,7 +5,16 @@
 			<view class="line" v-for="(item,index) in list">
 				<view class="lineLeft">
 					<view class="lineName">{{item.actName}}</view>
-					<view class="moneyBox">
+					
+					<view v-if="item.discountType==3">
+						<span class="mdsky">最大可抵工时数</span>
+						<span class="moneyNum" style="padding-left: 10rpx;">{{item.itemCount}}</span>
+					</view>
+					<view v-if="item.discountType==2">
+						<span class="mdsky">最大可抵商品数</span>
+						<span class="moneyNum" style="padding-left: 10rpx;">{{item.itemCount}}</span>
+					</view>
+					<view class="moneyBox"  v-if="item.discountType==1">
 						<span class="moneyBs">￥</span>
 						<span class="moneyNum">{{item.actMoney}}</span>
 						<span class="mdsky">{{item.whereMoney!==0?'满'+item.whereMoney+'可用':'无限制'}}</span>

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{

utils/common.js

@@ -97,6 +97,12 @@ function getExtStoreId(type){
 				 "unionId":"C3748B46-B778-40AA-8C60-A9B0F2FA23A7",
 				 "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对象');
 		//return extConfig[type];

utils/request.js

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