From 1fb44496929548b4f07b37796d506dedc494d44a Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 30 七月 2024 17:29:35 +0800
Subject: [PATCH] update 问题修复
---
sub_pages/supplier/flower-manage/flower-add.vue | 87 +++++++++++++++++++++++++++++++------------
1 files changed, 63 insertions(+), 24 deletions(-)
diff --git a/sub_pages/supplier/flower-manage/flower-add.vue b/sub_pages/supplier/flower-manage/flower-add.vue
index 4c497dd..2382501 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">
@@ -116,7 +126,8 @@
<view class="form-item ">
<view class="label required">商品参数详情</view>
- <view class="m-l-a m-r-0 flex " :class="[!dto.applicationType?'desc-gray':'']" @click="()=>{
+ <view class="m-l-a m-r-0 flex " style="flex-wrap: nowrap;"
+ :class="[!dto.applicationType?'desc-gray':'']" @click="()=>{
if(!dto.category){
$message.showToast('请先选择分类')
}else{
@@ -134,16 +145,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 +160,16 @@
<view v-if="dto.video">
<video :src="dto.video" 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;">
@@ -202,7 +213,7 @@
<script>
import environments from '@/environments'
- import dying318picker from '@/components/dying318-picker/Picker.vue'
+ // import dying318picker from '@/components/dying318-picker/Picker.vue'
import treeFilter from '@/components/tree-filter/tree-filter.vue'
@@ -228,6 +239,7 @@
price: '',
stock: '',
params: [], //id,value
+ description: '',
},
requireFields: [{
name: '商品分类',
@@ -373,7 +385,7 @@
}
}
},
- mapCategoryTree(node, arr) {
+ mapCategoryTree(node, arr,parentCheckTrue=false) {
var has = true
if (arr) {
var hasTrue = false
@@ -384,6 +396,9 @@
has = true
if (this.columns_categorys_search) {
has = false
+ }
+ if(parentCheckTrue){
+ has = true
}
var tmp = {
...item,
@@ -407,18 +422,20 @@
// }
this.columns_categorys_dict['@' + item.id] = item
if (item.children && item.children.length > 0) {
- tmp.children = []
- var childrenhas = this.mapCategoryTree(tmp.children, item.children)
- if (childrenhas) {
- has = true
- hasTrue = true
+ //如果上级已经有了，下级都包含
+ tmp.children = []
+ var childrenhas = this.mapCategoryTree(tmp.children, item.children,has)
+ if (childrenhas) {
+ has = true
+ hasTrue = true
}
+
} else {
tmp.children = undefined
}
if (has) {
- console.log('has ', tmp, hasTrue, has)
+ // console.log('has ', tmp, hasTrue, has)
node.push(tmp)
} else {
@@ -520,11 +537,32 @@
this.$message.showToast('商品价格未设置')
return
}
-
+ var tmp = parseFloat(this.dto.price)
+ if (isNaN(tmp) || parseFloat('' + tmp).toFixed(3) !== parseFloat('' + this.dto.price).toFixed(3)) {
+ this.$message.showToast('商品价格格式错误，精确到分')
+ console.log('a1', ('' + tmp))
+ console.log('a1', ('' + this.dto.price))
+ return
+ }
+ if ((tmp.toFixed(2) + '' + '0') !== ('' + tmp.toFixed(3))) {
+ this.$message.showToast('商品价格至多精确到分')
+ console.log('a1', (tmp.toFixed(2) + '' + '0'))
+ console.log('a1', tmp.toFixed(3))
+ // console.log('tmp.toFixed(2)',tmp.toFixed(2),tmp.toFixed(3))
+ return
+ } else {
+ this.dto.price = tmp.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}信息未填写`)
@@ -591,7 +629,7 @@
uploadIcon(key) {
console.log('that dto key', key)
const that = this
- if (key == 'video') {
+ if (key === 'video') {
uni.chooseVideo({
maxDuration: 30,
sourceType: ['camera', 'album'],
@@ -678,7 +716,7 @@
}
},
components: {
- dying318picker,
+ // dying318picker,
treeFilter
}
}
@@ -700,8 +738,9 @@
// height: 100px;
.label {
- width: 300rpx;
- line-height: 60px;
+ width: 240rpx;
+ line-height: 60px;
+ min-width: 240rpx;
}
--
Gitblit v1.9.3