长页默认数据深拷贝

src/components/editor.js

@@ -7,7 +7,7 @@ export default {
   //skin:'oxide-dark',
   language: 'zh_CN',
   language_url: './styles/tinymce/langs/zh_CN.js',
-  plugins: 'print preview searchreplace autolink directionality visualblocks visualchars fullscreen image link media template codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists wordcount imagetools textpattern help emoticons autosave autoresize formatpainter paragraphspacing',
+  plugins: 'print preview searchreplace autolink directionality visualblocks visualchars fullscreen image link media template codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists wordcount imagetools textpattern help emoticons autoresize formatpainter paragraphspacing',
   toolbar: 'code undo redo restoredraft | cut copy pastetext | forecolor backcolor headings fontsize lineHeight bold italic underline strikethrough link anchor | alignleft aligncenter alignright alignjustify | \
     styleselect fontselect fontsizeselect | bullist numlist | blockquote subscript superscript removeformat | \
     table image media charmap emoticons hr pagebreak insertdatetime print preview | fullscreen | indent2em formatpainter | paragraphspacing',

src/mixins/page/index.js

@@ -1,6 +1,7 @@
 import Module from '@/components/modules/module'
 import Setting from '@/setting'
 import Util from '@/libs/util'
+import _ from 'lodash'
 import { Loading } from 'element-ui'
 export default {
   data () {

src/pages/article/add/editor.js

@@ -8,7 +8,7 @@ export default {
   //skin:'oxide-dark',
   language: 'zh_CN',
   language_url: './styles/tinymce/langs/zh_CN.js',
-  plugins: 'print preview searchreplace autolink directionality visualblocks visualchars fullscreen image link media template codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists wordcount imagetools textpattern help emoticons autosave autoresize formatpainter',
+  plugins: 'print preview searchreplace autolink directionality visualblocks visualchars fullscreen image link media template codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists wordcount imagetools textpattern help emoticons autoresize formatpainter',
   toolbar: 'code undo redo restoredraft | cut copy pastetext | forecolor backcolor headings fontsize lineHeight bold italic underline strikethrough link anchor | alignleft aligncenter alignright alignjustify | \
     styleselect fontselect fontsizeselect | bullist numlist | blockquote subscript superscript removeformat | \
     table image media charmap emoticons hr pagebreak insertdatetime print preview | fullscreen | indent2em formatpainter',

src/pages/column/add/index.vue

@@ -170,6 +170,7 @@ import { mapState } from 'vuex'
 import Cropper from '@/components/img-upload/Cropper'
 import Axios from 'axios'
 import Modules from '@/const/modules'
+import _ from 'lodash'
 export default {
   data () {
     return {
@@ -299,7 +300,6 @@ export default {
     if (this.submiting) {
       next()
     } else {
-      const { id } = this.form
       const { updateTime } = this
       // 更改了信息才需要提示
       if (updateTime > 1) {
@@ -654,7 +654,6 @@ export default {
           this.updateFile(form, data)
           // 栏目类型选择了长页栏目，才需要保存长页
           form.typeId === 3 && this.savePage(data)
-          // return
           Util.successMsg("创建成功")
           next ? next() : this.$router.back()
         }).catch(err => {
@@ -666,11 +665,9 @@ export default {
     async savePage (columnId) {
       const { listStyleId } = this.form
       const { data } = await this.$post(`${this.api.findPage}?columnId=${columnId}`)
-      let module = Modules[this.pageStyle.find(e => e.id == listStyleId).path] // 获取module.js里存的初始长页数据
+      let module = _.cloneDeep(Modules[this.pageStyle.find(e => e.id == listStyleId).path]) // 获取module.js里存的初始长页数据
       // 如果是编辑 ，并且已经绑定过长页模板，则调编辑，并且json要给字符串（新增给数组）
       if (data.length) module = JSON.stringify(module)
-      console.log(111, Modules, module, Modules['iasf'])
-      // debugger
       if (module) {
         await this.$post(this.api[data.length ? 'updatePage' : 'savePage'], {
           id: data.length ? data[0].id : '',

src/pages/column/list/index.vue

@@ -406,7 +406,7 @@ export default {
         } else {
           this.$post(this.api.saveStyle, this.form).then(res => {
             this.$post(`${this.api.searchAllBySite}?siteId=${this.siteId}`).then(({ data }) => {
-              this.form = data[0]
+              if (data.length) this.form = data[0]
             }).catch(res => { })
           }).catch(res => { })
         }

src/pages/column/page/about.vue

@@ -208,7 +208,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.about
+      modules: _.cloneDeep(Modules.about)
     }
   },
   mounted () { },

src/pages/column/page/aboutNew.vue

@@ -176,7 +176,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.about
+      modules: _.cloneDeep(Modules.about)
     }
   },
   mounted () { },

src/pages/column/page/aboutUs.vue

@@ -185,7 +185,7 @@ export default {
   data () {
     return {
       isImg: Util.isImg,
-      modules: Modules.aboutUs,
+      modules: _.cloneDeep(Modules.aboutUs),
     }
   },
   components: {

src/pages/column/page/application.vue

@@ -158,7 +158,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.application
+      modules: _.cloneDeep(Modules.application)
     }
   },
   mounted () { },

src/pages/column/page/careers.vue

@@ -124,7 +124,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.careers
+      modules: _.cloneDeep(Modules.careers)
     }
   },
   mounted () { },

src/pages/column/page/contactUs.vue

@@ -59,7 +59,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.contactUs
+      modules: _.cloneDeep(Modules.contactUs)
     }
   },
   mounted () { },

src/pages/column/page/devHistory.vue

@@ -51,7 +51,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.devHistory
+      modules: _.cloneDeep(Modules.devHistory)
     }
   },
   mounted () { },

src/pages/column/page/deviceIntroBeam.vue

@@ -69,7 +69,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.deviceIntroBeam
+      modules: _.cloneDeep(Modules.deviceIntroBeam)
     }
   },
   mounted () { },

src/pages/column/page/deviceIntroLayout.vue

@@ -67,7 +67,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.deviceIntroLayout
+      modules: _.cloneDeep(Modules.deviceIntroLayout)
     }
   },
   mounted () { },

src/pages/column/page/deviceIntroLinear.vue

@@ -69,7 +69,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.deviceIntroLinear
+      modules: _.cloneDeep(Modules.deviceIntroLinear)
     }
   },
   mounted () { },

src/pages/column/page/edu.vue

@@ -76,7 +76,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.edu
+      modules: _.cloneDeep(Modules.edu)
     }
   },
   mounted () { },

src/pages/column/page/estate/event/index.vue

@@ -36,7 +36,8 @@
           <div v-if="modules[1].list.length" class="event">
             <ul class="time">
               <template v-for="(item, i) in modules[1].list">
-                <li v-if="item.isEnable" :key="i" :class="{ active: curYear == i }" @click="yearClick(i)">{{ item.title }}
+                <li v-if="item.isEnable" :key="i" :class="{ active: curYear == i }" @click="yearClick(i)">{{ item.title
+                  }}
                 </li>
               </template>
             </ul>
@@ -71,7 +72,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules['estate/event'],
+      modules: _.cloneDeep(Modules['estate/event']),
       active: 0,
       tabs: ['大事记'],
       curYear: 0

src/pages/column/page/estate/index/index.vue

@@ -231,7 +231,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules['estate/index']
+      modules: _.cloneDeep(Modules['estate/index'])
     }
   },
   mounted () { },

src/pages/column/page/estate/location/index.vue

@@ -73,7 +73,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules['estate/location'],
+      modules: _.cloneDeep(Modules['estate/location']),
       active: 0,
       tabs: ['地理位置']
     }

src/pages/column/page/estate/orgSetup/index.vue

@@ -55,7 +55,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules['estate/orgSetup'],
+      modules: _.cloneDeep(Modules['estate/orgSetup']),
       active: 0,
       tabs: ['机构设置']
     }

src/pages/column/page/estate/survey/index.vue

@@ -54,7 +54,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules['estate/survey'],
+      modules: _.cloneDeep(Modules['estate/survey']),
       active: 0,
       tabs: ['产业光源概况']
     }

src/pages/column/page/exp.vue

@@ -85,7 +85,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.exp,
+      modules: _.cloneDeep(Modules.exp),
       Util
     }
   },

src/pages/column/page/governance.vue

@@ -65,7 +65,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.governance,
+      modules: _.cloneDeep(Modules.governance),
       curYear: 0
     }
   },

src/pages/column/page/home.vue

@@ -212,7 +212,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.home
+      modules: _.cloneDeep(Modules.home)
     }
   },
   mounted () { },

src/pages/column/page/iasf.vue

@@ -239,7 +239,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.iasf,
+      modules: _.cloneDeep(Modules.iasf),
       articles: [],
       articles1: [],
       articles2: [],

src/pages/column/page/index.vue

@@ -48,7 +48,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.index
+      modules: _.cloneDeep(Modules.index)
     }
   },
   mounted () { },

src/pages/column/page/industrial.vue

@@ -162,7 +162,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.industrial
+      modules: _.cloneDeep(Modules.industrial)
     }
   },
   mounted () { },

src/pages/column/page/lightSources.vue

@@ -131,7 +131,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.lightSources,
+      modules: _.cloneDeep(Modules.lightSources),
       active: 0,
       tabs: [
         {

src/pages/column/page/member.vue

@@ -57,7 +57,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.member,
+      modules: _.cloneDeep(Modules.member),
     }
   },
   mounted () { },

src/pages/column/page/mission.vue

@@ -75,7 +75,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.mission
+      modules: _.cloneDeep(Modules.mission)
     }
   },
   mounted () { },

src/pages/column/page/news.vue

@@ -249,7 +249,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.news,
+      modules: _.cloneDeep(Modules.news),
       tabs: [
         {
           id: 1,

src/pages/column/page/newsPress.vue

@@ -54,7 +54,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.newsPress
+      modules: _.cloneDeep(Modules.newsPress)
     }
   },
   mounted () { },

src/pages/column/page/newsProcurement.vue

@@ -54,7 +54,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.newsProcurement
+      modules: _.cloneDeep(Modules.newsProcurement)
     }
   },
   mounted () { },

src/pages/column/page/org.vue

@@ -48,7 +48,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.org
+      modules: _.cloneDeep(Modules.org)
     }
   },
   mounted () { },

src/pages/column/page/overview.vue

@@ -150,7 +150,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.overview
+      modules: _.cloneDeep(Modules.overview)
     }
   },
   mounted () { },

src/pages/column/page/overviewDevHistory.vue

@@ -74,7 +74,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.overviewDevHistory,
+      modules: _.cloneDeep(Modules.overviewDevHistory),
       active: 0,
       tabs: ['发展历程'],
       curYear: 0

src/pages/column/page/overviewIntro.vue

@@ -62,7 +62,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.overviewIntro,
+      modules: _.cloneDeep(Modules.overviewIntro),
       active: 0,
       tabs: ['S³FEL介绍']
     }

src/pages/column/page/overviewLocation.vue

@@ -46,7 +46,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.overviewLocation,
+      modules: _.cloneDeep(Modules.overviewLocation),
       active: 0,
       tabs: ['地理位置']
     }

src/pages/column/page/overviewSetup.vue

@@ -54,7 +54,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.overviewSetup,
+      modules: _.cloneDeep(Modules.overviewSetup),
       active: 0,
       tabs: ['机构设置']
     }

src/pages/column/page/overviewTrailer.vue

@@ -50,7 +50,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.overviewTrailer,
+      modules: _.cloneDeep(Modules.overviewTrailer),
       active: 0,
       tabs: ['S³FEL宣传片']
     }

src/pages/column/page/research.vue

@@ -93,7 +93,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.research
+      modules: _.cloneDeep(Modules.research)
     }
   },
   mounted () { },

src/pages/column/page/researchNew.vue

@@ -73,7 +73,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.research
+      modules: _.cloneDeep(Modules.research)
     }
   },
   mounted () { },

src/pages/column/page/researchTeam.vue

@@ -59,7 +59,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.researchTeam,
+      modules: _.cloneDeep(Modules.researchTeam),
       title: ''
     }
   },

src/pages/column/page/science.vue

@@ -63,7 +63,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.science
+      modules: _.cloneDeep(Modules.science)
     }
   },
   mounted () { },

src/pages/column/page/scientific.vue

@@ -70,7 +70,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.scientific
+      modules: _.cloneDeep(Modules.scientific)
     }
   },
   mounted () { },

src/pages/column/page/sfel.vue

@@ -362,7 +362,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.sfel
+      modules: _.cloneDeep(Modules.sfel)
     }
   },
   mounted () { },

src/pages/column/page/sfelNew.vue

@@ -241,7 +241,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.sfel
+      modules: _.cloneDeep(Modules.sfel)
     }
   },
   mounted () { },

src/pages/column/page/shop.vue

@@ -67,7 +67,7 @@ export default {
   data () {
     return {
       isImg: Util.isImg,
-      modules: Modules.shop
+      modules: _.cloneDeep(Modules.shop)
     }
   },
   mounted () { },

src/pages/column/page/singlePage.vue

@@ -125,7 +125,7 @@ export default {
   data () {
     return {
       isImg: Util.isImg,
-      modules: Modules.singlePage,
+      modules: _.cloneDeep(Modules.singlePage),
       articles: [],
       articles1: [],
     }

src/pages/column/page/speech.vue

@@ -51,7 +51,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.speech
+      modules: _.cloneDeep(Modules.speech)
     }
   },
   mounted () { },

src/pages/column/page/talent.vue

@@ -101,7 +101,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.talent
+      modules: _.cloneDeep(Modules.talent)
     }
   },
   mounted () { },

src/pages/column/page/talentCenter.vue

@@ -105,7 +105,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.talentCenter
+      modules: _.cloneDeep(Modules.talentCenter)
     }
   },
   mounted () { },

src/pages/column/page/talentCentre.vue

@@ -85,7 +85,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.talentCentre,
+      modules: _.cloneDeep(Modules.talentCentre),
       defaultProps: {
         value: 'id',
         label: 'title'

src/pages/column/page/team.vue

@@ -50,7 +50,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.team
+      modules: _.cloneDeep(Modules.team)
     }
   },
   mounted () { },

src/pages/column/page/userSharing.vue

@@ -73,7 +73,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      modules: Modules.userSharing
+      modules: _.cloneDeep(Modules.userSharing)
     }
   },
   mounted () { },

src/plugins/requests/index.js

@@ -1,7 +1,7 @@
 import axios from 'axios'
 import Util from '@/libs/util'
 import Setting from '@/setting'
-import store from '@/store'
+import Store from '@/store'
 import Router from '@/router'
 
 const service = axios.create({
@@ -14,14 +14,17 @@ service.defaults.headers['X-Content-Type-Options'] = 'nosniff'
 service.defaults.headers['Content-Security-Policy'] = 'script-src "self"; object-src "none";style-src cdn.example.org third-party.org; child-src https:'
 // 请求拦截器
 service.interceptors.request.use(config => {
-  let token = Util.local.get(Setting.tokenKey);
-  if (token) config.headers.token = token
+  let token = Util.local.get(Setting.tokenKey)
+  if (token) {
+    config.headers.token = token
+    Store.state.user.userId || Store.dispatch('user/logout')
+  }
   return config;
 }, err => {
   Util.errorMsg({
-    message: "退出登陆",
+    message: '退出登陆',
     onClose: function () {
-      store.dispatch('user/logout')
+      Store.dispatch('user/logout')
     }
   });
   return Promise.reject(err);
@@ -37,7 +40,7 @@ service.interceptors.response.use(
     } else if (code === 401) {
       Util.errorMsg(res.msg)
       setTimeout(() => {
-        store.dispatch('user/logout')
+        Store.dispatch('user/logout')
       }, 1000)
       return Promise.reject(res)
     } else if (code == 300) {
@@ -61,14 +64,14 @@ service.interceptors.response.use(
           case 401:
             Util.errorMsg("登录过期，请重新登录")
             setTimeout(() => {
-              store.dispatch('user/logout')
+              Store.dispatch('user/logout')
             }, 1000)
             break
           // 403 token过期
           case 403:
             Util.errorMsg("登录过期，请重新登录")
             setTimeout(() => {
-              store.dispatch('user/logout')
+              Store.dispatch('user/logout')
             }, 1000)
             break
           // 其他错误，直接抛出错误提示

src/store/modules/user.js

@@ -1,6 +1,5 @@
 import Setting from '@/setting'
 import util from '@/libs/util'
-import addRoutes from '@/libs/route/addRoutes'
 
 /**
  * 用户信息
@@ -28,7 +27,7 @@ export default {
     }
   },
   actions: {
-      logout({ commit, state, dispatch }) {
+    logout ({ commit, state, dispatch }) {
       return new Promise((resolve, reject) => {
         util.local.remove(Setting.storeKey)
         util.local.remove(Setting.tokenKey)