Merge branch 'dev' into ats2

# Conflicts:
#	utils/common.js

components/nodata/nodata.vue

@@ -39,6 +39,7 @@ export default {
 		font-size: 32rpx;
 		color: #999999;
 		padding-top: 50rpx;
+		text-align: center;
 	}
 	.nodataBox{
 		text-align: center;

pages/activity/activity.vue

@@ -88,6 +88,7 @@
 
 		methods: {
 			goDetail(id) {
+				this.$store.commit('mutationsckshopInfo', '')
 				uni.navigateTo({
 					url: 'jkDetail?id=' + id
 				}) 

pages/activity/jkDetail.vue

@@ -898,15 +898,16 @@
 					//this.shopInfo = res.data.shopInfo
 					var shopinfo=res.data.shopInfo;
 					this.info.shopList.forEach(item=>{
-						//console.log(item.id)
-						//console.log(shopinfo.id)
+						
 						if(item.id==shopinfo.id){
-							
+                            this.ckshopdata=shopinfo
 							this.shopInfo=shopinfo
+							this.shopName=this.shopInfo.shopName
 						}
 					})
 					if(this.shopInfo==''){
 						this.shopInfo=this.info.shopList[0]
+						//this.shopName=this.shopInfo.shopName
 					}
 					 this.beginTimer();
 				})

pages/integral/integral.vue

@@ -243,6 +243,7 @@
 				this.getintegralGoodsPage();
 			},
 			goDetail(id){
+				this.$store.commit('mutationsckshopInfo', '')
 				uni.navigateTo({
 					url:'integralgoodsDetail?id='+id+'&avaIntegral='+this.avaIntegral
 				})

pages/integral/integralgoodsDetail.vue

@@ -251,9 +251,19 @@
 							this.info.details = this.info.details.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block" ');
 							 this.info.details=this.info.details.replace(/\<p/gi, '<p style="display: inline-block"');
 						}
-						this.shopInfo=res.data.shopList[0];
+						if(res.data.shopList.length>0){
+							this.shopInfo=res.data.shopList[0];
+							this.$store.commit('mutationsckshopInfo', this.shopInfo)
+							this.buyShow=false;
+						}else{
+							this.$store.commit('mutationsckshopInfo', '')
+							this.shopInfo=''
+							this.buyShow=false;
+						}
+						
 						this.totalIntegral=this.goodsnum*this.info.integral
-						//this.$store.commit('mutationsckshopInfo', '')
+						
+					
 						//this.szShop()
 						
 				 })
@@ -315,7 +325,7 @@
 				 	key: 'jfgoodsDetail',
 				 	data: that.info,
 				 	 success: function () {
-					   uni.navigateTo({
+					   uni.redirectTo({
 				 	   	url:'integralConfirm?shopID='+that.shopInfo.shopId+'&shopName='+that.shopInfo.shopName+'&goodsnum='+that.goodsnum+'&avaIntegral='+that.avaIntegral
 				 	   })
 				 	 }

pages/shop/ckshopList.vue

@@ -87,6 +87,9 @@
 			this.goodsId=opt.goodsId;
 			this.type=opt.type
 			uni.removeStorageSync('selectCity');
+			uni.showLoading({
+				title: '加载中'
+			})
 			uni.authorize({
 				scope: 'scope.userLocation',
 				success() {
@@ -96,7 +99,7 @@
 							console.log(res)
 							that.location.lat = res.latitude
 							that.location.lng = res.longitude
-							that.getqueryShopList() //获取全部门店列表
+							//that.getqueryShopList() //获取全部门店列表
 					         that.getAdress();
 							//that.getqueryShopList() //获取全部门店列表
 					
@@ -242,7 +245,13 @@
 							console.log("城市名称")
 							 console.log(res.data.regeocode.addressComponent.city)
 							// console.log(res.data.pois[0].cityname)
-							let cityname = res.data.regeocode.addressComponent.city;
+							//let cityname = res.data.regeocode.addressComponent.city;
+							if(res.data.regeocode.addressComponent.city.length!=0){
+								var cityname = res.data.regeocode.addressComponent.city;
+								
+							}else{
+								var cityname = res.data.regeocode.addressComponent.province;
+							}
 							var cityCode = res.data.regeocode.addressComponent.adcode
 							cityCode = cityCode.slice(0, -2)
 							cityCode = cityCode + '00'

pages/user/addCar/cailist.vue

@@ -39,14 +39,14 @@
 					<view class="lineplateNumber">{{item.plateNumber}}</view>
 					<view class="lineSx1"></view>
 					<view class="linekk">
-						<view class="linekkrow" v-if="item.nextCareMilage" style="color: #333333;">{{item.nextCareMilage}}km</view>
+						<view class="linekkrow" v-if="item.nextCareMilage" style="color: #333333;font-size: 24rpx;">{{item.nextCareMilage}}km</view>
 						<view class="linekkrow" v-else>-</view>
 						<view class="linekkrow">建议下次</view>
 						<view class="linekkrow" >保养里程</view>
 					</view>
 					<view class="lineSx"></view>
 					<view class="linekk">
-						<view class="linekkrow" v-if="item.nextCareDate" style="color: #333333;">{{item.nextCareDate.slice(0,10)}}</view>
+						<view class="linekkrow" v-if="item.nextCareDate" style="color: #333333;font-size: 24rpx;">{{item.nextCareDate.slice(0,10)}}</view>
 						<view class="linekkrow" v-else>-</view>
 						<view class="linekkrow">建议下次</view>
 						<view class="linekkrow" >保养日期</view>

utils/common.js

@@ -13,7 +13,7 @@ const automaticlogin = function() {
 	//console.log($store.state.userInfo)
 	var that=this;
 	var extConfig = uni.getExtConfigSync();
-	/* extConfig={
+	 /* extConfig={
 		"shopId": "23173848-292E-4AEA-B590-73AC9A763F1D",
 		"url":"https://store-api.qdbtl.cn/",
 		"unionId":"C3748B46-B778-40AA-8C60-A9B0F2FA23A7",
@@ -96,6 +96,13 @@ function getExtStoreId(type){
 		  "unionId":"EEADACCD-8A19-499D-8AD7-6975D2C93243",
 		  "appId":"wx33053a645546ec31"
 		  */
+		  /* extConfig={
+				 "shopId": "23173848-292E-4AEA-B590-73AC9A763F1D",
+				 "url":"https://store-api.qdbtl.cn/",
+				 "unionId":"C3748B46-B778-40AA-8C60-A9B0F2FA23A7",
+				 "appId":"wxc023ff04deb28f2d"
+		  } */
+		  
 		console.log(extConfig,'extJson对象');
 		//return extConfig[type];
 		return extConfig