diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..33c747a Binary files /dev/null and b/dist.zip differ diff --git a/src/components/News/index.vue b/src/components/News/index.vue index 7b9575e..ef6f8d9 100644 --- a/src/components/News/index.vue +++ b/src/components/News/index.vue @@ -160,6 +160,7 @@ * 获取详情列表 */ getList(options) { + console.log('options: ', options); const { pageNum, pageSize, showPage } = this; const params = { pageNum, @@ -170,7 +171,7 @@ params.showType = 0 } if(showPage === '0204'){ - params.showPage = '0203' + params.showPage = options.showPage params.showType = 1 } if(options){ diff --git a/src/config.js b/src/config.js index 466fb26..ab80f92 100644 --- a/src/config.js +++ b/src/config.js @@ -5,6 +5,7 @@ export const client_id = 'test' export const client_secret = "test" // export const BASE_API = "https://rapapi.renqilai.com/app/mock/39"; export const BASE_API = "http://10.119.190.12:8000/v1.0"; +// export const BASE_API = "https://test.tall.wiki/datang/v1.0"; export const pageSize = 20 export const SHELF_MAX_ROW=7 diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue index c98c97b..65524ea 100644 --- a/src/views/layout/Layout.vue +++ b/src/views/layout/Layout.vue @@ -26,7 +26,9 @@ export default { mixins: [ResizeMixin], watch: { '$route.path'() { - this.showBtn() + setTimeout(() => { + this.showBtn() + },500) } }, computed: { @@ -78,8 +80,12 @@ export default { } for(var i = 0; i < perList.length; i++) { if(perList[i][1] === code) { + console.log('perList[i]: ', perList[i]); list[perList[i][2]] = true; } + // if(perList[i][2] === 'reset') { + // console.log('perList[i]: ', perList[i]); + // } } this.setShowBtnList(list) }, diff --git a/vue.config.js b/vue.config.js index 0763d0c..10643fb 100644 --- a/vue.config.js +++ b/vue.config.js @@ -4,10 +4,13 @@ var path = require("path"); const BASE_API = "http://10.119.190.12:8000/v1.0" const proxyUrl = '/v1.0' +// const BASE_API = "https://test.tall.wiki/datang/v1.0" +// const proxyUrl = 'datang/v1.0' + const port = 8080 module.exports = { - publicPath: '/manage', + publicPath: '/v1.0/manage', devServer: { open: true, overlay: {