xuqiaoying пре 3 година
родитељ
комит
e26148aa99

+ 4 - 4
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,8 +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 = 'http://120.79.166.78:18001/' // 测试环境
+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/'  //预发布(弃用了)
 

+ 17 - 1
components/course/courseChapter.vue

@@ -145,13 +145,27 @@ export default {
   },
   onLoad() {},
   created() {},
+  watch: {
+    menuItem: {
+      handler(newV, oldV) {
+        console.log('监听---章---》', newV.courseId, oldV.courseId, this.menuItem)
+        if (this.needOpen && this.chapterOpen) {
+          // this.updateChapterOpen(false);
+          this.openChapter(this.menuItem);
+        }
+      },
+      deep: true,
+    },
+  },
   mounted() {
+    console.log('[[[[[[[[[[[[[[[[[[[[', this.needOpen, this.chapterOpen, this.menuItem.courseId)
     if (this.needOpen && this.chapterOpen) {
-      this.updateChapterOpen(false);
+      // this.updateChapterOpen(false);
       this.openChapter(this.menuItem);
     }
   },
   onPageShow() {
+    console.log('onPageShowonPageShow')
     if (this.isBuy) {
       this.refreshList({ isRebuild: this.isRebuild });
     }
@@ -594,6 +608,7 @@ export default {
         });
     },
     getBuySectionList(chapterId, courseId, moduleId) {
+      
       let self = this;
       this.$api
         .reSectionList({
@@ -626,6 +641,7 @@ export default {
               }
             });
             self.list = res.data.data;
+            console.log('=====================================', self.list)
           }
         });
     },

+ 5 - 0
components/course/courseModule.vue

@@ -85,6 +85,11 @@ export default {
 	onLoad() {},
 	created() {
 		
+	},
+	watch: {
+    	courseId(newV, oldV) {
+			console.log('监听---模块---》', newV, oldV)
+		}
 	},
 	mounted() {
 		if(this.needOpen && this.chapterOpen) {

+ 6 - 1
components/course/courseSection.vue

@@ -142,6 +142,11 @@ export default {
 	},
 	created() {
 		
+	},
+	watch: {
+		courseId(newV, oldV) {
+		console.log('监听---节---》', newV, oldV)
+		}
 	},
 	mounted() {
 		this.nowTime = Number(new  Date().getTime()/1000).toFixed(0)
@@ -150,7 +155,7 @@ export default {
 		console.log(this.playSectionId,'this.playSectionId')
 		console.log(this.isRebuild)
 		console.log(this.nextMenuItem,'nextMenuItem')
-		console.log(this.menuItem,'this.menuItem',this.menuItem.liveStartTime, this.nowTime)
+		console.log(this.menuItem,'this.menuItem=======>',this.menuItem.liveStartTime, this.nowTime)
 		let moduleId = this.menuItem.moduleId || 0;
 		let chapterId = this.menuItem.chapterId || 0;
 		let sectionId = this.menuItem.sectionId || this.menuItem.menuId;

+ 1 - 1
pages/learn/index.scss

@@ -169,7 +169,7 @@
 					color: #FF3B30;
 					font-size: 22rpx;
 					font-weight: 400;
-					color: #969696;
+					// color: #969696;
 					margin-bottom: 8rpx;
 				}
 			}

+ 2 - 2
pages/learn/index.vue

@@ -80,7 +80,7 @@
 						</view>
 
 						<!-- 状态 -->
-						<view v-if="item.goodsType == 1" class="all_status">
+						<view v-if="item.goodsType == 1" class="all_status"  @click="studyIn(item.goodsId,item.gradeId,item,index)">
 							<!-- 不在学习服务期 -->
 							<template v-if="item.serviceStartTime && (sysTime < item.serviceStartTime || sysTime > item.serviceEndTime)">
 								<view class="class-warm" v-if="item.gradeId != 0 && item.gradeStatus == 1">
@@ -1018,7 +1018,7 @@ export default {
 			this.appointTestShow = false
 		},
 		appointment(item, appoint) {
-			console.log('====', item.examApplyGoodsList)
+			console.log('====', item.examApplyGoodsList, this.userInfo)
 			this.appointItemIndex = item
 			if (item.examApplyGoodsList.length > 1) { // 多个考试预约				 
 				this.appointTestList = item.examApplyGoodsList

+ 12 - 0
pages2/appointment/index.vue

@@ -111,9 +111,21 @@ export default {
     this.goodsId = Number(option.goodsId);
     this.gradeId = Number(option.gradeId);
     this.orderGoodsId = Number(option.orderGoodsId) || "";
+    this.getAppoint()
     this.getInfo();
   },
   methods: {
+    getAppoint() {
+      this.$http({
+        url: '/user/subscribe/listSubscribe',
+        methods: 'get',
+        data: {
+          orderGoodsId: this.orderGoodsId
+        }
+      }).then((res) => {
+        console.log('-----', res)
+      })
+    },
     getInfo() {
       var data = {
         goodsId: this.goodsId,

+ 5 - 1
pages2/msg/detail.vue

@@ -88,6 +88,7 @@ export default {
 		},
 		//跳转页面
 		async jumpFuns(item,remindId) {
+			console.log('======items', item)
 			switch (remindId) {
 				case 1:
 				case 3:
@@ -290,7 +291,8 @@ export default {
 						if (res.data.code === 200) {
 							this.$navTo.togo('/pages2/appointment/index', {
 								goodsId: item.goodsId,
-								gradeId: item.gradeId
+								gradeId: item.gradeId,
+								orderGoodsId: this.orderGoodsId,
 							});
 						}
 					});
@@ -396,6 +398,7 @@ export default {
 			});
 		},
 		getInfo() {
+			// /app/informUser/' + data,
 			this.$api.getappinformUserId(this.id).then(res => {
 				if (res.data.code === 200) {
 					if (res.data.data.receiptStatus === 1 && (res.data.data.remindId === 2 || res.data.data.remindId === 4 || res.data.data.remindId === 24)) {
@@ -419,6 +422,7 @@ export default {
 					console.log('listDatalistData:', this.listData)
 					if(res.data.data.goodsId) {
 						if(res.data.data.gradeId) {
+							// /goods/'+ data,
 							this.$api.goodsDetail(res.data.data.goodsId).then(rs => {
 								this.goodsData = rs.data.data
 								if (

+ 1 - 0
pages3/live/detail.vue

@@ -93,6 +93,7 @@
               <image class="img" src="/pages3/static/imgs/toggle.png"></image>
               <view class="toggle_name">切换课程</view>
             </view>
+            <view v-if="courseTotal > 1" class="numbers">共{{ courseTotal }}门</view>
         </view>
         <!-- <u-row>
           <u-col span="10">

+ 6 - 1
pages3/polyv/css/detail.scss

@@ -24,7 +24,7 @@
     white-space: nowrap;
   }
   .one {
-    width: 540rpx;
+    width: 450rpx;
   }
   
   .notice_wrap {
@@ -62,6 +62,11 @@
       font-size: 24rpx;
     }
   }
+  .numbers {
+    color: #4B4B4B;
+    font-size: 24rpx;
+    margin-left: 8rpx;
+  }
 // 切换课程弹窗
 .popup_box {
     width: 100%;

+ 9 - 3
pages3/polyv/detail.vue

@@ -95,6 +95,7 @@
               <image class="img" src="/pages3/static/imgs/toggle.png" mode="widthFix"></image>
               <view class="toggle_name">切换课程</view>
             </view>
+            <view v-if="courseTotal > 1" class="numbers">共{{ courseTotal }}门</view>
         </view>
       </view>
       <u-line color="#D6D6DB" />
@@ -123,7 +124,7 @@
 						<view class="note">正在直播中</view>
 						<view class="title">{{livingItem.sectionName}}</view>
 					</view>
-          <view class="menuBox" v-for="(item, index) in menuList" :key="index">
+          <view class="menuBox onessss" v-for="(item, index) in menuList" :key="index">
             <!--模块 -->
             <view v-if="item.type == 1"
               ><courseModule
@@ -924,7 +925,9 @@ export default {
     },
     // 进入学习
     jump(item, index) {
-
+      console.log('item------>', item, item.goodsId, item.courseId, item.orderGoodsId)
+      this.courseId = item.courseId
+      // return
       if (index == 0) {
         if (item.rebuild === 0) {
           //未重修
@@ -1241,6 +1244,7 @@ export default {
                 this.menuList = [];
                 this.$nextTick(() => {
                   this.menuList = res.data.rows;
+                  console.log('nextTick==', this.menuList)
                 });
               }
             });
@@ -2668,6 +2672,8 @@ export default {
     },
     getMenuList() {
       let self = this;
+      console.log('-------------------------------------')
+      // /course/menuList 查询课程目录结构列表
       this.$api
         .reMenuList({ courseId: this.courseId, gradeId: this.gradeId,orderGoodsId: this.orderGoodsId, })
         .then((res) => {
@@ -2680,7 +2686,7 @@ export default {
               item.menuType = item.type;
             }
             self.menuList = res.data.rows;
-
+console.log('======menuList', this.menuList)
             for (let i = 0; i < res.data.rows.length; i++) {
               if (res.data.rows[i].type == 1) {
                 this.menuIndex = [i];