diff --git a/common/http.interceptor.js b/common/http.interceptor.js index 099e950..f4640c0 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -80,22 +80,27 @@ const install = (Vue, vm) => { const status = vm.$store.state.vuex_token; vm.$u.vuex('vuex_token', ''); vm.$u.vuex('user_message', {}); - vm.$router.go(0); - if(status){ - setTimeout(()=>{ - uni.showToast({title: '当前登录过期,请重新登录!',icon: 'none'}); - },500); - } - // uni.reLaunch({ - // url:getCurrentPages()[0].route, - // complete() { - // if(status){ - // setTimeout(()=>{ - // uni.showToast({title: '当前登录过期,请重新登录!',icon: 'none'}); - // },300); - // } - // } - // }) + // if(status){ + // setTimeout(()=>{ + // uni.showToast({title: '当前登录过期,请重新登录!',icon: 'none'}); + // },500); + // } + // vm.$router.go(0); + uni.setStorageSync('pc_current', 0); + uni.reLaunch({ + url:'/pages/pc_web/index/index', + complete() { + if(status){ + setTimeout(()=>{ + uni.showToast({title: '当前登录过期,请重新登录!',icon: 'none'}); + },300); + }else{ + setTimeout(()=>{ + uni.showToast({title: '请登录!',icon: 'none'}); + },300); + } + } + }) } return result; break; diff --git a/pages/pc_web/home/components/second.vue b/pages/pc_web/home/components/second.vue index bff2c2a..01a838c 100644 --- a/pages/pc_web/home/components/second.vue +++ b/pages/pc_web/home/components/second.vue @@ -32,7 +32,7 @@ - + {{ item.name }} @@ -52,7 +52,7 @@ {{ item.serviceName || '暂无' }} - + 做同款 @@ -407,9 +407,9 @@ export default { } .hs-services{ padding: 40rpx; - column-count:6; - -moz-column-count:6; /* Firefox */ - -webkit-column-count:6; /* Safari 和 Chrome */ + column-count:5; + -moz-column-count:5; /* Firefox */ + -webkit-column-count:5; /* Safari 和 Chrome */ column-gap: 2em; -moz-column-gap: 2em; -webkit-column-gap: 2em; diff --git a/pages/pc_web/home/home.vue b/pages/pc_web/home/home.vue index e4b8020..4295f0f 100644 --- a/pages/pc_web/home/home.vue +++ b/pages/pc_web/home/home.vue @@ -25,7 +25,7 @@ :title="item.serviceName||'暂无'"> - + 做同款 @@ -35,7 +35,7 @@ - + @@ -95,6 +95,10 @@ export default { return ''; } }, + // 服务跳转 + handleChangeService(id){ + this.$emit('changeService',id) + }, // 首页上传文件 uploadFile(file, fileList){ this.$refs.uploadCover.clearFiles(); diff --git a/pages/pc_web/index/index.vue b/pages/pc_web/index/index.vue index f8aec7d..6f2aa1b 100644 --- a/pages/pc_web/index/index.vue +++ b/pages/pc_web/index/index.vue @@ -1,12 +1,12 @@ + + + + \ No newline at end of file diff --git a/static/upload-center.gif b/static/upload-center.gif new file mode 100644 index 0000000..0400cf6 Binary files /dev/null and b/static/upload-center.gif differ