1

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/integral/integralgoodsDetail.vue

@@ -254,6 +254,7 @@
 						this.shopInfo=res.data.shopList[0];
 						this.totalIntegral=this.goodsnum*this.info.integral
 						//this.$store.commit('mutationsckshopInfo', '')
+						this.$store.commit('mutationsckshopInfo', this.shopInfo)
 						//this.szShop()
 						
 				 })

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",
@@ -91,6 +91,13 @@ function getExtStoreId(type){
 		  "unionId":"EF7981B9-2D1D-4006-9C0A-66CE7177134D",
 		  "appId":"wx2c6f04c0dcd15984"
 		  } */
+		  /* 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