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

components/custom-tabbar/custom-tabbar.vue

@@ -42,7 +42,7 @@
 					{
 						iconPath: 'static/images/tabbar/unselect/xuexi-sj.png',
 						activePath: 'static/images/tabbar/select/xuexi-sj.png',
-						path: `/pages/zhuanti/index`
+						path: `/pages/chanpinneirong/index`
 					},
 					{
 						iconPath: 'static/images/tabbar/unselect/faxian-sj.png',
@@ -52,7 +52,7 @@
 					{
 						iconPath: 'static/images/tabbar/unselect/wode-sj.png',
 						activePath: 'static/images/tabbar/select/wode-sj.png',
-						path: `/pages/chanpinMy/my`
+						path: `/pages/my/index`
 					},
 				],
 				currentTab: 0,
@@ -100,7 +100,7 @@
 						this.$refs.youkeDialogRef.handleShow();
 						return;
 					}
-					uni.redirectTo({
+					uni.navigateTo({
 						url: path + '?levelId=' + this.levelId + '&typeId=' + this.typeId + '&subjectId=' +
 							this.subjectId + '&tipFlag=' + this.tipFlag
 					});

pages/chanpinneirong/index.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="container">
+		<view @click="aaaa">asdfasdfdasfads</view>
 		<view class="icon-title-navBar-box">
 			<view class="nav-bar-icon" @click="handleBack"></view>
 			<view class="nav-bar-title">学习</view>
@@ -50,8 +51,8 @@
 		<view v-if="currentUnitName" class="current-unit-tip">
 			<text>{{ currentUnitName }}</text>
 		</view>
-<!-- 	
-		<CustomTabBar :currentTabNumber="0"></CustomTabBar> -->
+	
+		<CustomTabBar :currentTabNumber="0"></CustomTabBar>
 		
 	</view>
 </template>
@@ -90,9 +91,9 @@
 		},
 		mounted() {
 			//初始化加载数据
-			// this.$nextTick(() => {
-			// 	this.$refs.paging.reload()
-			// })
+			this.$nextTick(() => {
+			//	this.$refs.paging.reload()
+			})
 		},
 
 		methods: {