update

public/static/home.html

@@ -19,8 +19,8 @@
 						<div class="homeTop">
 							<div class="homeTopInfo">
 								<span>欢迎来到吉林省计算中心科技服务平台</span>
-								<button type="button">登录</button>
-								<button type="button">注册</button>
+								<!-- <button type="button">登录</button>
+								<button type="button">注册</button> -->
 							</div>
 							<div class="homeTopLogo">
 								<img src="images/logo.png">
@@ -31,7 +31,7 @@
 							<nav>
 								<ul>
 									<li class="live">
-										<a href="/platlive/live/hall/index" target="_blank" data-item="0">
+										<a href="/static/liveIndex.html" target="_blank" data-item="0">
 											<i class="iconfont icon-zhibo"></i>
 											<p>直播大厅</p>
 										</a>

src/layout/live/head.vue

@@ -9,7 +9,7 @@
           <p>
             欢迎来到吉林省计算中心科技平台
           </p>
-          <p v-if="user && user.id">
+          <p v-if="user && user.uid">
             {{ user.name }}
           </p>
           <p v-else>

src/router/before.js

@@ -1,19 +0,0 @@
-import store from '@/store/index';
-
-const checkLogin = router => {
-  router.beforeEach((to, form, next) => {
-    store.commit('setUser');
-    // if (to.name === 'login') {
-    //   next();
-    //   return;
-    // }
-    // let user = store.state.user;
-    // if (user) {
-    //   next();
-    // }
-    // //下面是没登录的情况,需要跳转页面到用户未登录页
-    // else next({ name: 'login' });
-    next();
-  });
-};
-export default checkLogin;

src/router/index.js

@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import VueRouter from 'vue-router';
-import checkLogin from './before';
+import checkLogin from '@common/router/before';
 
 Vue.use(VueRouter);
 

src/store/index.js

@@ -1,5 +1,6 @@
 import Vue from 'vue';
 import Vuex from 'vuex';
+import login from '@common/store/login';
 import chat from '@common/store/live/chat';
 import apply from '@common/store/live/apply';
 import dock from '@common/store/live/dock';
@@ -15,5 +16,5 @@ export default new Vuex.Store({
   state: { ...ustate },
   mutations: { ...umutations },
   actions: {},
-  modules: { marketproduct, talentExperts, market, chat, dock, apply, news },
+  modules: { marketproduct, talentExperts, market, chat, dock, apply, news, login },
 });

src/views/hall/liveApply.vue

@@ -114,7 +114,7 @@ export default {
     async onSubmit() {
       let duplicate = JSON.parse(JSON.stringify(this.form));
       let data = { ...duplicate };
-      data.user_id = this.user.id;
+      data.user_id = this.user.uid;
       data.user_name = this.user.name;
       let dock_id = this.$route.query.id;
       data.goodsList = [this.productInfo(this.form.goodsList)];

vue.config.js

@@ -28,51 +28,56 @@ module.exports = {
       '/files': {
         target: 'http://free.liaoningdoupo.com',
       },
-      '/api/setting': {
+      '/api': {
         target: 'http://free.liaoningdoupo.com',
-        // target: 'http://free.liaoningdoupo.com', //http://free.liaoningdoupo.com
         changeOrigin: true,
         ws: true,
       },
-      '/api/affairs': {
-        target: 'http://free.liaoningdoupo.com',
-        changeOrigin: true,
-        ws: true,
-      },
-      '/api/policy': {
-        target: 'http://free.liaoningdoupo.com',
-        changeOrigin: true,
-        ws: true,
-      },
-      '/api/record': {
-        target: 'http://free.liaoningdoupo.com',
-        changeOrigin: true,
-        ws: true,
-      },
-      '/api/serve': {
-        target: 'http://free.liaoningdoupo.com',
-        changeOrigin: true,
-        ws: true,
-        // pathRewrite: { '^/api/affairs': '/api' },
-      },
-      '/api/talent': {
-        target: 'http://free.liaoningdoupo.com',
-        changeOrigin: true,
-        ws: true,
-        // pathRewrite: { '^/api/affairs': '/api' },
-      },
-      '/api/market': {
-        target: 'http://free.liaoningdoupo.com',
-        changeOrigin: true,
-        ws: true,
-        // pathRewrite: { '^/api/affairs': '/api' },
-      },
-      '/api/live': {
-        target: 'http://free.liaoningdoupo.com',
-        changeOrigin: true,
-        ws: true,
-        // pathRewrite: { '^/api/affairs': '/api' },
-      },
+      // '/api/setting': {
+      //   target: 'http://free.liaoningdoupo.com',
+      //   // target: 'http://free.liaoningdoupo.com', //http://free.liaoningdoupo.com
+      //   changeOrigin: true,
+      //   ws: true,
+      // },
+      // '/api/affairs': {
+      //   target: 'http://free.liaoningdoupo.com',
+      //   changeOrigin: true,
+      //   ws: true,
+      // },
+      // '/api/policy': {
+      //   target: 'http://free.liaoningdoupo.com',
+      //   changeOrigin: true,
+      //   ws: true,
+      // },
+      // '/api/record': {
+      //   target: 'http://free.liaoningdoupo.com',
+      //   changeOrigin: true,
+      //   ws: true,
+      // },
+      // '/api/serve': {
+      //   target: 'http://free.liaoningdoupo.com',
+      //   changeOrigin: true,
+      //   ws: true,
+      //   // pathRewrite: { '^/api/affairs': '/api' },
+      // },
+      // '/api/talent': {
+      //   target: 'http://free.liaoningdoupo.com',
+      //   changeOrigin: true,
+      //   ws: true,
+      //   // pathRewrite: { '^/api/affairs': '/api' },
+      // },
+      // '/api/market': {
+      //   target: 'http://free.liaoningdoupo.com',
+      //   changeOrigin: true,
+      //   ws: true,
+      //   // pathRewrite: { '^/api/affairs': '/api' },
+      // },
+      // '/api/live': {
+      //   target: 'http://free.liaoningdoupo.com',
+      //   changeOrigin: true,
+      //   ws: true,
+      //   // pathRewrite: { '^/api/affairs': '/api' },
+      // },
       '/ws': {
         target: 'http://free.liaoningdoupo.com',
         ws: true,