From 7cc29e81687994567e0d04723f5ca48781c2ad02 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Thu, 23 Jun 2022 17:33:19 +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/index/index-home.vue          | 86 +++++++++++++++++------------
 pages/order-manage/order-manage.vue |  2 +-
 style/blue/blue-topic.css           | 17 ++++--
 3 files changed, 63 insertions(+), 42 deletions(-)

diff --git a/pages/index/index-home.vue b/pages/index/index-home.vue
index 4df7932..06e502c 100644
--- a/pages/index/index-home.vue
+++ b/pages/index/index-home.vue
@@ -95,8 +95,8 @@
 					<view>请您选择入驻类型！到家服务类请选择-服务商；商品销售类请选择-配件商。</view>
 				</view>
 				<view class="cu-bar bg-white">
-					<view class="action margin-0 flex-sub text-black" @tap="hideModal"
-						@click="chooseEntryType(1)">配件商</view>
+					<view class="action margin-0 flex-sub text-black" @tap="hideModal" @click="chooseEntryType(1)">配件商
+					</view>
 					<view class="action margin-0 flex-sub text-main-color solid-left" @tap="hideModal"
 						@click="chooseEntryType(0)">服务商</view>
 				</view>
@@ -111,7 +111,11 @@
 					<view>2.微信头像</view>
 				</view>
 				<view class="cu-bar bg-white">
-					<view class="action margin-0 flex-sub text-main-color solid-left" @tap="authWxLogin">确认授权</view>
+					<navigator class="modal-bottom-oper margin-0 flex-sub text-black" open-type="exit"
+						target="miniProgram">拒绝授权
+					</navigator>
+					<view class="modal-bottom-oper margin-0 flex-sub text-main-color solid-left" @tap="authWxLogin">确认授权
+					</view>
 				</view>
 			</view>
 		</view>
@@ -122,8 +126,13 @@
 					<view>授予小程序绑定微信手机号码的权限</view>
 				</view>
 				<view class="cu-bar bg-white">
-					<button class="action margin-0 flex-sub cu-btn bg-white text-main-color" open-type="getPhoneNumber"
-						@getphonenumber="getPhoneNumber">确认授权</button>
+					<navigator class="modal-bottom-oper margin-0 flex-sub text-black solid-right" open-type="exit"
+						target="miniProgram">拒绝授权
+					</navigator>
+					<view class="margin-0 flex-sub">
+						<button class="margin-0 flex-sub cu-btn bg-white text-main-color" open-type="getPhoneNumber"
+							@getphonenumber="getPhoneNumber">确认授权</button>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -132,7 +141,7 @@
 
 <script>
 	export default {
-		name: 'index',
+		name: 'index',
 		emits: ['changeCurPageCode'],
 		data() {
 			return {
@@ -197,10 +206,10 @@
 				if (this.isAuthWxPhoneModal) {
 					return;
 				}
-				this.curUserInfo = curUserInfo;
-				
-				// 是否展示选择入驻类型的模态框
-				this.isShowSteer = this.curUserInfo.type != null &&  this.curUserInfo.type != undefined ? false : true;
+				this.curUserInfo = curUserInfo;
+
+				// 是否展示选择入驻类型的模态框
+				this.isShowSteer = this.curUserInfo.type != null && this.curUserInfo.type != undefined ? false : true;
 
 				this.myInfo = await this.$api.data('myInfo');
 				// this.isShowSteer = !this.myInfo.entryType;
@@ -217,16 +226,16 @@
 				}
 				this.servModules = newServModules;
 			},
-			async chooseEntryType(typeCode) {
-				await this.$request.updateWorker({
-					type: typeCode
-				});
-				if (typeCode === 1) {
-					this.$emit('changeCurPageCode', 'supplyChainPage');
-				} else if (typeCode === 0) {
-					uni.navigateTo({
-						url: '/pages/my/master-settled-info'
-					})
+			async chooseEntryType(typeCode) {
+				await this.$request.updateWorker({
+					type: typeCode
+				});
+				if (typeCode === 1) {
+					this.$emit('changeCurPageCode', 'supplyChainPage');
+				} else if (typeCode === 0) {
+					uni.navigateTo({
+						url: '/pages/my/master-settled-info'
+					})
 				}
 			},
 			hideModal(e) {
@@ -286,14 +295,14 @@
 		margin-left: unset !important;
 		font-size: 30rpx !important;
 	}
-
-	.nav-list-panel {
-		font-weight: 300;
-	}
-	
+
+	.nav-list-panel {
+		font-weight: 300;
+	}
+
 	.nav-list-panel>navigator:first-child {
 		width: 46%;
-		height: 249rpx;
+		height: 249rpx;
 		line-height: 195rpx;
 	}
 
@@ -316,14 +325,21 @@
 		position: relative;
 		right: -30rpx;
 		border-radius: 40rpx 0 0 40rpx;
-	}
-	
-	.clearfix:after {
-	  visibility: hidden;
-	  display: block;
-	  font-size: 0;
-	  content: " ";
-	  clear: both;
-	  height: 0;
+	}
+
+	.clearfix:after {
+		visibility: hidden;
+		display: block;
+		font-size: 0;
+		content: " ";
+		clear: both;
+		height: 0;
+	}
+
+	.modal-bottom-oper {
+		height: 70rpx;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
 	}
 </style>
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index dcb77fd..b2da260 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -479,7 +479,7 @@
 					this.areaMultiIndex = [colObj.value, 0, 0];
 				} else if (colObj.column == 1) {
 					// 通过二级查三级
-					let subAreaList = await this.$request.areaListByStep({parentCode: this.regionList[0][colObj.value].areaCode});
+					let subAreaList = await this.$request.areaListByStep({parentCode: this.areaList[1][colObj.value].areaCode});
 					subAreaList = subAreaList.data;
 					this.areaList.pop();
 					this.areaList.push(subAreaList);
diff --git a/style/blue/blue-topic.css b/style/blue/blue-topic.css
index d27d3db..4a878d5 100644
--- a/style/blue/blue-topic.css
+++ b/style/blue/blue-topic.css
@@ -45,9 +45,14 @@ radio.main-color.checked .uni-radio-input {
 .cu-list.menu>.cu-item.bg-main-color.light {
 	color: #0081ff;
 	background-color: #cce6ff;
-}
-
-.cu-modal .cu-bar>.cu-btn.text-main-color {
-	color: #0081ff;
-	height: 100rpx;
-}
+}
+
+.cu-modal .cu-bar>.cu-btn.text-main-color {
+	color: #0081ff;
+	height: 100rpx;
+}
+
+.bg-white.text-main-color {
+	color: #0081ff;
+	background-color: #ffffff;
+}
\ No newline at end of file