Переглянути джерело

视频课程点击学习时去掉所有课程页面,直接进入课程学习页面

xuqiaoying 3 роки тому
батько
коміт
6faaee039f

+ 4 - 3
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'    //后端本地
@@ -18,7 +18,8 @@ export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/'  //test
 
 // web_view的
 // export const WEBVIEW_URL = 'https://m.xyyxt.net/'  //release
-export const WEBVIEW_URL = 'https://testm.xyyxt.net/'  //预发布
+// export const WEBVIEW_URL = 'https://testm.xyyxt.net/'  //预发布
+export const WEBVIEW_URL = 'http://120.79.166.78:18001/' // 测试环境
 // export const WEBVIEW_URL = 'http://192.168.1.38:8082/'  //test
 // export const WEBVIEW_URL = 'http://api.xyyxt.net:6066/'  //预发布(弃用了)
 

+ 10 - 4
pages/learn/index.vue

@@ -628,8 +628,11 @@ export default {
 			}).then(res => {
 				if (res.data.code == 200) {
 					if(res.data.total > 1) {
+						// uni.navigateTo({
+						// 	url:'/pages5/liveDetail/course?orderGoodsId='+item.orderGoodsId+'&goodsId='+item.goodsId+'&gradeId=0'
+						// })
 						uni.navigateTo({
-							url:'/pages5/liveDetail/course?orderGoodsId='+item.orderGoodsId+'&goodsId='+item.goodsId+'&gradeId=0'
+							url:'/pages3/live/detail?orderGoodsId='+item.orderGoodsId+'&goodsId='+item.goodsId+'&gradeId=0&courseId=""'
 						})
 					} else if(res.data.total == 1) {
 						uni.navigateTo({
@@ -763,7 +766,7 @@ export default {
 								method: 'get',
 								data: {
 									pageNum: 1,
-									pageSize: 1,
+									pageSize: 100,
 									goodsId: item.goodsId,
 									gradeId: item.gradeId,
 									orderGoodsId: item.orderGoodsId,
@@ -774,10 +777,13 @@ export default {
 								if (res.data.code == 200) {
 
 									if(res.data.total > 1) {
-										this.$navTo.togo(`/pages2/wd/course?id=${v}&gid=${i}&orderGoodsId=${item.orderGoodsId}`);
+										// this.$navTo.togo(`/pages2/wd/course?id=${v}&gid=${i}&orderGoodsId=${item.orderGoodsId}`);
+										uni.navigateTo({
+											url: `/pages3/polyv/detail?id=''&goodsId=${item.goodsId}&orderGoodsId=${item.orderGoodsId}&gradeId=${item.gradeId}`
+										})
 									} else if(res.data.total == 1) {
 										uni.navigateTo({
-											url: `/pages3/polyv/detail?id=${res.data.rows[0].courseId}&goodsId=${item.goodsId}&orderGoodsId=${item.orderGoodsId}`
+											url: `/pages3/polyv/detail?id=${res.data.rows[0].courseId}&goodsId=${item.goodsId}&orderGoodsId=${item.orderGoodsId}&gradeId=${item.gradeId}`
 										})
 									} else {
 										uni.showToast({

+ 3 - 0
pages/webview/index.vue

@@ -28,6 +28,7 @@ export default {
     };
   },
   onLoad(option) {
+    console.log('--option-', option)
     this.options = option
   },
   onShow() {
@@ -45,12 +46,14 @@ export default {
       this.getParam()
     } else {
       this.url = decodeURIComponent(this.options.url);
+      console.log('小程序进来的url:', this.url)
       let index = this.options.url.indexOf('?')
       let paramArr = this.options.url.slice(index + 1).split('&')
       let paramObj = {}
       for (let i = 0; i < paramArr.length; i++) {
           paramObj[paramArr[i].split('=')[0]] = paramArr[i].split('=')[1]
       }
+      console.log('paramObj', paramObj)
       this.studyLog(paramObj)
     }
   },

+ 12 - 9
pages2/learn/details.vue

@@ -133,15 +133,18 @@ export default {
         })
         .then((res) => {
           if (res.data.code === 200) {
-            uni.redirectTo({
-              url:
-                "/pages2/wd/course?gid=" +
-                self.gradeId +
-                "&id=" +
-                self.goodsId +
-                "&orderGoodsId=" +
-                self.orderGoodsId,
-            });
+            // uni.redirectTo({
+            //   url:
+            //     "/pages2/wd/course?gid=" +
+            //     self.gradeId +
+            //     "&id=" +
+            //     self.goodsId +
+            //     "&orderGoodsId=" +
+            //     self.orderGoodsId,
+            // });
+            uni.navigateTo({
+              url: `/pages3/polyv/detail?id=''&goodsId=${this.goodsId}&orderGoodsId=${this.orderGoodsId}&gradeId=${this.gradeId}`
+            })
           }
         });
       // uni.showModal({

+ 12 - 4
pages2/msg/detail.vue

@@ -207,10 +207,13 @@ export default {
 								if (res.data.code == 200) {
 
 									if(res.data.total > 1) {
-										this.$navTo.togo(`/pages2/wd/course?id=${item.goodsId}&gid=${item.gradeId}&orderGoodsId=${this.orderGoodsId}`);
+										// this.$navTo.togo(`/pages2/wd/course?id=${item.goodsId}&gid=${item.gradeId}&orderGoodsId=${this.orderGoodsId}`);
+										uni.navigateTo({
+											url: `/pages3/polyv/detail?id=''&goodsId=${item.goodsId}&orderGoodsId=${item.orderGoodsId}&gradeId=${item.gradeId}`
+										})
 									} else if(res.data.total == 1) {
 										uni.navigateTo({
-											url: `/pages3/polyv/detail?id=${res.data.rows[0].courseId}&goodsId=${item.goodsId}&orderGoodsId=${this.orderGoodsId}`
+											url: `/pages3/polyv/detail?id=${res.data.rows[0].courseId}&goodsId=${item.goodsId}&orderGoodsId=${this.orderGoodsId}&gradeId=${item.gradeId}`
 										})
 									} else {
 										uni.showToast({
@@ -311,8 +314,11 @@ export default {
 			}).then(res => {
 				if (res.data.code == 200) {
 					if(res.data.total > 1) {
+						// uni.navigateTo({
+						// 	url:'/pages5/liveDetail/course?orderGoodsId='+this.orderGoodsId+'&goodsId='+item.goodsId+'&gradeId=0'
+						// })
 						uni.navigateTo({
-							url:'/pages5/liveDetail/course?orderGoodsId='+this.orderGoodsId+'&goodsId='+item.goodsId+'&gradeId=0'
+							url:'/pages3/live/detail?orderGoodsId='+this.orderGoodsId+'&goodsId='+item.goodsId+'&gradeId=0&courseId=""'
 						})
 					} else if(res.data.total == 1) {
 						uni.navigateTo({
@@ -353,7 +359,9 @@ export default {
 				sectionId: item.sectionId,
 				recordingUrl: item.recordingUrl,
 				moduleId:item.moduleId || 0,
-				chapterId:item.chapterId || 0
+				chapterId:item.chapterId || 0,
+				orderGoodsId: this.orderGoodsId,
+				gradeId: item.gradeId,
 			});
 		},
 		//跳转题库题目

+ 8 - 5
pages2/plan/index.vue

@@ -699,17 +699,20 @@ export default {
 				}).then(res => {
 					if(res.data.code == 200) {
 						uni.navigateTo({
-							url:`/pages3/polyv/detail?id=${res.data.rows[0].courseId}&goodsId=${item.goodsId}`
+							url:`/pages3/polyv/detail?id=${res.data.rows[0].courseId}&goodsId=${item.goodsId}&gradeId=${item.gradeId}`
 						})
 					}
 				});
 				return;
 			}
 			
-			this.$navTo.togo('/pages2/wd/course', {
-				id: item.goodsId,
-				gid:item.gradeId
-			});
+			// this.$navTo.togo('/pages2/wd/course', {
+			// 	id: item.goodsId,
+			// 	gid:item.gradeId
+			// });
+			uni.navigateTo({
+				url: `/pages3/polyv/detail?id=''&goodsId=${item.goodsId}&gradeId=${item.gradeId}`
+			})
 			return;
 		},
 		/**

+ 0 - 1
pages2/wd/course.vue

@@ -91,7 +91,6 @@ export default {
     this.$store.getters.dictObj;
   },
   onShow(option) {
-    console.log('onshow的', option, this.options)
     if (this.itemIndex !== "") {
       this.refreshByIndex();
     }

+ 9 - 3
pages3/course/detail.vue

@@ -518,10 +518,13 @@ export default {
 						.then(res => {
 							if (res.data.code == 200) {
 								if(res.data.total > 1) {
-									this.$navTo.togo(`/pages2/wd/course?id=${item.goodsId}&gid=${item.gradeId}&orderGoodsId=${item.orderGoodsId}`);
+									// this.$navTo.togo(`/pages2/wd/course?id=${item.goodsId}&gid=${item.gradeId}&orderGoodsId=${item.orderGoodsId}`);
+									uni.navigateTo({
+										url: `/pages3/polyv/detail?id=''&goodsId=${item.goodsId}&orderGoodsId=${item.orderGoodsId}&gradeId=${item.gradeId}`
+									})
 								} else if(res.data.total == 1) {
 									uni.navigateTo({
-										url: `/pages3/polyv/detail?id=${res.data.rows[0].courseId}&goodsId=${item.goodsId}&orderGoodsId=${item.orderGoodsId}`
+										url: `/pages3/polyv/detail?id=${res.data.rows[0].courseId}&goodsId=${item.goodsId}&orderGoodsId=${item.orderGoodsId}&gradeId=${item.gradeId}`
 									})
 								} else {
 									uni.showToast({
@@ -545,8 +548,11 @@ export default {
 			}).then(res => {
 				if (res.data.code == 200) {
 					if(res.data.total > 1) {
+						// uni.navigateTo({
+						// 	url:'/pages5/liveDetail/course?orderGoodsId='+item.orderGoodsId+'&goodsId='+item.goodsId+'&gradeId=0'
+						// })
 						uni.navigateTo({
-							url:'/pages5/liveDetail/course?orderGoodsId='+item.orderGoodsId+'&goodsId='+item.goodsId+'&gradeId=0'
+							url:'/pages3/live/detail?orderGoodsId='+item.orderGoodsId+'&goodsId='+item.goodsId+'&gradeId=0&courseId=""'
 						})
 					} else if(res.data.total == 1) {
 						uni.navigateTo({

+ 216 - 84
pages3/live/detail.vue

@@ -84,7 +84,17 @@
         </view>
       </view>
       <view class="course_name">
-        <u-row>
+        <view class="course_titles">
+            <view class="video_t1" :class="{'one': !goodsData.buyNote}">{{ detail.courseName }}</view>
+            <view class="notice_wrap" v-if="goodsData.buyNote">
+              <view class="video_t1_t" @click="studyNotice"> 学员须知 </view>
+            </view>
+            <view v-if="courseTotal > 1" class="toggle_course" @click="changeCourses()">
+              <image class="img" src="/pages3/static/imgs/toggle.png"></image>
+              <view class="toggle_name">切换课程</view>
+            </view>
+        </view>
+        <!-- <u-row>
           <u-col span="10">
             <view class="video_t1">{{ detail.courseName }}</view>
           </u-col>
@@ -93,7 +103,7 @@
               <view class="video_t1_t" @click="studyNotice"> 学员须知 </view>
             </div>
           </u-col>
-        </u-row>
+        </u-row> -->
       </view>
       <u-line color="#D6D6DB" />
       <view>
@@ -540,7 +550,37 @@
       </div>
     </u-popup>
 		
-		
+		<!-- 切换课程弹窗 -->
+    <u-popup v-model="toggleCourseShow" mode="bottom" border-radius="40" :mask-close-able='false'>
+			<view class="popup_box">
+				<view class="check_head">
+            <view class="headers">
+              <view class="grade">切换课程</view>
+					    <u-icon name="close" color="#9C9C9C" size="40" @click="closePop()"></u-icon>
+            </view>
+            <view class="coruse_num">共{{ courseTotal }}门</view>
+				</view>
+				<view class="check_con">
+					<scroll-view scroll-y="true" style="height: 700rpx;">
+						<view class="course_items"  v-for="(item, index) in courseList" :key="index">
+                <view class="course_lefts">
+                  <view class="course_title">{{ item.courseName }}</view>
+                  <!-- <view class="course_pros">
+                    学习进度
+                    <text> {{ item.stuAllNum + item.recordNum }}/{{ item.secAllNum + item.examNum}}</text>
+                  </view> -->
+                </view>
+                <view class="course_rights" @click="jump(item, index)">
+                  <view class="cicles">
+                    <u-icon name="arrow-right" color="#498AFE" size="20"></u-icon>
+                  </view>
+                  <view class="intoStudy">进入学习</view>
+                </view>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</u-popup>
   </view>
 </template>
 
@@ -673,48 +713,39 @@ export default {
 			historyChatMsgList:[],
 			livingItem:'',
       bottomHeight: 0,
+      toggleCourseShow: false, // 切换课程弹窗
+      informId: '', //消息id,从公众号消息模板进来的才有
+      courseList: [], // 课程列表
+      courseTotal: 0,
+      options: {},
     };
   },
   computed: {
     ...mapGetters(["userInfo", "playSectionId", "playChannelId", "playVID"]),
   },
   onLoad(option) {
-    this.courseId = Number(option.courseId);
+    console.log('====option', option)
+    this.options = option
+    this.courseId = option.courseId || ''
     this.goodsId = Number(option.goodsId);
 		// this.gradeId = option.gradeId || 0
     this.orderGoodsId = Number(option.orderGoodsId) || '';
-		this.updateLiveLast(null)
-    this.courseDetail();
-    this.getGoodsDetail();
-    this.getAnswerList();
-		this.studyRecordMenuAllList();
-    this.answerTimer = setInterval(() => {
-      this.getAnswerList();
-    }, 5000);
-    let noteSecond = Number(option.noteSecond);
-    if (noteSecond > 0) {
-      //我的消息跳过来,播放节
-      let item = {
-        sectionId: Number(option.sectionId),
-        recordingUrl: option.recordingUrl,
-        noteSecond: noteSecond,
-        studyDuration: noteSecond,
-      };
-      let playNextId = `moduleId${option.moduleId}chapterId${
-        option.chapterId
-      }sectionId${option.sectionId}${option.isRebuild ? "isRebuild" : ""}`;
-      this.$store.commit("setPlaySectionId", { playSectionId: item.sectionId });
-      this.$store.commit("setPlayVID", { playVID: item.recordingUrl });
-      this.$store.commit("updatePlayNextId", playNextId);
-      console.log("this.playNoteVideo");
-			
-			this.playNoteVideo(item)
-    } else {
-			this.studyRecordQueryLiveLast();
-		}
+
+    // 公众号模板消息的数据埋点
+    if (option.informId) { // 从公众号消息点击进来上报一次,其他地方进来和没登录需要跳到登录页,登录后返回的不需要上报
+      this.informId = option.informId
+      this.clickOfficial()
+    }
+    if (this.$method.isGoLogin()) { // 从公众号消息进来的没登录需要跳到登录页,登录后返回
+      return;
+    }
+    this.courseCourseList();
+    this.$store.getters.dictObj;
+
+
+		
   },
   onShow() {
-    var self = this;
     //相机授权
 		// this.userConfirmInfoDetail().then(res => {
 			
@@ -724,9 +755,6 @@ export default {
     
     console.log(this.gradeId, 7512);
   },
-	onHide() {
-		
-	},
   onUnload() {
     if (this.playSectionId > 0 && this.hasStart) {
       //退出提交记录
@@ -757,56 +785,159 @@ export default {
     // websocket.sendMsg("delAction");
   },
   mounted() {
-    uni.$on("changeSection", (oldSectionId) => {
-      console.log(this.playVID);
-				this.hasStart = false;
-      this.photoConfig = false;
-      this.photoIndex = 0;
-      var polyvPlayerContext = this.selectComponent("#playerVideo");
-      if (polyvPlayerContext) {
-        //解决同个节视频切换问题
-        polyvPlayerContext.seek(0);
-        polyvPlayerContext.pause();
-      }
-      //清除直播
-      this.$store.commit("setPlayChannelId", { playChannelId: 0 });
-      this.postStudyRecord(0, oldSectionId);
-    });
-    uni.$on("getSection", (item) => {
-      //清除直播
-				this.hasStart = false;
-      this.isPlayRebuild = item.rebuild;
-      this.photoConfig = false;
-      this.photoIndex = 0;
-      this.sectionItem = item;
-      this.$store.commit("setPlayChannelId", { playChannelId: 0 });
-      //获取拍照历史
-      this.getPhotoLastRecord();
-			this.polyvLiveHistoryChatMsgList();
-      this.playVideo(item);
-    });
-    uni.$on("levelId", (item) => {
-      let arr = item.split("-");
-      //点击节获取的各层级ID
-      this.moduleId = arr[0];
-      this.chapterId = arr[1];
-    });
-    uni.$on("getChannel", (item) => {
-      //清除录播
-				this.hasStart = false;
-      this.$store.commit("setPlayVID", { playVID: null });
-      this.getPhotoLastRecord();
-      this.playChannel(item);
-			this.channelItem = item;
-    });
-    uni.$on("isRebuild", (item) => {
-      console.log(item);
-      this.isRebuild = item;
-    });
-    this.updateChapterOpen(true);
+    
   },
   methods: {
     ...mapMutations(["updateChapterOpen","updateLiveLast"]),
+    // 新增微信公众号模板消息点击数据
+    clickOfficial() {
+      this.$http({
+        url: '/data/click',
+        method: 'post',
+        data: { informId: this.informId }
+      }).then((res) => {
+        if (res.data.code == 200) {
+          console.log('埋点')
+        }
+      })
+    },
+    courseCourseList() {
+      this.$api.courseCourseList({
+        pageNum: 1,
+        pageSize: 100,
+        goodsId: this.goodsId,
+        gradeId: this.gradeId,
+        orderGoodsId: this.orderGoodsId,
+      }).then((res) => {
+        if (res.data.code == 200) {
+          this.courseList.push.apply(this.courseList, res.data.rows)
+          this.courseTotal = res.data.total || 0
+          if(res.data.total > 1) {
+            this.getUserWatchLast()
+          } else if(res.data.total == 1) {
+            console.log('111->this.courseId', this.courseId)
+            this.originOnShow()
+            this.originOnMount()
+          }
+        }
+      });
+    },
+    // 查询用户最后一次看的录播的信息
+    getUserWatchLast() {
+      this.$http({
+        url: '/study/record/getUserWatchLast',
+        method: 'get',
+        data: {
+          goodsId: this.goodsId
+        }
+      }).then((res) => {
+        if (res.data.code == 200) {
+          console.log('res.data', res.data)
+          if (res.data.data && Object.keys(res.data.data).length) { //有最后一次看的录播的信息
+            this.courseId = res.data.data.courseId
+            this.originOnShow()
+            this.originOnMount()
+          } else {
+            this.toggleCourseShow = true
+          }
+          
+        }
+      })
+    },
+    originOnShow() {
+      this.updateLiveLast(null)
+      this.courseDetail();
+      this.getGoodsDetail();
+      this.getAnswerList();
+      this.studyRecordMenuAllList();
+      this.answerTimer = setInterval(() => {
+        this.getAnswerList();
+      }, 5000);
+      let option = this.options
+      let noteSecond = Number(option.noteSecond);
+      if (noteSecond > 0) {
+        //我的消息跳过来,播放节
+        let item = {
+          sectionId: Number(option.sectionId),
+          recordingUrl: option.recordingUrl,
+          noteSecond: noteSecond,
+          studyDuration: noteSecond,
+        };
+        let playNextId = `moduleId${option.moduleId}chapterId${
+          option.chapterId
+        }sectionId${option.sectionId}${option.isRebuild ? "isRebuild" : ""}`;
+        this.$store.commit("setPlaySectionId", { playSectionId: item.sectionId });
+        this.$store.commit("setPlayVID", { playVID: item.recordingUrl });
+        this.$store.commit("updatePlayNextId", playNextId);
+        console.log("this.playNoteVideo");
+        
+        this.playNoteVideo(item)
+      } else {
+        this.studyRecordQueryLiveLast();
+      }
+    },
+    originOnMount() {
+      uni.$on("changeSection", (oldSectionId) => {
+        console.log(this.playVID);
+				this.hasStart = false;
+        this.photoConfig = false;
+        this.photoIndex = 0;
+        var polyvPlayerContext = this.selectComponent("#playerVideo");
+        if (polyvPlayerContext) {
+          //解决同个节视频切换问题
+          polyvPlayerContext.seek(0);
+          polyvPlayerContext.pause();
+        }
+        //清除直播
+        this.$store.commit("setPlayChannelId", { playChannelId: 0 });
+        this.postStudyRecord(0, oldSectionId);
+      });
+      uni.$on("getSection", (item) => {
+        //清除直播
+          this.hasStart = false;
+        this.isPlayRebuild = item.rebuild;
+        this.photoConfig = false;
+        this.photoIndex = 0;
+        this.sectionItem = item;
+        this.$store.commit("setPlayChannelId", { playChannelId: 0 });
+        //获取拍照历史
+        this.getPhotoLastRecord();
+        this.polyvLiveHistoryChatMsgList();
+        this.playVideo(item);
+      });
+      uni.$on("levelId", (item) => {
+        let arr = item.split("-");
+        //点击节获取的各层级ID
+        this.moduleId = arr[0];
+        this.chapterId = arr[1];
+      });
+      uni.$on("getChannel", (item) => {
+        //清除录播
+          this.hasStart = false;
+        this.$store.commit("setPlayVID", { playVID: null });
+        this.getPhotoLastRecord();
+        this.playChannel(item);
+        this.channelItem = item;
+      });
+      uni.$on("isRebuild", (item) => {
+        console.log(item);
+        this.isRebuild = item;
+      });
+      this.updateChapterOpen(true);
+    },
+    changeCourses() {
+      this.toggleCourseShow = true
+    },
+    closePop() {
+      this.toggleCourseShow = false
+    },
+    // 进入学习
+    jump(item, index) {
+      this.courseId = item.courseId
+      this.toggleCourseShow = false
+      this.originOnShow()
+      this.originOnMount()
+    },
     clickLeft() {
       uni.navigateBack()
     },
@@ -2097,6 +2228,7 @@ export default {
 </script>
 
 <style lang="scss" scope>
+@import '../polyv/css/detail.scss';
 .top {
 	&__header {
 		position:relative;

+ 132 - 0
pages3/polyv/css/detail.scss

@@ -0,0 +1,132 @@
+// 课程标题,课程切换按钮
+.course_name {
+    width: 100%;
+    height: 80rpx;
+    background-color: #fff;
+  }
+  .course_titles {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    padding: 0rpx 20rpx;
+  }
+  .video_t1 {
+    width: 405rpx;
+    height: 80rpx;
+    color: #333333;
+    line-height: 80rpx;
+    font-size: 30rpx;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #333333;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .one {
+    width: 540rpx;
+  }
+  
+  .notice_wrap {
+    height: 80rpx;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    margin-right: 10rpx;
+    .video_t1_t {
+      width: 124rpx;
+      height: 40rpx;
+      line-height: 40rpx;
+      text-align: center;
+      background: rgba(245, 154, 35, 1);
+      color: #333;
+      border-radius: 10rpx;
+      font-size: 24rpx;
+    }
+  }
+  .toggle_course {
+    width: 156rpx;
+    height: 56rpx;
+    background: #F1F5F8;
+    border-radius: 28rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .img {
+      width: 32rpx;
+      height: 32rpx;
+      margin-right: 4rpx;
+    }
+    .toggle_name {
+      color: #4B4B4B;
+      font-size: 24rpx;
+    }
+  }
+// 切换课程弹窗
+.popup_box {
+    width: 100%;
+    height: 938rpx;
+    padding: 56rpx 56rpx 0rpx;
+    .check_head {
+      height: 140rpx;
+      border-bottom: 2rpx solid #F0F0F0;
+    }
+    .headers {
+      width: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      .grade {
+        font-size: 40rpx;
+        font-weight: bold;
+        color: #222222;
+      }
+    }
+    .coruse_num {
+      margin-top: 12rpx;
+      font-size: 28rpx;
+      color: #222222;
+    }
+    .course_items {
+      width: 100%;
+      padding: 24rpx 0rpx 20rpx;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      border-bottom: 2rpx solid #F0F0F0;
+      .course_lefts {
+        width: 510rpx;
+      }
+      .course_title {
+        font-size: 28rpx;
+        font-weight: 500;
+        color: #303030;
+      }
+      .course_pros {
+        font-size: 22rpx;
+        color: #969696;
+        margin-top: 16rpx;
+        >text {
+          color: #4B4B4B;
+        }
+      }
+      .course_rights {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        .cicles {
+          width: 32rpx;
+          height: 32rpx;
+          line-height: 26rpx;
+          text-align: center;
+          border-radius: 50%;
+          background-color: #D5E4FF;
+        }
+        .intoStudy {
+          font-size: 22rpx;
+          color: #498AFE;
+          margin-top: 16rpx;
+        }
+      }
+    }
+  }

+ 363 - 272
pages3/polyv/detail.vue

@@ -91,9 +91,9 @@
             <view class="notice_wrap" v-if="goodsData.buyNote">
               <view class="video_t1_t" @click="studyNotice"> 学员须知 </view>
             </view>
-            <view class="toggle_course" >
+            <view class="toggle_course" v-if="courseTotal > 1" @click="changeCourses()">
               <image class="img" src="/pages3/static/imgs/toggle.png" mode="widthFix"></image>
-              <view class="toggle_name" @click="studyNotice">切换课程</view>
+              <view class="toggle_name">切换课程</view>
             </view>
         </view>
       </view>
@@ -533,37 +533,34 @@
 		</u-modal>
 
     <!-- 切换课程弹窗 -->
-    <u-popup v-model="toggleCourseShow" mode="bottom" border-radius="40">
+    <u-popup v-model="toggleCourseShow" mode="bottom" border-radius="40" :mask-close-able='false'>
 			<view class="popup_box">
 				<view class="check_head">
             <view class="headers">
               <view class="grade">切换课程</view>
-					    <u-icon name="close" color="#9C9C9C" size="40" @click="closePop(0)"></u-icon>
+					    <u-icon name="close" color="#9C9C9C" size="40" @click="closePop()"></u-icon>
             </view>
-            <view class="coruse_num">共2门</view>
+            <view class="coruse_num">共{{ courseTotal }}门</view>
 				</view>
 				<view class="check_con">
 					<scroll-view scroll-y="true" style="height: 700rpx;">
-						<view class="course_items">
+						<view class="course_items"  v-for="(item, index) in courseList" :key="index">
                 <view class="course_lefts">
-                  <view class="course_title">标题标题</view>
+                  <view class="course_title">{{ item.courseName }}</view>
                   <view class="course_pros">
                     学习进度
-                    <text>0/2</text>
+                    <text> {{ item.stuAllNum + item.recordNum }}/{{ item.secAllNum + item.examNum}}</text>
                   </view>
                 </view>
-                <view class="course_rights">
+                <view class="course_rights" @click="jump(item, index)">
                   <view class="cicles">
-                    <u-icon name="arrow-right" color="#498AFE" size="20" @click="closePop(0)"></u-icon>
+                    <u-icon name="arrow-right" color="#498AFE" size="20"></u-icon>
                   </view>
                   <view class="intoStudy">进入学习</view>
                 </view>
 						</view>
 					</scroll-view>
 				</view>
-				<!-- // <view class="confrim-btn">
-				// 	<view class="okBtn" @click="okPopup(0)">确定</view>
-				// </view> -->
 			</view>
 		</u-popup>
 		 
@@ -687,88 +684,38 @@ export default {
       downLoading: false, //下载讲义加载
       muluStyle: false, //显示和隐藏目录样式
       bottomHeight: 0,
-      toggleCourseShow: true, // 切换课程弹窗
+      toggleCourseShow: false, // 切换课程弹窗
+      informId: '', //消息id,从公众号消息模板进来的才有
+      courseList: [], // 课程列表
+      courseTotal: 0,
     };
   },
   computed: {
     ...mapGetters(["userInfo", "playSectionId", "playChannelId", "playVID"]),
   },
   onLoad(option) {
-    this.courseId = Number(option.id);
+    console.log('onLoadonLoadonLoadonLoad')
+    this.courseId = Number(option.id) || '';
     this.goodsId = Number(option.goodsId);
     this.orderGoodsId = Number(option.orderGoodsId) || '';
+    this.gradeId = option.gradeId
 		this.isOther = option.isOther
 		this.option = option
-  //   this.courseDetail();
-  //   this.getGoodsDetail();
-  //   this.getAnswerList();
-		// this.studyRecordMenuAllList();
-  //   this.answerTimer = setInterval(() => {
-  //     this.getAnswerList();
-  //   }, 5000);
-  //   let noteSecond = Number(option.noteSecond);
-  //   if (noteSecond > 0) {
-  //     //我的消息跳过来,播放节
-  //     let item = {
-  //       sectionId: Number(option.sectionId),
-  //       recordingUrl: option.recordingUrl,
-  //       noteSecond: noteSecond,
-  //       studyDuration: noteSecond,
-  //     };
-  //     let playNextId = `moduleId${option.moduleId}chapterId${
-  //       option.chapterId
-  //     }sectionId${option.sectionId}${option.isRebuild ? "isRebuild" : ""}`;
-  //     this.$store.commit("setPlaySectionId", { playSectionId: item.sectionId });
-  //     this.$store.commit("setPlayVID", { playVID: item.recordingUrl });
-  //     this.$store.commit("updatePlayNextId", playNextId);
-  //     console.log("this.playNoteVideo");
-			
-		// 	this.playNoteVideo(item)
-  //   } else {
-		// 	this.studyRecordQueryLiveLast();
-		// }
-  },
-  onShow() {
-		if(this.isOther) {
-			this.showMark = true;
-			return;
-		}
-		this.getbaseprofiletplists().then(res => {
-			this.courseDetail();
-			this.getGoodsDetail();
-			this.getAnswerList();
-			this.studyRecordMenuAllList();
-			this.answerTimer = setInterval(() => {
-			  this.getAnswerList();
-			}, 5000);
-			let noteSecond = Number(this.option.noteSecond);
-      console.log('noteSecondnoteSecond:', noteSecond)
-			if (noteSecond > 0) {
-			  //我的消息跳过来,播放节
-			  let item = {
-			    sectionId: Number(this.option.sectionId),
-			    recordingUrl: this.option.recordingUrl,
-			    noteSecond: noteSecond,
-			    studyDuration: noteSecond,
-			  };
-			  let playNextId = `moduleId${this.option.moduleId}chapterId${
-			    this.option.chapterId
-			  }sectionId${this.option.sectionId}${this.option.isRebuild ? "isRebuild" : ""}`;
-			  this.$store.commit("setPlaySectionId", { playSectionId: item.sectionId });
-			  this.$store.commit("setPlayVID", { playVID: item.recordingUrl });
-			  this.$store.commit("updatePlayNextId", playNextId);
-				
-				this.playNoteVideo(item)
-			} else {
-				this.studyRecordQueryLiveLast();
-			}
-		});
-    this.current = uni.getStorageSync('current') || 0
-    
+
+    // 公众号模板消息的数据埋点
+    if (option.informId) { // 从公众号消息点击进来上报一次,其他地方进来和没登录需要跳到登录页,登录后返回的不需要上报
+      this.informId = option.informId
+      this.clickOfficial()
+    }
+    if (this.$method.isGoLogin()) { // 从公众号消息进来的没登录需要跳到登录页,登录后返回
+      return;
+    }
+    this.courseCourseList();
+    this.$store.getters.dictObj;
   },
-	onHide() {
-		
-	},
+  // onShow() {
+  //   console.log('onShowonShowonShowonShow')
+  // },
   onUnload() {
     if (this.playSectionId > 0 && this.hasStart) {
       //退出提交记录
@@ -800,56 +747,327 @@ export default {
     uni.removeStorageSync('current')
     // websocket.sendMsg("delAction");
   },
-  mounted() {
-    uni.$on("changeSection", (oldSectionId) => {
-      console.log(this.playVID);
-				this.hasStart = false;
-      this.photoConfig = false;
-      this.photoIndex = 0;
-      var polyvPlayerContext = this.selectComponent("#playerVideo");
-      if (polyvPlayerContext) {
-        //解决同个节视频切换问题
-        polyvPlayerContext.seek(0);
-        polyvPlayerContext.pause();
-      }
-      //清除直播
-      this.$store.commit("setPlayChannelId", { playChannelId: 0 });
-      this.postStudyRecord(0, oldSectionId);
-    });
-    uni.$on("getSection", (item) => {
-      //清除直播
-				this.hasStart = false;
-      this.isPlayRebuild = item.rebuild;
-      this.photoConfig = false;
-      this.photoIndex = 0;
-      this.sectionItem = item;
-      this.$store.commit("setPlayChannelId", { playChannelId: 0 });
-      //获取拍照历史
-      this.getPhotoLastRecord();
-      this.playVideo(item);
-    });
-    uni.$on("levelId", (item) => {
-      let arr = item.split("-");
-      //点击节获取的各层级ID
-      this.moduleId = arr[0];
-      this.chapterId = arr[1];
-    });
-    uni.$on("getChannel", (item) => {
-      //清除录播
-				this.hasStart = false;
-      this.$store.commit("setPlayVID", { playVID: null });
-      this.getPhotoLastRecord();
-      this.playChannel(item);
-			this.channelItem = item;
-    });
-    uni.$on("isRebuild", (item) => {
-      console.log(item);
-      this.isRebuild = item;
-    });
-    this.updateChapterOpen(true);
-  },
+  // mounted() {
+  //   console.log('mountedmountedmounted')
+  // },
   methods: {
     ...mapMutations(["updateChapterOpen","updateLiveLast"]),
+    // 新增微信公众号模板消息点击数据
+    clickOfficial() {
+      this.$http({
+        url: '/data/click',
+        method: 'post',
+        data: { informId: this.informId }
+      }).then((res) => {
+        if (res.data.code == 200) {
+          console.log('埋点')
+        }
+      })
+    },
+    courseCourseList() {
+      // /course/courseList查询商品下的课程列表
+      this.$api.courseCourseList({
+        pageNum: 1,
+        pageSize: 100,
+        goodsId: this.goodsId,
+        gradeId: this.gradeId,
+        orderGoodsId: this.orderGoodsId,
+      }).then((res) => {
+        if (res.data.code == 200) {
+          this.courseList.push.apply(this.courseList, res.data.rows)
+          this.courseTotal = res.data.total || 0
+          console.log("total", res.data.rows.length)
+          if (res.data.rows.length) {
+            this.courseBusiness(res.data.rows[0].businessId)
+          }
+          if(res.data.total > 1) {
+            this.getUserWatchLast()
+            // this.$navTo.togo(`/pages2/wd/course?id=${v}&gid=${i}&orderGoodsId=${item.orderGoodsId}`);
+          } else if(res.data.total == 1) {
+            console.log('111->this.courseId', this.courseId)
+            this.originOnShow()
+            this.originMounted()
+          }
+        }
+      });
+    },
+    /**
+     * 获取业务层次详情
+     */
+    courseBusiness(businessId) {
+      this.$api.courseBusiness(businessId).then((res) => {
+        this.businessData = res.data.data
+      });
+    },
+    // 查询用户最后一次看的录播的信息
+    getUserWatchLast() {
+      this.$http({
+        url: '/study/record/getUserWatchLast',
+        method: 'get',
+        data: {
+          goodsId: this.goodsId
+        }
+      }).then((res) => {
+        if (res.data.code == 200) {
+          console.log('res.data', res.data)
+          if (res.data.data && Object.keys(res.data.data).length) { //有最后一次看的录播的信息
+            this.courseId = res.data.data.courseId
+            this.originOnShow()
+            this.originMounted()
+          } else {
+            this.toggleCourseShow = true
+          }
+          
+        }
+      })
+    },
+    // 原来onshow里面的内容
+    originOnShow() {
+      console.log('originOnShow')
+      if(this.isOther) {
+        this.showMark = true;
+        return;
+      }
+      this.getbaseprofiletplists().then(res => {
+        this.courseDetail();
+        this.getGoodsDetail();
+        this.getAnswerList();
+        this.studyRecordMenuAllList();
+        this.answerTimer = setInterval(() => {
+          this.getAnswerList();
+        }, 5000);
+        let noteSecond = Number(this.option.noteSecond);
+        console.log('noteSecondnoteSecond:', noteSecond)
+        if (noteSecond > 0) {
+          //我的消息跳过来,播放节
+          let item = {
+            sectionId: Number(this.option.sectionId),
+            recordingUrl: this.option.recordingUrl,
+            noteSecond: noteSecond,
+            studyDuration: noteSecond,
+          };
+          let playNextId = `moduleId${this.option.moduleId}chapterId${
+            this.option.chapterId
+          }sectionId${this.option.sectionId}${this.option.isRebuild ? "isRebuild" : ""}`;
+          this.$store.commit("setPlaySectionId", { playSectionId: item.sectionId });
+          this.$store.commit("setPlayVID", { playVID: item.recordingUrl });
+          this.$store.commit("updatePlayNextId", playNextId);
+          
+          this.playNoteVideo(item)
+        } else {
+          this.studyRecordQueryLiveLast();
+        }
+      });
+      this.current = uni.getStorageSync('current') || 0
+    },
+    // 原来的mouted内容
+    originMounted() {
+      console.log('originMounted')
+      uni.$on("changeSection", (oldSectionId) => {
+        console.log(this.playVID);
+          this.hasStart = false;
+        this.photoConfig = false;
+        this.photoIndex = 0;
+        var polyvPlayerContext = this.selectComponent("#playerVideo");
+        if (polyvPlayerContext) {
+          //解决同个节视频切换问题
+          polyvPlayerContext.seek(0);
+          polyvPlayerContext.pause();
+        }
+        //清除直播
+        this.$store.commit("setPlayChannelId", { playChannelId: 0 });
+        this.postStudyRecord(0, oldSectionId);
+      });
+      uni.$on("getSection", (item) => {
+        //清除直播
+          this.hasStart = false;
+        this.isPlayRebuild = item.rebuild;
+        this.photoConfig = false;
+        this.photoIndex = 0;
+        this.sectionItem = item;
+        this.$store.commit("setPlayChannelId", { playChannelId: 0 });
+        //获取拍照历史
+        this.getPhotoLastRecord();
+        this.playVideo(item);
+      });
+      uni.$on("levelId", (item) => {
+        let arr = item.split("-");
+        //点击节获取的各层级ID
+        this.moduleId = arr[0];
+        this.chapterId = arr[1];
+      });
+      uni.$on("getChannel", (item) => {
+        //清除录播
+          this.hasStart = false;
+        this.$store.commit("setPlayVID", { playVID: null });
+        this.getPhotoLastRecord();
+        this.playChannel(item);
+        this.channelItem = item;
+      });
+      uni.$on("isRebuild", (item) => {
+        console.log(item);
+        this.isRebuild = item;
+      });
+      this.updateChapterOpen(true);
+    },
+    changeCourses() {
+      this.toggleCourseShow = true
+    },
+    closePop() {
+      this.toggleCourseShow = false
+    },
+    // 进入学习
+    jump(item, index) {
+
+      if (index == 0) {
+        if (item.rebuild === 0) {
+          //未重修
+          this.$navTo.togo("/pages2/learn/details", {
+            id: item.courseId,
+            gradeId: item.gradeId,
+            goodsId: this.goodsId,
+            orderGoodsId: this.orderGoodsId,
+          });
+          return;
+        }
+
+        this.$api.courseDetail(item.courseId).then((res) => {
+          if (res.data.code == 200) {
+            // if (res.data.data.educationName == "继续教育") {
+            this.$api
+              .lockLockStatus({
+                action: "jxjy",
+                uuid: this.$method.getUuid(),
+              })
+              .then((res) => {
+                if (res.data.code == 200) {
+                  //有其他端在操作,不能学习
+                  uni.showToast({
+                    icon: "none",
+                    title: res.data.msg,
+                    mask: true,
+                    duration: 3000,
+                  });
+                } else if (res.data.code == 500) {
+                  //可以学习
+                  // this.$navTo.togo("/pages3/polyv/detail", {
+                  //   id: item.courseId,
+                  //   goodsId: this.goodsId,
+                  //   orderGoodsId: this.orderGoodsId,
+                  // });
+                  this.courseId = item.courseId
+                  this.toggleCourseShow = false
+                  this.originOnShow()
+                  this.originMounted()
+                }
+              });
+
+          }
+        });
+      } else {
+        if (this.businessData.goodsLearningOrder == 2) {
+          //学习顺序是从头到尾学习,没学完上一课不能学习下一课
+          let prevItem = this.courseList[index - 1]; //上一课
+          if (
+            prevItem.stuAllNum + prevItem.recordNum ==
+            prevItem.secAllNum + prevItem.examNum
+          ) {
+            if (item.rebuild === 0) {
+              //未重修
+              this.$navTo.togo("/pages2/learn/details", {
+                id: item.courseId,
+                gradeId: item.gradeId,
+                goodsId: this.goodsId,
+                orderGoodsId: this.orderGoodsId,
+              });
+              return;
+            }
+
+            this.$api.courseDetail(item.courseId).then((res) => {
+              if (res.data.code == 200) {
+                // if (res.data.data.educationName == "继续教育") {
+                this.$api
+                  .lockLockStatus({
+                    action: "jxjy",
+                    uuid: this.$method.getUuid(),
+                  })
+                  .then((res) => {
+                    if (res.data.code == 200) {
+                      //有其他端在操作,不能学习
+                      uni.showToast({
+                        icon: "none",
+                        title: res.data.msg,
+                        duration: 2000,
+                      });
+                    } else if (res.data.code == 500) {
+                      //可以学习
+
+                      // this.$navTo.togo("/pages3/polyv/detail", {
+                      //   id: item.courseId,
+                      //   goodsId: this.goodsId,
+                      //   orderGoodsId: this.orderGoodsId,
+                      // });
+                      this.courseId = item.courseId
+                      this.toggleCourseShow = false
+                      this.originOnShow()
+                      this.originMounted()
+                    }
+                  });
+              }
+            });
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "请按顺序学完上一课再学习这一课",
+            });
+          }
+        } else {
+          if (item.rebuild === 0) {
+            //未重修
+            this.$navTo.togo("/pages2/learn/details", {
+              id: item.courseId,
+              gradeId: item.gradeId,
+              goodsId: this.goodsId,
+              orderGoodsId: this.orderGoodsId,
+            });
+            return;
+          }
+
+          this.$api.courseDetail(item.courseId).then((res) => {
+            if (res.data.code == 200) {
+              // if (res.data.data.educationName == "继续教育") {
+              this.$api
+                .lockLockStatus({
+                  action: "jxjy",
+                  uuid: this.$method.getUuid(),
+                })
+                .then((res) => {
+                  if (res.data.code == 200) {
+                    //有其他端在操作,不能学习
+                    uni.showToast({
+                      icon: "none",
+                      title: res.data.msg,
+                      duration: 2000,
+                    });
+                  } else if (res.data.code == 500) {
+                    //可以学习
+                    // this.$navTo.togo("/pages3/polyv/detail", {
+                    //   id: item.courseId,
+                    //   goodsId: this.goodsId,
+                    //   orderGoodsId: this.orderGoodsId,
+                    // });
+                    this.courseId = item.courseId
+                    this.toggleCourseShow = false
+                    this.originOnShow()
+                    this.originMounted()
+                  }
+                });
+
+            }
+          });
+        }
+      }
+    },
     clickLeft() {
       uni.navigateBack()
     },
@@ -1289,14 +1507,14 @@ export default {
 			
 		},
 		
-    /**
-     * 获取业务层次详情
-     */
-    courseBusiness() {
-      this.$api.courseBusiness(this.goodsData.businessId).then((res) => {
-        this.businessData = res.data.data;
-      });
-    },
+    // /**
+    //  * 获取业务层次详情
+    //  */
+    // courseBusiness() {
+    //   this.$api.courseBusiness(this.goodsData.businessId).then((res) => {
+    //     this.businessData = res.data.data;
+    //   });
+    // },
     /**
      * 计算tabs宽度
      */
@@ -1647,6 +1865,7 @@ export default {
       });
     },
     studyNotice() {
+      console.log('这里也点击了吗')
       this.noticeShow = true;
     },
     //播放笔记视频
@@ -2330,13 +2549,13 @@ export default {
     getGoodsDetail() {
       let self = this;
       this.$api.goodsDetail(this.goodsId).then((res) => {
-        self.goodsData = res.data.data;
+        this.goodsData = res.data.data;
 				if(self.goodsData.buyNote) {
 						this.baseHandoutTipList()
 				}
         self.gradeId = self.goodsData.gradeId;
         console.log(self.gradeId, "班级ID");
-        this.courseBusiness();
+        this.courseBusiness(this.goodsData.businessId);
         this.courseHandouts();
         self.getMenuList();
         self.getReMenuList(); //获取重修目录
@@ -2544,6 +2763,7 @@ export default {
 </script>
 
 <style lang="scss" scope>
+@import './css/detail.scss';
 	.top {
 		&__header {
 			position:relative;
@@ -3161,69 +3381,7 @@ page {
   font-weight: 500;
   color: #666666;
 }
-.course_name {
-  width: 100%;
-  height: 80rpx;
-  background-color: #fff;
-}
-.course_titles {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  padding: 0rpx 20rpx;
-}
-.video_t1 {
-  width: 405rpx;
-  height: 80rpx;
-  color: #333333;
-  line-height: 80rpx;
-  font-size: 30rpx;
-  font-family: PingFang SC;
-  font-weight: bold;
-  color: #333333;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.one {
-  width: 540rpx;
-}
 
-.notice_wrap {
-  height: 80rpx;
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  margin-right: 10rpx;
-  .video_t1_t {
-    width: 124rpx;
-    height: 40rpx;
-    line-height: 40rpx;
-    text-align: center;
-    background: rgba(245, 154, 35, 1);
-    color: #333;
-    border-radius: 10rpx;
-    font-size: 24rpx;
-  }
-}
-.toggle_course {
-  width: 156rpx;
-  height: 56rpx;
-  background: #F1F5F8;
-  border-radius: 28rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  .img {
-    width: 32rpx;
-    height: 32rpx;
-    margin-right: 4rpx;
-  }
-  .toggle_name {
-    color: #4B4B4B;
-    font-size: 24rpx;
-  }
-}
 .video_play {
   position: absolute;
   width: 95rpx;
@@ -3364,72 +3522,5 @@ page {
       border: 1rpx solid red;
     }
   }
-  // 切换课程弹窗
-  .popup_box {
-    width: 100%;
-    height: 938rpx;
-    padding: 56rpx 56rpx 0rpx;
-    .check_head {
-      height: 140rpx;
-      border-bottom: 2rpx solid #F0F0F0;
-    }
-    .headers {
-      width: 100%;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      .grade {
-        font-size: 40rpx;
-        font-weight: bold;
-        color: #222222;
-      }
-    }
-    .coruse_num {
-      margin-top: 12rpx;
-      font-size: 28rpx;
-      color: #222222;
-    }
-    .course_items {
-      width: 100%;
-      padding: 24rpx 0rpx 20rpx;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      border-bottom: 2rpx solid #F0F0F0;
-      .course_lefts {
-        width: 510rpx;
-      }
-      .course_title {
-        font-size: 28rpx;
-        font-weight: 500;
-        color: #303030;
-      }
-      .course_pros {
-        font-size: 22rpx;
-        color: #969696;
-        margin-top: 16rpx;
-        >text {
-          color: #4B4B4B;
-        }
-      }
-      .course_rights {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        .cicles {
-          width: 32rpx;
-          height: 32rpx;
-          line-height: 26rpx;
-          text-align: center;
-          border-radius: 50%;
-          background-color: #D5E4FF;
-        }
-        .intoStudy {
-          font-size: 22rpx;
-          color: #498AFE;
-          margin-top: 16rpx;
-        }
-      }
-    }
-  }
+  
 </style>

+ 4 - 1
pages5/liveDetail/list.vue

@@ -139,8 +139,11 @@ export default {
 			}).then(res => {
 				if (res.data.code == 200) {
 					if(res.data.total > 1) {
+						// uni.navigateTo({
+						// 	url:'/pages5/liveDetail/course?orderGoodsId='+item.orderGoodsId+'&goodsId='+item.goodsId+'&gradeId=0'
+						// })
 						uni.navigateTo({
-							url:'/pages5/liveDetail/course?orderGoodsId='+item.orderGoodsId+'&goodsId='+item.goodsId+'&gradeId=0'
+							url:'/pages3/live/detail?orderGoodsId='+item.orderGoodsId+'&goodsId='+item.goodsId+'&gradeId=0&courseId=""'
 						})
 					} else if(res.data.total == 1) {
 						uni.navigateTo({