From 36f5a552738ff64d35e5508a1db8c2249b9187b0 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期四, 27 六月 2024 14:25:33 +0800
Subject: [PATCH] update1

---
 sub_pages/farmer/flower-manage/flower-manage.vue |   48 +++++++++++++++++++++++++++++++-----------------
 1 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/sub_pages/farmer/flower-manage/flower-manage.vue b/sub_pages/farmer/flower-manage/flower-manage.vue
index 9734e0a..7187f3c 100644
--- a/sub_pages/farmer/flower-manage/flower-manage.vue
+++ b/sub_pages/farmer/flower-manage/flower-manage.vue
@@ -23,7 +23,7 @@
 									{{item.categoryStr || '-'}}
 								</view>
 							</view>
-							<view class="each-list m-t-12">
+							<view class="each-list">
 								<view class="each-item">
 									<view class="label">状态</view>
 									<view class="value">{{item.statusStr || '-'}}</view>
@@ -61,10 +61,10 @@
 					<view class="buttons">
 						<view class="button" @click.stop="toDetail(item)">编辑</view>
 
-						<view class="button" @click.stop="buttonStatus(item,'FORCE_OFF')"
-							v-if="item.status=='FORCE_UP'">下架</view>
-						<view class="button" @click.stop="buttonStatus(item,'FORCE_UP')"
-							v-if="item.status=='FORCE_OFF'">上架</view>
+						<view class="button" @click.stop="buttonStatus(item,'OFF')"
+							v-if="item.status=='UP'">下架</view>
+						<view class="button" @click.stop="buttonStatus(item,'UP')"
+							v-if="item.status=='OFF'||item.status=='FORCE_OFF'">上架</view>
 						<view class="button" @click.stop="openValue(item,'price')">价格</view>
 						<view class="button" @click.stop="openValue(item,'stock')">库存</view>
 						<view class="button" @click.stop="toDetailAdd(item)">复制</view>
@@ -90,7 +90,7 @@
 					</view>
 
 					<!-- 输入框-->
-					<view class="flex w-fit">
+					<view class="flex w-fit ">
 
 						<u-input v-model="content" :placeholder="inputplaceholder" type="digit"
 							style="max-width: 390rpx;background-color: #F2F2F2;" v-if="currentInputKey=='price'" />
@@ -102,7 +102,7 @@
 				</view>
 				<!-- 提交按钮 -->
 				<view class="line-gray" style="margin-bottom: 0px;"></view>
-				<view class="flex">
+				<view class="flex  flex-wrap-normal">
 					<u-button type="default" class="w-fit  flex1 " text="取消"
 						@click="()=>{$refs.popup_input.close()}"></u-button>
 					<view class="component-line-vert"></view>
@@ -147,8 +147,12 @@
 					title = '商品管理-已上架'
 				}
 				if (this.type === 'unpass') {
+					this.query.status = 'DRAFT,OFF,FORCE_OFF'
+					title = '商品管理-仓库中'
+				}
+				if (this.type === 'rejectpass') {
 					this.query.status = 'REJECT'
-					title = '商品管理-审核拒绝'
+					title = '商品管理-未审核通过'
 				}
 			}
 			if (title) {
@@ -217,7 +221,7 @@
 				})
 			},
 			async buttonStatus(item, status) {
-				await this.$message.confirm(`确定${status==='FORCE_OFF'?'下降':'上架'}此商品吗`)
+				await this.$message.confirm(`确定${status==='OFF'?'下降':'上架'}此商品吗`)
 				this.$message.showLoading()
 				this.$http.request('get', '/api/supplier/flower/list/' + status, {
 					params: {
@@ -227,7 +231,7 @@
 					if (res.code == 0) {
 						this.$message.showToast('操作成功')
 						item.status = status
-						item.statusStr = (status == 'FORCE_OFF' ? '下架' : '上架')
+						item.statusStr = (status == 'OFF' ? '下架' : '上架')
 					}
 				}).finally(() => {
 					this.$message.hideLoading()
@@ -251,23 +255,23 @@
 			},
 			toDetail(item) {
 				uni.navigateTo({
-					url: '/pages/farmer/flower-manage/flower-add?id=' + item.id
+					url: '/sub_pages/farmer/flower-manage/flower-add?id=' + item.id
 				})
 			},
 			toDetailAdd(item) {
 				uni.navigateTo({
-					url: '/pages/farmer/flower-manage/flower-add?copyId=' + item.id
+					url: '/sub_pages/farmer/flower-manage/flower-add?copyId=' + item.id
 				})
 			},
 			clickButton(type) {
 				if (type == 'add') {
 					//添加页面
 					uni.navigateTo({
-						url: '/pages/farmer/flower-manage/flower-add'
+						url: '/sub_pages/farmer/flower-manage/flower-add'
 					})
 				} else {
 					uni.navigateTo({
-						url: '/pages/farmer/flower-manage/flower-manage?type=' + type
+						url: '/sub_pages/farmer/flower-manage/flower-manage?type=' + type
 					})
 				}
 			},
@@ -279,12 +283,12 @@
 	.flow-manage {
 		.flow-manage-list {
 			// padding: 20rpx 30rpx;
-			padding: 22rpx;
+			padding: 22rpx 22rpx 20rpx 22rpx;
 			background-color: #fff;
 
 			.flow-manage-list-item {
 
-				margin-bottom: 20rpx;
+				// margin-bottom: 20rpx;
 
 				.title {
 					font-weight: 600;
@@ -311,6 +315,9 @@
 						border-radius: 24rpx;
 						border: 2rpx solid #CECECE;
 						text-align: center;
+						font-size: 24rpx;
+						color: #666666;
+						line-height: 34rpx;
 					}
 				}
 
@@ -324,6 +331,7 @@
 				.each-list {
 					display: flex;
 					flex-wrap: wrap;
+					margin-top: 6rpx;
 
 					.each-item {
 						min-width: 30%;
@@ -345,7 +353,11 @@
 							content: ": "
 						}
 
-						.value {}
+						.value {
+							font-weight: 400;
+							font-size: 24rpx;
+							color: #666666;
+						}
 					}
 				}
 			}
@@ -368,6 +380,8 @@
 				// max-width: 90rpx;
 				margin-left: 14rpx;
 				margin-right: 14rpx;
+				font-weight: 400;
+
 			}
 
 			.button:first-child {

--
Gitblit v1.9.3