bug修改

pages/index/discountCard.vue

@@ -327,7 +327,7 @@
 		margin: 20rpx 24rpx 0rpx;
 		background-color: #FFFFFF;
 		border-radius: 10rpx;
-		padding: 40rpx 20rpx 20rpx;
+		padding: 24rpx 20rpx 20rpx;
 		    display: flex;
 	}
 	.leftB{
@@ -389,7 +389,7 @@
 		font-size: 24rpx;
 		
 		color: #666666;
-		margin-top: 15rpx;
+		margin-top: 10rpx;
 	}
 	.itemBottom {
 		display: flex;

pages/index/shopList.vue

@@ -6,15 +6,16 @@
 				<image src="../../static/timg/icon_arrow_def@2x.png" mode="" class="jtbelow"></image>
 			</view>
 			<view class="regionSx"></view>
-			<view class="regionLine">
-				<picker @change="bindPickerChange" :value="index" :range="areaList" range-key='area'>
-					<view class="regionTxt">{{areaName}}</view>
-				</picker>
-				
+			<view class="regionLine" @click="quCilck">
+				<!-- <picker @change="bindPickerChange" :value="index" :range="areaList" range-key='area' @cancel="cancelHandling">
+					
+				</picker> -->
+				<view class="regionTxt">{{areaName}}</view>
 				<image src="../../static/timg/icon_arrow_def@2x.png" mode="" class="jtbelow"></image>
 			</view>
 		</view>
-		<view class="shopline" v-for="(item,index) in queryShopList" >
+		<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>
 				<image src="../../static/timg/noimg.png" mode="" class="shopImg" v-else></image>
@@ -29,7 +30,7 @@
 							<view class="brands" v-for="(v,index2) in item.brands.split(',')">{{v}}</view>
 						</view>
 					</view>
-					<view class="yuyuBtnBox" @click="goDetail(item)">
+					<view class="yuyuBtnBox" >
 						<view>预约</view>
 						<image style="width: 21rpx;height: 21rpx;margin-top: 4rpx;margin-left: 5rpx;" src="http://dmsphoto.66km.com.cn/thFiles/1D60717A-DC1D-43BC-BBFE-EE0FAFD1A470.png" mode=""></image>
 					</view>
@@ -43,15 +44,15 @@
 				<view class="shopBottomLeft">
 
 					<span class="shopaddress"
-						v-if="item.address">{{item.provinceName}}{{item.cityName}}{{item.areaName}}{{item.address}}</span>
+						v-if="item.address">{{item.address}}</span>
 					<span v-if="item.distance&&item.distance!= '0.00'">{{item.distance}}km</span>
 				</view>
 				<view class="shopdhBox">
-				  <view class="shopcall" @click="makePhoneCall(item.mobilePhone)">
+				  <view class="shopcall" @click.stop="makePhoneCall(item.mobilePhone)">
 					  <image class="shopcallIcon" src="http://dmsphoto.66km.com.cn/thFiles/AB063613-7B7A-4BD4-AF43-9ECC082FF5C6.png" mode=""></image>
-				      <view class="shopcallTxt">{{item.mobilePhone}}</view>
+				      <view class="shopcallTxt">联系电话</view>
 				  </view>
-				  <view class="shopcall" style="padding-left: 65rpx;" @click="goMap(item)">
+				  <view class="shopcall" style="padding-left: 65rpx;" @click.stop="goMap(item)">
 				  	  <image class="shopcallIcon" src="http://dmsphoto.66km.com.cn/thFiles/5479ED98-61D3-41CB-8080-889E851FF6C0.png" mode=""></image>
 				      <view class="shopcallTxt">一键导航</view>
 				  </view>
@@ -68,7 +69,19 @@
 		<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">
+					<view v-for="item in areaList" class="areaListLine"
+					 :class="{areaActvie:item.area==areaName}"
+					 @click="checkarea(item)">
+					  <span >{{item.area}}</span>
+					<!--  <image src="" mode=""></image> -->
+					</view>
+				</scroll-view>
+			</view>
+			
+		</uni-popup>
 	</view>
 </template>
 
@@ -126,17 +139,38 @@
 			}
 		},
 		methods: {
+			quCilck(){
+				this.$refs.popup.open("right")
+				this.popupShow=true;
+			},
 			gocity(){
 				uni.navigateTo({
 					url:'/pages/subPack/chooseCity'
 				})
 			},
+			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()
+			},
 			bindPickerChange(e){
 				//console.log(e)
 				this.areaName=this.areaList[e.detail.value].area
 				this.area=this.areaList[e.detail.value].code
 				this.getqueryShopList() //获取门店列表
 			},
+			cancelHandling(){
+				this.areaName='区域'
+				this.area=''
+				this.getqueryShopList() //获取门店列表
+			},
             makePhoneCall(num){
 				uni.makePhoneCall({
 					phoneNumber:num
@@ -247,6 +281,25 @@
 </script>
 
 <style scoped>
+	.popup-content{
+		width: 590rpx;
+		background: #FFFFFF;
+		height: 100vh;
+	}
+	.brandList{
+		height:99vh;
+	}
+	.areaListLine{
+		padding: 20rpx;
+		color: #666666;
+		font-size: 28rpx;
+		border-bottom: 1px solid #eaeaea;
+	}
+	.areaActvie{
+		background: #F19D01;
+		color: #FFFFFF;
+	}
+	
 .jtbelow{
 	width: 14rpx;height: 7rpx;
 	margin-left: 10rpx;margin-top: 10rpx;
@@ -264,6 +317,9 @@
 	background: #FFFFFF;
 	padding: 20rpx 0;
 	margin-bottom: 20rpx;
+	position: fixed;
+	width: 100vw;
+	top: 0;left: 0;
 }
 	.box {
 		min-height: 100vh;
@@ -289,6 +345,8 @@
 		    color: #FF8113;
 		    align-items: center;
 		    justify-items: center;
+		/* border-left: 1px solid #EEEEEE;
+		 padding-left: 20rpx; */
 	}
 
 	.shopline {

pages/shop/wp.vue

@@ -38,7 +38,8 @@
 				mpWxQr2:'',
 				mpWxQr3:'',
 				mpWxQr4:'',
-				ptImg:'http://dmsphoto.66km.com.cn/thFiles/18415D1D-563A-4488-9163-0A7D59A99961.png',
+				//ptImg:'http://dmsphoto.66km.com.cn/thFiles/18415D1D-563A-4488-9163-0A7D59A99961.png',
+				ptImg:'https://dmsimg.66km.com/marketing//accompany/4E6F0009-EC54-4387-8DDC-2B7389065B49.png',
 				ptImg2:'',
 				groupType:'',
 			}
@@ -213,13 +214,13 @@
 				if(this.groupType){
 					var ptw=uni.upx2px(60)
 					var pth=uni.upx2px(32)
-					var ptIcon=await this.downloadImage(this.ptImg);
+					 var ptIcon=await this.downloadImage(this.ptImg);
 					if (ptIcon.tempFilePath) {
 						const x =  uni.upx2px(30) 
 						const y =  uni.upx2px(370)
 						this.drawRoundRectAvatar(ctx, x, y, ptw, pth, r, ptIcon.tempFilePath)
 						
-					}
+					} 
 				}
 				
 				// draw hello info

pages/subPack/rescueOrderOrderDetail.vue

@@ -95,12 +95,9 @@
 			</view>
 			<view class="informationLine">
 				<view class="informationTxt">救援联系人：</view>
-				<view class="informationNum">{{orderData.openShopHelpSheet.customerName}}</view>
-			</view>
-			<view class="informationLine" v-if="orderData.openShopHelpSheet.mobilePhone">
-				<view class="informationTxt">手机号：</view>
-				<view class="informationNum">{{orderData.openShopHelpSheet.mobilePhone}}</view>
+				<view class="informationNum">{{orderData.openShopHelpSheet.customerName}}/{{orderData.openShopHelpSheet.mobilePhone}}</view>
 			</view>
+			
 			<view class="informationLine" >
 				<view class="informationTxt">起点：</view>
 				<view class="informationNum">{{orderData.openShopHelpSheet.hStartAddress}}</view>
@@ -116,14 +113,16 @@
 		<!-- 支付信息 -->
 		<view class="information">
 			<view class="detailedTitle">订单信息</view>
+			
 			<view class="informationLine">
 				<view class="informationTxt">下单时间：</view>
 				<view class="informationNum" >{{orderData.openShopHelpSheet.createTime}}</view>
 			</view>
 			<view class="informationLine">
 				<view class="informationTxt">下单人：</view>
-				<view class="informationNum" >{{orderData.openUser.nickName|| '未知'}}</view>
+				<view class="informationNum" >{{orderData.openUser.nickName|| '未知'}}/{{orderData.openShopHelpSheet.mobilePhone}}</view>
 			</view>
+			
 			<view class="informationLine" v-if="orderData.openShopHelpSheet.confirmTime">
 				<view class="informationTxt">确认时间：</view>
 				<view class="informationNum" >{{orderData.openShopHelpSheet.confirmTime}}</view>
@@ -132,10 +131,12 @@
 				<view class="informationTxt">确认人：</view>
 				<view class="informationNum" >{{orderData.openShopHelpSheet.confirmOperator}}</view>
 			</view>
-			<view class="informationLine" v-if="orderData.openShopHelpSheet.goingTime">
-				<view class="informationTxt">出发时间：</view>
-				<view class="informationNum" >{{orderData.openShopHelpSheet.goingTime}}</view>
+			<view class="informationLine" v-if="orderData.openShopHelpSheet.evaluateTime">
+				<view class="informationTxt">评价时间：</view>
+				<view class="informationNum">{{orderData.openShopHelpSheet.evaluateTime}}</view>
 			</view>
+				
+			
 			<view class="informationLine" v-if="orderData.openShopHelpSheet.goingOperator">
 				<view class="informationTxt">出发人：</view>
 				<view class="informationNum" >{{orderData.openShopHelpSheet.goingOperator}}</view>
@@ -152,14 +153,14 @@
 				<view class="informationTxt">完成备注：</view>
 				<view class="informationNum" >{{orderData.openShopHelpSheet.finishComment}}</view>
 			</view>
-			<view class="informationLine" v-if="orderData.openShopHelpSheet.evaluateTime">
-				<view class="informationTxt">评价时间：</view>
-				<view class="informationNum">{{orderData.openShopHelpSheet.evaluateTime}}</view>
-			</view>
-			<view class="informationLine" v-if="orderData.openShopHelpSheet.evaluateComment">
-				<view class="informationTxt">评价内容：</view>
-				<view class="informationNum">{{orderData.openShopHelpSheet.evaluateComment}}</view>
-			</view>
+		<view class="informationLine" v-if="orderData.openShopHelpSheet.evaluateComment">
+			<view class="informationTxt">评价内容：</view>
+			<view class="informationNum">{{orderData.openShopHelpSheet.evaluateComment}}</view>
+		</view>
+		<view class="informationLine" v-if="orderData.openShopHelpSheet.goingTime">
+			<view class="informationTxt">出发时间：</view>
+			<view class="informationNum" >{{orderData.openShopHelpSheet.goingTime}}</view>
+		</view>
 			<view class="informationLine" v-if="orderData.openShopHelpSheet.cancelTime">
 				<view class="informationTxt">取消时间：</view>
 				<view class="informationNum">{{orderData.openShopHelpSheet.cancelTime}}</view>
@@ -179,7 +180,7 @@
 
 		<view style="height: 50rpx;background-color: #F4F5F7;"></view>
 
-		<view class="bottom">
+		<view class="bottom"  v-if="orderData.openShopHelpSheet.sheetState != 5">
            <!-- <view class="cancel" @click="cancelBespeak" v-if="orderData.data.groupType==1">取消订单</view> -->
 			<view class="cancel" v-if="orderData.openShopHelpSheet.sheetState == 0" @click="cancelBespeak" >取消订单</view>
 		<!--  -->	<view class="defer" v-if="orderData.openShopHelpSheet.sheetState == 3||orderData.openShopHelpSheet.sheetState == 1||orderData.openShopHelpSheet.sheetState == 2"  :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}" @click="orderevaluate">评价</view>
@@ -630,7 +631,7 @@
 							}
 						})
 					}
-					this.clock()
+					//this.clock()
 					console.log('可用券码--',this.quanMaList);
 					
 				})

pages/user/checkReport.vue

@@ -1,11 +1,16 @@
 <template>
 	<view class="box">
 	   <homenav :iStatusBarHeight="iStatusBarHeight" :title="'车检报告'" ></homenav>
-	   <view class="screenBox">
-		   <picker @change="bindPickerChange" :value="index" :range="array">
-				<view class="screenName">{{array[index]}}</view>
-			</picker>
-	   </view>
+	  <view class="screenBox">
+	  	<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+	  	<view style="height: 44px;"></view>
+	     <picker @change="bindPickerChange" :value="index" :range="array">
+	  		<view class="screenName"> <span>车牌号：{{array[index]}}</span> 
+	  		  <image src="../../static/timg/CS.png" mode="" class="jtImg"></image>
+	  		</view>
+	  	</picker>
+	  </view>
+	  <view style="height: 90rpx;"></view>
 		<view class="itemHistory" v-for="(item,index) in itemData" :key="index" @click="goDetail(item.id)">
 			<view class="time">{{item.CreateTime}}</view>
 			<view class="carPlate">
@@ -147,12 +152,20 @@
 		background-color: #F4F5F7;
 		padding-top: 20rpx;
 	}
+	.jtImg{
+		width: 24rpx;height: 24rpx;
+	}
 	.screenBox{
 		background: #FFFFFF;
 		margin-bottom: 20rpx;
+		position: fixed;
+		width: 100vw;
+		top: 0;left: 0;
 	}
      .screenName{
 		 padding: 24rpx;font-size: 28rpx;
+		 display: flex;
+		 justify-content: space-between;
 	 }
 	.itemHistory {
 		margin: 0rpx 24rpx 20rpx;

pages/user/historySpend.vue

@@ -2,10 +2,15 @@
 	<view class="box">
 		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'历史消费'" ></homenav>
 		<view class="screenBox">
+			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			<view style="height: 44px;"></view>
 		   <picker @change="bindPickerChange" :value="index" :range="array">
-				<view class="screenName">{{array[index]}}</view>
+				<view class="screenName"> <span>车牌号：{{array[index]}}</span> 
+				  <image src="../../static/timg/CS.png" mode="" class="jtImg"></image>
+				</view>
 			</picker>
 		</view>
+		<view style="height: 90rpx;"></view>
 		<view class="itemHistory" v-for="(item,index) in itemData" :key="index" @click="goDetail(item)">
 			<view class="topBox">
 				<view class="dan">{{item.code}}</view>
@@ -289,19 +294,26 @@
 		padding-top: 20rpx;
 		
 	}
+.jtImg{
+	width: 24rpx;height: 24rpx;
+}
 .screenBox{
 		background: #FFFFFF;
 		margin-bottom: 20rpx;
+		position: fixed;
+		width: 100vw;
+		top: 0;left: 0;
 	}
      .screenName{
 		 padding: 24rpx;font-size: 28rpx;
+		     display: flex;
+		     justify-content: space-between;
 	 }
 	.itemHistory {
 		margin: 0rpx 24rpx 20rpx;
 		padding: 20rpx;
 		background-color: #FFFFFF;
 		border-radius: 10rpx;
-
 	}
 	.topBox{
 		display: flex;