1.改bug

components/nodata/nodata.vue

@@ -36,7 +36,7 @@ export default {
 	  padding-top: 100rpx;
 	}
 	.noTxt{
-		font-size: 36rpx;
+		font-size: 32rpx;
 		color: #999999;
 		padding-top: 50rpx;
 	}

pages.json

@@ -29,7 +29,7 @@
 		{
 			"path": "pages/login/empower",
 			"style": {
-				"navigationBarTitleText": "天下养车"
+				"navigationBarTitleText": "车蓝图养车"
 			}
 		},
 		{
@@ -233,7 +233,7 @@
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "退款详情",
-                "enablePullDownRefresh": false
+                "enablePullDownRefresh": true
             }
             
         }
@@ -251,7 +251,7 @@
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "更换门店详情",
-                "enablePullDownRefresh": false
+                "enablePullDownRefresh": true
             }
             
         }

pages/changeStore/changeStore.vue

@@ -156,18 +156,23 @@
 					}, 'POST').then(res => {
 					uni.hideLoading();
 					if (res.code == 0) {
-						uni.showToast({
-							title: '提交成功',
-							icon: 'none',
-							duration: 2000,
-						});
+						
 						uni.removeStorageSync('changeStore')
-
-						setTimeout(function() {
-							uni.navigateBack({
-
-							})
-						}, 2000);
+						
+						uni.showModal({
+						    title: '更换门店申请成功，请等待平台处理',
+						    content: '您可以在【我的-更换门店申请记录】列表里具体查看申请的处理进度哦~',
+							showCancel:false,
+							confirmText:'知道了',
+						    success: function (res) {
+						        if (res.confirm) {
+						           uni.navigateBack({
+						           	
+						           })
+						        } 
+						    }
+						});
+						
 					}
 
 
@@ -190,18 +195,21 @@
 					}, 'POST').then(res => {
 					uni.hideLoading();
 					if (res.code == 0) {
-						uni.showToast({
-							title: '提交成功',
-							icon: 'none',
-							duration: 2000,
+						uni.removeStorageSync('changeStore')
+						
+						uni.showModal({
+						    title: '更换门店申请成功，请等待平台处理',
+						    content: '您可以在【我的-更换门店申请记录】列表里具体查看申请的处理进度哦~',
+							showCancel:false,
+							confirmText:'知道了',
+						    success: function (res) {
+						        if (res.confirm) {
+						           uni.navigateBack({
+						           	
+						           })
+						        } 
+						    }
 						});
-						uni.removeStorageSync('changeStore')
-
-						setTimeout(function() {
-							uni.navigateBack({
-
-							})
-						}, 2000);
 					}
 
 

pages/changeStore/changeStoreDetail.vue

@@ -21,22 +21,27 @@
 
 				</view>
 				<!-- 进度条 文字提示 -->
-				<view class="progressT">
-					<view class="stateView">
-						<view class="progressTitle">提交申请</view>
-						<view class="time" v-if="state>0">{{detailData.createTime}}</view>
-					</view>
-					<view style="width: 9%;"></view>
-					<view class="stateView">
-						<view class="progressTitle">平台审核</view>
-						<view class="time" v-if="state>1">{{detailData.handlerTime}}</view>
-					</view>
-					<view style="width: 9%;"></view>
-					<view class="stateView">
-						<view class="progressTitle">平台同意更换</view>
-						<view class="time" v-if="state>2">{{detailData.handlerTime}}</view>
-					</view>
-				</view>
+				
+				<view class="progressT">
+					<view class="progressTitle">提交申请</view>
+					<view style="width: 9%;"></view>
+					<view class="progressTitle">平台审核</view>
+					<view style="width: 9%;"></view>
+					<view class="progressTitle">平台同意更换</view>
+					
+					
+				</view>
+				
+				<view class="progressT">
+					<view class="time" v-if="state>0">{{detailData.createTime.slice(0,detailData.createTime.length-3)}}</view>
+					<view style="width: 7%;"></view>
+					<view class="time" v-if="state>1">{{detailData.handlerTime.slice(0,detailData.handlerTime.length-3)}}</view>
+					<view style="width: 8%;"></view>
+					<view class="time" v-if="state>2">{{detailData.handlerTime.slice(0,detailData.handlerTime.length-3)}}</view>
+					
+				</view>
+				
+				
 			</view>
 
 			<!-- 更换关闭 -->
@@ -56,7 +61,7 @@
 		<view class="whiteView" v-if="state==1">
 			<view class="title1">您已成功发起更换门店申请，请耐心等待平台处理</view>
 			<view class="title2">平台同意后，系统将自动更新门店信息</view>
-			<view class="title3">平台同意后，系统将自动更新门店信息</view>
+			<view class="title3">如果平台拒绝，您可以修改更换申请后再次发起，平台会重新处理</view>
 		</view>
 		<!-- 更换关闭 -->
 		<view class="whiteView" v-if="state==0">
@@ -81,7 +86,7 @@
 				<view class="name">{{detailData.oldShopName}}</view>
 			</view>
 			<view class="store">
-				<image src="../../static/img/icon_coordinate.png" mode="" class="leftIcon"></image>
+				<image src="../../static/img/icon_coordinate.png" mode="" class="leftIcon2"></image>
 				<view class="address">{{detailData.oldShopAddress}}</view>
 			</view>
 		</view>
@@ -93,7 +98,7 @@
 				<view class="name">{{detailData.newShopName}}</view>
 			</view>
 			<view class="store">
-				<image src="../../static/img/icon_coordinate.png" mode="" class="leftIcon"></image>
+				<image src="../../static/img/icon_coordinate.png" mode="" class="leftIcon2"></image>
 				<view class="address">{{detailData.newShopAddress}}</view>
 			</view>
 		</view>
@@ -113,7 +118,7 @@
 			</view>
 			<view class="informationLine">
 				<view class="informationTxt">补充描述：</view>
-				<view class="informationNum" v-if="detailData.applyReasonComment!=null">
+				<view class="informationNum" style="width: 80%;" v-if="detailData.applyReasonComment!=null">
 					{{detailData.applyReasonComment}}</view>
 			</view>
 			<view class="informationLine">
@@ -257,7 +262,14 @@
 			}
 			
 			
-		}
+		},
+		onPullDownRefresh() {
+			
+			this.getData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
 	}
 </script>
 
@@ -324,20 +336,18 @@
 
 	.progressT {
 		display: flex;
-
+		
 		align-items: center;
 
 	}
 
-	.stateView {
-		width: 30%;
-
-	}
+	
 
 	.progressTitle {
 		color: #333333;
 		font-size: 22rpx;
-		text-align: center;
+		text-align: center;
+		width: 30%;
 	}
 
 	.time {
@@ -389,6 +399,12 @@
 		width: 30rpx;
 		height: 30rpx;
 		margin-right: 10rpx;
+	}
+	.leftIcon2 {
+		width: 22rpx;
+		height: 29rpx;
+		margin-left: 5rpx;
+		margin-right: 15rpx;
 	}
 
 	.name {
@@ -415,7 +431,6 @@
 	.informationNum {
 		color: #333333;
 		
-
 	}
 
 	.copyBtn {

pages/iPhone/addphone.vue

@@ -7,7 +7,7 @@
 					 姓名:
 				  </view>
 				  <view>
-					  <input type="text" value="" placeholder="请输入" class="lineInput" v-model="name"/>
+					  <input type="text" value="" placeholder-style="color:#999999" placeholder="请输入" class="lineInput" v-model="name"/>
 				  </view>
 			  </view>
 			  <view class="phoneLine">
@@ -15,13 +15,13 @@
 					 手机号:
 				  </view>
 				  <view>
-					  <input type="text" value="" placeholder="请输入" class="lineInput" v-model="phone"/>
+					  <input type="text" value="" placeholder-style="color:#999999" placeholder="请输入" class="lineInput" v-model="phone"/>
 				  </view>
 			  </view>
 			  <view class="phoneLine2" style="display: flex;justify-content: space-between;">
 			  	<view class="DefaultTxt">设为默认联系人</view>
 				<view class="lineRight">
-					 <switch :checked="isDefault" @change="Default" color="#FF4F00" style="transform:scale(0.7)"/>
+					 <switch :checked="isDefault" @change="Default" color="#FF4F00" style="transform:scale(0.9)"/>
 				</view>
 			  </view>
 			  <view class="phoneLine3" @click="delPhone">
@@ -198,7 +198,7 @@ export default {
 		display: flex;
 		
 		padding: 30rpx;
-		border-bottom: 1px solid #DDDDDD;
+		border-bottom: 1px #EEEEEE solid;
 	}
 
 	.phoneLeft{
@@ -206,11 +206,11 @@ export default {
 color: #3C3C3C;
 	}
 	.phoneLine2{
-		padding:20rpx 30rpx;border-bottom: 1px solid #DDDDDD;
+		padding:20rpx 30rpx;border-bottom: 1px solid #EEEEEE;
 	}
 
 	.lineInput{
-	   color: #999999;
+	   color: #333333;
 		   font-size: 28rpx;
 	}
 	.DefaultTxt{

pages/index/addCar.vue

@@ -15,8 +15,8 @@
 
 			<view class="mesView" @click="goCarModel()">
 				<view class="leftTitle">车型</view>
-				<view class="carModBtn noSelectColor" v-if="!carModelInfo.value">请选择车型</view>
-				<view class="carModBtn selectColor" v-else>{{carModelInfo.value}}</view>
+				<view class="carModBtn noSelectColor" v-if="!carModelInfo.title">请选择车型</view>
+				<view class="carModBtn selectColor" v-else>{{carModelInfo.title}}</view>
 				<image src="../../static/img/rightArrow.png" class="rightArrow"></image>
 			</view>
 
@@ -41,7 +41,10 @@
 
 
 		<view class="bottomView">
-			<view class="saveCar" @click="saveCar()">保存爱车</view>
+			<view class="saveCar" @click="saveCar()">
+				<image src="../../static/img/icon_tianjiacheliang.png" mode="" style="width: 44rpx; height: 36rpx; margin-right: 10rpx;"></image>
+				<view>保存爱车</view>
+				</view>
 		</view>
 
 
@@ -76,7 +79,7 @@
 			console.log(opt);
 			this.isEditCar = opt.isEditCar
 			this.carId = opt.id
-			if (this.isEditCar == 1) {
+			if (this.isEditCar == 'true') {
 				this.getEditData()
 			}
 		},
@@ -111,8 +114,8 @@
 					
 					// 展示时
 					this.plateNo = res.data.plateNumber;
-					carModelInfo.value = res.data.carModel;
-					this.time = res.data.createTime;
+					carModelInfo.title = res.data.carModel;
+					this.time = res.data.createTime.slice(0,res.data.createTime.length-8);
 					this.mileage = res.data.milage;
 
 					this.carModelInfo = carModelInfo;
@@ -169,7 +172,7 @@
 					});
 					return false;
 				}
-				if (this.isEditCar == 1) {
+				if (this.isEditCar == 'true') {
 					this.updateTMemberCar()
 				}
 				else {
@@ -365,12 +368,14 @@
 		background: linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
 		margin: 23rpx 30rpx;
 		height: 74rpx;
-		line-height: 74rpx;
+		
 		border-radius: 37rpx;
 		color: #FFFFFF;
 		font-size: 30rpx;
 		font-weight: bold;
-		text-align: center;
-
+		
+		align-items: center;
+		display: flex;
+		justify-content: center;
 	}
 </style>

pages/index/cailist.vue

@@ -28,7 +28,15 @@
 			<view class="noTxt">暂无数据</view>
 		</view>
 		
-		<view class="addBtn" @click="addBtn">添加爱车</view>
+		
+			
+		<view class="bottomView">
+			<view class="saveCar" @click="addBtn">
+				<image src="../../static/img/icon_tianjiacheliang.png" mode="" style="width: 44rpx; height: 36rpx; margin-right: 10rpx;"></image>
+				<view>添加爱车</view>
+				</view>
+		</view>	
+			
 	</view>
 </template>
 
@@ -40,12 +48,14 @@ export default {
 			loding:false,
 			type:'',
 			carId:'',
+			fromMe:false,
 		}
 	},
 	onLoad(opt) {
 		this.$common.isUserId()
        this.type=opt.type;
 	  // console.log(this.type)
+	  this.fromMe = opt.fromMe
 	},
 	onShow() {
 		this.getqueryMyBMemberCar();
@@ -81,7 +91,7 @@ export default {
 		editCar(id){
 			
 			uni.navigateTo({
-				url:'addCar?id='+id + '&isEditCar=1'
+				url:'addCar?id='+id + '&isEditCar=true'
 			})
 		},
 		delCar(id){
@@ -134,6 +144,9 @@ export default {
 			})
 		},
 		itemClick(item){
+			if (this.fromMe == 'true') {
+				return
+			}
 			uni.setStorage({
 				key: 'maintainCarData',
 				data: item,
@@ -166,18 +179,28 @@ export default {
 	.nodataBox{
 		text-align: center;
 	}
-	.addBtn{
-		width: 690rpx;
-		height: 74rpx;
+	.bottomView {
+		background-color: #FFFFFF;
+		width: 100%;
+		height: 120rpx;
+		position: fixed;
+		bottom: 0rpx;
+	}
+	
+	.saveCar {
+	
 		background: linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
+		margin: 23rpx 30rpx;
+		height: 74rpx;
+		
 		border-radius: 37rpx;
-		line-height: 74rpx;
-		text-align: center;
 		color: #FFFFFF;
 		font-size: 30rpx;
-		position: fixed;
-		bottom: 23rpx;
-		left: 30rpx;
+		font-weight: bold;
+		
+		align-items: center;
+		display: flex;
+		justify-content: center;
 	}
 	.carlistBox{
 		padding-bottom: 120rpx;

pages/index/carModel.vue

@@ -502,7 +502,7 @@ export default {
 	.zdyNavCont{
 		height: 44px;
 		font-size: 28rpx;
-		// font-weight: 700;
+		// font-weight: bold;
 		display: flex;
 		justify-content: space-between;
 		line-height: 44px;
@@ -526,7 +526,7 @@ export default {
 		
 	}
 	.zdyNavContRight{
-		width: 114px;
+		width: 100px;
 	}
 	.smvin{
 		color: #3C3C3C;
@@ -668,7 +668,7 @@ export default {
 	  right: 16rpx;
 	  top: 360rpx;
 	  width: 23rpx;
-	  font-size:30rpx;
+	  font-size:24rpx;
 	  font-weight:500;
 	  line-height:35rpx;
 	  color: rgb(153, 153, 153);

pages/index/index.vue

@@ -31,7 +31,7 @@
 					<view class="plateNumber noSelectColor">请添加您的爱车</view>
 
 					<view class="changeCarBg" @click="addCar()">
-						<image src="../../static/img/icon_change.png"
+						<image src="../../static/img/icon_tianjia.png"
 							style="width: 32rpx; height: 34rpx; margin-right: 5rpx;"></image>
 						<view style="color: #FF2400; font-size: 28rpx;">添加</view>
 					</view>
@@ -109,7 +109,10 @@
 			this.uid = uni.getStorageSync("logodata").uid;
 
 			var location = uni.getStorageSync("location");
-
+			
+			if (this.uid) {
+				that.queryHomeDetail();
+			}
 
 			if (location) {
 				this.lng = location.lng;
@@ -117,7 +120,10 @@
 				this.cityname = location.cityname;
 				this.cityCode = location.cityCode;
                 this.location=location
-				that.queryHomeDetail();
+				if (this.uid) {
+					that.queryHomeDetail();
+				}
+				
 			} else {
 				/* uni.showToast({
 					title: '请选择城市'
@@ -140,7 +146,11 @@
 		},
 
 		methods: {
-
+			goLonIn(){
+				uni.navigateTo({
+					url:'../login/login'
+				}) 
+			},
 			queryHomeDetail() {
 				uni.showLoading({
 					title: '加载中'
@@ -152,7 +162,13 @@
 					uni.hideLoading();
 					this.imgData = res.data.banners
 					this.memberCar = res.data.memberCar
-					this.mileage = res.data.memberCar.milage
+					if (res.data.memberCar) {
+						this.mileage = res.data.memberCar.milage
+					}
+					else {
+						this.mileage =''
+					}
+					
 
 					var cardata = uni.getStorageSync("maintainCarData")
 					
@@ -170,6 +186,9 @@
 				})
 			},
 			gomodule() {
+				if (!this.uid) {
+					this.goLonIn();
+				}
 				uni.navigateTo({
 					url: '../module/maintain'
 				})
@@ -183,6 +202,9 @@
 				}
 			},
 			addCar() {
+				if (!this.uid) {
+					this.goLonIn();
+				}
 				uni.navigateTo({
 					url: 'addCar'
 
@@ -243,7 +265,9 @@
             				data: obj,
             				success: function () {}
             			}); 
-            			this.queryHomeDetail();
+            			if (this.uid) {
+            				that.queryHomeDetail();
+            			}
             	    }
             	});
             },

pages/login/empower.vue

@@ -5,8 +5,8 @@
 				<image src="../../static/img/sign_bg.png" mode="" class="euroImg"></image>
 			</view>
 			
-			<view class="title1">欢迎使用天下养车小程序</view>
-			<view class="title2">天下养车为您的爱车提供全方面的功能支持 为保证您能正常使用，请以此授权微信和手机号</view>
+			<view class="title1">欢迎使用车蓝图养车小程序</view>
+			<view class="title2">车蓝图养车为您的爱车提供全方面的功能支持 为保证您能正常使用，请以此授权微信和手机号</view>
 			<button class="wxlogin" @click="wxgologin">授权微信用户信息</button>
 			<view class="title3" @click="goIndex">取消授权</view>
 		</view>
@@ -28,6 +28,7 @@
 				type: '',
 				wxOpendata: '',
 				isload: false,
+				souquan:true,
 			}
 		},
 		onLoad(opt) {
@@ -51,7 +52,11 @@
 
 			//api uni.getUserProfile
 			wxgologin() {
+				
 				var that = this;
+				if (that.souquan == false) {
+					return
+				}
 				uni.getUserProfile({
 					lang: 'zh_CN',
 					desc: '登录',
@@ -71,6 +76,8 @@
 						console.log(res)
 					}
 				});
+				
+				that.souquan = false;
 			},
 			//api uni.login
 			ipLogin() {

pages/login/iphoneLogin.vue

@@ -1,327 +1,350 @@
-<template>
-	<view class="container" >
-	 <view class="tis">登录后更精彩</view>
-	 <view class="cont">
-		 <input type="number" value="" v-model="phone" placeholder="请输入手机号码" class="phoneInput" @input="input()"/>
-		 
-		 <view class="yzmBox">
-			 <input type="number" value="" v-model="code" placeholder="请输入验证码" class="yzmInput"  @input="yzminput()"/>
-			 <view @click="sendSms" class="yzmBtn" :class="{green:isgreen}" >{{yzmTxt}}</view>
-		 </view>
-		 
-		 <view class="loginBtn" :class="{okBtn:show}" @click="gologin">验证并登录</view>
-		 <view class="privacy" @click="privacyClick">
-		 	<image src="../../static/img/login_icon_checked.png" mode="" class="imgPrivacy" v-show="privacyCk"></image>
-		 	<view class="nock" v-show="!privacyCk"></view>
-		 	<span>同意</span> <span class="span1" @click.stop="goTreaty">《服务协议》</span>
-		 	<span>与</span> <span class="span1" @click.stop="goIntimity">《隐私政策》 </span>
-		 </view>
-	 </view>
-   </view>
-
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			privacyCk:true,
-			phone:'',
-			isYzm:true,
-			yzmTxt:'获取验证码',
-			isgreen:false,
-			timer: null,
-			show:false,
-			cont:'',
-			code:'',
-			wxdata:'',
-			wxCode:'',
-			openID:'',
-			wxOpendata:'',
-		}
-	},
-	onLoad() {
-     
-	 this.wxOpendata=uni.getStorageSync("wxOpendata");
-	},
-	methods: {
-		
-		goTreaty(){
-			uni.navigateTo({
-				url:'../me/treaty'
-			})
-		},
-		goIntimity(){
-			uni.navigateTo({
-				url:'../me/intimity'
-			})
-		},
-		
-		getWxdata(){
-			var that=this;
-			uni.getUserProfile({
-				lang:'zh_CN',
-				desc:'登录',
-				success:(res)=>{
-					console.log(res);
-					that.wxdata=res;
-					 uni.setStorage({
-						key: 'wxdata',
-						data: res,
-						success: function () {
-						  that.ipLogin()
-						}
-					}); 
-				},
-				fail:(res)=>{
-					console.log(res)
-				}
-			});
-		},
-		gologin(){
-			if(this.show){
-				if(this.wxOpendata){
-					this.openID=this.wxOpendata.openid;
-					this.wxdata=uni.getStorageSync("wxdata")
-					if(this.wxdata){
-						this.phoneLogin()
-					}else{
-						this.getWxdata()
-					}
-					
-				}else{
-					this.getWxdata()
-				}
-				
-			}
-			
-		},
-		ipLogin(){
-			var that=this;
-			 uni.showLoading({ });
-			 uni.login({
-			   provider: 'weixin',
-			   success: function (loginRes) {
-			     console.log(loginRes)
-				that.wxCode=loginRes.code
-			    that.getWxOpenID()
-			   }
-			 });
-			
-			
-			
-		},
-		getWxOpenID(){
-			 this.$http('worldKeepCar/sys/getWxOpenID', {
-			   code:this.wxCode,
-			 },'GET').then(res => {
-				//console.log(res)
-				this.openID=res.data.openid;
-				// console.log(this.openID)
-				this.phoneLogin()
-			})
-		},
-		phoneLogin(){
-			this.$http('worldKeepCar/sys/phoneLogin', {
-			   phone:this.phone,
-			   code:this.code,
-			   nickName:this.wxdata.userInfo.nickName,
-			   headUrl:this.wxdata.userInfo.avatarUrl,
-			   openID:this.openID,
-			 },).then(res => {
-				
-				uni.hideLoading();
-				if(res.code==0){
-					uni.setStorage({
-						key: 'logodata',
-						data: res.data,
-						success: function () {
-						  that.ipLogin()
-						}
-					}); 
-					uni.showToast({
-					     title: '登录成功',
-					 	 icon:'none',
-					     duration: 3000
-					 });
-					 uni.switchTab({
-						 url:'../index/index'
-					 }) 
-				}else{
-					uni.showToast({
-					     title: res.msg,
-					 	 icon:'none',
-					     duration: 3000
-					 });
-				}
-			}) 
-		},
-		input(phone){
-			console.log(this.phone);
-			if (this.phone!='') {
-			  this.isgreen=true;		
-			}
-		},
-		yzminput(){
-			if (this.code!=''&&this.phone!='') {
-			  this.show=true;		
-			}
-		},
-        sendSms(){
-			if(!this.isYzm){
-				return false;
-			}
-			 this.isYzm=false;
-			//this.clearIntervalDjs();
-			//return false;
-			 if (this.phone === '') {
-				 this.isYzm=true
-				 uni.showToast({
-				      title: '手机号不可为空',
-				  	 icon:'none',
-				      duration: 3000
-				  });
-			 } else {
-				  var reg=/^1[3456789]\d{9}$/;
-				  if(!reg.test(this.phone)){
-				   uni.showToast({
-				        title: '手机号格式不正确',
-				    	 icon:'none',
-				        duration: 3000
-				    });
-					 this.isYzm=true
-				  }else{
-					  this.$http('worldKeepCar/sys/sendSms', {
-					     phone:this.phone,
-					   },'GET').then(res => {
-						   this.isYzm=false;
-					  			/* uni.showToast({
-					  			     title: '发送成功',
-					  			 	 icon:'none',
-					  			     duration: 3000
-					  			 }); */	
-						  this.clearIntervalDjs()
-					  })
-				  }
-			    }
-
-			
-		},
-		clearIntervalDjs(){
-			const TIME_COUNT = 60;
-			 if (!this.timer) {
-			 this.cont = TIME_COUNT;
-			 this.isYzm = false;
-			 this.timer = setInterval(() => {
-			 if (this.cont > 0 && this.cont <= TIME_COUNT) {
-			  this.cont--;
-			  this.yzmTxt=this.cont+'S'
-			  } else {
-			  this.isYzm = true;
-			  clearInterval(this.timer);
-			  this.timer = null;
-			   this.yzmTxt="获取验证码"
-			  }
-			 }, 1000)
-			 }
-		},
-		privacyClick(){
-			this.privacyCk=!this.privacyCk
-		},
-		blur1(){
-			
-		}
-	}
-}
-</script>
-
-<style scoped>
-.tis{
-	color: #333333;
-	font-size: 44rpx;
-	padding-top: 78rpx;
-	padding-left: 58rpx;
-}
-.cont{
-	padding: 58rpx;
-}
-.phoneInput{
-	width: 604rpx;
-	height: 88rpx;
-	border-radius: 44rpx;
-	border: 2rpx solid #EEEEEE;
-	line-height: 88rpx;
-	color: #999999;
-	font-size: 30rpx;
-	padding-left: 30rpx;
-}
-.yzmBox{
-	width: 604rpx;
-	height: 88rpx;
-	border-radius: 44rpx;
-	border: 2rpx solid #EEEEEE;
-	line-height: 88rpx;
-	color: #999999;
-	font-size: 30rpx;
-	padding-left: 30rpx;
-	margin-top: 30rpx;
-	display: flex;
-	justify-content: space-between;
-}
-.yzmInput{
-	line-height: 88rpx;
-	color: #999999;
-	font-size: 30rpx;
-	height: 88rpx;
-}
-.yzmBtn{
-	padding-right: 30rpx;
-	border-left: 2rpx solid #EEEEEE;
-	padding-left: 20rpx;
-	height: 35rpx;
-	line-height: 35rpx;
-	margin-top: 26rpx;
-}
-.loginBtn{
-	width: 634rpx;
-	height: 88rpx;
-	background: #F5F5F5;
-	border-radius: 44rpx;
-	line-height: 88rpx;
-	text-align: center;
-	margin-top: 30rpx;
-	color: #999999;
-	font-size: 30rpx;
-}
-.privacy{
-		display: flex;
-		/* justify-content: center; */
-		font-size: 24rpx;
-		color: #CCCCCC;
-		padding-top: 34rpx;
-	}
-	.imgPrivacy{
-		width: 28rpx;
-		height: 28rpx;
-		margin-top: 2rpx;
-		margin-right: 10rpx;
-	}
-	.span1{
-		color: #FF4F00;
-	}
-	.nock{
-		width: 22rpx;
-		height: 22rpx;
-		border-radius: 50%;
-		border:2px solid #AEAEAE;
-		margin-top: 2rpx;
-		margin-right: 10rpx;
-	}
-	.green{
-		color: #FF4F00;
-	}
-	.okBtn{
-		background: #FF4F00;
-		color: #FFFFFF;
-	}
+<template>
+	<view class="container">
+		<view class="tis">登录后更精彩</view>
+		<view class="cont">
+			<input type="number" value="" v-model="phone" placeholder-style="color:#999999" placeholder="请输入手机号码" class="phoneInput" @input="input()" />
+
+			<view class="yzmBox">
+				<input type="number" value="" v-model="code" placeholder-style="color:#999999" placeholder="请输入验证码" class="yzmInput"
+					@input="yzminput()" />
+				<view @click="sendSms" class="yzmBtn" :class="{green:isgreen}">{{yzmTxt}}</view>
+			</view>
+
+			<view class="loginBtn" :class="{okBtn:show}" @click="gologin">验证并登录</view>
+			<view class="privacy" @click="privacyClick">
+				<image src="../../static/img/login_icon_checked.png" mode="" class="imgPrivacy" v-show="privacyCk">
+				</image>
+				<view class="nock" v-show="!privacyCk"></view>
+				<span>同意</span> <span class="span1" @click.stop="goTreaty">《服务协议》</span>
+				<span>与</span> <span class="span1" @click.stop="goIntimity">《隐私政策》 </span>
+			</view>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				privacyCk: true,
+				phone: '',
+				isYzm: true,
+				yzmTxt: '获取验证码',
+				isgreen: false,
+				timer: null,
+				show: false,
+				cont: '',
+				code: '',
+				wxdata: '',
+				wxCode: '',
+				openID: '',
+				wxOpendata: '',
+			}
+		},
+		onLoad() {
+
+			this.wxOpendata = uni.getStorageSync("wxOpendata");
+		},
+		methods: {
+
+			goTreaty() {
+				uni.navigateTo({
+					url: '../me/treaty'
+				})
+			},
+			goIntimity() {
+				uni.navigateTo({
+					url: '../me/intimity'
+				})
+			},
+
+			getWxdata() {
+				var that = this;
+				uni.getUserProfile({
+					lang: 'zh_CN',
+					desc: '登录',
+					success: (res) => {
+						console.log(res);
+						that.wxdata = res;
+						uni.setStorage({
+							key: 'wxdata',
+							data: res,
+							success: function() {
+								that.ipLogin()
+							}
+						});
+					},
+					fail: (res) => {
+						console.log(res)
+					}
+				});
+			},
+			gologin() {
+				if (this.privacyCk == false) {
+					
+					uni.showToast({
+						title: '您需要同意相关服务协议与隐私政策',
+						icon: 'none',
+						duration: 3000
+					});
+					return
+				}
+				if (this.show) {
+					if (this.wxOpendata) {
+						this.openID = this.wxOpendata.openid;
+						this.wxdata = uni.getStorageSync("wxdata")
+						if (this.wxdata) {
+							this.phoneLogin()
+						} else {
+							this.getWxdata()
+						}
+
+					} else {
+						this.getWxdata()
+					}
+
+				}
+
+			},
+			ipLogin() {
+				var that = this;
+				uni.showLoading({});
+				uni.login({
+					provider: 'weixin',
+					success: function(loginRes) {
+						console.log(loginRes)
+						that.wxCode = loginRes.code
+						that.getWxOpenID()
+					}
+				});
+
+
+
+			},
+			getWxOpenID() {
+				this.$http('worldKeepCar/sys/getWxOpenID', {
+					code: this.wxCode,
+				}, 'GET').then(res => {
+					//console.log(res)
+					this.openID = res.data.openid;
+					// console.log(this.openID)
+					this.phoneLogin()
+				})
+			},
+			phoneLogin() {
+				this.$http('worldKeepCar/sys/phoneLogin', {
+					phone: this.phone,
+					code: this.code,
+					nickName: this.wxdata.userInfo.nickName,
+					headUrl: this.wxdata.userInfo.avatarUrl,
+					openID: this.openID,
+				}, ).then(res => {
+
+					uni.hideLoading();
+					if (res.code == 0) {
+						uni.setStorage({
+							key: 'logodata',
+							data: res.data,
+							success: function() {
+								that.ipLogin()
+							}
+						});
+						uni.showToast({
+							title: '登录成功',
+							icon: 'none',
+							duration: 3000
+						});
+						uni.switchTab({
+							url: '../index/index'
+						})
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 3000
+						});
+					}
+				})
+			},
+			input(phone) {
+				console.log(this.phone);
+				if (this.phone != '') {
+					this.isgreen = true;
+				}
+			},
+			yzminput() {
+				if (this.code != '' && this.phone != '') {
+					this.show = true;
+				}
+			},
+			sendSms() {
+				if (!this.isYzm) {
+					return false;
+				}
+				this.isYzm = false;
+				//this.clearIntervalDjs();
+				//return false;
+				if (this.phone === '') {
+					this.isYzm = true
+					uni.showToast({
+						title: '手机号不可为空',
+						icon: 'none',
+						duration: 3000
+					});
+				} else {
+					var reg = /^1[3456789]\d{9}$/;
+					if (!reg.test(this.phone)) {
+						uni.showToast({
+							title: '手机号格式不正确',
+							icon: 'none',
+							duration: 3000
+						});
+						this.isYzm = true
+					} else {
+						this.$http('worldKeepCar/sys/sendSms', {
+							phone: this.phone,
+						}, 'GET').then(res => {
+							this.isYzm = false;
+							/* uni.showToast({
+							     title: '发送成功',
+							 	 icon:'none',
+							     duration: 3000
+							 }); */
+							this.clearIntervalDjs()
+						})
+					}
+				}
+
+
+			},
+			clearIntervalDjs() {
+				const TIME_COUNT = 60;
+				if (!this.timer) {
+					this.cont = TIME_COUNT;
+					this.isYzm = false;
+					this.timer = setInterval(() => {
+						if (this.cont > 0 && this.cont <= TIME_COUNT) {
+							this.cont--;
+							this.yzmTxt = this.cont + 'S'
+						} else {
+							this.isYzm = true;
+							clearInterval(this.timer);
+							this.timer = null;
+							this.yzmTxt = "获取验证码"
+						}
+					}, 1000)
+				}
+			},
+			privacyClick() {
+				this.privacyCk = !this.privacyCk
+			},
+			blur1() {
+
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.tis {
+		color: #333333;
+		font-size: 44rpx;
+		padding-top: 78rpx;
+		padding-left: 58rpx;
+	}
+
+	.cont {
+		padding: 58rpx;
+	}
+
+	.phoneInput {
+		width: 604rpx;
+		height: 88rpx;
+		border-radius: 44rpx;
+		border: 2rpx solid #EEEEEE;
+		line-height: 88rpx;
+		color: #333333;
+		font-size: 30rpx;
+		padding-left: 30rpx;
+	}
+
+	.yzmBox {
+		width: 604rpx;
+		height: 88rpx;
+		border-radius: 44rpx;
+		border: 2rpx solid #EEEEEE;
+		line-height: 88rpx;
+		color: #999999;
+		font-size: 30rpx;
+		padding-left: 30rpx;
+		margin-top: 30rpx;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.yzmInput {
+		line-height: 88rpx;
+		color: #333333;
+		font-size: 30rpx;
+		height: 88rpx;
+	}
+
+	.yzmBtn {
+		padding-right: 30rpx;
+		border-left: 2rpx solid #EEEEEE;
+		padding-left: 20rpx;
+		height: 35rpx;
+		line-height: 35rpx;
+		margin-top: 26rpx;
+	}
+
+	.loginBtn {
+		width: 634rpx;
+		height: 88rpx;
+		background: #F5F5F5;
+		border-radius: 44rpx;
+		line-height: 88rpx;
+		text-align: center;
+		margin-top: 30rpx;
+		color: #999999;
+		font-size: 30rpx;
+	}
+
+	.privacy {
+		display: flex;
+		/* justify-content: center; */
+		font-size: 24rpx;
+		color: #CCCCCC;
+		padding-top: 34rpx;
+	}
+
+	.imgPrivacy {
+		width: 28rpx;
+		height: 28rpx;
+		margin-top: 2rpx;
+		margin-right: 10rpx;
+	}
+
+	.span1 {
+		color: #FF4F00;
+	}
+
+	.nock {
+		width: 22rpx;
+		height: 22rpx;
+		border-radius: 50%;
+		border: 2px solid #AEAEAE;
+		margin-top: 2rpx;
+		margin-right: 10rpx;
+	}
+
+	.green {
+		color: #FF4F00;
+	}
+
+	.okBtn {
+		background: #FF4F00;
+		color: #FFFFFF;
+	}
 </style>

pages/login/login.vue

@@ -73,6 +73,15 @@ export default {
 		             
 		 },
 		 gologin(){
+			 if (this.privacyCk == false) {
+			 	
+			 	uni.showToast({
+			 		title: '您需要同意相关服务协议与隐私政策',
+			 		icon: 'none',
+			 		duration: 3000
+			 	});
+			 	return
+			 }
 			 var that=this;
 			 this.$http('worldKeepCar/sys/wxLogin', {
 			    openID:this.wxOpendata.openid,

pages/me/me.vue

@@ -87,7 +87,7 @@
 
 		<!-- 我的 相关 -->
 		<view class="rowBoxBg">
-			<view class="rowBox" @click="gonavigateTo('../index/cailist')">
+			<view class="rowBox" @click="gonavigateTo('../index/cailist?fromMe=true')">
 				<view class="leftView">
 					<image src="../../static/img/icon_car.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">我的车库</view>
@@ -131,7 +131,7 @@
 					<image src="../../static/img/icon_dianhua.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">联系我们</view>
 				</view>
-				<view class="rightView" @click="call('400-203-221')">
+				<view class="rightView" @click="call(numList.tAbouts.contents)">
 					<view style="color: #666666; font-size: 28rpx; margin-right: 20rpx;">{{numList.tAbouts.contents}}</view>
 					<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
 				</view>
@@ -169,6 +169,7 @@
 				ueserInfo: '',
 				shopData: '',
 				numList: '',
+				uid:'',
 			}
 		},
 		onLoad() {
@@ -178,7 +179,10 @@
 			this.$common.isUserId()
 			this.ueserInfo = uni.getStorageSync("logodata");
 			this.shopData = uni.getStorageSync("shopData");
-			this.queryMyDetail();
+			this.uid = uni.getStorageSync("logodata").uid;
+			if (this.uid) {
+				this.queryMyDetail();
+			}
 		},
 		methods: {
 			goSet(){

pages/me/myAppraise.vue

@@ -28,7 +28,13 @@
 							<image src="../../static/img/icon_del.png" class="deleteBtn"
 								@click.stop="deleteItem(item, index)"></image>
 						</view>
-
+						
+						<view class="thirdView">
+							<view class="count">服务态度：{{item.Serviceevaluation}}</view>
+							<view class="count">施工质量：{{item.Constructionevaluation}}</view>
+							<view class="count">店面环境：{{item.Storeevaluation}}</view>
+						</view>
+						
 						<view class="contentMes">{{item.EContent}}</view>
 
 						<!-- 照片 -->
@@ -82,11 +88,11 @@
 			this.getItemData()
 		},
 		methods: {
-			goDetail(item){
-				uni.navigateTo({
-					url:'myAppraiseDetail?id='+item.SheetID
-				})
-			},
+			// goDetail(item){
+			// 	uni.navigateTo({
+			// 		url:'myAppraiseDetail?id='+item.SheetID
+			// 	})
+			// },
 			previewImage(img, arrDic) {
 				var arr = [];
 
@@ -263,10 +269,20 @@
 		width: 36rpx;
 		height: 36rpx;
 	}
-
+	.thirdView{
+		display: flex;
+		justify-content: flex-start;
+		padding-top: 10rpx;
+		padding-bottom: 20rpx;
+	}
+	.count{
+		font-size: 24rpx;
+		color: #999999;
+		margin-right: 20rpx;
+	}
 	.contentMes {
 		font-size: 26rpx;
-		color: #666666;
+		color: #333333;
 		line-height: 37rpx;
 		/* padding-top: 20rpx; */
 

pages/me/myAppraiseDetail.vue

@@ -28,7 +28,13 @@
 							<image src="../../static/img/review_icon_del@2x.png" class="deleteBtn"
 								@click="deleteItem(detail, index)"></image>
 						</view>
-
+						
+						<view class="thirdView">
+							<view class="count">服务态度：{{detail.Serviceevaluation}}</view>
+							<view class="count">施工质量：{{detail.Constructionevaluation}}</view>
+							<view class="count">店面环境：{{detail.Storeevaluation}}</view>
+						</view>
+						
 						<view class="contentMes">{{detail.EContent}}</view>
 
 						<!-- 照片 -->
@@ -244,7 +250,17 @@
 		width: 36rpx;
 		height: 36rpx;
 	}
-
+	.thirdView{
+		display: flex;
+		justify-content: flex-start;
+		padding-top: 10rpx;
+		padding-bottom: 20rpx;
+	}
+	.count{
+		font-size: 24rpx;
+		color: #999999;
+		margin-right: 20rpx;
+	}
 	.contentMes {
 		font-size: 26rpx;
 		color: #666666;

pages/me/setup.vue

@@ -129,7 +129,7 @@ export default {
 		display: flex;
 		justify-content: space-between;
 		padding: 30rpx 0;
-		border-bottom: 1px solid #DDDDDD;
+		border-bottom: 1px solid #eeeeee;
 		font-size: 28rpx;
 		color: #3C3C3C;
 	}

pages/module/orderShop.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="box">
-		<view class="topTIs">门店确认收货后，才可选择预约时间</view>
+		<!-- <view class="topTIs">门店确认收货后，才可选择预约时间</view> -->
 		<view class="shopbox">
 			<view class="shopline" v-for="(item,index) in queryShopList">
 				<view class="shoplineLeft">
@@ -10,7 +10,7 @@
 				<view class="shopright">
 					<view class="shopTop">
 						<view class="shopName">{{item.shopName}}</view>
-						<image src="../../static/img/shopcall.png" mode="" class="shopCallImg"></image>
+						<image src="../../static/img/shopcall.png" mode="" class="shopCallImg" @click="call(item.mobilePhone)"></image>
 					</view>
 					<view class="shopScore">
 						<span class="shopScore1" v-if="item.shopScore">{{item.shopScore}}</span>
@@ -61,6 +61,11 @@ export default {
 		
 	},
 	methods: {
+		call(mobilePhone){
+			uni.makePhoneCall({
+			    phoneNumber: mobilePhone
+			}); 
+		},
 		ckshop(item){
 			console.log(item)
 			var that=this;
@@ -108,6 +113,14 @@ export default {
 			this.$http('worldKeepCar/worldHome/getWorldShopInfoList', params,'GET').then(res => {
 				uni.hideLoading();
 				this.queryShopList=res.data
+				
+				// 处理 undefined和null转为空白字符串
+				this.queryShopList.forEach((item, index) => {
+					for (const key in item) {
+						item[key] = this.$praseStrEmpty(item[key])
+					}
+				})
+				
 			})
 		},
 		
@@ -120,6 +133,7 @@ export default {
 	.box{
 		min-height: 100vh;
 		background:#F4F5F7 ;
+		padding: 20rpx 0;
 	}
 	.topTIs{
 		font-size: 26rpx;

pages/order/evaluate.vue

@@ -105,11 +105,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/order/myorder.vue

@@ -13,7 +13,7 @@
 				<view class="itemTop">
 					<view style="color: #999999; font-size: 24rpx;">保养订单</view>
 					<view class="itemSheetState" v-if="item.SheetState==1">待付款</view>
-					<view class="itemSheetState" v-if="item.SheetState==2">待确定</view>
+					<view class="itemSheetState" v-if="item.SheetState==2">待确认</view>
 					<view class="itemSheetState" v-if="item.SheetState==3">待收货</view>
 					<view class="itemSheetState" v-if="item.SheetState==4">待服务</view>
 					<view class="itemSheetState" v-if="item.SheetState==5">已完成</view>
@@ -23,21 +23,25 @@
 					<view class="shopName">{{item.ShopName}}</view>
 					<view class="price">￥{{item.raleMoney}}</view>
 				</view>
-				<view class="itemName">{{item.itemNameList}}</view>
-				<view class="itemName">{{item.goodNameList}}</view>
-				<view class="plateNumber">{{item.PlateNumber}}</view>
+				<view class="itemName">{{item.itemNameList}},{{item.goodNameList}}</view>
+				
+				<view class="plateBg">
+					<view class="plateNumber">{{item.PlateNumber}}</view>
+					<view class="plateNumber">
+						<!-- ChangeState  更换门店：1待处理2更换成功3更换关闭    3的不展示 -->
+						<view class="orderState" v-if="item.ChangeState==1">更换门店中</view>
+						<view class="orderState" v-if="item.ChangeState==2">更换成功</view>
+						
+						<view style="width: 20rpx;"></view>
+						<!-- ServiceState  退款申请：1待处理2退款成功3退款关闭    3的不展示 -->
+						<view class="orderState" v-if="item.ServiceState==1">退款中</view>
+						<view class="orderState" v-if="item.ServiceState==2">退款成功</view>
+					</view>
+				</view>
 
 				<view class="itemLineBottom">
 					<view class="itemBtn2" v-if="item.SheetState==1" @click.stop="orderPay(item)">立即支付</view>
 					
-					<!-- ChangeState  更换门店：1待处理2更换成功3更换关闭    3的不展示 -->
-					<view class="orderState" v-if="item.ChangeState==1">更换门店中</view>
-					<view class="orderState" v-if="item.ChangeState==2">更换成功</view>
-					
-					<!-- ServiceState  退款申请：1待处理2退款成功3退款关闭    3的不展示 -->
-					<view class="orderState" v-if="item.ServiceState==1">退款中</view>
-					<view class="orderState" v-if="item.ServiceState==2">退款成功</view>
-					
 
 					<view class="itemBtn2" v-if="item.SheetState==5&&item.EvaluateState==0&&item.EState==1"
 						@click.stop="goEvaluate(item)">
@@ -258,7 +262,7 @@
 	.itemShopBg {
 		display: flex;
 		justify-content: space-between;
-		margin: 20rpx 0;
+		margin-top: 20rpx;
 	}
 
 	.shopName {
@@ -274,17 +278,23 @@
 	.itemName {
 		color: #666666;
 		font-size: 24rpx;
-
+		padding: 16rpx 0;
 		height: 30rpx;
 		overflow: hidden;
 		text-overflow: ellipsis;
 		white-space: nowrap;
 	}
-
+	.plateBg{
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
 	.plateNumber {
 		color: #666666;
 		font-size: 24rpx;
-		margin: 15rpx 0 20rpx;
+		margin-bottom: 20rpx;
+		display: flex;
+		
 	}
 
 	.itemLineBottom {

pages/refundMoney/refundMoney.vue

@@ -126,19 +126,22 @@
 				}, 'POST').then(res => {
 					uni.hideLoading();
 					if(res.code==0){
-						uni.showToast({
-							title: '提交成功',
-							icon: 'none',
-							duration: 2000,
+						uni.showModal({
+						    title: '退款申请成功，请等待平台处理',
+						    content: '您可以在【我的-退款申请记录】列表里具体查看申请的处理进度哦~',
+							showCancel:false,
+							confirmText:'知道了',
+						    success: function (res) {
+						        if (res.confirm) {
+						           uni.navigateBack({
+						           	
+						           })
+						        } 
+						    }
 						});
-						setTimeout(function() {
-							uni.navigateBack({
-								
-							})
-						}, 2000); 	
+							
 					}
 					
-					
 							
 				})
 			},
@@ -156,16 +159,19 @@
 				}, 'POST').then(res => {
 					uni.hideLoading();
 					if(res.code==0){
-						uni.showToast({
-							title: '提交成功',
-							icon: 'none',
-							duration: 2000,
+						uni.showModal({
+						    title: '退款申请成功，请等待平台处理',
+						    content: '您可以在【我的-退款申请记录】列表里具体查看申请的处理进度哦~',
+							showCancel:false,
+							confirmText:'知道了',
+						    success: function (res) {
+						        if (res.confirm) {
+						           uni.navigateBack({
+						           	
+						           })
+						        } 
+						    }
 						});
-						setTimeout(function() {
-							uni.navigateBack({
-								
-							})
-						}, 2000); 	
 					}
 					
 					

pages/refundMoney/refundMoneyDetail.vue

@@ -20,23 +20,28 @@
 					</image>
 
 				</view>
-				<!-- 进度条 文字提示 -->
-				<view class="progressT">
-					<view class="stateView">
-						<view class="progressTitle">提交申请</view>
-						<view class="time" v-if="state>0">{{detailData.createTime}}</view>
-					</view>
-					<view style="width: 9%;"></view>
-					<view class="stateView">
-						<view class="progressTitle">平台审核</view>
-						<view class="time" v-if="state>1">{{detailData.handlerTime}}</view>
-					</view>
-					<view style="width: 9%;"></view>
-					<view class="stateView">
-						<view class="progressTitle">平台同意退款</view>
-						<view class="time" v-if="state>2">{{detailData.handlerTime}}</view>
-					</view>
-				</view>
+				
+				<!-- 进度条 文字提示 -->
+				
+				<view class="progressT">
+					<view class="progressTitle">提交申请</view>
+					<view style="width: 9%;"></view>
+					<view class="progressTitle">平台审核</view>
+					<view style="width: 9%;"></view>
+					<view class="progressTitle">平台同意退款</view>
+					
+					
+				</view>
+				
+				<view class="progressT">
+					<view class="time" v-if="state>0">{{detailData.createTime.slice(0,detailData.createTime.length-3)}}</view>
+					<view style="width: 7%;"></view>
+					<view class="time" v-if="state>1">{{detailData.handlerTime.slice(0,detailData.handlerTime.length-3)}}</view>
+					<view style="width: 8%;"></view>
+					<view class="time" v-if="state>2">{{detailData.handlerTime.slice(0,detailData.handlerTime.length-3)}}</view>
+					
+				</view>
+				
 			</view>
 
 			<!-- 退款关闭 -->
@@ -95,7 +100,7 @@
 			</view>
 			<view class="informationLine">
 				<view class="informationTxt">补充描述：</view>
-				<view class="informationNum" v-if="detailData.applyReasonComment!=null">
+				<view class="informationNum" style="width: 80%;" v-if="detailData.applyReasonComment!=null">
 					{{detailData.applyReasonComment}}</view>
 			</view>
 			<view class="informationLine">
@@ -234,13 +239,24 @@
 				
 				uni.navigateTo({
 					
-					url:'refundMoney?edit=true'+'&editId='+this.detailData.id+'&money='+this.detailData.money+'&reasonId='+this.detailData.applyReasonID+'&reason='+this.detailData.applyReason+'&exeContent='+this.detailData.applyReasonComment
+					url:'refundMoney?edit=true'+'&editId='+this.detailData.ID+'&money='+this.detailData.money+'&reasonId='+this.detailData.applyReasonID+'&reason='+this.detailData.applyReason+'&exeContent='+this.detailData.applyReasonComment
 				})
 			}
 			
 			
-		}
-	}
+		},
+		
+		onPullDownRefresh() {
+			
+			this.getData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		
+	}
+	
+	
 </script>
 
 <style>
@@ -311,15 +327,13 @@
 
 	}
 
-	.stateView {
-		width: 30%;
-
-	}
+	
 
 	.progressTitle {
 		color: #333333;
 		font-size: 22rpx;
-		text-align: center;
+		text-align: center;
+		width: 30%;
 	}
 
 	.time {

pages/refundMoney/refundMoneyList.vue

@@ -29,7 +29,7 @@
 				<!-- ServiceState"：1待处理2退款成功3退款关闭 -->
 				<view class="stateView" v-if="item.ServiceState==1">待平台处理</view>
 				<view class="stateView" v-if="item.ServiceState==2">退款成功</view>
-				<view class="stateView" v-if="item.ServiceState==2 && item.MoneyState==1">退款成功 退款金额￥{{item.Money}}元</view>
+				<view class="stateView" v-else-if="item.ServiceState==2 && item.MoneyState==1">退款成功 退款金额￥{{item.Money}}元</view>
 				<view class="stateView" v-if="item.ServiceState==3">退款关闭</view>
 				
 				<view style="display: flex; justify-content: flex-end;">

pages/shop/shopList.vue

@@ -5,7 +5,7 @@
 				<view class="search"><!-- 120rpx -->
 					<view class="searchVIew">
 						<image src="../../static/img/icon_search.png" mode="" class="searchIMg"></image>
-						<input type="text" value="" placeholder="请输入门店名称" class="searchInput" v-model="shopName" @confirm="searchList" />
+						<input type="text" value="" placeholder-style="color:#999999" placeholder="请输入门店名称" class="searchInput" v-model="shopName" @confirm="searchList" />
 					   <image src="../../static/img/icon_search_del.png" v-show="shopName" mode="" class="ssScImg" @click="searchSc"></image>
 					</view>
 				</view>
@@ -101,6 +101,7 @@ export default {
 			levelShow:false,
 			comprehensiveShow:false,
 			showCity:false,
+			uid:'',
 		}
 	},
 	onShow() {
@@ -113,8 +114,12 @@ export default {
 		 if(this.location){
 		 	this.cityname=this.location.cityname
 		 }
-		  this.getqueryShopList()//获取全部门店列表
-		 this.getqueryBShopLevel()//查询门店等级
+		 
+		 this.uid = uni.getStorageSync("logodata").uid;
+		 if (this.uid) {
+		 	this.getqueryShopList()//获取全部门店列表
+		 	this.getqueryBShopLevel()//查询门店等级
+		 }
 	},
 	onLoad() {
         
@@ -163,6 +168,13 @@ export default {
 			 },'GET').then(res => {
 				uni.hideLoading();
 				this.queryShopList=res.data
+				
+				// 处理 undefined和null转为空白字符串
+				this.queryShopList.forEach((item, index) => {
+					for (const key in item) {
+						item[key] = this.$praseStrEmpty(item[key])
+					}
+				})
 			})
 		},
 		getqueryBShopLevel(){
@@ -243,7 +255,7 @@ export default {
 		height: 72rpx;
 	}
 	.searchInput{
-		color: #999999;font-size: 28rpx;padding-left: 16rpx;
+		color: #333333;font-size: 28rpx;padding-left: 16rpx;
 		height: 72rpx;line-height: 72rpx;width: 570rpx;
 	}
 	.screenJt{