From 729eb7c86152696119d0b9cc0c03c2881311753d Mon Sep 17 00:00:00 2001
From: Mrxtyyp <1126084777@qq.com>
Date: Tue, 23 Jul 2024 21:36:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue      | 10 +++++++++-
 pages/login/login.vue      | 14 ++++++++++++--
 pages/my/certification.vue | 18 +++++++++++-------
 style/default.css          |  2 +-
 4 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 285d0ae..c9a6f52 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -39,7 +39,15 @@
 				forwardingPageCode: null
 			}
 		},
-		onLoad(options) {
+		onLoad(options) {
+			
+			let curUserInfo = this.$request.getCurUserInfo();
+			if(!curUserInfo) {
+				uni.reLaunch({
+					url: '/pages/login/login'
+				})
+				return
+			}
 			this.loadData();
 			if (options && options.menuCode) {
 				this.changeCurPageCode(options.menuCode)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index f05ea6a..3ae6c37 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -82,7 +82,16 @@
 		<vertify-login ref="vertifyLogin" @reload="authLogin"></vertify-login>
 		<!-- 加入师傅团队提示 -->
 		<!-- <invite-master ref="inviteMasterModal" :inviteMasterObj="inviter" @confirm="inviteMaster"></invite-master> -->
-		<confirm-modal ref="inviteMasterModal" :content="'是否确认加入' + inviter.name + '的团队？'" @confirm="inviteMaster(inviter)"></confirm-modal>
+		<confirm-modal ref="inviteMasterModal" :content="'是否确认加入' + inviter.name + '的团队？'" @confirm="inviteMaster(inviter)"></confirm-modal>
+		
+		<confirm-modal ref="focusModal" :showCancel="false">
+			<template #contentView>
+				<view style="display: flex;flex-direction: column;justify-content: center;align-items: center;">
+					<image style="width: 400upx;height: 400upx;margin-bottom: 50upx;" :show-menu-by-longpress="true" src="http://gqz.opsoul.com/qrcode_for_gh_e1c9ac86741f_860.jpg" mode="aspectFill"></image>
+					<text>为了方便工单进度通知，请关注公众号</text>
+				</view>
+			</template>
+		</confirm-modal>
 	</view>
 </template>
 
@@ -120,7 +129,8 @@
 			changeOperType() {
 				this.reset();
 				this.operType = this.operType === 0 ? 1 : 0;
-				if (this.operType === 1) {
+				if (this.operType === 1) {
+					this.$refs.focusModal.showModal();
 					this.authLogin();
 				}
 			},
diff --git a/pages/my/certification.vue b/pages/my/certification.vue
index f1f5a14..61edb0a 100644
--- a/pages/my/certification.vue
+++ b/pages/my/certification.vue
@@ -119,18 +119,22 @@
 							placeholder="请输入公司执照号码"></input>
 					</view>
 					<view class="cu-form-group">
-						<view class="title">公司地址</view>
-						<view class="flex-column-between flex-view">
+						<view class="title">公司区域</view>
+						<view class="flex-column-between">
 							<picker :mode="'multiSelector'" @change="regionChange" @columnchange="regionColChange"
 								:value="multiIndex" :range-key="'areaName'" :range="areaList">
 								<view class="picker">
 									{{realNameInfo.companyArea && realNameInfo.companyArea.length ? realNameInfo.companyArea[0].areaName + '-' + realNameInfo.companyArea[1].areaName + '-' + realNameInfo.companyArea[2].areaName : '请选择'}}
 								</view>
-							</picker>
-							<!-- <view><input name="companyAddress" v-model="realNameInfo.companyAddress" placeholder="请输入营业执照地址/经营地址/服务网点"></input></view> -->
-							<textarea name="companyAddress" class="solid padding-sm" maxlength="-1"
-								v-model="realNameInfo.companyAddress" placeholder="请输入营业执照地址/经营地址/服务网点" />
+							</picker>
 						</view>
+					</view>
+					<view class="cu-form-group">
+						<view class="title">公司地址</view>
+						<view class="flex-column-between flex-view">
+							<textarea name="companyAddress" class="solid padding-sm" maxlength="-1"
+								v-model="realNameInfo.companyAddress" placeholder="请输入营业执照地址/经营地址/服务网点" />
+						</view>
 					</view>
 					<view class="cu-form-group">
 						<view class="title">法人/负责人</view>
@@ -886,7 +890,7 @@
 		position: relative;
 		height: 60rpx;
 		line-height: 60rpx;
-		flex-basis: 40%;
+		flex-basis: 55%;
 	}
 
 	.form-opt {
diff --git a/style/default.css b/style/default.css
index c7c8477..4132bab 100644
--- a/style/default.css
+++ b/style/default.css
@@ -237,7 +237,7 @@
 }
 
 .cu-form-group textarea {
-	margin: 0 0 20rpx 0 !important;
+	margin: 20rpx 0 !important;
 	padding: 20rpx !important;
 }