From edb5af0f95a95d86d7293f7049ee495b3ec56ecd Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期五, 29 十月 2021 17:23:37 +0800
Subject: [PATCH] 默认更改列表
---
src/views/main-components/header.vue | 6
src/views/login.vue | 249 ++++++++++---------------------------------------
src/router/router.js | 12 ++
src/assets/yancao.png | 0
4 files changed, 65 insertions(+), 202 deletions(-)
diff --git a/src/assets/yancao.png b/src/assets/yancao.png
new file mode 100644
index 0000000..13fcb87
--- /dev/null
+++ b/src/assets/yancao.png
Binary files differ
diff --git a/src/router/router.js b/src/router/router.js
index 2d41852..b630139 100644
--- a/src/router/router.js
+++ b/src/router/router.js
@@ -82,6 +82,15 @@
component: () => import('@/views/error-page/500.vue')
};
+export const home2 = {
+ path: '/home2',
+ meta: {
+ title: 'home'
+ },
+ name: 'home',
+ component: () => import('@/views/sys/user-manage/userManage.vue')
+};
+
// 浣滀负Main缁勪欢鐨勫瓙椤甸潰灞曠ず浣嗘槸涓嶅湪宸︿晶鑿滃崟鏄剧ず鐨勮矾鐢卞啓鍦╫therRouter閲�
export const otherRouter = {
path: '/',
@@ -112,5 +121,6 @@
otherRouter,
...appRouter,
page500,
- page403
+ page403,
+ home2
];
diff --git a/src/views/login.vue b/src/views/login.vue
index 73c3014..9e8fef2 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -11,12 +11,6 @@
<div>
<Header />
<div v-if="!socialLogining">
- <Tabs v-model="tabName">
- <TabPane
- :label="$t('usernameLogin')"
- name="username"
- icon="md-person"
- >
<Form
ref="usernameLoginForm"
:model="form"
@@ -45,99 +39,53 @@
autocomplete="off"
/>
</FormItem>
- <FormItem prop="imgCode">
- <Row
- type="flex"
- justify="space-between"
- style="align-items: center; overflow: hidden"
- >
- <Input
- v-model="form.imgCode"
- size="large"
- clearable
- placeholder="璇疯緭鍏ュ浘鐗囬獙璇佺爜"
- :maxlength="10"
- class="input-verify"
- />
- <div
- class="code-image"
- style="position: relative; font-size: 12px"
- >
- <Spin v-if="loadingCaptcha" fix></Spin>
- <img
- :src="captchaImg"
- @click="getCaptchaImg"
- alt="鍔犺浇楠岃瘉鐮佸け璐�"
- style="width: 110px; cursor: pointer; display: block"
- />
- </div>
- </Row>
- </FormItem>
+ <!--<FormItem prop="imgCode">-->
+ <!--<Row-->
+ <!--type="flex"-->
+ <!--justify="space-between"-->
+ <!--style="align-items: center; overflow: hidden"-->
+ <!-->-->
+ <!--<Input-->
+ <!--v-model="form.imgCode"-->
+ <!--size="large"-->
+ <!--clearable-->
+ <!--placeholder="璇疯緭鍏ュ浘鐗囬獙璇佺爜"-->
+ <!--:maxlength="10"-->
+ <!--class="input-verify"-->
+ <!--/>-->
+ <!--<div-->
+ <!--class="code-image"-->
+ <!--style="position: relative; font-size: 12px"-->
+ <!-->-->
+ <!--<Spin v-if="loadingCaptcha" fix></Spin>-->
+ <!--<img-->
+ <!--:src="captchaImg"-->
+ <!--@click="getCaptchaImg"-->
+ <!--alt="鍔犺浇楠岃瘉鐮佸け璐�"-->
+ <!--style="width: 110px; cursor: pointer; display: block"-->
+ <!--/>-->
+ <!--</div>-->
+ <!--</Row>-->
+ <!--</FormItem>-->
</Form>
- </TabPane>
- <TabPane
- :label="$t('mobileLogin')"
- name="mobile"
- icon="ios-phone-portrait"
- >
- <Form
- ref="mobileLoginForm"
- :model="form"
- :rules="rules"
- class="form"
- v-if="tabName == 'mobile'"
- >
- <FormItem prop="mobile">
- <Input
- v-model="form.mobile"
- prefix="ios-phone-portrait"
- size="large"
- clearable
- placeholder="璇疯緭鍏ユ墜鏈哄彿"
- />
- </FormItem>
- <FormItem prop="code" :error="errorCode">
- <Row type="flex" justify="space-between">
- <Input
- v-model="form.code"
- prefix="ios-mail-outline"
- size="large"
- clearable
- placeholder="璇疯緭鍏ョ煭淇￠獙璇佺爜"
- :maxlength="6"
- class="input-verify"
- />
- <CountDownButton
- ref="countDown"
- @on-click="sendSmsCode"
- :autoCountDown="false"
- size="large"
- :loading="sending"
- :text="getSms"
- />
- </Row>
- </FormItem>
- </Form>
- </TabPane>
- </Tabs>
- <Row justify="space-between" align="middle">
- <Checkbox v-model="saveLogin" size="large">{{
- $t("autoLogin")
- }}</Checkbox>
- <Dropdown trigger="click" @on-click="handleDropDown">
- <a class="forget-pass">{{ $t("forgetPass") }}</a>
- <DropdownMenu slot="list">
- <DropdownItem name="test">浣撻獙娴嬭瘯璐﹀彿</DropdownItem>
- <DropdownItem name="resetByMobile"
- >浣跨敤鎵嬫満鍙烽噸缃瘑鐮�(浠樿垂)</DropdownItem
- >
- <DropdownItem name="resetByEmail"
- >浣跨敤閭閲嶇疆瀵嗙爜(浠樿垂)</DropdownItem
- >
- </DropdownMenu>
- </Dropdown>
- </Row>
+ <!--<Row justify="space-between" align="middle">-->
+ <!--<Checkbox v-model="saveLogin" size="large">{{-->
+ <!--$t("autoLogin")-->
+ <!--}}</Checkbox>-->
+ <!--<Dropdown trigger="click" @on-click="handleDropDown">-->
+ <!--<a class="forget-pass">{{ $t("forgetPass") }}</a>-->
+ <!--<DropdownMenu slot="list">-->
+ <!--<DropdownItem name="test">浣撻獙娴嬭瘯璐﹀彿</DropdownItem>-->
+ <!--<DropdownItem name="resetByMobile"-->
+ <!-->浣跨敤鎵嬫満鍙烽噸缃瘑鐮�(浠樿垂)</DropdownItem-->
+ <!-->-->
+ <!--<DropdownItem name="resetByEmail"-->
+ <!-->浣跨敤閭閲嶇疆瀵嗙爜(浠樿垂)</DropdownItem-->
+ <!-->-->
+ <!--</DropdownMenu>-->
+ <!--</Dropdown>-->
+ <!--</Row>-->
<Button
class="login-btn"
type="primary"
@@ -149,65 +97,12 @@
<span v-if="!loading">{{ $t("login") }}</span>
<span v-else>{{ $t("logining") }}</span>
</Button>
- <Row type="flex" justify="space-between" class="other-login">
- <div class="other-way icons">
- {{ $t("otherLogin") }}
- <div class="other-icon" @click="toGithubLogin">
- <Icon
- custom="iconfont icon-github"
- size="20"
- class="other-icon"
- @click="toGithubLogin"
- />
- </div>
- <div class="other-icon" @click="toQQLogin">
- <Icon custom="iconfont icon-qq" size="22" />
- </div>
- <div class="other-icon" @click="toWeixinLogin">
- <Icon custom="iconfont icon-weixin" size="23" />
- </div>
- <Icon
- v-show="!showMore"
- type="ios-arrow-down"
- class="other-icon"
- size="16"
- @click="showMore = true"
- ></Icon>
- <div class="other-icon" v-show="showMore" @click="toWeiboLogin">
- <Icon custom="iconfont icon-weibo" size="23" />
- </div>
- <div
- class="other-icon"
- v-show="showMore"
- @click="toDingdingLogin"
- >
- <Icon custom="iconfont icon-dingding" size="20" />
- </div>
- <div
- class="other-icon"
- v-show="showMore"
- @click="toWorkwechatLogin"
- >
- <Icon custom="iconfont icon-qiyeweixin" size="20" />
- </div>
- <Icon
- v-show="showMore"
- type="ios-arrow-up"
- class="other-icon"
- size="16"
- @click="showMore = false"
- ></Icon>
- </div>
- <router-link to="/regist">
- <a class="forget-pass">{{ $t("regist") }}</a>
- </router-link>
- </Row>
</div>
<div v-if="socialLogining">
<RectLoading />
</div>
</div>
- <Footer />
+ <!--<Footer />-->
</Col>
<LangSwitch />
</Row>
@@ -233,12 +128,6 @@
import {
login,
userInfo,
- githubLogin,
- qqLogin,
- weiboLogin,
- wechatLogin,
- dingdingLogin,
- workwechatLogin,
getJWT,
sendLoginSms,
smsLogin,
@@ -250,7 +139,7 @@
import { validateMobile } from "@/libs/validate";
import Cookies from "js-cookie";
import Header from "@/views/main-components/header";
- import Footer from "@/views/main-components/footer";
+ //import Footer from "@/views/main-components/footer";
import LangSwitch from "@/views/main-components/lang-switch";
import RectLoading from "@/views/my-components/xboot/rect-loading";
import CountDownButton from "@/views/my-components/xboot/count-down-button";
@@ -263,7 +152,6 @@
RectLoading,
LangSwitch,
Header,
- Footer,
VueFurcateTree
},
data() {
@@ -315,44 +203,9 @@
sending: false,
errorCode: "",
form: {
- username: "test鎴杢est2 鍙敞鍐� 鏀寔绗笁鏂硅处鍙风櫥褰�",
+ username: "admin",
password: "123456",
- mobile: "闃块噷浜戠煭淇�0.045/鏉� 鑻ヤ綑棰濅笉瓒宠仈绯讳綔鑰呭厖鍊�",
code: "",
- },
- rules: {
- username: [
- {
- required: true,
- message: "璐﹀彿涓嶈兘涓虹┖",
- trigger: "change",
- },
- ],
- password: [
- {
- required: true,
- message: "瀵嗙爜涓嶈兘涓虹┖",
- trigger: "change",
- },
- ],
- imgCode: [
- {
- required: true,
- message: "楠岃瘉鐮佷笉鑳戒负绌�",
- trigger: "change",
- },
- ],
- mobile: [
- {
- required: true,
- message: "鎵嬫満鍙蜂笉鑳戒负绌�",
- trigger: "change",
- },
- {
- validator: validateMobile,
- trigger: "change",
- },
- ],
},
};
},
@@ -422,7 +275,7 @@
util.initRouter(this);
// window.location.reload();
this.$router.push({
- name: "home_index",
+ name: "home2",
});
} else {
this.loading = false;
@@ -632,9 +485,9 @@
},
},
mounted() {
- this.showNotice();
+ //this.showNotice();
this.relatedLogin();
- this.getCaptchaImg();
+ //this.getCaptchaImg();
},
};
</script>
diff --git a/src/views/main-components/header.vue b/src/views/main-components/header.vue
index fcd7670..fb4571f 100644
--- a/src/views/main-components/header.vue
+++ b/src/views/main-components/header.vue
@@ -2,12 +2,12 @@
<div>
<div class="header">
<img
- src="@/assets/logo-white.png"
+ src="@/assets/yancao.png"
width="220px"
v-if="mainTheme == 'darkMode'"
/>
- <img src="@/assets/logo-black.png" width="220px" v-else />
- <div class="description">{{ $t("xboot") }}</div>
+ <img src="@/assets/yancao.png" width="320px" v-else />
+ <!--<div class="description">{{ 鍞愬北鐑熻崏 }}</div>-->
</div>
</div>
</template>
--
Gitblit v1.9.1