合并代码

manifest.json

@@ -10,6 +10,7 @@
 		"usingComponents": true,
 		"nvueStyleCompiler": "uni-app",
 		"compilerVersion": 3,
+		
 		"screenOrientation": [
 			// "portrait-primary", // 竖屏
 			"landscape-primary", // 横屏（home 键在右侧）

pages.json

@@ -226,10 +226,11 @@
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app x",
-		"navigationBarBackgroundColor": "#F8F8F8",
+		// "navigationBarBackgroundColor": "red",
-		"backgroundColor": "#F8F8F8",
+		// "backgroundColor": "red",
 		"navigationStyle": "custom",
 		"bounce": "none" //关闭窗口回弹效果
 	},
 	"uniIdRouter": {}
+	
 }

pages/login/newanimationpage.vue

@@ -1,6 +1,6 @@
 <!-- 动画页 -->
 <template>
-	<view @click="morerule=false">
+	<view>
 		<view class="home">
 			<image class="all-home" src="/static/index/warehouse/newindexhome/backdro.jpg" mode="aspectFit"></image>
 		</view>
@@ -68,7 +68,7 @@
 			<donghua width="14vw" height="13vw" :interval="250" :links="officerarray" :playing="playall" :loop="true" />
 		</view>
 		<view class="Print tp">
-			<donghua width="6vw" height="6vw" :interval="300" :links="Printarray" :playing="playall" :loop="true" />
+			<donghua width="5vw" height="5vw" :interval="300" :links="Printarray" :playing="playall" :loop="true" />
 		</view>
 		<view class="fontend tp">
 			<image class="all-home" src="/static/index/warehouse/newindexhome/reception.png" mode="aspectFit"></image>
@@ -500,6 +500,7 @@
 			return `${base}/${prefix}${idx}.${ext}`
 		})
 	}
+	
 	// // 当前坐标（px）
 	// const x = ref(77)
 	// const y = ref(60)
@@ -621,16 +622,17 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		background: linear-gradient(to right, #0089FD, #4CA5FF);
+		background: rgba(71, 188, 255, 0.2);
 		font-size: 1.5vw;
-		color: #fff;
+		color: #0089FE;
 		border-radius: 2vw;
 		position: relative;
 		z-index: 3;
+		border: 2rpx solid rgba(255, 255, 255, 0.6);
 	}
 
 	.office-font {
-		width: 9vw;
+		width: 10vw;
 		height: 3vw;
 		position: fixed;
 		top: 22vw;
@@ -638,12 +640,13 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		background: linear-gradient(to right, #0089FD, #4CA5FF);
+		background: rgba(71, 188, 255, 0.2);
 		font-size: 1.5vw;
-		color: #fff;
+		color: #0089FE;
 		border-radius: 2vw;
 		position: relative;
 		z-index: 3;
+		border: 2rpx solid rgba(255, 255, 255, 0.6);
 	}
 
 	.fontroom-font {
@@ -655,29 +658,31 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		background: linear-gradient(to right, #0089FD, #4CA5FF);
+		background: rgba(71, 188, 255, 0.2);
 		font-size: 1.5vw;
-		color: #fff;
+		color: #0089FE;
 		border-radius: 2vw;
 		position: relative;
 		z-index: 3;
+		border: 2rpx solid rgba(255, 255, 255, 0.6);
 	}
 
 	.back-font {
 		width: 7vw;
 		height: 3vw;
 		position: fixed;
-		top: 2vw;
+		top: 1vw;
-		left: 87vw;
+		left: 81vw;
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		background: linear-gradient(to right, #0089FD, #4CA5FF);
+		background: rgba(71, 188, 255, 0.2);
 		font-size: 1.5vw;
-		color: #fff;
+		color: #0089FE;
 		border-radius: 2vw;
 		position: relative;
 		z-index: 3;
+		border: 2rpx solid rgba(255, 255, 255, 0.6);
 	}
 
 	.store-font {
@@ -689,12 +694,13 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		background: linear-gradient(to right, #0089FD, #4CA5FF);
+		background: rgba(71, 188, 255, 0.2);
 		font-size: 1.5vw;
-		color: #fff;
+		color: #0089FE;
 		border-radius: 2vw;
 		position: relative;
 		z-index: 3;
+		border: 2rpx solid rgba(255, 255, 255, 0.6);
 	}
 
 	.font-ball {
@@ -815,22 +821,22 @@
 	}
 
 	.Print {
-		width: 6vw;
+		width: 5vw;
-		height: 6vw;
+		height: 5vw;
 		position: fixed;
-		bottom: 21vw;
+		bottom: 22vw;
-		right: 12vw;
+		right: 13vw;
 		z-index: 1;
 	}
 
 	.button-setting {
-		width: 4.5vw;
+		width: 5vw;
-		height: 4.5vw;
+		height: 5vw;
 		border-radius: 50%;
 		border: 1rpx solid #A3B2CF;
 		position: fixed;
 		bottom: 2vw;
-		right: 8.5vw;
+		right: 9vw;
 		display: flex;
 		justify-content: center;
 		align-items: center;
@@ -839,8 +845,8 @@
 	}
 
 	.button-back {
-		width: 4.5vw;
+		width: 5vw;
-		height: 4.5vw;
+		height: 5vw;
 		border-radius: 50%;
 		border: 1rpx solid #A3B2CF;
 		position: fixed;
@@ -868,8 +874,8 @@
 		width: 5vw;
 		height: 6vw;
 		position: fixed;
-		bottom: 1vw;
+		bottom: -0.5vw;
-		left: 4vw;
+		left: 9vw;
 	}
 	// .tp {
 	// 	image {

pages/procurement/outbound.vue

@@ -609,7 +609,7 @@
 			firstgetqueryCgdList();
 			console.log("!!!!!!", res)
 			setTimeout(() => {
-				if (res.result.status == "success") {
+				if (res.success) {
 					uni.showToast({
 						title: res.result.message,
 						icon: 'none', // 'none' 表示不带图标