From b0c20e677e8c5824ef733b0f23639592830bf71d Mon Sep 17 00:00:00 2001
From: "tianyi@bogon" <ittianyi@163.com>
Date: Mon, 23 Oct 2023 23:23:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E5=92=8C=E6=96=B0=E5=A2=9E=E5=95=86=E5=93=81=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/inventory/inventory.vue | 20 +++++++++++++---
 pages/login/login.vue         | 43 +++++++++++++++++++++++++++++++----
 2 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/pages/inventory/inventory.vue b/pages/inventory/inventory.vue
index 419dc75..cc4f0ba 100644
--- a/pages/inventory/inventory.vue
+++ b/pages/inventory/inventory.vue
@@ -36,7 +36,12 @@
 			</view>
 		</view>
 		<view class="search">
-			<u-search placeholder="输入商品名称/编号查询" v-model="keyword"></u-search>
+			<!-- <u-search placeholder="输入商品名称/编号查询" v-model="keyword"></u-search> -->
+			<uni-search-bar class="uni-mt-10" radius="5" placeholder="商品名称/编号" cancelButton="none"
+				@confirm="search" />
+			<view class="title-right-bottom title-btn" style="width:22%;float: left;height:75rpx;line-height: 75rpx;margin-top:20rpx;" @click="onGridClick('2')">
+				新增商品
+			</view>
 		</view>
 		<view class="content-box">
 			<view class="content-left">
@@ -205,7 +210,7 @@
 
 <style lang="scss" scoped>
 	.search {
-		padding: 20upx;
+		// padding: 20upx;
 		background-color: #fff;
 		// position: fixed;
 		// top: 0;
@@ -362,5 +367,14 @@
 
 	.price-box text:first-child {
 		color: #ffa200
-	}
+	}
+	.uni-mt-10 {
+		    position: relative;
+		    width: 74% !important;
+		    float: left !important;
+	}
+	.uni-searchbar,.uni-searchbar__box{
+		width: 100% !important;
+	}
+	
 </style>
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index cda054b..0dffd5f 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -56,11 +56,12 @@
 				<view class="popup-content">
 					<view class="popup-title">
 						<text>选择店铺</text>
-						<!-- <uni-icons @tap='close' type="closeempty" color='red' size="16"
-							style="height:40rpx;line-height: 40rpx;position: absolute;right: 0;"></uni-icons> -->
 					</view>
 					<view class="popup-container">
-						<text style="display: inline-block;text-indent: 2em;">{{item.remark}}</text>
+						<text style="display: inline-block">张三的店</text>
+					</view>
+					<view class="popup-container">
+						<text style="display: inline-block">李四的店</text>
 					</view>
 				</view>
 			</uni-popup>
@@ -134,7 +135,6 @@
 			},
 			//登录
 			goLogin() {
-				// this.isChoose = true;
 				let data = {}
 				if (this.loginWay) { //true
 					data = {
@@ -338,5 +338,40 @@
 
 	.code-box {
 		display: flex;
+	}
+	.popup-content {
+		align-items: center;
+		justify-content: center;
+		padding: 15px;
+		width: 500rpx;
+		height: auto;
+		background-color: #fff;
+	}
+	
+	.popup-title {
+		font-size: 36rpx;
+		font-weight: bold;
+		text-align: center;
+		position: relative;
+	}
+	
+	.popup-container {
+		   margin-top: 20rpx;
+		       height: 100rpx;
+		       border-radius: 10px;
+		       background: #088FEB;
+		       line-height: 100rpx;
+		       text-align: center;
+		       border-bottom: 1px solid #eee;
+		       border-top: 1px solid #eee;
+		       color: #fff;
+	}
+	
+	.phone-btn {
+		    width: 150rpx;
+		    height: 75rpx;
+		    color: #088FEB;
+		    line-height: 75rpx;
+		    font-size: 26rpx;
 	}
 </style>
\ No newline at end of file