优化

pages.json

@@ -1404,6 +1404,15 @@
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "white"
 			}
+		},
+		
+		{
+			"path": "pages/pda/workOrder/search/index",
+			"style": {
+				"navigationBarTitleText": "搜索",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
 		}
 
 
@@ -1411,6 +1420,7 @@
 
 
 
+
 	],
 	"tabBar": {
 		"color": "#908f8f",

pages/pda/picking/add.vue

@@ -4,7 +4,15 @@
 		<uni-nav-bar fixed="true" statusBar="true" left-icon="back" title="领料" background-color="#F7F9FA"
 			color="#404446" @clickLeft="back">
 			<block slot="right">
-				<button @click="openSearch" class="search_btn">搜索</button>
+				
+				<u-button
+				  type="success"
+				  size="small"
+				  class="u-reset-button"
+				  @click="openSearch"
+				  text="搜索"
+				></u-button>
+			
 			</block>
 			</uni-nav-bar>
 			
@@ -19,7 +27,23 @@
 		</view>
 
 		<view class="bottom-wrapper">
-			<view class="btn_box"></view>
+			<view class="btn_box rx-bc">
+				<view class="zdy_check rx-cc" @click='allChecked = !allChecked' :class="{ check_active : allChecked }">
+					<u-icon size="28" v-if='allChecked' name='checkbox-mark'></u-icon>
+				</view>
+				
+				
+		         <view>
+					 <u-button
+					   type="success"
+					   class="u-reset-button"
+					   @click="openSearch"
+					   text="确定添加"
+					 ></u-button>
+				 </view>
+				
+				
+			</view>
 		</view>
 
 
@@ -35,7 +59,7 @@
 		data() {
 			return {
 
-				show: false,
+				allChecked: false,
 				searchFrom: {
 					keyWord: ''
 				}
@@ -45,7 +69,11 @@
 
 			scrolltolower() {},
 
-			openSearch() {},
+			openSearch() {
+				uni.navigateTo({
+					url: '/pages/pda/workOrder/search/index'
+				})
+			},
 
 		}
 	}
@@ -62,16 +90,7 @@
 
 
 
-	.search_btn {
-		width: 120rpx;
-		height: 70rpx;
-		line-height: 70rpx;
-		padding: 0 24rpx;
-		background: $theme-color;
-		font-size: 32rpx;
-		color: #fff;
-		margin: 0;
-	}
+
 
 	.list_box {
 		flex: 1;
@@ -84,8 +103,28 @@
 	}
 
 	.btn_box {
-		width: 750rpx;
 		height: 112rpx;
 		background: #fff;
+		padding: 0 32rpx;
+		
+		.zdy_check {
+			width: 30rpx;
+			height: 30rpx;
+			border: 2rpx solid #c8c9cc;
+			border-radius: 4rpx;
+		
+		
+		}
+		
+		.check_active {
+			background: $theme-color;
+			border: 2rpx solid $theme-color;
+		
+			/deep/ .u-icon__icon {
+				color: #fff !important;
+			}
+		}
+		
+	
 	}
 </style>

pages/pda/picking/details.vue

@@ -14,7 +14,15 @@
 						</view>
 
 						<view class="right_box rx-ec">
-							<view class="btn" @click="addPicking">添加物料</view>
+							
+							<u-button
+							  type="success"
+							  size="small"
+							  class="u-reset-button"
+							  @click="addPicking"
+							  text="添加物料"
+							></u-button>
+							
 						</view>
 
 					</view>
@@ -175,17 +183,7 @@
 		}
 
 		.right_box {
-			.btn {
-				height: 40rpx;
-				line-height: 40rpx;
-				padding: 4rpx 8rpx;
-				background: #157A2C;
-				font-size: 24rpx;
-				font-style: normal;
-				font-weight: 400;
-				color: #fff;
-				border-radius: 4rpx;
-			}
+	
 
 		}
 

pages/pda/workOrder/search/index.vue

@@ -0,0 +1,47 @@
+<template>
+	<view class="content-box">
+		
+		<uni-nav-bar
+		  fixed="true"
+		  statusBar="true"
+		  left-icon="back"
+		  title="搜索"
+		  @clickLeft="back"
+		>
+		  <!--右菜单-->
+		  <template slot="right">
+		    <u-button
+		      type="success"
+		      size="small"
+		      class="u-reset-button"
+		      @click="$refs.treePicker._show()"
+		      text="选择分类"
+		    ></u-button>
+		  </template>
+		</uni-nav-bar>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content-box {
+		height: 100vh;
+		overflow: hidden;
+		display: flex;
+		flex-direction: column;
+		background-color: $page-bg;
+	}
+</style>

uni.scss

@@ -13,7 +13,7 @@
  */
 
 /* 颜色变量 */
-$j-primary-green:#33cc66; //主题颜色 - 绿色
+$j-primary-green:#157A2C; //主题颜色 - 绿色
 $j-primary-border-green: #157a2c;
 $theme-color: #157A2C;
 $border-color: #E3E5E5;

uni_modules/uview-ui/theme.scss

@@ -20,9 +20,9 @@ $u-warning-dark: #f1a532;
 $u-warning-disabled: #f9d39b;
 $u-warning-light: #fdf6ec;
 
-$u-success: #5ac725;
-$u-success-dark: #53c21d;
-$u-success-disabled: #a9e08f;
+$u-success: #157A2C;
+$u-success-dark: #157A2C;
+$u-success-disabled: #157A2C;
 $u-success-light: #f5fff0;
 
 $u-error: #f56c6c;