From 5df25fc7e5100da0965f1439f37139b4d4705e14 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Tue, 5 Jul 2022 23:58:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/edit-address.vue | 6 +++---
 pages/my/my-address.vue   | 2 +-
 pages/my/my-order.vue     | 2 +-
 pages/my/serv-detail.vue  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pages/my/edit-address.vue b/pages/my/edit-address.vue
index d3cce6a..93e5c67 100644
--- a/pages/my/edit-address.vue
+++ b/pages/my/edit-address.vue
@@ -94,9 +94,9 @@
 					chosenArea.push(this.areaList[i][this.multiIndex[i]]);
 				}
 				this.formData.area = chosenArea;
-				this.formData.provinceId = chosenArea[1].areaId;
-				this.formData.cityId = chosenArea[2].areaId;
-				this.formData.countryId = chosenArea[0].areaId;
+				this.formData.provinceId = chosenArea[0].areaId;
+				this.formData.cityId = chosenArea[1].areaId;
+				this.formData.countryId = chosenArea[2].areaId;
 			},
 			async regionColChange(e) {
 				let colObj = e.detail;
diff --git a/pages/my/my-address.vue b/pages/my/my-address.vue
index a0a93e1..30e5074 100644
--- a/pages/my/my-address.vue
+++ b/pages/my/my-address.vue
@@ -11,9 +11,9 @@
 				<view @click="chooseAddress(item)">
 					<view class="flex justify-start align-center">
 						<view class='cu-tag bg-yellow margin-right-sm' v-if="item.isDefault">默认</view>
-						<view class="text-gray margin-right-xs">{{item.countryName}}</view>
 						<view class="text-gray margin-right-xs">{{item.provinceName}}</view>
 						<view class="text-gray margin-right-xs">{{item.cityName}}</view>
+						<view class="text-gray margin-right-xs">{{item.countryName}}</view>
 					</view>
 					<view class="text-lg margin-tb-sm">{{item.address}}</view>
 					<view class="text-gray">
diff --git a/pages/my/my-order.vue b/pages/my/my-order.vue
index bdfba20..62a9079 100644
--- a/pages/my/my-order.vue
+++ b/pages/my/my-order.vue
@@ -240,7 +240,7 @@
 			async cancelOrder() {
 				let res = await this.$request.updateOrder({
 					id: this.curOrder.orderMasterId,
-					orderStatus: 5
+					orderStatus: 6
 				});
 				if (res.code === 0) {
 					uni.showToast({
diff --git a/pages/my/serv-detail.vue b/pages/my/serv-detail.vue
index 3efbc88..9f4d62f 100644
--- a/pages/my/serv-detail.vue
+++ b/pages/my/serv-detail.vue
@@ -89,7 +89,7 @@
 		<view class="bg-white margin-lr-sm padding-lr padding-bottom margin-top-sm" v-for="(item, index) in servDetail.orderStandardDetailList">
 			<view class="cu-bar solid-bottom">
 				<view class="action bar-first-action">
-					<text class="cuIcon-titles text-main-color"></text> 子单完成记录
+					<text class="cuIcon-titles text-main-color"></text> 施工记录
 				</view>
 				<view class='cu-tag bg-purple radius light margin-right-sm'>编码:{{item.orderDetailCode}}</view>
 			</view>