1

App.vue

@@ -1,4 +1,5 @@
 <script>
+	 import CustomTabBar from '@/components/custom-tabbar/custom-tabbar.vue';
 	export default {
 		// creat by wgy 0619  生命周期 钩子  
 		onLaunch: function() {

pages.json

@@ -48,29 +48,33 @@
 			}
 		}
 	],
-	"tabBar": {
-		"height": "90rpx",
-		"iconWidth": "134rpx",
-		"spacing": "0px",
-		"backgroundColor": "transparent",
-		"list": [{
-			"pagePath": "pages/study/index",
-			"iconPath": "static/images/tabbar/unselect/plan-sj.png",
-			"selectedIconPath": "static/images/tabbar/select/plan-sj.png"
-		}, {
-			"pagePath": "pages/study/index",
-			"iconPath": "static/images/tabbar/unselect/develop-sj.png",
-			"selectedIconPath": "static/images/tabbar/select/develop-sj.png"
-		}, {
-			"pagePath": "pages/study/index",
-			"iconPath": "static/images/tabbar/unselect/partner-sj.png",
-			"selectedIconPath": "static/images/tabbar/select/partner-sj.png"
-		}, {
-			"pagePath": "pages/my/index",
-			"iconPath": "static/images/tabbar/unselect/my-sj.png",
-			"selectedIconPath": "static/images/tabbar/select/my-sj.png"
-		}]
-	},
+	 "tabBar": {
+	    "custom": true,
+	    "list": []
+	  },
+	// "tabBar": {
+	// 	"height": "90rpx",
+	// 	"iconWidth": "134rpx",
+	// 	"spacing": "0px",
+	// 	"backgroundColor": "transparent",
+	// 	"list": [{
+	// 		"pagePath": "pages/study/index",
+	// 		"iconPath": "static/images/tabbar/unselect/plan-sj.png",
+	// 		"selectedIconPath": "static/images/tabbar/select/plan-sj.png"
+	// 	}, {
+	// 		"pagePath": "pages/study/index",
+	// 		"iconPath": "static/images/tabbar/unselect/develop-sj.png",
+	// 		"selectedIconPath": "static/images/tabbar/select/develop-sj.png"
+	// 	}, {
+	// 		"pagePath": "pages/study/index",
+	// 		"iconPath": "static/images/tabbar/unselect/partner-sj.png",
+	// 		"selectedIconPath": "static/images/tabbar/select/partner-sj.png"
+	// 	}, {
+	// 		"pagePath": "pages/my/index",
+	// 		"iconPath": "static/images/tabbar/unselect/my-sj.png",
+	// 		"selectedIconPath": "static/images/tabbar/select/my-sj.png"
+	// 	}]
+	// },
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "麦塔软件",

pages/login/login.vue

@@ -81,12 +81,11 @@
 				uni.setStorage({
 					key: 'Mta-Auth',
 					data: obj // 假设 this.userInputValue 是用户输入的数据
-				});
+				});
+				uni.navigateTo({
+				url: `/pages/study/index?gradeId=${obj.orgId}&termId=${obj.userId}&text='测试111'`
+				})
 			}
-	
-					uni.switchTab({
-					url: `/pages/study/index`
-					})
 		})
 
 		// uni.navigateTo({

pages/study/index.vue

@@ -26,7 +26,8 @@
 		<!-- 蛋 -->
 		<view class="ezy-popup">蛋</view>
 		
-		<catalogue ref="catalogueRef" :nianji="routeParams.nianji" :xueqi="routeParams.xueqi" @change-zhang="handleChangeZhang"></catalogue>
+		<catalogue ref="catalogueRef" :nianji="routeParams.nianji" :xueqi="routeParams.xueqi" @change-zhang="handleChangeZhang"></catalogue>
+		<CustomTabBar></CustomTabBar>
 	</view>
 </template>
 
@@ -41,7 +42,8 @@
 		onReady,
 		onShow,
 	} from '@dcloudio/uni-app';
-	import catalogue from "@/components/catalogue/catalogue.vue";
+	import catalogue from "@/components/catalogue/catalogue.vue";
+		import CustomTabBar from '@/components/custom-tabbar/custom-tabbar.vue';
 	import {
 		useStudyRouteParams
 	} from "@/utils/emitEvents.js"
@@ -54,6 +56,9 @@
 	// 来自单元测试的路由参数缓存
 	const routeParams = ref(null);
 
+	onLoad((options) => {
+		console.log(options)
+	})
 	onShow(() => {
 		console.log('show')
 		// 获取路由参数

pages/study/lookShipin.vue

@@ -83,7 +83,6 @@
 					id: "wgy-player-test",
 					"vid": 'b997f16cb9cb474cb93526cff77d8801',
 					"playauth": this.playAuth,
-					"encryptType": 1,
 					// "playConfig": {
 					// 	"EncryptType": 'AliyunVoDEncryption'
 					// },