Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini

App.vue

@@ -5,10 +5,11 @@
 	export default {
 		onLaunch() {
 			console.log('App Launch');
-
+			
 		},
 
 		onShow() {
+			
 			console.log('App Show');
 			if (uni.getStorageSync('userInfo')) {
 				// 重置重连计数，确保立即重连

pages/NursingNew/component/index.vue

@@ -1083,7 +1083,7 @@
 	.weight-time {
 		font-weight: 800;
 		font-size: 70rpx;
-		margin-bottom: 0rpx;
+		margin-top: 2vw;
 		position: relative;
 		margin-left: -50rpx;
 	}
@@ -1099,6 +1099,7 @@
 		font-size: 35rpx;
 		margin-right: 10rpx;
 		font-weight: 600;
+		margin-top: 2vw;
 	}
 
 	.server-bgc {

pages/NursingNew/component/leftcontent/leftcontent.vue

@@ -66,8 +66,8 @@
 			}
 		}
 		.logomain{
-			width: 6.5vw;
+			width: 6vw;
-			height: 6.5vw;
+			height: 6vw;
 		}
 		.cont{
 			width: 6vw;

pages/Warehouse/index/component/index.vue

@@ -630,13 +630,14 @@
 	.weight-time {
 		font-weight: 800;
 		font-size: 70rpx;
-		margin-bottom: 0rpx;
+		margin-top: 30rpx;
 		position: relative;
 		margin-left: -50rpx;
 	}
 
 	.big-img {
 		margin-top: 40rpx;
+		margin-bottom: 40rpx;
 		width: 450rpx;
 		height: 450rpx;
 		z-index: 10;

pages/login/newanimationpage.vue

@@ -61,6 +61,12 @@
 		<view class="unit" @click="housactive(0)">
 			<image class="all-home" src="/static/index/warehouse/newindexhome/un.png" mode="aspectFit"></image>
 		</view>
+		<view class="unit-text" :style="{ fontSize: fontSize }">
+			{{ fontnumber }}
+		</view>
+		<view class="unit-image">
+			<image class="all-home" src="/static/red.png" mode="aspectFit"></image>
+		</view>
 		<view class="office" @click="housactive(1)">
 			<image class="all-home" src="/static/index/warehouse/newindexhome/office.png" mode="aspectFit"></image>
 		</view>
@@ -85,7 +91,8 @@
 				:loop="true" />
 		</view>
 		<view class="door tp">
-			<donghua width="17vw" height="16vw" :interval="200" :links="[...doorarray, ...doorarray.slice().reverse()]" :playing="playall" :loop="true" />
+			<donghua width="17vw" height="16vw" :interval="200" :links="[...doorarray, ...doorarray.slice().reverse()]"
+				:playing="playall" :loop="true" />
 		</view>
 		<view class="ondoor tp">
 			<donghua width="5vw" height="6vw" :interval="300" :links="ondoorarray" :playing="playall" :loop="true" />
@@ -257,6 +264,14 @@
 	const leftMenuArray = ref([])
 	const exitshow = ref(false);
 	const morerule = ref(false)
+	const fontnumber = ref(uni.getStorageSync('orgListName'))
+	const fontSize = computed(() => {
+	  const len = (fontnumber.value || '').length
+	  if (len === 10) return '1.3vw'      // 恰好10字
+	  if (len < 10)   return '1.4vw'      // 少于10字
+	  if (len <= 15)  return '1.2vw'      // 11~15字
+	  return '1.1vw'                      // 超过15字
+	})
 	// 生命周期钩子
 	onShow(() => {
 		zyupgrade.value?.check_update();
@@ -268,15 +283,15 @@
 	const filteredMenu = (index : number) => {
 		return leftMenuArray.value.filter(item => Number(item.areaFlag) - 1 == index);
 	}
-	const ondoorarray = 
+	const ondoorarray =
-	genPaths(
+		genPaths(
-		'/static/index/warehouse/newindexhome/',
+			'/static/index/warehouse/newindexhome/',
-		'gate',
+			'gate',
-		5,    // 张数
+			5,    // 张数
-		'png',
+			'png',
-		0,     // 起始索引为 1
+			0,     // 起始索引为 1
-		false  // 不补零
+			false  // 不补零
-	)
+		)
 	const doorarray =
 		genPaths(
 			'/static/index/warehouse/newindexhome/',
@@ -500,7 +515,7 @@
 			return `${base}/${prefix}${idx}.${ext}`
 		})
 	}
-	
+
 	// // 当前坐标（px）
 	// const x = ref(77)
 	// const y = ref(60)
@@ -796,13 +811,42 @@
 	.unit {
 		width: 53vw;
 		height: 53vw;
-		// background-color: red;
 		position: fixed;
 		top: -4vw;
 		left: 30vw;
 		z-index: 2;
 	}
 
+	.unit-text {
+		position: fixed;
+		bottom: 28.5vw;
+		left: 18vw;
+		z-index: 12;
+		display: inline-block;
+		transform-origin: left top;
+		/* 关键：左上角 */
+		transform: skewX(29deg) rotate(35deg) scaleY(1.2);
+		letter-spacing: -2px;
+		/* 负值 = 缩小 */
+		font-size: 1.2vw;
+		color: #0089FE;
+	}
+	.unit-image{
+		position: fixed;
+		bottom: 29.3vw;
+		left: 15.5vw;
+		z-index: 12;
+		display: inline-block;
+		transform-origin: left top;
+		/* 关键：左上角 */
+		transform: skewX(29deg) rotate(35deg) scaleY(1.2);
+		letter-spacing: -2px;
+		width: 2vw;
+		height: 2vw;
+		/* 负值 = 缩小 */
+	
+		color: #0089FE;
+	}
 	.office {
 		width: 50vw;
 		height: 50vw;
@@ -863,20 +907,23 @@
 		width: 50%;
 		height: 50%;
 	}
-	.door{
+
+	.door {
 		width: 17vw;
 		height: 16vw;
 		position: fixed;
 		bottom: 0vw;
 		left: 0vw;
 	}
-	.ondoor{
+
+	.ondoor {
 		width: 5vw;
 		height: 6vw;
 		position: fixed;
 		bottom: -0.5vw;
 		left: 9vw;
 	}
+
 	// .tp {
 	// 	image {
 	// 		width: 100%;