Merge branch 'main' of https://gogs.mtavip.com/wangguoyu/uniProject into main

pages/course/common/catalogue.vue

@@ -68,6 +68,7 @@
 		loadProgressFromCache();
 		findFirstUnfinished();
 	});
+	// 加载缓存进度
 	const loadProgressFromCache = () => {
 		props.options.zhangList.forEach(zhang => {
 			zhang.jieList.forEach(jie => {

pages/course/kechengInfo.vue

@@ -78,16 +78,12 @@
 	}
 
 	function getKejianInfo(data) {
-		console.log('data', data);
-		// currentVideo.value = {
-		// 	url: data.url || 'https://www.w3school.com.cn/example/html5/mov_bbb.mp4',
-		// 	kjId: data.kjId
-		// };	
+		console.log('data', data.url);
+		
 		currentVideo.value = {
-			url: 'https://www.w3school.com.cn/example/html5/mov_bbb.mp4',
+			url: data.url,
 			kjId: data.kjId
-		};
-
+		};	
 		setTimeout(() => {
 			if (!videoContext) {
 				videoContext = uni.createVideoContext(videoId.value, this);

unpackage/dist/cache/.vite/deps/_metadata.json

@@ -1,25 +1,25 @@
 {
-  "hash": "f126114c",
-  "configHash": "5539dff6",
-  "lockfileHash": "07bb1a63",
-  "browserHash": "9e4f8c39",
+  "hash": "dbe0ab36",
+  "configHash": "5978ec27",
+  "lockfileHash": "e3b0c442",
+  "browserHash": "3f38b205",
   "optimized": {
     "jsencrypt": {
       "src": "../../../../../node_modules/jsencrypt/lib/index.js",
       "file": "jsencrypt.js",
-      "fileHash": "86b9d963",
+      "fileHash": "509f5046",
       "needsInterop": false
     },
     "ts-md5/dist/md5": {
       "src": "../../../../../node_modules/ts-md5/dist/md5.js",
       "file": "ts-md5_dist_md5.js",
-      "fileHash": "cd24f8c2",
+      "fileHash": "52805b5f",
       "needsInterop": true
     },
     "crypto-js": {
       "src": "../../../../../node_modules/crypto-js/index.js",
       "file": "crypto-js.js",
-      "fileHash": "2f57b087",
+      "fileHash": "0b2d2147",
       "needsInterop": true
     }
   },