学科选择调整

pages.json

@@ -15,7 +15,7 @@
 		{
 			"path": "pages/selectGradesTerms/index",
 			"style": {
-				"navigationBarTitleText": "选择年级和学期",
+				"navigationBarTitleText": "选择学科和年纪",
 				"navigationStyle": "custom"
 			}
 		},

pages/selectGradesTerms/index.vue

@@ -5,13 +5,13 @@
 			<text class="grades-title-desc">我们会根据您选择，为您匹配对应的学习内容</text>
 			<view class="grades-terms-title terms-title-img"></view>
 			<view class="grade-item-box">
-				<view v-for="item in nianji_list" :key="item.id" @click="handleSelectGrade(item)"
-					:class="['grade-item', {active: item.id == activeNianji}]">{{item.label}}</view>
+				<view v-for="item in xueke_list" :key="item.id" @click="handleSelectXueke(item)"
+					:class="['grade-item',{active: item.id == activeXueke}]">{{item.label}}</view>
 			</view>
 			<view class="grades-terms-title grades-title-img"></view>
 			<view class="grade-item-box">
-				<view v-for="item in xueqi_list" :key="item.id" @click="handleSelectTerm(item)"
-					:class="['grade-item',{active: item.id == activeXueqi}]">{{item.label}}</view>
+				<view v-for="item in nianji_list" :key="item.id" @click="handleSelectGrade(item)"
+					:class="['grade-item', {active: item.id == activeNianji}]">{{item.label}}</view>
 			</view>
 			<view class="grade-line"></view>
 			<button class="grade-confirm-btn" @click="handleConfirm"></button>
@@ -26,7 +26,7 @@
 	} from "vue";
 	import {
 		nianji_list,
-		xueqi_list
+		xueke_list
 	} from "@/utils/constant.js";
 	import {
 		onLoad
@@ -36,16 +36,16 @@
 
 		const data = reactive({
 			activeNianji: null, // 当前年级
-			activeXueqi: null, // 当前学期
+			activeXueke: null, // 当前学期
 		});
 
 		onLoad((options) => {
 			const {
 				nianji,
-				xueqi
+				xueke
 			} = options;
 			data.activeNianji = nianji;
-			data.activeXueqi = xueqi;
+			data.activeXueke = xueke;
 		});
 
 		// 选择 年级+学期
@@ -58,7 +58,7 @@
 				return;
 			}
 
-			if (!data.activeXueqi) {
+			if (!data.activeXueke) {
 				uni.showToast({
 					title: "请选择学期",
 					duration: 2000,
@@ -68,7 +68,7 @@
 
 			const options = {
 				nianji: data.activeNianji,
-				xueqi: data.activeXueqi,
+				xueke: data.activeXueke,
 			};
 
 			goDAOToStudy(options);
@@ -77,11 +77,11 @@
 		// 跳转 岛 学习
 		function goDAOToStudy({
 			nianji,
-			xueqi,
+			xueke,
 			text
 		}) {
 			uni.redirectTo({
-				url: `/pages/study/index?xueqi=${data.activeXueqi}&nianji=${data.activeNianji}&flag=selectGrades`
+				url: `/pages/study/index?xueke=${data.activeXueke}&nianji=${data.activeNianji}&flag=selectGrades`
 			})
 		}
 
@@ -95,7 +95,7 @@
 
 	const {
 		activeNianji,
-		activeXueqi,
+		activeXueke,
 		handleConfirm
 	} = useSelectGrade()
 
@@ -103,7 +103,7 @@
 		activeNianji.value = item.id;
 	}
 
-	function handleSelectTerm(item) {
-		activeXueqi.value = item.id;
+	function handleSelectXueke(item) {
+		activeXueke.value = item.id;
 	}
 </script>

utils/constant.js

@@ -24,14 +24,15 @@
 		id: 6
 	},
 ];
+
  
-export const xueqi_list = [{
-		label: '上册',
+export const xueke_list = [
+	{
+		label: "数学",
 		id: 1
 	},
 	{
-		label: '下册',
-		id: 2
+		label: "英语",
+		id:2
 	}
-]
- 
+]