1.改bug

components/chose-city/chose-city.vue

@@ -219,9 +219,13 @@
 					},
 					fail(err) {
 						console.log(err)
-						that.cityname = uni.getStorageSync("location").cityname;
-						that.citydw.name = uni.getStorageSync("location").cityname
-						that.citydw.citycode = uni.getStorageSync("location").cityCode
+						// that.cityname = uni.getStorageSync("location").cityname;
+						// that.citydw.name = uni.getStorageSync("location").cityname
+						// that.citydw.citycode = uni.getStorageSync("location").cityCode
+						uni.showToast({
+							icon:'none',
+							title: '获取用户定位失败，请手动选择当前城市'
+						})
 					}
 				});
 			},

pages.json

@@ -273,6 +273,25 @@
             }
             
         }
+        ,{
+            "path" : "pages/module/usableDiscountCard",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "优惠券",
+                "enablePullDownRefresh": true
+            }
+            
+        },
+		{
+		    "path" : "pages/shop/shopAppraise",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "门店评价",
+		        "enablePullDownRefresh": true
+		    }
+		    
+		}
+		
     ],
 	"tabBar": {
 		"color": "#8a8a8a",

pages/changeStore/changeStore.vue

@@ -69,7 +69,8 @@
 	export default {
 		data() {
 			return {
-				sheetId: '',
+				sheetId: '',
+				oldShopID:'',
 				oldStoreName: '',
 				oldStoreAddress: '',
 				store: '',
@@ -81,19 +82,22 @@
 				exeContent: '',
 				edit: '', //修改申请
 				editId: '',
-
+				brand:'',
 			}
 		},
 		onLoad(opt) {
-			this.sheetId = opt.sheetId;
+			this.sheetId = opt.sheetId;
+			this.oldShopID = opt.oldShopID;
 			this.oldStoreName = opt.oldStoreName;
 			this.oldStoreAddress = opt.oldStoreAddress;
 			this.getChangeData();
-			console.log(this.sheetId);
-
+			console.log(this.sheetId);
+			this.brand = opt.brand;
+			
 			//修改申请
 			this.edit = opt.edit;
-			this.editId = opt.editId;
+			this.editId = opt.editId;
+			this.oldShopID = opt.oldShopID;
 			this.oldStoreName = opt.oldStoreName;
 			this.oldStoreAddress = opt.oldStoreAddress;
 			this.store = opt.store;
@@ -114,8 +118,9 @@
 			
 		},
 		methods: {
-			submit() {
-				if (this.store == '') {
+			submit() {
+				console.log(this.reason, this.reasonId);
+				if (!this.store) {
 					uni.showToast({
 						title: '请选择更换门店',
 						icon: 'none',
@@ -123,7 +128,7 @@
 					});
 					return;
 				}
-				if (this.reasonId == '') {
+				if (!this.reasonId) {
 					uni.showToast({
 						title: '请选择更换原因',
 						icon: 'none',
@@ -247,7 +252,7 @@
 			storeChange(e) {
 				uni.navigateTo({
 
-					url: '../module/orderShop?fromChangeStore=true'
+					url: '../module/orderShop?fromChangeStore=true'+'&oldShopID='+this.oldShopID+'&brand='+this.brand
 				})
 			},
 			reasonChange(e) {

pages/changeStore/changeStoreDetail.vue

@@ -124,12 +124,12 @@
 			<view class="informationLine">
 				<view class="informationTxt">申请单号：</view>
 				<view class="informationNum">{{detailData.changeCode}}</view>
-				<view class="copyBtn" @click="copy(orderData.changeCode)">复制</view>
+				<view class="copyBtn" @click="copy(detailData.changeCode)">复制</view>
 			</view>
 			<view class="informationLine">
 				<view class="informationTxt">订单单号：</view>
 				<view class="informationNum">{{detailData.sheetCode}}</view>
-				<view class="copyBtn" @click="copy(orderData.sheetCode)">复制</view>
+				<view class="copyBtn" @click="copy(detailData.sheetCode)">复制</view>
 				<view style="color: #3F90F7; font-size: 26rpx; margin-left: 50rpx;" @click="goOrderDetail()">详情</view>
 			</view>
 
@@ -257,7 +257,7 @@
 				
 				uni.navigateTo({
 					
-					url:'changeStore?edit=true'+'&editId='+this.detailData.id+'&oldStoreName='+this.detailData.oldShopName+'&oldStoreAddress='+this.detailData.oldShopAddress+'&store='+this.detailData.newShopName+'&storeId='+this.detailData.newShopID+'&reasonId='+this.detailData.applyReasonID+'&reason='+this.detailData.applyReason+'&exeContent='+this.detailData.applyReasonComment
+					url:'changeStore?edit=true'+'&editId='+this.detailData.id+'&oldShopID='+this.detailData.oldShopID+'&oldStoreName='+this.detailData.oldShopName+'&oldStoreAddress='+this.detailData.oldShopAddress+'&store='+this.detailData.newShopName+'&storeId='+this.detailData.newShopID+'&reasonId='+this.detailData.applyReasonID+'&reason='+this.detailData.applyReason+'&exeContent='+this.detailData.applyReasonComment+'&brand='+this.detailData.brand
 				})
 			}
 			

pages/index/carModel.vue

@@ -524,6 +524,11 @@ export default {
 	}
 	.zdyNavContLeft{
 		
+	}
+	.zdyNavContTitle{
+		color: #000000;
+		font-size: 30rpx;
+		font-weight: bold;
 	}
 	.zdyNavContRight{
 		width: 100px;

pages/index/index.vue

@@ -51,6 +51,7 @@
 			<view class="mesView">
 				<view class="leftTitle">车型</view>
 				<view class="carModBtn selectColor" v-if="memberCar">{{memberCar.carModel}}</view>
+				<view class="carModBtn noSelectColor" v-else>车型</view>
 
 			</view>
 
@@ -96,6 +97,7 @@
 				time: '',
 				mileage: '',
                 autoplay:true,
+				brand:'',
 			}
 		},
 		onLoad() {
@@ -169,6 +171,7 @@
 						this.mileage =''
 					}
 					
+					this.brand = res.data.memberCar.brand
 
 					var cardata = uni.getStorageSync("maintainCarData")
 					
@@ -189,8 +192,18 @@
 				if (!this.uid) {
 					this.goLonIn();
 				}
+				console.log(this.location.cityCode);
+				if (!this.location.cityCode) {
+					uni.showToast({
+						title:'请选择城市',
+						icon:'none',
+						duration: 3000,
+					})
+					return
+				}
+				
 				uni.navigateTo({
-					url: '../module/maintain'
+					url: '../module/maintain?brand='+this.brand
 				})
 			},
 
@@ -285,7 +298,7 @@
 
 	.bBannerList {
 		width: 100%;
-		height: 300rpx;
+		height: 100%;
 		background-color: #F4F5F7;
 	}
 

pages/login/empower.vue

@@ -78,6 +78,9 @@
 				});
 				
 				that.souquan = false;
+				setTimeout(function() {
+					that.souquan = true;
+				}, 2000);
 			},
 			//api uni.login
 			ipLogin() {

pages/login/iphoneLogin.vue

@@ -84,7 +84,7 @@
 				if (this.privacyCk == false) {
 					
 					uni.showToast({
-						title: '您需要同意相关服务协议与隐私政策',
+						title: '您需要先同意相关服务协议与隐私政策',
 						icon: 'none',
 						duration: 3000
 					});

pages/login/login.vue

@@ -76,7 +76,7 @@ export default {
 			 if (this.privacyCk == false) {
 			 	
 			 	uni.showToast({
-			 		title: '您需要同意相关服务协议与隐私政策',
+			 		title: '您需要先同意相关服务协议与隐私政策',
 			 		icon: 'none',
 			 		duration: 3000
 			 	});
@@ -148,7 +148,7 @@ export default {
 			background-size: 100%;
 	}
 	.loginLogo{
-		width: 215rpx;height: 111rpx;
+		width: 220rpx;height: 133rpx;
 		
 	}
 	.box{

pages/me/discountCard.vue

@@ -1,288 +1,286 @@
-<template>
-	<view class="content">
-
-		<view class="teamTop">
-			<view class="sumCount">可使用优惠券</view>
-		</view>
-
-		<!-- 列表 -->
-		<view class="itemContent">
-			<view v-for="(item,index) in itemData" :key="index">
-				<view class="item">
-
-					<!-- 第一块 -->
-					<view class="topView" @click="ckCoupon(item)">
-						<view class="leftView">
-							<view class="moneyView">
-								<view>￥</view>
-								<view class="money">{{item.ActMoney}}</view>
-							</view>
-							<view class="condition" v-if="item.WhereMoney != 0">满{{item.WhereMoney}}元可用</view>
-							<view class="condition" v-else>满任意金额可用</view>
-						</view>
-
-						<view class="rightView">
-							<view class="cardName">{{item.ActName}}</view>
-							<!-- 时间截取 -->
-							<view class="valid">有效期：{{item.StartTime.slice(0,item.StartTime.length-8)}}至 {{item.EndTime.slice(0,item.EndTime.length-8)}}</view>
-						</view>
-					</view>
-
-					<!-- 第二快 -->
-					<view class="bottomView">
-						<view>发放门店：{{item.UsedShopName}}</view>
-						<view @click="goDiscountDetail(item)">查看详情</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<!-- 上拉 加载更多 -->
-		<view class="noMore" v-if="noMoreShow">没有更多数据</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: [],
-				page: 1,
-				noMoreShow: false,
-				payMoney:'',
-			}
-		},
-		onLoad(opt) {
-			this.page = 1
-			if(opt.payMoney){
-				this.payMoney=opt.payMoney;
-				this.myOrderCoupon()
-			}else{
-				this.getItemData()
-			}
-			
-		},
-		methods: {
-			ckCoupon(item){
-				console.log(item);
-				if(this.payMoney){
-					uni.setStorage({
-						key: 'couponData',
-						data: item,
-						success: function () {
-							uni.navigateBack({
-								delta:1
-							})
-						}
-					}); 
-				}else{
-					uni.navigateTo({
-						url: 'discountDetail?couponId=' + item.ID,
-					})
-				}
-			},
-			myOrderCoupon(){
-				uni.showLoading({
-					title: '加载中'
-				})
-				this.$http('worldKeepCar/maintainOrder/myOrderCoupon', {
-				  money:this.payMoney,
-				  /* page:this.page,
-				  limit:10, */
-				 },'GET').then(res => {
-					uni.hideLoading();
-					var list = res.data
-					
-					// 处理 undefined和null转为空白字符串
-					list.forEach((item, index) => {
-						for (const key in item) {
-							item[key] = this.$praseStrEmpty(item[key])
-						}
-					})
-					
-					if (this.page == 1) {
-						this.itemData = list
-					} else {
-						this.itemData = this.itemData.concat(list)
-					}
-					
-					if (list.length < 10) {
-						this.noMoreShow = false
-					} else {
-						this.noMoreShow = true
-					}
-				})
-			},
-			goDiscountDetail(item) {
-
-				uni.navigateTo({
-					url: 'discountDetail?couponId=' + item.ID,
-				})
-			},
-			getItemData() {
-				uni.showLoading({
-					title: '加载中'
-				})
-				let url = 'worldKeepCar/keepCarMy/listTCouponMemberPage',
-					params = {
-						page: this.page,
-						limit: 20,
-
-					}
-				this.$http(url, params, 'GET').then(res => {
-					uni.hideLoading();
-					var list = res.data.Items
-
-					// 处理 undefined和null转为空白字符串
-					list.forEach((item, index) => {
-						for (const key in item) {
-							item[key] = this.$praseStrEmpty(item[key])
-						}
-					})
-
-
-					if (this.page == 1) {
-						this.itemData = list
-					} else {
-						this.itemData = this.itemData.concat(list)
-					}
-
-					if (list.length < 10) {
-						this.noMoreShow = false
-					} else {
-						this.noMoreShow = true
-					}
-					
-					
-				})
-			},
-
-		},
-
-		// 下拉刷新 上拉加载更多
-		onPullDownRefresh() {
-			this.page = 1
-			if(opt.payMoney){
-				
-				this.myOrderCoupon()
-			}else{
-				this.getItemData()
-			}
-			//this.getItemData()
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		onReachBottom() {
-			this.page++;
-			if(opt.payMoney){
-				
-				this.myOrderCoupon()
-			}else{
-				this.getItemData()
-			}
-		},
-
-	}
-</script>
-
-<style scoped>
-	.content {
-		background: #F4F5F7;
-		min-height: 100vh;
-
-	}
-
-	.teamTop {
-		position: fixed;
-		top: 0rpx;
-		left: 0rpx;
-		background-color: #F4F5F7;
-		width: 100%;
-		height: 77rpx;
-	}
-
-	.sumCount {
-		padding: 20rpx 24rpx;
-		color: #999999;
-		font-size: 26rpx;
-	}
-
-	.itemContent {
-		padding: 55rpx 20rpx 24rpx;
-	}
-
-	.item {
-		margin: 20rpx 0rpx;
-		background-color: #FFFFFF;
-		border-radius: 10rpx;
-
-	}
-
-	.topView {
-		display: flex;
-		justify-content: flex-start;
-		padding: 22rpx 0rpx;
-		margin-left: 22rpx;
-		margin-right: 22rpx;
-		border-bottom: 1rpx #CCCCCC dashed;
-		align-items: center;
-	}
-
-	.leftView,
-	.rightView {
-		margin-right: 40rpx;
-		
-	}
-
-	.moneyView {
-		display: flex;
-		justify-content: flex-start;
-		color: #FF4F00;
-		align-items: baseline;
-	}
-
-	.money {
-		font-size: 56rpx;
-	}
-
-	.condition {
-		font-size: 22rpx;
-		color: #999999;
-	}
-
-	.cardName {
-		font-size: 30rpx;
-		font-weight: bold;
-		color: #333333;
-		margin-top: 10rpx;
-		margin-bottom: 15rpx;
-	}
-
-	.valid {
-		font-size: 26rpx;
-		color: #999999;
-	}
-
-	.bottomView {
-		display: flex;
-		justify-content: space-between;
-		padding: 20rpx 24rpx;
-		font-size: 24rpx;
-		color: #666666;
-	}
-
-	.noMore {
-		text-align: center;
-		line-height: 50rpx;
-		color: #999999;
-		font-size: 28rpx;
+<template>
+	<view class="content">
+
+		<view class="topTab">
+			<!-- tab -->
+			<view class="tab">
+				<view class="tabLine" :class="{tabActive:tabIndex==1}" @click="tabClick(1)">未使用</view>
+				<view class="tabLine" :class="{tabActive:tabIndex==2}" @click="tabClick(2)">已使用</view>
+				<view class="tabLine" :class="{tabActive:tabIndex==3}" @click="tabClick(3)">已过期</view>
+			</view>
+
+		</view>
+
+		<!-- 列表 -->
+		<view class="itemContent">
+			<view v-for="(item,index) in itemData" :key="index">
+				<view class="item">
+					<image src="../../static/img/icon_yishiyong.png" mode="" class="stateImg" v-if="tabIndex==2">
+					</image>
+					<image src="../../static/img/icon_yiguoqi.png" mode="" class="stateImg" v-if="tabIndex==3"></image>
+					<!-- 第一块 -->
+					<view class="topView">
+						<view class="leftView">
+							<view class="moneyView">
+								<view>￥</view>
+								<view class="money">{{item.ActMoney}}</view>
+							</view>
+							<view class="condition" v-if="item.WhereMoney != 0">满{{item.WhereMoney}}元可用</view>
+							<view class="condition" v-else>满任意金额可用</view>
+						</view>
+
+						<view class="rightView">
+							<view class="cardName">{{item.ActName}}</view>
+							<!-- 时间截取 -->
+							<view class="valid">有效期：{{item.StartTime.slice(0,item.StartTime.length-8)}}至
+								{{item.EndTime.slice(0,item.EndTime.length-8)}}
+							</view>
+						</view>
+					</view>
+
+					<!-- 第二快 -->
+					<view class="bottomView">
+						<view class="shopNamesView">适用门店：{{item.shopNames}}</view>
+						<view @click="goDiscountDetail(item)">查看详情</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 上拉 加载更多 -->
+		<view class="noMore" v-if="noMoreShow">没有更多数据</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: [],
+				page: 1,
+				noMoreShow: false,
+				tabIndex: 1,
+			}
+		},
+		onLoad(opt) {
+			this.page = 1
+
+			this.getItemData()
+
+
+		},
+		methods: {
+			tabClick(num) {
+				this.tabIndex = num;
+				this.page = 1;
+				this.getItemData()
+			},
+
+
+			goDiscountDetail(item) {
+
+				uni.navigateTo({
+					url: 'discountDetail?couponId=' + item.ID,
+				})
+			},
+			getItemData() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				var usedState = ''
+				if (this.tabIndex == 1) {
+					usedState = 0
+				}
+				if (this.tabIndex == 2) {
+					usedState = 1
+				}
+				var expireState = ''
+				if (this.tabIndex == 3) {
+					expireState = 1
+				}
+
+				let url = 'worldKeepCar/keepCarMy/listTCouponMemberPage',
+					params = {
+						page: this.page,
+						limit: 20,
+						usedState: usedState,
+						expireState: expireState,
+
+					}
+				this.$http(url, params, 'GET').then(res => {
+					uni.hideLoading();
+					var list = res.data.Items
+
+					// 处理 undefined和null转为空白字符串
+					list.forEach((item, index) => {
+						for (const key in item) {
+							item[key] = this.$praseStrEmpty(item[key])
+						}
+					})
+
+
+					if (this.page == 1) {
+						this.itemData = list
+					} else {
+						this.itemData = this.itemData.concat(list)
+					}
+
+					if (list.length < 10) {
+						this.noMoreShow = false
+					} else {
+						this.noMoreShow = true
+					}
+
+
+				})
+			},
+
+		},
+
+		// 下拉刷新 上拉加载更多
+		onPullDownRefresh() {
+			this.page = 1
+
+			this.getItemData()
+
+			//this.getItemData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		onReachBottom() {
+			this.page++;
+
+			this.getItemData()
+
+		},
+
+	}
+</script>
+
+<style scoped>
+	.content {
+		background: #F4F5F7;
+		min-height: 100vh;
+
+	}
+
+	.topTab {
+		background: #FFFFFF;
+		position: fixed;
+		width: 100%;
+		height: 92rpx;
+		z-index: 99;
+	}
+
+	.tab {
+		background: #FFFFFF;
+		display: flex;
+		justify-content: space-around;
+		line-height: 90rpx;
+		height: 90rpx;
+		width: 100%;
+
+	}
+
+	.tabLine {
+
+		text-align: center;
+	}
+
+	.tabActive {
+		color: #FF4F00;
+		border-bottom: 4rpx solid #FF4F00;
+	}
+
+
+
+	.itemContent {
+		padding: 100rpx 20rpx 24rpx;
+	}
+
+	.item {
+		margin: 20rpx 0rpx;
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+
+	}
+
+	.stateImg {
+		width: 118rpx;
+		height: 86rpx;
+		position: absolute;
+		right: 20rpx;
+		margin-right: 20rpx;
+	}
+
+	.topView {
+		display: flex;
+		justify-content: flex-start;
+		padding: 22rpx 0rpx;
+		margin-left: 22rpx;
+		margin-right: 22rpx;
+		border-bottom: 1rpx #CCCCCC dashed;
+		align-items: center;
+	}
+
+	.leftView,
+	.rightView {
+		margin-right: 40rpx;
+
+	}
+
+	.moneyView {
+		display: flex;
+		justify-content: flex-start;
+		color: #FF4F00;
+		align-items: baseline;
+	}
+
+	.money {
+		font-size: 56rpx;
+	}
+
+	.condition {
+		font-size: 22rpx;
+		color: #999999;
+	}
+
+	.cardName {
+		font-size: 30rpx;
+		font-weight: bold;
+		color: #333333;
+		margin-top: 10rpx;
+		margin-bottom: 15rpx;
+	}
+
+	.valid {
+		font-size: 26rpx;
+		color: #999999;
+	}
+
+	.bottomView {
+		display: flex;
+		justify-content: space-between;
+		padding: 20rpx 24rpx;
+		font-size: 24rpx;
+		color: #666666;
 	}
+	.shopNamesView{
+		width: 80%;
+	}
+
+	.noMore {
+		text-align: center;
+		line-height: 50rpx;
+		color: #999999;
+		font-size: 28rpx;
+	}
 </style>

pages/me/discountDetail.vue

@@ -6,8 +6,8 @@
 
 			<!-- firstView -->
 			<view class="firstView">
-				<view class="money">{{detailData.actName}}</view>
-				<view class="condition" v-if="detailData.whereMoney != 0">满{{detailData.whereMoney}}元可用</view>
+				<view class="money">{{detailData.ActName}}</view>
+				<view class="condition" v-if="detailData.WhereMoney != 0">满{{detailData.WhereMoney}}元可用</view>
 				<view class="condition" v-else>满任意金额可用</view>
 			</view>
 			<view class="point leftP"></view>
@@ -16,18 +16,18 @@
 			<!-- secondView -->
 			<view class="secondView">
 				
-				<view  v-if="detailData.endOffsetDays===null||detailData.endOffsetDays==='null'||detailData.endOffsetDays===''">
+				<view  v-if="detailData.EndOffsetDays===null||detailData.EndOffsetDays==='null'||detailData.EndOffsetDays===''">
 					
-					<view class="valid same" >有效期：{{detailData.startTime.slice(0,detailData.startTime.length-8)}}至 {{detailData.endTime.slice(0,detailData.endTime.length-8)}}</view>
+					<view class="valid same" >有效期：{{detailData.StartTime.slice(0,detailData.StartTime.length-8)}}至 {{detailData.EndTime.slice(0,detailData.EndTime.length-8)}}</view>
 				</view>
 				<view v-else>
 				
-					<view class="valid same" v-if="detailData.endOffsetDays>-1">有效期：自领取后，{{detailData.endOffsetDays}}天有效</view>
-				     <view class="valid same" v-if="detailData.endOffsetDays==-1||detailData.endOffsetDays==null||detailData.endOffsetDays=='null'">有效期：{{detailData.startTime.slice(0,detailData.startTime.length-8)}}至 {{detailData.endTime.slice(0,detailData.endTime.length-8)}}</view>
+					<view class="valid same" v-if="detailData.EndOffsetDays>-1">有效期：自领取后，{{detailData.EndOffsetDays}}天有效</view>
+				     <view class="valid same" v-if="detailData.EndOffsetDays==-1||detailData.EndOffsetDays==null||detailData.EndOffsetDays=='null'">有效期：{{detailData.StartTime.slice(0,detailData.StartTime.length-8)}}至 {{detailData.EndTime.slice(0,detailData.EndTime.length-8)}}</view>
 				</view>
 				
 				
-				<view class="same">可用次数：{{detailData.avaQty}}</view>
+				<!-- <view class="same">可用次数：{{detailData.avaQty}}</view> -->
 			</view>
 
 			<!-- thirdView -->
@@ -66,7 +66,7 @@
 		},
 		onLoad(opt) {
 			this.couponId = opt.couponId,
-			this.page = 1
+			
 			this.getDetailData()
 		},
 		methods: {
@@ -83,8 +83,8 @@
 					uni.hideLoading();
 					var data = res.data
 					
-					if(res.data.couContent){
-						 this.couContent=res.data.couContent.replace(/\<p/gi, '<p style="display: inline-block"');
+					if(res.data.CouContent){
+						 this.couContent=res.data.CouContent.replace(/\<p/gi, '<p style="display: inline-block"');
 					}
 					// 处理 undefined和null转为空白字符串
 					

pages/module/confirmOrder.vue

@@ -5,8 +5,8 @@
 			<view class="topShopName">{{orderShop.shopName}}</view>
 			<view class="topShopAdress">
 				<image src="../../static/img/topshopicon.png" mode="" class="topShopAdressIcon"></image>
-			    <view class="topShopjl" v-if="orderShop.distance">{{orderShop.distance}}KM</view>
-				<view class="topShopAdressTxt">{{orderShop.address}}</view>
+			    <view class="topShopjl" v-if="orderShop.distance">{{orderShop.distance}}km</view>
+				<view class="topShopAdressTxt" v-if="orderShop.address">{{orderShop.address}}</view>
 			</view>
 		</view>
 		
@@ -29,9 +29,9 @@
 				<view class="topLine borderB" v-if="!iphoneData">
 					<view class="toplineLeft">
 						<view class="topTitle">联系人:</view>
-						<view class="topTxt"></view>
+						<view style="color: #999999; font-size: 28rpx;" @click="gophone">请选择</view>
 					</view>
-					<view class="topLineRight" @click="gophone">添加></view>
+					<view style="width: 14rpx; height: 23rpx; color: #999999;">></view>
 				</view>
 				
 				
@@ -49,7 +49,7 @@
 				<view class="goodsItemRight" >
 					<view class="goodsItemName">{{v.goodsName}}</view>
 					<view class="goodsItemBottom">
-						<view class="goodssalePrice">￥{{v.salePrice}}</view>
+						<view class="goodssalePrice">￥{{v.salePrice?v.salePrice:'0.00'}}</view>
 						<view class="goodsNum">x{{v.qty}}</view>
 					</view>
 				</view>
@@ -62,7 +62,7 @@
 				<view class="goodsItemRight" >
 					<view class="goodsItemName">{{v.itemName}}</view>
 					<view class="goodsItemBottom">
-						<view class="goodssalePrice">￥{{v.salePrice}}</view>
+						<view class="goodssalePrice">￥{{v.salePrice?v.salePrice:'0.00'}}</view>
 						
 					</view>
 				</view>
@@ -89,7 +89,7 @@
 			<view class="payTxt">￥{{goodsMoney.toFixed(2)}}</view>
 		</view>
 		<view class="payLIne borderB">
-			<view class="payTitle">项目费</view>
+			<view class="payTitle">工时费</view>
 			<view class="payTxt">￥{{itemMoney.toFixed(2)}}</view>
 		</view>
 		<view class="payLIne" @click="gocoupon">
@@ -139,6 +139,7 @@ export default {
 			couponMoney:'',
 			yhTotalSize:0,
 			orderShop:'',
+			brands:'',
 		}
 	},
 	onLoad(opt) {
@@ -235,7 +236,7 @@ export default {
 			var payMoney=this.goodsMoney+this.itemMoney;
 			//payMoney=40
 			uni.navigateTo({
-				url:'../me/discountCard?payMoney='+payMoney
+				url:'usableDiscountCard?payMoney='+payMoney
 			})
 		},
 		settlement(){

pages/module/maintain.vue

@@ -59,7 +59,7 @@
 												<view class="replace" @click.stop="replace(vf,index,findex,i)" v-if="vf.length>1">更换</view>
 											</view>
 											<view class="goodsCOntBOttom">
-												<view class="salePrice">￥{{v.salePrice}}</view>
+												<view class="salePrice">￥{{v.salePrice?v.salePrice:'0.00'}}</view>
 												<view class="as">
 													<view class="asa" @click.stop="reduce(v)">-</view>
 													<view class="asNum">{{v.qty}}</view>
@@ -176,9 +176,10 @@ export default {
 			orderData:[],
 			replaceIndex1:'',
 			replaceIndex2:'',
+			brand:'',
 		}
 	},
-	onLoad() {
+	onLoad(opt) {
 		this.$common.isUserId()
         this.maintainCarData=uni.getStorageSync("maintainCarData");
 		//console.log(this.maintainCarData)
@@ -186,6 +187,9 @@ export default {
 		if(this.maintainCarData.milage==0){
 			this.maintainCarData.milage='';
 		}
+		if (opt.brand) {
+			this.brand = opt.brand
+		}
         this.getData();
 	},
 	onShow() {
@@ -376,7 +380,7 @@ export default {
 					url:'confirmOrder?orderData='+JSON.stringify(this.orderData)+'&currentMileage='+this.maintainCarData.milage
 				}) */
 				uni.navigateTo({
-					url:'orderShop?orderData='+JSON.stringify(this.orderData)+'&currentMileage='+this.maintainCarData.milage
+					url:'orderShop?orderData='+JSON.stringify(this.orderData)+'&currentMileage='+this.maintainCarData.milage+'&brand='+this.brand
 				}) 
 			}
 			
@@ -525,9 +529,11 @@ export default {
 	}
 	.topLeft{
      display: flex;
+	 justify-content: space-between;
 	}
 	.carName{
-		padding-left: 10rpx;
+		margin-left: 10rpx;
+		width: 80%;
 	}
 	.topEdit{
 		width: 30rpx;

pages/module/orderShop.vue

@@ -1,226 +1,294 @@
-<template>
-	<view class="box">
-		<!-- <view class="topTIs">门店确认收货后，才可选择预约时间</view> -->
-		<view class="shopbox">
-			<view class="shopline" v-for="(item,index) in queryShopList">
-				<view class="shoplineLeft">
-					<image :src="item.photoPath" mode="" class="shopImg" v-if="item.photoPath"></image>
-					<image src="../../static/img/noimg.png" mode="" class="shopImg" v-else></image>
-				</view>
-				<view class="shopright">
-					<view class="shopTop">
-						<view class="shopName">{{item.shopName}}</view>
-						<image src="../../static/img/shopcall.png" mode="" class="shopCallImg" @click="call(item.mobilePhone)"></image>
-					</view>
-					<view class="shopScore">
+<template>
+	<view class="box">
+		<!-- <view class="topTIs">门店确认收货后，才可选择预约时间</view> -->
+		<view class="shopbox">
+			<view class="shopline" v-for="(item,index) in queryShopList">
+				<view class="shoplineLeft">
+					<image :src="item.photoPath" mode="" class="shopImg" v-if="item.photoPath"></image>
+					<image src="../../static/img/noimg.png" mode="" class="shopImg" v-else></image>
+				</view>
+				<view class="shopright">
+					<view class="shopTop">
+						<view class="shopName">{{item.shopName}}</view>
+						<image src="../../static/img/shopcall.png" mode="" class="shopCallImg"
+							@click="call(item.mobilePhone)"></image>
+					</view>
+					<view class="brandsBg">
 						<span class="shopScore1" v-if="item.shopScore">{{item.shopScore}}</span>
 						<span class="shopScore2" v-if="item.shopScore">分</span>
 						<span class="shopScore2" v-if="!item.shopScore">暂无评分</span>
-						<span class="shopScore3">服务次数 {{item.sheetSum}}</span>
+						<view class="brands" v-if="item.brands" v-for="(barnd,index2) in item.brands.split(',')">{{barnd}}</view>
 					</view>
-					<view class="shopTime"><span v-if="item.startTime">{{item.startTime}}</span> - <span v-if="item.endTime">{{item.endTime}}</span> </view>
-				    <view class="shopBottom">
-						<view class="shopBottomLeft">
-							<span v-if="item.distance&&item.distance!= '0.00'">{{item.distance}}km</span>
-							<span class="shopaddress">{{item.address}}</span>
-						</view>
-						<view class="Btn" @click="ckshop(item)">确定</view>
+					
+					<view class="timeBg">
+						<view class="shopTime"><span v-if="item.startTime">{{item.startTime}}</span> - <span
+								v-if="item.endTime">{{item.endTime}}</span> </view>
+						<span class="shopScore3">服务次数 {{item.sheetSum}}</span>
 					</view>
-				
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-
-export default {
-	components: {
-		
-	},
-	data() {
-		return {
-			orderData:'',
-			currentMileage:'',
-			location:'',
-			queryShopList:[],
-			fromChangeStore:'',
-		}
-	},
-	onShow() {
-		
-	},
-	onLoad(opt) {
-        this.orderData=opt.orderData;
-		this.currentMileage=opt.currentMileage;
-		this.location=uni.getStorageSync("location");
-		this.getqueryShopList()
-		
-		this.fromChangeStore = opt.fromChangeStore;
-		
-	},
-	methods: {
-		call(mobilePhone){
-			uni.makePhoneCall({
-			    phoneNumber: mobilePhone
-			}); 
-		},
-		ckshop(item){
-			console.log(item)
-			var that=this;
-			
-			if (that.fromChangeStore == 'true') {
-				console.log('更换门店');
-				// 从更换门店 进来 
-				uni.setStorage({
-					key: 'changeStore',
-					data: item,
-					success: function() {
-						uni.navigateBack({
-							
-						})
-					}
-				});
-			} 
-			else{
-				uni.setStorage({
-					key: 'orderShop',
-					data: item,
-					success: function() {
-						uni.navigateTo({
-							url:'confirmOrder?orderData='+that.orderData+'&currentMileage='+that.currentMileage
-						}) 
-					}
-				});
-			}
-			
-		},
-	
-		getqueryShopList(){
-			uni.showLoading({ });
-			var params={}
-			if(this.location.lat){
-				params={
-					lat:this.location.lat,
-					lng:this.location.lng,
-					cityCode:this.location.cityCode,
-					comprehensive:1,
-				}
-			}else{
-				
-			}
-			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])
-					}
-				})
-				
-			})
-		},
-		
-	
-	}
-}
-</script>
-
-<style scoped>
-	.box{
-		min-height: 100vh;
-		background:#F4F5F7 ;
-		padding: 20rpx 0;
-	}
-	.topTIs{
-		font-size: 26rpx;
-		text-align: center;
-		color: #C8841C;
-		height: 72rpx;
-		background: #FFF7EB;
-		line-height: 72rpx;
-		margin-bottom: 20rpx;
-	}
-	.shopbox{
-		padding:0 16rpx;
-	}
-	.shopline{
-		padding: 20rpx;
-		background: #FFFFFF;
-		border-radius: 10rpx;
-		margin-top: 20rpx;
+					
+					<view class="shopBottom">
+						<view class="shopBottomLeft">
+							<span v-if="item.distance&&item.distance!= '0.00'">{{item.distance}}km</span>
+							<span class="shopaddress">{{item.address}}</span>
+						</view>
+						<view v-if="fromChangeStore == 'true'">
+							<view class="grayBtn" v-if="item.shopId == oldShopID" >确定</view>
+							<view v-else class="Btn" @click="ckshop(item)">确定</view>
+						</view>
+
+						<view v-else class="Btn" @click="ckshop(item)">确定</view>
+					</view>
+
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				orderData: '',
+				currentMileage: '',
+				location: '',
+				queryShopList: [],
+				fromChangeStore: '',
+				oldShopID: '',
+				brand:'',
+			}
+		},
+		onShow() {
+
+		},
+		onLoad(opt) {
+			this.orderData = opt.orderData;
+			this.currentMileage = opt.currentMileage;
+			this.location = uni.getStorageSync("location");
+			this.brand = opt.brand;
+			
+			this.getqueryShopList()
+
+			this.fromChangeStore = opt.fromChangeStore;
+			this.oldShopID = opt.oldShopID;
+			
+		},
+		methods: {
+			call(mobilePhone) {
+				uni.makePhoneCall({
+					phoneNumber: mobilePhone
+				});
+			},
+			ckshop(item) {
+				console.log(item)
+				var that = this;
+
+				if (that.fromChangeStore == 'true') {
+					console.log('更换门店');
+					// 从更换门店 进来 
+					uni.setStorage({
+						key: 'changeStore',
+						data: item,
+						success: function() {
+							uni.navigateBack({
+
+							})
+						}
+					});
+				} else {
+					uni.setStorage({
+						key: 'orderShop',
+						data: item,
+						success: function() {
+							uni.navigateTo({
+								url: 'confirmOrder?orderData=' + that.orderData + '&currentMileage=' +
+									that.currentMileage
+							})
+						}
+					});
+				}
+
+			},
+
+			getqueryShopList() {
+				uni.showLoading({});
+				var params = {}
+				if (this.location.lat) {
+					params = {
+						lat: this.location.lat,
+						lng: this.location.lng,
+						cityCode: this.location.cityCode,
+						comprehensive: 1,
+						brand:this.brand,
+					}
+				} else {
+					params = {
+						
+						cityCode: this.location.cityCode,
+						comprehensive: 1,
+						brand:this.brand,
+					}
+				}
+				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])
+						}
+					})
+
+				})
+			},
+
+
+		}
+	}
+</script>
+
+<style scoped>
+	.box {
+		min-height: 100vh;
+		background: #F4F5F7;
+		padding: 20rpx 0;
+	}
+
+	.topTIs {
+		font-size: 26rpx;
+		text-align: center;
+		color: #C8841C;
+		height: 72rpx;
+		background: #FFF7EB;
+		line-height: 72rpx;
+		margin-bottom: 20rpx;
+	}
+
+	.shopbox {
+		padding: 0 16rpx;
+	}
+
+	.shopline {
+		padding: 20rpx;
+		background: #FFFFFF;
+		border-radius: 10rpx;
+		margin-top: 20rpx;
+		display: flex;
+	}
+
+	.shopImg {
+		width: 146rpx;
+		height: 146rpx;
+		border-radius: 10rpx;
+	}
+
+	.shopCallImg {
+		width: 38rpx;
+		height: 46rpx;
+	}
+
+	.shopTop {
+		display: flex;
+		justify-content: space-between;
+		width: 510rpx;
+	}
+
+	.shopright {
+		padding-left: 20rpx;
+	}
+
+	.shopName {
+		font-size: 26rpx;
+		color: #333333;
+		line-height: 37rpx;
+		width: 450rpx;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.shopScore1 {
+		font-size: 36rpx;
+		color: #FF4F00;
+	}
+
+	.shopScore2 {
+		font-size: 22rpx;
+		color: #FF4F00;
+	}
+
+	.shopScore3 {
+		font-size: 22rpx;
+		color: #333333;
+		padding-left: 20rpx;
+	}
+
+	.brandsBg {
 		display: flex;
+		align-items: center;
 	}
-	.shopImg{
-		width: 146rpx;
-		height: 146rpx;
-		border-radius: 10rpx;
-	}
-	.shopCallImg{
-		width: 38rpx;
-		height: 46rpx;
-	}
-	.shopTop{
-		display: flex;
-		justify-content: space-between;
-		width: 510rpx;
-	}
-	.shopright{
-		padding-left: 20rpx;
-	}
-	.shopName{
-		font-size: 26rpx;
-		color: #333333;
-		line-height: 37rpx;
-		width:450rpx;
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-	.shopScore1{
-		font-size: 36rpx;
-		color: #FF4F00;
-	}
-	.shopScore2{
+	
+	.brands {
+		margin-left: 14rpx;
+		height: 30rpx;
 		font-size: 22rpx;
-		color: #FF4F00;
+		
+		color: #FF5800;
+		line-height: 30rpx;
+		border-radius: 4rpx;
+		border: 1rpx solid #F25D24;
 	}
-	.shopScore3{
-		font-size: 22rpx;
-		color: #333333;
-		padding-left: 20rpx;
+	
+	.timeBg {
+		display: flex;
+		align-items: center;
+		padding-top: 10rpx;
 	}
-	.shopTime{
-		font-size: 22rpx;
+	
+	.shopTime {
 		color: #666666;
-		line-height: 30rpx;
-		padding-top: 10rpx;
+		font-size: 22rpx;
+	}
+
+	.Btn {
+		width: 104rpx;
+		height: 56rpx;
+		background: #FF2400 linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
+		border-radius: 6rpx;
+		font-size: 26rpx;
+		text-align: center;
+		color: #FFFFFF;
+		line-height: 56rpx;
 	}
-	.Btn{
+	.grayBtn {
 		width: 104rpx;
 		height: 56rpx;
-		background: #FF2400 linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
+		background-color: #CCCCCC;
 		border-radius: 6rpx;
 		font-size: 26rpx;
 		text-align: center;
 		color: #FFFFFF;
 		line-height: 56rpx;
-	}
-	.shopBottom{
-		display: flex;
-		
-	}
-	.shopBottomLeft{
-		width: 400rpx;
-		font-size: 22rpx;
-		color: #666666;
-		line-height: 30rpx;
-		padding-top: 10rpx;
-	}
-	.shopaddress{
-		padding-left: 10rpx;
-	}
+	}
+
+	.shopBottom {
+		display: flex;
+
+	}
+
+	.shopBottomLeft {
+		width: 400rpx;
+		font-size: 22rpx;
+		color: #666666;
+		line-height: 30rpx;
+		padding-top: 10rpx;
+	}
+
+	.shopaddress {
+		padding-left: 10rpx;
+	}
 </style>

pages/module/usableDiscountCard.vue

@@ -0,0 +1,241 @@
+<template>
+	<view class="content">
+
+		<view class="teamTop">
+			<view class="sumCount">可使用优惠券</view>
+		</view>
+
+		<!-- 列表 -->
+		<view class="itemContent">
+			<view v-for="(item,index) in itemData" :key="index">
+				<view class="item">
+
+					<!-- 第一块 -->
+					<view class="topView" @click="ckCoupon(item)">
+						<view class="leftView">
+							<view class="moneyView">
+								<view>￥</view>
+								<view class="money">{{item.ActMoney}}</view>
+							</view>
+							<view class="condition" v-if="item.WhereMoney != 0">满{{item.WhereMoney}}元可用</view>
+							<view class="condition" v-else>满任意金额可用</view>
+						</view>
+
+						<view class="rightView">
+							<view class="cardName">{{item.ActName}}</view>
+							<!-- 时间截取 -->
+							<view class="valid">有效期：{{item.StartTime.slice(0,item.StartTime.length-8)}}至 {{item.EndTime.slice(0,item.EndTime.length-8)}}</view>
+						</view>
+					</view>
+
+					<!-- 第二快 -->
+					<view class="bottomView">
+						<view>发放门店：{{item.ShopName}}</view>
+						<view @click="goDiscountDetail(item)">查看详情</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 上拉 加载更多 -->
+		<view class="noMore" v-if="noMoreShow">没有更多数据</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: [],
+				page: 1,
+				noMoreShow: false,
+				payMoney:'',
+			}
+		},
+		onLoad(opt) {
+			this.page = 1
+			if(opt.payMoney){
+				this.payMoney=opt.payMoney;
+				this.myOrderCoupon()
+			}
+			
+		},
+		methods: {
+			ckCoupon(item){
+				console.log(item);
+				uni.setStorage({
+					key: 'couponData',
+					data: item,
+					success: function () {
+						uni.navigateBack({
+							delta:1
+						})
+					}
+				}); 
+			},
+			myOrderCoupon(){
+				uni.showLoading({
+					title: '加载中'
+				})
+				this.$http('worldKeepCar/maintainOrder/myOrderCoupon', {
+				  money:this.payMoney,
+				  page:this.page,
+				  limit:10,
+				 },'GET').then(res => {
+					uni.hideLoading();
+					var list = res.data
+					
+					// 处理 undefined和null转为空白字符串
+					list.forEach((item, index) => {
+						for (const key in item) {
+							item[key] = this.$praseStrEmpty(item[key])
+						}
+					})
+					
+					if (this.page == 1) {
+						this.itemData = list
+					} else {
+						this.itemData = this.itemData.concat(list)
+					}
+					
+					if (list.length < 10) {
+						this.noMoreShow = false
+					} else {
+						this.noMoreShow = true
+					}
+				})
+			},
+			goDiscountDetail(item) {
+
+				uni.navigateTo({
+					
+					url: '../me/discountDetail?couponId=' + item.ID,
+				})
+			},
+			
+
+		},
+
+		// 下拉刷新 上拉加载更多
+		onPullDownRefresh() {
+			this.page = 1
+			if(opt.payMoney){
+				
+				this.myOrderCoupon()
+			}
+			//this.getItemData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		onReachBottom() {
+			this.page++;
+			if(opt.payMoney){
+				
+				this.myOrderCoupon()
+			}
+		},
+
+	}
+</script>
+
+<style scoped>
+	.content {
+		background: #F4F5F7;
+		min-height: 100vh;
+
+	}
+
+	.teamTop {
+		position: fixed;
+		top: 0rpx;
+		left: 0rpx;
+		background-color: #F4F5F7;
+		width: 100%;
+		height: 77rpx;
+	}
+
+	.sumCount {
+		padding: 20rpx 24rpx;
+		color: #999999;
+		font-size: 26rpx;
+	}
+
+	.itemContent {
+		padding: 55rpx 20rpx 24rpx;
+	}
+
+	.item {
+		margin: 20rpx 0rpx;
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+
+	}
+
+	.topView {
+		display: flex;
+		justify-content: flex-start;
+		padding: 22rpx 0rpx;
+		margin-left: 22rpx;
+		margin-right: 22rpx;
+		border-bottom: 1rpx #CCCCCC dashed;
+		align-items: center;
+	}
+
+	.leftView,
+	.rightView {
+		margin-right: 40rpx;
+		
+	}
+
+	.moneyView {
+		display: flex;
+		justify-content: flex-start;
+		color: #FF4F00;
+		align-items: baseline;
+	}
+
+	.money {
+		font-size: 56rpx;
+	}
+
+	.condition {
+		font-size: 22rpx;
+		color: #999999;
+	}
+
+	.cardName {
+		font-size: 30rpx;
+		font-weight: bold;
+		color: #333333;
+		margin-top: 10rpx;
+		margin-bottom: 15rpx;
+	}
+
+	.valid {
+		font-size: 26rpx;
+		color: #999999;
+	}
+
+	.bottomView {
+		display: flex;
+		justify-content: space-between;
+		padding: 20rpx 24rpx;
+		font-size: 24rpx;
+		color: #666666;
+	}
+
+	.noMore {
+		text-align: center;
+		line-height: 50rpx;
+		color: #999999;
+		font-size: 28rpx;
+	}
+</style>

pages/order/evaluate.vue

@@ -104,7 +104,7 @@
 
 					<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 :class="{img4:(imgindex+1)%4==0}" :src="img" mode="" class="itemImg" @click="previewImage(imgindex,imgArr)"></image>
 							<image src="../../static/img/icon_del_red.png" mode="" class="delImg"
 								@click="delimg(imgindex)"></image>
 						</view>
@@ -180,6 +180,24 @@
 				this.exeContent = e.target.value
 
 			},
+			previewImage(index, arr) {
+				
+			
+				// 预览图片
+				uni.previewImage({
+					urls: arr,
+					current: index,
+					longPressActions: {
+						itemList: ['发送给朋友', '保存图片', '收藏'],
+						success: function(data) {
+							console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+						},
+						fail: function(err) {
+							console.log(err.errMsg);
+						}
+					}
+				});
+			},
 			uploadImg() {
 
 				var that = this;

pages/order/myorder.vue

@@ -23,7 +23,7 @@
 					<view class="shopName">{{item.ShopName}}</view>
 					<view class="price">￥{{item.raleMoney}}</view>
 				</view>
-				<view class="itemName">{{item.itemNameList}},{{item.goodNameList}}</view>
+				<view class="itemName">{{item.itemNameList?item.itemNameList:''}},{{item.goodNameList?item.goodNameList:''}}</view>
 				
 				<view class="plateBg">
 					<view class="plateNumber">{{item.PlateNumber}}</view>
@@ -32,7 +32,7 @@
 						<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>
@@ -329,5 +329,6 @@
 	.orderState{
 		color: #F19D01;
 		font-size: 24rpx;
+		padding-left: 20rpx;
 	}
 </style>

pages/order/orderDetail.vue

@@ -265,19 +265,19 @@
 			</view>
 
 			<view class="orderBottom" v-if="orderData.SheetState==2">
-				<view class="cancelBtn" v-if="orderData.ServiceState == null || orderData.ServiceState == 3" @click="refundMoney">申请退款</view>
-				<view class="cancelBtn" v-else @click="refundDetail">退款详情</view>
+				<view class="cancelBtn" v-if="(orderData.ServiceState == null || orderData.ServiceState == 3) && orderData.PayMoney>0" @click="refundMoney">申请退款</view>
+				<view class="cancelBtn" v-else-if="orderData.ServiceState == 1 || orderData.ServiceState == 2" @click="refundDetail">退款详情</view>
 
 			</view>
 
 			<view class="orderBottom" v-if="orderData.SheetState==3">
-				<view class="cancelBtn" v-if="orderData.ServiceState == null || orderData.ServiceState == 3" @click="refundMoney">申请退款</view>
-				<view class="cancelBtn" v-else @click="refundDetail">退款详情</view>
+				<view class="cancelBtn" v-if="(orderData.ServiceState == null || orderData.ServiceState == 3) && orderData.PayMoney>0" @click="refundMoney">申请退款</view>
+				<view class="cancelBtn" v-else-if="orderData.ServiceState == 1 || orderData.ServiceState == 2" @click="refundDetail">退款详情</view>
 			</view>
 
 			<view class="orderBottom" v-if="orderData.SheetState==4">
-				<view class="cancelBtn" v-if="orderData.ServiceState == null || orderData.ServiceState == 3" @click="refundMoney">申请退款</view>
-				<view class="cancelBtn" v-else @click="refundDetail">退款详情</view>
+				<view class="cancelBtn" v-if="(orderData.ServiceState == null || orderData.ServiceState == 3) && orderData.PayMoney>0" @click="refundMoney">申请退款</view>
+				<view class="cancelBtn" v-else-if="orderData.ServiceState == 1 || orderData.ServiceState == 2" @click="refundDetail">退款详情</view>
 				<view class="payBtn" @click="timeShowClick" v-if="orderData.OrderState==1">立即预约</view>
 			</view>
 
@@ -417,13 +417,13 @@
 					sheetId: this.id,
 
 				}, 'GET').then(res => {
-					uni.hideLoading();
+					
 
 					if (res.code == 0) {
 						uni.navigateTo({
-							url: '../changeStore/changeStore?sheetId=' + this.id + '&oldStoreName=' + this
+							url: '../changeStore/changeStore?sheetId=' + this.id +'&oldShopID='+this.orderData.ShopID+ '&oldStoreName=' + this
 								.orderData.ShopName + '&oldStoreAddress=' + this.orderData.ProvinceName +
-								this.orderData.CityName + this.orderData.AreaName + this.orderData.Address
+								this.orderData.CityName + this.orderData.AreaName + this.orderData.Address +'&brand='+this.orderData.Brand
 						})
 					}
 
@@ -574,9 +574,9 @@
 					sheetId: this.id,
 
 				}, 'GET').then(res => {
-					uni.hideLoading();
-
-					if (res.code == 0) {
+					
+					if (res.code == 0) {
+						
 						uni.navigateTo({
 							url: '../refundMoney/refundMoney?sheetId=' + this.id + '&maxMoney=' + this
 								.orderData.PayMoney
@@ -779,8 +779,8 @@
 	}
 
 	.shopRightImg {
-		width: 54rpx;
-		height: 52rpx;
+		width: 38rpx;
+		height: 38rpx;
 	}
 
 	.shopsx {
@@ -815,7 +815,7 @@
 	.shopRihgtTxt {
 		color: #999999;
 		font-size: 22rpx;
-		margin-top: -20rpx;
+		
 	}
 
 	.shopRightBox {
@@ -880,7 +880,7 @@
 		background: #FFFFFF;
 		border-radius: 10px;
 		margin: 20rpx 24rpx;
-		padding: 20rpx 0;
+		padding-bottom: 20rpx;
 	}
 
 	.itemBox {

pages/refundMoney/refundMoneyDetail.vue

@@ -106,12 +106,12 @@
 			<view class="informationLine">
 				<view class="informationTxt">售后单号：</view>
 				<view class="informationNum">{{detailData.serviceCode}}</view>
-				<view class="copyBtn" @click="copy(orderData.serviceCode)">复制</view>
+				<view class="copyBtn" @click="copy(detailData.serviceCode)">复制</view>
 			</view>
 			<view class="informationLine">
 				<view class="informationTxt">订单单号：</view>
 				<view class="informationNum">{{detailData.sheetCode}}</view>
-				<view class="copyBtn" @click="copy(orderData.sheetCode)">复制</view>
+				<view class="copyBtn" @click="copy(detailData.sheetCode)">复制</view>
 				<view style="color: #3F90F7; font-size: 26rpx; margin-left: 50rpx;" @click="goOrderDetail()">详情</view>
 			</view>
 

pages/refundMoney/refundMoneyList.vue

@@ -24,12 +24,12 @@
 				</view>
 				
 				<view class="shopName">{{item.ShopName}}</view>
-				<view class="itemName">{{item.itemNameList}}</view>
-				<view class="itemName">{{item.goodNameList}}</view>
+				<view class="itemName">{{item.itemNameList}},{{item.goodNameList}}</view>
+				
 				<!-- 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-else-if="item.ServiceState==2 && item.MoneyState==1">退款成功 退款金额￥{{item.Money}}元</view>
+				
+				<view class="stateView" v-if="item.ServiceState==2">退款成功 退款金额￥{{item.Money}}元</view>
 				<view class="stateView" v-if="item.ServiceState==3">退款关闭</view>
 				
 				<view style="display: flex; justify-content: flex-end;">
@@ -227,6 +227,9 @@
 		padding-bottom: 20rpx;
 		color: #666666;
 		font-size: 24rpx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
 	}
 	.stateView{
 		background-color: #F8F9FB;

pages/shop/shopAppraise.vue

@@ -106,7 +106,7 @@
 				uni.showLoading({
 					title: '加载中'
 				})
-				let url = 'miniAppShopInfoController/listShopBMEvaluatePage',
+				let url = 'worldKeepCar/worldHome/listShopTMEvaluatePage',
 					params = {
 						page: this.page,
 						limit: 20,

pages/shop/shopDetail.vue

@@ -44,7 +44,7 @@
 			<!-- 地图 -->
 			<view class="mapBox">
 				<view class="mapLeft">
-					<view class="dingwBox"><image src="../../static/img/icon_zuob.png" mode="" class="mapdwImg"></image>
+					<view class="dingwBox"><image src="../../static/img/icon_coordinate.png" mode="" class="mapdwImg"></image>
 					    <view class="distance" v-if="shopdata.distance&&shopdata.distance!= '0.00'">距离 {{shopdata.distance}}km</view>
 					     <view class="distance" v-else>距离 --km</view>
 					</view>
@@ -54,15 +54,20 @@
 				</view>
 				<view class="shopsx"></view>
 				<view class="shopRightBox" @click="map">
-					   <view> <image src="../../static/img/icon_ditu.png" mode="" class="shopRightImg"></image> </view>
+					   <view> <image src="../../static/img/icon_map.png" mode="" class="shopRightImg"></image> </view>
 					   <view class="shopRihgtTxt">地图</view>
 				</view>
 				<view class="shopsx"></view>
 				<view class="shopRightBox" @click="call">
-					   <view> <image src="../../static/img/icon_phone.png" mode="" class="shopRightImg"></image> </view>
+					   <view> <image src="../../static/img/icon_phone2.png" mode="" class="shopRightImg"></image> </view>
 					   <view class="shopRihgtTxt">电话</view>
 				</view>
 			</view>
+			
+			<!-- 去保养 -->
+			<view class="bottom">
+				<view class="care" @click="goCare">去保养</view>
+			</view>
 			<!-- 车型里程 -->
 		<!-- 	<view class="Cartop">
 				<view class="CartopLeft">
@@ -275,7 +280,7 @@ export default {
 		
 	},
 	onLoad(opt) {
-		this.$common.isUserId()
+		// this.$common.isUserId()
        this.shopId=opt.id;
 	   this.location=uni.getStorageSync("location");
 	   this.maintainCarData=uni.getStorageSync("maintainCarData");
@@ -284,6 +289,13 @@ export default {
 	   this.getmainData() */
 	},
 	methods: {
+		goCare(){
+			this.$common.isUserId()
+			
+			uni.navigateTo({
+				url: '../module/maintain?brand='+this.brand
+			})
+		},
 		goGoods(item){
 			uni.navigateTo({
 				url:'../goods/goodsDetail?goodsId='+item.mGoodsID+'&type=1'+'&typeIndex=2&maintain=1'
@@ -354,8 +366,8 @@ export default {
 			this.shopImg=[];
 			this.$http('worldKeepCar/worldHome/queryKeepCarShopDetail', {
 			  id:this.shopId,
-			  lat:this.location.lat,
-			  lng:this.location.lng,
+			  lat:this.location.lat ? this.location.lat : '',
+			  lng:this.location.lng ? this.location.lng : '',
 			
 			 },'GET').then(res => {
 				uni.hideLoading();
@@ -632,7 +644,7 @@ export default {
 		width: 559rpx;
 		height: 62rpx;
 		background: rgba(255, 79, 0, 0.08);
-		border-radius: 0px 15rpx 14rpx 0px;
+		border-radius: 0rpx 15rpx 14rpx 0rpx;
 		margin-top: 10rpx;
 	}
 	.pingfenImg{
@@ -757,7 +769,7 @@ export default {
 		padding-left: 28rpx;
 	}
 	.shopRightImg{
-		width: 52rpx;height: 38rpx;
+		width: 44rpx;height: 48rpx;
 	}
 	.Cartop{
 		background: #FFFFFF;
@@ -952,6 +964,18 @@ export default {
 		background: #FFFFFF;
 		box-shadow: 0px -2px 20px 0px rgba(153, 153, 153, 0.2);
 	}
+	.care{
+		width: 690rpx;
+		margin: 23rpx 30rpx;
+		text-align: center;
+		height: 74rpx;
+		background: linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
+		border-radius: 37rpx;
+		
+		color: #FFFFFF;
+		font-size: 30rpx;
+		line-height: 74rpx;
+	}
 	.main{
 		display: flex;
 		height: calc(100vh - 410rpx);