From d7ad4f31d11d07a74814b0e177891c6b71442f20 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期一, 23 九月 2024 10:04:40 +0800
Subject: [PATCH] update

---
 sub_pages/supplier/flower-manage/flower-manage.vue |   46 +++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/sub_pages/supplier/flower-manage/flower-manage.vue b/sub_pages/supplier/flower-manage/flower-manage.vue
index 53dd868..932828f 100644
--- a/sub_pages/supplier/flower-manage/flower-manage.vue
+++ b/sub_pages/supplier/flower-manage/flower-manage.vue
@@ -8,10 +8,14 @@
 			<view @click.stop="clickButton('delete')" class="button button-search-delete" style="margin-top: -1rpx;">
 			</view>
 		</view>
-		<view class="top-buttons" v-if="type==='delete'">
-			<view v-if="type === 'delete'"  class="button t-red " @click.stop="deleteSelected()">删除</view>
-			<view v-if="type === 'delete'"  class="button " @click.stop="recoverSelected()">恢复</view>
+		
+		<view class="recycle-button"  v-if="type==='delete'">
+		<view class="buttons" >
+				<view v-if="type === 'delete'" class="button t-red"  @click.stop="deleteSelected()">删除</view>
+				<view v-if="type === 'delete'" class="button"  @click.stop="recoverSelected()">恢复</view>
 		</view>
+		</view>
+	
 		<view class="p15" style="min-height: calc(100vh - 500rpx);">
 			<no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>
 			
@@ -68,6 +72,10 @@
 									<view class="label">价格</view>
 									<view class="value">{{item.price||'-'}}</view>
 								</view>
+								<view class="each-item">
+									<view class="label">限购数量</view>
+									<view class="value">{{item.limited||'-'}}</view>
+								</view>
 							</view>
 						</view>
 					</view>
@@ -85,7 +93,7 @@
 						<view class="button" @click.stop="openValue(item,'stock')">库存</view>
 						<view class="button" @click.stop="toDetailAdd(item)">复制</view>
 
-						<view class="button t-red" @click.stop="buttonDelete(item)">删除</view>
+						<view v-if="type !== 'delete' && (item.status==='OFF' || item.status==='FORCE_OFF')  " class="button t-red" @click.stop="buttonDelete(item)">删除</view>
 
 					</view>
 				</view>
@@ -154,7 +162,7 @@
 		async onLoad(options) {
 			this.type = options.type || 'all'
 			var title = ''
-			this.page.size = 5
+			this.page.size = 20
 			//todo 根据type切换查询条件
 			if (this.type === 'delete') {
 				this.listApi = '/api/supplier/flower/list/rc'
@@ -575,5 +583,33 @@
 
 			}
 		}
+		
+		.recycle-button{
+			
+			
+			
+			min-height: 50rpx;
+			background-color: #fff;
+			
+			.buttons {
+				display: flex;
+				justify-content: flex-end;
+				background-color: #fff;
+				padding: 22rpx 42rpx;
+		
+				.button {
+					margin: 0 auto;
+					width: 98rpx;
+					line-height: 48rpx;
+					border-radius: 24rpx;
+					border: 2rpx solid #CECECE;
+					text-align: center;
+					font-size: 24rpx;
+					color: #666666;
+					line-height: 34rpx;
+				}
+			}
+		}
+		
 	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3