From 08b73a91cec8c8ef430b8d5bc5b4a631bcbbe7f2 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期日, 21 七月 2024 18:13:49 +0800
Subject: [PATCH] Merge branch 'main' of https://gitee.com/people_3/hmy_farmer

---
 sub_pages/supplier/flower-manage/flower-add.vue |   89 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 71 insertions(+), 18 deletions(-)

diff --git a/sub_pages/supplier/flower-manage/flower-add.vue b/sub_pages/supplier/flower-manage/flower-add.vue
index 2aff894..e1cedd5 100644
--- a/sub_pages/supplier/flower-manage/flower-add.vue
+++ b/sub_pages/supplier/flower-manage/flower-add.vue
@@ -95,6 +95,16 @@
 				</view>
 			</view>
 			<view class="line-gray-big"></view>
+			<view class="form-item before-line">
+				<view class="label required">商品等级</view>
+				<view class="m-l-a m-r-0 flex " :class="[!dto.level?'desc-gray':'']" @click="()=>{
+					show_select_level=true
+				}">
+					<view>{{dto.levelStr||dto.level || '请选择'}}</view>
+					<u-icon class="m-l-a" name="arrow-right"></u-icon>
+				</view>
+
+			</view>
 
 
 			<view class="form-item before-line">
@@ -134,16 +144,6 @@
 
 			</view>
 			<view class="line-gray-big"></view>
-			<view class="form-item before-line">
-				<view class="label required">商品等级</view>
-				<view class="m-l-a m-r-0 flex " :class="[!dto.level?'desc-gray':'']" @click="()=>{
-					show_select_level=true
-				}">
-					<view>{{dto.levelStr||dto.level || '请选择'}}</view>
-					<u-icon class="m-l-a" name="arrow-right"></u-icon>
-				</view>
-
-			</view>
 
 
 			<view class="form-item before-line">
@@ -159,6 +159,18 @@
 			<view v-if="dto.video">
 				<video :src="dto.video" style="display: block;margin: 0 auto;"></video>
 			</view>
+			<view class="form-item ">
+				<view class="label required">商品描述</view>
+				<view class="m-l-a m-r-0 flex">
+					<!-- 	<u-input type="textarea" v-model="dto.description" placeholder="请输入商品描述" type="number"
+						></u-input> -->
+					<u--textarea v-model="dto.description" style="margin-top: 16px;text-align: right;"
+						placeholder="请输入商品描述"></u--textarea>
+
+				</view>
+			</view>
+
+
 
 			<view style="min-height: 200rpx;">
 				&nbsp;
@@ -225,19 +237,26 @@
 					bannerList: [], //str[]
 					video: '',
 					level: '', //FLOWER_LEVEL
-					price: 0.00,
-					stock: 0,
+					price: '',
+					stock: '',
 					params: [], //id,value
+					description: '',
 				},
 				requireFields: [{
 					name: '商品分类',
 					key: 'category'
-				},{
+				}, {
 					name: '列表封面图',
 					key: 'cover'
-				},{
+				}, {
 					name: '商品等级',
 					key: 'level'
+				}, {
+					name: '商品价格',
+					key: 'price'
+				}, {
+					name: '商品库存',
+					key: 'stock'
 				}],
 				show_select_category: false,
 				show_select_level: false,
@@ -510,16 +529,50 @@
 
 			},
 			async submit() {
+				if (!this.dto.price) {
+					this.$message.showToast('商品价格未设置')
+					return
+				}
+				var tmp = parseFloat(this.dto.price)
+				if (isNaN(tmp) || ('' + tmp) !== ('' + this.dto.price)) {
+					this.$message.showToast('商品价格格式错误，精确到分')
+					return
+				}
+				if ((tmp.toFixed(2) + '' + '0') !== tmp.toFixed(3)) {
+					this.$message.showToast('商品价格至多精确到分')
+					// console.log('tmp.toFixed(2)',tmp.toFixed(2),tmp.toFixed(3))
+					return
+				} else {
+					this.dto.price = this.dto.price.toFixed(2)
+				}
+				if (this.dto.price <= 0) {
+					this.$message.showToast('商品价格不能小于等于0')
+					return
+				}
+				tmp = parseFloat(this.dto.stock)
+				if (isNaN(tmp) || ('' + tmp.toFixed(0)) !== ('' + this.dto.stock) || tmp < 0) {
+					this.$message.showToast('商品库存格式错误，需要大于等于0')
+					return
+				}
+
 				for (var field of this.requireFields) {
 					if (!this.dto[field.key]) {
 						this.$message.showToast(`${field.name}信息未填写`)
 						return
 					}
-				}
-				if(this.dto.params.length<1){
-					this.$message.showToast('商品参数详情未设置')
-					return
 				}
+				if (this.dto.params.length < 1) {
+					this.$message.showToast('商品参数详情未设置')
+					return
+				} else {
+					for (var item of this.dto.params) {
+						if (!item.value) {
+							this.$message.showToast('存在商品参数详情未设置')
+							return
+						}
+					}
+				}
+
 				// if (!this.dto.applicationType) {
 				// 	this.$message.showToast('未选择类型')
 				// 	return

--
Gitblit v1.9.3