From 52748a0cf85aa819db74737def3366a5b5d043af Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Mon, 9 Aug 2021 09:37:26 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7=E7=89=A9=E8=B5=84=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 canteen/pages/purchase/receipt.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/canteen/pages/purchase/receipt.vue b/canteen/pages/purchase/receipt.vue
index 381d61f..9d3cae3 100644
--- a/canteen/pages/purchase/receipt.vue
+++ b/canteen/pages/purchase/receipt.vue
@@ -3,6 +3,7 @@
 		<view class="card" v-for="(item, index) in list" :key="index">
 			<view class="lf-row-between">
 				<view class="lf-color-black lf-font-bold" v-if="item.material && item.material.m_name">{{ item.material.m_name }}</view>
+				<view>{{item.spec.name}}</view>
 				<!-- 修改功能先隐藏 -->
 				<!-- <view style="color: #11D189;" @click="showEdit">修改</view> -->
 			</view>
@@ -265,7 +266,7 @@
 				if(!this.is_upload){
 					return this.$msg('请上传凭证后再确认收货');
 				}
-				return this.$msg('PASS');
+				// return this.$msg('PASS');
 				this.$http(this.API.API_CONFIRM, {
 					p_sn: this.p_sn,
 					state: '已入库',

From bf95b758e7d4e98b007e6ec2b928431acf07e90c Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Mon, 9 Aug 2021 10:02:13 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=8F=91=E8=B5=B7=E6=8A=A5=E4=BB=B7?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 supplier/pages/offer/index.vue | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/supplier/pages/offer/index.vue b/supplier/pages/offer/index.vue
index f1776da..341159c 100644
--- a/supplier/pages/offer/index.vue
+++ b/supplier/pages/offer/index.vue
@@ -45,7 +45,11 @@
 		<view class="box">
 			<view class="lf-m-b-20 lf-row-between">
 				<view class="lf-font-32 lf-color-black lf-font-bold">报价明细</view>
-				<input placeholder="搜索物资" confirm-type="search" :value="searchValue" @input="inputChange" @confirm="inputConfirm" style="background: pink;" />
+				<view class="flex lf-row-between">
+					<u-icon name="search" style="position: relative;left: 50rpx;" v-if="show_icon"></u-icon>
+					<input placeholder="搜索物资" confirm-type="search" @focus="hideIcon()" class="search-self" :value="searchValue" @input="inputChange" @confirm="inputConfirm" />
+				</view>
+				
 			</view>
 			<wyb-table :first-line-fixed="true" 
 				contentBgColor="#eef6fe" 
@@ -78,6 +82,7 @@
 		},
 		data(){
 			return {
+				show_icon: true,
 				headers: [{
 					label: '物资名称',
 					key: 'name',
@@ -173,6 +178,11 @@
 			}
 		},
 		methods: {
+			hideIcon() {
+				if(this.searchValue != '') {
+					this.show_icon = false;
+				}
+			},
 			// 搜索input值被改变
 			inputChange(event){
 				if(timer){
@@ -182,6 +192,10 @@
 				timer = setTimeout(() => {
 					this.searchValue = event.detail.value;
 				}, 1000);
+				this.show_icon = false;
+				if(event.detail.value == '') {
+					this.show_icon = true;
+				}
 			},
 			// 搜索按下回车
 			inputConfirm(event){
@@ -455,6 +469,15 @@
 	}
 </style>
 <style lang="scss" scoped="scoped">
+	.search-self {
+		background: rgb(228,228,228);
+		padding: 10rpx 0 10rpx 20rpx;
+		border-radius: 40rpx;
+	}
+	.search-self .uni-input-placeholder {
+		margin-left: 40rpx;
+		color: #333;
+	}
 	.lf-m-t-5{
 		margin-top: 5rpx;
 	}

From c7431fabf60f6fb1f4dad377325d47de1e5c525e Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Mon, 9 Aug 2021 10:14:53 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=9C=AA=E8=AF=BB=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 canteen/pages/index/index.vue  | 7 ++++---
 supplier/pages/index/index.vue | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/canteen/pages/index/index.vue b/canteen/pages/index/index.vue
index 6484865..2f12a69 100644
--- a/canteen/pages/index/index.vue
+++ b/canteen/pages/index/index.vue
@@ -37,7 +37,7 @@
 				block_list: []
 			}
 		},
-		onLoad() {
+		onShow() {
 			// todo 优化：显示订单角标
 			this.getHomeData();
 		},
@@ -83,8 +83,9 @@
 </style>
 <style lang="scss" scoped="scoped">
 	.message-tag {
-		width: 60rpx;
-		height: 60rpx;
+		width: 52rpx;
+		height: 52rpx;
+		font-size: 16rpx;
 		background-color: red;
 		border-radius: 50%;
 		margin-right: 10rpx;
diff --git a/supplier/pages/index/index.vue b/supplier/pages/index/index.vue
index 043cb76..1f11161 100644
--- a/supplier/pages/index/index.vue
+++ b/supplier/pages/index/index.vue
@@ -37,7 +37,7 @@
 				block_list: []
 			}
 		},
-		onLoad(){
+		onShow() {
 			// todo 优化：显示订单角标
 			this.getData();
 		},
@@ -85,8 +85,9 @@
 </style>
 <style lang="scss" scoped="scoped">
 	.message-tag {
-		width: 60rpx;
-		height: 60rpx;
+		width: 52rpx;
+		height: 52rpx;
+		font-size: 16rpx;
 		background-color: red;
 		border-radius: 50%;
 		margin-right: 10rpx;

From 2843f81896acc481a203ad30a9bf32b46e5b2006 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Mon, 9 Aug 2021 11:07:39 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 supplier/pages/offer/index.vue | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/supplier/pages/offer/index.vue b/supplier/pages/offer/index.vue
index 341159c..6e5264f 100644
--- a/supplier/pages/offer/index.vue
+++ b/supplier/pages/offer/index.vue
@@ -46,7 +46,7 @@
 			<view class="lf-m-b-20 lf-row-between">
 				<view class="lf-font-32 lf-color-black lf-font-bold">报价明细</view>
 				<view class="flex lf-row-between">
-					<u-icon name="search" style="position: relative;left: 50rpx;" v-if="show_icon"></u-icon>
+					<u-icon name="search" class="search-icon" v-if="show_icon"></u-icon>
 					<input placeholder="搜索物资" confirm-type="search" @focus="hideIcon()" class="search-self" :value="searchValue" @input="inputChange" @confirm="inputConfirm" />
 				</view>
 				
@@ -192,9 +192,10 @@
 				timer = setTimeout(() => {
 					this.searchValue = event.detail.value;
 				}, 1000);
-				this.show_icon = false;
 				if(event.detail.value == '') {
 					this.show_icon = true;
+				}else {
+					this.show_icon = false;
 				}
 			},
 			// 搜索按下回车
@@ -469,14 +470,21 @@
 	}
 </style>
 <style lang="scss" scoped="scoped">
+	.search-icon {
+		position: relative;
+		left: 50rpx;
+		color: #777;
+	}
 	.search-self {
 		background: rgb(228,228,228);
 		padding: 10rpx 0 10rpx 20rpx;
 		border-radius: 40rpx;
+		font-size: 28rpx;
 	}
 	.search-self .uni-input-placeholder {
 		margin-left: 40rpx;
-		color: #333;
+		color: #777;
+		font-size: 28rpx;
 	}
 	.lf-m-t-5{
 		margin-top: 5rpx;

From 1ad58477776dfdabd2d14b889fe6067e24057ece Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Mon, 9 Aug 2021 15:43:19 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 canteen/pages/purchase/receipt.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/canteen/pages/purchase/receipt.vue b/canteen/pages/purchase/receipt.vue
index 9d3cae3..5c94777 100644
--- a/canteen/pages/purchase/receipt.vue
+++ b/canteen/pages/purchase/receipt.vue
@@ -2,8 +2,11 @@
 	<view class="content">
 		<view class="card" v-for="(item, index) in list" :key="index">
 			<view class="lf-row-between">
-				<view class="lf-color-black lf-font-bold" v-if="item.material && item.material.m_name">{{ item.material.m_name }}</view>
-				<view>{{item.spec.name}}</view>
+				<view class="flex lf-row-center justify-center text-center">
+					<view class="lf-color-black lf-font-bold" v-if="item.material && item.material.m_name">{{ item.material.m_name }}</view>
+					<view class="lf-m-l-10">{{item.spec.name}}</view>
+				</view>
+				<view>单位: {{item.material.unit.unit_name}}</view>
 				<!-- 修改功能先隐藏 -->
 				<!-- <view style="color: #11D189;" @click="showEdit">修改</view> -->
 			</view>