Merge remote-tracking branch 'origin/2024鹅状元' into 2024鹅状元

components/questionJiexi/questionJiexi.vue

@@ -189,7 +189,13 @@
 									"align": "tr",
 									"x": 10,
 									"y": 12
-								}
+								},
+								{
+								          "name": "timeDisplay",
+								          "align": "tl",
+								          "x": 10,
+								          "y": 7
+								        }
 							]
 						}
 					],

pages/study/lookShipin.vue

@@ -96,7 +96,7 @@
 				this.zhangId = youkeData.zhangId
 				this.cardId = youkeData.cardId
 				this.shipinTitle = youkeData.jieName
-				this.progressMarkers = youkeData.jieList[0].jiedianList||[]
+				this.progressMarkers = youkeData.jieList[0].jiedianList || []
 				this.getLiveYk(); //获取播放凭证
 			} else {
 				this.init(options)
@@ -157,7 +157,8 @@
 					return false
 				} else {
 
-					let currentJieData = cacheManager.getCurrentJieData('zhangInfo', this.cacheCurrentZhangIndex, this.jieId)
+					let currentJieData = cacheManager.getCurrentJieData('zhangInfo', this.cacheCurrentZhangIndex, this
+						.jieId)
 					if (currentJieData.studyFlag == 1) {
 						// 学完一遍
 						this.courseClass = 'course-finish-dialog'
@@ -256,7 +257,7 @@
 			},
 			svipConfirm() {
 				uni.redirectTo({
-					url: '/pages/pay/svip?cardId='+cacheManager.get('auth').cardId
+					url: '/pages/pay/svip?cardId=' + cacheManager.get('auth').cardId
 				})
 			},
 			ykConfirm() {
@@ -405,6 +406,12 @@
 									"align": "tr",
 									"x": 10,
 									"y": 12
+								},
+								{
+									"name": "timeDisplay",
+									"align": "tl",
+									"x": 10,
+									"y": 7
 								}
 							]
 						}