From ba14872e89107fa03f3e895becfc3eb4c35ed180 Mon Sep 17 00:00:00 2001
From: Apcallover <1503963513@qq.com>
Date: Wed, 24 Jul 2024 14:45:29 +0800
Subject: [PATCH] =?UTF-8?q?flat:=E7=99=BB=E5=BD=95=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue |  31 ++--
 pages/login/login.vue | 342 +++++++++++++++++++++---------------------
 store/models/face.js  |  64 ++++----
 3 files changed, 222 insertions(+), 215 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2842c22..80c2b05 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -191,16 +191,16 @@
             </view>
         </view>
 
-        <view class="info_market">
+        <!--   <view class="info_market">
             <view class="market_top">
                 <view class="top_log"></view>
                 <view class="next_market" @click="navTo('/pages/market/market')">去市场</view>
             </view>
-            <!-- <view class="market_bottom">
+            <view class="market_bottom">
                 <view>了解市场<u-icon name="arrow-right" color="#666666" size="13"></u-icon></view>
                 <view>我要咨询<u-icon name="arrow-right" color="#666666" size="13"></u-icon></view>
-            </view> -->
-        </view>
+            </view>
+        </view> -->
 
         <view class="latestMission">
             <view class="cardTips"
@@ -289,18 +289,11 @@
                 policyContentList: [],
                 policyType: 1,
                 swiperType: 1,
+                isResume: true,
             };
         },
         onLoad: function(options) {
-            myResume().then(res => {
-                const data = res.data.data
-                if (!(data.education && data.telephone && data.wage && data.workplace)) {
-                    this.goures()
-                    this.$api.sleep(1000).then(() => {
-                        this.$api.msg('请输入基本信息')
-                    })
-                }
-            })
+
         },
         onShow: function() {
             if (!this.$store.state.user.token) {
@@ -319,6 +312,18 @@
             this.download()
             this.getSwiperList()
             this.getPolicy()
+            if (this.isResume) {
+                this.isResume = false
+                myResume().then(res => {
+                    const data = res.data.data
+                    if (!(data.education && data.telephone && data.wage && data.workplace)) {
+                        this.goures()
+                        this.$api.sleep(1000).then(() => {
+                            this.$api.msg('请输入基本信息')
+                        })
+                    }
+                })
+            }
         },
         onReady() {
             uni.setNavigationBarTitle({
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 41ad0f1..d844c69 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,170 +1,172 @@
-<template>
-	<login-template title="账号登录">
-		<!--  #ifdef  H5 -->
-		<!-- <view class="login-go-home" @click="goHome">
-			<image class="login-go-home-image" src="@/static/img/home.svg"></image>
-		</view> -->
-		<!--  #endif -->
-		<jl-input type="text" v-model="phone" placeholder="请输入手机号" @confirm="login"></jl-input>
-		<jl-input type="text" v-model="password" placeholder="请输入登录密码" @confirm="login" showPassword clearable></jl-input>
-		<!-- <code-input ref="code" v-model="code" :getCode="getCaptcha" @key-change="keyChange" @confirm="login"></code-input> -->
-		<view v-if="loading" class="btn nocheck" loading="true"></view>
-		<view v-else-if="validate" class="btn" @click="login">立即登录</view>
-		<view v-else class="btn nocheck">立即登录</view>
-		<!-- <view class="changeLogintype">
-			<view class="" @click="goReg">手机注册</view>
-			<view class="" @click="goForget">忘记密码</view>
-		</view> -->
-	</login-template>
-</template>
-
-<script>
-	import {
-		mapGetters
-	} from 'vuex'
-	import {
-		getCaptcha
-	} from '@/api/user.js'
-	import {
-		isMobile
-	} from '@/untils/validate.js'
-	import website from '@/config/website.js'
-	import codeInput from './codeInput.vue'
-	import jlInput from '@/components/jl-input/main.vue'
-	import loginTemplate from './template.vue'
-
-	export default {
-		components: {
-			jlInput,
-			codeInput,
-			loginTemplate
-		},
-		data() {
-			return {
-				phone: '',
-				password: '',
-				code: '1111',
-				key: '',
-				loading: false
-			}
-		},
-		created() {
-			if (this.userInfo.token) {
-				uni.navigateBack()
-			}
-		},
-		onShow() {
-			// #ifdef  MP-WEIXIN
-			wx.hideHomeButton();
-			//#endif
-			this.password = ''
-			if (this.$store.state.user.token) {
-				this.$store.dispatch('LogOut').then(() => {
-					this.$store.dispatch('clearAuthState')
-					this.$store.dispatch('endRefreshNewsTimer')
-				})
-			}
-		},
-		methods: {
-			goHome() {
-				uni.switchTab({
-					url: '/pages/index/index'
-				})
-			},
-			login(e) {
-				if (this.validate) {
-					this.userChecked = true;
-					console.log(this.userChecked)
-					// if (!this.userChecked) {
-					// 	uni.showToast({
-					// 		title:'请先阅读并同意《服务及隐私协议》',
-					// 		icon:'none',
-					// 	})
-					// } else {
-						var that = this
-						this.loading = true
-						this.$store.dispatch("LoginByUsername", {
-							username: this.phone,
-							password: this.password,
-							key: this.key,
-							code: this.code,
-							type: "account",
-							tenantId: website.tenantId
-						}).then((resp) => {
-							this.$store.dispatch('refreshAuthState').then(() => {
-								that.loading = false
-								var auth = this.auth
-								if (!auth.bankCardState) {
-									that.goSign(0)
-								} else {
-									uni.switchTab({
-										url: '/pages/index/index'
-									})
-								}
-							})
-						}).catch((err) => {
-							this.loading = false
-							// this.$refs.code.refushCode()
-							location.href = "https://dy12333.org.cn/h5/"
-						});
-					// }
-				}
-			},
-			// 步骤
-			goSign(active) {
-				uni.navigateTo({
-					url: `/pages/projectInfo/signContract?active=${active}`
-				})
-			},
-			keyChange(val) {
-				this.key = val
-			},
-			goReg() {
-				uni.navigateTo({
-					url: './reg'
-				})
-			},
-			goForget() {
-				uni.navigateTo({
-					url: './forgetPwd'
-				})
-			},
-			getCaptcha
-		},
-		computed: {
-			...mapGetters(['userInfo', 'auth', 'autograph', 'userChecked']),
-			validate() {
-				return this.phone && this.password && this.code
-			}
-		}
-	}
-</script>
-
-<style>
-	@import "./css.css";
-
-	/*  #ifdef  H5 */
-	.login-go-home {
-		position: absolute;
-		top: 10rpx;
-		left: 0;
-		border-radius: 50%;
-		width: 60rpx;
-		height: 60rpx;
-		background: rgb(217, 217, 217);
-		border: 1px solid rgb(198, 198, 198);
-	}
-
-	.login-go-home-image {
-		width: 40rpx;
-		height: 40rpx;
-		margin: auto;
-		position: absolute;
-		top: 0;
-		bottom: 0;
-		left: 0;
-		right: 0;
-	}
-
-	/* #endif */
-</style>
+<template>
+    <login-template title="账号登录">
+        <!--  #ifdef  H5 -->
+        <!-- <view class="login-go-home" @click="goHome">
+			<image class="login-go-home-image" src="@/static/img/home.svg"></image>
+		</view> -->
+        <!--  #endif -->
+        <jl-input type="text" v-model="phone" placeholder="请输入手机号" @confirm="login"></jl-input>
+        <jl-input type="text" v-model="password" placeholder="请输入登录密码" @confirm="login" showPassword
+            clearable></jl-input>
+        <!-- <code-input ref="code" v-model="code" :getCode="getCaptcha" @key-change="keyChange" @confirm="login"></code-input> -->
+        <view v-if="loading" class="btn nocheck" loading="true"></view>
+        <view v-else-if="validate" class="btn" @click="login">立即登录</view>
+        <view v-else class="btn nocheck">立即登录</view>
+        <!-- <view class="changeLogintype">
+			<view class="" @click="goReg">手机注册</view>
+			<view class="" @click="goForget">忘记密码</view>
+		</view> -->
+    </login-template>
+</template>
+
+<script>
+    import {
+        mapGetters
+    } from 'vuex'
+    import {
+        getCaptcha
+    } from '@/api/user.js'
+    import {
+        isMobile
+    } from '@/untils/validate.js'
+    import website from '@/config/website.js'
+    import codeInput from './codeInput.vue'
+    import jlInput from '@/components/jl-input/main.vue'
+    import loginTemplate from './template.vue'
+
+    export default {
+        components: {
+            jlInput,
+            codeInput,
+            loginTemplate
+        },
+        data() {
+            return {
+                phone: '',
+                password: '',
+                code: '1111',
+                key: '',
+                loading: false
+            }
+        },
+        created() {
+            if (this.userInfo.token) {
+                uni.navigateBack()
+            }
+        },
+        onShow() {
+            // #ifdef  MP-WEIXIN
+            wx.hideHomeButton();
+            //#endif
+            this.password = ''
+            if (this.$store.state.user.token) {
+                this.$store.dispatch('LogOut').then(() => {
+                    this.$store.dispatch('clearAuthState')
+                    this.$store.dispatch('endRefreshNewsTimer')
+                })
+            }
+        },
+        methods: {
+            goHome() {
+                uni.switchTab({
+                    url: '/pages/index/index'
+                })
+            },
+            login(e) {
+                if (this.validate) {
+                    this.userChecked = true;
+                    console.log(this.userChecked)
+                    // if (!this.userChecked) {
+                    // 	uni.showToast({
+                    // 		title:'请先阅读并同意《服务及隐私协议》',
+                    // 		icon:'none',
+                    // 	})
+                    // } else {
+                    var that = this
+                    this.loading = true
+                    this.$store.dispatch("LoginByUsername", {
+                        username: this.phone,
+                        password: this.password,
+                        key: this.key,
+                        code: this.code,
+                        type: "account",
+                        tenantId: website.tenantId
+                    }).then((resp) => {
+                        this.$store.dispatch('refreshAuthState').then(() => {
+                            that.loading = false
+                            var auth = this.auth
+                            if (!auth.bankCardState) {
+                                that.goSign(0)
+                            } else {
+                                uni.switchTab({
+                                    url: '/pages/index/index'
+                                })
+                            }
+                        })
+                    }).catch((err) => {
+                        this.loading = false
+                        // this.$refs.code.refushCode()
+                        // location.href = "https://dy12333.org.cn/h5/"
+                        this.$api.msg('登录失败')
+                    });
+                    // }
+                }
+            },
+            // 步骤
+            goSign(active) {
+                uni.navigateTo({
+                    url: `/pages/projectInfo/signContract?active=${active}`
+                })
+            },
+            keyChange(val) {
+                this.key = val
+            },
+            goReg() {
+                uni.navigateTo({
+                    url: './reg'
+                })
+            },
+            goForget() {
+                uni.navigateTo({
+                    url: './forgetPwd'
+                })
+            },
+            getCaptcha
+        },
+        computed: {
+            ...mapGetters(['userInfo', 'auth', 'autograph', 'userChecked']),
+            validate() {
+                return this.phone && this.password && this.code
+            }
+        }
+    }
+</script>
+
+<style>
+    @import "./css.css";
+
+    /*  #ifdef  H5 */
+    .login-go-home {
+        position: absolute;
+        top: 10rpx;
+        left: 0;
+        border-radius: 50%;
+        width: 60rpx;
+        height: 60rpx;
+        background: rgb(217, 217, 217);
+        border: 1px solid rgb(198, 198, 198);
+    }
+
+    .login-go-home-image {
+        width: 40rpx;
+        height: 40rpx;
+        margin: auto;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+    }
+
+    /* #endif */
+</style>
\ No newline at end of file
diff --git a/store/models/face.js b/store/models/face.js
index eee7c33..c040ab7 100644
--- a/store/models/face.js
+++ b/store/models/face.js
@@ -1,32 +1,32 @@
-import {
-	getStore,
-	setStore
-} from '@/untils/store.js'
-
-export default {
-	state: {
-		homeNavShow: getStore({
-			name: 'homeNavShow'
-		}) !== false,
-		homeTitle: getStore({
-			name: 'homeTitle'
-		}) || '德阳市智慧就业服务平台'
-	},
-	actions: {},
-	mutations: {
-		SET_HOME_TITLE: (state, status) => {
-			state.homeTitle = status
-			setStore({
-				name: 'homeTitle',
-				content: state.homeTitle
-			})
-		},
-		SET_HOME_NAV_SHOW: (state, status) => {
-			state.homeNavShow = status
-			setStore({
-				name: 'homeNavShow',
-				content: state.homeNavShow
-			})
-		},
-	}
-}
+import {
+    getStore,
+    setStore
+} from '@/untils/store.js'
+
+export default {
+    state: {
+        homeNavShow: getStore({
+            name: 'homeNavShow'
+        }) !== false,
+        homeTitle: getStore({
+            name: 'homeTitle'
+        }) || '管陶县智慧就业服务平台'
+    },
+    actions: {},
+    mutations: {
+        SET_HOME_TITLE: (state, status) => {
+            state.homeTitle = status
+            setStore({
+                name: 'homeTitle',
+                content: state.homeTitle
+            })
+        },
+        SET_HOME_NAV_SHOW: (state, status) => {
+            state.homeNavShow = status
+            setStore({
+                name: 'homeNavShow',
+                content: state.homeNavShow
+            })
+        },
+    }
+}
\ No newline at end of file