Squashed commit of the following:

commit da50c6450655c0d6ee7ae09456df499d737710b0
Author: twt <178638311@qq.com>
Date:   Mon Mar 4 18:20:24 2024 +0800

    样式

commit 6728959d7630480d189081dcaf5a9d1c81210a82
Author: twt <178638311@qq.com>
Date:   Thu Feb 29 10:05:50 2024 +0800

    日期bug

commit 4182e5e2dd7d2bd4a38a719402fff024e58d1da2
Author: twt <178638311@qq.com>
Date:   Tue Feb 27 17:17:36 2024 +0800

    优化

commit c863501cdc6c7120c72917861bae174ccb48845f
Author: twt <178638311@qq.com>
Date:   Tue Feb 27 14:42:30 2024 +0800

    优化

commit 502f85ea5d25816fad579f2e5bf4c42ce8a68eab
Author: twt <178638311@qq.com>
Date:   Mon Feb 26 15:43:27 2024 +0800

    门店bug修改

commit 17d3a8a440eb2bedeb64d692403efa142dbbea75
Author: twt <178638311@qq.com>
Date:   Fri Feb 23 18:01:14 2024 +0800

    代码提交

commit 3fae584dc4ec2d6b6cb8bbf9bf045fc7cdc6c0ec
Author: twt <178638311@qq.com>
Date:   Wed Feb 21 14:19:32 2024 +0800

    提示语

commit 0c34b2e7ae8efe79d7511e67da8049f4c28679db
Author: twt <178638311@qq.com>
Date:   Mon Feb 19 17:32:44 2024 +0800

    退出重新登录

commit 057cba5b5ff02032c9f5f800c619649e57f6e609
Merge: 3db72bc ac370f8
Author: twt <178638311@qq.com>
Date:   Sat Feb 17 15:11:38 2024 +0800

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

commit 3db72bc08a313884bd3e0adf7893c87eb230742d
Author: twt <178638311@qq.com>
Date:   Sun Feb 4 16:27:27 2024 +0800

    bug修改

commit ac370f8e7311ee93552b9a3f2f8eae42aa1b8e3a
Author: twt <178638311@qq.com>
Date:   Sun Feb 4 16:23:58 2024 +0800

    门店修改

commit 743b87c81583a1fc9febba2941d16bb9d09a9e48
Author: twt <178638311@qq.com>
Date:   Sun Feb 4 14:44:55 2024 +0800

    安徒生bug修改

commit 0a46d958dfbf531b5d7ecbf18e3d9dbc220312a2
Merge: d9ff807 5714eba
Author: twt <178638311@qq.com>
Date:   Sun Feb 4 11:14:13 2024 +0800

    Merge branch 'dev' into ats

commit 5714eba7f943289c04c32b7112c59004d6649dc5
Author: twt <178638311@qq.com>
Date:   Sun Feb 4 11:13:55 2024 +0800

    暂无门店提示

commit d9ff80773101e8b14dc84fe6b4af55e0f6773bd1
Merge: 7e671fe 32229bc
Author: twt <178638311@qq.com>
Date:   Sun Feb 4 11:09:58 2024 +0800

    Merge branch 'dev' into ats

    # Conflicts:
    #	pages/shop/ckshopList.vue
    #	utils/request.js

commit 32229bcc598ce7ae04b8c374367ecc78915c7067
Author: twt <178638311@qq.com>
Date:   Sun Feb 4 11:02:57 2024 +0800

    授权修改

commit 7e671fe89771047e676f3584b72bde5ab280919d
Author: twt <178638311@qq.com>
Date:   Sun Feb 4 10:36:07 2024 +0800

    门店授权

commit 2e9f7b262328832188f54e035b1a4c308c01ad6f
Merge: cb47d42 23ab761
Author: twt <178638311@qq.com>
Date:   Sun Feb 4 10:32:28 2024 +0800

    Merge branch 'ats' of http://47.98.226.240:3000/twt/wxThird into ats

commit cb47d426a2f40371570660e5af39cf105ac6dc4f
Author: twt <178638311@qq.com>
Date:   Sun Feb 4 10:32:21 2024 +0800

    安徒生修改

commit 23ab7613834d9355cc9c99e65408bd288920fdd3
Author: @tang_weiteng <178638311@qq.com>
Date:   Sat Feb 3 16:30:57 2024 +0800

    主题色修改

commit 463b6a1e76b4d6e9b4c7d95ea9b50b1343ae97af
Author: twt <178638311@qq.com>
Date:   Thu Feb 1 01:09:54 2024 +0800

    bug修改

commit 63c524210907bfee70436faf120d15042612bb10
Author: twt <178638311@qq.com>
Date:   Wed Jan 24 17:34:49 2024 +0800

    门店选择

commit e05cb7cf77856c7b45992532ba7a61df6b3c7f7a
Author: twt <178638311@qq.com>
Date:   Tue Jan 23 11:13:11 2024 +0800

    门店列表，海报

commit 88853f1230612aca708f54d73a95924346bd9384
Merge: 21a9940 56df830
Author: twt <178638311@qq.com>
Date:   Mon Jan 22 15:02:39 2024 +0800

    Merge branch 'master' into dev

commit 21a9940eaa036b07cd8bef3244811c89727bee73
Author: twt <178638311@qq.com>
Date:   Mon Jan 22 14:49:33 2024 +0800

    门店

commit 72feaa2b6549d5b505abd0856a6a30bc2ae66b76
Author: twt <178638311@qq.com>
Date:   Mon Jan 22 11:51:28 2024 +0800

    111

pages.json

@@ -458,41 +458,41 @@
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": true
 			}
-		},
-		{
-			"path": "pages/user/myAppraise",
-			"style": {
-				"navigationBarTitleText": "我的评价",
-		
-				"enablePullDownRefresh": true
-			}
-		
-		},
-		{
-			"path": "pages/user/myAppraiseDetail",
-			"style": {
-				"navigationBarTitleText": "查看评价"
-		
-				
-			}
-		
-		},
-		{
-			"path": "pages/user/appraise",
-			"style": {
-				"navigationBarTitleText": "评价"
-		
-				
-			}
-		
+		},
+		{
+			"path": "pages/user/myAppraise",
+			"style": {
+				"navigationBarTitleText": "我的评价",
+		
+				"enablePullDownRefresh": true
+			}
+		
+		},
+		{
+			"path": "pages/user/myAppraiseDetail",
+			"style": {
+				"navigationBarTitleText": "查看评价"
+		
+				
+			}
+		
+		},
+		{
+			"path": "pages/user/appraise",
+			"style": {
+				"navigationBarTitleText": "评价"
+		
+				
+			}
+		
 		}
 		    ,{
             "path" : "pages/user/ShopAppraiseList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "评价列表",
-                "enablePullDownRefresh": true
-            }
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "评价列表",
+                "enablePullDownRefresh": true
+            }
             
         },
 		{
@@ -566,6 +566,15 @@
 							"enablePullDownRefresh": false
 						}
 
+					},
+					{
+						"path": "oldhistoryDetail",
+						"style": {
+							//"navigationBarTitleText": "消费明细",
+							"navigationStyle": "custom",
+							"enablePullDownRefresh": true
+						}
+					
 					}
 				]
 				
@@ -610,4 +619,4 @@
 			"backgroundColor": "#F8F8F8"
 		},
 		"uniIdRouter": {}
-	}
+	}

pages/activity/jkDetail.vue

@@ -424,7 +424,12 @@
 		   
 		   
 		},
-	
+		onShow() {
+			this.shopName=this.$store.state.ckshopInfo.shopName;
+			this.ckshopdata=this.$store.state.ckshopInfo
+			this.shopInfo=this.$store.state.ckshopInfo
+			//console.log(this.shopInfo)
+		},
 		onPullDownRefresh(){
 			//this.getInfo();
 			this.queryActivityInfo();
@@ -798,7 +803,10 @@
 			},
 			showCkshop(){
 				console.log("选择门店")
-				this.ckshopShow=true;
+				//this.ckshopShow=true;
+				uni.navigateTo({
+					url:'/pages/shop/ckshopList?goodsId='+this.collectingID+'&type=5'
+				})
 				
 			},
 			noShowShop(){

pages/index/confirmRescue.vue

@@ -135,7 +135,11 @@
 		},
 		onLoad(opt) {
 			this.themeColor = uni.getStorageSync("themeColor");
-			this.userInfo = uni.getStorageSync("userInfo");
+			//this.userInfo = uni.getStorageSync("userInfo");
+			var customerInfo=uni.getStorageSync("wxOpenData").loginInfo.customerInfo;
+			this.customerName=customerInfo.customerName;
+			this.mobilePhone=customerInfo.mobilePhone;
+			this.userInfo = this.$store.state.userInfo;
 			this.shopName=opt.shopName;
 			this.opt=opt;
 			if(this.opt.type==2){
@@ -209,7 +213,7 @@
 					 if(res.code==0){
 						 uni.showModal({
 						     title: '提示',
-						     content: '预约成功',
+						     content: '救援信息提交成功',
 						 	confirmText:'返回首页',
 						 	cancelText:'查看订单',
 						     success: function (res) {

pages/index/confirmYuyue.vue

@@ -92,7 +92,8 @@
 			this.stationID=this.yuyueData[0].StationID
 			this.totalPrice=opt.totalPrice
 			//this.carInfo=this.$store.state.carInfo
-			this.userInfo = uni.getStorageSync("userInfo");
+			//this.userInfo = uni.getStorageSync("userInfo");
+			this.userInfo = this.$store.state.userInfo;
 			this.yyshopInfo=uni.getStorageSync("yyshopInfo")
 			//this.getOrderTimes()
 			

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">
@@ -241,7 +241,7 @@
 		
 		<view style="height: 60rpx;"></view>
 		<!-- 手机号授权 -->
-		<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
+		<view class="authorizBox" v-if="authorizShow" @click="authorizShowHide">
 			<view class="authorizCont" @click.stop="">
 				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
 				<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
@@ -335,9 +335,11 @@
 				this.uniLogin()
 			}
 			//版本更新
-		    this.UpdateManager()
+		    this.UpdateManager();
+			
 		},
 		onShow() {
+			
 			this.userInfo=this.$store.state.userInfo;
 			this.wxOpenData=this.$store.state.wxOpenData;
 			var indexaddcar = uni.getStorageSync("indexaddcar");
@@ -347,6 +349,11 @@
 				this.getCarList();
 			}else{
 				this.carInfo=this.$store.state.carInfo;
+				console.log("车辆信息")
+				console.log(this.carInfo)
+				if(!this.carInfo){
+					this.getCarList();
+				}
 				this.jsTime()
 			}
 		    
@@ -362,6 +369,9 @@
 			}, 1000);
 		},
 		methods: {
+			authorizShowHide(){
+				this.authorizShow=false
+			},
 			UpdateManager(){
 				const updateManager = uni.getUpdateManager();
 				updateManager.onCheckForUpdate(function (res) {
@@ -732,7 +742,7 @@
 						data: that.themeColor,
 						 success: function () {
 						    // that.uniLogin()
-						 
+						    console.log("themeColor=="+that.themeColor)
 						 }
 					}); 
 					if(this.wxOpenData.loginInfo){
@@ -898,6 +908,8 @@
 				  },'GET').then(res => {
 					 if(res.code==401){
 						// this.uniLogin()
+						this.carInfo=''
+						this.$store.commit('mutationscarInfo', '')
 					 }else{
 						 this.carInfo=res.data[0]
 						 //this.carInfo=[]

pages/index/onlineBooking.vue

@@ -193,13 +193,16 @@
 				wxOpenData:'',
 				code:'',
 				scene:'',
+				naUnionId:'',
 			}
 		},
 		onLoad(opt) {
 			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
-			this.userInfo = uni.getStorageSync("userInfo");
+			//this.userInfo = uni.getStorageSync("userInfo");
+			this.userInfo = this.$store.state.userInfo;
 			this.themeColor = uni.getStorageSync("themeColor");
 			this.naShopId = opt.naShopId;
+			this.naUnionId=opt.naUnionId
 			if (this.naShopId == null || this.naShopId == 'null') {
 				this.naShopId = ''
 			}
@@ -252,7 +255,6 @@
 					 var data= JSON.parse(res.data) ;
 					 console.log(data)
 					 this.naShopId=data.naShopId;
-					
 					 this.getInfo(); 
 				 })
 			},
@@ -321,10 +323,16 @@
 				uni.showLoading({
 					title: '加载中'
 				});
+				if(this.naUnionId){
+					var unionId=this.naUnionId
+				}else{
+					var unionId=this.userInfo.unionId
+				}
+				
 				//openreservation/listBigTags
 				this.$http('openreservation/listItemWxCategory', {
 					shopId: this.shopInfo.id,
-					unionId: this.userInfo.unionId
+					unionId: unionId
 				}, 'GET').then(res => {
 					uni.hideLoading();
 					this.bizTagId = res.data[0].ID
@@ -420,6 +428,14 @@
 				this.selectedItems = []
 			},
 			yuyue() {
+				if(this.shopInfo.shopState!=1){
+					uni.showToast({
+						title: '当前门店暂未营业',
+						icon: 'none',
+						duration: 3000
+					});
+					return false
+				}
 				if(!this.userInfo){
 					this.authorizShow=true
 				}else{
@@ -648,16 +664,16 @@
 
 	.yrTop {
 		display: flex;
-		justify-content: space-between;
+		justify-content: space-between;
 		align-items: center;
 	}
 
 	.ItemName {
 		color: #3C3C3C;
 		font-size: 28rpx;
-		width: 480rpx;
-		font-weight: bold;
-		margin-top: 20rpx;
+		width: 480rpx;
+		font-weight: bold;
+		margin-top: 20rpx;
 		margin-bottom: 10rpx;
 	}
 
@@ -847,12 +863,12 @@
 		color: #FF3B30;
 		font-size: 32rpx;
 	}
-	.appraiseBg{
-		display: flex;
-		align-items: center;
+	.appraiseBg{
+		display: flex;
+		align-items: center;
 	}
 	.appraiseBox {
-		padding: 5rpx 20rpx;
+		padding: 5rpx 20rpx;
 		padding-right: 30rpx;
 		margin-top: 10rpx;
 		height: 62rpx;
@@ -953,4 +969,4 @@
 		margin-top: 62rpx;
 		margin-left:71rpx;
 	}
-</style>
+</style>

pages/index/paintShopList.vue

@@ -1,6 +1,17 @@
 <template>
 	<view class="box">
-
+        <view class="regionBox">
+        	<view class="regionLine" @click="gocity">
+        		<view class="regionTxt">{{cityName}}</view>
+        		<image src="../../static/timg/icon_arrow_def@2x.png" mode="" class="jtbelow"></image>
+        	</view>
+        	<view class="regionSx"></view>
+        	<view class="regionLine" @click="quCilck">
+        		<view class="regionTxt">{{areaName}}</view>
+        		<image src="../../static/timg/icon_arrow_def@2x.png" mode="" class="jtbelow"></image>
+        	</view>
+        </view>
+		<view style="height: 90rpx;"></view>
 		<view class="shopline" v-for="(item,index) in queryShopList" @click="goDetail(item)">
 			<view class="shoplineLeft">
 				<image :src="item.photoPath" mode="" class="shopImg" v-if="item.photoPath"></image>
@@ -28,7 +39,20 @@
 		<view class="noMore" v-if="noMoreShow && (queryShopList.length!=0)">没有更多数据</view>
 		<!-- 无数据空白页 -->
 		<nodata v-if="queryShopList.length==0"></nodata>
-
+        <uni-popup ref="popup" type="right" :mask-click="true">
+        	<view class="popup-content">
+        		<scroll-view class="brandList" scroll-y="true">
+        			<!-- :class="{areaActvie:item.area==areaName}" -->
+        			<view v-for="item in areaList" class="areaListLine"
+        			 
+        			 @click="checkarea(item)">
+        			  <span >{{item.area}}</span>
+        			  <image v-if="item.code==area" class="areaCkIcon" src="http://dmsphoto.66km.com.cn/thFiles/0A1DADEA-1807-4ABC-B391-ECC8B1882DA4.png" mode=""></image>
+        			</view>
+        		</scroll-view>
+        	</view>
+        	
+        </uni-popup>
 	</view>
 </template>
 
@@ -48,25 +72,86 @@
 				queryShopList: '',
 				noMoreShow: false,
                 goodsId:'',
-
+                cityName:'城市',
+                area:'',
+                cityCode:'',
+                areaName:'区域',
+                loading:false,
+                areaList:'',
 
 			}
 		},
 
 		onLoad(opt) {
-			
-			
-			this.getqueryShopList() //获取全部门店列表
+			var that = this;
+			uni.removeStorageSync('selectCity');
+			uni.authorize({
+				scope: 'scope.userLocation',
+				success() {
+					uni.getLocation({
+						type: 'gcj02',
+						success: function(res) {
+							console.log(res)
+							that.location.lat = res.latitude
+							that.location.lng = res.longitude
+					         that.getAdress();
+							//that.getqueryShopList() //获取全部门店列表
+					
+						},
+						fail(err) {
+					      console.log(err)
+						  that.getqueryShopList() //获取全部门店列表
+						}
+					});
+				},
+				fail: (err) => {
+					 that.getqueryShopList();
+					 
+				}})
+			//this.getqueryShopList() //获取全部门店列表
+		},
+		onShow() {
+			const selectCity = uni.getStorageSync('selectCity');
+			//console.log("onShow")
+			//console.log(selectCity)
+			if(selectCity){
+				this.cityName=selectCity.city
+				this.cityCode=selectCity.code
+				this.areaName='区域'
+				this.area=''
+				this.getAreaList()
+				this.getqueryShopList() //获取门店列表
+			}
 		},
 		methods: {
-
-
+            quCilck(){
+            	this.$refs.popup.open("right")
+            	this.popupShow=true;
+            },
+            gocity(){
+            	uni.navigateTo({
+            		url:'/pages/subPack/chooseCity?type=3'
+            	})
+            },
+            checkarea(item){
+            	if(this.area==item.code){
+            		this.areaName='区域'
+            		this.area=''
+            		this.getqueryShopList() //获取门店列表
+            	}else{
+            		this.areaName=item.area
+            		this.area=item.code
+            		this.getqueryShopList() //获取门店列表
+            	}
+            	this.$refs.popup.close()
+            },
 			getqueryShopList() {
 				uni.showLoading({
 					title: '加载中'
 				})
 				this.$http('openSheetMetalSprayPaint/queryBpshopList', {
-     
+                      city:this.cityCode,
+                      area:this.area
 				}, 'GET').then(res => {
 					uni.hideLoading();
 					this.queryShopList = res.data
@@ -74,7 +159,49 @@
 
 				})
 			},
-
+         getAreaList(){
+            	this.$http('openSheetMetalSprayPaint/shop-area-list', {
+            	    city:this.cityCode
+            	}, 'GET').then(res => {
+            	    this.areaList=res.data
+            	
+            	})
+            },
+			getAdress(){
+				var that=this;
+				var location = this.location.lng + ',' + this.location.lat
+				console.log('location'+location)
+				uni.request({
+					url: 'https://restapi.amap.com/v3/geocode/regeo',
+					data: {
+						key: '389a059efa3f499d9145eb84b1c3248d',
+						location: location,
+					},
+					dataType: "json",
+					success: (res) => {
+						console.log('定位城市', res);
+						if(res.data.regeocode){
+							console.log("城市名称")
+							 console.log(res.data.regeocode.addressComponent.city)
+							// console.log(res.data.pois[0].cityname)
+							let cityname = res.data.regeocode.addressComponent.city;
+							var cityCode = res.data.regeocode.addressComponent.adcode
+							cityCode = cityCode.slice(0, -2)
+							cityCode = cityCode + '00'
+							this.cityName = cityname
+							this.cityCode = cityCode
+							that.getqueryShopList() //获取全部门店列表
+							that.getAreaList()
+							
+						}else{
+							console.log("接口获取失败")
+							that.cityCode = ''
+							that.getqueryShopList() //获取全部门店列表
+						}
+						
+					}
+				});
+			},
 			goDetail(item) {
 				 this.$store.commit('mutationsckshopInfo', item)	
 				uni.navigateBack({
@@ -338,4 +465,70 @@
 		color: #999999;
 		font-size: 28rpx;
 	}
+	.regionSx{
+		width: 2rpx;height: 33rpx;background:#EEEEEE;
+	}
+	.regionLine{
+		display: flex;justify-content: center;font-size: 26rpx;
+		width: 370rpx;line-height: 33rpx;color: #3C3C3C;
+	}
+	.regionBox{
+		display: flex;
+		justify-content: center;
+		background: #FFFFFF;
+		padding: 20rpx 0;
+		margin-bottom: 20rpx;
+		position: fixed;
+		width: 100vw;
+		top: 0;left: 0;
+	}
+	.jtbelow{
+		width: 14rpx;height: 7rpx;
+		margin-left: 10rpx;margin-top: 10rpx;
+	}
+	.popup-content{
+		width: 590rpx;
+		background: #FFFFFF;
+		height: 100vh;
+	}
+	.brandList{
+		height:99vh;
+	}
+	.areaListLine{
+		padding:30rpx 24rpx;
+		color: #666666;
+		font-size: 28rpx;
+		border-bottom: 1px solid #eaeaea;
+		display: flex;
+		justify-content: space-between;
+		line-height: 28rpx;
+	}
+	.areaActvie{
+		background: #F19D01;
+		color: #FFFFFF;
+	}
+	.popup-content{
+		width: 590rpx;
+		background: #FFFFFF;
+		height: 100vh;
+	}
+	.brandList{
+		height:99vh;
+	}
+	.areaListLine{
+		padding:30rpx 24rpx;
+		color: #666666;
+		font-size: 28rpx;
+		border-bottom: 1px solid #eaeaea;
+		display: flex;
+		justify-content: space-between;
+		line-height: 28rpx;
+	}
+	.areaActvie{
+		background: #F19D01;
+		color: #FFFFFF;
+	}
+	.areaCkIcon{
+		width: 38rpx;height: 28rpx;
+	}
 </style>

pages/index/rescue.vue

@@ -77,9 +77,9 @@
       <w-picker
 			  :visible.sync="visible"
 			  mode="date" 
-			  startYear="2023" 
+			  startYear="2024" 
 			  endYear="2029"
-			  value="2020-04-08 13:18"
+			  value=""
 			  :current="true"
 			  fields="minute"
 			  @confirm="onConfirm($event,'date')"
@@ -316,6 +316,12 @@
 				})
 			},
 			sure(){
+				if (this.userInfo) {
+					
+				} else {
+					this.authorizShow = true;
+					return false;
+				}
 				if(this.tabIndex==0){
 					const yy = new Date().getFullYear()
 					  const MM = (new Date().getMonth() + 1) < 10 ? '0' + (new Date().getMonth() + 1) : (new Date().getMonth() + 1)
@@ -372,7 +378,7 @@
 				}) */
 				 if(!this.shopInfo){
 					uni.showToast({
-						 title: '暂未找到救援门店',
+						 title: res.data.msg,
 						 icon:'none',
 						 duration: 3000
 					});

pages/index/shopList.vue

@@ -83,6 +83,19 @@
 			</view>
 			
 		</uni-popup>
+		<!-- 手机号授权 -->
+		<view class="authorizBox" v-if="authorizShow" @click="authorizShowno">
+			<view class="authorizCont" @click.stop="">
+				<view class="authorizName">{{wxOpenData.miniAppName}}</view>
+				<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+				<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
+			</view>
+			<view style="text-align: center;padding-top: 56rpx;">
+				<image src="../../static/timg/icon_guanbi@2x.png"  @click="authorizShowno" mode="" class="authorizCloseImg"></image>
+			</view>
+		</view>
+		<!-- <view>lng:{{location.lng}}</view>
+		<view>lat:{{location.lat}}</view> -->
 	</view>
 </template>
 
@@ -110,34 +123,35 @@
 				index:'',
 				areaName:'区域',
 				loading:false,
+				ext:'',
+				authorizShow:false,
+				wxOpenData:'',
+				userInfo: '',
 			}
 		},
 
 		onLoad() {
 			var that = this;
 			uni.removeStorageSync('selectCity');
-			uni.authorize({
-				scope: 'scope.userLocation',
-				success() {
-					uni.getLocation({
-						type: 'gcj02',
-						success: function(res) {
-							console.log(res)
-							that.location.lat = res.latitude
-							that.location.lng = res.longitude
-					        that.getAdress();
-							//that.getqueryShopList() //获取全部门店列表
-						},
-						fail(err) {
-							console.log("定位失败")
-					        that.getqueryShopList();
-						}
-					});
-				},
-				fail: (err) => {
-					 that.getqueryShopList();
-					 
-				}})
+			this.userInfo = this.$store.state.userInfo;
+			this.ext=this.$common.getExtStoreId();
+			 if(this.userInfo){
+				 this.themeColor = uni.getStorageSync("themeColor");
+				 this.wxOpenData=this.$store.state.wxOpenData;
+				 this.init()
+			 }else{
+				 this.$common.automaticlogin().then(val => {
+				 	this.themeColor = uni.getStorageSync("themeColor");
+				 	this.userInfo=this.$store.state.userInfo;
+				 	this.wxOpenData=this.$store.state.wxOpenData;
+				 	this.init()
+					if(!this.userInfo){
+						uni.hideLoading();
+						this.authorizShow=true
+					}
+				 })
+			 }
+			
 			
 			// that.getqueryShopList();
 			
@@ -156,13 +170,111 @@
 			}
 		},
 		methods: {
+			authorizShowno(){
+				this.authorizShow=false
+			},
+			decryptPhoneNumber: function(e) {
+				  console.log(e);
+				  this.code=e.detail.code
+				  this.wxPhoneLogin()
+				  this.authorizShow=false;
+			},
+			wxPhoneLogin(){
+					 var that=this;
+					 this.$http('miniApp2/sys/wxPhoneLogin', {
+					   appId:this.ext.appId,
+					   unionId:this.ext.unionId,
+					   code:this.code,
+					   openId:this.wxOpenData.openid
+					  },'POST').then(res => {
+						var data = res.data;
+						if(data.loginInfo){
+							this.userInfo=data.loginInfo.openUser;
+							this.wxOpenData=data.loginInfo;
+							this.$store.commit('mutationswxOpenData', data)
+							this.$store.commit('mutationsuserInfo', this.userInfo)
+						    this.init()
+						}	
+					  })
+			},
+			init(){
+				var that = this;
+				uni.showLoading({
+					title: '加载中'
+				})
+				uni.authorize({
+					scope: 'scope.userLocation',
+					success() {
+						uni.getLocation({
+							type: 'gcj02',
+							success: function(res) {
+								console.log(res)
+								that.location.lat = res.latitude
+								that.location.lng = res.longitude
+						        that.getAdress();
+								//that.getqueryShopList() //获取全部门店列表
+						
+							},
+							fail(err) {
+								console.log("定位失败")
+						        that.getqueryShopList();
+							}
+						});
+					},
+					fail: (err) => {
+						 that.getqueryShopList();
+						 
+					}})
+			},
 			quCilck(){
-				this.$refs.popup.open("right")
-				this.popupShow=true;
+				console.log(this.cityName)
+				if(this.cityName){	
+					this.$refs.popup.open("right")
+					//this.popupShow=true;
+					if(this.areaList.length==0){
+						/* uni.showToast({
+							title: '当前城市下无区域，请切换城市查看',
+							icon: 'none',
+							duration: 4000
+						}); */
+						uni.showModal({
+						        title: '提示',
+						        content: '当前城市下无区域，请切换城市查看',
+						        success: function(res) {
+						        if (res.confirm) {
+						            // 执行确认后的操作
+									uni.navigateTo({
+										url:'/pages/subPack/chooseCity?type=1'
+									})
+						        } 
+						        else {
+						            // 执行取消后的操作
+						        }
+						    }
+						})
+					}
+				}else{
+					uni.showModal({
+					        title: '提示',
+					        content: '当前城市暂无门店，请切换城市查看',
+					        success: function(res) {
+					        if (res.confirm) {
+					            // 执行确认后的操作
+								uni.navigateTo({
+									url:'/pages/subPack/chooseCity?type=1'
+								})
+					        } 
+					        else {
+					            // 执行取消后的操作
+					        }
+					    }
+					})
+				}
+				
 			},
 			gocity(){
 				uni.navigateTo({
-					url:'/pages/subPack/chooseCity'
+					url:'/pages/subPack/chooseCity?type=1'
 				})
 			},
 			checkarea(item){
@@ -221,6 +333,8 @@
 				var that=this;
 				var location = this.location.lng + ',' + this.location.lat
 				console.log('location'+location)
+				//location='117.29249484592015,39.026727973090274'
+				
 				uni.request({
 					url: 'https://restapi.amap.com/v3/geocode/regeo',
 					data: {
@@ -234,7 +348,13 @@
 							console.log("城市名称")
 							 console.log(res.data.regeocode.addressComponent.city)
 							// console.log(res.data.pois[0].cityname)
-							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'
@@ -245,8 +365,7 @@
 							
 						}else{
 							console.log("接口获取失败")
-							that.cityCode = ''
-							that.getqueryShopList() //获取全部门店列表
+							uni.hideLoading();
 						}
 						
 					}
@@ -276,6 +395,28 @@
 					this.queryShopList = res.data.shop;
 					this.loading=true;
 					//console.log('list+=', this.queryShopList);
+					if(this.queryShopList.length==0){
+						/* uni.showToast({
+							title: '当前城市暂无门店，请切换城市查看',
+							icon: 'none',
+							duration: 4000
+						}); */
+						uni.showModal({
+						        title: '提示',
+						        content: '当前城市暂无门店，请切换城市查看',
+						        success: function(res) {
+						        if (res.confirm) {
+						            // 执行确认后的操作
+									uni.navigateTo({
+										url:'/pages/subPack/chooseCity?type=1'
+									})
+						        } 
+						        else {
+						            // 执行取消后的操作
+						        }
+						    }
+						})
+					}
 
 				})
 			},
@@ -284,9 +425,15 @@
 				// uni.navigateTo({
 				// 	url: '../shop/shopDetail?id=' + item.shopId
 				// })
-				uni.navigateTo({
-					url:'onlineBooking?naShopId='+item.shopId
-				})
+				if (this.userInfo) {
+					uni.navigateTo({
+						url:'onlineBooking?naShopId='+item.shopId+'naUnionId='+item.unionId
+					})
+				} else {
+					this.authorizShow = true;
+					return false;
+				}
+				
 			}
 		},
 		
@@ -604,4 +751,63 @@
 		color: #999999;
 		font-size: 28rpx;
 	}
+	.authorizBox{
+		width: 100vw;
+		height: 100vh;
+		background: rgba(0, 0, 0, 0.5);
+		position: fixed;
+		top: 0;
+		left: 0;
+	}
+	.authorizCont{
+		margin-top: 30vh;
+		width: 564rpx;
+		height: 408rpx;
+		background: #FFFFFF;
+		border-radius: 24rpx;
+		margin-left: 93rpx;
+		position: relative;
+	}
+	.authorizCloseImg{
+		width: 62rpx;
+		height: 62rpx;
+	}
+	.sqLogoBox{
+		width: 180rpx;
+		height: 180rpx;
+		background: #FFFFFF;
+		border-radius: 90rpx;
+		text-align: center;
+		position: absolute;
+		top: -50rpx;
+		left: 192rpx;
+	}
+	.authorizName{
+		color: #333333;
+		line-height: 42rpx;
+		font-size: 30rpx;
+		text-align: center;
+		padding-top: 58rpx;
+	}
+	.authorizMs{
+		color: #999999;
+		line-height: 36rpx;
+		font-size: 26rpx;
+		width: 452rpx;
+		padding-top: 24rpx;
+		text-align: center;
+		margin-left: 56rpx;
+	}
+	.authorizContbutton{
+		width: 422rpx;
+		height: 88rpx;
+		background: #D53533;
+		border-radius: 44rpx;
+		line-height: 88rpx;
+		text-align: center;
+		font-size:30rpx;
+		color: #FFFFFF;
+		margin-top: 62rpx;
+		margin-left:71rpx;
+	}
 </style>

pages/integral/integralgoodsDetail.vue

@@ -81,7 +81,7 @@
 				<view class="buySHop" @click="ckShop" style="border-bottom: 1px solid #EEEEEE;">
 					<view>服务门店</view>
 					<view class="buyShopRight" >
-						<view v-if="shopInfo.shopId">{{shopInfo.ShopName}}</view>
+						<view v-if="shopInfo.shopId">{{shopInfo.shopName}}</view>
 						<view v-else>请选择</view>
 						<image src="../../static/timg/icon_arrow_right.png" mode="" class="buyShopRightJt"></image>
 					</view>
@@ -194,9 +194,9 @@
 			
 		},
 		onShow() {
-			//this.shopInfo=this.$store.state.ckshopInfo;
+			this.shopInfo=this.$store.state.ckshopInfo;
 			
-			//console.log(this.shopInfo)
+			console.log(this.shopInfo)
 		},
 		onPullDownRefresh(){
 			this.openGoodsDetailById();
@@ -224,7 +224,10 @@
 				this.ckshopShow=false;
 			},
 			ckShop(){
-				this.ckshopShow=true;
+				//this.ckshopShow=true;
+				uni.navigateTo({
+					url:'/pages/shop/ckshopList?goodsId='+this.id+'&type=4'
+				})
 			},
 			ckshop2(item){
 				if(item.qty){
@@ -313,7 +316,7 @@
 				 	data: that.info,
 				 	 success: function () {
 					   uni.navigateTo({
-				 	   	url:'integralConfirm?shopID='+that.shopInfo.shopId+'&shopName='+that.shopInfo.ShopName+'&goodsnum='+that.goodsnum+'&avaIntegral='+that.avaIntegral
+				 	   	url:'integralConfirm?shopID='+that.shopInfo.shopId+'&shopName='+that.shopInfo.shopName+'&goodsnum='+that.goodsnum+'&avaIntegral='+that.avaIntegral
 				 	   })
 				 	 }
 				 }); 

pages/partner/bonus.vue

@@ -59,7 +59,8 @@
 		},
 		onLoad(opt) {
 			this.themeColor = uni.getStorageSync("themeColor");
-			this.userInfo = uni.getStorageSync("userInfo");
+			//this.userInfo = uni.getStorageSync("userInfo");
+			this.userInfo = this.$store.state.userInfo;
 			this.userInfo=this.$store.state.userInfo;
 			this.ext=this.$common.getExtStoreId();
 			if(this.userInfo){

pages/shop/ckshopList.vue

@@ -1,6 +1,17 @@
 <template>
 	<view class="box">
-
+        <view class="regionBox">
+        	<view class="regionLine" @click="gocity">
+        		<view class="regionTxt">{{cityName}}</view>
+        		<image src="../../static/timg/icon_arrow_def@2x.png" mode="" class="jtbelow"></image>
+        	</view>
+        	<view class="regionSx"></view>
+        	<view class="regionLine" @click="quCilck">
+        		<view class="regionTxt">{{areaName}}</view>
+        		<image src="../../static/timg/icon_arrow_def@2x.png" mode="" class="jtbelow"></image>
+        	</view>
+        </view>
+		<view style="height: 90rpx;"></view>
 		<view class="shopline" v-for="(item,index) in queryShopList" @click="goDetail(item)">
 			<view class="shoplineLeft">
 				<image :src="item.photoPath" mode="" class="shopImg" v-if="item.photoPath"></image>
@@ -28,7 +39,20 @@
 		<view class="noMore" v-if="noMoreShow && (queryShopList.length!=0)">没有更多数据</view>
 		<!-- 无数据空白页 -->
 		<nodata v-if="queryShopList.length==0"></nodata>
-
+        <uni-popup ref="popup" type="right" :mask-click="true">
+        	<view class="popup-content">
+        		<scroll-view class="brandList" scroll-y="true">
+        			<!-- :class="{areaActvie:item.area==areaName}" -->
+        			<view v-for="item in areaList" class="areaListLine"
+        			 
+        			 @click="checkarea(item)">
+        			  <span >{{item.area}}</span>
+        			  <image v-if="item.code==area" class="areaCkIcon" src="http://dmsphoto.66km.com.cn/thFiles/0A1DADEA-1807-4ABC-B391-ECC8B1882DA4.png" mode=""></image>
+        			</view>
+        		</scroll-view>
+        	</view>
+        	
+        </uni-popup>
 	</view>
 </template>
 
@@ -48,14 +72,21 @@
 				queryShopList: '',
 				noMoreShow: false,
                 goodsId:'',
-
-
+                cityName:'城市',
+                area:'',
+                cityCode:'',
+				areaName:'区域',
+				loading:false,
+                areaList:'',
+				type:'',
 			}
 		},
 
 		onLoad(opt) {
 			var that = this;
 			this.goodsId=opt.goodsId;
+			this.type=opt.type
+			uni.removeStorageSync('selectCity');
 			uni.authorize({
 				scope: 'scope.userLocation',
 				success() {
@@ -65,8 +96,9 @@
 							console.log(res)
 							that.location.lat = res.latitude
 							that.location.lng = res.longitude
-					
 							that.getqueryShopList() //获取全部门店列表
+					         that.getAdress();
+							//that.getqueryShopList() //获取全部门店列表
 					
 						},
 						fail(err) {
@@ -79,26 +111,155 @@
 					 that.getqueryShopList();
 					 
 				}})
-		},
-		methods: {
 
+		},
+		onShow() {
+			const selectCity = uni.getStorageSync('selectCity');
+			//console.log("onShow")
+			//console.log(selectCity)
+			if(selectCity){
+				this.cityName=selectCity.city
+				this.cityCode=selectCity.code
+				this.areaName='区域'
+				this.area=''
+				this.getAreaList()
+				this.getqueryShopList() //获取门店列表
+			}
 
+		},
+		methods: {
+            quCilck(){
+            	this.$refs.popup.open("right")
+            	this.popupShow=true;
+            },
+            gocity(){
+				if(this.type==4){
+					uni.navigateTo({
+						url:'/pages/subPack/chooseCity?type=4&id='+this.goodsId
+					})
+				}else if(this.type==5){
+					uni.navigateTo({
+						url:'/pages/subPack/chooseCity?type=5&id='+this.goodsId
+					})
+				}else{
+					uni.navigateTo({
+						url:'/pages/subPack/chooseCity?type=2&id='+this.goodsId
+					})
+				}
+            	
+            },
+           checkarea(item){
+				if(this.area==item.code){
+					this.areaName='区域'
+					this.area=''
+					this.getqueryShopList() //获取门店列表
+				}else{
+					this.areaName=item.area
+					this.area=item.code
+					this.getqueryShopList() //获取门店列表
+				}
+				this.$refs.popup.close()
+			},
 			getqueryShopList() {
 				uni.showLoading({
 					title: '加载中'
 				})
-				this.$http('openMall/openStoreList', {
-                    goodsId:this.goodsId,
-					lat: this.location.lat ? this.location.lat : '',
-					lng: this.location.lng ? this.location.lng : '',
-				}, 'GET').then(res => {
+				if(this.type==4){
+					var url='openIntegralMall/getShopList'
+					var	params = {
+							id:this.goodsId,
+							city:this.cityCode,
+							area:this.area
+						}
+				}else if(this.type==5){
+						var url='openHome/queryShopList'
+						var	params = {
+								collectingID:this.goodsId,
+								city:this.cityCode,
+								area:this.area
+							}
+				}
+				else{
+					var url='openMall/openStoreList'
+					var	params = {
+							goodsId:this.goodsId,
+							id:this.goodsId,
+							lat: this.location.lat ? this.location.lat : '',
+							lng: this.location.lng ? this.location.lng : '',
+							city:this.cityCode,
+							area:this.area
+						}
+					
+				}
+				this.$http(url,params, 'GET').then(res => {
 					uni.hideLoading();
 					this.queryShopList = res.data
 					//console.log('list+=', this.queryShopList);
 
 				})
 			},
-
+            getAreaList(){
+				if(this.type==4){
+					var url='openIntegralMall/shop-area-list'
+					var	params = {
+							city:this.cityCode,
+							id:this.goodsId,
+						}
+				}else if(this.type==5){
+					//集客
+					var url='openHome/shop-area-list'
+					var	params = {
+							city:this.cityCode,
+							collectingID:this.goodsId,
+						}
+				}
+				else{
+					var url='openMall/shop-area-list'
+					var	params = {
+							city:this.cityCode,
+							id:this.goodsId,
+						}
+				}
+            	this.$http(url, params, 'GET').then(res => {
+            	    this.areaList=res.data
+            	
+            	})
+            },
+			getAdress(){
+				var that=this;
+				var location = this.location.lng + ',' + this.location.lat
+				console.log('location'+location)
+				uni.request({
+					url: 'https://restapi.amap.com/v3/geocode/regeo',
+					data: {
+						key: '389a059efa3f499d9145eb84b1c3248d',
+						location: location,
+					},
+					dataType: "json",
+					success: (res) => {
+						console.log('定位城市', res);
+						if(res.data.regeocode){
+							console.log("城市名称")
+							 console.log(res.data.regeocode.addressComponent.city)
+							// console.log(res.data.pois[0].cityname)
+							let cityname = res.data.regeocode.addressComponent.city;
+							var cityCode = res.data.regeocode.addressComponent.adcode
+							cityCode = cityCode.slice(0, -2)
+							cityCode = cityCode + '00'
+							this.cityName = cityname
+							this.cityCode = cityCode
+							that.getqueryShopList() //获取全部门店列表
+							that.getAreaList()
+							
+						}else{
+							console.log("接口获取失败")
+							that.cityCode = ''
+							that.getqueryShopList() //获取全部门店列表
+						}
+						
+					}
+				});
+			},
 			goDetail(item) {
 				 this.$store.commit('mutationsckshopInfo', item)	
 				uni.navigateBack({
@@ -126,7 +287,7 @@
 	.box {
 		min-height: 100vh;
 		background-color: #F4F5F7;
-		padding-top: 20rpx;
+		/* padding-top: 20rpx; */
 		padding-bottom: 60rpx;
 	}
 
@@ -362,4 +523,49 @@
 		color: #999999;
 		font-size: 28rpx;
 	}
+	.regionSx{
+		width: 2rpx;height: 33rpx;background:#EEEEEE;
+	}
+	.regionLine{
+		display: flex;justify-content: center;font-size: 26rpx;
+		width: 370rpx;line-height: 33rpx;color: #3C3C3C;
+	}
+	.regionBox{
+		display: flex;
+		justify-content: center;
+		background: #FFFFFF;
+		padding: 20rpx 0;
+		margin-bottom: 20rpx;
+		position: fixed;
+		width: 100vw;
+		top: 0;left: 0;
+	}
+	.jtbelow{
+		width: 14rpx;height: 7rpx;
+		margin-left: 10rpx;margin-top: 10rpx;
+	}
+	.popup-content{
+		width: 590rpx;
+		background: #FFFFFF;
+		height: 100vh;
+	}
+	.brandList{
+		height:99vh;
+	}
+	.areaListLine{
+		padding:30rpx 24rpx;
+		color: #666666;
+		font-size: 28rpx;
+		border-bottom: 1px solid #eaeaea;
+		display: flex;
+		justify-content: space-between;
+		line-height: 28rpx;
+	}
+	.areaActvie{
+		background: #F19D01;
+		color: #FFFFFF;
+	}
+	.areaCkIcon{
+		width: 38rpx;height: 28rpx;
+	}
 </style>

pages/shop/wp.vue

@@ -59,6 +59,7 @@
 			//this.canvasW = uni.getSystemInfoSync().windowWidth
 			//this.canvasH = this.calculateCanvasHeight()
 			this.avatar=opt.img;
+			//this.avatar='http://dmsphoto.66km.com.cn/marketing/B7511CA2-CC50-4F2C-867D-DB15783CE3C5.jpg';
 			console.log(this.avatar.slice(0,5))
 			/* if(this.avatar.slice(0,5)=='https'){
 				
@@ -179,7 +180,7 @@
 			},
 			async toDrawCanvas() {
 				const padding = uni.upx2px(34)
-				const cardHeight = uni.upx2px(380)
+				const cardHeight = uni.upx2px(420)
 				const cw = this.canvasW - 2 * padding
                const r = uni.upx2px(12)
 				let ctx = uni.createCanvasContext('mini_poster', this)
@@ -200,7 +201,8 @@
 				this.drawCard(ctx, padding, padding, cw, cardHeight)
 				// draw avatar
 				const av = uni.upx2px(540)
-				const topimgh = uni.upx2px(317)
+				const topimgh = uni.upx2px(360)
+				//const topimgh ='auto'
 				//console.log(av)
 				//console.log(topimgh)
 				const hi = await this.downloadImage(this.avatar)
@@ -273,7 +275,7 @@
 				// draw company
 				//let vp = y + uni.upx2px(45)
 				//const hp = x + uni.upx2px(52)
-				let vp =  uni.upx2px(400)
+				let vp =  uni.upx2px(440)
 				
 				var hp = uni.upx2px(36)
 				ctx.setTextBaseline('center')

pages/subPack/chooseCity.vue

@@ -51,11 +51,13 @@
 					lng: '',
 					lat: '',
 				},
-				
-
+				type:'',
+                id:'',
 			}
 		},
-		onLoad() {
+		onLoad(opt) {
+			this.type=opt.type
+			this.id=opt.id
 			this.getData();
 		},
 		onShow() {
@@ -147,11 +149,30 @@
 				uni.showLoading({
 					title: '加载中'
 				})
-
-				let url = 'opencarOwnerHome/shop-city-list',
-					params = {
+				var	params = {
 						
 					}
+                if(this.type==2){
+					//项目商品下单
+					var url = 'openMall/shop-city-list'
+					params.id=this.id
+				}else if(this.type==3){
+					//板金喷漆
+					var url = 'openSheetMetalSprayPaint/shop-city-list'
+				}else if(this.type==1){
+					//门店列表
+					var url = 'opencarOwnerHome/shop-city-list'
+				}else if(this.type==4){
+					//积分商城
+					var url = 'openIntegralMall/shop-city-list'
+					params.id=this.id
+				}else if(this.type==5){
+					//集客
+					var url = 'openHome/shop-city-list'
+					params.collectingID=this.id
+				}
+				
+				
 				this.$http(url, params, 'GET').then(res => {
 					uni.hideLoading()
 
@@ -337,8 +358,9 @@
 		font-weight: bold;
 		color: #999999;
 		width: 4%;
-		margin: 20rpx 0;
+		margin: 2rpx 0;
 		text-align: center;
+		padding: 10rpx 10rpx 10rpx 15rpx;
 	}
 
 	.select {

pages/subPack/rescueOrderOrderDetail.vue

@@ -102,7 +102,7 @@
 				<view class="informationTxt">起点：</view>
 				<view class="informationNum">{{orderData.openShopHelpSheet.hStartAddress}}</view>
 			</view>
-			<view class="informationLine">
+			<view class="informationLine" v-if="orderData.openShopHelpSheet.helpType==2">
 				<view class="informationTxt">终点：</view>
 				<view class="informationNum">{{orderData.openShopHelpSheet.hEndAddress}}</view>
 			</view>

pages/user/historyDetail.vue

@@ -338,7 +338,9 @@
 						if (item.fieldValue == 'ReceiptsMoney') {
 							this.ReceiptsMoney = item.isChecked
 						}
-
+                        if (item.fieldValue == 'TotalDiscountMoney') {
+                        	this.TotalDiscountMoney = item.isChecked
+                        }
 
 
 					})

pages/user/historySpend.vue

@@ -63,11 +63,17 @@
 
 			<view class="shopName">{{item.ShopName}}</view>
 			
-			<view class="itemN" v-if="item.listItems.length != 0">
+			<!-- <view class="itemN" v-if="item.listItems.length != 0">
 				<view class="itemContent" v-if="item.listItems.length != 0" v-for="(v,i) in item.listItems">{{v.ItemName}},</view>
 			</view>
 			<view class="itemN" v-if="item.listParts.length != 0">
 				<view class="itemContent" v-if="item.listParts.length != 0" v-for="(v,i) in item.listParts">{{v.GoodsName}},</view>
+			</view> -->
+			<view class="itemN" v-if="item.ItemName">
+				<view class="itemContent" >{{item.ItemName}}</view>
+			</view>
+			<view class="itemN" v-if="item.GoodsName">
+				<view class="itemContent" >{{item.GoodsName}}</view>
 			</view>
 			
 			<view v-if="((item.PayState == 2) && (appraise == true) && ((item.lastDay <= 30 && item.EvaluateState == 0) || item.EvaluateState == 1))" class="bottom">
@@ -75,11 +81,45 @@
 				<view v-if="item.EvaluateState == 1" @click.stop="goAppraiseDetail(item)" class="kan">查看评价</view>
 			</view>
 		</view>
+		<view class="itemHistory" v-for="(item,index) in oldlist" :key="index" @click="goDetail2(item)">
+			<view class="topBox">
+				<view class="dan">{{item.Code}}</view>
+				
+				<!-- SheetType单据类型(1维修单 2销售单3洗车单4销售退货) -->
+				
+				<view class="stateBox" >
+					<view class="danState2">{{item.CheckoutState?item.CheckoutState:''}}</view>
+				</view>
+				
+			</view>
+			
+			
+			<view class="carPlate">
+				<view class="plateBox">
+					<view class="plate">{{item.PlateNumber}}</view>
+					
+					<view class="mileage" v-if="item.CurrentMileage>0">{{item.CurrentMileage}}km</view>
+				</view>
+				<view v-if="ReceiptsMoney&&item.CheckoutMoney" class="price"><span style="font-size: 22rpx;">￥</span>{{item.CheckoutMoney}}</view>
+			</view>
+			<view class="time">{{item.time}}</view>
+		
+			<view class="shopName">{{item.ShopName}}</view>
+			<view class="itemN" v-if="item.ItemName">
+				<view class="itemContent" >{{item.ItemName}}</view>
+			</view>
+			<view class="itemN" v-if="item.GoodsName">
+				<view class="itemContent" >{{item.GoodsName}}</view>
+			</view>
+			
+			
+		</view>
+		
 
 		<!-- 上拉 加载更多 -->
 		<view class="noMore" v-if="noMoreShow && (itemData.length!=0)">没有更多数据</view>
 		<!-- 无数据空白页 -->
-		<nodata v-if="itemData.length==0"></nodata>
+		<nodata v-if="itemData.length==0&&oldlist.length==0"></nodata>
 
 	</view>
 </template>
@@ -96,6 +136,7 @@
 			return {
 				page: 1,
 				itemData: [],
+				oldlist:[],
 				noMoreShow: false,
 				appraise:false,
 				ReceiptsMoney:false,//支付金额
@@ -174,8 +215,14 @@
 				})
 			},
 			goDetail(item) {
-				uni.navigateTo({
+				 uni.navigateTo({
 					url: 'historyDetail?id=' + item.id + '&lastDay=' + item.lastDay
+				}) 
+
+			},
+			goDetail2(item){
+				uni.navigateTo({
+					url: '../subPack/oldhistoryDetail?id=' + item.id + '&lastDay=' + item.lastDay
 				})
 			},
 			myOrderCoupon() {
@@ -183,7 +230,7 @@
 				uni.showLoading({
 					title: '加载中'
 				})
-				this.$http('openweiXinCardInfoController/queryConsumptionList', {
+				/* this.$http('openweiXinCardInfoController/queryConsumptionList', {
                      plateNumber:this.plateNumber
 					// page: this.page,
 					// limit: 10,
@@ -210,6 +257,21 @@
 					
 
 
+				}) */
+				this.$http('openweiXinCardInfoController/queryConsumptionListV2', {
+				     plateNumber:this.plateNumber
+					// page: this.page,
+					// limit: 10,
+				}, 'POST').then(res => {
+					uni.hideLoading();
+					var list = res.data.list
+					this.oldlist=res.data.oldlist
+					this.itemData = list
+					if (list.length < 10) {
+						this.noMoreShow = true
+					} else {
+						this.noMoreShow = false
+					}
 				})
 			},
 			//时间对比

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,7 +240,7 @@
 				</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>
@@ -350,6 +350,10 @@
 			</view> -->
 
 		</view>
+		<view class="rowBoxBg">
+			<view class="exit" @click="exit">退出登录</view>
+		</view>
+		
 		<view class="releaseVersion">版本号：{{release_version}}</view>
 
 		<!-- <view class="signOut" @click="signOut">退出登录</view> -->
@@ -418,6 +422,7 @@
 
 			this.ext = this.$common.getExtStoreId();
 			this.themeColor = uni.getStorageSync("themeColor");
+			console.log("themeColor=="+this.themeColor)
 			if (this.themeColor) {
 				if (this.themeColor == '6F2BE8') {
 					var backgroundImage = '/static/tabimg/me6F2BE8.png'
@@ -460,17 +465,40 @@
 				this.queryMyDetail();
 			} else {
 				//console.log("授权")
-				//this.authorizShow = true;
+				this.authorizShow = true;
 			}
 			if (wxOpenData) {
 
 				this.uid = wxOpenData.loginInfo.uid;
 			}
-			
+			//this.themeColor = uni.getStorageSync("themeColor");
 
 
 		},
 		methods: {
+			exit(){
+				var that=this;
+				uni.showModal({
+				  title: '提示',
+				  content: '是否退出登录',
+				  success(res) {
+				    if (res.confirm) {
+						uni.clearStorageSync()
+						that.$store.commit('mutationsuserInfo', '')
+						that.$store.commit('mutationscarInfo', '')
+						that.$http('miniApp2/sys/logout', {
+							
+						}, 'GET').then(res => {
+						  uni.reLaunch({
+						  	 url: '../index/index'
+						  });
+						})
+						 
+				    }
+				  }
+				});
+				
+			},
 			makePhoneCall(tel){
 				uni.makePhoneCall({
 				  phoneNumber: tel,
@@ -510,9 +538,15 @@
 				})
 			},
 			useremind(){
-				uni.navigateTo({
-					url: '../integral/integral'
-				})
+				if (this.userInfo) {
+					uni.navigateTo({
+						url: '../integral/integral'
+					})
+				} else {
+					this.authorizShow = true;
+					return false;
+				}
+			
 			},
 			gonavigateaboutUS(){
 				uni.navigateTo({
@@ -526,11 +560,14 @@
 				})
 			},
 			getVersionInfo() {
-				this.$http('miniApp2/sys/getVersionInfo', {
+				this.$http('miniApp2/sys/getVersionInfov2', {
 					appId: this.ext.appId,
 
 				}, 'POST').then(res => {
-					this.release_version = res.data.release_version
+					if( res.data){
+						this.release_version = res.data
+					}
+					
 				})
 			},
 			updateUserInfo() {
@@ -639,14 +676,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() {
@@ -731,6 +768,16 @@
 </script>
 
 <style scoped>
+.exit{
+	background: #FFFFFF;
+	line-height: 100rpx;
+	margin-top: 20rpx;
+	font-size: 28rpx;
+	font-family: PingFang;
+	font-weight: 500;
+	color: #ED2323;
+	text-align: center;
+}
 .cardNameIcon{
 	width: 30rpx;height: 30rpx;
 }

utils/common.js

@@ -12,8 +12,15 @@ const isUserId = function() {
 const automaticlogin = function() {
 	//console.log($store.state.userInfo)
 	var that=this;
-	const extConfig = uni.getExtConfigSync();
-	//console.log(extConfig)
+	var extConfig = uni.getExtConfigSync();
+	/* extConfig={
+		"shopId": "23173848-292E-4AEA-B590-73AC9A763F1D",
+		"url":"https://store-api.qdbtl.cn/",
+		"unionId":"C3748B46-B778-40AA-8C60-A9B0F2FA23A7",
+		"appId":"wxc023ff04deb28f2d"
+	} */
+	console.log("automaticlogin")
+	console.log(extConfig)
 	
 	 return new Promise((resolve, reject) => {
 		 if($store.state.userInfo){
@@ -73,12 +80,18 @@ 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"
 	      } */
+		  /* extConfig={
+		  "shopId": "E37BB296-5A08-4534-859D-B351BA611AF9",
+		  "url":"https://apidms.66km.com",
+		  "unionId":"EF7981B9-2D1D-4006-9C0A-66CE7177134D",
+		  "appId":"wx2c6f04c0dcd15984"
+		  } */
 		console.log(extConfig,'extJson对象');
 		//return extConfig[type];
 		return extConfig

utils/request.js

@@ -9,15 +9,15 @@ import $store from '../store'
 const extConfig = uni.getExtConfigSync();		
 console.log(extConfig)
 const baseUrl=extConfig.url+'/'
-//const baseUrl='http://192.168.0.127:20189/'
-//const baseUrl='http://192.168.0.174:20187/'
-//const baseUrl='http://dms.66km.com.cn/'
-
-//wx2c6f04c0dcd15984正式  wx33053a645546ec31 E37BB296-5A08-4534-859D-B351BA611AF9 EEADACCD-8A19-499D-8AD7-6975D2C93243 
+//const baseUrl='http://192.168.0.147:20187/'
+//const baseUrl='https://store-api.qdbtl.cn/'
+//const baseUrl='https://apidms.66km.com/'
+//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) => {