Skip to content

C
campSite
Commit 3208ed7e authored by wuwangwolihui's avatar wuwangwolihui
Browse files
Options

功能修改-lh

parent 510548b6
Show whitespace changes
Inline Side-by-side
Showing with 250 additions and 318 deletions
package-lock.json
View file @ 3208ed7e
......@@ -14,7 +14,6 @@
"js-cookie": "^3.0.1",
"node-sass": "^6.0.1",
"qrcodejs2": "^0.0.2",
"react-inlinesvg": "^2.3.0",
"sass": "^1.42.1",
"vue": "^2.6.11",
"vue-router": "^3.5.1",
......@@ -6817,11 +6816,6 @@
"node": ">=6"
}
},
"node_modules/exenv": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
"integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50="
},
"node_modules/expand-brackets": {
"version": "2.1.4",
"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
......@@ -9162,18 +9156,6 @@
"url": "https://tidelift.com/funding/github/npm/loglevel"
}
},
"node_modules/loose-envify": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
"integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
"peer": true,
"dependencies": {
"js-tokens": "^3.0.0 || ^4.0.0"
},
"bin": {
"loose-envify": "cli.js"
}
},
"node_modules/lower-case": {
"version": "1.1.4",
"integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
......@@ -11693,39 +11675,6 @@
"node": ">= 0.8"
}
},
"node_modules/react": {
"version": "17.0.2",
"resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
"integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
"peer": true,
"dependencies": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1"
},
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/react-from-dom": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/react-from-dom/-/react-from-dom-0.6.1.tgz",
"integrity": "sha512-7aAZx7LhRnmR51W5XtmTBYHGFl2n1AdEk1uoXLuzHa1OoGXrxOW/iwLcudvgp6BGX/l4Yh1rtMrIzvhlvbVddg==",
"peerDependencies": {
"react": "^15.0.0 || ^16.0.0 || ^17.0.0"
}
},
"node_modules/react-inlinesvg": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/react-inlinesvg/-/react-inlinesvg-2.3.0.tgz",
"integrity": "sha512-fEGOdDf4k4bcveArbEpj01pJcH8pOCKLxmSj2POFdGvEk5YK0NZVnH6BXpW/PzACHPRsuh1YKAhNZyFnD28oxg==",
"dependencies": {
"exenv": "^1.2.2",
"react-from-dom": "^0.6.0"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0"
}
},
"node_modules/read-pkg": {
"version": "5.2.0",
"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
......@@ -20646,11 +20595,6 @@
"strip-eof": "^1.0.0"
}
},
"exenv": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
"integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50="
},
"expand-brackets": {
"version": "2.1.4",
"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
......@@ -22415,15 +22359,6 @@
"integrity": "sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==",
"dev": true
},
"loose-envify": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
"integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
"peer": true,
"requires": {
"js-tokens": "^3.0.0 || ^4.0.0"
}
},
"lower-case": {
"version": "1.1.4",
"integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
......@@ -24422,31 +24357,6 @@
"unpipe": "1.0.0"
}
},
"react": {
"version": "17.0.2",
"resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
"integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
"peer": true,
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1"
}
},
"react-from-dom": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/react-from-dom/-/react-from-dom-0.6.1.tgz",
"integrity": "sha512-7aAZx7LhRnmR51W5XtmTBYHGFl2n1AdEk1uoXLuzHa1OoGXrxOW/iwLcudvgp6BGX/l4Yh1rtMrIzvhlvbVddg==",
"requires": {}
},
"react-inlinesvg": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/react-inlinesvg/-/react-inlinesvg-2.3.0.tgz",
"integrity": "sha512-fEGOdDf4k4bcveArbEpj01pJcH8pOCKLxmSj2POFdGvEk5YK0NZVnH6BXpW/PzACHPRsuh1YKAhNZyFnD28oxg==",
"requires": {
"exenv": "^1.2.2",
"react-from-dom": "^0.6.0"
}
},
"read-pkg": {
"version": "5.2.0",
"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
......
src/components/index/Header.vue
View file @ 3208ed7e
......@@ -2,7 +2,7 @@
<div class="Header">
<div class="H_content com-container">
<div class="image">
<img :src="system_logo" alt="" />
<img :src="system_logo" alt=""/>
</div>
<div class="right" v-if="!isLogin">
<span
......@@ -21,16 +21,18 @@
<div class="right alreadyLogin" v-else>
<el-dropdown @command="handleCommand" trigger="click">
<div class="el-dropdown-link">
<img src="@/assets/img/default.svg" class="img_user" />
<img src="@/assets/img/default.svg" class="img_user"/>
<span class="phone">{{ phone }}</span>
<i class="el-icon-arrow-down el-icon--right"></i>
</div>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="1" @click="toCenter">
<i class="el-icon-user"></i>个人中心</el-dropdown-item
<i class="el-icon-user"></i>个人中心
</el-dropdown-item
>
<el-dropdown-item command="2" @click="logout">
<i class="el-icon-switch-button"></i>退出</el-dropdown-item
<i class="el-icon-switch-button"></i>退出
</el-dropdown-item
>
</el-dropdown-menu>
</el-dropdown>
......@@ -39,11 +41,11 @@
</div>
</template>
<script>
/* eslint-disable */
import Cookie from "js-cookie";
import { logout } from "r/index/login";
/* eslint-disable */
import Cookie from "js-cookie";
import {logout} from "r/index/login";
export default {
export default {
name: "Header",
data() {
return {
......@@ -92,8 +94,6 @@ export default {
if (confirmResult !== "confirm")
return this.$message.info("您取消了退出");
await logout({});
// if (res.code !== 200) return this.$message.error(res.message);
// 清除本地缓存除了大学logo
// window.localStorage.clear();
let code = this.$store.state.indexIdentity;
......@@ -115,31 +115,40 @@ export default {
window.localStorage.removeItem("examine_reason" + code);
window.localStorage.removeItem("sign_up_file_18355151517" + code);
window.localStorage.removeItem("schoolName" + code);
window.localStorage.removeItem("camp_statement");
// window.localStorage.removeItem("restet_code_time" + code, )
this.isLogin = false;
this.$message.success('退出成功');
await logout({});
},
onMouserEnter(val) {
this.isHover = val;
},
},
};
};
</script>
<style lang="scss" scoped>
@import "a/scss/common";
.Header {
@import "a/scss/common";
.Header {
font-family: PingFang SC;
height: 80px;
box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.12);
.H_content {
height: 100%;
display: flex;
flex-flow: row;
align-items: center;
justify-content: space-between;
.image img {
// width: 318px;
height: 62px;
}
.right {
span {
font-size: 15px;
......@@ -149,15 +158,18 @@ export default {
padding: 10px 36px;
border-radius: 4px;
border: 2px solid transparent;
&:last-child {
margin-left: 10px;
}
&.is-hover {
cursor: pointer;
color: var(--color);
border-color: var(--color);
}
}
&.alreadyLogin span {
padding: 0 !important;
}
......@@ -189,5 +201,5 @@ export default {
}
}
}
}
}
</style>
src/components/index/SignUp/Header.vue
View file @ 3208ed7e
......@@ -2,18 +2,19 @@
<div class="Header">
<div class="H_content com-container">
<div class="image" @click="toRecruit">
<img :src="system_logo" alt="" />
<img :src="system_logo" alt=""/>
</div>
<div class="right">
<el-dropdown @command="handleCommand" trigger="click">
<div class="el-dropdown-link">
<img src="@/assets/img/default.svg" class="img_user" />
<img src="@/assets/img/default.svg" class="img_user"/>
<span class="phone">{{ phone }}</span>
<i class="el-icon-arrow-down el-icon--right"></i>
</div>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="1">
<i class="el-icon-switch-button"></i>退出</el-dropdown-item
<i class="el-icon-switch-button"></i>退出
</el-dropdown-item
>
</el-dropdown-menu>
</el-dropdown>
......@@ -22,16 +23,16 @@
</div>
</template>
<script>
/* eslint-disable */
import Cookie from "js-cookie"
import { logout } from "r/index/login";
/* eslint-disable */
import Cookie from "js-cookie"
import {logout} from "r/index/login";
export default {
export default {
name: "Header",
data() {
return {
phone: window.localStorage.getItem("phone"+this.$store.state.indexIdentity),
system_logo: window.localStorage.getItem("system_logo"+this.$store.state.indexIdentity),
phone: window.localStorage.getItem("phone" + this.$store.state.indexIdentity),
system_logo: window.localStorage.getItem("system_logo" + this.$store.state.indexIdentity),
};
},
methods: {
......@@ -51,26 +52,26 @@ export default {
if (confirmResult !== "confirm")
return this.$message.info("您取消了退出");
await logout({});
// if (res.code !== 200) return this.$message.error(res.message);
// 清除本地缓存除了大学logo
window.localStorage.clear();
let code = this.$store.state.indexIdentity;
this.$router.replace("/"+code);
await this.$router.replace("/" + code);
this.$message.success('退出成功');
await logout({});
},
// 点击图片跳转到招生简章页面
toRecruit() {
// 清除本地缓存除了大学logo
let code = this.$store.state.indexIdentity;
this.$router.replace("/"+code);
this.$router.replace("/" + code);
},
},
};
};
</script>
<style lang="scss" scoped>
@import "a/scss/common";
@import "a/scss/common";
.Header {
.Header {
font-family: PingFang SC;
height: 80px;
box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.12);
......@@ -117,5 +118,5 @@ export default {
}
}
}
}
}
</style>
src/components/index/SignUp/invitation.vue
View file @ 3208ed7e
......@@ -54,6 +54,7 @@
<div class="btn">
<el-button @click="next()">下一步</el-button>
</div>
</div>
</template>
......
src/request/index/network.js
View file @ 3208ed7e
......@@ -206,8 +206,10 @@ export function request(config) {
return
}
if (res.data.code == 400023) {
console.log(res)
// console.log(store.state.indexIdentity, 'store.state.indexIdentity')
let code = store.state.indexIdentity;
let isLogout = res.config.url =='/web/auth/loginOut';
window.localStorage.removeItem("doubt_code" + code);
window.localStorage.removeItem("doubt_info" + code);
window.localStorage.removeItem("doubt_check" + code);
......@@ -225,15 +227,17 @@ export function request(config) {
window.localStorage.removeItem("examine_reason" + code);
window.localStorage.removeItem("sign_up_file_18355151517" + code);
window.localStorage.removeItem("schoolName" + code);
window.localStorage.removeItem("restet_code_time" + code, )
window.localStorage.removeItem("restet_code_time" + code);
window.localStorage.removeItem("camp_statement")
router.push({
path: '/' + store.state.indexIdentity,
})
if(!isLogout){
Notification({
message: res.data.message,
duration: 3000,
});
}
return
}
if (res.data.code == 400003) {
......
src/views/index/camp/SignUp.vue
View file @ 3208ed7e
......@@ -42,7 +42,7 @@
class="info"
title="营地声明"
:visible.sync="dialogVisible"
width="40%"
width="520px"
center
>
<div>
......@@ -105,10 +105,14 @@ export default {
},
created() {
this.type = this.$route.params.type;
// console.log(this.$route, "router");
let camp_statement = window.localStorage.getItem('camp_statement');
if(!camp_statement){
this.dialogVisible = true; //营地声明弹窗
window.localStorage.setItem('camp_statement', '1');
}
this.statuss();
this.signUpInit();
this.dialogVisible = true; //营地声明弹窗
},
watch: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment