From 182aed85616f7ac60d0ffb02e4feac5661b80e0c Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 08 六月 2022 10:40:21 +0800
Subject: [PATCH] 修复初始化页面
---
src/pages/index/App.vue | 119 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 56 insertions(+), 63 deletions(-)
diff --git a/src/pages/index/App.vue b/src/pages/index/App.vue
index 4fc7f0d..4c8dbd7 100644
--- a/src/pages/index/App.vue
+++ b/src/pages/index/App.vue
@@ -11,24 +11,24 @@
<el-carousel ref="carousel" trigger="click" :loop="false" :autoplay="false" :initial-index="active">
<el-carousel-item>
- <formAccount ref="form0"></formAccount>
+ <formAccount ref="form0" v-show="active == createUser"></formAccount>
</el-carousel-item>
<el-carousel-item>
- <formNet ref="form1"></formNet>
+ <formNet ref="form1" v-show="active == configNet"></formNet>
</el-carousel-item>
<el-carousel-item>
- <formInfo ref="form2"></formInfo>
+ <formInfo ref="form2" v-show="active == registerInfo"></formInfo>
</el-carousel-item>
</el-carousel>
<div class="control">
- <div class="pre" @click="preForm" v-if="active != 0">涓婁竴姝�</div>
- <div class="next" @click="nextForm" v-if="active == 0">涓嬩竴姝�</div>
- <div class="next" @click="nextFormNot" v-if="active == 1">璺宠繃</div>
- <div class="next" @click="nextForm" v-if="active == 1 && !isNet">
+ <div class="pre" @click="preForm" v-if="active != createUser">涓婁竴姝�</div>
+ <div class="next" @click="nextForm" v-if="active == createUser || (active == configNet && !isOnline)">
涓嬩竴姝�
</div>
- <div class="next" @click="nextForm" v-if="active == 2">瀹屾垚</div>
+ <div class="next" @click="nextFormNot" v-if="active == configNet">璺宠繃</div>
+
+ <div class="next" @click="nextForm" v-if="active == registerInfo">瀹屾垚</div>
</div>
</div>
</div>
@@ -42,13 +42,22 @@
import { getInitInfo, savePassword, initNetwork, saveRegInfo, getRegInfo, isOnNet } from "./api"
export default {
- created() {
- window.addEventListener("keydown", (event) => {
- if (event.keyCode === 9) {
- console.log("tabfalse13")
- event.preventDefault()
- }
- })
+ name: "smartai init",
+ components: {
+ formAccount,
+ formNet,
+ formInfo
+ },
+ data() {
+ return {
+ active: 0,
+ formData: {},
+ isWhite: true,
+ isOnline: false,
+ createUser: 0,
+ configNet: 1,
+ registerInfo: 2
+ }
},
mounted() {
this.getInitInfo()
@@ -59,11 +68,9 @@
//涓存椂鍒ゆ柇缃戠粶鏄惁閫氱晠
img.src = "http://apps.smartai.com/img/icons/favicon-32x32.png"
img.onload = function() {
- console.log("11111")
if (callback) callback(true)
}
img.onerror = function() {
- console.log("22222")
if (callback) callback(false)
}
}
@@ -71,7 +78,7 @@
onLine((flag) => {
let message = ""
if (flag) {
- this.isNet = true
+ this.isOnline = true
message = "宸叉湁缃戠粶"
} else {
//缃戠粶鏂綉鏁堟灉鍥惧嚭鏉ュ悗锛屽皢姝ゅ湴鏀逛负璺宠浆璺緞鍒版晥鏋滃浘涓�
@@ -82,57 +89,56 @@
}
})
},
- data() {
- return {
- active: 0,
- formData: {},
- isWhite: true,
- isNet: false
- }
- },
- components: {
- formAccount,
- formNet,
- formInfo
- },
+
methods: {
preForm() {
- if (this.active == 0) {
+ if (this.active == this.createUser) {
return
}
this.active--
- this.$refs["carousel"].prev()
+
+ // 濡傛灉缃戠粶姝ｅ父, 鐩存帴璺宠繃
+ if (this.active == this.configNet && this.isOnline) {
+ this.active--
+ }
+
+ this.$refs["carousel"].setActiveItem(this.active)
},
async nextForm() {
- if (this.active == 2) {
+ // 鎻愪氦娉ㄥ唽淇℃伅
+ if (this.active == this.registerInfo) {
const data = this.$refs[`form${this.active}`].getFormData()
await saveRegInfo(data)
location.assign("/view/login/")
return
}
- if (this.active == 0) {
+ // 閰嶇疆缃戠粶
+ if (this.active == this.configNet) {
+ const data = this.$refs[`form${this.active}`].getFormData()
+ initNetwork(data)
+ }
+
+ // 鍒涘缓鐢ㄦ埛
+ if (this.active == this.createUser) {
const data = this.$refs[`form${this.active}`].getFormData()
if (!data) {
return false
}
- const res1 = await savePassword(data)
- console.log(data)
- this.active++
- this.$refs["carousel"].next()
+
+ await savePassword(data)
+
+ // 濡傛灉缃戠粶姝ｅ父, 鐩存帴璺冲埌绗笁閮�
+ if (this.isOnline) {
+ this.active++
+ }
}
- if (this.active == 1) {
- const data = this.$refs[`form${this.active}`].getFormData()
- initNetwork(data)
- this.active++
- this.$refs["carousel"].next()
- }
-
- this.getInitInfo()
+ this.active++
+ this.$refs["carousel"].setActiveItem(this.active)
},
- nextFormNot() {
- this.getInitInfo()
+ async nextFormNot() {
+ await this.getInitInfo()
this.active++
this.$refs["carousel"].next()
@@ -142,15 +148,8 @@
this.isWhite = false
})
- console.log(res)
-
if (res.data && res.data.initPwd && !res.data.initRegInfo) {
- const res1 = await getRegInfo()
- this.active = 1
- console.log(res1)
- setTimeout(() => {
- this.$refs["carousel"].setActiveItem(1)
- }, 0)
+ this.active = this.isOnline ? this.registerInfo : this.configNet
}
if (res.data && res.data.initPwd && res.data.initRegInfo) {
@@ -160,12 +159,6 @@
this.isWhite = false
}
- },
- destroyed() {
- window.removeEventListener("keydown", (event) => {
- console.log(event.value)
- event.preventDefault()
- })
}
}
</script>
--
Gitblit v1.8.0