Merge branch '2024鹅状元' of https://gogs.mtavip.com/wangguoyu/uniProject into 2024鹅状元

components/catalogue/catalogue.vue

@@ -148,7 +148,7 @@
 			url: '/pages/login/index'
 		});
 	}
-
+	
 	/**
 	 * @summary 展示弹窗 暴露函数
 	 */
@@ -160,18 +160,19 @@
 			activeCollapse.value = '';
 			// 滚动高度
 			callback = () => {
+				console.log('uni.getTopWindowStyle()',uni.getSystemInfoSync().screenWidth)
 				if (cardId.value == 2) {
 					// 英语
 					activeCollapse.value = index+'';
-					scrollTop.value = 50 * index;
+					scrollTop.value = (uni.getSystemInfoSync().screenWidth/750)* 50 * index;
 				} else {
 					// 数学
 					if (index<shuxueShangxia.value) {
 						activeCollapse.value = index+'';
-						scrollTop.value = 50 * index + 50;
+						scrollTop.value = (uni.getSystemInfoSync().screenWidth/750)* 50 * index + (uni.getSystemInfoSync().screenWidth/750)* 50;
 					} else {
 						activeCollapse.value = index+'';
-						scrollTop.value = 50 * index + 100;
+						scrollTop.value =  (uni.getSystemInfoSync().screenWidth/750)* 50 * index +  (uni.getSystemInfoSync().screenWidth/750) * 50 * 2;
 					}
 				}
 			}