diff --git a/src/assets/icons/Feedback.vue b/src/assets/icons/Feedback.vue new file mode 100644 index 0000000..98c6fb2 --- /dev/null +++ b/src/assets/icons/Feedback.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js index 5a136b9..4675135 100644 --- a/src/assets/icons/index.js +++ b/src/assets/icons/index.js @@ -55,6 +55,7 @@ export { default as Questionnaire } from './Questionnaire.vue' export { default as OrderQuery } from './OrderQuery.vue' export { default as ComponentQuery } from './ComponentQuery.vue' export { default as TermQuery } from './TermQuery.vue' +export { default as Feedback } from './Feedback.vue' export { default as File7z } from './file/7z.vue' export { default as FileBmp } from './file/Bmp.vue' diff --git a/src/components/scCustomer/index.vue b/src/components/scCustomer/index.vue index 184e01b..19e5943 100644 --- a/src/components/scCustomer/index.vue +++ b/src/components/scCustomer/index.vue @@ -123,13 +123,16 @@ export default { msgList:[], user_id:0, } + }, + computed: { + }, mounted() { let token = this.$TOOL.cookie.get('TOKEN'); if (token && token != null) { // 登录成功连接ws - let global_callback = function () {}; - this.$socketApi.createWebSocket(global_callback); + // let global_callback = function () {}; + // this.$socketApi.createWebSocket(global_callback); // 获取新消息 eventBus.$on('sockBack', this.getWsResult); @@ -355,7 +358,9 @@ export default { window.location.href = em.file; }, - scroll({scrollTop}){ + scroll(e){ + let {scrollTop} = e; + if(!scrollTop) {return false} if(scrollTop>10){ this.$refs.tagList.style.position = "absolute"; this.$refs.tagList.style.background = "#fff"; @@ -373,7 +378,9 @@ export default { const wrap = this.$refs.scrollbar; if(wrap){ const e = wrap.$el.querySelector('.el-scrollbar__wrap') - e.scrollTop = e.scrollHeight; + if(e && e.scrollTop){ + e.scrollTop = e.scrollHeight; + } } }) }, diff --git a/src/router/scrollBehavior.js b/src/router/scrollBehavior.js index ec30197..de5c2de 100644 --- a/src/router/scrollBehavior.js +++ b/src/router/scrollBehavior.js @@ -6,7 +6,7 @@ export function beforeEach(to, from){ if(!adminMain){return false} store.commit("updateViewTags", { fullPath: from.fullPath, - scrollTop: adminMain.scrollTop + scrollTop: adminMain.scrollTop || 0 }) } @@ -15,8 +15,8 @@ export function afterEach(to){ if(!adminMain){return false} nextTick(()=>{ var beforeRoute = store.state.viewTags.viewTags.filter(v => v.fullPath == to.fullPath)[0] - if(beforeRoute){ + if(beforeRoute && adminMain.scrollTop){ adminMain.scrollTop = beforeRoute.scrollTop || 0 } }) -} \ No newline at end of file +} diff --git a/src/store/modules/global.js b/src/store/modules/global.js index e7e5fb0..f4c54e5 100644 --- a/src/store/modules/global.js +++ b/src/store/modules/global.js @@ -27,7 +27,7 @@ export default { ], shareRouter:[ {name:'我的文档',id:''} - ] + ], }, mutations: { SET_ismobile(state, key){ diff --git a/src/views/maintenance/index.vue b/src/views/maintenance/index.vue index 2b63f39..6236d34 100644 --- a/src/views/maintenance/index.vue +++ b/src/views/maintenance/index.vue @@ -3,43 +3,11 @@ -
-
-
-
-
- -
- {{item.name}} - -
-
-
- -
- 占位占位占位占位占位占位占位占位占位占位占位占位占位占位 - -
-
-
-
-
-
-
智能推荐
-
-
-
-
搜索历史
-
-
{{item.name}}
-
-
-
+ + + - - - @@ -47,103 +15,82 @@ diff --git a/src/views/personalCenter/components/editAccount.vue b/src/views/personalCenter/components/editAccount.vue index 3e5d580..30e3317 100644 --- a/src/views/personalCenter/components/editAccount.vue +++ b/src/views/personalCenter/components/editAccount.vue @@ -20,7 +20,7 @@ - + 保 存 @@ -140,10 +140,8 @@ export default { window.addEventListener('storage',this.wechatStorageChange); }, mounted() { - // const userInfo = this.$TOOL.data.get("USER_INFO"); - // this.userInfo = userInfo; - - // this.getUserInfo(); + this.getUserInfo(); + this.getInfo(); }, methods:{ async bindWechat(){ @@ -214,9 +212,6 @@ export default { } }, - // parentParams(item){ - // this.form.avatar = item; - // }, // 图片上传成功回调 async parentParams(files) { let params = { diff --git a/src/views/personalCenter/components/feedback.vue b/src/views/personalCenter/components/feedback.vue new file mode 100644 index 0000000..21a5085 --- /dev/null +++ b/src/views/personalCenter/components/feedback.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/src/views/personalCenter/index.vue b/src/views/personalCenter/index.vue index 8438cca..03a46ba 100644 --- a/src/views/personalCenter/index.vue +++ b/src/views/personalCenter/index.vue @@ -1,48 +1,37 @@ diff --git a/src/views/serveView/components/widget.vue b/src/views/serveView/components/widget.vue index 9d6074a..a3459e7 100644 --- a/src/views/serveView/components/widget.vue +++ b/src/views/serveView/components/widget.vue @@ -11,12 +11,12 @@
- + - +
@@ -24,7 +24,7 @@