diff --git a/config/index.js b/config/index.js index 5a55324..e2a452f 100644 --- a/config/index.js +++ b/config/index.js @@ -26,7 +26,7 @@ module.exports = { }, // Various Dev Server settings - host: '192.168.0.103', // can be overwritten by process.env.HOST + host: '127.0.0.1', // can be overwritten by process.env.HOST port: 8989, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, diff --git a/src/common/components/common.js b/src/common/components/common.js index e85dd04..0392c24 100644 --- a/src/common/components/common.js +++ b/src/common/components/common.js @@ -1,5 +1,6 @@ +const publishUrl = 'http://v3.xzszwhy.cn/' const url = 'http://v3.xzszwhy.cn/xzszwhy/' -const liveUrl = 'https://www.xzszwhy.cn/' +const liveUrl = 'http://v3.xzszwhy.cn/live/' const shopUrl = 'http://v3.xzszwhy.cn/xzshop/' /** * 基础区域ID、编码 @@ -21,12 +22,12 @@ const shopUrl = 'http://v3.xzszwhy.cn/xzshop/' * 15.吉隆县: 642389, 540234000000 * 16.聂拉木县: 642437, 540235000000 * 17.萨嘎县: 642489, 540236000000 - * 18.岗巴县: 642536, 540237000000 + * 18.岗巴县: 642536, 540232000000 */ const area = { - areaName: '桑珠孜区', - areaId: '640676', - areaCode: '540202000000' + areaName: '日喀则市', + areaId: '640675', + areaCode: '540200000000' } const phoneSafe = (phone) => { @@ -37,6 +38,7 @@ const phoneSafe = (phone) => { } export default { + publishUrl, url, liveUrl, shopUrl, diff --git a/src/pages/ArtTrain/ArtTrain.vue b/src/pages/ArtTrain/ArtTrain.vue index fa51398..56c3775 100644 --- a/src/pages/ArtTrain/ArtTrain.vue +++ b/src/pages/ArtTrain/ArtTrain.vue @@ -69,6 +69,7 @@ export default { photography: [], innerContent: [], url: common.url, + publishUrl: common.publishUrl, isLoading: false } }, @@ -114,7 +115,7 @@ export default { if (link) { window.open(link) } else { - window.location.href = this.url + url + window.location.href = this.publishUrl + url } } }, diff --git a/src/pages/ArtTrainList/ArtTrainList.vue b/src/pages/ArtTrainList/ArtTrainList.vue index c330ed6..b9210c0 100644 --- a/src/pages/ArtTrainList/ArtTrainList.vue +++ b/src/pages/ArtTrainList/ArtTrainList.vue @@ -89,6 +89,7 @@ export default { newsDirectoriesParentId: 'd9d8c7ea-32e0-43ed-ad17-7c99a3c389b9' }, url: common.url, + publishUrl: common.publishUrl, isLoading: false } }, @@ -102,7 +103,7 @@ export default { }, methods: { goDetail: function (url) { - window.location.href = this.url + url + window.location.href = this.publishUrl + url }, doJumpPage: function () { this.page.page = this.changePage diff --git a/src/pages/Broadcast/Broadcast.vue b/src/pages/Broadcast/Broadcast.vue index 93c7c4f..47103b4 100644 --- a/src/pages/Broadcast/Broadcast.vue +++ b/src/pages/Broadcast/Broadcast.vue @@ -22,7 +22,7 @@