1

api/learnPlan.js

@@ -11,9 +11,12 @@ export function userLocate(data = {}) {
   })
 }
 
-export function getCommonZhangFirstInfo(data = {}) {
+
+
+
+export function userZhangInfo(data = {}) {
   return request({
-    'url': '/common/zhang/firstInfo',
+    'url': '/app/user/zhang/info',
     headers: {
       isToken: true
     },
@@ -23,9 +26,9 @@ export function getCommonZhangFirstInfo(data = {}) {
   })
 }
 
-export function userZhangFirstInfo(data = {}) {
+export function getCommonZhangInfo(data = {}) {
   return request({
-    'url': '/app/user/zhang/firstInfo',
+    'url': '/common/zhang/info',
     headers: {
       isToken: true
     },
@@ -35,9 +38,9 @@ export function userZhangFirstInfo(data = {}) {
   })
 }
 
-export function userZhangInfo(data = {}) {
+export function userZhangForntInfo(data = {}) {
   return request({
-    'url': '/app/user/zhang/info',
+    'url': '/app/user/zhang/frontinfo',
     headers: {
       isToken: true
     },
@@ -47,9 +50,9 @@ export function userZhangInfo(data = {}) {
   })
 }
 
-export function getCommonZhangInfo(data = {}) {
+export function userZhangNextInfo(data = {}) {
   return request({
-    'url': '/common/zhang/firstInfo',
+    'url': '/app/user/zhang/nextinfo',
     headers: {
       isToken: true
     },

config.js

@@ -1,6 +1,6 @@
 // 应用全局配置
 export default   {
-  baseUrl: 'https://kf1.mtavip.com/api',
+  baseUrl: 'https://goosechampion.com/api',
   // baseUrl: 'http://localhost:8080',
   // 应用信息
   appInfo: {

pages/study/index.vue

@@ -1,49 +1,22 @@
 <template>
 	<view class="ezy-study-page">
-		<view class="study-school-year" @click="clickGradeTerm">{{gradeTerm}}</view>
-		<view class="ezy-study-wrap" @touchstart="onTouchStart" @touchend="onTouchEnd">
-			<view class="chapter-box" @click="handleCheckCatalogue">{{infoData.numberStr}}</view>
-			<view class="chapter-title-box">{{infoData.zhangName}}</view>
-			<view>
-				<view class="brand-item" v-for="(item, index) in infoData.jieList" :key="item.jieId"
-					@click="listClick(item, index)" :class="{ 'brand-active': index === 0 }">
-					<view class="brand-icon">
-						<template v-if="item.vipFlag">{{ index + 1 }}</template>
-						<template v-else-if="index === 0">1</template>
-					</view>
-					<view class="brand-lock" v-if="item.vipFlag==0 && index !== 0"></view>
-					<view class="brand-growth">
-						<template v-if="item.vipFlag ==1">
-							<template v-if="item.growth === 0">蛋</template>
-							<template v-else-if="item.growth === 10">小鹅</template>
-							<template v-else-if="item.growth === 20">中鹅</template>
-							<template v-else-if="item.growth === 50">大鹅</template>
-						</template>
-					</view>
-					<view class="brand-content">{{ item.jieName }}</view>
-				</view>
-			</view>
-		</view>
-		<!-- <uni-button  style="margin-top: 200px;display: block;" @click="goKaoshi">goKaoshi</uni-button>
-	 -->
-		<!-- <uni-button @click="handleCheckCatalogue">go catalogue</uni-button>
-		<uni-button @click="goKaoshi">goKaoshi</uni-button>
+		<shuxueZhangjie @clickGradeTerm="clickGradeTerm" @onLeft="onLeft" @onRight="onRight"
+			@handleCheckCatalogue="handleCheckCatalogue" :options="infoData">
+		</shuxueZhangjie>
 		<!-- 蛋 -->
 		<egg-dialog ref="eggDialogRef" @eggBtn="eggBtn"></egg-dialog>
-
-		<catalogue ref="catalogueRef" :nianji="routeParams.nianji" :xueke="routeParams.xueke"
+		<catalogue ref="catalogueRef" :nianji="selectZhang.nianji" :cardId="selectZhang.cardId"
 			@change-zhang="handleChangeZhang"></catalogue>
 		<CustomTabBar></CustomTabBar>
-
 	</view>
-</template>
 
+</template>
 <script setup>
 	import {
-		userZhangFirstInfo,
-		getCommonZhangFirstInfo,
 		userZhangInfo,
 		userLocate,
+		userZhangForntInfo,
+		userZhangNextInfo,
 		getCommonZhangInfo
 	} from "@/api/learnPlan.js"
 	import {
@@ -53,13 +26,11 @@
 		onMounted
 	} from "vue";
 	import {
-		onLoad,
+		onLoad
 	} from '@dcloudio/uni-app';
 	import catalogue from "@/components/catalogue/catalogue.vue";
 	import CustomTabBar from '@/components/custom-tabbar/custom-tabbar.vue';
-	import {
-		getAuth
-	} from '@/utils/auth.js';
+	import shuxueZhangjie from './product/shuxue.vue';
 	import {
 		useTabBarHistory
 	} from '@/utils/emitEvents.js';
@@ -68,232 +39,118 @@
 		toast
 	} from "../../utils/common";
 	import cacheManager from "../../utils/cacheManager.js";
-
 	const eggDialogRef = ref(null);
-
-	const catalogueRef = ref(null);
-	let gradeTerm = ref('');
-	let startX = ref(0);
-	let isSliding = ref(false);
-	let endX = ref(0);
 	const selectZhang = ref(null);
 	let infoData = reactive({
 		jieList: [],
 		haveFlag: '',
 		nianji: '',
 		number: '',
-		xueke: '',
+		cardId: '',
 		zhangId: '',
 		zhangName: '',
 		numberStr: '',
 	});
-	// 来自单元测试的路由参数缓存
-	const gradeMapping = {
-		1: '一年级',
-		2: '二年级',
-		3: '三年级',
-		4: '四年级',
-		5: '五年级',
-		6: '六年级'
-	};
-
-	const termMapping = {
-		1: '上',
-		2: '下'
-	};
-	const routeParams = ref(null);
-
-	onLoad((options) => {
-
-		//	 appContext.config.globalProperties.$state
-		// const state = appContext.config.globalProperties.$state;
-		console.log(options)
-		console.log(cacheManager);
+	onLoad(() => {
 		// 获取路由参数
-		routeParams.value = options;
+		selectZhang.value = cacheManager.get('auth');
 
-		if (getAuth()) {
+		console.log(selectZhang.value);
+		if (cacheManager.get('auth')) {
 			// 已登录
 			// 选择年级进入调用此接口
-			if (options.flag == 'selectGrades') {
-				getZhangFirst()
-			} else {
-				getZhangInfo()
-			}
-			// 设置全局变量
+			//options.flag == 'selectGrades'
+			getZhangInfo()
 
 			// 蛋
 			// eggDialogRef.value.eggShow();
-
 		} else {
-			if (options.flag == 'selectGrades') {
-				getCommonZhangFirst()
-			} else {
-				getCommonZhang();
-			}
-			// 未登录
+			// 未登录 游客
+			getCommonZhang()
+
 
 		}
 	})
 
-	function getCommonZhang(data) {
-		let req = data ? {
+	function getZhangInfo(data) {
+		let req = {
 			nianji: selectZhang.value.nianji,
-			xueke: selectZhang.value.xueke,
+			cardId: selectZhang.value.cardId,
 			zhangId: selectZhang.value.zhangId,
-		} : {
-			nianji: routeParams.value.nianji,
-			xueke: routeParams.value.xueke,
-			zhangId: routeParams.value.zhangId,
-		};
-		getCommonZhangInfo(req).then(res => {
+		}
+		userZhangInfo(req).then(res => {
 			infoData.jieList = res.data.jieList
 			infoData.haveFlag = res.data.haveFlag
 			infoData.nianji = res.data.nianji
 			infoData.number = res.data.number
 			infoData.numberStr = res.data.numberStr
-			infoData.xueke = res.data.xueke
+			infoData.cardId = res.data.cardId
 			infoData.zhangId = res.data.zhangId
 			infoData.zhangName = res.data.zhangName
 			gradeTerm.value = translateData(res.data);
-			useTabBarHistory().setTabBarStorage({
-				nianji: res.data.nianji,
-				zhangId: res.data.zhangId,
-				xueke: res.data.xueke
-			})
-			cacheManager.set("zhangJieCacheInfo", res.data)
-		})
-	}
-
-
-	function onTouchStart(event) {
-		console.log(event.touches.length);
-		isSliding.value = false
-		if (event.touches.length === 1) {
-			isSliding.value = true;
-			startX.value = event.touches[0].pageX;
-		} else {
-			isSliding.value = false;
-			event.preventDefault()
-			return
-		}
-	}
-	function onSwipeLeft(event) {
-		console.log('用户左滑了');
-	}
-	function onSwipeRight(event) {
-		console.log('用户又滑了');
-	}
-	function onTouchEnd(event) {
-		if (isSliding.value) {
-			const distanceX = event.changedTouches[0].clientX - startX.value
-			if (distanceX > 0) {
-				onSwipeLeft();
-			} else if (distanceX < 0) {
-				onSwipeRight();
-			}
-			isSliding.value = false
-		}else{
-			console.log(11111);
-		}
-	}
-
-
-
-	function recordZhangJie() {
-		let req = {
-			nianji: routeParams.value.nianji,
-			userId: JSON.parse(getAuth()).userId,
-			zhangId: infoData.zhangId,
-			xueke: routeParams.value.xueke,
-
-		}
-		userLocate(req).then(res => {
-
+			recordZhangJie()
+			cacheManager.set('zhangInfo', res.data)
+			// if (cacheManager.get('zhangInfo')) {
+			//     cacheManager.remove('zhangInfo')
+			//     cacheManager.set('zhangInfo', res.data)
+			// } else {
+			//     cacheManager.set('zhangInfo', res.data)
+			// }
 		})
 	}
 
-	function getCommonZhangFirst() {
+	function getCommonZhang(data) {
 		let req = {
-			nianji: routeParams.value.nianji,
-			xueke: routeParams.value.xueke,
-
+			nianji: selectZhang.value.nianji,
+			cardId: selectZhang.value.cardId,
+			zhangId: selectZhang.value.zhangId,
 		}
-		getCommonZhangFirstInfo(req).then(res => {
+		getCommonZhangInfo(req).then(res => {
 			infoData.jieList = res.data.jieList
 			infoData.haveFlag = res.data.haveFlag
 			infoData.nianji = res.data.nianji
 			infoData.number = res.data.number
 			infoData.numberStr = res.data.numberStr
-			infoData.xueke = res.data.xueke
+			infoData.cardId = res.data.cardId
 			infoData.zhangId = res.data.zhangId
 			infoData.zhangName = res.data.zhangName
 			gradeTerm.value = translateData(res.data);
 			useTabBarHistory().setTabBarStorage({
 				nianji: res.data.nianji,
 				zhangId: res.data.zhangId,
-				xueke: res.data.xueke
+				cardId: res.data.cardId
 			})
-			cacheManager.set("zhangJieCacheInfo", res.data)
 		})
 	}
 
-	function getZhangFirst() {
-		let req = {
-			nianji: routeParams.value.nianji,
-			xueke: routeParams.value.xueke,
 
-		}
-		userZhangFirstInfo(req).then(res => {
-			infoData.jieList = res.data.jieList
-			infoData.haveFlag = res.data.haveFlag
-			infoData.nianji = res.data.nianji
-			infoData.number = res.data.number
-			infoData.numberStr = res.data.numberStr
-			infoData.xueke = res.data.xueke
-			infoData.zhangId = res.data.zhangId
-			infoData.zhangName = res.data.zhangName
-			gradeTerm.value = translateData(res.data);
-			recordZhangJie()
-			useTabBarHistory().setTabBarStorage({
-				nianji: res.data.nianji,
-				zhangId: res.data.zhangId,
-				xueke: res.data.xueke
-			})
-		})
+
+	function onLeft(event) {
+		console.log('用户左滑了');
 	}
 
-	function getZhangInfo(data) {
-		let req = data ? {
-			nianji: selectZhang.value.nianji,
-			xueke: selectZhang.value.xueke,
-			zhangId: selectZhang.value.zhangId,
-		} : {
-			nianji: routeParams.value.nianji,
-			xueke: routeParams.value.xueke,
-			zhangId: routeParams.value.zhangId,
-		};
-		userZhangInfo(req).then(res => {
-			infoData.jieList = res.data.jieList
-			infoData.haveFlag = res.data.haveFlag
-			infoData.nianji = res.data.nianji
-			infoData.number = res.data.number
-			infoData.numberStr = res.data.numberStr
-			infoData.xueke = res.data.xueke
-			infoData.zhangId = res.data.zhangId
-			infoData.zhangName = res.data.zhangName
-			gradeTerm.value = translateData(res.data);
-			recordZhangJie()
-			useTabBarHistory().setTabBarStorage({
-				nianji: res.data.nianji,
-				zhangId: res.data.zhangId,
-				xueke: res.data.xueke
-			})
-		})
+	function onRight(event) {
+		console.log('用户又滑了');
+		// let req = {
+
+		// }
+		// userZhangNextInfo().then(res => {
+
+		// })
 	}
 
-	function translateData(data) {
-		return gradeMapping[data.nianji] + termMapping[data.xueke]
+
+	function recordZhangJie() {
+		let req = {
+			nianji: selectZhang.value.nianji,
+			userId: cacheManager.get('auth').userId,
+			zhangId: infoData.zhangId,
+			cardId: selectZhang.value.cardId,
+
+		}
+		userLocate(req).then(res => {
+
+		})
 	}
 
 	function handleChangeZhang(data) {
@@ -304,10 +161,10 @@
 
 	function goKaoshi(data) {
 		let zhangId = selectZhang.value ? selectZhang.value.zhangId : infoData.zhangId;
-		let nianji = routeParams.value.nianji;
-		let xueke = routeParams.value.xueke;
+		let nianji = selectZhang.value.nianji;
+		let cardId = selectZhang.value.cardId;
 		uni.navigateTo({
-			url: `/pages/unitTest/index?jieId=${data.jieId}&zhangId=${zhangId}&nianji=${nianji}&xueke=${xueke}`
+			url: `/pages/unitTest/index?jieId=${data.jieId}&zhangId=${zhangId}&nianji=${nianji}&cardId=${cardId}`
 		})
 	}
 
@@ -337,48 +194,7 @@
 		}]
 		data.zhangId = infoData.zhangId
 		data.nianji = infoData.nianji
-		data.xueke = infoData.xueke
-		const pageData = {
-			//	videoId:data.videoId,
-			videoId: 'b997f16cb9cb474cb93526cff77d8801',
-			progressMarkers: [{
-				offset: 30,
-				isCustomized: true,
-				coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/9A3F562E595E4764AD1DD546FA52C6E5-6-2.png',
-				title: 'test title',
-				describe: 'test string',
-			}, {
-				offset: 150,
-				isCustomized: true,
-				coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/1E7F402241CD4C0F94AD2BBB5CCC3EC7-6-2.png',
-				title: 'test title',
-				describe: 'test string',
-			}, {
-				offset: 250,
-				isCustomized: true,
-				coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/553AEA01161342C8A2B1756E83B69B5B-6-2.png',
-				title: 'test title',
-				describe: 'test string',
-			}, {
-				offset: 550,
-				isCustomized: true,
-				coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/553AEA01161342C8A2B1756E83B69B5B-6-2.png',
-				title: 'test title',
-				describe: 'test string',
-			}, {
-				offset: 320,
-				isCustomized: true,
-				coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/553AEA01161342C8A2B1756E83B69B5B-6-2.png',
-				title: 'test title',
-				describe: 'test string',
-			}, {
-				offset: 650,
-				isCustomized: true,
-				coverUrl: 'https://alivc-demo-vod.aliyuncs.com/image/cover/553AEA01161342C8A2B1756E83B69B5B-6-2.png',
-				title: 'test title',
-				describe: 'test string',
-			}],
-		}
+		data.cardId = infoData.cardId
 		uni.navigateTo({
 			//url: '/pages/study/lookShipin?studyData=' + JSON.stringify(pageData)
 			url: '/pages/study/lookShipin?studyData=' + JSON.stringify(data)
@@ -387,7 +203,7 @@
 
 
 	function listClick(data, index) {
-		if (!getAuth()) {
+		if (!cacheManager.get('auth')) {
 			toast("当前为游客模式请登录！")
 			uni.redirectTo({
 				url: '/pages/login/index'
@@ -397,8 +213,8 @@
 
 		// if(index !=0&&data.jieId!=79){
 
-		// 			toast("付费章节！")
-		// 			return false
+		//             toast("付费章节！")
+		//             return false
 		// }
 
 		if (!data.vipFlag) {
@@ -419,7 +235,7 @@
 
 	function clickGradeTerm() {
 		uni.navigateTo({
-			url: `/pages/selectGradesTerms/index?&nianji=${routeParams.value.nianji}&xueke=${routeParams.value.xueke}`,
+			url: `/pages/selectGradesTerms/index?&nianji=${selectZhang.value.nianji}&cardId=${selectZhang.value.cardId}`,
 		})
 	}
 
@@ -427,7 +243,5 @@
 		console.log('点击：开启提分之旅');
 	}
 </script>
-
 <style>
-
 </style>

pages/study/product/shuxue.vue

@@ -0,0 +1,124 @@
+<template>
+	<view>
+		<view class="study-school-year" @click="clickGradeTerm">{{gradeTerm}}</view>
+		<view class="ezy-study-wrap" @touchstart="onTouchStart" @touchend="onTouchEnd">
+			<view class="chapter-box" @click="handleCheckCatalogue">{{options.numberStr}}</view>
+			<view class="chapter-title-box">{{options.zhangName}}</view>
+			<view>
+				<view class="brand-item" v-for="(item, index) in options.jieList" :key="item.jieId"
+					@click="listClick(item, index)" :class="{ 'brand-active': index === 0 }">
+					<view class="brand-icon">
+						<template v-if="item.vipFlag">{{ index + 1 }}</template>
+						<template v-else-if="index === 0">1</template>
+					</view>
+					<view class="brand-lock" v-if="item.vipFlag==0 && index !== 0"></view>
+					<view class="brand-growth">
+						<template v-if="item.vipFlag ==1">
+							<template v-if="item.growth === 0">蛋</template>
+							<template v-else-if="item.growth === 10">小鹅</template>
+							<template v-else-if="item.growth === 20">中鹅</template>
+							<template v-else-if="item.growth === 50">大鹅</template>
+						</template>
+					</view>
+					<view class="brand-content">{{ item.jieName }}</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		reactive,
+		ref,
+		watch,
+		getCurrentInstance,
+		onMounted
+	} from "vue";
+	const $emit = defineEmits(['clickGradeTerm', 'onLeft', 'onRight', 'handleCheckCatalogue'])
+	const props = defineProps({
+		options: {
+			type: Object,
+		},
+	})
+	const gradeMapping = {
+		1: '一年级',
+		2: '二年级',
+		3: '三年级',
+		4: '四年级',
+		5: '五年级',
+		6: '六年级'
+	};
+
+	const termMapping = {
+		1: '数学',
+		2: '英语'
+	};
+	
+	let startX = ref(0);
+	let isSliding = ref(false);
+	let endX = ref(0);
+	let gradeTerm = ref('');
+
+	function clickGradeTerm() {
+
+	}
+
+	function translateData(data) {
+		return gradeMapping[data.nianji] + termMapping[data.cardId]
+	}
+
+	function handleCheckCatalogue() {
+
+	}
+
+	function onTouchStart(event) {
+		console.log(event.touches.length);
+		isSliding.value = false
+		if (event.touches.length === 1) {
+			isSliding.value = true;
+			startX.value = event.touches[0].pageX;
+		} else {
+			isSliding.value = false;
+			event.preventDefault()
+			return
+		}
+	}
+
+	function onSwipeLeft(event) {
+		console.log('11111');
+		$emit('onLeft');
+	}
+
+	function onSwipeRight(event) {
+		console.log('22222');
+		$emit('onRight');
+	}
+
+	function onTouchEnd(event) {
+		if (isSliding.value) {
+			const distanceX = event.changedTouches[0].clientX - startX.value
+			if (distanceX > 0) {
+				onSwipeLeft();
+			} else if (distanceX < 0) {
+				onSwipeRight();
+			}
+			isSliding.value = false
+		} else {
+			console.log('error');
+		}
+	}
+	watch(() => props.options, (newVal, oldVal) => {
+		console.log('New options:', newVal);
+		console.log('Old options:', oldVal);
+		// 在这里可以根据新的 options 做一些操作，比如发起请求等
+			gradeTerm.value = translateData(newVal);
+	}, {
+		deep: true,
+		immediate: true
+	});
+</script>
+
+<style>
+
+</style>