Skip to content

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

nankai-修改

parent 8d42f7c6
Show whitespace changes
Inline Side-by-side
Showing with 62 additions and 88 deletions
src/components/Header.vue
View file @ aa033dd4
...@@ -2,19 +2,18 @@ ...@@ -2,19 +2,18 @@
<div class="Header" :class="type==1?'all-header':''"> <div class="Header" :class="type==1?'all-header':''">
<div class="H_content com-container"> <div class="H_content com-container">
<div class="image"> <div class="image">
<img v-if="type==1" :src="all_logo" alt="" @click="toHome"/> <!--<img v-if="type==1" :src="all_logo" alt="" @click="toHome"/>-->
<img v-if="type==2" :src="system_logo" alt="" @click="toRecruit"/> <img v-if="type==2" :src="system_logo" alt="" @click="toRecruit"/>
<img v-if="type==3" :src="system_logo" alt="" @click="toRecruit"/> <img v-if="type==3" :src="system_logo" alt="" @click="toRecruit"/>
<img v-if="type==4" :src="all_logo" alt="" @click="toHome"/> <!--<img v-if="type==4" :src="all_logo" alt="" @click="toHome"/>-->
<!--<img v-if="type==4" :src="system_logo?system_logo:all_logo" alt=""/>-->
</div> </div>
<div class="right"> <div class="right">
<el-menu :default-active="$store.state.activeIndex" <!--<el-menu :default-active="$store.state.activeIndex"
@select="handleSelect" @select="handleSelect"
mode="horizontal"> mode="horizontal">
<el-menu-item index="/">首页</el-menu-item> <el-menu-item index="/">首页</el-menu-item>
<el-menu-item index="/active">活动中心</el-menu-item> <el-menu-item index="/active">活动中心</el-menu-item>
</el-menu> </el-menu>-->
<el-button v-if="type==2" @click="toSignUp" class="sign-up">立即报名</el-button> <el-button v-if="type==2" @click="toSignUp" class="sign-up">立即报名</el-button>
<div class="noLogin" v-if="!isLogin"> <div class="noLogin" v-if="!isLogin">
<span <span
......
src/config/server.js
View file @ aa033dd4
// export const SERVER_URL = "https://ysslapi.thussat.cn"; // 测试环境
// export const DEVELOPMENT_SERVER_URL = "https://ysslapi.thussat.cn"; //开发环境
// export const SERVER_WS_URL = "wss://ysslapi.thussat.cn"; // websocket
// export const SERVER_URL = "http://123.56.237.167:20202"; // 测试环境
// export const DEVELOPMENT_SERVER_URL = "http://123.56.237.167:20202"; //测试环境
// export const SERVER_WS_URL = "wss://123.56.237.167:20202"; // websocket
// 正式（暂时不用）
// export const SERVER_URL = 'https://api1.testgate.cn' // 正式环境
// export const DEVELOPMENT_SERVER_URL = 'https://api1.testgate.cn' // 开发环境
// export const SERVER_WS_URL = 'wss://api1.testgate.cn' // websocket
// 正式
// export const SERVER_URL = "https://apiy.thuers.com/modules-campsite"; // 正式环境
// export const DEVELOPMENT_SERVER_URL = " https://apiy.thuers.com/modules-campsite"; //开发环境
// export const SERVER_WS_URL = "wss://apiy.thuers.com"; // websocket
// 测试
// export const SERVER_URL = "https://tgwapi.campcenter.cn/modules-campsite"; // 正式环境
// export const DEVELOPMENT_SERVER_URL = "https://tgwapi.campcenter.cn/modules-campsite"; //开发环境
// export const SERVER_WS_URL = "wss://tgwapi.campcenter.cn"; // websocket
// 正式 // 正式
export const SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; // 正式环境 export const SERVER_URL = "https://nkapi.twentysmart.cn/modules-campsite"; // 正式环境
export const DEVELOPMENT_SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; //开发环境 export const DEVELOPMENT_SERVER_URL = "https://nkapi.twentysmart.cn/modules-campsite"; //开发环境
export const SERVER_WS_URL = "wss://gwapi.campcenter.cn"; // websocket export const SERVER_WS_URL = "wss://nkapi.twentysmart.cn"; // websocket
// 测试
// export const SERVER_URL = "http:// 8088/modules-campsite"; // 正式环境
// export const DEVELOPMENT_SERVER_URL = "http://43.143.166.79:8088/modules-campsite"; //开发环境
// export const SERVER_WS_URL = "wss://43.143.166.79:8088"; // websocket
src/request/network.js
View file @ aa033dd4
...@@ -92,23 +92,23 @@ export function request(config) { ...@@ -92,23 +92,23 @@ export function request(config) {
}) })
instance.interceptors.request.use( instance.interceptors.request.use(
(config) => { (config) => {
const loginUrl = '/web/auth/login'; const loginUrl = '/web/auth/login',
const setAccountInfo = '/web/register/setAccountInfo'; setAccountInfo = '/web/register/setAccountInfo',
const passMsgOld = '/web/auth/changePassOld'; passMsgOld = '/web/auth/changePassOld',
const getCam = '/web/auth/getCam'; getCam = '/web/auth/getCam',
const LoginCode = '/web/code/loginCode'; LoginCode = '/web/code/loginCode',
const registerCode = '/web/code/registerCode'; registerCode = '/web/code/registerCode',
const registerEmailCode = 'web/code/registerEmailCode'; registerEmailCode = 'web/code/registerEmailCode',
const passwordEmailCode = 'web/code/passwordEmailCode'; passwordEmailCode = 'web/code/passwordEmailCode',
const passwordCode = '/web/code/passwordCode'; passwordCode = '/web/code/passwordCode',
const changePassCode = '/web/auth/changePassCode'; changePassCode = '/web/auth/changePassCode',
const loginOut = '/web/auth/loginOut'; loginOut = '/web/auth/loginOut',
const setLog = '/web/auth/setLog'; setLog = '/web/auth/setLog',
const LabelType = '/activity/labelType'; LabelType = '/activity/labelType',
const HotList = '/activityCenter/hotList'; HotList = '/activityCenter/hotList',
const GetActiveInfo = '/activityCenter/detail/'; GetActiveInfo = '/activityCenter/detail/',
const HomeHot = '/activityCenter/hot'; HomeHot = '/activityCenter/hot',
const Logout = '/web/auth/loginOut'; Logout = '/web/auth/loginOut';
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(setAccountInfo) != -1 ||
config.url.indexOf(passMsgOld) != -1 || config.url.indexOf(passMsgOld) != -1 ||
......
src/router/index.js
View file @ aa033dd4
...@@ -19,25 +19,25 @@ Vue.use(VueRouter) ...@@ -19,25 +19,25 @@ Vue.use(VueRouter)
const routes = [ const routes = [
{ // {
path: '', // path: '',
name: '', // name: '',
meta: { // meta: {
title: '' // title: ''
}, // },
redirect: "/", // redirect: "/",
component: () => import('v/base/Index.vue'), // component: () => import('v/base/Index.vue'),
children: [...indexHome, ...indexActive] // children: [...indexHome, ...indexActive]
}, // },
{ // {
path: '/baseLogin', // path: '/baseLogin',
name: 'loginBase', // name: 'loginBase',
meta: { // meta: {
title: '登录' // title: '登录'
}, // },
component: () => import('v/base/login/Index.vue'), // component: () => import('v/base/login/Index.vue'),
children: [...baseLogin] // children: [...baseLogin]
}, // },
{ {
path: '/myInfo/', path: '/myInfo/',
name: 'myInfoIndex', name: 'myInfoIndex',
...@@ -197,28 +197,31 @@ function checkCam(code, cb) { ...@@ -197,28 +197,31 @@ function checkCam(code, cb) {
} }
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
if (!(from.path == '/' && from.name == null) && // if (!(from.path == '/' && from.name == null) &&
(from.path != '/baseLogin' && // (from.path != '/baseLogin' &&
from.path != '/baseRegister' && // from.path != '/baseRegister' &&
from.path != '/baseReset')) { // from.path != '/baseReset')) {
store.commit('setPreviousPath', from.path); // store.commit('setPreviousPath', from.path);
} // }
if (to.query && to.query.disCode) { // if (to.query && to.query.disCode) {
store.commit('setDisCode', to.query.disCode); // store.commit('setDisCode', to.query.disCode);
} // }
let toLogin = "/login", let toLogin = "/login",
toRegister = "/register", toRegister = "/register",
toReset = "/reset", toReset = "/reset",
toBaseLogin = "/baseLogin", // toBaseLogin = "/baseLogin",
toBaseRegister = "/baseRegister", // toBaseRegister = "/baseRegister",
toBaseReset = "/baseReset", // toBaseReset = "/baseReset",
toHome = "/", // toHome = "/",
toActive = "/active", // toActive = "/active",
toInfo = "/myInfo"; toInfo = "/myInfo";
let code = false; let code = false;
document.title = to.meta.title; document.title = to.meta.title;
if (to.path == toBaseLogin || to.path == toBaseRegister || to.path == toBaseReset || to.path.indexOf(toInfo) != -1 || to.path == toHome || to.path == toActive || to.path.indexOf(toActive) != -1) { // if (to.path == toBaseLogin || to.path == toBaseRegister || to.path == toBaseReset || to.path.indexOf(toInfo) != -1 || to.path == toHome || to.path == toActive || to.path.indexOf(toActive) != -1) {
// return next();
// } else
if (to.path.indexOf(toInfo) != -1) {
return next(); return next();
} else if (to.path == toLogin || to.path == toRegister || to.path == toReset) { } else if (to.path == toLogin || to.path == toRegister || to.path == toReset) {
code = to.params.code ? to.params.code : to.query.code; code = to.params.code ? to.params.code : to.query.code;
......
src/views/base/myInfo/index.vue
View file @ aa033dd4
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<script> <script>
/* eslint-disable */ /* eslint-disable */
import Header from "@/components/Header.vue"; import Header from "@/components/Header.vue";
import Footer from "@/components/Footer.vue"; import Footer from "@/components/index/Footer.vue";
import svg1 from '@/assets/img/signUp/icon.svg'; import svg1 from '@/assets/img/signUp/icon.svg';
import signUpList from '../myInfo/signUp.vue'; import signUpList from '../myInfo/signUp.vue';
...@@ -63,7 +63,6 @@ ...@@ -63,7 +63,6 @@
icon: "icon-icon1", icon: "icon-icon1",
url: svg1 url: svg1
}, },
], ],
campindex_type: 0, campindex_type: 0,
}; };
......
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