Merge branch 'master' of https://gitea.igandanyiyuan.com/gdxz/uniapp-app

# Conflicts:
#	App.vue
#	manifest.json

components/navBar/navbar.vue

@@ -1,12 +1,12 @@
 <template>
 	<!-- 顶部导航栏 -->
 	<uni-nav-bar
-		left-icon="left"
+		:left-icon="showLeft?left:''"
 		:title="title"
 		@clickLeft="goBack"
 		fixed
 		color="#8B2316"
-		height="140rpx"
+		height="180rpx"
 		:border="false"
 		backgroundColor="#eeeeee"
 	/>
@@ -16,6 +16,10 @@
 	import { ref } from 'vue';
 	import { onShow } from "@dcloudio/uni-app";
 	const props=defineProps({
+		showLeft:{
+			type:Boolean,
+			default:true
+		},
 		title:{
 			type:String,
 			default:''

components/tabBar/tabBar.vue

@@ -72,7 +72,7 @@
 			activeColor: '#007aff',
 			badge: 0,
 			showRedDot: false,
-			pagePath: '/pages/index/index'
+			pagePath: '/pages/index/index?from=push'
 		},
 		{
 			icon: classroom,