diff --git a/config/index.js b/config/index.js index d972d01..1dccdb5 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://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' -======= -// export const VUE_APP_API_URL = 'http://139.186.134.205:9006/api' -export const VUE_APP_API_URL = 'http://192.168.0.110:8098/api' -// export const VUE_APP_API_URL = 'https://www.cyjyyjy.com:8096/api' ->>>>>>> 00824c5a0f2aa21e0580a759ffd2d820250d7841 // 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/pages.json b/pages.json index ec1c408..0393ece 100644 --- a/pages.json +++ b/pages.json @@ -74,7 +74,8 @@ { "path": "pages/course/detail", "style": { - "navigationBarTitleText": "课程详情" + "navigationBarTitleText": "课程详情", + "enablePullDownRefresh": true } }, { diff --git a/pages/course/detail.vue b/pages/course/detail.vue index 548d637..c7709d6 100644 --- a/pages/course/detail.vue +++ b/pages/course/detail.vue @@ -244,11 +244,11 @@ this.tabInitTop= res.top; } }).exec(); - if(this.$yroute.query.teacherId){ + if(this.$yroute.query.teacherId){ //服务老师分享链接 this.courseId = this.$yroute.query.courseId; this.validCode = this.$yroute.query.validCode; this.teacherId = this.$yroute.query.teacherId; - } else{ + } else{ //普通进入详情页 this.courseId = this.$yroute.query.id; } if(this.userInfo.uid){ @@ -272,6 +272,17 @@ }, mounted(){ + }, + onPullDownRefresh() { + this.getDetail() + }, + onShareAppMessage: function(res) { + console.log(this.detail.id) + return { + title: this.detail.courseName, + imageUrl:this.detail.imageArr[0], + path: '/pages/course/detail?id=' + this.detail.id, + } }, methods: { getPhoneNumber: function(e) { @@ -352,7 +363,8 @@ this.hour = Math.floor(this.times / (60 * 60)) - (this.day * 24); this.minute = Math.floor(this.times / 60) - (this.day * 24 * 60) - (this.hour * 60); this.second = Math.floor(this.times) - (this.day * 24 * 60 * 60) - (this.hour * 60 * 60) - (this.minute * 60); - console.log(this.times) + // console.log(this.times) + uni.stopPullDownRefresh() }) }, @@ -399,7 +411,9 @@ } else if(res.data.state == 1){ if(this.detail.courseType == 1){ //直播课程弹出引导下载小程序 this.showSignUp = true - this.getDetail() + setTimeout(()=>{ + this.getDetail() + },1500) } else{ uni.showToast({ title: '报名成功!' diff --git a/pages/home/index.vue b/pages/home/index.vue index a27aa72..253ee31 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -305,6 +305,7 @@ export default { that.$set(that, 'articleList', res.data.articleDtos) uni.hideLoading() that.setOpenShare() + uni.stopPullDownRefresh() console.log(res.data.courseDtos) }) }, diff --git a/pages/study/editDabang.vue b/pages/study/editDabang.vue index 031e2f0..99c3094 100644 --- a/pages/study/editDabang.vue +++ b/pages/study/editDabang.vue @@ -92,6 +92,7 @@ }, } } +