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

pages.json

@@ -64,7 +64,11 @@
 			"style" :
 			{
 				"navigationBarTitleText" : "单元测试",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"app-plus": {
+					"softinputMode": "adjustResize",
+					"softinputNavBar": "none"
+				}
 			}
 		},
 		{

pages/game/components/goose.vue

@@ -2,7 +2,7 @@
 	<view>
 		<up-line-progress v-if="growthType!==3" :percentage="progress" :showText="false" activeColor="#54e1fe" class="game-progress-box"></up-line-progress>
 		<text v-if="growthType!==3" class="game-progress-text">成长值：{{progress}}%</text>
-		<image :src="imgUrl" class="goose-img-box"></image>
+    <image :src="imgUrl" class="goose-img-box" @click="handleTouch"></image>
 	</view>
 </template>
 
@@ -25,6 +25,10 @@
 		const active = gooseGrowthTypeList.find(item => item.id == props.growthType)
 		return active ? active.imgUrl: ''
 	})
+
+  function handleTouch() {
+    console.log('333')
+  }
 </script>
 
 <style>

pages/game/index.vue

@@ -30,6 +30,8 @@
 				<icon @click="handleClose" class="yxsm-close-btn"></icon>
 			</view>
 		</commonDialogVue>
+    <!--  导航  -->
+    <CustomTabBar :currentTabNumber="1"></CustomTabBar>
 	</view>
 </template>
 
@@ -39,6 +41,8 @@
 	import gooseVue from "./components/goose.vue";
 	import foodSelectVue from "./components/foodSelect.vue";
 	import commonDialogVue from "@/components/dialog/commonDialog.vue";
+  import CustomTabBar from '@/components/custom-tabbar/custom-tabbar.vue';
+
 	import { useGame } from "./useGame";
 	const {	credit,growth,growthType,progress,shiwuId ,handleWeishi } = useGame();
 	const yxsmContent = reactive([{