@@ -102,7 +102,7 @@ export default {
getBoradcastList: function () {
var self = this
self.isLoading = true
- axios.get(self.liveUrl + 'live/app/liveplan/listliveplanrelease').then(function (res) {
+ axios.get(self.liveUrl + 'app/liveplan/listliveplanrelease').then(function (res) {
self.isLoading = false
self.broadcast = res.data
self.selectedList = res.data
diff --git a/src/pages/BroadcastDetail/BroadcastDetail.vue b/src/pages/BroadcastDetail/BroadcastDetail.vue
index 69040a7..221cac6 100644
--- a/src/pages/BroadcastDetail/BroadcastDetail.vue
+++ b/src/pages/BroadcastDetail/BroadcastDetail.vue
@@ -53,7 +53,8 @@ export default {
videoList: [],
selectedVideo: {},
player: null,
- url: common.url
+ url: common.url,
+ liveUrl: common.liveUrl
}
},
computed: {
@@ -79,7 +80,7 @@ export default {
},
getBroadcastDetail: function () {
var self = this
- axios.get(self.url + 'app/liveplan/getliveplanbyidrelease/' + self.$route.params.id).then(function (res) {
+ axios.get(self.liveUrl + 'app/liveplan/getliveplanbyidrelease/' + self.$route.params.id).then(function (res) {
self.broadcastData = res.data
if (res.data.liveStatus !== '2') {
self.getVideo()
@@ -90,16 +91,17 @@ export default {
},
getVideo: function () {
var self = this
- axios.get(self.url + 'app/liverecord/listliverecordrelease/' + self.$route.params.id).then(function (res) {
+ axios.get(self.liveUrl + 'app/liverecord/listliverecordrelease/' + self.$route.params.id).then(function (res) {
self.videoList = res.data
self.selectedVideo = res.data[0]
- self.selectedVideo.videoSrc = self.selectedVideo.recordFilePath
+ self.selectedVideo.videoSrc = common.publishUrl + self.selectedVideo.recordFilePath
self.flv_load()
})
},
changeVideo: function (idx) {
+ console.log('changeVideo')
this.selectedVideo = this.videoList[idx]
- this.selectedVideo.videoSrc = this.selectedVideo.recordFilePath
+ this.selectedVideo.videoSrc = common.publishUrl + this.selectedVideo.recordFilePath
var video = document.getElementById('myVideo')
video.src = this.selectedVideo.videoSrc
this.flv_load()
@@ -116,7 +118,7 @@ export default {
}
}
self.player = flvjs.createPlayer({
- type: 'flv', // 视频mp4格式
+ type: 'mp4', // 视频mp4格式
url: self.selectedVideo.videoSrc
})
self.player.attachMediaElement(element)
diff --git a/src/pages/CultureDynamics/CultureDynamics.vue b/src/pages/CultureDynamics/CultureDynamics.vue
index e8b6ff0..e352450 100644
--- a/src/pages/CultureDynamics/CultureDynamics.vue
+++ b/src/pages/CultureDynamics/CultureDynamics.vue
@@ -103,6 +103,7 @@ export default {
defaultArea: common.area.areaCode,
area: common.area.areaCode,
url: common.url,
+ publishUrl: common.publishUrl,
isLoading: false
}
},
@@ -149,7 +150,7 @@ export default {
if (link) {
window.open(link)
} else {
- window.location.href = this.url + url
+ window.location.href = this.publishUrl + url
}
},
getTypeList: function () {
diff --git a/src/pages/CultureSupermarket/CultureSupermarket.vue b/src/pages/CultureSupermarket/CultureSupermarket.vue
index 817d78e..0e2cd5b 100644
--- a/src/pages/CultureSupermarket/CultureSupermarket.vue
+++ b/src/pages/CultureSupermarket/CultureSupermarket.vue
@@ -58,7 +58,7 @@ export default {
goodsPage: {
page: {
current: 1,
- size: 3,
+ size: 8,
groupSize: 5,
total: 0,
keywords: '',
diff --git a/src/pages/Exhibition/Exhibition.vue b/src/pages/Exhibition/Exhibition.vue
index d65edf6..ce3d7a1 100644
--- a/src/pages/Exhibition/Exhibition.vue
+++ b/src/pages/Exhibition/Exhibition.vue
@@ -89,6 +89,7 @@ export default {
newsDirectoriesParentId: 'f1d5d313-f728-4dda-9843-1116d97e17b0'
},
url: common.url,
+ publishUrl: common.publishUrl,
isLoading: false
}
},
@@ -125,7 +126,7 @@ export default {
if (link) {
window.open(link)
} else {
- window.location.href = this.url + url
+ window.location.href = this.publishUrl + url
}
},
doJumpPage: function () {
diff --git a/src/pages/Index/components/DigitalResource.vue b/src/pages/Index/components/DigitalResource.vue
index 6178caa..1bc22b7 100644
--- a/src/pages/Index/components/DigitalResource.vue
+++ b/src/pages/Index/components/DigitalResource.vue
@@ -42,6 +42,7 @@ export default {
spaceBetween: 30
},
url: common.url,
+ publishUrl: common.publishUrl,
literature: [],
literaturePage: {
page: 1,
@@ -57,7 +58,7 @@ export default {
if (link) {
window.open(link)
} else {
- window.location.href = this.url + url
+ window.location.href = this.publishUrl + url
}
},
getLiterature: function () {
diff --git a/src/pages/Index/components/IndexDynamic.vue b/src/pages/Index/components/IndexDynamic.vue
index a5f37f3..acbab2f 100644
--- a/src/pages/Index/components/IndexDynamic.vue
+++ b/src/pages/Index/components/IndexDynamic.vue
@@ -42,7 +42,8 @@ export default {
},
data () {
return {
- url: common.url
+ url: common.url,
+ publishUrl: common.publishUrl
}
},
methods: {
@@ -50,7 +51,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/Index/components/IndexVideo.vue b/src/pages/Index/components/IndexVideo.vue
index 78abbed..6217e44 100644
--- a/src/pages/Index/components/IndexVideo.vue
+++ b/src/pages/Index/components/IndexVideo.vue
@@ -30,7 +30,8 @@ export default {
},
data () {
return {
- url: common.url
+ url: common.url,
+ publishUrl: common.publishUrl
}
},
methods: {
@@ -38,7 +39,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/Index/components/Swiper.vue b/src/pages/Index/components/Swiper.vue
index 12bac98..63d1428 100644
--- a/src/pages/Index/components/Swiper.vue
+++ b/src/pages/Index/components/Swiper.vue
@@ -24,12 +24,13 @@ export default {
// loop: true,
autoplay: 3000
},
- url: common.url
+ url: common.url,
+ publishUrl: common.publishUrl
}
},
methods: {
goDetail: function (url) {
- window.location.href = this.url + url
+ window.location.href = this.publishUrl + url
}
}
}
diff --git a/src/pages/Resource/Resource.vue b/src/pages/Resource/Resource.vue
index 3642a11..d265f8e 100644
--- a/src/pages/Resource/Resource.vue
+++ b/src/pages/Resource/Resource.vue
@@ -90,6 +90,7 @@ export default {
newsDirectoriesParentId: '98c74389-2088-499b-a046-8611bdc57ea4'
},
url: common.url,
+ publishUrl: common.publishUrl,
isLoading: false
}
},
@@ -106,7 +107,7 @@ export default {
if (link) {
window.open(link)
} else {
- window.location.href = this.url + url
+ window.location.href = this.publishUrl + url
}
},
changeType: function (type) {
diff --git a/src/pages/SearchList/SearchList.vue b/src/pages/SearchList/SearchList.vue
index 07e577c..4d0c07d 100644
--- a/src/pages/SearchList/SearchList.vue
+++ b/src/pages/SearchList/SearchList.vue
@@ -80,7 +80,7 @@
@@ -231,6 +231,7 @@ export default {
},
pageList: [],
url: common.url,
+ publishUrl: common.publishUrl,
liveUrl: common.liveUrl
}
},
@@ -344,7 +345,7 @@ export default {
},
// 跳转详情页
goDetail: function (url) {
- window.location.href = this.url + url
+ window.location.href = this.publishUrl + url
},
// 查询艺术培训
searchArt: function () {
@@ -428,7 +429,7 @@ export default {
// 查询直播
searchBoradcast: function () {
var self = this
- axios.get(self.liveUrl + 'live/app/liveplan/listliveplanrelease', {
+ axios.get(self.liveUrl + 'app/liveplan/listliveplanrelease', {
params: self.page
}).then(function (res) {
self.pageList = res.data.rows
diff --git a/src/pages/SearchResult/SearchResult.vue b/src/pages/SearchResult/SearchResult.vue
index ef97bee..9a2f1b2 100644
--- a/src/pages/SearchResult/SearchResult.vue
+++ b/src/pages/SearchResult/SearchResult.vue
@@ -100,7 +100,7 @@
@@ -273,7 +273,9 @@ export default {
heritageTotal: 0,
broadcastList: [],
broadcastTotal: 0,
- url: common.url
+ url: common.url,
+ liveUrl: common.liveUrl,
+ publishUrl: common.publishUrl
}
},
computed: {
@@ -339,7 +341,7 @@ export default {
if (link) {
window.location.href = link
} else {
- window.location.href = this.url + url
+ window.location.href = this.publishUrl + url
}
},
// 查询艺术培训
diff --git a/src/pages/Travel/Travel.vue b/src/pages/Travel/Travel.vue
index 316296f..1c7a12b 100644
--- a/src/pages/Travel/Travel.vue
+++ b/src/pages/Travel/Travel.vue
@@ -77,6 +77,7 @@ export default {
newsDirectoriesId: '51ae7beb-f277-47a4-937a-088e6d47656d'
},
url: common.url,
+ publishUrl: common.publishUrl,
isLoading: false
}
},
@@ -116,7 +117,7 @@ export default {
if (link) {
window.open(link)
} else {
- window.location.href = this.url + url
+ window.location.href = this.publishUrl + url
}
}
},