修复代码合并报错

This commit is contained in:
2024-12-06 11:35:02 +08:00
parent eae93ae6c7
commit d85b101e30
3 changed files with 9 additions and 19 deletions

View File

@@ -1,10 +1,10 @@
// const ROOTPATH1 = "https://dj-api.hnsiyao.cn/sqx_fast/"; // const ROOTPATH1 = "https://dj-api.hnsiyao.cn/sqx_fast/"; //
// const ROOTPATH = "https://dj-api.hnsiyao.cn/sqx_fast/"; //后台服务域名 const ROOTPATH = "https://dj-api.hnsiyao.cn/sqx_fast/"; //后台服务域名
// const ROOTPATH2 = "https://dj-api.hnsiyao.cn"; //后台服务域名 const ROOTPATH2 = "https://dj-api.hnsiyao.cn"; //后台服务域名
const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; // // const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; //
const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名 // const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名
const ROOTPATH2 = "https://video.hnsiyao.cn"; //后台服务域名 // const ROOTPATH2 = "https://video.hnsiyao.cn"; //后台服务域名
module.exports = { module.exports = {
APIHOST: ROOTPATH, APIHOST: ROOTPATH,

View File

@@ -149,7 +149,7 @@
methods: { methods: {
toRed(){ toRed(){
uni.navigateTo({ uni.navigateTo({
url: '/me/balance/index' url: '/me/invite/cashDetail'
}) })
}, },

View File

@@ -382,8 +382,8 @@
'width': '750rpx', 'width': '750rpx',
}, },
isShowVideo: '', isShowVideo: '',
noBuyVideoIndex:null noBuyVideoIndex:null,
playFlag: false, playFlag: false
}; };
}, },
onUnload() { onUnload() {
@@ -508,16 +508,6 @@
} }
}, },
methods: { methods: {
onDone(index) {
const prize = this.prizeList[index]
uni.showModal({
title: prize.id == 'thanks' ? '很遗憾' : '恭喜您',
content: (prize.id !== 'thanks' ? `获得` : '') + prize.name
})
},
onClick() {
// 奖品的索引
this.$refs.dialer.run(5)
//播放时的回掉 //播放时的回掉
videoPlay(videoId,courseDetailsId) { videoPlay(videoId,courseDetailsId) {
this.courseDetailsId = courseDetailsId this.courseDetailsId = courseDetailsId