Skip to content

C
campSite
Commit 279944cb authored by wuwangwolihui's avatar wuwangwolihui
Browse files
Options

营地2.0-整合修改

parent 6ddceae6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2690 additions and 2528 deletions
src/components/Header.vue
View file @ 279944cb
......@@ -69,12 +69,12 @@
},
// 下拉菜单操作
handleCommand(command) {
if (command == 2) {
this.logout();
}
if (command == 1) {
this.toCenter();
}
if (command == 2) {
this.logout();
}
},
// 去个人中心
toCenter() {
......@@ -107,42 +107,13 @@
closeOnClickModal: false,
type: "warning",
}).catch((err) => err);
if (confirmResult !== "confirm")
if (confirmResult !== "confirm") {
return this.$message.info("您取消了退出");
// 清除本地缓存除了大学logo
if (this.type == 1) {
// 清除所有缓存
window.localStorage.clear();
this.isLogin = false;
} else if (this.type == 2) {
// this.reload()
}
// 清除本地缓存 除了特殊缓存
this.$store.commit('removeLocalStorage');
if (this.type == 2) {
let code = this.$store.state.indexIdentity;
window.localStorage.removeItem("doubt_code" + code);
window.localStorage.removeItem("doubt_info" + code);
window.localStorage.removeItem("doubt_check" + code);
window.localStorage.removeItem("camp_name" + code);
window.localStorage.removeItem("system_color" + code);
window.localStorage.removeItem("system_logo" + code);
window.localStorage.removeItem("has_amount" + code);
window.localStorage.removeItem("campsite_id" + code);
window.localStorage.removeItem("order_no" + code);
window.localStorage.removeItem("campindex_type" + code);
window.localStorage.removeItem("bk_pic" + code);
window.localStorage.removeItem("examine_status" + code);
window.localStorage.removeItem("examine_reason" + code);
window.localStorage.removeItem("sign_up_file_18355151517" + window.localStorage.getItem("phone" + code) + code);
window.localStorage.removeItem("schoolName" + code);
window.localStorage.removeItem("camp_statement" + code);
window.localStorage.removeItem("transfer_account" + code);
window.localStorage.removeItem("payee" + code);
window.localStorage.removeItem("bank_first" + code);
window.localStorage.removeItem("bank_idcard" + code);
window.localStorage.removeItem("bank_info" + window.localStorage.getItem("phone" + code) + code);
window.localStorage.removeItem("index-token-all");
window.localStorage.removeItem("index-phone-all");
this.isLogin = false;
// this.reload()
if (this.$store.state.human == 1) {
await this.$router.replace({
path: "/login",
......@@ -154,8 +125,9 @@
await this.$router.replace("/" + code);
}
}
this.isLogin = false;
this.$message.success("退出成功");
await logout({});
// await logout({});
},
// 鼠标移入事件
onMouserEnter(val) {
......
src/components/index/Header.vue
View file @ 279944cb
......@@ -52,14 +52,12 @@ export default {
"system_logo" + this.$store.state.indexIdentity
),
isLogin: false,
phone: window.localStorage.getItem(
"phone" + this.$store.state.indexIdentity
),
phone: window.localStorage.getItem("index-phone-all"),
};
},
created() {
let code = this.$store.state.indexIdentity;
this.isLogin = !!localStorage.getItem("index-token" + code);
this.isLogin = !!localStorage.getItem("index-token-all");
},
methods: {
toLogin() {
......@@ -97,8 +95,8 @@ export default {
window.localStorage.removeItem("doubt_code" + code);
window.localStorage.removeItem("doubt_info" + code);
window.localStorage.removeItem("doubt_check" + code);
window.localStorage.removeItem("index-token" + code);
window.localStorage.removeItem("phone" + code);
window.localStorage.removeItem("index-token-all");
window.localStorage.removeItem("index-phone-all");
window.localStorage.removeItem("camp_name" + code);
window.localStorage.removeItem("system_color" + code);
window.localStorage.removeItem("system_logo" + code);
......@@ -110,8 +108,8 @@ export default {
window.localStorage.removeItem("examine_status" + code);
window.localStorage.removeItem("examine_reason" + code);
window.localStorage.removeItem(
"sign_up_file_18355151517" +
window.localStorage.getItem("phone" + code) +
"sign_up_file_" +
window.localStorage.getItem("index-phone-all") +
code
);
window.localStorage.removeItem("schoolName" + code);
......@@ -121,7 +119,7 @@ export default {
window.localStorage.removeItem("bank_first" + code);
window.localStorage.removeItem("bank_idcard" + code);
window.localStorage.removeItem(
"bank_info" + window.localStorage.getItem("phone" + code) + code
"bank_info" + window.localStorage.getItem("index-phone-all") + code
);
this.isLogin = false;
this.reload()
......
src/components/index/Homework/Header.vue
View file @ 279944cb
......@@ -30,9 +30,7 @@ export default {
name: "Header",
data() {
return {
phone: window.localStorage.getItem(
"phone" + this.$store.state.indexIdentity
),
phone: window.localStorage.getItem("index-phone-all"),
system_logo: window.localStorage.getItem(
"system_logo" + this.$store.state.indexIdentity
),
......
src/components/index/SignUp/Header.vue
View file @ 279944cb
......@@ -33,9 +33,7 @@ export default {
name: "Header",
data() {
return {
phone: window.localStorage.getItem(
"phone" + this.$store.state.indexIdentity
),
phone: window.localStorage.getItem("index-phone-all"),
system_logo: window.localStorage.getItem(
"system_logo" + this.$store.state.indexIdentity
),
......
src/components/index/SignUp/pass.vue
View file @ 279944cb
This diff is collapsed.
src/components/index/SignUp/paying.vue
View file @ 279944cb
This diff is collapsed.
src/components/index/SignUp/referInfo.vue
View file @ 279944cb
......@@ -654,7 +654,7 @@
</div>
</el-col>
<!-- 自我介绍 -->
<el-col :span="12" v-show="configJson.introduceMyself == 1" >
<el-col :span="12" v-show="configJson.introduceMyself == 1">
<el-form-item
prop="introduce"
label="自我介绍"
......@@ -1388,11 +1388,11 @@
},
created() {
const code = this.$store.state.indexIdentity;
this.referForm.phone = window.localStorage.getItem("phone" + code); //本地取用户手机号
this.referForm.phone = window.localStorage.getItem("index-phone-all"); //本地取用户手机号
this.referForm.email = window.localStorage.getItem("email" + code); //本地取用户邮箱
// console.log(this.referForm.email, " this.referForm.email");
let signUpFile = window.localStorage.getItem(
"sign_up_file_" + window.localStorage.getItem("phone" + code) + code
"sign_up_file_" + window.localStorage.getItem("index-phone-all") + code
);
// console.log(signUpFile);
if (signUpFile && JSON.parse(signUpFile).length > 0) {
......@@ -1737,8 +1737,7 @@
this.schoolName = res.data.school_list;
// console.log( this.schoolName)
let code = this.$store.state.indexIdentity;
window.localStorage.setItem(
"schoolName" + code,
window.localStorage.setItem("schoolName" + code,
JSON.stringify(res.data.list)
);
for (let key in this.schoolName) {
......@@ -1850,9 +1849,8 @@
};
this.fileList.push(obj);
let code = this.$store.state.indexIdentity;
window.localStorage.setItem(
"sign_up_file_" +
+window.localStorage.getItem("phone" + code) +
window.localStorage.setItem("sign_up_file_" +
+window.localStorage.getItem("index-phone-all") +
code,
JSON.stringify(this.fileList)
);
......@@ -1900,9 +1898,8 @@
if (item.url == file.url) {
this.fileList.splice(idx, 1);
let code = this.$store.state.indexIdentity;
window.localStorage.setItem(
"sign_up_file_" +
window.localStorage.getItem("phone" + code) +
window.localStorage.setItem("sign_up_file_" +
window.localStorage.getItem("index-phone-all") +
code,
JSON.stringify(this.fileList)
);
......
src/request/base/active.js
View file @ 279944cb
/* eslint-disable */
import {request} from './network';
import {request} from '../network';
// 获取label列表-搜索模块
export function LabelType(data) {
......
src/request/base/login.js
View file @ 279944cb
/* eslint-disable */
import {request} from './network'
import {request} from '../network'
// 登录
export function login(data) {
......
src/request/base/register.js
View file @ 279944cb
/* eslint-disable */
import {
request
} from './network'
import {request} from '../network';
// 通过邮箱验证码注册
export function registerEmailCode(data) {
......
src/request/index/certificate.js
View file @ 279944cb
/* eslint-disable */
import {
request
} from './network'
import store from '@/store'
import {request} from '../network';
import store from '@/store';
// 添加地址
......
src/request/index/homework.js
View file @ 279944cb
/* eslint-disable */
import {
request
} from './network'
import store from '@/store'
import {request} from '../network';
import store from '@/store';
// 获取营地作业列表
......
src/request/index/info.js
View file @ 279944cb
/* eslint-disable */
import {
request
} from './network'
import store from '@/store'
// 获取资料（个人信息）
export function getAccountInfo(data) {
data['identity'] = store.state.indexIdentity;
return request({
method: 'post',
url: '/web/signUp/getAccountInfo',
data
})
}
// 保存个人资料
export function setAccountInfo(data) {
data['identity'] = store.state.indexIdentity;
return request({
method: 'post',
url: '/web/signUp/setAccountInfo',
data
})
}
\ No newline at end of file
import {request} from '../network';
import store from '@/store';
// 获取资料（个人信息）
export function getAccountInfo(data) {
data['identity'] = store.state.indexIdentity;
return request({
method: 'post',
url: '/web/signUp/getAccountInfo',
data
})
}
// 保存个人资料
export function setAccountInfo(data) {
data['identity'] = store.state.indexIdentity;
return request({
method: 'post',
url: '/web/signUp/setAccountInfo',
data
})
}
src/request/index/login.js
View file @ 279944cb
/* eslint-disable */
import {
request
} from './network'
import store from '@/store'
import {request} from '../network';
import store from '@/store';
//登录前获取营地主题
export function getCam(code) {
......
src/request/index/network.js
View file @ 279944cb
......@@ -15,7 +15,6 @@ import {
} from 'element-ui'
import router from '@/router'
const instance = axios.create({
baseURL: DEVELOPMENT_SERVER_URL,
timeout: 60000,
......@@ -105,8 +104,7 @@ export function request(config) {
const changePassCode = '/web/auth/changePassCode';
const loginOut = '/web/auth/loginOut';
const setLog = '/web/auth/setLog';
if (
(config.url.indexOf(loginUrl) != -1 && config.url.indexOf(loginOut) == -1) ||
if ((config.url.indexOf(loginUrl) != -1 && config.url.indexOf(loginOut) == -1) ||
config.url.indexOf(setAccountInfo) != -1 ||
config.url.indexOf(passMsgOld) != -1 ||
config.url.indexOf(getCam) != -1 ||
......@@ -116,15 +114,10 @@ export function request(config) {
config.url.indexOf(passwordEmailCode) != -1 ||
config.url.indexOf(changePassCode) != -1 ||
config.url.indexOf(passwordCode) != -1 ||
config.url.indexOf(setLog) != -1
) {
config.url.indexOf(setLog) != -1) {
return config
}
// const token = localStorage.getItem('index-token' + store.state.indexIdentity)
const token = localStorage.getItem('index-token-all');
if (token) {
config.headers.token = token;
} else {
......@@ -189,34 +182,9 @@ export function request(config) {
return
}
if (res.data.code == 400023) {
console.log(res)
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);
window.localStorage.removeItem("camp_name" + code);
window.localStorage.removeItem("system_color" + code);
window.localStorage.removeItem("system_logo" + code);
window.localStorage.removeItem("has_amount" + code);
window.localStorage.removeItem("campsite_id" + code);
window.localStorage.removeItem("order_no" + code);
window.localStorage.removeItem("campindex_type" + code);
window.localStorage.removeItem("bk_pic" + code);
window.localStorage.removeItem("examine_status" + code);
window.localStorage.removeItem("examine_reason" + code);
window.localStorage.removeItem("sign_up_file_18355151517" + window.localStorage.getItem("phone" + code) + code);
window.localStorage.removeItem("schoolName" + code);
window.localStorage.removeItem("restet_code_time" + code);
window.localStorage.removeItem("camp_statement" + code)
window.localStorage.removeItem("transfer_account" + code);
window.localStorage.removeItem("payee" + code);
window.localStorage.removeItem("bank_first" + code);
window.localStorage.removeItem("bank_idcard" + code);
window.localStorage.removeItem("bank_info" + window.localStorage.getItem("phone" + code) + code);
window.localStorage.removeItem("index-token-all");
window.localStorage.removeItem("index-phone-all");
// 清除本地缓存 除了特殊缓存
store.commit('removeLocalStorage');
router.push({
path: '/' + store.state.indexIdentity,
})
......@@ -229,35 +197,8 @@ export function request(config) {
return
}
if (res.data.code == 400003) {
let code = this.$store.state.indexIdentity;
window.localStorage.removeItem("doubt_code" + code);
window.localStorage.removeItem("doubt_info" + code);
window.localStorage.removeItem("doubt_check" + code);
window.localStorage.removeItem("camp_name" + code);
window.localStorage.removeItem("system_color" + code);
window.localStorage.removeItem("system_logo" + code);
window.localStorage.removeItem("has_amount" + code);
window.localStorage.removeItem("campsite_id" + code);
window.localStorage.removeItem("order_no" + code);
window.localStorage.removeItem("campindex_type" + code);
window.localStorage.removeItem("bk_pic" + code);
window.localStorage.removeItem("examine_status" + code);
window.localStorage.removeItem("examine_reason" + code);
window.localStorage.removeItem(
"sign_up_file_18355151517" +
window.localStorage.getItem("phone" + code) +
code
);
window.localStorage.removeItem("schoolName" + code);
window.localStorage.removeItem("transfer_account" + code);
window.localStorage.removeItem("payee" + code);
window.localStorage.removeItem("bank_first" + code);
window.localStorage.removeItem("bank_idcard" + code);
window.localStorage.removeItem(
"bank_info" + window.localStorage.getItem("phone" + code) + code
);
window.localStorage.removeItem("index-token-all");
window.localStorage.removeItem("index-phone-all");
// 清除本地缓存 除了特殊缓存
store.commit('removeLocalStorage');
router.push({
path: '/login',
query: {
......
src/request/index/pay.js
View file @ 279944cb
/* eslint-disable */
import {
request
} from './network'
import store from '@/store'
import {request} from '../network';
import store from '@/store';
// 报名初始化
......
src/request/index/register.js
View file @ 279944cb
/* eslint-disable */
import {
request
} from './network'
import store from '@/store'
import {request} from '../network';
import store from '@/store';
// 通过邮箱验证码注册
export function registerEmailCode(data) {
......
src/request/index/signUp.js
View file @ 279944cb
/* eslint-disable */
import {
request
} from './network'
import store from '@/store'
import {request} from '../network';
import store from '@/store';
// 报名初始化
export function signUpInit(data) {
......
src/request/network.js 0 → 100644
View file @ 279944cb
/* eslint-disable */
import axios from 'axios'
import store from '@/store'
import qs from 'qs'
import {tansParams} from '@/store/common.js'
import {
SERVER_URL,
DEVELOPMENT_SERVER_URL
} from '@/config/server'
import {
Notification,
Message,
Loading
} from 'element-ui'
import router from '@/router'
const instance = axios.create({
baseURL: DEVELOPMENT_SERVER_URL,
timeout: 60000,
method: "post",
headers: {
"Content-Type": "application/x-www-form-urlencoded",
},
withCredentials: false,
});
instance.interceptors.request.use(
(config) => {
if (config.method === "post" && !config.notQs) {
config.data = qs.stringify(config.data);
}
if (config.url.indexOf(SERVER_URL) === -1) {
config.headers["Content-Type"] = "multipart/form-data";
} else {
config.headers["Content-Type"] = "application/x-www-form-urlencoded";
}
// 调用接口请求添加token认证信息
const token = localStorage.getItem('index-token-all');
config.headers.token = token
if (token) config.headers.authorization = token;
return config;
},
(error) => {
return Promise.reject(error);
}
);
export default instance;
// 正在进行中的请求列表
const reqList = []
/**
* 阻止重复请求
* @param {array} reqList - 请求缓存列表
* @param {string} url - 当前请求地址
* @param {function} cancel - 请求中断函数
* @param {string} errorMessage - 请求中断时需要显示的错误信息
*/
const stopRepeatRequest = function (reqList, url, cancel, errorMessage) {
const errorMsg = errorMessage || ''
for (let i = 0; i < reqList.length; i++) {
if (reqList[i] === url) {
// cancel(errorMsg);
return
}
}
reqList.push(url)
}
/**
* 允许某个请求可以继续进行
* @param {array} reqList 全部请求列表
* @param {string} url 请求地址
*/
const allowRequest = function (reqList, url) {
for (let i = 0; i < reqList.length; i++) {
if (reqList[i] === url) {
reqList.splice(i, 1)
break
}
}
}
let loadingInstance = null
export function request(config) {
const instance = axios.create({
baseURL: process.env.NODE_ENV === 'development' ?
DEVELOPMENT_SERVER_URL : SERVER_URL,
timeout: 60 * 1000
})
instance.interceptors.request.use(
(config) => {
const loginUrl = '/web/auth/login';
const setAccountInfo = '/web/register/setAccountInfo';
const passMsgOld = '/web/auth/changePassOld';
const getCam = '/web/auth/getCam';
const LoginCode = '/web/code/loginCode';
const registerCode = '/web/code/registerCode';
const registerEmailCode = 'web/code/registerEmailCode';
const passwordEmailCode = 'web/code/passwordEmailCode';
const passwordCode = '/web/code/passwordCode';
const changePassCode = '/web/auth/changePassCode';
const loginOut = '/web/auth/loginOut';
const setLog = '/web/auth/setLog';
const LabelType = '/activity/labelType';
const HotList = '/activityCenter/hotList';
const GetActiveInfo = '/activityCenter/detail/';
if ((config.url.indexOf(loginUrl) != -1 && config.url.indexOf(loginOut) == -1) ||
config.url.indexOf(setAccountInfo) != -1 ||
config.url.indexOf(passMsgOld) != -1 ||
config.url.indexOf(getCam) != -1 ||
config.url.indexOf(LoginCode) != -1 ||
config.url.indexOf(registerCode) != -1 ||
config.url.indexOf(registerEmailCode) != -1 ||
config.url.indexOf(passwordEmailCode) != -1 ||
config.url.indexOf(changePassCode) != -1 ||
config.url.indexOf(passwordCode) != -1 ||
config.url.indexOf(setLog) != -1 ||
config.url.indexOf(LabelType) != -1 ||
config.url.indexOf(HotList) != -1 ||
config.url.indexOf(GetActiveInfo) != -1) {
return config
}
const token = localStorage.getItem('index-token-all');
if (token) {
config.headers.token = token;
} else {
router.push({
path: '/login',
query: {
redirect: router.currentRoute.fullPath
} // 从哪个页面跳转
})
const error = new Error('请登录！')
return Promise.reject(error)
}
let cancel
// 设置cancelToken对象
config.cancelToken = new axios.CancelToken(function (c) {
cancel = c
})
if (
config.url.indexOf('/web/config/getUniversity') == -1 &&
config.url.indexOf('/web/config/getProfession') == -1
) {
// 阻止重复请求。当上个请求未完成时，相同的请求不会进行
stopRepeatRequest(
reqList,
config.url,
cancel,
`${config.url} 请求被中断`
)
}
if (config.hasLoading) {
const loadingText = config.loadingText ? config.loadingText : '请求中'
loadingInstance = Loading.service({
lock: true,
fullscreen: true,
text: loadingText,
background: 'rgba(0, 0, 0, 0.25)'
})
}
return config
},
(error) => {
return Promise.reject(error)
}
)
instance.interceptors.response.use(
(res) => {
if (res.data.code == 400034 ||
res.data.code == 400035 ||
// res.data.code == 400001 ||
res.data.code == 400002 ||
res.data.code == 400003) {
router.push({
path: '/' + store.state.indexIdentity,
})
Notification({
message: res.data.message,
duration: 1000,
});
return
}
if (res.data.code == 400023) {
let isLogout = res.config.url == '/web/auth/loginOut';
// 清除本地缓存 除了特殊缓存
store.commit('removeLocalStorage');
router.push({
path: '/' + store.state.indexIdentity,
})
if (!isLogout) {
Notification({
message: res.data.message,
duration: 3000,
});
}
return
}
if (res.data.code == 400003) {
// 清除本地缓存 除了特殊缓存
store.commit('removeLocalStorage');
router.push({
path: '/login',
query: {
redirect: router.currentRoute.fullPath
} // 从哪个页面跳转
})
}
loadingInstance && loadingInstance.close()
setTimeout(() => {
allowRequest(reqList, res.config.url)
}, 1000)
return res
},
(error) => {
console.log(error, 'err')
Message.closeAll()
if (error.message == '请登录！') {
router.push({
path: "/login?code=" + store.state.indexIdentity,
})
}
if (error.response.status == 404) {
Notification({
message: "营地报名已关闭",
duration: 3000,
});
}
if (axios.isCancel(error)) {
console.log(error.message)
} else {
// 增加延迟，相同请求不得在短时间内重复发送
setTimeout(() => {
console.log(error)
allowRequest(reqList, error.config.url)
}, 1000)
}
loadingInstance && loadingInstance.close()
return Promise.reject(error)
}
)
return instance(config)
}
/**
* axios:upload 文件上传方法
* @param url
* @param data
* @returns {Promise}
*/
export function upload(url, data = {}) {
return new Promise((resolve, reject) => {
axios.post(url, data).then(
(response) => {
resolve(response);
},
(err) => {
reject(err);
}
);
});
}
// 通用下载方法
export function download(url, params, filename) {
console.log(url, params, filename)
return instance.post(url, params, {
transformRequest: [
params => {
return tansParams(params);
}
],
headers: {
"Content-Type": "application/x-www-form-urlencoded"
},
responseType: "blob"
})
.then(data => {
const content = data;
const blob = new Blob([content]);
if ("download" in document.createElement("a")) {
const elink = document.createElement("a");
elink.download = filename;
elink.style.display = "none";
elink.href = URL.createObjectURL(blob);
document.body.appendChild(elink);
elink.click();
URL.revokeObjectURL(elink.href);
document.body.removeChild(elink);
} else {
navigator.msSaveBlob(blob, filename);
}
})
.catch(r => {
console.error(r);
});
}
// 合并多个请求
export function allRequest(arrRequest) {
return axios.all(arrRequest)
}
src/router/index.js
View file @ 279944cb
......@@ -153,16 +153,13 @@ function checkCam(code, cb) {
window.localStorage.setItem("bk_pic" + code, res.data.background_picture);
//当前营地logo
window.localStorage.setItem("system_logo" + code, res.data.system_logo);
window.localStorage.setItem(
"doubt_code" + code,
window.localStorage.setItem("doubt_code" + code,
res.data.fill_individual_Invitationcode
); //是否填写邀请码
window.localStorage.setItem(
"doubt_info" + code,
window.localStorage.setItem("doubt_info" + code,
res.data.fill_individual_information
); //是否填写个人资料
window.localStorage.setItem(
"doubt_check" + code,
window.localStorage.setItem("doubt_check" + code,
res.data.audit_individual_information
); //是否审核个人资料
// 判断使用微信二维码付款/上传转账截图
......
src/store/mutations.js
View file @ 279944cb
......@@ -31,4 +31,17 @@ export default {
state.fullPath = path;
window.localStorage.setItem('index-fullPath', path);
},
removeLocalStorage(state){
for (let key in window.localStorage) {
if (key.indexOf('email') == -1 &&
key.indexOf('multiform') == -1 &&
key.indexOf('register_code_time') == -1 &&
key.indexOf('restet_code_phone') == -1 &&
key.indexOf('restet_code_time') == -1 &&
key.indexOf('index-active-path') == -1 &&
key.indexOf('index-fullPath') == -1) {
window.localStorage.removeItem(key);
}
}
},
};
src/views/base/login/Register.vue
View file @ 279944cb
......@@ -265,8 +265,7 @@
this.$message.success(res.data.message);
this.codeTime = res.data.data.now * 1000;
// console.log(this.codeTime)
window.localStorage.setItem(
"register_code_time",
window.localStorage.setItem("register_code_time",
res.data.data.now * 1000
);
this.intervalHandle(new Date(), res.data.data.now * 1000);
......
src/views/base/login/Reset.vue
View file @ 279944cb
......@@ -263,8 +263,7 @@
this.$message.success(res.data.message);
this.codeTime = res.data.data.now * 1000;
// console.log(this.codeTime)
window.localStorage.setItem(
"restet_code_time" ,
window.localStorage.setItem("restet_code_time" ,
res.data.data.now * 1000
);
this.intervalHandle(new Date(), res.data.data.now * 1000);
......@@ -288,8 +287,7 @@
}
this.$message.success(res.data.message);
// token存储
window.localStorage.setItem(
"restet_code_phone" ,
window.localStorage.setItem("restet_code_phone" ,
this.resetForm.phone
);
this.$router.replace("/baseLogin");
......
src/views/index/Info/personalInfo.vue
View file @ 279944cb
......@@ -534,11 +534,11 @@ export default {
mounted() {},
created() {
const code = this.$store.state.indexIdentity;
this.referForm.phone = window.localStorage.getItem("phone" + code); //本地取用户手机号
this.referForm.phone = window.localStorage.getItem("index-phone-all"); //本地取用户手机号
this.referForm.email = window.localStorage.getItem("email" + code); //本地取用户邮箱
console.log(this.referForm.email, " this.referForm.email");
let signUpFile = window.localStorage.getItem(
"sign_up_file_" + window.localStorage.getItem("phone" + code) + code
"sign_up_file_" + window.localStorage.getItem("index-phone-all") + code
);
// console.log(signUpFile);
if (signUpFile && JSON.parse(signUpFile).length > 0) {
......@@ -791,8 +791,7 @@ export default {
if (res.data.code === 200) {
this.schoolName = res.data.school_list;
let code = this.$store.state.indexIdentity;
window.localStorage.setItem(
"schoolName" + code,
window.localStorage.setItem("schoolName" + code,
JSON.stringify(res.data.list)
);
for (let key in this.schoolName) {
......
src/views/index/camp/SignUp.vue
View file @ 279944cb
......@@ -208,8 +208,7 @@
);
if (!camp_statement) {
this.dialogVisible = true; //营地通知列表弹窗
window.localStorage.setItem(
"camp_statement" + this.$store.state.indexIdentity,
window.localStorage.setItem("camp_statement" + this.$store.state.indexIdentity,
"1"
);
}
......@@ -354,15 +353,12 @@
window.localStorage.setItem("has_amount" + code, res.data.has_amount);
window.localStorage.setItem("campsite_id" + code, res.data.campsite_id);
window.localStorage.setItem("order_no" + code, res.data.order_no);
window.localStorage.setItem(
"examine_status" + code,
window.localStorage.setItem("examine_status" + code,
res.data.examine_status
); //返回错误原因
window.localStorage.setItem(
"examine_reason" + code,
window.localStorage.setItem("examine_reason" + code,
res.data.examine_reason
); //资料审核状态
// window.localStorage.setItem("achievement_path", res.data.achievement_path); //上传的图片
const aPath = res.data.achievement_path;
if (aPath) {
let arr = aPath.split(",");
......@@ -374,9 +370,8 @@
return obj;
});
// let code = this.$store.state.indexIdentity;
window.localStorage.setItem(
"sign_up_file_" +
window.localStorage.getItem("phone" + code) +
window.localStorage.setItem("sign_up_file_" +
window.localStorage.getItem("index-phone-all") +
code,
JSON.stringify(fileList)
); //上传的图片
......@@ -397,13 +392,11 @@
// console.log(fileList)
// console.log(JSON.stringify(fileList))
// let code = this.$store.state.indexIdentity;
window.localStorage.setItem(
"bank_info" + window.localStorage.getItem("phone" + code) + code,
window.localStorage.setItem("bank_info" + window.localStorage.getItem("index-phone-all") + code,
JSON.stringify(fileList)
); //上传的图片
} else {
window.localStorage.setItem(
"bank_info" + window.localStorage.getItem("phone" + code) + code,
window.localStorage.setItem("bank_info" + window.localStorage.getItem("index-phone-all") + code,
"[]"
);
}
......
src/views/index/camp/homework/refer.vue
View file @ 279944cb
......@@ -271,7 +271,7 @@
console.log(value, "value");
// let code = this.$store.state.indexIdentity;
// this.formData.stu_enclosure_url = window.localStorage.getItem(
// "student_file_" + window.localStorage.getItem("phone" + code) + code
// "student_file_" + window.localStorage.getItem("index-phone-all") + code
// );
// console.log(
// this.stu_fileList,' this.stu_fileList'
......@@ -327,12 +327,10 @@
};
},
created() {
// console.log(this.formData.stu_enclosure_url);
let code = this.$store.state.indexIdentity;
let stu_fileListoss = window.localStorage.getItem(
"student_file_" + window.localStorage.getItem("phone" + code) + code
"student_file_" + window.localStorage.getItem("index-phone-all") + code
);
console.log(stu_fileListoss);
if (stu_fileListoss && JSON.parse(stu_fileListoss).length > 0) {
this.stu_fileListoss = JSON.parse(stu_fileListoss);
}
......@@ -352,7 +350,6 @@
//老师作业展示
getTeachList() {
let url = this.enclosure_urls;
// console.log(this.enclosure_urls);
if (this.enclosure_urls) {
let arr = url.split(",");
arr.forEach((item) => {
......@@ -368,16 +365,7 @@
},
// 下载老师附件
downloadStuFile(url) {
// this.download(
// "http://api.campcenter.cn/web/download/downloadTeacherWork",
// {
// enclosure_url: url,
// identity: this.$store.state.indexIdentity
// },
// ""
// );
downloadTeacherWork({enclosure_url: url}).then((res) => {
// console.log(res, "res");
if (res.data.code != 200) {
return this.$message.error(res.data.message);
}
......@@ -394,7 +382,6 @@
// 下载老师评分结果
downloadScoreFile(url) {
downloadTeacherWork({enclosure_url: url}).then((res) => {
// console.log(res, "res");
if (res.data.code != 200) {
return this.$message.error(res.data.message);
}
......@@ -410,13 +397,8 @@
},
// 学生作业回显
getStudentWork(student_status) {
// console.log(student_status, "student_status");
let stu_work_num = this.work_nums;
// console.log(stu_work_num);
// console.log(this.formData);
// return
getStudentWork({teacher_id: stu_work_num}).then((res) => {
// console.log(res, "getStudentWork");
if (res.data.code != 200) {
return this.$message.error(res.data.message);
}
......@@ -424,10 +406,8 @@
if (student_status == 1) {
// 学生已提交
this.formData.stu_answer = res.data.data.stu_answer;
// console.log(this.formData);
//学生的已经提交的相关附件
this.formData.stu_enclosure_url = res.data.data.stu_enclosure_url;
console.log(this.formData.stu_enclosure_url)
let gotfileList = res.data.data.work;
if (gotfileList) {
this.stu_fileList = gotfileList.map((item) => {
......@@ -438,14 +418,11 @@
type: item.type,
};
});
//
this.fileList = gotfileList.map((item) => {
return {
url_open: item.url_open,
};
});
console.log(this.stu_fileList);
console.log(this.fileList);
}
this.$forceUpdate();
} else if (student_status == 2) {
......@@ -464,11 +441,9 @@
}
this.score = res.data.data.score; //老师评分
this.teacher_commment = res.data.data.teacher_commment; //老师评语
// console.log(res.data.data.teacher_commment, " this.teacher_commment");
let scoreFileList = res.data.data.teacher_url;
if (scoreFileList) {
let arr = scoreFileList.split(",");
// console.log(arr, "arr");
this.tea_scoreFileList = arr.map((item) => {
return {
name: item.split("workforstudent/")[1],
......@@ -486,7 +461,7 @@
cancelBtnTrue() {
let code = this.$store.state.indexIdentity;
window.localStorage.removeItem(
"student_file_" + window.localStorage.getItem("phone" + code) + code
"student_file_" + window.localStorage.getItem("index-phone-all") + code
);
this.stu_fileList = [];
this.stu_fileListoss = "";
......@@ -501,10 +476,9 @@
cancelBtn() {
let code = this.$store.state.indexIdentity;
window.localStorage.removeItem(
"student_file_" + window.localStorage.getItem("phone" + code) + code
"student_file_" + window.localStorage.getItem("index-phone-all") + code
);
this.stu_fileList = [];
this.stu_fileListoss = "";
this.teaFileList = [];
this.dialogVisible = false;
......@@ -520,10 +494,7 @@
},
uploadPicture(params) {
this.isUploading = true;
// console.log("已经准备好上传图片", params);
this.file = params.file;
// console.log(this.file, "1111");
console.log(this.file, "1111");
let raw = params.file;
let image = {
name: raw.name,
......@@ -542,7 +513,6 @@
teacher_id: this.work_nums,
})
.then((res) => {
// console.log(res, "开始上传图片");
if (res.data.code === 200) {
let oss_url = res.data.config.host;
let filename = res.data.config.file;
......@@ -555,12 +525,10 @@
formData.append("callback", res.data.config.callback);
formData.append("success_action_status", 200);
formData.append("file", file);
// console.log(formData);
this.upload(oss_url, formData)
.then((ress) => {
console.log(ress, "ress");
if (ress.data.code != 200) {
// console.log(ress, "ress");
this.isUploading = false;
return this.$message.error(ress.data.message);
}
......@@ -572,27 +540,20 @@
savefile: res.data.config.savefile,
name: res.data.config.savefile.split("/work/")[1],
};
console.log(this.stu_fileList, "this.stu_fileList");
this.stu_fileList.push(obj);
this.fileList.push(obj);
console.log(this.fileList, 'this.fileList')
this.stu_fileListoss = this.stu_fileList
.map((item) => {
return item.url_open;
})
.join(",");
console.log(this.stu_fileListoss, "stu_fileListoss");
// this.formData.stu_enclosure_url = this.stu_fileListoss;
let code = this.$store.state.indexIdentity;
console.log(typeof (this.stu_fileListoss))
window.localStorage.setItem(
"student_file_" +
+window.localStorage.getItem("phone" + code) +
window.localStorage.setItem("student_file_" +
+window.localStorage.getItem("index-phone-all") +
code,
JSON.stringify(this.stu_fileListoss)
);
console.log('student_file_')
this.isUploading = false;
})
.catch((err) => {
......@@ -606,7 +567,6 @@
})
.catch((err) => {
this.isUploading = false;
// console.log(err);
});
},
// 下载证明资料图片
......@@ -640,7 +600,7 @@
if (item.url_open == file.url_open) {
this.stu_fileList.splice(idx, 1);
// this.fileList.splice(idx, 1);
console.log( this.fileList);
console.log(this.fileList);
let code = this.$store.state.indexIdentity;
this.stu_fileListoss = this.stu_fileList
.map(function (item, index) {
......@@ -650,9 +610,8 @@
console.log(this.stu_fileListoss);
console.log(this.stu_fileList);
this.$message.success(res.data.message);
window.localStorage.setItem(
"student_file_" +
window.localStorage.getItem("phone" + code) +
window.localStorage.setItem("student_file_" +
window.localStorage.getItem("index-phone-all") +
code,
this.stu_fileListoss
);
......@@ -698,10 +657,10 @@
.substring(url.lastIndexOf(".") + 1, url.length)
.split("?")[0];
let isWord = onlineViewType.find((type) => type === fileTypeName);
console.log(isWord,'isWord')
if (isWord=='ppt'||isWord=='pptx') {
console.log(isWord, 'isWord')
if (isWord == 'ppt' || isWord == 'pptx') {
url = "http://view.officeapps.live.com/op/view.aspx?src=" + url;
}else {
} else {
url = url;
}
window.open(url, "_blank");
......
src/views/index/login/Login.vue
View file @ 279944cb
This diff is collapsed.
src/views/index/login/Register.vue
View file @ 279944cb
This diff is collapsed.
src/views/index/login/Reset.vue
View file @ 279944cb
This diff is collapsed.
src/views/index/recruit/Index.vue
View file @ 279944cb
......@@ -85,8 +85,7 @@
methods: {
toLogin() {
let code = this.$store.state.indexIdentity;
// console.log(window.localStorage.getItem("index-token"+code),'1111')
if (!window.localStorage.getItem("index-token" + code)) {
if (!window.localStorage.getItem("index-token-all")) {
this.$router.push("/login?code=" + code);
} else {
this.$router.push("/signUp/examInfo?code=" + code);
......
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