|
|
@@ -31,7 +31,7 @@
|
|
|
<el-input style="width:200px;" class="margin15" placeholder="请输入商户号" v-model="merchants" autosize></el-input>
|
|
|
</el-col> -->
|
|
|
<el-col :span="8">
|
|
|
- <span>商品原价：</span>
|
|
|
+ <span>商品原价(选填)：</span>
|
|
|
<el-input style="width:200px;" class="margin15" placeholder="请输入商品原价" type="number" :min="0"
|
|
|
:controls="false" v-model="originalMoney" autosize></el-input>
|
|
|
</el-col>
|
|
|
@@ -41,12 +41,12 @@
|
|
|
:controls="false" v-model="goodsMoney" autosize></el-input>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <span>打包费：</span>
|
|
|
+ <span>打包费(选填)：</span>
|
|
|
<el-input style="width:200px;" class="margin15" placeholder="请输入打包费" type="number" :min="0"
|
|
|
:controls="false" v-model="packMoney" autosize></el-input>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <span>商品销量：</span>
|
|
|
+ <span>商品销量(选填)：</span>
|
|
|
<el-input style="width:200px;" class="margin15" placeholder="请输入商品销量" type="number" :min="0"
|
|
|
:controls="false" v-model="sales" autosize></el-input>
|
|
|
</el-col>
|
|
|
@@ -64,7 +64,7 @@
|
|
|
</el-select>
|
|
|
</el-col> -->
|
|
|
<el-col :span="8">
|
|
|
- <span>商品简介：</span>
|
|
|
+ <span>商品简介(选填)：</span>
|
|
|
<el-input style="width:200px;" class="margin15" placeholder="请输入商品简介" type="text"
|
|
|
:controls="false" v-model="goodsDescribe" autosize></el-input>
|
|
|
</el-col>
|
|
|
@@ -409,7 +409,7 @@
|
|
|
</div> -->
|
|
|
</div>
|
|
|
<div class="tinymce-content" style="display: flex;">
|
|
|
- <div style="width:90px;">商品详情：</div>
|
|
|
+ <div style="width:90px;">商品详情(选填)：</div>
|
|
|
<!-- <textarea id="tinymceId" :value="goodsDescribe" class="tinymce-textarea" /> -->
|
|
|
<!-- <quill-editor ref="myTextEditor" v-model="goodsSynopsis" :options="quillOption"
|
|
|
style="padding-bottom: 50px;height: 300px;width: 72%;display: inline-table;margin-bottom: 60px;">
|
|
|
@@ -505,7 +505,7 @@
|
|
|
},
|
|
|
sku: [],
|
|
|
img: '',
|
|
|
- sales:'',
|
|
|
+ sales:0,
|
|
|
salesVolume: '',
|
|
|
status: 0,
|
|
|
goodsPicture: '',
|
|
|
@@ -628,7 +628,7 @@
|
|
|
this.originalMoney = '0'
|
|
|
}
|
|
|
if (this.goodsMoney == '') {
|
|
|
- this.goodsMoney = '0'
|
|
|
+ this.goodsMoney = this.goodsMoney
|
|
|
}
|
|
|
this.$http({
|
|
|
url: this.$http.adornUrl('admin/goods/onlyFormatAttr'),
|
|
|
@@ -726,13 +726,14 @@
|
|
|
return
|
|
|
}
|
|
|
if (this.originalMoney == '') {
|
|
|
- this.$notify({
|
|
|
- title: '提示',
|
|
|
- duration: 1800,
|
|
|
- message: '请输入商品原价',
|
|
|
- type: 'warning'
|
|
|
- });
|
|
|
- return
|
|
|
+ this.originalMoney=this.goodsMoney
|
|
|
+ // this.$notify({
|
|
|
+ // title: '提示',
|
|
|
+ // duration: 1800,
|
|
|
+ // message: '请输入商品原价',
|
|
|
+ // type: 'warning'
|
|
|
+ // });
|
|
|
+ // return
|
|
|
}
|
|
|
// if (this.originalMoney < 1) {
|
|
|
// this.$notify({
|
|
|
@@ -743,32 +744,34 @@
|
|
|
// });
|
|
|
// return
|
|
|
// }
|
|
|
- // if (this.goodsMoney == '') {
|
|
|
- // this.$notify({
|
|
|
- // title: '提示',
|
|
|
- // duration: 1800,
|
|
|
- // message: '请输入折扣价格',
|
|
|
- // type: 'warning'
|
|
|
- // });
|
|
|
- // return
|
|
|
- // }
|
|
|
+ if (this.goodsMoney === '') {
|
|
|
+ this.$notify({
|
|
|
+ title: '提示',
|
|
|
+ duration: 1800,
|
|
|
+ message: '请输入折扣价格',
|
|
|
+ type: 'warning'
|
|
|
+ });
|
|
|
+ return
|
|
|
+ }
|
|
|
if (this.packMoney == '') {
|
|
|
- this.$notify({
|
|
|
- title: '提示',
|
|
|
- duration: 1800,
|
|
|
- message: '请输入打包费',
|
|
|
- type: 'warning'
|
|
|
- });
|
|
|
- return
|
|
|
+ this.packMoney ='0'
|
|
|
+ // this.$notify({
|
|
|
+ // title: '提示',
|
|
|
+ // duration: 1800,
|
|
|
+ // message: '请输入打包费',
|
|
|
+ // type: 'warning'
|
|
|
+ // });
|
|
|
+ // return
|
|
|
}
|
|
|
if (this.goodsDescribe == '') {
|
|
|
- this.$notify({
|
|
|
- title: '提示',
|
|
|
- duration: 1800,
|
|
|
- message: '请输入简介',
|
|
|
- type: 'warning'
|
|
|
- });
|
|
|
- return
|
|
|
+ this.goodsDescribe ='无'
|
|
|
+ // this.$notify({
|
|
|
+ // title: '提示',
|
|
|
+ // duration: 1800,
|
|
|
+ // message: '请输入简介',
|
|
|
+ // type: 'warning'
|
|
|
+ // });
|
|
|
+ // return
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -792,15 +795,24 @@
|
|
|
});
|
|
|
return
|
|
|
}
|
|
|
- if (this.goodsDescribe == '') {
|
|
|
+ if (this.potost.length == 0) {
|
|
|
this.$notify({
|
|
|
title: '提示',
|
|
|
duration: 1800,
|
|
|
- message: '请输入商品详情',
|
|
|
+ message: '请选择商品轮播图',
|
|
|
type: 'warning'
|
|
|
});
|
|
|
return
|
|
|
}
|
|
|
+ // if (this.goodsDescribe == '') {
|
|
|
+ // this.$notify({
|
|
|
+ // title: '提示',
|
|
|
+ // duration: 1800,
|
|
|
+ // message: '请输入商品详情',
|
|
|
+ // type: 'warning'
|
|
|
+ // });
|
|
|
+ // return
|
|
|
+ // }
|
|
|
// if (this.inventory == '') {
|
|
|
// this.$notify({
|
|
|
// title: '提示',
|
|
|
@@ -829,13 +841,15 @@
|
|
|
return
|
|
|
}
|
|
|
if (this.goodsParticularsPicture.length == 0) {
|
|
|
- this.$notify({
|
|
|
- title: '提示',
|
|
|
- duration: 1800,
|
|
|
- message: '请上传商品详情图',
|
|
|
- type: 'warning'
|
|
|
- });
|
|
|
- return
|
|
|
+ this.goodsParticularsPicture=['https://moxuanyunshang.oss-cn-beijing.aliyuncs.com/xiangqing/12ecc56005731327e02f42f0d851848.png']
|
|
|
+ console.log(this.goodsParticularsPicture,'详情图')
|
|
|
+ // this.$notify({
|
|
|
+ // title: '提示',
|
|
|
+ // duration: 1800,
|
|
|
+ // message: '请上传商品详情图',
|
|
|
+ // type: 'warning'
|
|
|
+ // });
|
|
|
+ // return
|
|
|
}
|
|
|
|
|
|
if (this.guige == 0) {
|
