From 6d54fb64df667c0c396fc7d74aeed9e096d95f95 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 11 九月 2024 10:36:50 +0800
Subject: [PATCH] Merge branch 'v2' of ssh://47.96.225.205:29418/hmy_farmer-main into v2

---
 sub_pages/supplier/flower-manage/flower-add.vue |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/sub_pages/supplier/flower-manage/flower-add.vue b/sub_pages/supplier/flower-manage/flower-add.vue
index a7dca75..cfd84fe 100644
--- a/sub_pages/supplier/flower-manage/flower-add.vue
+++ b/sub_pages/supplier/flower-manage/flower-add.vue
@@ -148,8 +148,17 @@
 			</view>
 			<view class="line-gray-big"></view>
 
+			<view class="form-item  before-line">
+				<view class="label">商品描述</view>
+				<view class="m-l-a m-r-0 flex">
 
-			<view class="form-item before-line">
+				</view>
+			</view>
+			<view style="min-width: 500rpx;margin-left: 20rpx;margin-right: 20rpx;margin-top: 20rpx;">
+				<u--textarea v-model="dto.description" autoHeight placeholder="请输入商品描述"></u--textarea>
+			</view>
+
+			<view class="form-item bottom-border-no">
 				<view class="label">商品视频</view>
 				<view class="m-l-a m-r-0 flex">
 					<!-- :style="{'background-image':dto.icon&&`url('${dto.icon}')`||''}" -->
@@ -162,18 +171,10 @@
 			<view v-if="dto.video">
 				<video :src="dto.video" :auto-pause-if-navigate="true" style="display: block;margin: 0 auto;"></video>
 			</view>
-			<view class="form-item bottom-border-no">
-				<view class="label">商品描述</view>
-				<view class="m-l-a m-r-0 flex">
-
-				</view>
-			</view>
-			<view style="min-width: 500rpx;margin-left: 20rpx;margin-right: 20rpx;margin-top: 20rpx;">
-				<u--textarea v-model="dto.description" autoHeight placeholder="请输入商品描述"></u--textarea>
-			</view>
 
 
-			<view style="min-height: 200rpx;">
+
+			<view style="min-height: 240rpx;">
 				&nbsp;
 			</view>
 			<view class="button-green-1 m-t-20 button-fixed-bottom " @click="submit" v-if="!dto.id">

--
Gitblit v1.9.3