Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-test

src/store/index.js

@@ -1,13 +1,31 @@
-import Vue from 'vue';
-import Vuex from 'vuex';
-import chat from '@common/store/live/chat';
+import Vue from "vue";
+import Vuex from "vuex";
+import login from "@common/store/login";
+import chat from "@common/store/live/chat";
+import roomchat from "@common/store/live/room-chat";
+import apply from "@common/store/live/apply";
+import dock from "@common/store/live/dock";
+import news from "@common/store/live/news";
+import market from "@common/store/market/market";
+import marketproduct from "@common/store/market/marketproduct";
+import talentExperts from "@common/store/market/talentExperts";
+import * as ustate from "@common/store/user/state";
+import * as umutations from "@common/store/user/mutations";
 Vue.use(Vuex);
 
 export default new Vuex.Store({
-  state: {},
-  mutations: {},
+  state: { ...ustate },
+  mutations: { ...umutations },
   actions: {},
   modules: {
+    roomchat,
+    marketproduct,
+    talentExperts,
+    market,
     chat,
+    dock,
+    apply,
+    news,
+    login,
   },
 });

src/views/technical/index.vue

@@ -71,62 +71,19 @@
 </template>
 
 <script>
+import _ from 'lodash';
+import { mapState, createNamespacedHelpers } from 'vuex';
+const { mapActions: news } = createNamespacedHelpers('news');
 export default {
   name: 'technical',
   props: {},
   components: {},
   data: () => ({
     jishuImage: require('@/assets/live/main2.png'),
-    zhuantiList: [
-      {
-        publish_time: '2020-05-01',
-        title: '第六届创新创业大赛总决赛圆满结束第六届创新创业大赛总决赛圆满结束',
-        content: '第六届创新创业大赛总决赛圆满结束第六届创新创业大赛总决赛圆满结束第六届创新创业大赛总决赛圆满结束',
-      },
-      { publish_time: '2020-05-01', title: '六条数据', content: '六条数据' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束', content: '第六届创新创业大赛总决赛圆满结束' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束', content: '第六届创新创业大赛总决赛圆满结束' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束', content: '第六届创新创业大赛总决赛圆满结束' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束', content: '第六届创新创业大赛总决赛圆满结束' },
-    ],
-    jishuList: [
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束第六届创新创业大赛总决赛圆满结束' },
-      { publish_time: '2020-05-01', title: '十条数据' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束' },
-    ],
-    hangyeList: [
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束第六届创新创业大赛总决赛圆满结束' },
-      { publish_time: '2020-05-01', title: '十条数据' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束' },
-    ],
-    jiaoyuList: [
-      {
-        publish_time: '2020-05-01',
-        title: '第六届创新创业大赛总决赛圆满结束第六届创新创业大赛总决赛圆满结束',
-        content: '第六届创新创业大赛总决赛圆满结束第六届创新创业大赛总决赛圆满结束第六届创新创业大赛总决赛圆满结束',
-      },
-      { publish_time: '2020-05-01', title: '六条数据', content: '六条数据' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束', content: '第六届创新创业大赛总决赛圆满结束' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束', content: '第六届创新创业大赛总决赛圆满结束' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束', content: '第六届创新创业大赛总决赛圆满结束' },
-      { publish_time: '2020-05-01', title: '第六届创新创业大赛总决赛圆满结束', content: '第六届创新创业大赛总决赛圆满结束' },
-    ],
+    zhuantiList: [],
+    jishuList: [],
+    hangyeList: [],
+    jiaoyuList: [],
   }),
   created() {},
   computed: {},