From 5f3d46a899c2b78a2277743c6c4adc0457997050 Mon Sep 17 00:00:00 2001
From: Teng <461587751@qq.com>
Date: Thu, 25 Dec 2025 09:50:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E4=B8=BB=E9=A1=B5=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/animationpage.vue     | 55 ++++++++++++++++++++++---------
 pages/watch/settings/leida.vue    |  2 +-
 pages/watch/settings/settings.vue | 28 ++++++++--------
 3 files changed, 54 insertions(+), 31 deletions(-)

diff --git a/pages/login/animationpage.vue b/pages/login/animationpage.vue
index a67067a..0fcd6ca 100644
--- a/pages/login/animationpage.vue
+++ b/pages/login/animationpage.vue
@@ -4,12 +4,12 @@
 		<view class="home">
 			<image class="all-home" src="/static/index/warehouse/newhome/backpage.jpg" mode="aspectFit"></image>
 		</view>
-		<view class="right-title">
+		<!-- <view class="right-title">
 			<image class="title-imge" src="/static/home.png" mode="aspectFit"></image>
 			<view class="title-font">
 				{{ uni.getStorageSync('nuName') }}
 			</view>
-		</view>
+		</view> -->
 		<view class="paizi tp">
 			<donghua width="15vw" height="15vw" :interval="300" :links="paiziarray" :playing="playall" :loop="true" />
 		</view>
@@ -37,13 +37,20 @@
 		<view class="juzhen tp" @click="housactive(6)">
 			<donghua width="17vw" height="17vw" :interval="300" :links="juzhenarray" :playing="playall" :loop="true" />
 		</view>
-		<!-- 	<view class="juzhentag tp" @click="housactive(6)">
-			<view class="blue-bgc" style="background: #7BC2FF;width: 8vw;">
-				库房矩阵
+		<view class="juzhentag tp" @click="housactive(6)">
+			<view class="blue-bgc" style="background: #7BC2FF;width: 7vw;">
+				设置
 				<view class="triangle-middle" style="border-top: 0.5vw solid #7BC2FF"></view>
 			</view>
 			<image class="blue-imge" src="/static/index/warehouse/home/z.png" mode=""></image>
-		</view> -->
+		</view>
+		<view class="exittag tp" @click="exitshow=true">
+			<view class="blue-bgc" style="background: #7BC2FF;width: 7vw;">
+				退出
+				<view class="triangle-middle" style="border-top: 0.5vw solid #7BC2FF"></view>
+			</view>
+			<image class="blue-imge" src="/static/index/warehouse/home/z.png" mode=""></image>
+		</view>
 		<view class="caigou tp" @click="housactive(0)">
 			<donghua width="16vw" height="16vw" :interval="150" :links="caigouarray" :playing="playall" :loop="true" />
 		</view>
@@ -115,6 +122,7 @@
 		<view :style="moverStyle">
 			<image style="width: 100%;height: 100%;" :src="cararray[cartarget]" mode="widthFix"></image>
 		</view>
+		<exit :show="exitshow" @close="exitshow=false" />
 		<!-- 自动更新组件  -->
 		<zy-update ref="zyupgrade" :noticeflag="true" theme="blue" :h5preview="false" oldversion="1.0.0"
 			:appstoreflag="true" :autocheckupdate="true"></zy-update>
@@ -126,12 +134,14 @@
 	import { onBackPress, onShow } from "@dcloudio/uni-app"
 	import { queryPadPageList } from '@/pages/watch/api/lunpan.js'
 	import ZyUpdate from '@/component/zy-upgrade/zy-upgrade.vue'
+	import exit from "@/component/public/exit.vue"
 
 	onBackPress(() => {
 		return true; // 禁止返回手势返回
 	})
 	const zyupgrade = ref(null);
 	const leftMenuArray = ref([])
+	const exitshow = ref(false);
 	// 生命周期钩子
 	onShow(() => {
 		zyupgrade.value?.check_update();
@@ -140,7 +150,7 @@
 
 		}))
 	});
-	const filteredMenu = (index:number) => {
+	const filteredMenu = (index : number) => {
 		return leftMenuArray.value.filter(item => Number(item.areaFlag) - 1 == index);
 	}
 	const juzhenarray =
@@ -224,13 +234,13 @@
 	const housedex = ref(0);
 	const navurl = ref('')
 	const housactive = (index : number) => {
-		
+
 		let data = filteredMenu(0)[0]
 		uni.setStorageSync('nuId', data.nuId);
 		uni.setStorageSync('nuName', data.nuName);
 		uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null);
 		uni.setStorageSync('NUall', data);
-		
+
 		housedex.value = index;
 		if (index == 0) {
 			uni.navigateTo({
@@ -261,12 +271,11 @@
 				url: '/pages/Warehouse/warehome',
 			})
 		}
-		// if (index == 5) {
-		// 	navurl.value = 'pages/procurement/inventory'
-		// 	uni.navigateTo({
-		// 		url: '/' + navurl.value
-		// 	})
-		// }
+		if (index == 6) {
+			uni.navigateTo({
+				url: '/pages/watch/settings/settings',
+			})
+		}
 		// if (index == 7) {
 		// 	navurl.value = 'pages/procurement/outbound?code=1'
 		// 	uni.navigateTo({
@@ -542,7 +551,21 @@
 		left: 19vw;
 		z-index: 50;
 	}
-
+	.exittag {
+		position: fixed;
+		top: 6vw;
+		right: 10.5vw;
+		z-index: 51;
+		
+		.blue-imge {
+			position: absolute;
+			top: 2.2vw;
+			left: 50%;
+			transform: translateX(-50%);
+			width: 3vw;
+			height: 5vw;
+		}
+	}
 	.juzhentag {
 		position: fixed;
 		top: 20vw;
diff --git a/pages/watch/settings/leida.vue b/pages/watch/settings/leida.vue
index 7ed9bf4..2599d04 100644
--- a/pages/watch/settings/leida.vue
+++ b/pages/watch/settings/leida.vue
@@ -315,7 +315,7 @@
 				element.isNew = true
 			})
 			relArray.value = []
-			console.log("!!!",res.result.records)
+			// console.log("!!!",res.result.records)
 			relArray.value.push(...res.result.records)
 			
 
diff --git a/pages/watch/settings/settings.vue b/pages/watch/settings/settings.vue
index bf6ac8f..c8df7aa 100644
--- a/pages/watch/settings/settings.vue
+++ b/pages/watch/settings/settings.vue
@@ -1,9 +1,9 @@
 <template>
 	<view class="index-content-other">
-		<!-- <view class="index-content-right" @click="goback">
-			<image class="back-img" :src="`/static/index/settings/back.png`" />
-			返回
-		</view> -->
+		<view class="index-content-right">
+			<!-- <image class="back-img" :src="`/static/index/settings/back.png`" />
+			返回 -->
+		</view>
 		<view class="array-father">
 			<view v-for="(item,index) in iconsArray.slice(0,3)" :key="index" class="item" @click="jumpToTarget(index)">
 				<view class="left-item">
@@ -45,14 +45,14 @@
 				</view>
 			</view>
 		</view>
-		<view class="bottom-button" @click="exitshow=true">
+	<!-- 	<view class="bottom-button" @click="exitshow=true">
 			注销登录
-		</view>
+		</view> -->
 		<view class="text-center">
-			<view>{{ uni.getStorageSync('orgListName') }}</view>
+			<!-- <view>{{ uni.getStorageSync('orgListName') }}</view> -->
 		</view>
 
-		<exit :show="exitshow" @close="exitshow=false" />
+		<!-- <exit :show="exitshow" @close="exitshow=false" /> -->
 		<reset :show="resetshow" @close="resetshow=false" />
 		<zy-update ref="zyupgrade" :noticeflag="true" theme="blue" :h5preview="false" oldversion="1.0.0"
 			:appstoreflag="true" :autocheckupdate="true" @showupdateTips="noNeed"></zy-update>
@@ -91,7 +91,7 @@
 
 <script setup lang="ts">
 	import { ref, onMounted, watch, nextTick } from 'vue'
-	import exit from "@/component/public/exit.vue"
+	// import exit from "@/component/public/exit.vue"
 	import reset from "@/component/public/reset.vue"
 	import ZyUpdate from '@/component/zy-upgrade/zy-upgrade.vue'
 	import oneseven from '@/pages/login/oneseven.vue'
@@ -101,7 +101,7 @@
 	const issay = ref(false)
 	const openany = ref(false);
 	const opentype = ref(false);
-	const exitshow = ref(false);
+	// const exitshow = ref(false);
 	const resetshow = ref(false);
 	const emit = defineEmits(['jump'])
 	// const props = defineProps({ isShow: { type: Boolean, required: true } })
@@ -208,9 +208,9 @@
 		}
 
 	}
-	const goback = () => {
-		uni.navigateBack()
-	}
+	// const goback = () => {
+	// 	uni.navigateBack()
+	// }
 </script>
 
 <style scoped lang="less">
@@ -347,7 +347,7 @@
 
 	.text-center {
 		margin-top: 40rpx;
-		height: 60rpx;
+		height: 30rpx;
 		width: 100%;
 		display: flex;
 		justify-content: center;