diff --git a/components/bottomBtn/bottomBtn.vue b/components/bottomBtn/bottomBtn.vue
new file mode 100644
index 0000000..fa63fc9
--- /dev/null
+++ b/components/bottomBtn/bottomBtn.vue
@@ -0,0 +1,242 @@
+<!-- PageBottom.vue -->
+<template>
+	<view class="pageBottom" :style="{ position: position, bottom: isSubmit ? '60rpx' : '0' }">
+		<!-- 三按钮 -->
+		<view class="thirdbuttons" v-if="isThird">
+			<view class="buttonLeft button" @click="onSubmit()">{{ texts[0] }}</view>
+			<view class="buttonMid button" @click="onCancel()">{{ texts[1] }}</view>
+			<view class="buttonRight button" @click="onCheck()">{{ texts[2] }}</view>
+		</view>
+
+		<!-- 双按钮 -->
+		<view class="buttons" v-else-if="isDouble">
+			<view class="buttonLeft button" @click="onCancel()">{{ texts[0] }}</view>
+			<view class="buttonRight button" @click="onSubmit()">{{ texts[1] }}</view>
+		</view>
+
+		<!-- 单按钮 -->
+		<view v-else class="buttons" @click="onSubmit()">
+			<view class="buttonOne button">{{ texts[0] }}</view>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	export default {
+		name: 'PageBottom',
+
+		// 接收的 props
+		props: {
+			backgroundWhite: {
+				type: Boolean,
+				default: false
+			},
+			isSubmit: {
+				type: Boolean,
+				default: false
+			},
+			isWhite: {
+				type: Boolean,
+				default: true
+			},
+			isThird: {
+				type: Boolean,
+				default: false
+			},
+			isDouble: {
+				type: Boolean,
+				default: false
+			},
+			disable: {
+				type: Boolean,
+				default: false
+			},
+			texts: {
+				type: Array,
+				default () {
+					return ['取消', '确定'];
+				}
+			},
+			text: {
+				type: String,
+				default: ''
+			},
+			position: {
+				type: String,
+				default: 'fixed'
+			}
+		},
+
+		// 方法
+		methods: {
+			onSubmit() {
+				if (props.disable) return
+				this.$emit('onSubmit');
+			},
+			onCancel() {
+				if (props.disable) return
+				this.$emit('onCancel');
+			},
+			onCheck() {
+				if (props.disable) return
+				this.$emit('onCheck');
+			}
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	.pageBottom {
+		left: 0;
+		bottom: 0;
+		z-index: 30;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+		width: 100%;
+		padding: 20rpx 0 20rpx;
+
+		.button {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			width: 686rpx;
+			height: 72rpx;
+			font-weight: 400;
+			font-size: 32rpx;
+			color: #ffffff;
+			border-radius: 16rpx;
+			background: rgb(22, 93, 255);
+		}
+
+		.backgroundWhite {
+			background: #fff;
+			color: #165dff;
+			border: 2rpx solid rgb(22, 93, 255);
+		}
+
+		.buttons {
+			display: flex;
+			justify-content: center;
+			width: 100%;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			padding: 24rpx 0 60rpx;
+			background-color: #fff;
+
+			.buttonOne {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				height: 90rpx;
+				width: 664rpx;
+				box-sizing: border-box;
+				background: rgb(22, 93, 255);
+				border-radius: 16rpx;
+				color: #FFFFFF;
+				font-weight: 400;
+				font-size: 32rpx;
+			}
+
+			.buttonLeft {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				height: 90rpx;
+				width: 332rpx;
+				box-sizing: border-box;
+				background: rgb(22, 93, 255);
+				border-radius: 16rpx;
+				color: #FFFFFF;
+				font-weight: 400;
+				font-size: 32rpx;
+			}
+
+			.buttonRight {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				height: 90rpx;
+				width: 332rpx;
+				border-radius: 16rpx;
+				background: rgb(22, 93, 255);
+				font-weight: 400;
+				font-size: 32rpx;
+				color: #FFFFFF;
+				margin-left: 22rpx;
+			}
+		}
+
+		.thirdbuttons {
+			display: flex;
+			justify-content: center;
+			width: 100%;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			padding: 10rpx 0 60rpx;
+			background-color: #fff;
+
+			.buttonLeft {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				height: 72rpx;
+				width: 232rpx;
+				box-sizing: border-box;
+				border: 2rpx solid rgb(22, 93, 255);
+				border-radius: 16rpx;
+				background: rgb(255, 255, 255);
+				color: #165DFF;
+				font-weight: 400;
+				font-size: 32rpx;
+			}
+
+			.buttonMid {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				height: 72rpx;
+				width: 232rpx;
+				box-sizing: border-box;
+				border: 2rpx solid rgb(22, 93, 255);
+				border-radius: 16rpx;
+				background: rgb(255, 255, 255);
+				color: #165DFF;
+				font-weight: 400;
+				font-size: 32rpx;
+				margin-left: 10rpx;
+			}
+
+			.buttonRight {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				height: 72rpx;
+				width: 232rpx;
+				border-radius: 16rpx;
+				background: rgb(22, 93, 255);
+				font-weight: 400;
+				font-size: 32rpx;
+				color: #FFFFFF;
+				margin-left: 10rpx;
+			}
+		}
+	}
+
+	.contentWhite {
+		content: '';
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		height: 240rpx;
+		background: linear-gradient(to bottom,
+				#f3ece400 0%,
+				#F2F3F5 100%);
+		pointer-events: none;
+	}
+</style>
\ No newline at end of file
diff --git a/components/colorui/components/cu-custom.vue b/components/colorui/components/cu-custom.vue
index b09f70d..a87886f 100644
--- a/components/colorui/components/cu-custom.vue
+++ b/components/colorui/components/cu-custom.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="cu-custom" :style="[{height:CustomBar + 'px'}]">
-			<view class="cu-bar fixed" :style="style" :class="[bgImage!=''?'none-bg text-white bg-img':'',bgColor]">
+			<view class="cu-bar fixed" :style="style" :class="[bgImage!=''?'none-bg text-white bg-img':'']">
 				<view class="action" @tap="BackPage" v-if="isBack">
 					<text class="cuIcon-back"></text>
 					<slot name="backText"></slot>
@@ -61,5 +61,7 @@
 </script>
 
 <style>
-
+	.cu-bar{
+		background-color: #fff;
+	}
 </style>
diff --git a/components/colorui/main.css b/components/colorui/main.css
index fade3b2..7e34636 100644
--- a/components/colorui/main.css
+++ b/components/colorui/main.css
@@ -11,7 +11,7 @@
         初始化
  ==================== */
 body {
-	background-color: #f1f1f1;
+	background-color: #fff;
 	font-size: 28upx;
 	color: #333333;
 	font-family: Helvetica Neue, Helvetica, sans-serif;
@@ -180,7 +180,7 @@ switch .uni-switch-input {
 
 switch .wx-switch-input:not([class*="bg-"]),
 switch .uni-switch-input:not([class*="bg-"]) {
-	background: #8799a3 !important;
+	background: #165DFF !important;
 }
 
 switch .wx-switch-input::after,
@@ -1071,7 +1071,7 @@ button.cuIcon.lg {
 	flex-direction: column;
 	justify-content: center;
 	font-size: 28upx;
-	z-index: 9999;
+	z-index: 99;
 	line-height: 2.4em;
 }
 
@@ -1885,7 +1885,7 @@ button.cuIcon.lg {
 	padding-right: 150upx;
 	/* #endif */
 	box-shadow: 0upx 0upx 0upx;
-	z-index: 9999;
+	z-index: 99;
 }
 
 .cu-custom .cu-bar .border-custom {
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..e230349
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+  "name": "pda_uniapp",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}
diff --git a/pages.json b/pages.json
index 3952cc5..fa9d451 100644
--- a/pages.json
+++ b/pages.json
@@ -199,24 +199,24 @@
 		}
 	],
 	"tabBar": {
-		"color": "#000000",
-		"selectedColor": "#000000",
+		"selectedColor":"#165DFF",
+		"color":"#4E5969",
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
 		"list": [{
 			"pagePath": "pages/index",
 			"iconPath": "static/images/tabbar/home.png",
-			"selectedIconPath": "static/images/tabbar/home_.png",
+			"selectedIconPath": "static/images/tabbar/homeS.png",
 			"text": "首页"
 		}, {
 			"pagePath": "pages/work/index",
 			"iconPath": "static/images/tabbar/work.png",
-			"selectedIconPath": "static/images/tabbar/work_.png",
+			"selectedIconPath": "static/images/tabbar/workS.png",
 			"text": "工作台"
 		}, {
 			"pagePath": "pages/mine/index",
 			"iconPath": "static/images/tabbar/mine.png",
-			"selectedIconPath": "static/images/tabbar/mine_.png",
+			"selectedIconPath": "static/images/tabbar/mineS.png",
 			"text": "我的"
 		}]
 	},
diff --git a/pages/index.vue b/pages/index.vue
index a7e2680..d66747d 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="home-container">
 		<!-- <image class="logo" src="@/static/images/superMan.png"></image>
 		<view class="text-area">
 			<text class="title">这里是主页，放几个统计图</text>
@@ -13,7 +13,7 @@
 					v-if="item.type=='video'"></video>
 			</swiper-item>
 		</swiper>
-		<uni-section title="系统功能" type="line"></uni-section>
+		<!-- <uni-section title="系统功能" type="line"></uni-section> -->
 	</view>
 </template>
 
@@ -126,6 +126,12 @@
 </script>
 
 <style>
+	.home-container {
+		background: linear-gradient(180.00deg, rgb(181, 202, 245) 0%, rgb(184, 204, 245) 40.449%, rgba(213, 227, 249, 0) 87.96%);
+		width: 100%;
+		height: 90vh;
+		overflow: hidden;
+	}
 	.content {
 		display: flex;
 		flex-direction: column;
diff --git a/pages/login.vue b/pages/login.vue
index 88e4e74..f7e67fb 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -1,17 +1,20 @@
 <!--登录界面-->
 <template>
 	<view class="normal-login-container">
-		<view class=" margin-top ">
-			<img class="logo"  src="/static/logo200.png" mode="widthFix">
-			<div class="head">RRS APP</div>
+		<view class="loginBg">
+			<img class="logo"  src="/static/images/loginBg.png" mode="widthFix">
 		</view>
 		<view class="login-form-content">
 			<view class="input-item flex align-center">
-				<view class="iconfont icon-user icon"></view>
+				<view class="login-icon">
+					<img src="/static/images/user.png" alt="" srcset="" />
+				</view>
 				<input v-model="loginForm.username" class="input" type="text" placeholder="请输入账号" maxlength="30" />
 			</view>
 			<view class="input-item flex align-center">
-				<view class="iconfont icon-password icon"></view>
+				<view class="login-icon">
+					<img src="/static/images/pass.png" alt="" srcset="" />
+				</view>
 				<input v-model="loginForm.password" type="password" class="input" placeholder="请输入密码" maxlength="20" />
 			</view>
 			<view class="input-item flex align-center" style="width: 60%;margin: 0px;" v-if="captchaEnabled">
@@ -147,14 +150,16 @@
 	page {
 		background-color: #ffffff;
 	}
-
+	.loginBg{
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+	}
 	.logo {
-		width: 60px !important;
-		margin-top: 10px !important;
-		margin-bottom: 10px !important;
-		margin-left: 20px !important;
-		border: none;
-		background-color: transparent;
+		width: 100%;
+		height:700rpx;
+		opacity: 0.66;
 	}
 
 	.head {
@@ -172,7 +177,8 @@
 
 	.normal-login-container {
 		width: 100%;
-
+		height: 100vh;
+		overflow: hidden;
 		.logo-content {
 			width: 100%;
 			font-size: 21px;
@@ -191,15 +197,26 @@
 		.login-form-content {
 			text-align: center;
 			margin: 20px auto;
-			margin-top: 15%;
+			margin-top: 400px;
 			width: 80%;
 
 			.input-item {
-				margin: 20px auto;
-				background-color: #f5f6f7;
-				height: 45px;
-				border-radius: 20px;
-
+				width: 606rpx;
+				height: 100rpx;
+				margin: 36rpx auto;
+				border-radius: 24rpx;
+				box-shadow: 0px 1rpx 5rpx 0px rgba(4, 8, 43, 0.04);
+				/* #F7F8FA_禁用浅色1 */
+				background: rgb(247, 248, 250);
+				padding-left: 42rpx;
+				.login-icon{
+					width: 52rpx;
+					height: 52rpx;
+					img{
+						width: 52rpx;
+						height: 52rpx;
+					}
+				}
 				.icon {
 					font-size: 38rpx;
 					margin-left: 10px;
@@ -219,6 +236,11 @@
 			.login-btn {
 				margin-top: 40px;
 				height: 45px;
+				border-radius: 24rpx;
+				
+				box-shadow: 0px 1rpx 5rpx 0px rgba(4, 8, 43, 0.04);
+				/* #165DFF_主色 */
+				background: rgb(22, 93, 255);
 			}
 
 			.reg {
diff --git a/pages/register.vue b/pages/register.vue
index c772c2d..2372540 100644
--- a/pages/register.vue
+++ b/pages/register.vue
@@ -7,11 +7,11 @@
 		</view>
 		<view class="login-form-content">
 			<view class="input-item flex align-center">
-				<view class="iconfont icon-user icon"></view>
+				<view class="login-user"></view>
 				<input v-model="registerForm.username" class="input" type="text" placeholder="请输入账号" maxlength="30" />
 			</view>
 			<view class="input-item flex align-center">
-				<view class="iconfont icon-password icon"></view>
+				<view class="login-password"></view>
 				<input v-model="registerForm.password" type="password" class="input" placeholder="请输入密码"
 					maxlength="20" />
 			</view>
@@ -157,17 +157,23 @@
 			width: 80%;
 
 			.input-item {
-				margin: 20px auto;
-				background-color: #f5f6f7;
-				height: 45px;
-				border-radius: 20px;
-
+				width: 606px;
+				height: 100px;
+				margin: 18px auto;
+				border-radius: 24px;
+				box-shadow: 0px 1px 5px 0px rgba(4, 8, 43, 0.04);
+				/* #F7F8FA_禁用浅色1 */
+				background: rgb(247, 248, 250);
 				.icon {
 					font-size: 38rpx;
 					margin-left: 10px;
 					color: #999;
 				}
-
+				.login-password{
+					width: 52px;
+					height: 52px;
+					background-image: url('');
+				}
 				.input {
 					width: 100%;
 					font-size: 14px;
diff --git a/pages/work/index.vue b/pages/work/index.vue
index d164615..3cf72f7 100644
--- a/pages/work/index.vue
+++ b/pages/work/index.vue
@@ -1,50 +1,79 @@
 <template>
 	<view class="work-container">
+		<!--顶部个人信息栏-->
+		<view class="header-section ">
+			<view class="flex  justify-between">
+				<view class="flex align-center">
+					<view v-if="!avatar" class="cu-avatar xl round bg-white">
+						<view class="iconfont icon-people text-gray icon"></view>
+					</view>
+					<image v-if="avatar" @click="handleToAvatar" :src="avatar" class="cu-avatar xl round"
+						mode="widthFix">
+					</image>
+					<view v-if="!name" @click="handleToLogin" class="login-tip">
+						点击登录
+					</view>
+					<view v-if="name" @click="handleToInfo" class="user-info">
+						<view class="u_title">
+							Hi.{{ name }}
+						</view>
+						<view class="s_text">
+							欢迎使用RF
+						</view>
+					</view>
+				</view>
+				<!-- <view @click="handleToInfo" class="flex align-center">
+					<text>个人信息</text>
+					<view class="iconfont icon-right"></view>
+				</view> -->
+			</view>
+		</view>
 		<!-- 轮播图 -->
-		<swiper class="screen-swiper" :class="dotStyle?'square-dot':'round-dot'" :indicator-dots="true" :circular="true"
+		<swiper class="work-swiper" :class="dotStyle?'square-dot':'round-dot'" :indicator-dots="true" :circular="true"
 			:autoplay="true" interval="5000" duration="500">
 			<swiper-item v-for="(item,index) in swiperList" :key="index">
-				<image :src="item.url" mode="aspectFill" v-if="item.type=='image'"></image>
+				<image :src="item.url" v-if="item.type=='image'"></image>
 				<video :src="item.url" autoplay loop muted :show-play-btn="false" :controls="false" objectFit="cover"
 					v-if="item.type=='video'"></video>
 			</swiper-item>
 		</swiper>
-		<uni-section title="请选择业务操作 >>>" type="line"></uni-section>
-		<view>
-			<scroll-view scroll-y class="page">
-				<view class="grid-body">
-					<uni-grid :column="4" :showBorder="true">
-						<uni-grid-item v-for="(item,index) in wmsRouter" :key="index">
-							<view class="grid-item-box" @click="navChange(item)">
-								<uni-icons :class='item.icon' size="30"></uni-icons>
-								<text class="text">{{item.title}}</text>
-							</view>
-						</uni-grid-item>
-					</uni-grid>
+		<view class="grid-body">
+			<view class="bodytitle">
+				业务操作
+			</view>
+			<view class="bodybox">
+				<view v-for="(item,index) in wmsRouter" class="bodyboxitem" :key="index">
+					<view class="grid-item-box" @click="navChange(item)">
+						<!-- <uni-icons :class='item.icon' size="30"></uni-icons> -->
+						<image :src="item.icon" ></image>
+						<text class="text">{{item.title}}</text>
+					</view>
 				</view>
-			</scroll-view>
+				<view style="width: 140rpx;"></view>
+				<view style="width: 140rpx;"></view>
+				<view style="width: 140rpx;"></view>
+			</view>
 		</view>
-		<template v-if="userRoutes.length>0">
+		<view class="grid-body" v-if="userRoutes.length>0">
 			<template v-for="oneMenuList in userRoutes">
-				<uni-section :title='oneMenuList.title' type="line"></uni-section>
-				<view>
-					<scroll-view scroll-y class="page">
-						<view class="grid-body">
-							<uni-grid :column="4" :showBorder="true">
-								<uni-grid-item v-for="(item,index) in oneMenuList.children" :key="index">
-									<view class="grid-item-box" @click="navChange(item)">
-										<uni-icons :class='item.icon' size="30" :color='item.color'></uni-icons>
-										<text class="text">{{item.title}}</text>
-									</view>
-								</uni-grid-item>
-							</uni-grid>
+				<view class="bodytitle">
+					{{oneMenuList.title}}
+				</view>
+				<view class="bodybox">
+					<view v-for="(item,index) in oneMenuList.children" class="bodyboxitem" :key="index">
+						<view class="grid-item-box" @click="navChange(item)">
+							<uni-icons :class='item.icon' size="30"></uni-icons>
+							
+							<text class="text">{{item.title}}</text>
 						</view>
-					</scroll-view>
+					</view>
+					<view style="width: 140rpx;"></view>
+					<view style="width: 140rpx;"></view>
+					<view style="width: 140rpx;"></view>
 				</view>
 			</template>
-		</template>
-
-	
+		</view>
+	</view>
 	</view>
 </template>
 
@@ -57,44 +86,58 @@
 		data() {
 			return {
 				wmsRouter,
-				
+				name: this.$store.state.user.name,
 				swiperList: [
-				// {
-				// 	id: 0,
-				// 	type: 'image',
-				// 	url: '/static/images/banner/banner01.jpg'
-				// }, {
-				// 	id: 1,
-				// 	type: 'image',
-				// 	url: '/static/images/banner/banner02.jpg',
-				// }, {
-				// 	id: 2,
-				// 	type: 'image',
-				// 	url: '/static/images/banner/banner03.jpg'
-				// }, 
-				{
-					id: 3,
-					type: 'image',
-					url: '/static/images/banner/banner04.jpg'
-				}, {
-					id: 4,
-					type: 'image',
-					url: '/static/images/banner/banner05.jpg'
-				}, {
-					id: 5,
-					type: 'image',
-					url: '/static/images/banner/banner06.jpg'
-				}, {
-					id: 6,
-					type: 'image',
-					url: '/static/images/banner/banner07.jpg'
-				}, ],
+					// {
+					// 	id: 0,
+					// 	type: 'image',
+					// 	url: '/static/images/banner/banner01.jpg'
+					// }, {
+					// 	id: 1,
+					// 	type: 'image',
+					// 	url: '/static/images/banner/banner02.jpg',
+					// }, {
+					// 	id: 2,
+					// 	type: 'image',
+					// 	url: '/static/images/banner/banner03.jpg'
+					// }, 
+					{
+						id: 3,
+						type: 'image',
+						url: '/static/images/banner/banner04.jpg'
+					}, {
+						id: 4,
+						type: 'image',
+						url: '/static/images/banner/banner05.jpg'
+					}, {
+						id: 5,
+						type: 'image',
+						url: '/static/images/banner/banner06.jpg'
+					}, {
+						id: 6,
+						type: 'image',
+						url: '/static/images/banner/banner07.jpg'
+					},
+				],
 				towerStart: 0,
 				direction: '',
 				dotStyle: true,
 				userRoutes: []
 			}
 		},
+		computed: {
+			avatar() {
+				return this.$store.state.user.avatar
+			},
+			windowHeight() {
+				return uni.getSystemInfoSync().windowHeight - 50
+			},
+			warehouseinfo() {
+				if (Array.isArray(this.warehouse) && this.warehouse.length > 0) {
+					return '【' + this.warehouse[0].warehouseCode + '】' + this.warehouse[0].warehouseName
+				}
+			}
+		},
 		onLoad() {
 			this.TowerSwiper('swiperList');
 			this.direction = 'left';
@@ -167,7 +210,7 @@
 	}
 </script>
 
-<style lang="scss">
+<style scoped lang="scss">
 	@import url("../../components/colorui/main.css");
 	@import url("../../components/colorui/icon.css");
 
@@ -186,11 +229,84 @@
 		line-height: inherit;
 	}
 
+	.work-swiper {
+		width: 686rpx;
+		height: 180rpx;
+		margin: 0 auto;
+		border-radius: 24rpx;
+
+		image {
+			width: 686rpx;
+			height: 180rpx;
+			border-radius: 24rpx;
+		}
+
+		video {
+			width: 686rpx;
+			height: 180rpx;
+			border-radius: 24rpx;
+		}
+	}
+
+	.header-section {
+		padding: 40rpx 32rpx;
+		color: white;
+
+		.login-tip {
+			font-size: 18px;
+			margin-left: 10px;
+		}
+
+		.cu-avatar {
+			width: 80rpx;
+			height: 80rpx;
+			border: 2px solid #eaeaea;
+			border-radius: 24rpx;
+
+			.icon {
+				font-size: 40px;
+			}
+		}
+
+		.user-info {
+			margin-left: 36rpx;
+
+			.u_title {
+
+				color: rgb(255, 255, 255);
+				font-family: 苹方-简;
+				font-size: 42rpx;
+				font-weight: 500;
+				line-height: 59rpx;
+				letter-spacing: 0%;
+				text-align: left;
+			}
+
+			.s_text {
+				color: rgb(255, 255, 255);
+				font-family: 苹方-简;
+				font-size: 24rpx;
+				font-weight: 400;
+				line-height: 34rpx;
+				letter-spacing: 0%;
+				text-align: left;
+				margin-top: 10rpx;
+			}
+		}
+	}
+
 	/* #endif */
+	.work-container {
+		background: linear-gradient(180.00deg, rgb(181, 202, 245) 0%, rgb(184, 204, 245) 40.449%, rgba(213, 227, 249, 0) 87.96%);
+		width: 100%;
+		height: 90vh;
+		overflow: hidden;
+	}
 
 	.text {
 		text-align: center;
-		font-size: 26rpx;
+		font-size: 28rpx;
+		font-weight: 400;
 		margin-top: 10rpx;
 	}
 
@@ -203,6 +319,10 @@
 		align-items: center;
 		justify-content: center;
 		padding: 15px 0;
+		image{
+			width: 100rpx;
+			height: 100rpx;
+		}
 	}
 
 	.uni-margin-wrap {
@@ -219,6 +339,38 @@
 		height: 150px;
 	}
 
+	.grid-body {
+		width: 686rpx;
+		border-radius: 24rpx;
+		padding: 32rpx;
+		margin: 32rpx auto;
+		box-shadow: 0px 4rpx 11rpx 0px rgba(111, 150, 198, 0.09), 0px 4px 84px 0px rgba(130, 154, 190, 0.11);
+		background: rgb(255, 255, 255);
+
+		.bodytitle {
+			color: rgb(29, 33, 41);
+			font-family: 苹方-简;
+			font-size: 32rpx;
+			font-weight: 500;
+			line-height: 45rpx;
+			letter-spacing: 0px;
+			text-align: left;
+			margin-bottom: 10rpx;
+		}
+
+		.bodybox {
+			display: flex;
+			align-items: center;
+			flex-wrap: wrap;
+			justify-content: space-evenly;
+		}
+
+		.bodyboxitem {
+			width: 140rpx;
+			height: 195rpx;
+		}
+	}
+
 	.swiper-item {
 		/* #ifndef APP-NVUE */
 		display: flex;
diff --git a/pages/work/wms/clearEmptyLoc.vue b/pages/work/wms/clearEmptyLoc.vue
index 4cfefe5..0db8dff 100644
--- a/pages/work/wms/clearEmptyLoc.vue
+++ b/pages/work/wms/clearEmptyLoc.vue
@@ -1,19 +1,22 @@
 <!--托盘信息查询-->
 <template>
 	<view class="container">
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
-			<block slot="backText">返回</block>
+		<cu-custom  :isBack="true">
+			<block slot="backText"></block>
 			<block slot="content"> 整巷道清空</block>
 		</cu-custom>
 		<view class="example">
 			<uni-forms ref="form" labelWidth="80px">
 				<uni-forms-item label="货位编号" name="locCode">
-					<view class="flex-twice  padding-0 radius">
-						<uni-easyinput v-model="locCode" placeholder="请扫描货位编号" @blur="queryLocInfo" />
+					<view class="fromItem">
+						<view class="flex-twice  padding-0 radius">
+							<uni-easyinput v-model="locCode" placeholder="请扫描货位编号" @blur="queryLocInfo" />
+						</view>
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
 					</view>
 				</uni-forms-item>
 			</uni-forms>
-			<button type="primary" @click="handleClear">一键清空</button>
+			<!-- <button type="primary" @click="handleClear">一键清空</button> -->
 			
 			<!-- 货位信息表格 -->
 			<view v-if='locList.length>0'>
@@ -31,12 +34,16 @@
 				</view>
 			</view>
 		</view>
+		<bottomBtn :isSubmit="true" :isWhite="false" position="fixed"  :texts="['一键清空']"
+			@onSubmit="handleClear"></bottomBtn>
 	</view>
 </template>
 
 <script>
 	import { queryEmptyLoc, clearEmptyLoc } from "@/api/wms/agvRf.js"
-	
+	import {
+		bottomBtn
+	} from '@/components/bottomBtn/bottomBtn.vue'
 	export default {
 		data() {
 			return {
@@ -54,6 +61,9 @@
 				}
 			};
 		},
+		component: {
+			bottomBtn
+		},
 		onReady() {
 			this.$refs.form.setRules(this.rules)
 		},
@@ -130,6 +140,82 @@
 </script>
 
 <style lang="scss">
+	.container {
+		background: rgb(242, 243, 245);
+		height: 100vh;
+	}
+	
+	.uni-forms-item {
+		border-bottom: 1px solid #E5E6EB;
+		margin-bottom: 0;
+		padding: 24rpx 0;
+	}
+	
+	::v-deep .uni-forms-item__label {
+		color: #1D2129;
+		font-size: 28rpx;
+		font-weight: 400;
+	}
+	
+	::v-deep .uni-select {
+		border: 0px;
+	}
+	
+	::v-deep.uni-select__input-placeholder {
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #86909C;
+	}
+	
+	.textarea {
+		background-color: #F2F3F5;
+		width: 100%;
+	}
+	
+	::v-deep.full-width-textarea {
+		width: 100% !important;
+		border: unset !important;
+	}
+	
+	::v-deep .is-input-border {
+		border: unset;
+	}
+	
+	::v-deep .uni-easyinput__placeholder-class {
+		font-size: 28rpx;
+		color: #86909C;
+	}
+	
+	::v-deep .uni-input-input {
+		font-size: 28rpx;
+	}
+	
+	::v-deep .uni-select__input-placeholder {
+		font-size: 28rpx;
+		color: #86909C;
+	}
+	
+	::v-deep .uniui-bottom {
+		display: none;
+	}
+	
+	::v-deep .uniui-top {
+		display: none;
+	}
+	
+	.fromItem {
+		display: flex;
+		align-items: center;
+	}
+	
+	.example {
+		padding: 0 24rpx;
+		background-color: #fff;
+		width: 702rpx;
+		border-radius: 24rpx;
+		margin: 24rpx auto;
+	
+	}
 	/* 原有样式保留 */
 	.cu-form-group .title {
 		min-width: calc(4em + 15px);
diff --git a/pages/work/wms/emptyPalletOut.vue b/pages/work/wms/emptyPalletOut.vue
index ee0a29e..5a84d28 100644
--- a/pages/work/wms/emptyPalletOut.vue
+++ b/pages/work/wms/emptyPalletOut.vue
@@ -1,51 +1,64 @@
 <template>
 	<view class="container">
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
-			<block slot="backText">返回</block>
+		<cu-custom :isBack="true">
+			<block slot="backText"></block>
 			<block slot="content">空容器出库</block>
-		</cu-custom>
-		<view class="example">
-			<uni-forms ref="form" :model="formData" labelWidth="80px">
+			</cu-custom>
+			<view class="example">
+				<uni-forms ref="form" :model="formData" labelWidth="80px">
 
-				<uni-forms-item label="空容器"  name="palletCode">
-					<uni-easyinput  v-model="ktpCode"  disabled />
-				</uni-forms-item>
-				<uni-forms-item label="货位编号" name="locCode">
-					<uni-easyinput v-model="formData.locCode" placeholder="请扫描货位编号" @blur="trimLocInput"/>
-				</uni-forms-item>
-				<uni-forms-item label="容器数量" name="skuQty" >
-					<uni-easyinput v-model="formData.skuQty" disabled type="number" placeholder="请输入物料数量"/>
-				</uni-forms-item>
- 
- 
-			</uni-forms>
+					<uni-forms-item label="空容器" name="palletCode">
+						<view class="fromItem">
+							<uni-easyinput v-model="ktpCode" disabled />
+							<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
+						</view>
+					</uni-forms-item>
+					<uni-forms-item label="货位编号" name="locCode">
+						<view class="fromItem">
+							<uni-easyinput v-model="formData.locCode" placeholder="请扫描货位编号" @blur="trimLocInput" />
+							<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
+						</view>
+					</uni-forms-item>
+					<uni-forms-item label="容器数量" name="skuQty">
+						<view class="fromItem">
+							<uni-easyinput v-model="formData.skuQty" disabled type="number" placeholder="请输入物料数量" />
+							<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
+						</view>
+					</uni-forms-item>
 
-		  <view class="button-group">
-		    <button type="primary" style="width: 200px;" :disabled="isButtonDisabled" @click="submitPallet">呼叫出库</button>
 
-		  </view>
+				</uni-forms>
 
-		</view>
-		<view class="cu-modal" :class="msgModalName=='Modal'?'show':''">
-			<view class="cu-dialog">
-				<view class="cu-bar bg-white justify-end">
-					<view class="content">{{msgTitleName}}</view>
-					<view class="action" @tap="hideMsgModal">
-						<text class="cuIcon-close text-red"></text>
+			<!-- 	<view class="button-group">
+					<button type="primary" style="width: 200px;" :disabled="isButtonDisabled"
+						@click="submitPallet">呼叫出库</button>
+
+				</view> -->
+
+			</view>
+			<bottomBtn  :isSubmit="true" :isWhite="false" position="fixed" :disable="isButtonDisabled"
+			                :texts="['确认叫料']"  @onSubmit="submitPallet"></bottomBtn>
+			<view class="cu-modal" :class="msgModalName=='Modal'?'show':''">
+				<view class="cu-dialog">
+					<view class="cu-bar bg-white justify-end">
+						<view class="content">{{msgTitleName}}</view>
+						<view class="action" @tap="hideMsgModal">
+							<text class="cuIcon-close text-red"></text>
+						</view>
+					</view>
+					<view class="padding-xl">
+						{{msg}}
 					</view>
 				</view>
-				<view class="padding-xl">
-					{{msg}}
-				</view>
 			</view>
-		</view>
 	</view>
 
 </template>
 
 <script>
 	import {
-		getSkuDictionary,getSkuTypes
+		getSkuDictionary,
+		getSkuTypes
 	} from "@/api/wms/sku.js"
 	import {
 		callEmptyOut
@@ -56,15 +69,16 @@
 	import {
 		formatDate
 	} from 'tough-cookie';
+	import {bottomBtn} from '@/components/bottomBtn/bottomBtn.vue'
 	export default {
 		data() {
 			return {
-				isButtonDisabled:false,
-				autoCall:true,
-				ktpCode:"KTP0001",
-				msgTitleName:'标题',
-				msg:'消息',
-				msgModalName:"",
+				isButtonDisabled: false,
+				autoCall: true,
+				ktpCode: "KTP0001",
+				msgTitleName: '标题',
+				msg: '消息',
+				msgModalName: "",
 				//表单中的数据信息	
 				formData: {
 					locCode: "",
@@ -88,53 +102,121 @@
 			};
 		},
 		onLoad() {
-		
+
 		},
 		onReady() {
 			this.$refs.form.setRules(this.rules)
 		},
-
+component:{
+			bottomBtn
+		},
 		watch: {
 
 		},
 		methods: {
-			
+
 			//去除空格
 			trimLocInput(event) {
-			    this.formData.locCode = event.target.value.trim();
+				this.formData.locCode = event.target.value.trim();
 			},
 			//呼叫AGV
 			submitPallet: function() {
 				//this.msgModalName='Modal'
-				this.isButtonDisabled = true; 
-                this.$modal.loading("请等待...")
-                if(!this.formData.locCode){
-                    this.$modal.closeLoading()
-                }
-				const whcode=this.$store.state.user.warehouse[0]?.warehouseCode;
-                var data={
-					locCode:this.formData.locCode,
-					userCode:this.$store.state.user.name,
-					warehouseCode:whcode
-                }
-                callEmptyOut(data).then(response => {
-                    console.log("response", response)
-                    this.$modal.msgSuccess("呼叫入库成功")
-                }).finally(() => {
-                this.isButtonDisabled = false; // 恢复按钮可用
-                this.$modal.closeLoading()
-                });
+				this.isButtonDisabled = true;
+				this.$modal.loading("请等待...")
+				if (!this.formData.locCode) {
+					this.$modal.closeLoading()
+				}
+				const whcode = this.$store.state.user.warehouse[0]?.warehouseCode;
+				var data = {
+					locCode: this.formData.locCode,
+					userCode: this.$store.state.user.name,
+					warehouseCode: whcode
+				}
+				callEmptyOut(data).then(response => {
+					console.log("response", response)
+					this.$modal.msgSuccess("呼叫入库成功")
+				}).finally(() => {
+					this.isButtonDisabled = false; // 恢复按钮可用
+					this.$modal.closeLoading()
+				});
 			},
 			hideMsgModal(e) {
 				//关闭信息模态框
 				this.msgModalName = null;
 			},
-			 
+
 		}
 	}
 </script>
 
 <style lang="scss">
+	.container {
+		background: rgb(242, 243, 245);
+		height: 100vh;
+	}
+	
+	.uni-forms-item {
+		border-bottom: 1px solid #E5E6EB;
+		margin-bottom: 0;
+		padding: 24rpx 0;
+	}
+	
+	::v-deep .uni-forms-item__label {
+		color: #1D2129;
+		font-size: 28rpx;
+		font-weight: 400;
+	}
+	
+	::v-deep .uni-select {
+		border: 0px;
+	}
+	
+	::v-deep.uni-select__input-placeholder {
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #86909C;
+	}
+	.textarea{
+		background-color: #F2F3F5;
+		width: 100%;
+	}
+	::v-deep.full-width-textarea{
+		width: 100%!important;
+		border: unset!important;
+	}
+	::v-deep .is-input-border{
+		border: unset;
+	}
+	::v-deep .uni-easyinput__placeholder-class{
+		font-size: 28rpx;
+		color: #86909C;
+	}
+	::v-deep .uni-input-input{
+		font-size: 28rpx;
+	}
+	::v-deep .uni-select__input-placeholder{
+		font-size: 28rpx;
+		color: #86909C;
+	}
+	::v-deep .uniui-bottom{
+		display: none;
+	}
+	::v-deep .uniui-top{
+		display: none;
+	}
+	.fromItem{
+		display: flex;
+		align-items: center;
+	}
+	.example {
+		padding: 0 24rpx;
+		background-color: #fff;
+		width: 702rpx;
+		border-radius: 24rpx;
+		margin: 24rpx auto;
+	
+	}
 	.cu-form-group .title {
 		min-width: calc(4em + 15px);
 	}
@@ -143,10 +225,7 @@
 		background-color: #ffffff;
 	}
 
-	.example {
-		padding: 15px;
-		background-color: #fff;
-	}
+	
 
 	.segmented-control {
 		margin-bottom: 15px;
@@ -171,11 +250,12 @@
 		line-height: 35px;
 		margin-left: 10px;
 	}
- .switch-item {
-   display: flex;
-   align-items: center;
-   justify-content: space-between;
-   padding: 10px;
-   border-bottom: 1px solid #eee;
- }
+
+	.switch-item {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 10px;
+		border-bottom: 1px solid #eee;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/work/wms/manualCall.vue b/pages/work/wms/manualCall.vue
index ae5971b..11d5e3b 100644
--- a/pages/work/wms/manualCall.vue
+++ b/pages/work/wms/manualCall.vue
@@ -1,42 +1,59 @@
 <template>
 	<view class="container">
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
-			<block slot="backText">返回</block>
+		<cu-custom :isBack="true">
+			<block slot="backText"></block>
 			<block slot="content">人工叫料</block>
 		</cu-custom>
 		<view class="example">
 			<uni-forms ref="form" :model="formData" labelWidth="80px">
 				<uni-forms-item label="工位" name="locCode">
-					<uni-data-select v-model="formData.locCode" :localdata="stations" placeholder="请选择货位">
-					</uni-data-select>
-				</uni-forms-item>
-				<uni-forms-item label="物料类型" name="skuType">
-					<uni-data-select v-model="skuType" :localdata="skuTypeList" @change="changeSkuType" placeholder="请选择物料类型">
-					</uni-data-select>
-				</uni-forms-item>
-				<uni-forms-item label="物料" name="skuCode">
-					<uni-easyinput v-model="skuInput" placeholder="输入物料码" @input="onSkuInput"
-						@focus="showSkuDropdown = true" @blur="handleSkuBlur" />
-					<view class="sku-dropdown" v-if="showSkuDropdown && filteredSkuList.length > 0">
-						<view v-for="item in filteredSkuList" :key="item.value" class="dropdown-item"
-							@mousedown.prevent="selectSku(item)">
-							{{ item.text }}
-						</view>
+					<view class="fromItem">
+						<uni-data-select v-model="formData.locCode" :localdata="stations" placeholder="请选择货位">
+						</uni-data-select>
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
 					</view>
 				</uni-forms-item>
-				<uni-forms-item label="" name="">
-					<textarea class="full-width-textarea" v-model="skuInfo"></textarea>
+				<uni-forms-item label="物料类型" name="skuType">
+					<view class="fromItem">
+						<uni-data-select v-model="skuType" :localdata="skuTypeList" @change="changeSkuType"
+							placeholder="请选择物料类型">
+						</uni-data-select>
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
+					</view>
 				</uni-forms-item>
+				<uni-forms-item label="物料" name="skuCode">
+					<view class="fromItem">
+						<uni-easyinput v-model="skuInput" placeholder="输入物料码" @input="onSkuInput"
+							@focus="showSkuDropdown = true" @blur="handleSkuBlur" />
+						<view class="sku-dropdown" v-if="showSkuDropdown && filteredSkuList.length > 0">
+							<view v-for="item in filteredSkuList" :key="item.value" class="dropdown-item"
+								@mousedown.prevent="selectSku(item)">
+								{{ item.text }}
+							</view>
+						</view>
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
+					</view>
+
+				</uni-forms-item>
+				<view class="textarea">
+					<textarea class="full-width-textarea" v-model="skuInfo">
+							</textarea>
+				</view>
 				<uni-forms-item label="库存数量" name="countQty">
-					<uni-easyinput v-model="countQty"  disabled="true" />
+					<view class="fromItem">
+						<uni-easyinput v-model="countQty" disabled="true" />
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
+					</view>
 				</uni-forms-item>
 			</uni-forms>
-			
+			<!-- 		
 			<view class="button-group">
 				<button type="primary" :disabled="isButtonDisabled" style="width: 100px;" @click="callAgv">确认叫料</button>
-			</view>
+			</view> -->
 
 		</view>
+		<bottomBtn :isSubmit="true" :isWhite="false" position="fixed" :disable="isButtonDisabled" :texts="['确认叫料']"
+			@onSubmit="callAgv"></bottomBtn>
 		<view class="cu-modal" :class="msgModalName=='Modal'?'show':''">
 			<view class="cu-dialog">
 				<view class="cu-bar bg-white justify-end">
@@ -74,6 +91,9 @@
 	import {
 		formatDate
 	} from 'tough-cookie';
+	import {
+		bottomBtn
+	} from '@/components/bottomBtn/bottomBtn.vue'
 	export default {
 		data() {
 			return {
@@ -86,7 +106,7 @@
 				isButtonDisabled: false,
 				autoCall: true,
 				skuInfo: "",
-				countQty:"",
+				countQty: "",
 				callStatus: "已开启自动呼叫空容器",
 				//表单中的数据信息	
 				formData: {
@@ -225,7 +245,9 @@
 		onReady() {
 			this.$refs.form.setRules(this.rules)
 		},
-
+		component: {
+			bottomBtn
+		},
 		watch: {
 
 			async skuType(newVal) {
@@ -239,7 +261,7 @@
 				this.filteredSkuList = data.map(item => ({
 					value: item.skuCode,
 					text: `${item.skuCode} - ${item.skuName}`,
-					qtyDesc:`托数:${item.ext1} 总数量:${item.ext2}`
+					qtyDesc: `托数:${item.ext1} 总数量:${item.ext2}`
 				}));
 			}
 		},
@@ -252,7 +274,7 @@
 					.map(item => ({
 						value: item.skuCode,
 						text: `${item.skuCode} - ${item.skuName}`,
-						qtyDesc:`托数:${item.ext1} 总数量:${item.ext2}`
+						qtyDesc: `托数:${item.ext1} 总数量:${item.ext2}`
 					}));
 				this.showSkuDropdown = true;
 			},
@@ -298,10 +320,10 @@
 				this.skuTypeList = await getSkuTypes();
 				console.log("this.skutypeList", this.skuTypeList)
 			},
-			changeSkuType(){
-				this.skuInput='';
-				this.skuInfo='';
-				this.countQty='';
+			changeSkuType() {
+				this.skuInput = '';
+				this.skuInfo = '';
+				this.countQty = '';
 			},
 			//获取物料列表
 			// async getSkus() { 
@@ -501,6 +523,83 @@
 </script>
 
 <style lang="scss">
+	.container {
+		background: rgb(242, 243, 245);
+		height: 100vh;
+	}
+
+	.uni-forms-item {
+		border-bottom: 1px solid #E5E6EB;
+		margin-bottom: 0;
+		padding: 24rpx 0;
+	}
+
+	::v-deep .uni-forms-item__label {
+		color: #1D2129;
+		font-size: 28rpx;
+		font-weight: 400;
+	}
+
+	::v-deep .uni-select {
+		border: 0px;
+	}
+
+	::v-deep.uni-select__input-placeholder {
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #86909C;
+	}
+
+	.textarea {
+		background-color: #F2F3F5;
+		width: 100%;
+	}
+
+	::v-deep.full-width-textarea {
+		width: 100% !important;
+		border: unset !important;
+	}
+
+	::v-deep .is-input-border {
+		border: unset;
+	}
+
+	::v-deep .uni-easyinput__placeholder-class {
+		font-size: 28rpx;
+		color: #86909C;
+	}
+
+	::v-deep .uni-input-input {
+		font-size: 28rpx;
+	}
+
+	::v-deep .uni-select__input-placeholder {
+		font-size: 28rpx;
+		color: #86909C;
+	}
+
+	::v-deep .uniui-bottom {
+		display: none;
+	}
+
+	::v-deep .uniui-top {
+		display: none;
+	}
+
+	.fromItem {
+		display: flex;
+		align-items: center;
+	}
+
+	.example {
+		padding: 0 24rpx;
+		background-color: #fff;
+		width: 702rpx;
+		border-radius: 24rpx;
+		margin: 24rpx auto;
+
+	}
+
 	.sku-dropdown {
 		position: absolute;
 		z-index: 1000;
@@ -536,10 +635,7 @@
 		background-color: #ffffff;
 	}
 
-	.example {
-		padding: 15px;
-		background-color: #fff;
-	}
+
 
 	.segmented-control {
 		margin-bottom: 15px;
diff --git a/pages/work/wms/palletInfoQuery.vue b/pages/work/wms/palletInfoQuery.vue
index 94384e1..ec74824 100644
--- a/pages/work/wms/palletInfoQuery.vue
+++ b/pages/work/wms/palletInfoQuery.vue
@@ -1,16 +1,20 @@
 <!--托盘信息查询-->
 <template>
 	<view class="container">
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
-			<block slot="backText">返回</block>
+		<cu-custom  :isBack="true">
+			<block slot="backText"></block>
 			<block slot="content">托盘信息查询</block>
 		</cu-custom>
 		<view class="example">
 			<uni-forms ref="form" :model="formData" labelWidth="80px">
 				<uni-forms-item label="托盘编号" name="palletCode">
-					<view class="flex-twice  padding-0 radius">
-						<uni-easyinput v-model="formData.palletCode" placeholder="请输入托盘编号" @blur="queryPalletInfo" />
+					<view class="fromItem">
+						<view class="flex-twice  padding-0 radius">
+							<uni-easyinput v-model="formData.palletCode" placeholder="请输入托盘编号" @blur="queryPalletInfo" />
+						</view>
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
 					</view>
+				
 					<!-- <view class="flex-sub padding-0 margin-xs radius">
 						<view class="cu-capsule radius" v-if="palletInfo.needPickQty>0">
 							<view class='cu-tag bg-blue '>
@@ -20,7 +24,9 @@
 					</view> -->
 				</uni-forms-item>
 			</uni-forms>
-			<button type="primary" @click="formSubmit">托盘解绑</button>
+			<!-- <button type="primary" @click="formSubmit">托盘解绑</button> -->
+			<bottomBtn :isSubmit="true" :isWhite="false" position="fixed"  :texts="['托盘解绑']"
+				@onSubmit="formSubmit"></bottomBtn>
 			<!--明细-->
 			<view v-if='palletInfo.details.length>0'>
 				<view class="uni-container">
@@ -100,6 +106,9 @@
 	import {
 		formateDate
 	} from 'tough-cookie'
+	import {
+		bottomBtn
+	} from '@/components/bottomBtn/bottomBtn.vue'
 	export default {
 		data() {
 			return {
@@ -151,6 +160,9 @@
 		onReady() {
 			this.$refs.form.setRules(this.rules)
 		},
+		component: {
+			bottomBtn
+		},
 		methods: {
 			btnModify(e) {
 				console.log("修改按钮", e);
@@ -342,9 +354,81 @@
 		background-color: #ffffff;
 	}
 
+	.container {
+		background: rgb(242, 243, 245);
+		height: 100vh;
+	}
+	
+	.uni-forms-item {
+		border-bottom: 1px solid #E5E6EB;
+		margin-bottom: 0;
+		padding: 24rpx 0;
+	}
+	
+	::v-deep .uni-forms-item__label {
+		color: #1D2129;
+		font-size: 28rpx;
+		font-weight: 400;
+	}
+	
+	::v-deep .uni-select {
+		border: 0px;
+	}
+	
+	::v-deep.uni-select__input-placeholder {
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #86909C;
+	}
+	
+	.textarea {
+		background-color: #F2F3F5;
+		width: 100%;
+	}
+	
+	::v-deep.full-width-textarea {
+		width: 100% !important;
+		border: unset !important;
+	}
+	
+	::v-deep .is-input-border {
+		border: unset;
+	}
+	
+	::v-deep .uni-easyinput__placeholder-class {
+		font-size: 28rpx;
+		color: #86909C;
+	}
+	
+	::v-deep .uni-input-input {
+		font-size: 28rpx;
+	}
+	
+	::v-deep .uni-select__input-placeholder {
+		font-size: 28rpx;
+		color: #86909C;
+	}
+	
+	::v-deep .uniui-bottom {
+		display: none;
+	}
+	
+	::v-deep .uniui-top {
+		display: none;
+	}
+	
+	.fromItem {
+		display: flex;
+		align-items: center;
+	}
+	
 	.example {
-		padding: 15px;
+		padding: 0 24rpx;
 		background-color: #fff;
+		width: 702rpx;
+		border-radius: 24rpx;
+		margin: 24rpx auto;
+	
 	}
 
 	.segmented-control {
diff --git a/pages/work/wms/returnEmptyRack.vue b/pages/work/wms/returnEmptyRack.vue
index d9d47ca..8c3873c 100644
--- a/pages/work/wms/returnEmptyRack.vue
+++ b/pages/work/wms/returnEmptyRack.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
-			<block slot="backText">返回</block>
+		<cu-custom  :isBack="true">
+			<block slot="backText"></block>
 			<block slot="content">空工装返回</block>
 		</cu-custom>
 		<view class="example">
@@ -14,14 +14,15 @@
 					</view>
 				</view>
 			</uni-section>
-			
+		<!-- 	
 			<view class="button-container">
 				<button class="action-button" type="primary" @click="showEditDialog">
 					<text>修改工位</text>
 				</button>
-			</view>
+			</view> -->
 		</view>
-
+		<bottomBtn  :isSubmit="true" :isWhite="false" position="fixed" :disable="isButtonDisabled"
+		                :texts="['修改工位']"  @onSubmit="showEditDialog"></bottomBtn>
 		<!-- 工位编辑弹窗 -->
 		<uni-popup ref="editDialog" type="dialog">
 			<uni-popup-dialog mode="input" title="工位管理" 
@@ -36,7 +37,7 @@
 <script>
 import { getStation, setStation } from '@/utils/station'
 import { returnEmptyRack } from "@/api/wms/bill.js"
-
+	import {bottomBtn} from '@/components/bottomBtn/bottomBtn.vue'
 export default {
     data() {
         return {
@@ -49,6 +50,9 @@ export default {
     mounted() {
         this.loadStations();
     },
+	component:{
+		bottomBtn
+	},
     methods: {
         // 加载工位
         loadStations() {
@@ -122,9 +126,10 @@ export default {
 </script>
 
 <style lang="scss">
-.container {
-    padding: 20rpx;
-}
+	.container {
+		background: rgb(242, 243, 245);
+		height: 100vh;
+	}
 
 .station-container {
     display: flex;
@@ -132,7 +137,14 @@ export default {
     gap: 20rpx;
     padding: 20rpx;
 }
-
+.example {
+		padding: 0 24rpx;
+		background-color: #fff;
+		width: 702rpx;
+		border-radius: 24rpx;
+		margin: 24rpx auto;
+	
+	}
 .station-item {
     position: relative;
     background-color: #f0f0f0;
diff --git a/pages/work/wms/skuCreatePallet.vue b/pages/work/wms/skuCreatePallet.vue
index ac3480d..28436f6 100644
--- a/pages/work/wms/skuCreatePallet.vue
+++ b/pages/work/wms/skuCreatePallet.vue
@@ -1,66 +1,80 @@
 <template>
 	<view class="container">
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
-			<block slot="backText">返回</block>
+		<cu-custom :isBack="true">
 			<block slot="content">物料组盘 AGV入库</block>
 		</cu-custom>
 		<view class="example">
 			<uni-forms ref="form" :model="formData" labelWidth="80px">
 				<uni-forms-item label="生产线" name="lineCode">
-					<uni-data-select v-model="formData.lineCode" :localdata="lineCodeList"  
-					 placeholder="请选择收货线体">
-					</uni-data-select>
+					<view class="fromItem">
+						<uni-data-select v-model="formData.lineCode" :localdata="lineCodeList" placeholder="请选择收货线体">
+						</uni-data-select>
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
+					</view>
+					
 				</uni-forms-item>
 				<uni-forms-item label="物料类型" name="skuType">
-					<uni-data-select v-model="skuType" :localdata="skuTypeList" @change="changeSkuType"
-					 placeholder="请选择物料类型">
-					</uni-data-select>
+					
+					<view class="fromItem">
+						<uni-data-select v-model="skuType" :localdata="skuTypeList" @change="changeSkuType"
+							placeholder="请选择物料类型">
+						</uni-data-select>
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
+					</view>
 				</uni-forms-item>
 				<uni-forms-item label="物料" name="skuCode">
-									<uni-easyinput 
-										v-model="skuInput"
-										placeholder="输入物料码" 
-										@input="onSkuInput"
-										@focus="showSkuDropdown = true"
-										@blur="handleSkuBlur"
-									/>
-									<view class="sku-dropdown" v-if="showSkuDropdown && filteredSkuList.length > 0">
-										<view 
-											v-for="item in filteredSkuList" 
-											:key="item.value"
-											class="dropdown-item"
-											@mousedown.prevent="selectSku(item)"
-										>
-											{{ item.text }}
-										</view>
-									</view>
-								</uni-forms-item>
-				 <uni-forms-item label="" name="">
-						<textarea   class="full-width-textarea" v-model="skuInfo"    >
-						</textarea >
-					</uni-forms-item>
+					
+					<view class="fromItem">
+						<uni-easyinput v-model="skuInput" placeholder="输入物料码" @input="onSkuInput"
+							@focus="showSkuDropdown = true" @blur="handleSkuBlur" />
+						<view class="sku-dropdown" v-if="showSkuDropdown && filteredSkuList.length > 0">
+							<view v-for="item in filteredSkuList" :key="item.value" class="dropdown-item"
+								@mousedown.prevent="selectSku(item)">
+								{{ item.text }}
+							</view>
+						</view>
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
+					</view>
+					
+				</uni-forms-item>
+				<view class="textarea">
+						<textarea class="full-width-textarea" v-model="skuInfo">
+							</textarea>
+				</view>
+				
 				<uni-forms-item label="托盘编号" name="palletCode">
-					<uni-easyinput v-model="formData.palletCode" placeholder="请扫描托盘号" @blur="trimPalletInput"/>
+					<view class="fromItem">
+						<uni-easyinput v-model="formData.palletCode" placeholder="请扫描托盘号" @blur="trimPalletInput" />
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
+					</view>
 				</uni-forms-item>
 				<uni-forms-item label="货位编号" name="locCode">
-					<uni-easyinput v-model="formData.locCode" placeholder="请扫描货位编号" @blur="trimLocInput"/>
+					<view class="fromItem">
+						<uni-easyinput v-model="formData.locCode" placeholder="请扫描货位编号" @blur="trimLocInput" />
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
+					</view>
 				</uni-forms-item>
 				<uni-forms-item label="物料数量" name="skuQty">
-					<uni-easyinput v-model="formData.skuQty" type="number" placeholder="请输入物料数量"/>
+					<view class="fromItem">
+						<uni-easyinput v-model="formData.skuQty" type="number" placeholder="请输入物料数量" />
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
+					</view>
 				</uni-forms-item>
- 
- 
+
 			</uni-forms>
 			<view class="switch-item">
-					<view class="uni-list-cell-db">{{callStatus}}</view>
-					<switch :checked="autoCall" color="#0055ff" @change="switchChange" />
-				</view>
-		  <view class="button-group">
-		    <button type="primary" style="width: 100px;" :disabled="isButtonDisabled" @click="submitPallet">组盘</button>
-		    <button :disabled="isButtonDisabled" style="width: 100px;" @click="callAgv">确认入库</button>
-		  </view>
+				<view class="uni-list-cell-db">{{callStatus}}</view>
+				<switch :checked="autoCall"  @change="switchChange" />
+			</view>
+			<!-- <view class="button-group">
+				<button type="primary" style="width: 100px;" :disabled="isButtonDisabled"
+					@click="submitPallet">组盘</button>
+				<button :disabled="isButtonDisabled" style="width: 100px;" @click="callAgv">确认入库</button>
+			</view> -->
 
 		</view>
+		<bottomBtn :isDouble="true" :isSubmit="true" :isWhite="false" position="fixed" :disable="isButtonDisabled"
+                        :texts="['组盘', '确认入库']" @onCancel="submitPallet" @onSubmit="callAgv"></bottomBtn>
 		<view class="cu-modal" :class="msgModalName=='Modal'?'show':''">
 			<view class="cu-dialog">
 				<view class="cu-bar bg-white justify-end">
@@ -80,10 +94,13 @@
 
 <script>
 	import {
-		getSkuDictionary,getSkuTypes,getLineCodes
+		getSkuDictionary,
+		getSkuTypes,
+		getLineCodes
 	} from "@/api/wms/sku.js"
 	import {
-		createPalletBySku, callAgvIn
+		createPalletBySku,
+		callAgvIn
 	} from "@/api/wms/bill.js"
 	import {
 		getDictionary
@@ -91,22 +108,23 @@
 	import {
 		formatDate
 	} from 'tough-cookie';
+	import {bottomBtn} from '@/components/bottomBtn/bottomBtn.vue'
 	export default {
 		data() {
 			return {
 				skuInput: '',
-							showSkuDropdown: false,
-							filteredSkuList: [],
-							originalSkuList: [],
+				showSkuDropdown: false,
+				filteredSkuList: [],
+				originalSkuList: [],
 				whCode: this.$store.state.user.warehouse[0]?.warehouseCode,
-				userCode:this.$store.state.user.name,
-				isButtonDisabled:false,
-				autoCall:true,
-				skuInfo:"",
-				callStatus:"已开启自动呼叫空容器",
+				userCode: this.$store.state.user.name,
+				isButtonDisabled: false,
+				autoCall: true,
+				skuInfo: "",
+				callStatus: "已开启自动呼叫空容器",
 				//表单中的数据信息	
 				formData: {
-					lineCode:'',
+					lineCode: '',
 					palletCode: "",
 					skuCode: "",
 					locCode: "",
@@ -144,7 +162,7 @@
 						}]
 					}
 				},
-				
+
 				//查询获取的单据信息
 				billInfo: {
 					totalPlanQty: 0,
@@ -200,12 +218,12 @@
 						title: "组盘数量"
 					},
 				],
-				
+
 				warehouseList: [],
 				skuList: [],
-                skuType:'',
-                skuTypeList: [],
-				lineCodeList:[],
+				skuType: '',
+				skuTypeList: [],
+				lineCodeList: [],
 				skuArray: [],
 				skushow: false,
 				invoiceCode: null,
@@ -230,56 +248,60 @@
 			//加载入库单据类型下拉值列表
 			// this.getWarehouses()
 			//this.getInvoicesByBusinessType()
-		
+
 		},
 		onReady() {
 			this.$refs.form.setRules(this.rules)
 		},
-
+		component:{
+			bottomBtn
+		},
 		watch: {
- 
-					async skuType(newVal) {
-						const param = { categoryCode: this.skuType };
-						const data = await getSkuDictionary(param);
-						//this.skuList =data;
-						this.originalSkuList = data; // 存储原始数据
-						this.filteredSkuList = data.map(item => ({
-							value: item.skuCode,
-							text: `${item.skuCode} - ${item.skuName}`
-						}));
-					}
+
+			async skuType(newVal) {
+				const param = {
+					categoryCode: this.skuType
+				};
+				const data = await getSkuDictionary(param);
+				//this.skuList =data;
+				this.originalSkuList = data; // 存储原始数据
+				this.filteredSkuList = data.map(item => ({
+					value: item.skuCode,
+					text: `${item.skuCode} - ${item.skuName}`
+				}));
+			}
 		},
 		methods: {
 			onSkuInput(value) {
-						this.skuInput = value;
+				this.skuInput = value;
 
-							this.filteredSkuList = this.originalSkuList
-								.filter(item => item.skuCode.includes(value))
-								.map(item => ({
-									value: item.skuCode,
-									text: `${item.skuCode} - ${item.skuName}`
-								}));
-						this.showSkuDropdown = true;
-					},
-					selectSku(item) {
-						this.formData.skuCode = item.value;
-						this.skuInput = item.value; // 显示完整物料码
-						this.showSkuDropdown = false;
-						this.skuInfo= item.text
-					},
-					handleSkuBlur() {
-						setTimeout(() => {
-							this.showSkuDropdown = false;
-						}, 200);
-					},
+				this.filteredSkuList = this.originalSkuList
+					.filter(item => item.skuCode.includes(value))
+					.map(item => ({
+						value: item.skuCode,
+						text: `${item.skuCode} - ${item.skuName}`
+					}));
+				this.showSkuDropdown = true;
+			},
+			selectSku(item) {
+				this.formData.skuCode = item.value;
+				this.skuInput = item.value; // 显示完整物料码
+				this.showSkuDropdown = false;
+				this.skuInfo = item.text
+			},
+			handleSkuBlur() {
+				setTimeout(() => {
+					this.showSkuDropdown = false;
+				}, 200);
+			},
 			//去除空格
 			trimPalletInput(event) {
-			    this.formData.palletCode = event.target.value.trim();
+				this.formData.palletCode = event.target.value.trim();
 			},
-			
+
 			//去除空格
 			trimLocInput(event) {
-			    this.formData.locCode = event.target.value.trim();
+				this.formData.locCode = event.target.value.trim();
 			},
 			/// 数据来源 [模拟]
 			async fetch(param) {
@@ -289,12 +311,12 @@
 					data: response.data.record,
 				};
 			},
-			switchChange(e){
+			switchChange(e) {
 				this.autoCall = e.detail.value;
-				if(this.autoCall){
-					this.callStatus="已开启自动呼叫空容器"
-				}else{
-					this.callStatus="已停止自动呼叫空容器"
+				if (this.autoCall) {
+					this.callStatus = "已开启自动呼叫空容器"
+				} else {
+					this.callStatus = "已停止自动呼叫空容器"
 				}
 			},
 			//获取物料类型列表
@@ -304,23 +326,23 @@
 			//获取线体编号
 			async getLineCodes() {
 				this.lineCodeList = await getLineCodes();
-				console.log("this.lineCodeList",this.lineCodeList)
+				console.log("this.lineCodeList", this.lineCodeList)
 			},
-			changeSkuType(){
-				this.skuInput='';
-				this.skuInfo='';
+			changeSkuType() {
+				this.skuInput = '';
+				this.skuInfo = '';
 			},
 			//获取物料列表
 			// async getSkus() { 
 			// 	console.log("this.skuType",this.skuType)
-            //     if(this.skuType){
-            //         this.skuList = await getSkuDictionary(this.skuType);
-            //     }
+			//     if(this.skuType){
+			//         this.skuList = await getSkuDictionary(this.skuType);
+			//     }
 			// },
 			//获取仓库列表
 			async getWarehouses() {
 				this.warehouseList = await getDictionary('warehouseList');
-				console.log("this.warehouseList",this.warehouseList)
+				console.log("this.warehouseList", this.warehouseList)
 			},
 			// 多选处理
 			selectedItems() {
@@ -425,51 +447,51 @@
 			// }
 			//组盘
 			submitPallet: function(ref) {
-				this.isButtonDisabled = true; 
+				this.isButtonDisabled = true;
 				this.$modal.loading("请等待...")
 				this.$refs.form.validate().then(res => {
-					
-					let requestData={
+
+					let requestData = {
 						...this.formData,
-						userCode:this.userCode,
-						warehouseCode:this.whCode
+						userCode: this.userCode,
+						warehouseCode: this.whCode
 					}
 					createPalletBySku(requestData).then(response => {
 						console.log("response", response)
 						this.$modal.msgSuccess("组盘成功")
 					}).finally(() => {
-                    this.isButtonDisabled = false; // 恢复按钮可用
-				    this.$modal.closeLoading()
+						this.isButtonDisabled = false; // 恢复按钮可用
+						this.$modal.closeLoading()
 					});
-				}).catch(()=>{
-                    this.isButtonDisabled = false; // 恢复按钮可用
-				    this.$modal.closeLoading()
+				}).catch(() => {
+					this.isButtonDisabled = false; // 恢复按钮可用
+					this.$modal.closeLoading()
 				})
 			},
 			//呼叫AGV
 			callAgv: function() {
-				this.isButtonDisabled = true; 
-                this.$modal.loading("请等待...")
-                if(!this.formData.locCode){
-                    this.$modal.closeLoading()
-                }
-                if(!this.formData.palletCode){
-                    this.$modal.closeLoading()
-                }
-                var data={
-					locCode:this.formData.locCode,
-                    palletCode:this.formData.palletCode,
-					autoCall:this.autoCall,
-					userCode:this.userCode,
-					warehouseCode:this.whCode
-                }
-                callAgvIn(data).then(response => {
-                    console.log("response", response)
-                    this.$modal.msgSuccess("呼叫入库成功")
-                }).finally(() => {
-                this.isButtonDisabled = false; // 恢复按钮可用
-                this.$modal.closeLoading()
-                });
+				this.isButtonDisabled = true;
+				this.$modal.loading("请等待...")
+				if (!this.formData.locCode) {
+					this.$modal.closeLoading()
+				}
+				if (!this.formData.palletCode) {
+					this.$modal.closeLoading()
+				}
+				var data = {
+					locCode: this.formData.locCode,
+					palletCode: this.formData.palletCode,
+					autoCall: this.autoCall,
+					userCode: this.userCode,
+					warehouseCode: this.whCode
+				}
+				callAgvIn(data).then(response => {
+					console.log("response", response)
+					this.$modal.msgSuccess("呼叫入库成功")
+				}).finally(() => {
+					this.isButtonDisabled = false; // 恢复按钮可用
+					this.$modal.closeLoading()
+				});
 			},
 			hideMsgModal(e) {
 				//关闭信息模态框
@@ -508,7 +530,74 @@
 	}
 </script>
 
-<style lang="scss">
+<style scoped lang="scss">
+	.container {
+		background: rgb(242, 243, 245);
+		height: 100vh;
+	}
+
+	.uni-forms-item {
+		border-bottom: 1px solid #E5E6EB;
+		margin-bottom: 0;
+		padding: 24rpx 0;
+	}
+
+	::v-deep .uni-forms-item__label {
+		color: #1D2129;
+		font-size: 28rpx;
+		font-weight: 400;
+	}
+
+	::v-deep .uni-select {
+		border: 0px;
+	}
+
+	::v-deep.uni-select__input-placeholder {
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #86909C;
+	}
+	.textarea{
+		background-color: #F2F3F5;
+		width: 100%;
+	}
+	::v-deep.full-width-textarea{
+		width: 100%!important;
+		border: unset!important;
+	}
+	::v-deep .is-input-border{
+		border: unset;
+	}
+	::v-deep .uni-easyinput__placeholder-class{
+		font-size: 28rpx;
+		color: #86909C;
+	}
+	::v-deep .uni-input-input{
+		font-size: 28rpx;
+	}
+	::v-deep .uni-select__input-placeholder{
+		font-size: 28rpx;
+		color: #86909C;
+	}
+	::v-deep .uniui-bottom{
+		display: none;
+	}
+	::v-deep .uniui-top{
+		display: none;
+	}
+	.fromItem{
+		display: flex;
+		align-items: center;
+	}
+	.example {
+		padding: 0 24rpx;
+		background-color: #fff;
+		width: 702rpx;
+		border-radius: 24rpx;
+		margin: 24rpx auto;
+	
+	}
+	// 文字色/三级文字-#86909C
 	.sku-dropdown {
 		position: absolute;
 		z-index: 1000;
@@ -518,22 +607,24 @@
 		max-height: 200px;
 		overflow-y: auto;
 		width: 100%;
-		box-shadow: 0 2px 12px rgba(0,0,0,0.1);
+		box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
 	}
+
 	.dropdown-item {
 		padding: 8px 12px;
 		font-size: 14px;
 		color: #333;
 		border-bottom: 1px solid #eee;
 	}
-	
+
 	.dropdown-item:last-child {
 		border-bottom: none;
 	}
-	
+
 	.dropdown-item:hover {
 		background-color: #f5f5f5;
 	}
+
 	.cu-form-group .title {
 		min-width: calc(4em + 15px);
 	}
@@ -542,10 +633,7 @@
 		background-color: #ffffff;
 	}
 
-	.example {
-		padding: 15px;
-		background-color: #fff;
-	}
+	
 
 	.segmented-control {
 		margin-bottom: 15px;
@@ -570,25 +658,26 @@
 		line-height: 35px;
 		margin-left: 10px;
 	}
- .switch-item {
-   display: flex;
-   align-items: center;
-   justify-content: space-between;
-   padding: 10px;
-   border-bottom: 1px solid #eee;
- }
 
- /* 输入框样式 */
- .full-width-textarea {
-     width: calc(100vw - 260rpx); /* 直接扣除边距 */
- 
-   padding: 20rpx;
-   box-sizing: border-box;
-   border: 2rpx solid #e5e5e5;
-   border-radius: 8rpx;
-   min-height: 200rpx;
-   font-size: 28rpx;
-   line-height: 1.5;
- }
- 
+	.switch-item {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 10px;
+		border-bottom: 1px solid #eee;
+	}
+
+	/* 输入框样式 */
+	.full-width-textarea {
+		width: calc(100vw - 260rpx);
+		/* 直接扣除边距 */
+
+		padding: 20rpx;
+		box-sizing: border-box;
+		border: 2rpx solid #e5e5e5;
+		border-radius: 8rpx;
+		min-height: 200rpx;
+		font-size: 28rpx;
+		line-height: 1.5;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/work/wms/skuCreatePalletByCode.vue b/pages/work/wms/skuCreatePalletByCode.vue
index 2361427..094ccfb 100644
--- a/pages/work/wms/skuCreatePalletByCode.vue
+++ b/pages/work/wms/skuCreatePalletByCode.vue
@@ -1,41 +1,60 @@
 <template>
 	<view class="container">
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
-			<block slot="backText">返回</block>
+		<cu-custom :isBack="true">
+			<block slot="backText"></block>
 			<block slot="content">一码通组盘 AGV入库</block>
 		</cu-custom>
 		<view class="example">
 			<uni-forms ref="form" :model="formData" labelWidth="80px">
-				<uni-forms-item label="一码通" >
-					<uni-easyinput v-model="barCode" placeholder="请扫描一码通"
-					 @blur="trimbarCode"  @confirm="handleEnter"/>
+				<uni-forms-item label="一码通">
+					<view class="fromItem">
+						<uni-easyinput v-model="barCode" placeholder="请扫描一码通" @blur="trimbarCode"
+							@confirm="handleEnter" />
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
+					</view>
+
 				</uni-forms-item>
 				<uni-forms-item label="物料">
-					<uni-easyinput v-model="formData.palletCode" disabled/>
-				</uni-data-select>
+					<view class="fromItem">
+						<uni-easyinput v-model="formData.palletCode" disabled />
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
+					</view>
+					</uni-data-select>
 				</uni-forms-item>
 				<uni-forms-item label="托盘编号">
-					<uni-easyinput v-model="formData.palletCode" disabled />
+					<view class="fromItem">
+						<uni-easyinput v-model="formData.palletCode" disabled />
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
+					</view>
 				</uni-forms-item>
 				<uni-forms-item label="货位编号">
-					<uni-easyinput v-model="formData.locCode" placeholder="请扫描货位编号" @blur="trimLocInput" />
+					<view class="fromItem">
+						<uni-easyinput v-model="formData.locCode" placeholder="请扫描货位编号" @blur="trimLocInput" />
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
+					</view>
 				</uni-forms-item>
 				<uni-forms-item label="物料数量">
-					<uni-easyinput v-model="formData.skuQty" type="number" disabled />
+					<view class="fromItem">
+						<uni-easyinput v-model="formData.skuQty" type="number" disabled />
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
+					</view>
 				</uni-forms-item>
- 
- 
+
+
 			</uni-forms>
 			<view class="switch-item">
-					<view class="uni-list-cell-db">{{callStatus}}</view>
-					<switch :checked="autoCall" color="#0055ff" @change="switchChange" />
-				</view>
-		  <view class="button-group">
-		    <button type="primary" style="width: 100px;" :disabled="isButtonDisabled" @click="submitPallet">组盘</button>
-		    <button :disabled="isButtonDisabled" style="width: 100px;" @click="callAgv">确认入库</button>
-		  </view>
+				<view class="uni-list-cell-db">{{callStatus}}</view>
+				<switch :checked="autoCall"  @change="switchChange" />
+			</view>
+		<!-- 	<view class="button-group">
+				<button type="primary" style="width: 100px;" :disabled="isButtonDisabled"
+					@click="submitPallet">组盘</button>
+				<button :disabled="isButtonDisabled" style="width: 100px;" @click="callAgv">确认入库</button>
+			</view> -->
 
 		</view>
+		<bottomBtn :isDouble="true" :isSubmit="true" :isWhite="false" position="fixed" :disable="isButtonDisabled"
+		                :texts="['组盘', '确认入库']" @onCancel="submitPallet" @onSubmit="callAgv"></bottomBtn>
 		<view class="cu-modal" :class="msgModalName=='Modal'?'show':''">
 			<view class="cu-dialog">
 				<view class="cu-bar bg-white justify-end">
@@ -55,10 +74,12 @@
 
 <script>
 	import {
-		getSkuDictionary,getSkuTypes
+		getSkuDictionary,
+		getSkuTypes
 	} from "@/api/wms/sku.js"
 	import {
-		createPalletBySku, callAgvIn
+		createPalletBySku,
+		callAgvIn
 	} from "@/api/wms/bill.js"
 	import {
 		getDictionary
@@ -66,14 +87,17 @@
 	import {
 		formatDate
 	} from 'tough-cookie';
-	import { debounce } from 'lodash';
+	import {
+		debounce
+	} from 'lodash';
+	import {bottomBtn} from '@/components/bottomBtn/bottomBtn.vue'
 	export default {
 		data() {
 			return {
-				barCode:'',
-				isButtonDisabled:false,
-				autoCall:true,
-				callStatus:"已开启自动呼叫空容器",
+				barCode: '',
+				isButtonDisabled: false,
+				autoCall: true,
+				callStatus: "已开启自动呼叫空容器",
 				//表单中的数据信息	
 				formData: {
 					palletCode: "",
@@ -107,7 +131,7 @@
 						}]
 					}
 				},
-				
+
 				//查询获取的单据信息
 				billInfo: {
 					totalPlanQty: 0,
@@ -163,11 +187,11 @@
 						title: "组盘数量"
 					},
 				],
-				
+
 				warehouseList: [],
 				skuList: [],
-                skuType:'',
-                skuTypeList: [],
+				skuType: '',
+				skuTypeList: [],
 				skuArray: [],
 				skushow: false,
 				invoiceCode: null,
@@ -191,31 +215,35 @@
 			//加载入库单据类型下拉值列表
 			// this.getWarehouses()
 			//this.getInvoicesByBusinessType()
-		
+
 		},
 		onReady() {
 			this.$refs.form.setRules(this.rules)
 		},
-
+	component:{
+			bottomBtn
+		},
 		watch: {
-			async  skuType(newVal) {
-				var param={categoryCode:this.skuType}
+			async skuType(newVal) {
+				var param = {
+					categoryCode: this.skuType
+				}
 				this.skuList = await getSkuDictionary(param);
-			 
+
 			}
 		},
 		methods: {
-			handleEnter:_.debounce(function() {
-			    console.log('回车键被按下，当前输入值：', this.barCode);
+			handleEnter: _.debounce(function() {
+				console.log('回车键被按下，当前输入值：', this.barCode);
 			}, 500),
- 
+
 			//去除空格
 			trimLocInput(event) {
-			    this.formData.locCode = event.target.value.trim();
+				this.formData.locCode = event.target.value.trim();
 			},
 			//去除空格
 			trimbarCode(event) {
-			    this.barCode = event.target.value.trim();
+				this.barCode = event.target.value.trim();
 			},
 			/// 数据来源 [模拟]
 			async fetch(param) {
@@ -225,30 +253,30 @@
 					data: response.data.record,
 				};
 			},
-			switchChange(e){
+			switchChange(e) {
 				this.autoCall = e.detail.value;
-				if(this.autoCall){
-					this.callStatus="已开启自动呼叫空容器"
-				}else{
-					this.callStatus="已停止自动呼叫空容器"
+				if (this.autoCall) {
+					this.callStatus = "已开启自动呼叫空容器"
+				} else {
+					this.callStatus = "已停止自动呼叫空容器"
 				}
 			},
 			//获取物料类型列表
 			async getSkuTypes() {
 				this.skuTypeList = await getSkuTypes();
-				console.log("this.skutypeList",this.skuTypeList)
+				console.log("this.skutypeList", this.skuTypeList)
 			},
 			//获取物料列表
 			// async getSkus() { 
 			// 	console.log("this.skuType",this.skuType)
-            //     if(this.skuType){
-            //         this.skuList = await getSkuDictionary(this.skuType);
-            //     }
+			//     if(this.skuType){
+			//         this.skuList = await getSkuDictionary(this.skuType);
+			//     }
 			// },
 			//获取仓库列表
 			async getWarehouses() {
 				this.warehouseList = await getDictionary('warehouseList');
-				console.log("this.warehouseList",this.warehouseList)
+				console.log("this.warehouseList", this.warehouseList)
 			},
 			// 多选处理
 			selectedItems() {
@@ -353,7 +381,7 @@
 			// }
 			//组盘
 			submitPallet: function(ref) {
-				this.isButtonDisabled = true; 
+				this.isButtonDisabled = true;
 				this.$modal.loading("请等待...")
 				this.$refs.form.validate().then(res => {
 					console.log("数据校验通过", res)
@@ -361,36 +389,36 @@
 						console.log("response", response)
 						this.$modal.msgSuccess("组盘成功")
 					}).finally(() => {
-                    this.isButtonDisabled = false; // 恢复按钮可用
-				    this.$modal.closeLoading()
+						this.isButtonDisabled = false; // 恢复按钮可用
+						this.$modal.closeLoading()
 					});
-				}).catch(()=>{
-                    this.isButtonDisabled = false; // 恢复按钮可用
-				    this.$modal.closeLoading()
+				}).catch(() => {
+					this.isButtonDisabled = false; // 恢复按钮可用
+					this.$modal.closeLoading()
 				})
 			},
 			//呼叫AGV
 			callAgv: function() {
-				this.isButtonDisabled = true; 
-                this.$modal.loading("请等待...")
-                if(!this.formData.locCode){
-                    this.$modal.closeLoading()
-                }
-                if(!this.formData.palletCode){
-                    this.$modal.closeLoading()
-                }
-                var data={
-					locCode:this.formData.locCode,
-                    palletCode:this.formData.palletCode,
-					autoCall:this.autoCall
-                }
-                callAgvIn(data).then(response => {
-                    console.log("response", response)
-                    this.$modal.msgSuccess("呼叫入库成功")
-                }).finally(() => {
-                this.isButtonDisabled = false; // 恢复按钮可用
-                this.$modal.closeLoading()
-                });
+				this.isButtonDisabled = true;
+				this.$modal.loading("请等待...")
+				if (!this.formData.locCode) {
+					this.$modal.closeLoading()
+				}
+				if (!this.formData.palletCode) {
+					this.$modal.closeLoading()
+				}
+				var data = {
+					locCode: this.formData.locCode,
+					palletCode: this.formData.palletCode,
+					autoCall: this.autoCall
+				}
+				callAgvIn(data).then(response => {
+					console.log("response", response)
+					this.$modal.msgSuccess("呼叫入库成功")
+				}).finally(() => {
+					this.isButtonDisabled = false; // 恢复按钮可用
+					this.$modal.closeLoading()
+				});
 			},
 			hideMsgModal(e) {
 				//关闭信息模态框
@@ -429,7 +457,65 @@
 	}
 </script>
 
-<style lang="scss">
+<style  scoped lang="scss">
+	.container {
+		background: rgb(242, 243, 245);
+		height: 100vh;
+	}
+	
+	.uni-forms-item {
+		border-bottom: 1px solid #E5E6EB;
+		margin-bottom: 0;
+		padding: 24rpx 0;
+	}
+	
+	::v-deep .uni-forms-item__label {
+		color: #1D2129;
+		font-size: 28rpx;
+		font-weight: 400;
+	}
+	
+	::v-deep .uni-select {
+		border: 0px;
+	}
+	
+	::v-deep.uni-select__input-placeholder {
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #86909C;
+	}
+	.textarea{
+		background-color: #F2F3F5;
+		width: 100%;
+	}
+	::v-deep.full-width-textarea{
+		width: 100%!important;
+		border: unset!important;
+	}
+	::v-deep .is-input-border{
+		border: unset;
+	}
+	::v-deep .uni-easyinput__placeholder-class{
+		font-size: 28rpx;
+		color: #86909C;
+	}
+	::v-deep .uni-input-input{
+		font-size: 28rpx;
+	}
+	::v-deep .uni-select__input-placeholder{
+		font-size: 28rpx;
+		color: #86909C;
+	}
+	::v-deep .uniui-bottom{
+		display: none;
+	}
+	::v-deep .uniui-top{
+		display: none;
+	}
+	.fromItem{
+		display: flex;
+		align-items: center;
+	}
 	.cu-form-group .title {
 		min-width: calc(4em + 15px);
 	}
@@ -439,8 +525,12 @@
 	}
 
 	.example {
-		padding: 15px;
+		padding: 0 24rpx;
 		background-color: #fff;
+		width: 702rpx;
+		border-radius: 24rpx;
+		margin: 24rpx auto;
+	
 	}
 
 	.segmented-control {
@@ -466,11 +556,12 @@
 		line-height: 35px;
 		margin-left: 10px;
 	}
- .switch-item {
-   display: flex;
-   align-items: center;
-   justify-content: space-between;
-   padding: 10px;
-   border-bottom: 1px solid #eee;
- }
+
+	.switch-item {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 10px;
+		border-bottom: 1px solid #eee;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/work/wms/surplusOut.vue b/pages/work/wms/surplusOut.vue
index 5c90cb8..caa5fd3 100644
--- a/pages/work/wms/surplusOut.vue
+++ b/pages/work/wms/surplusOut.vue
@@ -1,43 +1,60 @@
 <template>
 	<view class="container">
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
-			<block slot="backText">返回</block>
+		<cu-custom :isBack="true">
+			<block slot="backText"></block>
 			<block slot="content">余料出库</block>
 		</cu-custom>
 		<view class="example">
 			<uni-forms ref="form" :model="formData" labelWidth="80px">
 				<uni-card>注意：余料出库后请人工拉走，系统会自动清除托盘信息</uni-card>
-				
+
 				<uni-forms-item label="货位编号" name="locCode">
-					<uni-easyinput v-model="formData.locCode" placeholder="请扫描货位编号" @blur="trimLocInput"/>
-				</uni-forms-item>
-				<uni-forms-item label="物料类型" name="skuType">
-					<uni-data-select v-model="skuType" :localdata="skuTypeList" @change="changeSkuType" placeholder="请选择物料类型">
-					</uni-data-select>
-				</uni-forms-item>
-				<uni-forms-item label="物料" name="skuCode">
-					<uni-easyinput v-model="skuInput" placeholder="输入物料码" @input="onSkuInput"
-						@focus="showSkuDropdown = true" @blur="handleSkuBlur" />
-					<view class="sku-dropdown" v-if="showSkuDropdown && filteredSkuList.length > 0">
-						<view v-for="item in filteredSkuList" :key="item.value" class="dropdown-item"
-							@mousedown.prevent="selectSku(item)">
-							{{ item.text }}
-						</view>
+					<view class="fromItem">
+						<uni-easyinput v-model="formData.locCode" placeholder="请扫描货位编号" @blur="trimLocInput" />
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
 					</view>
 				</uni-forms-item>
-				<uni-forms-item label="" name="">
-					<textarea class="full-width-textarea" v-model="skuInfo"></textarea>
+				<uni-forms-item label="物料类型" name="skuType">
+					<view class="fromItem">
+						<uni-data-select v-model="skuType" :localdata="skuTypeList" @change="changeSkuType"
+							placeholder="请选择物料类型">
+						</uni-data-select>
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
+					</view>
+
 				</uni-forms-item>
+				<uni-forms-item label="物料" name="skuCode">
+					<view class="fromItem">
+						<uni-easyinput v-model="skuInput" placeholder="输入物料码" @input="onSkuInput"
+							@focus="showSkuDropdown = true" @blur="handleSkuBlur" />
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
+					</view>
+				</uni-forms-item>
+				<view class="sku-dropdown" v-if="showSkuDropdown && filteredSkuList.length > 0">
+					<view v-for="item in filteredSkuList" :key="item.value" class="dropdown-item"
+						@mousedown.prevent="selectSku(item)">
+						{{ item.text }}
+					</view>
+				</view>
+				<view class="textarea">
+					<textarea class="full-width-textarea" v-model="skuInfo">
+							</textarea>
+				</view>
 				<uni-forms-item label="库存数量" name="countQty">
-					<uni-easyinput v-model="countQty"  disabled="true" />
+					<view class="fromItem">
+						<uni-easyinput v-model="countQty" disabled="true" />
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
+					</view>
 				</uni-forms-item>
 			</uni-forms>
-			
-			<view class="button-group">
+
+		<!-- 	<view class="button-group">
 				<button type="primary" :disabled="isButtonDisabled" style="width: 100px;" @click="callAgv">确认叫料</button>
-			</view>
+			</view> -->
 
 		</view>
+		<bottomBtn :isSubmit="true" :isWhite="false" position="fixed" :disable="isButtonDisabled" :texts="['确认叫料']"
+			@onSubmit="callAgv"></bottomBtn>
 		<view class="cu-modal" :class="msgModalName=='Modal'?'show':''">
 			<view class="cu-dialog">
 				<view class="cu-bar bg-white justify-end">
@@ -76,6 +93,9 @@
 	import {
 		formatDate
 	} from 'tough-cookie';
+	import {
+		bottomBtn
+	} from '@/components/bottomBtn/bottomBtn.vue'
 	export default {
 		data() {
 			return {
@@ -88,7 +108,7 @@
 				isButtonDisabled: false,
 				autoCall: true,
 				skuInfo: "",
-				countQty:"",
+				countQty: "",
 				callStatus: "已开启自动呼叫空容器",
 				//表单中的数据信息	
 				formData: {
@@ -202,6 +222,9 @@
 				msg: null
 			};
 		},
+		component: {
+			bottomBtn
+		},
 		onLoad() {
 			//加载物料下拉值列表
 			this.getSkuTypes()
@@ -241,7 +264,7 @@
 				this.filteredSkuList = data.map(item => ({
 					value: item.skuCode,
 					text: `${item.skuCode} - ${item.skuName}`,
-					qtyDesc:`托数:${item.ext1} 总数量:${item.ext2}`
+					qtyDesc: `托数:${item.ext1} 总数量:${item.ext2}`
 				}));
 			}
 		},
@@ -254,7 +277,7 @@
 					.map(item => ({
 						value: item.skuCode,
 						text: `${item.skuCode} - ${item.skuName}`,
-						qtyDesc:`托数:${item.ext1} 总数量:${item.ext2}`
+						qtyDesc: `托数:${item.ext1} 总数量:${item.ext2}`
 					}));
 				this.showSkuDropdown = true;
 			},
@@ -300,10 +323,10 @@
 				this.skuTypeList = await getSkuTypes();
 				console.log("this.skutypeList", this.skuTypeList)
 			},
-			changeSkuType(){
-				this.skuInput='';
-				this.skuInfo='';
-				this.countQty='';
+			changeSkuType() {
+				this.skuInput = '';
+				this.skuInfo = '';
+				this.countQty = '';
 			},
 			//获取物料列表
 			// async getSkus() { 
@@ -443,7 +466,7 @@
 			},
 			//去除空格
 			trimLocInput(event) {
-			    this.formData.locCode = event.target.value.trim();
+				this.formData.locCode = event.target.value.trim();
 			},
 			//呼叫AGV
 			callAgv: function() {
@@ -542,9 +565,81 @@
 		background-color: #ffffff;
 	}
 
+	.container {
+		background: rgb(242, 243, 245);
+		height: 100vh;
+	}
+	
+	.uni-forms-item {
+		border-bottom: 1px solid #E5E6EB;
+		margin-bottom: 0;
+		padding: 24rpx 0;
+	}
+	
+	::v-deep .uni-forms-item__label {
+		color: #1D2129;
+		font-size: 28rpx;
+		font-weight: 400;
+	}
+	
+	::v-deep .uni-select {
+		border: 0px;
+	}
+	
+	::v-deep.uni-select__input-placeholder {
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #86909C;
+	}
+	
+	.textarea {
+		background-color: #F2F3F5;
+		width: 100%;
+	}
+	
+	::v-deep.full-width-textarea {
+		width: 100% !important;
+		border: unset !important;
+	}
+	
+	::v-deep .is-input-border {
+		border: unset;
+	}
+	
+	::v-deep .uni-easyinput__placeholder-class {
+		font-size: 28rpx;
+		color: #86909C;
+	}
+	
+	::v-deep .uni-input-input {
+		font-size: 28rpx;
+	}
+	
+	::v-deep .uni-select__input-placeholder {
+		font-size: 28rpx;
+		color: #86909C;
+	}
+	
+	::v-deep .uniui-bottom {
+		display: none;
+	}
+	
+	::v-deep .uniui-top {
+		display: none;
+	}
+	
+	.fromItem {
+		display: flex;
+		align-items: center;
+	}
+	
 	.example {
-		padding: 15px;
+		padding: 12rpx 24rpx 0;
 		background-color: #fff;
+		width: 702rpx;
+		border-radius: 24rpx;
+		margin: 24rpx auto;
+	
 	}
 
 	.segmented-control {
diff --git a/pages/work/wms/surplusReturn.vue b/pages/work/wms/surplusReturn.vue
index f9289ef..27f6a71 100644
--- a/pages/work/wms/surplusReturn.vue
+++ b/pages/work/wms/surplusReturn.vue
@@ -1,34 +1,48 @@
 <template>
 	<view class="container">
-		<cu-custom bgColor="bg-gradual-pink" :isBack="true">
-			<block slot="backText">返回</block>
+		<cu-custom  :isBack="true">
+			<block slot="backText"></block>
 			<block slot="content">余料回库</block>
 		</cu-custom>
 		<view class="example">
 			<uni-forms ref="form" :model="formData" labelWidth="80px">
 				<uni-forms-item label="托盘编号" name="palletCode">
-					<uni-easyinput v-model="formData.palletCode" placeholder="请扫描托盘号" @blur="trimPalletInput"/>
+					<view class="fromItem">
+						<uni-easyinput v-model="formData.palletCode" placeholder="请扫描托盘号" @blur="trimPalletInput"/>
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
+					</view>
 				</uni-forms-item>
 				<uni-forms-item label="物料编号" name="skuCode">
-					<uni-easyinput v-model="this.skuCode" disabled/>
+					<view class="fromItem">
+						<uni-easyinput v-model="this.skuCode" disabled/>
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
+					</view>
 				</uni-forms-item>
 				<uni-forms-item label="物料描述" name="skuName">
-					<textarea class="full-width-textarea"  v-model="this.skuName" disabled/>
+					
 				</uni-forms-item>
 				<uni-forms-item label="余料数量" name="surplusQty">
-					<uni-easyinput v-model="formData.surplusQty" type="number" placeholder="请输入余料数量"/>
+					<view class="fromItem">
+						<uni-easyinput v-model="formData.surplusQty" type="number" placeholder="请输入余料数量"/>
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
+					</view>
 				</uni-forms-item>
 				<uni-forms-item label="工位" name="locCode">
-					<uni-data-select v-model="formData.locCode" :localdata="stations" 
-					 placeholder="请选择货位">
-					</uni-data-select>
+					<view class="fromItem">
+						<uni-data-select v-model="formData.locCode" :localdata="stations"
+						 placeholder="请选择货位">
+						</uni-data-select>
+						<image style="width: 28rpx;" src="/static/images/right.png" mode="widthFix"></image>
+					</view>
 				</uni-forms-item>
 			</uni-forms>
-		  <view class="button-group">
+	<!-- 	  <view class="button-group">
 		    <button :disabled="isButtonDisabled" style="width: 100px;" @click="callAgv">确认回库</button>
-		  </view>
+		  </view> -->
 
 		</view>
+		<bottomBtn :isSubmit="true" :isWhite="false" position="fixed" :disable="isButtonDisabled" :texts="['确认回库']"
+			@onSubmit="callAgv"></bottomBtn>
 		<view class="cu-modal" :class="msgModalName=='Modal'?'show':''">
 			<view class="cu-dialog">
 				<view class="cu-bar bg-white justify-end">
@@ -61,6 +75,9 @@
 	import {
 		formatDate
 	} from 'tough-cookie';
+	import {
+		bottomBtn
+	} from '@/components/bottomBtn/bottomBtn.vue'
 	export default {
 		data() {
 			return {
@@ -181,6 +198,9 @@
 				msg: null
 			};
 		},
+		component: {
+			bottomBtn
+		},
 		onLoad() {
 			//加载物料下拉值列表
 			this.getSkuTypes()
@@ -465,7 +485,83 @@
 	}
 </script>
 
-<style lang="scss">
+<style scoped lang="scss">
+	.container {
+		background: rgb(242, 243, 245);
+		height: 100vh;
+	}
+	
+	.uni-forms-item {
+		border-bottom: 1px solid #E5E6EB;
+		margin-bottom: 0;
+		padding: 24rpx 0;
+	}
+	
+	::v-deep .uni-forms-item__label {
+		color: #1D2129;
+		font-size: 28rpx;
+		font-weight: 400;
+	}
+	
+	::v-deep .uni-select {
+		border: 0px;
+	}
+	
+	::v-deep.uni-select__input-placeholder {
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #86909C;
+	}
+	
+	.textarea {
+		background-color: #F2F3F5;
+		width: 100%;
+	}
+	
+	::v-deep.full-width-textarea {
+		width: 100% !important;
+		border: unset !important;
+	}
+	
+	::v-deep .is-input-border {
+		border: unset;
+	}
+	
+	::v-deep .uni-easyinput__placeholder-class {
+		font-size: 28rpx;
+		color: #86909C;
+	}
+	
+	::v-deep .uni-input-input {
+		font-size: 28rpx;
+	}
+	
+	::v-deep .uni-select__input-placeholder {
+		font-size: 28rpx;
+		color: #86909C;
+	}
+	
+	::v-deep .uniui-bottom {
+		display: none;
+	}
+	
+	::v-deep .uniui-top {
+		display: none;
+	}
+	
+	.fromItem {
+		display: flex;
+		align-items: center;
+	}
+	
+	.example {
+		padding: 0 24rpx;
+		background-color: #fff;
+		width: 702rpx;
+		border-radius: 24rpx;
+		margin: 24rpx auto;
+	
+	}
 	.cu-form-group .title {
 		min-width: calc(4em + 15px);
 	}
@@ -474,10 +570,7 @@
 		background-color: #ffffff;
 	}
 
-	.example {
-		padding: 15px;
-		background-color: #fff;
-	}
+	
 
 	.segmented-control {
 		margin-bottom: 15px;
diff --git a/static/images/loginBg.jpg b/static/images/loginBg.jpg
new file mode 100644
index 0000000..8190fed
Binary files /dev/null and b/static/images/loginBg.jpg differ
diff --git a/static/images/loginBg.png b/static/images/loginBg.png
new file mode 100644
index 0000000..efe3079
Binary files /dev/null and b/static/images/loginBg.png differ
diff --git a/static/images/pass.png b/static/images/pass.png
new file mode 100644
index 0000000..0c222ac
Binary files /dev/null and b/static/images/pass.png differ
diff --git a/static/images/right.png b/static/images/right.png
new file mode 100644
index 0000000..44211eb
Binary files /dev/null and b/static/images/right.png differ
diff --git a/static/images/tabbar/home.png b/static/images/tabbar/home.png
index 50acdfd..15bd69e 100644
Binary files a/static/images/tabbar/home.png and b/static/images/tabbar/home.png differ
diff --git a/static/images/tabbar/homeS.png b/static/images/tabbar/homeS.png
new file mode 100644
index 0000000..4b42b1a
Binary files /dev/null and b/static/images/tabbar/homeS.png differ
diff --git a/static/images/tabbar/home_.png b/static/images/tabbar/home_.png
deleted file mode 100644
index a408f71..0000000
Binary files a/static/images/tabbar/home_.png and /dev/null differ
diff --git a/static/images/tabbar/mine.png b/static/images/tabbar/mine.png
index f13fe44..0d95308 100644
Binary files a/static/images/tabbar/mine.png and b/static/images/tabbar/mine.png differ
diff --git a/static/images/tabbar/mineS.png b/static/images/tabbar/mineS.png
new file mode 100644
index 0000000..5c1ab40
Binary files /dev/null and b/static/images/tabbar/mineS.png differ
diff --git a/static/images/tabbar/mine_.png b/static/images/tabbar/mine_.png
deleted file mode 100644
index 8a0a742..0000000
Binary files a/static/images/tabbar/mine_.png and /dev/null differ
diff --git a/static/images/tabbar/work.png b/static/images/tabbar/work.png
index 21e130d..86d1f04 100644
Binary files a/static/images/tabbar/work.png and b/static/images/tabbar/work.png differ
diff --git a/static/images/tabbar/workS.png b/static/images/tabbar/workS.png
new file mode 100644
index 0000000..13dd039
Binary files /dev/null and b/static/images/tabbar/workS.png differ
diff --git a/static/images/tabbar/work_.png b/static/images/tabbar/work_.png
deleted file mode 100644
index 80b979c..0000000
Binary files a/static/images/tabbar/work_.png and /dev/null differ
diff --git a/static/images/user.png b/static/images/user.png
new file mode 100644
index 0000000..b80b4a5
Binary files /dev/null and b/static/images/user.png differ
diff --git a/static/images/work/组合 1747.png b/static/images/work/组合 1747.png
new file mode 100644
index 0000000..9292030
Binary files /dev/null and b/static/images/work/组合 1747.png differ
diff --git a/static/images/work/组合 1749.png b/static/images/work/组合 1749.png
new file mode 100644
index 0000000..f6b2974
Binary files /dev/null and b/static/images/work/组合 1749.png differ
diff --git a/static/images/work/组合 1752.png b/static/images/work/组合 1752.png
new file mode 100644
index 0000000..35887bc
Binary files /dev/null and b/static/images/work/组合 1752.png differ
diff --git a/static/images/work/组合 1753.png b/static/images/work/组合 1753.png
new file mode 100644
index 0000000..95dc4cc
Binary files /dev/null and b/static/images/work/组合 1753.png differ
diff --git a/static/images/work/组合 1756.png b/static/images/work/组合 1756.png
new file mode 100644
index 0000000..fdb3d25
Binary files /dev/null and b/static/images/work/组合 1756.png differ
diff --git a/static/images/work/组合 1758.png b/static/images/work/组合 1758.png
new file mode 100644
index 0000000..613d4fe
Binary files /dev/null and b/static/images/work/组合 1758.png differ
diff --git a/static/images/work/组合 1759.png b/static/images/work/组合 1759.png
new file mode 100644
index 0000000..24d87a8
Binary files /dev/null and b/static/images/work/组合 1759.png differ
diff --git a/static/images/work/组合 1762.png b/static/images/work/组合 1762.png
new file mode 100644
index 0000000..e59329d
Binary files /dev/null and b/static/images/work/组合 1762.png differ
diff --git a/static/images/work/组合 1763.png b/static/images/work/组合 1763.png
new file mode 100644
index 0000000..61342a2
Binary files /dev/null and b/static/images/work/组合 1763.png differ
diff --git a/static/images/work/组合 1764.png b/static/images/work/组合 1764.png
new file mode 100644
index 0000000..a781736
Binary files /dev/null and b/static/images/work/组合 1764.png differ
diff --git a/static/json/dynamicRouter.json b/static/json/dynamicRouter.json
index 4c6e015..e3cd7dd 100644
--- a/static/json/dynamicRouter.json
+++ b/static/json/dynamicRouter.json
@@ -7,61 +7,61 @@
 			"name": "skuCreatePallet",
 			"title": "组盘入库",
 			"color": "red",
-			"icon": "cuIcon-forwardfill"
+			"icon": "/static/images/work/组合 1747.png"
 		}, 
 		{
 			"path": "/pages/work/wms/skuCreatePalletByCode",
 			"name": "skuCreatePalletByCode",
 			"title": "一码通入库",
 			"color": "red",
-			"icon": "cuIcon-qr_code"
+			"icon": "/static/images/work/组合 1749.png"
 		},
 		{
 			"path": "/pages/work/wms/manualCall",
 			"name": "manualCall",
 			"title": "人工叫料",
 			"color": "red",
-			"icon": "cuIcon-forward"
+			"icon": "/static/images/work/组合 1753.png"
 		},
 		{
 			"path": "/pages/work/wms/emptyPalletOut",
 			"name": "emptyPalletOut",
 			"title": "空容器出库",
 			"color": "red",
-			"icon": "cuIcon-upload"
+			"icon": "/static/images/work/组合 1756.png"
 		},
 		{
 			"path": "/pages/work/wms/returnEmptyRack",
 			"name": "returnEmptyRack",
 			"title": "空工装回库",
 			"color": "red",
-			"icon": "cuIcon-forward"
+			"icon": "/static/images/work/组合 1758.png"
 		},
 		{
 			"path": "/pages/work/wms/surplusReturn",
 			"name": "surplusReturn",
 			"title": "余料回库",
 			"color": "red",
-			"icon": "cuIcon-forward"
+			"icon": "/static/images/work/组合 1759.png"
 		},
 		{
 			"path": "/pages/work/wms/clearEmptyLoc",
 			"name": "clearEmptyLoc",
 			"title": "工装货位腾空",
-			"icon": "cuIcon-exit"
+			"icon": "/static/images/work/组合 1763.png"
 		},
 		{
 			"path": "/pages/work/wms/palletInfoQuery",
 			"name": "palletInfoQuery",
 			"title": "托盘信息查询",
-			"icon": "cuIcon-search"
+			"icon": "/static/images/work/组合 1764.png"
 		},
 		{
 			"path": "/pages/work/wms/surplusOut",
 			"name": "surplusOut",
 			"title": "余料出库",
 			"color": "red",
-			"icon": "cuIcon-forward"
+			"icon": "/static/images/work/组合 1762.png"
 		}
 	],
 	"msg": "成功"
diff --git a/static/scss/colorui.css b/static/scss/colorui.css
index 07380a5..79921e0 100644
--- a/static/scss/colorui.css
+++ b/static/scss/colorui.css
@@ -11,7 +11,7 @@
         main 初始化
  ==================== */
 body {
-	background-color: #f1f1f1;
+	background-color: #ffff;
 	font-size: 28upx;
 	color: #333333;
 	font-family: Helvetica Neue, Helvetica, sans-serif;
@@ -1071,7 +1071,7 @@ button.cuIcon.lg {
 	flex-direction: column;
 	justify-content: center;
 	font-size: 28upx;
-	z-index: 9999;
+	z-index: 99;
 	line-height: 2.4em;
 }
 
@@ -1885,7 +1885,7 @@ button.cuIcon.lg {
 	padding-right: 150upx;
 	/* #endif */
 	box-shadow: 0upx 0upx 0upx;
-	z-index: 9999;
+	z-index: 99;
 }
 
 .cu-custom .cu-bar .border-custom {