소스 검색

fix:回放直播和资料填写返回

xuqiaoying 3 년 전
부모
커밋
33973decf9
4개의 변경된 파일12개의 추가작업 그리고 6개의 파일을 삭제
  1. 2 2
      common/request.js
  2. 4 2
      pages/webview/index.vue
  3. 2 2
      pages2/verify/input.vue
  4. 4 0
      pages3/live/detail.vue

+ 2 - 2
common/request.js

@@ -5,8 +5,8 @@ import api from './api.js'
 var num = 1
 //接口api   
 // export const BASE_URL = 'https://api.xyyxt.net'   //release
-// export const BASE_URL = 'https://test.xyyxt.net'   //预发布
-export const BASE_URL = 'http://120.79.166.78:19012' // 测试环境
+export const BASE_URL = 'https://test.xyyxt.net'   //预发布
+// export const BASE_URL = 'http://120.79.166.78:19012' // 测试环境
 // export const BASE_URL = 'http://42.192.164.187:19005'    //test(后端本地)
 // export const BASE_URL = 'http://192.168.1.222:5055'    //后端本地更新到222
 // export const BASE_URL = 'http://192.168.1.24:5055'    //后端本地

+ 4 - 2
pages/webview/index.vue

@@ -39,6 +39,7 @@ export default {
       checkStatus: 0, // 0没有权限,1有权限
       goodsStatus: 0, // 0未上架,1上架
       sectionType: 2, // 2直播
+      vid: '', // 回放id
     };
   },
   onShareAppMessage() {
@@ -50,7 +51,7 @@ export default {
     // buyCourse 是否购买课程:1是 0否
     let encode = encodeURIComponent(WEBVIEW_URL+'pages/live/index?token='+uni.getStorageSync('token')+'&userInfo='+JSON.stringify(this.userInfo)+'&channelId='
     +item.liveUrl+'&gradeId='+0+'&courseId='+item.courseId+'&goodsId='+item.goodsId+'&orderGoodsId='+item.orderGoodsId+'&sectionId='+sectionId+'&chapterId='
-    +chapterId+'&moduleId='+moduleId+'&buyCourse='+item.buyCourse+'&ident='+uuid+'&sectionType='+this.sectionType)
+    +chapterId+'&moduleId='+moduleId+'&buyCourse='+item.buyCourse+'&ident='+uuid+'&sectionType='+this.sectionType+'&vid='+this.vid)
 		return {
 			title: '直播',
 			path: `/pages/webview/index?url=` + encode
@@ -112,6 +113,7 @@ export default {
           this.goodsId = item.goodsId
           this.goodsStatus = item.goodsStatus
           this.sectionType = item.sectionType
+          this.vid = item.recordingUrl || ''
           if (item.checkStatus == 1) { // 有权限
             let moduleId = item.moduleId || 0
             let chapterId = item.chapterId || 0
@@ -121,7 +123,7 @@ export default {
             // buyCourse 是否购买课程:1是 0否
             this.url = WEBVIEW_URL+'pages/live/index?token='+uni.getStorageSync('token')+'&userInfo='+JSON.stringify(this.userInfo)+'&channelId='
             +item.channelId+'&gradeId='+0+'&courseId='+item.courseId+'&goodsId='+item.goodsId+'&orderGoodsId='+item.orderGoodsId+'&sectionId='+sectionId
-            +'&chapterId='+chapterId+'&moduleId='+moduleId+'&buyCourse='+item.buyCourse+'&ident='+uuid+'&sectionType='+ this.sectionType
+            +'&chapterId='+chapterId+'&moduleId='+moduleId+'&buyCourse='+item.buyCourse+'&ident='+uuid+'&sectionType='+ this.sectionType+'&vid='+this.vid
             console.log('url:', this.url)
             this.studyLog(item)
           } else {

+ 2 - 2
pages2/verify/input.vue

@@ -9,7 +9,7 @@
             >学习前请提交完整审核资料</text
           >
         </view>
-        <view style="color: #007aff" @click="backPage">稍后再填</view>
+        <view style="color: #007aff" @click="refuseAgreement">稍后再填</view>
       </view>
       <u-collapse
         v-show="remarkStatus"
@@ -1118,7 +1118,7 @@ export default {
                                       setTimeout(() => {
                                         console.log('延迟')
                                         uni.navigateBack();
-                                      }, 2000)
+                                      }, 1500)
                                       
                                     } else {
                                       this.$method.showToast(res.data.msg);

+ 4 - 0
pages3/live/detail.vue

@@ -1455,6 +1455,10 @@ export default {
     //正常播放视频
     async playVideo(item) {
       console.log(item);
+      if (item.sectionType == 3) { // 回放的不播放
+        console.log('回放的不播放')
+        return
+      }
       if (this.timer) {
         clearInterval(this.timer);
       }