提交 f3882b19 编写于 作者: zhangzhiwei's avatar zhangzhiwei

.

...@@ -77,12 +77,12 @@ ...@@ -77,12 +77,12 @@
<span>{{scope.row.purchasePrice}}</span> <span>{{scope.row.purchasePrice}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="salePrice" label="优惠价(¥)" align="center" v-if="!priceformulaId"> <el-table-column prop="salePrice" label="优惠价(¥)" align="center" v-if="!priceformulaId&&false">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.salePrice}}</span> <span>{{scope.row.salePrice}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="productPrice" label="零售价(¥)" align="center" v-if="!priceformulaId"> <el-table-column prop="productPrice" label="零售价(¥)" align="center" v-if="!priceformulaId&&false">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.productPrice}}</span> <span>{{scope.row.productPrice}}</span>
</template> </template>
......
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
</div> </div>
<div class="m_t_20 m_b_20"> <div class="m_t_20 m_b_20">
商品SKU设置 商品SKU设置
<span class="f_14 f_c_disable form_tip">SKU图必须为高清无底图,图片像素为800*800PX, 大小不可超过512k,格式为png</span> <span class="f_14 f_c_disable form_tip">SKU图必须为高清无底图,推荐图片像素为800*800PX, 大小不可超过512k,格式为png</span>
</div> </div>
<div class="sku_list" v-loading="loading_list"> <div class="sku_list" v-loading="loading_list">
<!-- <div class="button" v-if="skuList.filter(v => v.isShow !== false).length > 0"> <!-- <div class="button" v-if="skuList.filter(v => v.isShow !== false).length > 0">
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
<el-table-column prop="supplyPrice" label="供货价" width="120"> <el-table-column prop="supplyPrice" label="供货价" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover <el-popover
v-if="hasFormula==1" v-if="hasFormula==1&false"
placement="top" placement="top"
width="160" width="160"
trigger="click" trigger="click"
...@@ -343,7 +343,7 @@ ...@@ -343,7 +343,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="salePrice" label="优惠价" width="120" v-if="!priceformulaId"> <el-table-column prop="salePrice" label="优惠价" width="120" v-if="!priceformulaId&&false">
<!-- <template slot="header" slot-scope="scope"> <!-- <template slot="header" slot-scope="scope">
<el-tooltip placement="top" effect="light" v-if="youhuiTip"> <el-tooltip placement="top" effect="light" v-if="youhuiTip">
<div slot="content"> <div slot="content">
...@@ -364,7 +364,7 @@ ...@@ -364,7 +364,7 @@
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="productPrice" label="零售价" width="120" v-if="!priceformulaId"> <el-table-column prop="productPrice" label="零售价" width="120" v-if="!priceformulaId&&false">
<!-- <template slot="header" slot-scope="scope"> <!-- <template slot="header" slot-scope="scope">
<el-tooltip placement="top" effect="light" v-if="lingshouTip"> <el-tooltip placement="top" effect="light" v-if="lingshouTip">
<div slot="content"> <div slot="content">
...@@ -485,7 +485,7 @@ ...@@ -485,7 +485,7 @@
<el-form :label-position="labelPosition" label-width="100px"> <el-form :label-position="labelPosition" label-width="100px">
<el-form-item label="商品主图" required prop="imgsJson.supMainImgs"> <el-form-item label="商品主图" required prop="imgsJson.supMainImgs">
<div class="form_tip"> <div class="form_tip">
商品主图像素要求800*800px,并且确保商品位于图中间600*800px的安全区域,以免在不同展示环境下裁切时显示不完整; 商品主图像素推荐800*800px,并且确保商品位于图中间600*800px的安全区域,以免在不同展示环境下裁切时显示不完整;
大小不可超过512k,格式为jpg或png,最多可上传5张。 大小不可超过512k,格式为jpg或png,最多可上传5张。
<!-- <span class="green checktip m_l_20">查看重要注意事项</span> --> <!-- <span class="green checktip m_l_20">查看重要注意事项</span> -->
</div> </div>
...@@ -686,7 +686,7 @@ ...@@ -686,7 +686,7 @@
<el-form :label-position="labelPosition" label-width="100px"> <el-form :label-position="labelPosition" label-width="100px">
<el-form-item label="详情描述" required prop="imgsJson.detailImgs"> <el-form-item label="详情描述" required prop="imgsJson.detailImgs">
<div class="form_tip"> <div class="form_tip">
详情页的规格统一宽度为<span class="red">790px</span> 详情页的规格推荐宽度为<span class="red">790px</span>
单张切片大小不超过<span class="red">2M</span> 单张切片大小不超过<span class="red">2M</span>
,支持JPG和PNG格式 ,支持JPG和PNG格式
</div> </div>
...@@ -929,10 +929,7 @@ export default { ...@@ -929,10 +929,7 @@ export default {
volume:[{ validator: checkNum, trigger: 'blur' }], volume:[{ validator: checkNum, trigger: 'blur' }],
// sellingPoint:[{ required: true, message: '商品卖点不能为空'}] // sellingPoint:[{ required: true, message: '商品卖点不能为空'}]
}, },
supplyPrice:[{ required: true, message: '供货价不能为空'}],
purchasePrice:[{ required: true, message: '采购价不能为空'}],
salePrice:[{ required: true, message: '优惠价不能为空'}],
productPrice:[{ required: true, message: '零售价不能为空'}],
moq:[ moq:[
{ required: true, message: '起订量不能为空'}, { required: true, message: '起订量不能为空'},
{ type: 'number', message: '起订量有误'} { type: 'number', message: '起订量有误'}
...@@ -1805,11 +1802,9 @@ export default { ...@@ -1805,11 +1802,9 @@ export default {
const rules = { const rules = {
'mainImg':{ 'mainImg':{
vSize:512, vSize:512,
vImgWH:[800,800]
}, },
'supMainImgs':{ 'supMainImgs':{
vSize:512, vSize:512,
vImgWH:[800,800]
}, },
'video':{ 'video':{
vIsVideo:true, vIsVideo:true,
...@@ -1817,14 +1812,12 @@ export default { ...@@ -1817,14 +1812,12 @@ export default {
}, },
'higImg':{ 'higImg':{
vSize:1024, vSize:1024,
vImgWH:[1600,1600]
}, },
// 'model3D':{ // 'model3D':{
// vSize:102400, // vSize:102400,
// }, // },
'detailImgs':{ 'detailImgs':{
vSize:2048, vSize:2048,
vImgW:[790]
} }
} }
// 文件上传 // 文件上传
...@@ -2143,16 +2136,18 @@ export default { ...@@ -2143,16 +2136,18 @@ export default {
},{ },{
key:'supplyPrice', key:'supplyPrice',
tip:'供货价不能为空' tip:'供货价不能为空'
},{ },
key:'purchasePrice', // {
tip:'采购价不能为空' // key:'purchasePrice',
},{ // tip:'采购价不能为空'
key:'salePrice', // },{
tip:'优惠价不能为空' // key:'salePrice',
},{ // tip:'优惠价不能为空'
key:'productPrice', // },{
tip:'零售价不能为空' // key:'productPrice',
},{ // tip:'零售价不能为空'
// },
{
key:'moq', key:'moq',
tip:'起订量不能为空' tip:'起订量不能为空'
}, },
...@@ -2176,8 +2171,7 @@ export default { ...@@ -2176,8 +2171,7 @@ export default {
}] }]
}] }]
let tipsDialog = (msg) => { let tipsDialog = (msg) => {
this.$notify({ this.$message({
title: '警告',
message: msg, message: msg,
type: 'warning' type: 'warning'
}); });
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册