进入平台时需将当前个人登录状态及缓存中的数据清除

pages/index/loading.vue

@@ -24,14 +24,15 @@ const tabBarControl = (show = false) => { // 显示/隐藏 TabBar
 
 onShow(async() => {
   tabBarControl(false) // 隐藏页面底部导航
+  
   // 检查是否是个人令牌
   if (getAccessToken() && uni.getStorageSync('isPersonalToken')) {
-    
     // 查看用户是否有在申请中的数据
-    const { code } =  await useUserStore.getPersonalApplyingData()
+    const { code } = await useUserStore.getPersonalApplyingData()
     uni.redirectTo({ url: code ? '/pages/register/review?hasData=true' : '/pages/register/index' })
     return
   }
+
 	if (!getAccessToken()) showAuthModal()
   uni.reLaunch({ url: '/pages/index/search' }) // 进入门墩儿
 })

pages/register/contact.vue

@@ -39,7 +39,7 @@
 import { ref, computed } from 'vue'
 import { userStore } from '@/store/user'
 import { onLoad } from '@dcloudio/uni-app'
-import { realName, mobile, emailRequired, password } from '@/utils/validate'
+import { mobile, emailRequired, password } from '@/utils/validate'
 import { enterpriseRegisterApply } from '@/api/enterprise'
 
 const useUserStore = userStore()
@@ -49,7 +49,9 @@ console.log(adminUserPhone.value, '注册手机号', register.value)
 
 const formRef = ref()
 const formRules = {
-	contactName: realName,
+	contactName: {
+		rules: [{required: true, errorMessage: '请输入姓名' }]
+	},
   phone: mobile,
 	email: emailRequired,
 	password,

pages/register/review.vue

@@ -1,11 +1,11 @@
 <template>
-	<view style="padding: 15px;">
+	<view v-if="show" style="padding: 15px;">
 		<!-- 提交企业注册以后跳转显示页面 -->
 		<view v-if="!applyInfo?.status">
 			<view class="d-flex flex-column align-center">
 				<image src="/static/svg/submit.svg" style="height: 200px; width: "></image>
 			</view>
-			<view style="text-align: center;"><span class="color-primary font-size-20 font-weight-bold">您的企业注册申请已提交</span></view>
+			<view class="text-center"><span class="color-primary font-size-20 font-weight-bold">您的企业注册申请已提交</span></view>
       <view class="mt-5">审核时间预计在1~3个工作日内，申请结果会以短信方式通知到您的手机上，请注意查收。</view>
       <view style="width: 100%;">
         <view class="mt-5 mb-1">如有疑问请长按二维码添加下方企业微信联系我们：</view>
@@ -14,6 +14,7 @@
         </view>
         <view class="text-center ml-5">潘青海先生（Peter Pan）</view>
       </view>
+			<button class="recomm-button" @tap="refresh">刷新结果</button>
 		</view>
 		<!-- 等待审核 -->
 		<view v-else-if="applyInfo?.status === '0'">
@@ -33,6 +34,7 @@
         </view>
         <view class="text-center ml-5">潘青海先生（Peter Pan）</view>
       </view>
+			<button class="recomm-button" @tap="refresh">刷新结果</button>
 		</view>
 
 		<!-- 审核不通过 -->
@@ -55,13 +57,18 @@
         </view>
         <view class="text-center ml-5">潘青海先生（Peter Pan）</view>
       </view>
-		</view>
-
-		<view>
-			<!-- <button :class="{'second-button': applyInfo.status === '2', 'send-button': applyInfo.status !== '2'}" @tap="handleToHome">回到首页</button> -->
-			<button v-if="applyInfo?.status === '2'" class="recomm-button" @tap="handleConfirm">重新提交</button>
+			<button class="recomm-button" @tap="handleConfirm">重新提交</button>
 			<button class="recomm-button" @tap="refresh">刷新结果</button>
 		</view>
+		
+		<!-- 审核通过  -->
+		<view v-else-if="applyInfo?.status === '1'" class="ss-m-b-100">
+			<view class="d-flex flex-column align-center">
+				<image src="/static/svg/submit.svg" style="height: 200px; width: "></image>
+			</view>
+			<view class="text-center"><span class="color-primary font-size-20 font-weight-bold">您的企业注册申请已通过</span></view>
+			<button class="recomm-button" @tap="toLogin">前往门墩儿招聘</button>
+		</view>
 	</view>
 </template>
 
@@ -69,11 +76,12 @@
 import { ref } from 'vue'
 import { getUserRegisterEnterpriseApply } from '@/api/enterprise.js'
 import { timesTampChange } from '@/utils/date'
-import { onLoad } from '@dcloudio/uni-app'
+import { onLoad, onShow } from '@dcloudio/uni-app'
 import { userStore } from '@/store/user'
 
 const user = userStore()
 const applyInfo = ref({})
+const show = ref(false)
 
 // 查看用户是否有在申请中的数据
 const getApplyInfo = async () => {
@@ -86,7 +94,7 @@ const getApplyInfo = async () => {
 		result = data || {}
 		uni.setStorageSync('entRegisterData', JSON.stringify(result))
 	}
-	
+
   applyInfo.value = {
 		phone: result.phone,
     createTime: timesTampChange(result.createTime), // 创建时间
@@ -107,6 +115,10 @@ onLoad((options) => {
 	getApplyInfo()
 })
 
+onShow(() => {
+	show.value = true
+})
+
 const refresh = async () => {
 	hasData = false
 	await getApplyInfo()
@@ -116,11 +128,21 @@ const refresh = async () => {
 // 回到首页时需将当前个人登录状态及缓存中的数据清除
 const handleToHome = async () => {
 	await user.handleUserLogout()
+	uni.removeStorageSync('isPersonalToken') // 注册企业时个人登录
 	uni.reLaunch({
 		url: '/pages/index/my'
 	})
 }
 
+// 进入平台时需将当前个人登录状态及缓存中的数据清除
+const toLogin = async () => {
+	await user.handleUserLogout()
+	uni.removeStorageSync('token');
+	uni.removeStorageSync('refresh-token');	
+	uni.removeStorageSync('isPersonalToken') // 注册企业时个人登录
+  uni.reLaunch({ url: '/pages/index/search' }) // 进入门墩儿
+}
+
 const handleConfirm = () => {
 	if (uni.getStorageSync('token') && uni.getStorageSync('isPersonalToken')) {
 		uni.navigateTo({ url: '/pages/register/index' })
@@ -133,5 +155,4 @@ const handleConfirm = () => {
 </script>
 
 <style scoped lang="scss">
-
 </style>

store/user.js

@@ -92,7 +92,7 @@ export const userStore = defineStore('user', {
     // 查看用户是否有在申请中的数据
     async getPersonalApplyingData () {
       const { data } = await getUserRegisterEnterpriseApply()
-      const bool = data && Object.keys(data).length > 0 && data.status !== '1'
+      const bool = data && Object.keys(data).length > 0
       uni.setStorageSync('entRegisterData', bool ? JSON.stringify(data) : "") // 企业注册申请中的数据
       return Promise.resolve({ code: bool ? 1 : 0 , data: bool ? JSON.stringify(data) : "" });
     },
@@ -153,6 +153,8 @@ export const userStore = defineStore('user', {
     // 账号注册-回到首页
     async handleUserLogout () {
       await userLogout()
+      uni.removeStorageSync('isPersonalToken') // 注册企业时个人登录
+      uni.removeStorageSync('entRegisterData') // 企业注册申请中的数据
       this.resetUserData()
       return !this.isLogin
     },