1.改bug

pages.json

@@ -293,7 +293,16 @@
                 "enablePullDownRefresh": false
             }
             
-        }
+        },
+		{
+		    "path" : "pages/module/handbook",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "保养手册",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		}
     ],
 	"tabBar": {
 		"color": "#8a8a8a",

pages/changeStore/changeStoreDetail.vue

@@ -87,7 +87,7 @@
 			</view>
 			<view class="store">
 				<image src="../../static/img/icon_coordinate.png" mode="" class="leftIcon2"></image>
-				<view class="address">{{detailData.oldShopAddress}}</view>
+				<view class="address" v-if="detailData.oldShopAddress">{{detailData.oldShopAddress}}</view>
 			</view>
 		</view>
 
@@ -99,7 +99,7 @@
 			</view>
 			<view class="store">
 				<image src="../../static/img/icon_coordinate.png" mode="" class="leftIcon2"></image>
-				<view class="address">{{detailData.newShopAddress}}</view>
+				<view class="address" v-if="detailData.newShopAddress">{{detailData.newShopAddress}}</view>
 			</view>
 		</view>
 
@@ -204,7 +204,7 @@
 						// 拒绝
 						this.state = -1;
 					}
-					if (this.detailData.cancelType != null) {
+					if (this.detailData.cancelType == 1) {
 						// 关闭
 						this.state = 0;
 					}

pages/changeStore/changeStoreList.vue

@@ -3,7 +3,9 @@
 		<view class="topView">
 			<!-- tab -->
 			<view class="tab">
-				<view class="tabLine" :class="{tabActive:tabIndex==1}" @click="tabClick(1)">待处理</view>
+				<view class="tabLine" :class="{tabActive:tabIndex==1}" @click="tabClick(1)">
+					<view class="orderNum" v-show="num>0">{{num}}</view>
+					待处理</view>
 				<view class="tabLine" :class="{tabActive:tabIndex==2}" @click="tabClick(2)">申请记录</view>
 			</view>
 			<!-- 搜索 -->
@@ -65,7 +67,8 @@
 				page: 1,
 				tabIndex: 1,
 				itemData:[],
-				noMoreShow: false,
+				noMoreShow: false,
+				num:'',
 			}
 		},
 		onLoad() {
@@ -110,7 +113,7 @@
 				this.$http(url, params, 'GET').then(res => {
 					uni.hideLoading()
 					var list = res.data.Items
-			
+					this.num = res.data.changeState
 					// 处理 undefined和null转为空白字符串
 					list.forEach((item, index) => {
 						for (const key in item) {
@@ -184,7 +187,18 @@
 		color: #FF4F00;
 		border-bottom: 4rpx solid #FF4F00;
 	}
-
+	.orderNum {
+		line-height: 26rpx;
+		background: #FF4F00;
+		padding: 0 8rpx;
+		border-radius: 13rpx;
+		color: #FFFFFF;
+		font-size: 20rpx;
+		position: absolute;
+		top: 10rpx;
+		right: -10rpx;
+		z-index: 11;
+	}
 	.searchBoxBg {
 		
 		width: 100%;

pages/iPhone/addphone.vue

@@ -24,7 +24,7 @@
 					 <switch :checked="isDefault" @change="Default" color="#FF4F00" style="transform:scale(0.9)"/>
 				</view>
 			  </view>
-			  <view class="phoneLine3" @click="delPhone">
+			  <view class="phoneLine3" @click="delPhone" v-if="id">
 				  删除该联系人
 			  </view>
 		  </view>

pages/index/addCar.vue

@@ -22,7 +22,7 @@
 
 			<view class="mesView">
 				<view class="leftTitle">购车时间</view>
-				<picker class="timeBtn" @change="bindChange" mode="date">
+				<picker class="timeBtn" @change="bindChange" mode="date" :end="currentdate">
 					<view class="uni-input selectColor" v-if="time">{{time}}</view>
 					<view class="uni-input noSelectColor" v-else>请选择您的购车时间</view>
 				</picker>
@@ -68,10 +68,12 @@
 				mileage: '',
 				carId: '',
 				isEditCar: false,
+				currentdate:'',
 
 			}
 		},
 		onLoad(opt) {
+			this.getNowFormatDate();	
 			var carModelInfo = uni.getStorageSync("carModelInfo");
 			if (carModelInfo) {
 				this.carModelInfo = carModelInfo;
@@ -80,6 +82,9 @@
 			this.isEditCar = opt.isEditCar
 			this.carId = opt.id
 			if (this.isEditCar == 'true') {
+				uni.setNavigationBarTitle({
+					title:'编辑爱车'
+				})
 				this.getEditData()
 			}
 		},
@@ -90,6 +95,23 @@
 			}
 		},
 		methods: {
+			
+			getNowFormatDate(){
+				
+				var date = new Date();
+				var seperator1 = "-";
+				var year = date.getFullYear();
+				var month = date.getMonth() + 1;
+				var day = date.getDate();
+				if (month >= 1 && month <= 9) {
+					month = "0" + month;
+				}
+				if (day >= 0 && day <= 9) {
+					day = "0" + day;
+				}
+				var currentdate = year + seperator1 + month + seperator1 + day;
+				 this.currentdate = currentdate;
+			},
 			getEditData() {
 				uni.showLoading({});
 				var carModelInfo = {
@@ -115,7 +137,7 @@
 					// 展示时
 					this.plateNo = res.data.plateNumber;
 					carModelInfo.title = res.data.carModel;
-					this.time = res.data.createTime.slice(0,res.data.createTime.length-8);
+					this.time = res.data.acarTime.slice(0,res.data.createTime.length-8);
 					this.mileage = res.data.milage;
 
 					this.carModelInfo = carModelInfo;
@@ -196,7 +218,7 @@
 					nLevelID: this.carModelInfo.carModelInfo.nLevelID,
 					engineType: this.carModelInfo.carModelInfo.engineModel,
 					brandLogo: this.carModelInfo.carModelInfo.logo,
-					AcarTime: this.time,
+					acarTime: this.time,
 					guidePrice: this.carModelInfo.carModelInfo.guidePrice,
 				}, 'POST').then(res => {
 					uni.hideLoading();
@@ -238,7 +260,7 @@
 					nLevelID: this.carModelInfo.carModelInfo.nLevelID,
 					engineType: this.carModelInfo.carModelInfo.engineModel,
 					brandLogo: this.carModelInfo.carModelInfo.logo,
-					AcarTime: this.time,
+					acarTime: this.time,
 					guidePrice: this.carModelInfo.carModelInfo.guidePrice,
 					
 					id: this.carId,

pages/index/index.vue

@@ -232,6 +232,14 @@
 					
 					if (cardata) {
 						this.memberCar = cardata
+						if (cardata) {
+							this.mileage = this.memberCar.milage
+						}
+						else {
+							this.mileage =''
+						}
+						
+						this.brand = this.memberCar.brand
 					}else{
 						uni.setStorage({
 							key: 'maintainCarData',

pages/me/discountCard.vue

@@ -275,6 +275,9 @@
 	}
 	.shopNamesView{
 		width: 80%;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
 	}
 
 	.noMore {

pages/me/feedBack.vue

@@ -16,11 +16,11 @@
 				<view class="imgBox">
 					<view class="imgLine" v-for="(img,imgindex) in imgArr">
 						<image :class="{img4:(imgindex+1)%4==0}" :src="img" mode="" class="itemImg"></image>
-						<image src="../../static/img/icon_delpic@2x.png" mode="" class="delImg"
+						<image src="../../static/img/icon_del_red.png" mode="" class="delImg"
 							@click="delimg(imgindex)"></image>
 					</view>
 					<view class="imgLine" @click="uploadImg">
-						<image src="../../static/img/icon_addpic@2x.png" mode="" class="itemImg"></image>
+						<image src="../../static/img/btn_pic.png" mode="" class="itemImg"></image>
 					</view>
 				</view>
 			</view>

pages/me/me.vue

@@ -112,15 +112,15 @@
 				</view>
 				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
 			</view>
-			<view class="grayline"></view>
+			<!-- <view class="grayline"></view> -->
 
-			<view class="rowBox">
+			<!-- <view class="rowBox">
 				<view class="leftView">
 					<image src="../../static/img/icon_yaoqing.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">邀请有礼</view>
 				</view>
 				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
-			</view>
+			</view> -->
 
 		</view>
 		
@@ -170,6 +170,7 @@
 				shopData: '',
 				numList: '',
 				uid:'',
+				
 			}
 		},
 		onLoad() {
@@ -187,7 +188,7 @@
 		methods: {
 			goSet(){
 				uni.navigateTo({
-					url:'setup?phone='+this.numList.tMember.phone
+					url:'setup?phone='+this.numList.tMember.phone +'&nickName='+this.numList.tMember.nickName+'&name='+this.numList.tMember.name
 				})
 			},
 			call(e) {
@@ -213,6 +214,7 @@
 				}, 'GET').then(res => {
 					uni.hideLoading();
 					this.numList = res.data
+					
 				})
 			},
 			gonavigateTo(url) {

pages/me/myAppraise.vue

@@ -15,9 +15,8 @@
 						<!-- 第一行 -->
 						<view class="firstView">
 							<view class="shopName">{{item.ShopName}}</view>
-							<!-- 时间截取 -->
-							<!-- <view class="time">2021-9-05</view> -->
-							<view class="time">{{item.CreateTime.slice(0,item.CreateTime.length-8)}}</view>
+							
+							
 						</view>
 
 						<!-- 第2行 -->
@@ -25,8 +24,11 @@
 							<!-- 星星 -->
 							<uni-rate :value="item.Overallevaluation" :max="5" color="#EEEEEE" active-color="#FF4F00"
 								:size="16" :margin="4" :readonly="true" />
-							<image src="../../static/img/icon_del.png" class="deleteBtn"
-								@click.stop="deleteItem(item, index)"></image>
+								<view class="secondRightView">
+									<view class="time">{{item.CreateTime.slice(0,item.CreateTime.length-8)}}</view>
+									<image src="../../static/img/icon_del.png" class="deleteBtn"
+										@click.stop="deleteItem(item, index)"></image>
+								</view>
 						</view>
 						
 						<view class="thirdView">
@@ -80,13 +82,14 @@
 			}
 		},
 		onLoad(opt) {
-			
-		},
-		onShow() {
-			this.itemData=[]
 			this.page = 1
 			this.getItemData()
 		},
+		onShow() {
+			// this.itemData=[]
+			// this.page = 1
+			// this.getItemData()
+		},
 		methods: {
 			// goDetail(item){
 			// 	uni.navigateTo({
@@ -251,7 +254,7 @@
 		padding-top: 12rpx;
 		padding-bottom: 20rpx;
 	}
-
+	
 	.shopName {
 		/* padding-top: 30rpx;
 		padding-bottom: 10rpx; */
@@ -259,10 +262,13 @@
 		font-weight: bold;
 		color: #333333;
 	}
-
+	.secondRightView{
+		display: flex;
+	}
 	.time {
 		font-size: 26rpx;
 		color: #999999;
+		margin-right: 20rpx;
 	}
 
 	.deleteBtn {

pages/me/myAppraiseDetail.vue

@@ -15,9 +15,7 @@
 						<!-- 第一行 -->
 						<view class="firstView">
 							<view class="shopName">{{detail.Evaluator}}</view>
-							<!-- 时间截取 -->
-							<!-- <view class="time">2021-9-05</view> -->
-							<view class="time">{{detail.CreateTime.slice(0,detail.CreateTime.length-8)}}</view>
+							
 						</view>
 
 						<!-- 第2行 -->
@@ -25,8 +23,12 @@
 							<!-- 星星 -->
 							<uni-rate :value="detail.Overallevaluation" :max="5" color="#EEEEEE" active-color="#FF4F00"
 								:size="16" :margin="4" :readonly="true" />
-							<image src="../../static/img/review_icon_del@2x.png" class="deleteBtn"
-								@click="deleteItem(detail, index)"></image>
+								
+								<view class="secondRightView">
+									<view class="time">{{detail.CreateTime.slice(0,detail.CreateTime.length-8)}}</view>
+									<image src="../../static/img/icon_del.png" class="deleteBtn"
+										@click="deleteItem(detail, index)"></image>
+								</view>
 						</view>
 						
 						<view class="thirdView">
@@ -241,9 +243,13 @@
 		color: #333333;
 	}
 
+	.secondRightView{
+		display: flex;
+	}
 	.time {
 		font-size: 26rpx;
 		color: #999999;
+		margin-right: 20rpx;
 	}
 
 	.deleteBtn {

pages/me/setup.vue

@@ -4,7 +4,7 @@
 	    <view class="mkBox">
 			<view class="line">
 				<view class="lineTitle">昵称</view>
-				<view class="lineCont">{{ueserInfo.memberInfo.nickName}}</view>
+				<view class="lineCont">{{nickName}}</view>
 			</view>
 			<view class="line">
 				<view class="lineTitle">手机号</view>
@@ -13,7 +13,7 @@
 			<view class="line boderNo">
 				<view class="lineTitle">真实姓名</view>
 				<view class="lineCont">
-					<input type="text" v-model="ueserInfo.memberInfo.name" value="" placeholder="请输入" class="lineinput" @blur="updateBmember"/>
+					<input type="text" v-model="name" value="" placeholder="请输入" class="lineinput" @blur="updateBmember"/>
 				</view>
 			</view>
 		</view>
@@ -52,14 +52,18 @@
 export default {
 	data() {
 		return {
-			ueserInfo:'',
+			
+			nickName:'',
 			phoneNum:'',
 			name:'',
 		}
 	},
 	onLoad(opt) {
-      this.ueserInfo=uni.getStorageSync("logodata");
-	  this.phoneNum = opt.phone
+      
+	  this.nickName = opt.nickName
+	   this.phoneNum = opt.phone
+	  this.name = opt.name
+	 
 	},
 	onShow() {
 		
@@ -70,15 +74,7 @@ export default {
 				this.$http('worldKeepCar/keepCarMy/updateTmember', {
 					name:this.name		 
 				},'POST').then(res => {
-				    if(res.code==0){
-						
-						console.log(this.ueserInfo)
-						uni.setStorage({
-							key: 'logodata',
-							data: this.ueserInfo,
-							success: function () {}
-						}); 
-					}
+				    
 				})
 			}
 			

pages/module/handbook.vue

@@ -0,0 +1,196 @@
+<template>
+	<view class="content">
+
+		<scroll-view scroll-y="true" scroll-x="true" :scroll-top="scrollTop" :scroll-left="scrollTop" @scroll="scroll">
+
+			<!-- 内容 -->
+			<view class="teamContent" :style="{width:HN_width}">
+				<view v-for="(itemRow,indexRow) in itemData" :key="indexRow">
+					<view class="row" :class="{grayColor:indexRow==0}">
+						<view v-for="(itemCol,indexCol) in itemRow" :key="indexCol" class="colBg"  :class="{grayColor:indexCol==0}">
+							<view class="col" v-if="indexCol==0">{{itemCol}}</view>
+							<view class="col" v-else-if="indexRow==0">{{itemCol}}</view>
+							<view class="redCol" v-else-if="indexRow!=0 && indexCol!=0 && itemCol==1"></view>
+							<view class="grayCol" v-else-if="indexRow!=0 && indexCol!=0 && itemCol==0"></view>
+							
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			
+
+		</scroll-view>
+		
+		<view class="leftView">
+			<view v-for="(item,index) in leftData" :key="index" class="leftTitleBg">
+				<view class="leftTitle" :class="{firstRow:index==0}">{{item}}</view>
+			</view>
+		</view>
+		
+		
+
+
+		<!-- 无数据空白页 -->
+		<nodata v-if="itemData.length==0"></nodata>
+
+	</view>
+</template>
+
+<script>
+	import nodata from '../../components/nodata/nodata.vue'
+	export default {
+		components: {
+			nodata,
+		},
+		data() {
+			return {
+				itemData:[],
+				noMoreShow: false,
+				mileage: '',
+				liyangId: '',
+				scrollTop: 0,
+				old: {
+					scrollTop: 0
+				},
+				leftData:[],
+				
+			}
+		},
+		onLoad(opt) {
+			this.mileage = opt.mileage
+			this.liyangId = opt.liyangId
+
+			this.getData()
+
+		},
+		computed: {
+
+			HN_width() {
+				var MaxLength = 2;
+				var Row_Materials = this.itemData[0];
+				if (Row_Materials != null && Row_Materials.length > 0) {
+					MaxLength = Row_Materials.length * (180 + 40)
+				}
+
+				return MaxLength + 'rpx';
+
+			},
+		},
+		methods: {
+
+
+
+			scroll: function(e) {
+
+				this.old.scrollTop = e.detail.scrollTop
+			},
+			getData() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = 'miniAppMyBMemberCar/queryPlan',
+					params = {
+						mileage: this.mileage,
+						liyangId: this.liyangId,
+					}
+				this.$http(url, params, 'GET').then(res => {
+					uni.hideLoading()
+					this.itemData = res.data
+
+					// 首列数据
+					for (var i = 0; i < res.data.length; i++) {
+						var leftArr = res.data[i]
+						this.leftData.push(leftArr[0])
+					}       
+					
+					
+
+				})
+			}
+		},
+
+	}
+</script>
+
+<style scoped>
+	.content {
+		background: #FFFFFF;
+		min-height: 100vh;
+
+	}
+
+	.scroll-view {
+		white-space: nowrap;
+		height: 1000;
+
+	}
+
+	.teamContent {
+		width: 100%;
+		align-items: center;
+	}
+
+	.row {
+		display: flex;
+		justify-content: space-around;
+		width: 100%;
+		
+	}
+	.colBg{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 20rpx;
+		width: 180rpx;
+		border: 1rpx #EEEEEE solid;
+		
+		
+	}
+	.col {
+		color: #333333;
+		font-size: 28rpx;
+		
+	}
+	.redCol,
+	.grayCol{
+		width: 24rpx;
+		height: 24rpx;
+		background-color: #FF4F00;
+		border-radius: 12rpx;
+		
+	}
+	.grayCol{
+		background-color: #DDDDDD;
+	}
+	.grayColor{
+		background-color: #F7F7F7;
+	}
+	.leftView{
+		display: flex;
+		justify-content: space-around;
+		flex-flow: column;
+		
+		position: absolute;
+		left: 0rpx;
+		top: 0rpx;
+		background-color: #FFFFFF;
+		z-index: 99;
+		
+	}
+	
+	.leftTitleBg{
+		
+		padding: 20rpx;
+		width: 180rpx;
+		background-color: #F7F7F7;
+		border: 1rpx #EEEEEE solid;
+	}
+	.leftTitle{
+		color: #333333;
+		font-size: 28rpx;
+	}
+	.firstRow{
+		height: 80rpx;
+	}
+</style>

pages/module/maintain.vue

@@ -14,7 +14,7 @@
 		<!-- 保养推荐 -->
 		<view class="maintainrecommend">
 			<view class="recommendTxt">保养推荐</view>
-			<view class="manual" @click="handbook">保养手册</view>
+			<view class="manual" @click="handbook()">保养手册</view>
 		</view>
 		<!--主体  -->
 		<view class="main">
@@ -368,7 +368,7 @@ export default {
 		},
         handbook(){
 			uni.navigateTo({
-				url:'../car/handbook?mileage'+this.maintainCarData.milage+'&liyangId='+this.maintainCarData.nLevelID
+				url:'handbook?mileage'+this.maintainCarData.milage+'&liyangId='+this.maintainCarData.nLevelID
 			})
 		},
 		settlement(){
@@ -531,27 +531,27 @@ export default {
 	}
 	.topLeft{
      display: flex;
-	
+	align-content: center;
 	}
 	.carName{
-		
+		width: 61%;
 	}
 	.topEdit{
-		width: 30rpx;
-		height: 30rpx;
-		padding-top: 3px;
-		padding-left: 12rpx;
-		padding-right: 5px;
-		padding-bottom: 5px;
+		width: 22rpx;
+		height: 22rpx;
+		padding: 10rpx;
 	}
 	.topRight{
 		display: flex;
+		justify-content: flex-end;
+		align-items: center;
 	}
 	.topInput{
 		font-size: 28rpx;
 		color: #FFFFFF;
 		text-align: right;
 		padding-top: 3rpx;
+		width: 70%;
 	}
 	.maintainrecommend{
 		padding: 30rpx 24rpx;

pages/module/orderShop.vue

@@ -218,7 +218,8 @@
 
 	.shopScore2 {
 		font-size: 22rpx;
-		color: #FF4F00;
+		color: #FF4F00;
+		margin-right: 14rpx;
 	}
 
 	.shopScore3 {
@@ -232,15 +233,16 @@
 		align-items: center;
 	}
 	
-	.brands {
-		margin-left: 14rpx;
-		height: 30rpx;
-		font-size: 22rpx;
-		
-		color: #FF5800;
-		line-height: 30rpx;
-		border-radius: 4rpx;
-		border: 1rpx solid #F25D24;
+	.brands {
+		border-radius: 4rpx;
+		padding: 0 5rpx;
+		color: #FF5800;
+		height: 28rpx;
+		border: 1px solid #FF5800;
+		margin-right: 5rpx;
+		font-size: 20rpx;
+		line-height: 28rpx;
+		
 	}
 	
 	.timeBg {

pages/module/replaceGoods.vue

@@ -107,7 +107,7 @@ export default {
 	}
 	.goodsItem{
 		display: flex;
-		padding: 15rpx 0;
+		padding: 30rpx 0;
 		border-bottom:  1px solid #EEEEEE;
 	}
 	.goodsItem:last-child{

pages/module/usableDiscountCard.vue

@@ -30,7 +30,7 @@
 
 					<!-- 第二快 -->
 					<view class="bottomView">
-						<view>发放门店：{{item.ShopName}}</view>
+						<view class="shopName">适用门店：{{item.ShopName}}</view>
 						<view @click="goDiscountDetail(item)">查看详情</view>
 					</view>
 				</view>
@@ -234,7 +234,13 @@
 		font-size: 24rpx;
 		color: #666666;
 	}
-
+	.shopName{
+		
+		width: 80%;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
 	.noMore {
 		text-align: center;
 		line-height: 50rpx;

pages/refundMoney/refundMoney.vue

@@ -19,7 +19,7 @@
 				<view class="viewBg2">
 					<image src="../../static/img/icon_xinghao.png" mode="" style="width: 14rpx; height: 14rpx;"></image>
 					<view class="leftTitle">退款金额</view>
-					<input class="blackColor" type="number" v-model="digit" :placeholder="'最大可退 ￥'+maxMoney"
+					<input class="blackColor" type="digit" v-model="money" :placeholder="'最大可退 ￥'+maxMoney"
 						placeholder-style="color:#999999" />
 
 				</view>
@@ -80,7 +80,7 @@
 		},
 		methods: {
 			submit() {
-				if (this.reasonId == '') {
+				if (!this.reasonId) {
 					uni.showToast({
 						title: '请选择退款原因',
 						icon: 'none',
@@ -88,7 +88,7 @@
 					});
 					return ;
 				}
-				if (this.money==0) {
+				if (!this.money) {
 					uni.showToast({
 						title: '请输入退款金额',
 						icon: 'none',

pages/refundMoney/refundMoneyDetail.vue

@@ -174,7 +174,7 @@
 					this.detailData = res.data
 
 					// 退款状态
-					// "changeState": 备注：处理状态1待处理2退款成功3退款关闭
+					// "serviceState": 备注：处理状态1待处理2退款成功3退款关闭
 					if (this.detailData.serviceState == 1) {
 						// 平台处理
 						this.state = 1;
@@ -186,7 +186,7 @@
 						// 拒绝
 						this.state = -1;
 					}
-					if (this.detailData.cancelType != null) {
+					if (this.detailData.cancelType == 1) {
 						// 关闭
 						this.state = 0;
 					}

pages/refundMoney/refundMoneyList.vue

@@ -3,7 +3,9 @@
 		<view class="topView">
 			<!-- tab -->
 			<view class="tab">
-				<view class="tabLine" :class="{tabActive:tabIndex==1}" @click="tabClick(1)">待处理</view>
+				<view class="tabLine" :class="{tabActive:tabIndex==1}" @click="tabClick(1)">
+					<view class="orderNum" v-show="num>0">{{num}}</view>
+					待处理</view>
 				<view class="tabLine" :class="{tabActive:tabIndex==2}" @click="tabClick(2)">申请记录</view>
 			</view>
 			<!-- 搜索 -->
@@ -18,14 +20,14 @@
 				<view class="firstView">
 					<view style="font-size: 24rpx; color: #999999;">申请单号：{{item.ServiceCode}}</view>
 					<view class="rightView">
-						<image src="../../static/img/icon_tuikuan2.png" mode="" style="width: 30rpx; height: 30rpx; margin-right: 10rpx;"></image>
-						<view style="color: #666666; font-size: 24rpx;">退款</view>
+						<image src="../../static/img/icon_tuikuan2.png" mode="aspectFit" style="width: 30rpx; height: 30rpx;"></image>
+						<view style="color: #666666; font-size: 24rpx; margin-left: 10rpx;">退款</view>
 					</view>
 				</view>
 				
 				<view class="shopName">{{item.ShopName}}</view>
 				<view class="itemName">{{item.itemNameList}},{{item.goodNameList}}</view>
-				
+				<view class="itemName">车牌号:{{item.PlateNumber?item.PlateNumber:''}}</view>
 				<!-- ServiceState"：1待处理2退款成功3退款关闭 -->
 				<view class="stateView" v-if="item.ServiceState==1">待平台处理</view>
 				
@@ -63,7 +65,8 @@
 				page: 1,
 				tabIndex: 1,
 				itemData:[],
-				noMoreShow: false,
+				noMoreShow: false,
+				num:'',
 			}
 		},
 		onLoad() {
@@ -109,6 +112,7 @@
 				this.$http(url, params, 'GET').then(res => {
 					uni.hideLoading()
 					var list = res.data.Items
+					this.num = res.data.afterService
 			
 					// 处理 undefined和null转为空白字符串
 					list.forEach((item, index) => {
@@ -176,14 +180,26 @@
 
 	.tabLine {
 
-		text-align: center;
+		text-align: center;
+		position: relative;
 	}
-
+	
 	.tabActive {
 		color: #FF4F00;
 		border-bottom: 4rpx solid #FF4F00;
 	}
-
+	.orderNum {
+		line-height: 26rpx;
+		background: #FF4F00;
+		padding: 0 8rpx;
+		border-radius: 13rpx;
+		color: #FFFFFF;
+		font-size: 20rpx;
+		position: absolute;
+		top: 10rpx;
+		right: -10rpx;
+		z-index: 11;
+	}
 	.searchBoxBg {
 		
 		width: 100%;
@@ -221,7 +237,7 @@
 	.shopName{
 		padding-bottom: 20rpx;
 		color: #333333;
-		font-size: 26rpx;
+		font-size: 30rpx;
 	}
 	.itemName{
 		padding-bottom: 20rpx;

pages/shop/shopAppraise.vue

@@ -15,9 +15,8 @@
 						<!-- 第一行 -->
 						<view class="firstView">
 							<view class="shopName">{{item.Evaluator}}</view>
-							<!-- 时间截取 -->
-							<!-- <view class="time">2021-9-05</view> -->
-							<view class="time">{{item.CreateTime.slice(0,item.CreateTime.length-8)}}</view>
+							
+							
 						</view>
 
 						<!-- 第2行 -->
@@ -25,7 +24,7 @@
 							<!-- 星星 -->
 							<uni-rate :value="item.Overallevaluation" :max="5" color="#EEEEEE" active-color="#FF4F00"
 								:size="16" :margin="4" :readonly="true" />
-							
+							<view class="time">{{item.CreateTime.slice(0,item.CreateTime.length-8)}}</view>
 						</view>
 
 						<view class="contentMes">{{item.EContent}}</view>

pages/shop/shopList.vue

@@ -23,10 +23,10 @@
 					</view>
 
 					<view class="screenLine" @click="juli" :class="{colorCS:comprehensiveShow}">
-						<view class="screenLineTxt" v-if="comprehensive==0">综合排序</view>
+						<!-- <view class="screenLineTxt" v-if="comprehensive==0">综合排序</view> -->
 						<view class="screenLineTxt" v-if="comprehensive==1">距离最近</view>
 						<view class="screenLineTxt" v-if="comprehensive==2">评分最高</view>
-						<image src="../../static/img/icon_arrow_gray.png" mode="" v-show="!comprehensiveShow"
+						<image src="../../static/img/icon_arrow_gray.png" mode="" 
 							class="screenJt"></image>
 
 					</view>
@@ -35,8 +35,8 @@
 					<view class="shoplevelBox " v-show="comprehensiveShow" @click="comprehensiveShow=false">
 						<view class="shoplevelCont ">
 							<view class="comprehensivebox">
-								<view class="comprehensiveLine" :class="{comprehensiveACtive:comprehensive==0}"
-									@click.stop="comprehensiveClick(0)">综合排序</view>
+								<!-- <view class="comprehensiveLine" :class="{comprehensiveACtive:comprehensive==0}"
+									@click.stop="comprehensiveClick(0)">综合排序</view> -->
 								<view class="comprehensiveLine" :class="{comprehensiveACtive:comprehensive==1}"
 									@click.stop="comprehensiveClick(1)">距离最近</view>
 								<view class="comprehensiveLine" :class="{comprehensiveACtive:comprehensive==2}"
@@ -125,7 +125,8 @@
 				levelShow: false,
 				comprehensiveShow: false,
 				
-				uid: '',
+				uid: '',
+				
 
 			}
 		},
@@ -143,6 +144,7 @@
 				this.cityCode = selectCity.code
 			} 
 			this.location = uni.getStorageSync("locationCity");
+			
 			
 
 			this.getqueryShopList() //获取全部门店列表
@@ -516,14 +518,14 @@
 
 	.brands {
 		border-radius: 4rpx;
-		line-height: 30rpx;
-		padding: 0 8rpx;
+		padding: 0 5rpx;
 		color: #FF5800;
-		height: 30rpx;
+		height: 28rpx;
 		border: 1px solid #FF5800;
-		margin-right: 14rpx;
-		font-size: 24rpx;
-		line-height: 30rpx;
+		margin-right: 5rpx;
+		font-size: 20rpx;
+		line-height: 28rpx;
+		
 	}
 
 	.timeBg {