diff --git a/config/index.js b/config/index.js index ee2e9d7..7b50302 100644 --- a/config/index.js +++ b/config/index.js @@ -1,14 +1,8 @@ // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api' -<<<<<<< HEAD -// export const VUE_APP_API_URL = 'http://139.186.134.205:9006/api' export const VUE_APP_API_URL = 'http://192.168.0.112:8088/api' -// export const VUE_APP_API_URL = 'https://www.cyjyyjy.com:8096/api' -======= -// export const VUE_APP_API_URL = 'http://192.168.0.112:8088/api' -// export const VUE_APP_API_URL = 'http://192.168.0.114:8088/api' -export const VUE_APP_API_URL = 'https://www.cyjyyjy.com/api' ->>>>>>> 1521d49cdb4b0c5490ac953afbe9910a0a287c45 +// export const VUE_APP_API_URL = 'http://192.168.0.111:8088/api' +// export const VUE_APP_API_URL = 'https://www.cyjyyjy.com/api' // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://thapi.xinxintuan.co/api' // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api'; diff --git a/manifest.json b/manifest.json index 0cf6bb7..4ff1717 100644 --- a/manifest.json +++ b/manifest.json @@ -147,14 +147,14 @@ "scope.userLocation" : { "desc" : "你的位置信息将用于小程序位置接口的效果展示" } - }, + }, "plugins" : { - // #ifdef MP-WEIXIN - "live-player-plugin": { - "version": "1.3.0", - "provider": "wx2b03c6e691cd7370" - } - } + // #ifdef MP-WEIXIN + "live-player-plugin": { + "version": "1.3.0", + "provider": "wx2b03c6e691cd7370" + } + } }, // #endif "mp-alipay" : { diff --git a/pages/course/detail.vue b/pages/course/detail.vue index 9e21c90..408f75c 100644 --- a/pages/course/detail.vue +++ b/pages/course/detail.vue @@ -262,7 +262,7 @@ console.log(this.detail.id) return { title: this.detail.courseName, - imageUrl:this.detail.imageArr[0], + imageUrl:this.detail.coverImg, path: '/pages/course/detail?id=' + this.detail.id, } }, @@ -381,7 +381,7 @@ let roomId = this.detail.roomId; let customParams = encodeURIComponent(JSON.stringify({ path: 'pages/index/index', pid: 1 })) wx.navigateTo({ - url: `plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=${roomId}&custom_params=${customParams}` + url: `plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=${roomId}&custom_params=${customParams}` }) } else{ this.sign() @@ -430,7 +430,7 @@ signType: 'MD5', package:orderInfo.packageValue, success: success => { - if(this.detail.courseType == 1){ //直播课程弹出引导下载小程序 + if(this.detail.courseType == 1){ //直播课程弹出引导下载app this.showSignUp = true this.getDetail() } else{ diff --git a/pages/home/index.vue b/pages/home/index.vue index 90e7f81..b467548 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -104,7 +104,7 @@ {{item.clockTimes}} - {{item.listName}} + {{item.listName}} {{setDate(item.listStartTime)}}开始 {{item.enterNum}}人已参与