Merge remote-tracking branch 'remotes/origin/ats' into dev

pages.json

@@ -573,31 +573,31 @@
 	
 		"tabBar": {
 			"color": "#8a8a8a",
-			"selectedColor": "#D53533",
+			"selectedColor": "#1677FF",
 			"borderStyle": "black",
 			"backgroundColor": "#ffffff",
 			"list": [{
 					"pagePath": "pages/index/index",
 					"iconPath": "./static/tabimg/index2.png",
-					"selectedIconPath": "./static/tabimg/index1.png",
+					"selectedIconPath": "./static/tabimg/index1677FF.png",
 					"text": "首页"
 				},
 				{
 					"pagePath": "pages/shop/shop",
 					"iconPath": "./static/tabimg/shop2.png",
-					"selectedIconPath": "./static/tabimg/shop1.png",
+					"selectedIconPath": "./static/tabimg/shop1677FF.png",
 					"text": "商城"
 				},
 				{
 					"pagePath": "pages/activity/activity",
 					"iconPath": "./static/tabimg/activty2.png",
-					"selectedIconPath": "./static/tabimg/activity1.png",
+					"selectedIconPath": "./static/tabimg/activty1677FF.png",
 					"text": "活动"
 				},
 				{
 					"pagePath": "pages/user/user",
 					"iconPath": "./static/tabimg/me2.png",
-					"selectedIconPath": "./static/tabimg/me1.png",
+					"selectedIconPath": "./static/tabimg/me1677FF.png",
 					"text": "我的"
 				}
 

pages/index/index.vue

@@ -173,7 +173,7 @@
 		
 		<!-- 热门商品 -->
 		<view v-if="homeCardList.openMGoods">
-			<view class="" v-if="homeCardList.openMGoods.goodsList.length>0">
+			<view class="" v-if="homeCardList.openMGoods.goodsList&&homeCardList.openMGoods.goodsList.length>0">
 				<view class="Hot" v-if="homeCardList.openMGoods.showType==1">
 					<view class="hotTop">
 						<view class="hotLeft">
@@ -282,7 +282,7 @@
 				InsuranceExpireDate:'',
 				NextCareDate:'',
 				NextAuditDate:'',
-				themeColor:'',
+				themeColor:'1677FF',
 				getwxLoing:false,
 				shareID:'',
 				discount:'',
@@ -335,7 +335,8 @@
 				this.uniLogin()
 			}
 			//版本更新
-		    this.UpdateManager()
+		    this.UpdateManager();
+			
 		},
 		onShow() {
 			this.userInfo=this.$store.state.userInfo;

pages/index/onlineBooking.vue

@@ -952,7 +952,8 @@
 	.authorizContbutton{
 		width: 422rpx;
 		height: 88rpx;
-		background: #D53533;
+		/* background: #D53533; */
+		background: #1677FF;
 		border-radius: 44rpx;
 		line-height: 88rpx;
 		text-align: center;

pages/shop/ckshopList.vue

@@ -96,6 +96,7 @@
 							console.log(res)
 							that.location.lat = res.latitude
 							that.location.lng = res.longitude
+							that.getqueryShopList() //获取全部门店列表
 					         that.getAdress();
 							//that.getqueryShopList() //获取全部门店列表
 					
@@ -110,6 +111,7 @@
 					 that.getqueryShopList();
 					 
 				}})
+
 		},
 		onShow() {
 			const selectCity = uni.getStorageSync('selectCity');
@@ -123,6 +125,7 @@
 				this.getAreaList()
 				this.getqueryShopList() //获取门店列表
 			}
+
 		},
 		methods: {
             quCilck(){

pages/user/user.vue

@@ -57,7 +57,7 @@
 		</view>
 		
         <!-- 卡制度-->
-		<view v-if="showSetting.isShowCardSystem">
+		<view v-if="showSetting.isShowCardSystem&&f2csystemlist">
 				<view >
 				<swiper class="swiper2"  :autoplay="false" :interval="interval"
 								:duration="duration" :indicator-dots="true" indicator-color="#CCCCCC" :indicator-active-color="'#'+themeColor">
@@ -240,13 +240,13 @@
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
-		    <!-- <view class="rowBox" @click="gonavigateTo('../subPack/depositList')">
+		    <view class="rowBox" @click="gonavigateTo('../subPack/depositList')">
 				<view class="leftView">
 					<image src="../../static/timg/icon_jydd.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">我的寄存</view>
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
-			</view> -->
+			</view> 
 			 <view class="rowBox" @click="gonavigateTo('../subPack/rescueOrder')">
 				<view class="leftView">
 					<image src="../../static/timg/sos.png" mode="" class="liftIcon"></image>
@@ -402,7 +402,7 @@
 				nickName: '',
 				phone: '',
 				ext: '',
-				themeColor: '',
+				themeColor: '1677FF',
 				release_version: '',
 				qrimg:'',
 				qrSHow:false,
@@ -648,14 +648,14 @@
 			},
 			goorder(num) {
 				if (this.userInfo) {
-					
+					uni.navigateTo({
+						url: './myOrder/myOrder?num=' + num
+					})
 				} else {
 					this.authorizShow = true;
 					return false;
 				}
-				uni.navigateTo({
-					url: './myOrder/myOrder?num=' + num
-				})
+				
 			},
 
 			queryMyDetail() {

utils/common.js

@@ -73,11 +73,11 @@ function noMultipleClicks(methods, info) {
 function getExtStoreId(type){
 	try{
 	 var extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {shopId:'默认的门店id'};
-	/* 	 extConfig={
-		  	"shopId": "935D2FA9-1DA3-4C8B-944C-DB40D5C6F132",
-		  	"url":"https://apidms.66km.com",
-		  	"unionId":"1933D569-A2A4-4090-87C3-8E84B33FF15A",
-		  	"appId":"wx09ff516cd194a04d"
+		 /* 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];

utils/request.js

@@ -10,14 +10,14 @@ const extConfig = uni.getExtConfigSync();
 console.log(extConfig)
 const baseUrl=extConfig.url+'/'
 //const baseUrl='http://192.168.0.147:20187/'
-//const baseUrl='http://192.168.0.129:20189/'
+//const baseUrl='https://store-api.qdbtl.cn/'
 //const baseUrl='http://dms.66km.com.cn/'
-
-//wx2c6f04c0dcd15984正式  wx33053a645546ec31 E37BB296-5A08-4534-859D-B351BA611AF9 EEADACCD-8A19-499D-8AD7-6975D2C93243 
+//wxc023ff04deb28f2d正式  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)
 const http = (url = '', date = {}, type = 'POST', header = {
 }) => {
     return new Promise((resolve, reject) => {