1.更换门店 修改

common/request.js

@@ -83,6 +83,13 @@ const http = (url = '', date = {}, type = 'POST', header = {
 			}else if(res.data.code==409){
 				 // getToken(url,date,type,header)
 			}
+			else if(res.data.code==1){
+				 uni.showToast({
+				     title: res.data.msg,
+				 	 icon:'none',
+				     duration: 3000,
+				 });
+			}
             resolve(res.data);
         }).catch(error => {
             let [err, res] = error;

pages/changeStore/changeStore.vue

@@ -19,8 +19,10 @@
 			<view class="viewBg">
 				<image src="../../static/img/icon_xinghao.png" mode="" style="width: 14rpx; height: 14rpx;"></image>
 				<view class="leftTitle">更换门店</view>
-					<view class="blackColor width70" :class="{grayColor: store==''}" @click="storeChange">{{store?store:'请选择'}}</view>
-			
+				<view class="blackColor width70" :class="{grayColor: store==''}" @click="storeChange">
+					{{store == ''? '请选择':store}}
+				</view>
+
 				<image src="../../static/img/rightArrow.png" mode="" style="width: 13rpx; height: 23rpx;"></image>
 
 
@@ -33,10 +35,10 @@
 			<view class="viewBg" style="border-bottom: 1rpx solid #EEEEEE;">
 				<image src="../../static/img/icon_xinghao.png" mode="" style="width: 14rpx; height: 14rpx;"></image>
 				<view class="leftTitle">更换原因</view>
-				<picker :value="firstIndex" class="width70" mode="selector" :range="reasonArray" range-key="contents"
-					@change="reasonChange">
-					<view class="blackColor" :class="{grayColor: firstIndex==null}">
-						{{firstIndex == null ? '请选择' : reasonArray[firstIndex].contents}}
+				<picker class="width70" mode="selector" :range="reasonNameArray" @change="reasonChange">
+					<view class="blackColor" :class="{grayColor: reason==''}">
+						{{reason == '' ? '请选择' : reason}}
+
 					</view>
 				</picker>
 
@@ -66,39 +68,57 @@
 <script>
 	export default {
 		data() {
-			return {
-				sheetId:'',
+			return {
+				sheetId: '',
 				oldStoreName: '',
 				oldStoreAddress: '',
 				store: '',
-				storeId:'',
+				storeId: '',
 				reasonArray: [],
+				reasonNameArray: [],
 				reasonId: '',
-				firstIndex: null,
+				reason: "",
 				exeContent: '',
+				edit: '', //修改申请
+				editId: '',
+
 			}
 		},
 		onLoad(opt) {
 			this.sheetId = opt.sheetId;
 			this.oldStoreName = opt.oldStoreName;
 			this.oldStoreAddress = opt.oldStoreAddress;
-			this.getChangeData();
+			this.getChangeData();
 			console.log(this.sheetId);
-		},
-		onShow() {
+
+			//修改申请
+			this.edit = opt.edit;
+			this.editId = opt.editId;
+			this.oldStoreName = opt.oldStoreName;
+			this.oldStoreAddress = opt.oldStoreAddress;
+			this.store = opt.store;
+			this.storeId = opt.storeId;
+			this.reasonId = opt.reasonId;
+			this.reason = opt.reason;
+			this.exeContent = opt.exeContent == null ? '' : opt.exeContent;
+		},
+		onShow() {
 			let storeMes = uni.getStorageSync('changeStore')
-			this.storeId = storeMes.shopId
-			this.store = storeMes.shopName
+			if (storeMes) {
+				this.storeId = storeMes.shopId
+				this.store = storeMes.shopName
+			}
+			
 		},
 		methods: {
-			submit() {
-				if (this.store == '') {
-					uni.showToast({
-						title: '请选择更换门店',
-						icon: 'none',
-						duration: 2000,
-					});
-					return;
+			submit() {
+				if (this.store == '') {
+					uni.showToast({
+						title: '请选择更换门店',
+						icon: 'none',
+						duration: 2000,
+					});
+					return;
 				}
 				if (this.reasonId == '') {
 					uni.showToast({
@@ -108,29 +128,72 @@
 					});
 					return;
 				}
-				
 
+				if (this.edit == 'true') {
+					console.log('修改申请');
+					this.editUrl();
+				} else {
+					this.addUrl();
+				}
+
+			},
+			addUrl() {
+				uni.showLoading({});
+
+				this.$http('worldKeepCar/orderChangeShop/applyChangeShop',
+					{
+						sheetId: this.sheetId,
+						applyReasonId: this.reasonId,
+						applyReason: this.reason,
+
+						reasonComment: this.exeContent,
+						newShopId: this.storeId,
+						newShopName: this.store,
+
+					}, 'POST').then(res => {
+					uni.hideLoading();
+					if (res.code == 0) {
+						uni.showToast({
+							title: '提交成功',
+							icon: 'none',
+							duration: 2000,
+						});
+						uni.removeStorageSync('changeStore')
+
+						setTimeout(function() {
+							uni.navigateBack({
+
+							})
+						}, 2000);
+					}
+
+
+
+				})
+			},
+			editUrl() {
 				uni.showLoading({});
+				this.$http('worldKeepCar/orderChangeShop/editApply',
+					{
 
-				this.$http('worldKeepCar/orderChangeShop/applyChangeShop', {
-					sheetId: this.sheetId,
-					applyReasonId: this.reasonId,
-					applyReason: this.reasonArray[this.firstIndex].contents,
-					
-					reasonComment: this.exeContent,
-					newShopID: this.storeId,
-					newShopName: this.store,
+						applyReasonId: this.reasonId,
+						applyReason: this.reason,
 
-				}, 'POST').then(res => {
+						reasonComment: this.exeContent,
+						newShopId: this.storeId,
+						newShopName: this.store,
+						id: this.editId,
+
+					}, 'POST').then(res => {
 					uni.hideLoading();
 					if (res.code == 0) {
 						uni.showToast({
 							title: '提交成功',
 							icon: 'none',
 							duration: 2000,
-						});
-						uni.removeStorageSync('changeStore')
-						
+						});
+						uni.removeStorageSync('changeStore')
+
 						setTimeout(function() {
 							uni.navigateBack({
 
@@ -155,9 +218,14 @@
 
 					uni.hideLoading();
 
-
 					this.reasonArray = res.data
 
+					this.reasonArray.forEach((item, index) => {
+						this.reasonNameArray.push(item.contents)
+					});
+
+					console.log(this.reasonNameArray);
+
 
 				})
 			},
@@ -166,14 +234,15 @@
 
 			},
 			storeChange(e) {
-				uni.navigateTo({
-					
-					url:'../module/orderShop?fromChangeStore=true'
-				}) 
+				uni.navigateTo({
+
+					url: '../module/orderShop?fromChangeStore=true'
+				})
 			},
 			reasonChange(e) {
-				this.firstIndex = e.target.value
-				this.reasonId = this.reasonArray[this.firstIndex].id
+
+				this.reasonId = this.reasonArray[e.target.value].id
+				this.reason = this.reasonArray[e.target.value].contents
 			}
 		}
 	}

pages/changeStore/changeStoreDetail.vue

@@ -3,137 +3,138 @@
 		<view class="topView">
 			<!-- 待处理 -->
 			<view class="waitBg" v-if="state>0">
-				<view class="title">请等待平台处理</view>
+				<view class="title">请等待平台处理</view>
 				<!-- 进度条 -->
 				<view class="progress">
 					<image :src="(state>0 ? tongguoUrl : waitUrl)" class="waitImg" :class="{tongguoImg:state>0}">
-					</image>
-					
-					<view class="line" :class="{lightLine:state>0}"></view>
-					
+					</image>
+
+					<view class="line" :class="{lightLine:state>0}"></view>
+
 					<image :src="(state>1 ? tongguoUrl : waitUrl)" class="waitImg" :class="{tongguoImg:state>1}">
-					</image>
-					
-					<view class="line" :class="{lightLine:state>1}"></view>
-					
+					</image>
+
+					<view class="line" :class="{lightLine:state>1}"></view>
+
 					<image :src="(state>2 ? tongguoUrl : waitUrl)" class="waitImg" :class="{tongguoImg:state>2}">
 					</image>
 
 				</view>
-				<!-- 进度条 文字提示 -->
-				<view class="progressT">
-					<view class="stateView">
-						<view class="progressTitle">提交申请</view>
-						<view class="time" v-if="state>0">2021-11-2 12:43</view>
-					</view>
-					<view style="width: 9%;"></view>
-					<view class="stateView">
-						<view class="progressTitle">平台审核</view>
-						<view class="time" v-if="state>1">2021-11-2 12:43</view>
-					</view>
-					<view style="width: 9%;"></view>
-					<view class="stateView">
-						<view class="progressTitle">平台同意更换</view>
-						<view class="time" v-if="state>2">2021-11-2 12:43</view>
-					</view>
-				</view>
+				<!-- 进度条 文字提示 -->
+				<view class="progressT">
+					<view class="stateView">
+						<view class="progressTitle">提交申请</view>
+						<view class="time" v-if="state>0">2021-11-2 12:43</view>
+					</view>
+					<view style="width: 9%;"></view>
+					<view class="stateView">
+						<view class="progressTitle">平台审核</view>
+						<view class="time" v-if="state>1">2021-11-2 12:43</view>
+					</view>
+					<view style="width: 9%;"></view>
+					<view class="stateView">
+						<view class="progressTitle">平台同意更换</view>
+						<view class="time" v-if="state>2">2021-11-2 12:43</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 更换关闭 -->
+			<view class="waitBg" v-if="state==0" style="height: 100rpx;">
+				<view class="title">更换关闭</view>
+				<view class="title3">2021年11月12日 12:43</view>
+			</view>
+
+			<!-- 平台拒绝 -->
+			<view class="waitBg" v-if="state==-1" style="height: 100rpx;">
+				<view class="title">平台已拒绝</view>
+				<view class="title3">2021年11月12日 12:43</view>
 			</view>
-			
-			<!-- 更换关闭 -->
-			<view class="waitBg" v-if="state==0" style="height: 100rpx;">
-				<view class="title">更换关闭</view>
-				<view class="title3">2021年11月12日 12:43</view>
-			</view>
-			
-			<!-- 平台拒绝 -->
-			<view class="waitBg" v-if="state==-1" style="height: 100rpx;">
-				<view class="title">平台已拒绝</view>
-				<view class="title3">2021年11月12日 12:43</view>
-			</view>
 		</view>
-		
-		<!-- 更换提交 -->
-		<view class="whiteView" v-if="state==1">
-			<view class="title1">您已成功发起更换门店申请，请耐心等待平台处理</view>
-			<view class="title2">平台同意后，系统将自动更新门店信息</view>
-			<view class="title3">平台同意后，系统将自动更新门店信息</view>
-		</view>
-		<!-- 更换关闭 -->
-		<view class="whiteView" v-if="state==0">
-			<view class="title1">您已撤销本次退款申请，如有问题仍未解决，您可以重新发起申请</view>
-			
-		</view>
-		<!-- 平台拒绝 -->
-		<view class="whiteView" v-if="state==-1">
-			<view class="title1">平台拒绝原因：这是选择的原因</view>
-			<view class="title2">您可以修改更换申请后再次发起，平台会重新处理</view>
-		</view>
-		<!-- 同意申请 -->
-		<view class="tongyiView" v-if="state==3">
-			<view class="title1">进度详情</view>
-			<image src="../../static/img/rightArrow.png" mode="" style="width: 14rpx; height: 23rpx;"></image>
-		</view>
-		
-		<view class="whiteView">
-			<view class="storeTitle">更换前门店信息</view>
-			<view class="store">
+
+		<!-- 更换提交 -->
+		<view class="whiteView" v-if="state==1">
+			<view class="title1">您已成功发起更换门店申请，请耐心等待平台处理</view>
+			<view class="title2">平台同意后，系统将自动更新门店信息</view>
+			<view class="title3">平台同意后，系统将自动更新门店信息</view>
+		</view>
+		<!-- 更换关闭 -->
+		<view class="whiteView" v-if="state==0">
+			<view class="title1">您已撤销本次退款申请，如有问题仍未解决，您可以重新发起申请</view>
+
+		</view>
+		<!-- 平台拒绝 -->
+		<view class="whiteView" v-if="state==-1">
+			<view class="title1">平台拒绝原因：这是选择的原因</view>
+			<view class="title2">您可以修改更换申请后再次发起，平台会重新处理</view>
+		</view>
+		<!-- 同意申请 -->
+		<view class="tongyiView" v-if="state==3">
+			<view class="title1">进度详情</view>
+			<image src="../../static/img/rightArrow.png" mode="" style="width: 14rpx; height: 23rpx;"></image>
+		</view>
+
+		<view class="whiteView">
+			<view class="storeTitle">更换前门店信息</view>
+			<view class="store">
 				<image src="../../static/img/icon_state_gray.png" mode="" class="leftIcon"></image>
-				<view class="name">这是门店名称</view>
-			</view>
-			<view class="store">
-				<image src="../../static/img/icon_coordinate.png" mode="" class="leftIcon"></image>
-				<view class="address">江苏省南京市鼓楼区铁路南街233号</view>
-			</view>
-		</view>
-		
-		<view class="whiteView">
-			<view class="storeTitle">更换后门店信息</view>
-			<view class="store">
-				<image src="../../static/img/icon_state_gray.png" mode="" class="leftIcon"></image>
-				<view class="name">这是门店名称</view>
-			</view>
-			<view class="store">
-				<image src="../../static/img/icon_coordinate.png" mode="" class="leftIcon"></image>
-				<view class="address">江苏省南京市鼓楼区铁路南街233号</view>
-			</view>
-		</view>
-		
-		
-		<!-- 订单信息 -->
-		<view class="whiteView">
-			
-			<view class="informationLine">
-				<view class="informationTxt">更换原因：</view>
-				<view class="informationNum">七天无理由</view>
-				
-			</view>
-			<view class="informationLine">
-				<view class="informationTxt">申请时间：</view>
-				<view class="informationNum">2021-11-21 11:32:12</view>
-			</view>
-			<view class="informationLine">
-				<view class="informationTxt">补充描述：</view>
-				<view class="informationNum">无</view>
-			</view>
-			<view class="informationLine">
-				<view class="informationTxt">申请单号：</view>
-				<view class="informationNum">12345</view>
-				<view class="copyBtn" @click="copy(orderData.Code)">复制</view>
-			</view>
-			<view class="informationLine">
-				<view class="informationTxt">订单单号：</view>
-				<view class="informationNum">T124</view>
-				<view class="copyBtn" @click="copy(orderData.Code)">复制</view>
-				<view style="color: #3F90F7; font-size: 26rpx; margin-left: 50rpx;">详情</view>
-			</view>
-			
-		</view>
-		
-		<!-- 底部按钮 操作 -->
-		<view style="height: 150rpx;"></view>
-		<view class="orderBottom" v-if="state==1">
-			<view class="cancelBtn" @click="cancelBtn">撤销申请</view>
-			<view class="cancelBtn" @click="editBtn">修改申请</view>
+				<view class="name">{{detailData.oldShopName}}</view>
+			</view>
+			<view class="store">
+				<image src="../../static/img/icon_coordinate.png" mode="" class="leftIcon"></image>
+				<view class="address">{{detailData.oldShopAddress}}</view>
+			</view>
+		</view>
+
+		<view class="whiteView">
+			<view class="storeTitle">更换后门店信息</view>
+			<view class="store">
+				<image src="../../static/img/icon_state_gray.png" mode="" class="leftIcon"></image>
+				<view class="name">{{detailData.newShopName}}</view>
+			</view>
+			<view class="store">
+				<image src="../../static/img/icon_coordinate.png" mode="" class="leftIcon"></image>
+				<view class="address">{{detailData.newShopAddress}}</view>
+			</view>
+		</view>
+
+
+		<!-- 订单信息 -->
+		<view class="whiteView">
+
+			<view class="informationLine">
+				<view class="informationTxt">更换原因：</view>
+				<view class="informationNum">{{detailData.applyReason}}</view>
+
+			</view>
+			<view class="informationLine">
+				<view class="informationTxt">申请时间：</view>
+				<view class="informationNum">{{detailData.createTime}}</view>
+			</view>
+			<view class="informationLine">
+				<view class="informationTxt">补充描述：</view>
+				<view class="informationNum" v-if="detailData.applyReasonComment!=null">
+					{{detailData.applyReasonComment}}</view>
+			</view>
+			<view class="informationLine">
+				<view class="informationTxt">申请单号：</view>
+				<view class="informationNum">{{detailData.changeCode}}</view>
+				<view class="copyBtn" @click="copy(orderData.changeCode)">复制</view>
+			</view>
+			<view class="informationLine">
+				<view class="informationTxt">订单单号：</view>
+				<view class="informationNum">{{detailData.sheetID}}</view>
+				<view class="copyBtn" @click="copy(orderData.sheetID)">复制</view>
+				<view style="color: #3F90F7; font-size: 26rpx; margin-left: 50rpx;">详情</view>
+			</view>
+
+		</view>
+
+		<!-- 底部按钮 操作 -->
+		<view style="height: 150rpx;"></view>
+		<view class="orderBottom" v-if="state==1">
+			<view class="cancelBtn" @click="cancelBtn">撤销申请</view>
+			<view class="cancelBtn" @click="editBtn">修改申请</view>
 		</view>
 
 	</view>
@@ -143,24 +144,107 @@
 	export default {
 		data() {
 			return {
-				state: -1,// -1 拒绝1 提交申请 2 平台审核 3 同意申请
+				state: -1, // -1 拒绝 0自己撤销关闭 1 提交申请 3 同意申请
 				tongguoUrl: '../../static/img/icon_tongguo.png',
 				waitUrl: '../../static/img/icon_yuan.png',
+				id: '',
+				detailData: '',
 			}
 		},
+		onLoad(opt) {
+			this.id = opt.id
+			this.getData();
+		},
+		onShow() {
+			this.getData();
+		},
 		methods: {
-			copy(txt) {
-				uni.setClipboardData({
-					data: txt,
-					success: function() {
-						uni.showToast({
-							title: '复制成功',
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				});
+			getData() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = '/worldKeepCar/orderChangeShop/changeDetail',
+					params = {
+						id: this.id,
+
+					}
+				this.$http(url, params, 'GET').then(res => {
+
+					uni.hideLoading();
+
+					this.detailData = res.data
+
+					// 更换状态
+					// "changeState": 备注：处理状态1待处理2更换成功3更换关闭
+					if (this.detailData.changeState == 1) {
+						// 平台处理
+						this.state = 1;
+					} else if (this.detailData.changeState == 2) {
+						// 平台同意
+						this.state = 3;
+					}
+					if (this.detailData.handlerReasonID != null) {
+						// 拒绝
+						this.state = -1;
+					}
+					if (this.detailData.cancelType != null) {
+						// 关闭
+						this.state = 0;
+					}
+
+				})
 			},
+			copy(txt) {
+				uni.setClipboardData({
+					data: txt,
+					success: function() {
+						uni.showToast({
+							title: '复制成功',
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				});
+			},
+			cancelBtn(){
+				
+					uni.showLoading({
+						title: '加载中'
+					})
+					let url = 'worldKeepCar/orderChangeShop/cancelApply',
+						params = {
+							id: this.detailData.id,
+				
+						}
+					this.$http(url, params, 'POST').then(res => {
+				
+						uni.hideLoading();
+						
+						if(res.code==0){
+							uni.showToast({
+								title: '撤销成功',
+								icon: 'none',
+								duration: 2000,
+							});
+							setTimeout(function() {
+								uni.navigateBack({
+									
+								})
+							}, 2000); 	
+						}
+						
+					})
+				
+			},
+			editBtn(){
+				
+				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
+				})
+			}
+			
+			
 		}
 	}
 </script>
@@ -192,23 +276,24 @@
 
 	.progress {
 		display: flex;
-		
-		align-items: center;
-		
+
+		align-items: center;
+
 		padding: 10rpx 70rpx;
 	}
 
-	
+
 
 	.waitImg {
 		width: 20rpx;
 		height: 20rpx;
 	}
-	
-	.tongguoImg {
-		width: 38rpx;
-		height: 38rpx;
+
+	.tongguoImg {
+		width: 38rpx;
+		height: 38rpx;
 	}
+
 	.line {
 		width: 40%;
 		margin: 0rpx 5rpx;
@@ -221,132 +306,149 @@
 		width: 40%;
 		margin: 0rpx 5rpx;
 		height: 2px;
-		background: #FF2400;
+		background: #FF2400;
 		opacity: 1.0;
-	}
-	.progressT{
-		display: flex;
-		
-		align-items: center;
-		
-	}
-	.stateView{
-		width: 30%;
-		
-	}
-	.progressTitle{
-		color: #333333;
-		font-size: 22rpx;
-		text-align: center;
-	}
-	.time{
-		color: #999999;
-		font-size: 22rpx;
-		text-align: center;
-	}
-	.whiteView{
-		background-color: #FFFFFF;
-		padding: 30rpx 24rpx;
-		margin: 20rpx 0;
-	}
-	.title1 {
-		color: #3C3C3C;
-		font-size: 30rpx;
-		font-weight: bold;
-	}
-	.title2{
-		color: #999999;
-		font-size: 24rpx;
-		padding-top: 16rpx;
-		padding-bottom: 8rpx;
-	}
-	.title3{
-		color: #999999;
-		font-size: 24rpx;
-		
-	}
-	.storeTitle{
-		color: #3C3C3C;
-		font-size: 30rpx;
-		font-weight: bold;
-		border-bottom: 1rpx #EEEEEE solid;
-		padding-bottom: 22rpx;
-	}
-	.store{
-		display: flex;
-		padding-top: 20rpx;
-		align-items: center;
-	}
-	.leftIcon{
-		width: 30rpx;
-		height: 30rpx;
-		margin-right: 10rpx;
-	}
-	.name {
-		color: #3C3C3C;
-		font-size: 26rpx;
-	}
-	.address {
-		color: #999999;
-		font-size: 26rpx;
-	}
-	
-	.informationLine {
-		display: flex;
-		font-size: 26rpx;
-		padding: 20rpx 0;
-	}
-	
-	.informationTxt {
-		width: 130rpx;
-		color: #666666;
-	}
-	
-	.informationNum {
-		color: #333333;
-	}
-	
-	.copyBtn {
-		width: 86rpx;
-		height: 40rpx;
-		background: #F4F5F7;
-		border-radius: 20rpx;
-		font-size: 24rpx;
-		color: #333333;
-		text-align: center;
-		line-height: 40rpx;
-		margin-left: 20rpx;
-	}
-	
-	.orderBottom {
-		width: 750rpx;
-		height: 98rpx;
-		background: #FFFFFF;
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		display: flex;
-		justify-content: flex-end;
-	}
-	.cancelBtn {
-		width: 150rpx;
-		height: 56rpx;
-		border-radius: 36rpx;
-		border: 2rpx solid #DDDDDD;
-		text-align: center;
-		line-height: 56rpx;
-		font-size: 28rpx;
-		color: #3C3C3C;
-		margin-top: 21rpx;
-		margin-right: 16rpx;
-		margin-left: 20rpx;
-	}
-	.tongyiView{
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		background-color: #FFFFFF;
-		padding: 30rpx 24rpx;
-		margin: 20rpx 0;
+	}
+
+	.progressT {
+		display: flex;
+
+		align-items: center;
+
+	}
+
+	.stateView {
+		width: 30%;
+
+	}
+
+	.progressTitle {
+		color: #333333;
+		font-size: 22rpx;
+		text-align: center;
+	}
+
+	.time {
+		color: #999999;
+		font-size: 22rpx;
+		text-align: center;
+	}
+
+	.whiteView {
+		background-color: #FFFFFF;
+		padding: 30rpx 24rpx;
+		margin: 20rpx 0;
+	}
+
+	.title1 {
+		color: #3C3C3C;
+		font-size: 30rpx;
+		font-weight: bold;
+	}
+
+	.title2 {
+		color: #999999;
+		font-size: 24rpx;
+		padding-top: 16rpx;
+		padding-bottom: 8rpx;
+	}
+
+	.title3 {
+		color: #999999;
+		font-size: 24rpx;
+
+	}
+
+	.storeTitle {
+		color: #3C3C3C;
+		font-size: 30rpx;
+		font-weight: bold;
+		border-bottom: 1rpx #EEEEEE solid;
+		padding-bottom: 22rpx;
+	}
+
+	.store {
+		display: flex;
+		padding-top: 20rpx;
+		align-items: center;
+	}
+
+	.leftIcon {
+		width: 30rpx;
+		height: 30rpx;
+		margin-right: 10rpx;
+	}
+
+	.name {
+		color: #3C3C3C;
+		font-size: 26rpx;
+	}
+
+	.address {
+		color: #999999;
+		font-size: 26rpx;
+	}
+
+	.informationLine {
+		display: flex;
+		font-size: 26rpx;
+		padding: 20rpx 0;
+	}
+
+	.informationTxt {
+		width: 130rpx;
+		color: #666666;
+	}
+
+	.informationNum {
+		color: #333333;
+		width: 50%;
+
+	}
+
+	.copyBtn {
+		width: 86rpx;
+		height: 40rpx;
+		background: #F4F5F7;
+		border-radius: 20rpx;
+		font-size: 24rpx;
+		color: #333333;
+		text-align: center;
+		line-height: 40rpx;
+		margin-left: 20rpx;
+	}
+
+	.orderBottom {
+		width: 750rpx;
+		height: 98rpx;
+		background: #FFFFFF;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		display: flex;
+		justify-content: flex-end;
+	}
+
+	.cancelBtn {
+		width: 150rpx;
+		height: 56rpx;
+		border-radius: 36rpx;
+		border: 2rpx solid #DDDDDD;
+		text-align: center;
+		line-height: 56rpx;
+		font-size: 28rpx;
+		color: #3C3C3C;
+		margin-top: 21rpx;
+		margin-right: 16rpx;
+		margin-left: 20rpx;
+	}
+
+	.tongyiView {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		background-color: #FFFFFF;
+		padding: 30rpx 24rpx;
+		margin: 20rpx 0;
 	}
 </style>

pages/changeStore/changeStoreList.vue

@@ -16,19 +16,26 @@
 		<view class="listContent">
 			<view class="itemBg" v-for="(item,index) in itemData">
 				<view class="firstView">
-					<view style="font-size: 24rpx; color: #999999;">申请单号：202111203368</view>
+					<view style="font-size: 24rpx; color: #999999;">申请单号：{{item.ChangeCode}}</view>
 					<view class="rightView">
 						<image src="../../static/img/icon_change.png" mode="" style="width: 30rpx; height: 30rpx; margin-right: 10rpx;"></image>
 						<view style="color: #666666; font-size: 24rpx;">更换门店</view>
 					</view>
 				</view>
 				
-				<view class="shopName">更换前门店：这是门店名称</view>
-				<view class="shopName">更换后门店：这是门店名称</view>
-				<view class="stateView">待平台处理</view>
+				<view class="shopName">
+					<text style="color: #999999; font-size: 26rpx;">更换前门店：</text>
+				{{item.OldShopName}}</view>
+				<view class="shopName">
+					<text style="color: #999999; font-size: 26rpx;">更换后门店：</text>
+					{{item.NewShopName}}</view>
+				<!-- "ChangeState": //备注：1待处理2更换成功3更换关闭 -->
+				<view class="stateView" v-if="item.ChangeState==1">待平台处理</view>
+				<view class="stateView" v-if="item.ChangeState==2">更换成功</view>
+				<view class="stateView" v-if="item.ChangeState==3">更换关闭</view>
 				
 				<view style="display: flex; justify-content: flex-end;">
-					<view class="detail" @click="goDetail(item.id)">更换详情</view>
+					<view class="detail" @click="goDetail(item.ID)">更换详情</view>
 				</view>
 			</view>
 		</view>
@@ -57,9 +64,16 @@
 				searchValue: '',
 				page: 1,
 				tabIndex: 1,
-				itemData:[1,2,3],
+				itemData:[],
 				noMoreShow: false,
 			}
+		},
+		onLoad() {
+			this.getData();
+		},
+		onShow() {
+			this.page = 1
+			this.getData();
 		},
 		methods: {
 			goDetail(id){
@@ -69,27 +83,32 @@
 			},
 			tabClick(num) {
 				this.tabIndex = num;
-				// this.page = 1;
-				// this.getData()
+				this.page = 1;
+				this.getData()
 			},
 			search(val) {
 				// console.log(val);
 				this.searchValue = val
-				// this.page = 1
-				// this.getData()
+				this.page = 1
+				this.getData()
 			},
 			getData() {
 				uni.showLoading({
 					title: '加载中'
 				})
-				let url = 'accompany/SuperAccounts/queryMyteam',
+				var changeStateStr = ''
+				if (this.tabIndex == 1) {
+					changeStateStr = '1'
+				}
+				let url = 'worldKeepCar/keepCarMy/listTMSheetChangeShopPage',
 					params = {
 						page: this.page,
 						limit: 10,
-						name: this.searchValue
+						name: this.searchValue,
+						changeState:changeStateStr,
 					}
 				this.$http(url, params, 'GET').then(res => {
-					this.count = Number(res.data.count)
+					uni.hideLoading()
 					var list = res.data.Items
 			
 					// 处理 undefined和null转为空白字符串
@@ -101,9 +120,9 @@
 			
 			
 					if (this.page == 1) {
-						this.shopData = list
+						this.itemData = list
 					} else {
-						this.shopData = this.shopData.concat(list)
+						this.itemData = this.itemData.concat(list)
 					}
 			
 					if (list.length < 10) {
@@ -119,14 +138,14 @@
 		
 		onPullDownRefresh() {
 			this.page = 1;
-			// this.getData()
+			this.getData()
 			setTimeout(function() {
 				uni.stopPullDownRefresh();
 			}, 1000);
 		},
 		onReachBottom() {
 			this.page++;
-			// this.getData()
+			this.getData()
 		}
 	}
 </script>
@@ -203,7 +222,7 @@
 	.shopName{
 		padding-bottom: 20rpx;
 		color: #333333;
-		font-size: 30rpx;
+		font-size: 26rpx;
 	}
 	.stateView{
 		background-color: #F8F9FB;

pages/order/myorder.vue

@@ -35,8 +35,8 @@
 					<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="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"

pages/refundMoney/refundMoney.vue

@@ -5,11 +5,11 @@
 			<view class="viewBg">
 				<image src="../../static/img/icon_xinghao.png" mode="" style="width: 14rpx; height: 14rpx;"></image>
 				<view class="leftTitle">退款原因</view>
-				<picker :value="firstIndex" class="width70" mode="selector" :range="reasonArray" range-key="contents"
-					@change="reasonChange">
-					<view class="blackColor" :class="{grayColor: firstIndex==null}">
-						{{firstIndex == null ? '请选择' : reasonArray[firstIndex].contents}}
-					</view>
+				<picker class="width70" mode="selector" :range="reasonNameArray" @change="reasonChange">
+					<view class="blackColor" :class="{grayColor: reason==''}">
+						{{reason == '' ? '请选择' : reason}}
+				
+					</view>
 				</picker>
 
 				<image src="../../static/img/rightArrow.png" mode="" style="width: 13rpx; height: 23rpx;"></image>
@@ -48,9 +48,10 @@
 		data() {
 			return {
 				sheetId: '',
-				reasonArray: [],
-				firstIndex: null,
-				reasonId: '',
+				reasonArray: [],
+				reasonNameArray: [],
+				reasonId: '',
+				reason:'',
 				maxMoney: '',
 				money: '',
 				exeContent: '',
@@ -93,7 +94,7 @@
 				this.$http('worldKeepCar/orderRefund/applyRefund', {
 					sheetId:this.sheetId,
 					applyReasonId:this.reasonId,
-					applyReason:this.reasonArray[this.firstIndex].contents,
+					applyReason:this.reason,
 					money:this.money,
 					reasonComment: this.exeContent,
 					
@@ -131,7 +132,10 @@
 
 
 					this.reasonArray = res.data
-					
+					
+					this.reasonArray.forEach((item, index) => {
+						this.reasonNameArray.push(item.contents)
+					});
 
 				})
 			},
@@ -141,8 +145,8 @@
 			},
 			reasonChange(e) {
 
-				this.firstIndex = e.target.value
-				this.reasonId = this.reasonArray[this.firstIndex].id
+				this.reasonId = this.reasonArray[e.target.value].id
+				this.reason = this.reasonArray[e.target.value].contents
 
 			},
 		}