From b05a84f9178894b40a1d6a601b577403d7d93c46 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 08 一月 2025 09:09:20 +0800
Subject: [PATCH] 1.运费配置说明修改

---
 sub_pages/supplier/flower-manage/flower-add.vue |  105 +++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 70 insertions(+), 35 deletions(-)

diff --git a/sub_pages/supplier/flower-manage/flower-add.vue b/sub_pages/supplier/flower-manage/flower-add.vue
index a501662..393f814 100644
--- a/sub_pages/supplier/flower-manage/flower-add.vue
+++ b/sub_pages/supplier/flower-manage/flower-add.vue
@@ -114,17 +114,27 @@
 			<view class="form-item before-line">
 				<view class="label required">售价(元)</view>
 				<view class="m-l-a m-r-0 flex">
-					<input v-model="dto.price" placeholder="请输入数字" type="digit"
-						style="margin-top: 16px;text-align: right;"></input>
+					<!-- <input v-model="dto.price" placeholder="请输入数字" type="digit" class="text-right m-t-15"></input> -->
+					<u-input v-model="dto.price" placeholder="请输入数字" type="digit" class="text-right m-t-15" />
+
 				</view>
 			</view>
 			<view class="form-item ">
 				<view class="label required">库存</view>
 				<view class="m-l-a m-r-0 flex">
-					<input v-model="dto.stock" placeholder="请输入数字" type="number"
-						style="margin-top: 16px;text-align: right;"></input>
+					<!-- <input v-model="dto.stock" placeholder="请输入数字" type="number" class="text-right m-t-15"></input> -->
+
+					<u-input v-model="dto.stock" placeholder="请输入数字" type="number"  class="text-right m-t-15" />
+
 				</view>
 			</view>
+			<!-- <view class="form-item ">
+				<view class="label">限购数量</view>
+				<view class="m-l-a m-r-0 flex">
+					<input v-model="dto.limited" placeholder="请输入数字" type="number"
+						style="margin-top: 16px;text-align: right;"></input>
+				</view>
+			</view> -->
 
 			<view class="line-gray-big"></view>
 
@@ -150,8 +160,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}')`||''}" -->
@@ -164,18 +183,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">
@@ -242,25 +253,28 @@
 					level: '', //FLOWER_LEVEL
 					price: '',
 					stock: '',
+					limited: '',
 					params: [], //id,value
 					description: '',
 				},
 				requireFields: [{
-					name: '商品分类',
-					key: 'category'
-				}, {
-					name: '列表封面图',
-					key: 'cover'
-				}, {
-					name: '商品等级',
-					key: 'level'
-				}, {
-					name: '商品价格',
-					key: 'price'
-				}, {
-					name: '商品库存',
-					key: 'stock'
-				}],
+						name: '商品分类',
+						key: 'category'
+					}, {
+						name: '列表封面图',
+						key: 'cover'
+					}, {
+						name: '商品等级',
+						key: 'level'
+					}, {
+						name: '商品价格',
+						key: 'price'
+					}, {
+						name: '商品库存',
+						key: 'stock'
+					},
+
+				],
 				show_select_category: false,
 				show_select_level: false,
 				columns_categorys: [],
@@ -366,10 +380,21 @@
 				this.$refs.picker_category.selectedClear()
 			},
 			async PickCategory(item, e) {
-				console.log('PickCategory', item, e)
+				console.log('PickCategory', item, e, this.columns_categorys_dict)
 				if (e.detail.value) {
 					var currentnode = this.columns_categorys_dict['@' + e.detail.value[e.detail.value.length - 1]
 						.value]
+					let levelLimit = currentnode && currentnode.levelLimit || ''
+					if (!levelLimit) {
+						if (currentnode.parentId) {
+							var currentnodeParentNode = this.columns_categorys_dict['@' + currentnode.parentId]
+							if (currentnodeParentNode) {
+								levelLimit = currentnodeParentNode.levelLimit || ''
+							}
+						}
+					}
+
+
 					let tmpe = e
 
 
@@ -384,11 +409,11 @@
 							this.dto.color = currentnode.color
 							//设置等级
 							// console.log('tmpe', currentnode)
-							if (currentnode.levelLimit) {
+							if (levelLimit) {
 
 								this.columns_levels = []
 								var tarr = []
-								var filterLevel = currentnode.levelLimit.split(",")
+								var filterLevel = levelLimit.split(",")
 								for (var t of this.columns_levels_all) {
 									if (filterLevel.indexOf(t.value) >= 0) {
 										tarr.push(t)
@@ -418,11 +443,11 @@
 					} else {
 						//设置等级
 						// console.log('tmpe', currentnode)
-						if (currentnode.levelLimit) {
+						if (levelLimit) {
 
 							this.columns_levels = []
 							var tarr = []
-							var filterLevel = currentnode.levelLimit.split(",")
+							var filterLevel = levelLimit.split(",")
 							for (var t of this.columns_levels_all) {
 								if (filterLevel.indexOf(t.value) >= 0) {
 									tarr.push(t)
@@ -649,6 +674,14 @@
 					this.$message.showToast('商品库存格式错误,需要大于0')
 					return
 				}
+				
+			
+				// if ( this.dto.limited && this.dto.limited !== '' && (!Number(this.dto.limited) || Number(this.dto.limited) <= 0)) {
+				//     this.$message.showToast('商品限购数量格式错误');
+				//     return;
+				// }
+
+
 
 				for (var field of this.requireFields) {
 					if (!this.dto[field.key]) {
@@ -745,6 +778,7 @@
 								}).catch(res => {
 									that.$message.hideLoading()
 									console.error(res)
+									that.$message.showToast('文件上传失败,请联系管理员')
 								})
 							}
 						}
@@ -781,6 +815,7 @@
 								}).catch(res => {
 									that.$message.hideLoading()
 									console.error(res)
+									that.$message.showToast('文件上传失败,请联系管理员')
 								})
 							}
 						}

--
Gitblit v1.9.3