Skip to content

S
shop-new
提交 b9ec6df1 authored 作者: 王天霸's avatar 王天霸
浏览文件
操作

Merge branch '商品产地bug' into test

上级 c1d33061 496ae5c6
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 126 行增加 和 80 行删除
dist/index.html
浏览文件 @ b9ec6df1
差异被折叠。
dist/static/css/chunk-09052950.adec8750.css 0 → 100644
浏览文件 @ b9ec6df1
.dashboard-promote .el-row[data-v-17e0ac5e]{margin-bottom:20px;font-size:14px}.dashboard-promote[data-v-17e0ac5e]{margin-left:21px}.header[data-v-17e0ac5e]{width:100%;overflow:hidden;margin-top:20px;background:#fff;border-radius:8px}.header .header-top[data-v-17e0ac5e]{margin-top:29px}.header .sp[data-v-17e0ac5e]{width:63px;height:16px;margin-left:24px;font:400 16px/5px Alibaba PuHuiTi;color:#000}.header-foot[data-v-17e0ac5e]{width:100%;height:100px;margin-top:39px;overflow:hidden}.foot-le[data-v-17e0ac5e]{width:66%;text-align:center;display:inline-block}.header-img[data-v-17e0ac5e]{vertical-align:middle}.header-span[data-v-17e0ac5e]{font:600 14px/11px Lantinghei SC;color:#333}.header-p[data-v-17e0ac5e]{font:600 24px/17px Lantinghei SC;color:#344750}.foot-ri[data-v-17e0ac5e]{width:33%;height:80px;display:inline-block;text-align:center;border-left:2px solid #e6edfe}@media screen and (max-width:1600px){.main-left-top .tp-col .tp-img[data-v-17e0ac5e]{display:none}}@media screen and (max-width:1490px){.footer-top-two[data-v-17e0ac5e]{margin-top:15px}}@media screen and (max-width:1637px){.footer-top-two[data-v-17e0ac5e]{margin-top:15px}}@media screen and (max-width:1200px){.main-left-top .tp-le[data-v-17e0ac5e]{width:100%;text-align:center}.footer-right[data-v-17e0ac5e],.main-right-top[data-v-17e0ac5e]{margin-top:20px;margin-left:-15px}.main-right-foot[data-v-17e0ac5e]{margin-left:-15px}.footer-top-one[data-v-17e0ac5e]{margin-top:15px}}.main[data-v-17e0ac5e]{width:100%;margin-top:20px}.main .main-left[data-v-17e0ac5e]{height:592px}.main-left-top .tp-le[data-v-17e0ac5e],.tp-img[data-v-17e0ac5e]{display:inline-block;text-align:center;margin-top:27px}.main-left-top .tp-col[data-v-17e0ac5e]{cursor:pointer;height:106px;background:linear-gradient(180deg,#fff,#f5f8ff);border-radius:4px}.main-left-top .tp-le[data-v-17e0ac5e]{width:163px}.main-left-top .tp-col span[data-v-17e0ac5e]{font:400 14px/11px Alibaba PuHuiTi;color:#333}.main-left-top .tp-col p[data-v-17e0ac5e]{font:700 24px/17px Alibaba PuHuiTi;color:#19191a}.main-left-foot[data-v-17e0ac5e]{height:466px;margin-top:20px;background:#fff;border-radius:4px;overflow:hidden}.main-left-foot .ft-sp[data-v-17e0ac5e]{font:400 16px/5px Alibaba PuHuiTi;color:#000}.main-left-foot-top[data-v-17e0ac5e]{float:right;margin-right:49px}.main-right[data-v-17e0ac5e]{z-index:10000;height:592px;margin-left:15px}.main-right-top[data-v-17e0ac5e]{height:198px;background:#fff;border-radius:4px}.main-right-top .sa[data-v-17e0ac5e]{display:inline-block;margin:30px 0 0 26px;font:400 16px/5px Alibaba PuHuiTi;color:#000}.main-right-top .right-top-item[data-v-17e0ac5e]{width:70px;height:70px;margin:auto;display:flex;justify-content:center;align-items:center;background:#f0f6ff;border-radius:10px}.main-right-top-point[data-v-17e0ac5e]{cursor:pointer}.main-right-foot[data-v-17e0ac5e]{height:374px;margin-top:20px;background:#fff;border-radius:4px}.main-right-foot ul[data-v-17e0ac5e]{margin:24px 0 0 25px}.main-right-foot ul li[data-v-17e0ac5e]{margin-bottom:16px;cursor:pointer}.main-right-foot-sn[data-v-17e0ac5e]{display:inline-block;margin:30px 0 0 25px;cursor:pointer;font:400 16px Alibaba PuHuiTi;color:#000}.main-right-foot .main-right-foot-sa[data-v-17e0ac5e]{float:right;margin:30px 25px 0 0;cursor:pointer;font:400 14px Alibaba PuHuiTi;color:#999}.main-right-foot .main-right-foot-le[data-v-17e0ac5e]{display:none;width:37px;height:22px;display:inline-block;background:#fff5f6;border-radius:4px}.main-right-foot .main-right-foot-ri[data-v-17e0ac5e]{display:none;width:23px;height:22px;display:inline-block;border-radius:4px}.foot-color[data-v-17e0ac5e]{background:#fff6ed}.main-right-foot-le[data-v-17e0ac5e],.main-right-foot-ri div[data-v-17e0ac5e]{text-align:center;line-height:22px;font:400 14px Alibaba PuHuiTi;font-style:italic}.main-right-foot .foot-le-text[data-v-17e0ac5e]{margin-left:46px;font:400 14px Alibaba PuHuiTi;color:#000}.footer-left[data-v-17e0ac5e]{height:448px;background:#fff;border-radius:4px}.footer-left .footer-sp[data-v-17e0ac5e]{margin:30px 0 0 23px;display:inline-block;font:400 16px/5px Alibaba PuHuiTi;color:#000}.footer-right-top[data-v-17e0ac5e]{width:100%;background:#fff;border-radius:4px;display:inline-block;margin-left:15px}.footer-right-top-text[data-v-17e0ac5e]{font:400 16px Alibaba PuHuiTi;color:#000;line-height:5px;display:inline-block;margin:30px 0 0 24px}.footer-right-top-item[data-v-17e0ac5e]{width:88%;display:flex;justify-content:space-between;align-items:center;flex-wrap:wrap;margin:24px auto}.footer-right-top-img[data-v-17e0ac5e]{cursor:pointer;width:177px;height:81px;border:1px dotted #000}.footer-top-one[data-v-17e0ac5e]{background-image:url(../../static/img/background-item1.c6868d4e.png)}.footer-top-two[data-v-17e0ac5e]{background-image:url(../../static/img/background-item2.4120fb67.png)}.footer-top-thr[data-v-17e0ac5e]{background-image:url(../../static/img/background-item3.8679f57b.png)}.footer-right-top-img span[data-v-17e0ac5e]{display:inline-block;font:400 14px/2px Microsoft YaHei;color:#000;margin:20px 0 0 23px}.footer-right-top-img p[data-v-17e0ac5e]{font:400 14px/2px FZZhengHeiS-B-GB;color:#c7cad7;margin:14px 0 0 23px}.footer-right-bot[data-v-17e0ac5e]{width:100%;margin-top:20px;display:inline-block;margin-left:15px}.foot-table-img[data-v-17e0ac5e]{position:absolute;vertical-align:middle;left:36%;top:14%}.foot-table-imgone[data-v-17e0ac5e]{position:absolute;vertical-align:middle;left:41%;top:14%}.foot-table[data-v-17e0ac5e]{position:relative}.dia-text[data-v-17e0ac5e]{text-align:center;font:600 24px FZZhengHeiS-B-GB;color:#000}.foot-index[data-v-17e0ac5e]{margin:auto;width:48px;height:19px;background:#feeee5;border-radius:10px}.foot-indexone[data-v-17e0ac5e]{margin:auto;width:48px;height:19px;background:#f5f7fa;border-radius:10px}li[data-v-17e0ac5e],ul[data-v-17e0ac5e]{padding:0;margin:0;list-style:none}.dashboard-editor-container[data-v-17e0ac5e]{background-color:#f1f4fa;position:relative;height:100%;overflow-y:scroll;overflow-x:hidden}
\ No newline at end of file
dist/static/css/chunk-23d8180c.171fd667.css deleted 100644 → 0
浏览文件 @ c1d33061
.dashboard-promote .el-row[data-v-4f818730]{margin-bottom:20px;font-size:14px}.dashboard-promote[data-v-4f818730]{margin-left:21px}.header[data-v-4f818730]{width:100%;overflow:hidden;margin-top:20px;background:#fff;border-radius:8px}.header .header-top[data-v-4f818730]{margin-top:29px}.header .sp[data-v-4f818730]{width:63px;height:16px;margin-left:24px;font:400 16px/5px Alibaba PuHuiTi;color:#000}.header-foot[data-v-4f818730]{width:100%;height:100px;margin-top:39px;overflow:hidden}.foot-le[data-v-4f818730]{width:66%;text-align:center;display:inline-block}.header-img[data-v-4f818730]{vertical-align:middle}.header-span[data-v-4f818730]{font:600 14px/11px Lantinghei SC;color:#333}.header-p[data-v-4f818730]{font:600 24px/17px Lantinghei SC;color:#344750}.foot-ri[data-v-4f818730]{width:33%;height:80px;display:inline-block;text-align:center;border-left:2px solid #e6edfe}@media screen and (max-width:1600px){.main-left-top .tp-col .tp-img[data-v-4f818730]{display:none}}@media screen and (max-width:1490px){.footer-top-two[data-v-4f818730]{margin-top:15px}}@media screen and (max-width:1200px){.main-left-top .tp-le[data-v-4f818730]{width:100%;text-align:center}.footer-right[data-v-4f818730],.main-right-top[data-v-4f818730]{margin-top:20px;margin-left:-15px}.main-right-foot[data-v-4f818730]{margin-left:-15px}.footer-top-one[data-v-4f818730]{margin-top:15px}}.main[data-v-4f818730]{width:100%;margin-top:20px}.main .main-left[data-v-4f818730]{height:592px}.main-left-top .tp-le[data-v-4f818730],.tp-img[data-v-4f818730]{display:inline-block;text-align:center;margin-top:27px}.main-left-top .tp-col[data-v-4f818730]{cursor:pointer;height:106px;background:linear-gradient(180deg,#fff,#f5f8ff);border-radius:4px}.main-left-top .tp-le[data-v-4f818730]{width:163px}.main-left-top .tp-col span[data-v-4f818730]{font:400 14px/11px Alibaba PuHuiTi;color:#333}.main-left-top .tp-col p[data-v-4f818730]{font:700 24px/17px Alibaba PuHuiTi;color:#19191a}.main-left-foot[data-v-4f818730]{height:466px;margin-top:20px;background:#fff;border-radius:4px;overflow:hidden}.main-left-foot .ft-sp[data-v-4f818730]{font:400 16px/5px Alibaba PuHuiTi;color:#000}.main-left-foot-top[data-v-4f818730]{float:right;margin-right:49px}.main-right[data-v-4f818730]{z-index:10000;height:592px;margin-left:15px}.main-right-top[data-v-4f818730]{height:198px;background:#fff;border-radius:4px}.main-right-top .sa[data-v-4f818730]{display:inline-block;margin:30px 0 0 26px;font:400 16px/5px Alibaba PuHuiTi;color:#000}.main-right-top .right-top-item[data-v-4f818730]{width:70px;height:70px;margin:auto;display:flex;justify-content:center;align-items:center;background:#f0f6ff;border-radius:10px}.main-right-top-point[data-v-4f818730]{cursor:pointer}.main-right-foot[data-v-4f818730]{height:374px;margin-top:20px;background:#fff;border-radius:4px}.main-right-foot ul[data-v-4f818730]{margin:24px 0 0 25px}.main-right-foot ul li[data-v-4f818730]{margin-bottom:16px;cursor:pointer}.main-right-foot-sn[data-v-4f818730]{display:inline-block;margin:30px 0 0 25px;cursor:pointer;font:400 16px Alibaba PuHuiTi;color:#000}.main-right-foot .main-right-foot-sa[data-v-4f818730]{float:right;margin:30px 25px 0 0;cursor:pointer;font:400 14px Alibaba PuHuiTi;color:#999}.main-right-foot .main-right-foot-le[data-v-4f818730]{display:none;width:37px;height:22px;display:inline-block;background:#fff5f6;border-radius:4px}.main-right-foot .main-right-foot-ri[data-v-4f818730]{display:none;width:23px;height:22px;display:inline-block;border-radius:4px}.foot-color[data-v-4f818730]{background:#fff6ed}.main-right-foot-le[data-v-4f818730],.main-right-foot-ri div[data-v-4f818730]{text-align:center;line-height:22px;font:400 14px Alibaba PuHuiTi;font-style:italic}.main-right-foot .foot-le-text[data-v-4f818730]{margin-left:46px;font:400 14px Alibaba PuHuiTi;color:#000}.footer-left[data-v-4f818730]{height:448px;background:#fff;border-radius:4px}.footer-left .footer-sp[data-v-4f818730]{margin:30px 0 0 23px;display:inline-block;font:400 16px/5px Alibaba PuHuiTi;color:#000}.footer-right-top[data-v-4f818730]{width:100%;background:#fff;border-radius:4px;display:inline-block;margin-left:15px}.footer-right-top-text[data-v-4f818730]{font:400 16px Alibaba PuHuiTi;color:#000;line-height:5px;display:inline-block;margin:30px 0 0 24px}.footer-right-top-item[data-v-4f818730]{width:88%;display:flex;justify-content:space-between;align-items:center;flex-wrap:wrap;margin:24px auto}.footer-right-top-img[data-v-4f818730]{cursor:pointer;width:177px;height:81px;border:1px dotted #000}.footer-top-one[data-v-4f818730]{background-image:url(../../static/img/background-item1.c6868d4e.png)}.footer-top-two[data-v-4f818730]{background-image:url(../../static/img/background-item2.4120fb67.png)}.footer-top-thr[data-v-4f818730]{background-image:url(../../static/img/background-item3.8679f57b.png)}.footer-right-top-img span[data-v-4f818730]{display:inline-block;font:400 14px/2px Microsoft YaHei;color:#000;margin:20px 0 0 23px}.footer-right-top-img p[data-v-4f818730]{font:400 14px/2px FZZhengHeiS-B-GB;color:#c7cad7;margin:14px 0 0 23px}.footer-right-bot[data-v-4f818730]{width:100%;margin-top:20px;display:inline-block;margin-left:15px}.foot-table-img[data-v-4f818730]{position:absolute;vertical-align:middle;left:36%;top:14%}.foot-table-imgone[data-v-4f818730]{position:absolute;vertical-align:middle;left:41%;top:14%}.foot-table[data-v-4f818730]{position:relative}.dia-text[data-v-4f818730]{text-align:center;font:600 24px FZZhengHeiS-B-GB;color:#000}.foot-index[data-v-4f818730]{margin:auto;width:48px;height:19px;background:#feeee5;border-radius:10px}.foot-indexone[data-v-4f818730]{margin:auto;width:48px;height:19px;background:#f5f7fa;border-radius:10px}li[data-v-4f818730],ul[data-v-4f818730]{padding:0;margin:0;list-style:none}.dashboard-editor-container[data-v-4f818730]{background-color:#f1f4fa;position:relative;height:100%;overflow-y:scroll;overflow-x:hidden}
\ No newline at end of file
dist/static/js/app.2e24117f.js → dist/static/js/app.fe8c3200.js
浏览文件 @ b9ec6df1
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/chunk-09052950.1acbd0a3.js 0 → 100644
浏览文件 @ b9ec6df1
差异被折叠。
dist/static/js/chunk-09052950.1acbd0a3.js.map 0 → 100644
浏览文件 @ b9ec6df1
差异被折叠。
src/views/dashboard/LineChart.vue
浏览文件 @ b9ec6df1
......@@ -26,34 +26,26 @@ export default {
type: Boolean,
default: true
},
numberData: {
chartData: {
type: Object,
required: true
}
},
data() {
return {
dateArr: [],
yAsix:10000,
chart: null
}
},
watch: {
numberData: {
chartData: {
deep: true,
handler(val) {
this.dateArr= val.date
this.numberMax(this.numberData.ordercount,this.numberData.customerprice)
this.setOptions(val)
// debugger
}
}
},
created() {
this.$nextTick(() => {
this.initChart()
})
},
mounted() {
this.$nextTick(() => {
this.initChart()
})
......@@ -66,30 +58,46 @@ export default {
this.chart = null
},
methods: {
moneyMax(num){
let maxNumVal=Math.max.apply(null,num)
let prec = 2
let ceil = true
const len = String(maxNumVal).length;
if (len <= prec) { return maxNumVal };
const mult = Math.pow(10, prec);
return ceil ?
Math.ceil(maxNumVal / mult) * mult :
Math.floor(maxNumVal / mult) * mult;
},
numberMax(num1,num2){
if(num1,num2){
let result = num1.every(function(item,index,array){
return item == 0
})
let result2 = num2.every(function(item,index,array){
return item == 0
})
if(result||result2){
this.yAsix=100
}else{
var c = num1.concat(num2)
this.yAsix = Math.ceil(Math.max(...c))
}
let maxNum1=Math.max.apply(null,num1)
let maxNum2=Math.max.apply(null,num2)
let num = ''
if(maxNum1>=maxNum2){
num = maxNum1
}else{
num = maxNum2
}
let prec = 2
let ceil = true
const len = String(num).length;
if (len <= prec) { return num };
const mult = Math.pow(10, prec);
return ceil ?
Math.ceil(num / mult) * mult :
Math.floor(num / mult) * mult;
},
initChart() {
this.chart = echarts.init(this.$el, 'macarons')
this.setOptions(this.numberData)
this.setOptions(this.chartData)
},
setOptions({ordercount,customerprice,ordertotal,customerArr,dateArr,retentionArr} = {}) {
setOptions({ customerprice, ordercount, ordertotal,date} = {}) {
this.chart.setOption({
xAxis: {
data: this.dateArr,
type: 'category',
data: date,
boundaryGap: true,
axisTick: {
show: true
......@@ -114,36 +122,53 @@ export default {
type: 'value',
name: '交易量',
min: 0,
max: this.yAsix,
interval: Math.ceil(this.yAsix/5),
max: this.numberMax(this.chartData.customerprice,this.chartData.ordercount)<10?10:this.numberMax(this.chartData.customerprice,this.chartData.ordercount),
interval: this.numberMax(this.chartData.customerprice,this.chartData.ordercount)<10?2:(this.numberMax(this.chartData.customerprice,this.chartData.ordercount))/5,
axisLabel: {
formatter: '{value}'
}
},
{
type: 'value',
name: '总订单金额',
min: 0,
max: this.moneyMax(this.chartData.ordertotal)<10?10:this.moneyMax(this.chartData.ordertotal),
interval: this.moneyMax(this.chartData.ordertotal)<10?2:(this.moneyMax(this.chartData.ordertotal))/5,
axisLabel: {
formatter: '{value} 元'
}
}
],
legend: {
data: ['总订单数','总订单金额','客单价']
legend: {
data: ['总订单数', '总订单金额','客单价']
},
series: [{
name: '总订单数', itemStyle: {
series: [
{
name: '总订单数',
smooth: false,
type: 'bar',
itemStyle: {
normal: {
color: '#4784FF',
color: '#3A64E4',
lineStyle: {
color: '#4784FF',
width: 2
color: '#3A64E4',
width: 1
},
areaStyle: {
color: '#f3f8ff'
}
}
},
smooth: true,
type: 'bar',
data: ordercount,
animationDuration: 2800,
animationEasing: 'quadraticOut'
},
{
name: '总订单金额',
smooth: true,
smooth: false,
type: 'line',
yAxisIndex: 1,
itemStyle: {
normal: {
color: '#EE7945',
......@@ -151,20 +176,18 @@ export default {
color: '#EE7945',
width: 2
},
areaStyle: {
color: '#f3f8ff'
}
}
},
data: ordertotal,
animationDuration: 2800,
animationEasing: 'cubicInOut'
animationEasing: 'quadraticOut'
},
{
name: '客单价',
smooth: true,
smooth: false,
type: 'bar',
// yAxisIndex: 1,
yAxisIndex: 0,
itemStyle: {
normal: {
color: '#49D3CE',
......@@ -172,9 +195,7 @@ export default {
color: '#49D3CE',
width: 2
},
areaStyle: {
color: '#f3f8ff'
}
}
},
data: customerprice,
......
src/views/index.vue
浏览文件 @ b9ec6df1
......@@ -133,7 +133,6 @@
v-model="value1"
@change="dateTimechange"
:picker-options="pickerOptions"
value-format="timestamp"
:default-time="['00:00:00', '23:59:59']"
type="daterange"
......@@ -149,7 +148,7 @@
</div>
</div>
<div style="margin-top:38px;padding:16px 16px 0;" v-show="isShowData">
<line-chart :number-data="numberChartData"/>
<line-chart :chart-data="numberChartData"/>
</div>
<div style="margin-top:38px;padding:16px 16px 0;" v-show="!isShowData">
<el-table
......@@ -699,6 +698,11 @@ export default {
margin-top: 15px;
}
}
@media screen and (max-width: 1637px) {
.footer-top-two{
margin-top: 15px;
}
}
@media screen and (max-width: 1200px) {
.main-left-top .tp-le{
width: 100%;
......
src/views/system/goods/add/components/goodsaftersale.vue
浏览文件 @ b9ec6df1
......@@ -39,12 +39,12 @@
<el-button style="margin-left:50px;margin-bottom:30px;" type="primary" @click="addparameter">添加参数</el-button>
</el-card>
<el-form ref="goodsAfterSaleForm" :model="goodsAfterSaleForm" :rules="goodsAfterSaleRules" label-width="150px" size="small">
<el-card class="box-card" ref="salesvalue">
<div slot="header" class="clearfix">
<span>售后及服务</span>
</div>
<el-form ref="goodsAfterSaleForm" :model="goodsAfterSaleForm" :rules="goodsAfterSaleRules" label-width="150px" size="small">
<el-form-item label="服务标签：" prop="stags">
<el-checkbox-group v-model="goodsAfterSaleForm.stags">
......@@ -74,14 +74,14 @@
</el-select>
</el-form-item>
</el-form>
</el-card>
<el-card class="box-card" ref="outhervalue">
<div slot="header" class="clearfix" >
<span>其他设置</span>
</div>
<el-form :model="goodsAfterSaleForm" :rules="goodsAfterSaleRules" ref="goodsAfterSaleForm" label-width="150px" class="demo-goodsInfoForm" size="small">
<el-form-item label='商品关键词：' prop="goods_des">
<el-input v-model.trim="goodsAfterSaleForm.goods_des" placeholder="请输入商品关键词" style="width:420px;"></el-input>
<span class="tip-span ml20">关键词之间用 <strong>英文逗号</strong> 分开，最多可以添加5个</span>
......@@ -120,9 +120,10 @@
<el-form-item label='商品编码：' prop="out_goods_id">
<el-input v-model.trim="goodsAfterSaleForm.out_goods_id" placeholder="请输入商品编码（非必须）" style="width:420px;"></el-input>
</el-form-item>
</el-form>
</el-card>
</el-form>
</div>
</template>
......@@ -188,10 +189,11 @@
out_goods_id:''//商品编码
},
goodsAfterSaleRules: {
stags: [{required: true, validator: checkStags}],
stags: [{ type: 'array', required: true, message: '请选择至少一个服务标签', trigger: 'change' }],
freight_id: [{required: true, message: '请选择邮费模板', trigger: 'change'}],
delay_compensate: [{required: true, message: '请选择发货时效', trigger: 'change'}],
aftersale_time: [{required: true, message: '请选择售后时长', trigger: 'change'}],
producing_area:[{required: true, message: '请选择商品产地', trigger: 'change'}],
deliver_area: [{required: true, message: '请选择商品发货地', trigger: 'change'}],
unit: [{required: true, message: '商品单位不能为空', trigger: 'blur'}],
goods_brand: [{required: true, message: '请选择商品品牌', trigger: 'change'}]
......@@ -209,7 +211,7 @@
components: { draggable },
mounted() {
this.getFreightData();
//debugger
debugger
console.log('售后数据：',this.goodsaftersale);
if(this.goodsaftersale) {
this.goodsAfterSaleForm = this.goodsaftersale;
......@@ -281,6 +283,11 @@
flag = true
} else {
flag = false
if(this.goodsAfterSaleForm.producing_area==''||this.goodsAfterSaleForm.deliver_area==''||this.goodsAfterSaleForm.unit==''){
sessionStorage.setItem('clickbtm',1)
}else{
sessionStorage.setItem('clickbtm',2)
}
}
})
return flag
......
src/views/system/goods/add/index.vue
浏览文件 @ b9ec6df1
......@@ -474,8 +474,8 @@
// 商品售价，通过获取的数据，分别进行判断
let isGoodsPrice = true;
let goodsPriceMsg = '';
let spsjData1 = this.$refs.goodsparameter.singleSpecTable;
let spsjData2 = this.$refs.goodsparameter.parameterdata;
let spsjData1 = JSON.parse(JSON.stringify(this.$refs.goodsparameter.singleSpecTable));
let spsjData2 = JSON.parse(JSON.stringify(this.$refs.goodsparameter.parameterdata));
// debugger
// 如果有，则说明有规格组合数据
if ( this.radioguide==2&&spsjData2.specs_group && spsjData2.specs_group.length > 0 ) {
......@@ -556,11 +556,17 @@
}
if(!isGoodsAfterSaleMsg) {
this.$message({type:'error',message:'售后及服务未填写完整'});
if(sessionStorage.getItem('clickbtm')==1){
this.$message({type:'error',message:'其他设置未填写完整'});
this.setFloorNavMountClick(5);
}else if(sessionStorage.getItem('clickbtm')==2){
this.$message({type:'error',message:'售后及服务未填写完整'});
this.setFloorNavMountClick(4);
}
return
}
debugger
// 所有校验通过，整理数据
// 获取 商品信息数据
let spxxData = this.$refs.goodsInfo.goodsInfoForm;
......
src/views/system/retreat/retreat/index.vue
浏览文件 @ b9ec6df1
......@@ -154,6 +154,7 @@
<template slot-scope="scope">
<span v-if="scope.row.status==5">-</span>
<span v-else>{{formatter(scope.row.deadline)}}</span>
</template>
</el-table-column>
<el-table-column prop="mobile" label="买家手机号" align="center" width="120"></el-table-column>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论