提交 b31e778f authored 作者: 王天霸's avatar 王天霸

1

上级 08ed9e81
......@@ -61,7 +61,7 @@ service.interceptors.response.use(res => {
// 返回所有数据的统一处理
const data = res.data;
// 获取错误信息
const message = errorCode[code] || res.data.message || errorCode['default'];
const message = errorCode[code] || res.data.message || res.data.msg || errorCode['default'];
// 200,1意味着成功返回数据
if(code === 200 || code === 1) {
if( res.data ) {
......
......@@ -144,7 +144,7 @@
this.balanceList = res.data.list;
this.total = res.data.count;
}else {
let msg = res.message ? res.message : '查询失败'
let msg = res.message || res.msg? res.message || res.msg : '查询失败'
this.$message({type: 'error', message: msg});
}
});
......
......@@ -185,7 +185,7 @@
this.bankcardList = res.data.bank_list;
}
}else {
this.$message({type:'error',message: res.message ? res.message : '获取用户列表失败'});
this.$message({type:'error',message: res.message || res.msg? res.message || res.msg: '获取用户列表失败'});
}
});
},
......@@ -214,7 +214,7 @@
this.bankcardForm.bank_branch_name = res.data.bank_branch_name;
this.bankcardForm.bank_account_sn = res.data.bank_account_sn;
}else {
let msg = res.message ? res.message : '获取银行卡信息失败'
let msg = res.message || res.msg ? res.message || res.msg: '获取银行卡信息失败'
this.$message({type:'error',message: msg});
}
});
......@@ -279,7 +279,7 @@
this.addBankcardInfoDialog = false;
this.getMyAssetList(); // 更新数据
}else {
this.$message({type:'error',message: res.message ? res.message : '新增失败' });
this.$message({type:'error',message: res.message || res.msg? res.message || res.msg : '新增失败' });
}
});
}else {
......@@ -291,7 +291,7 @@
this.addBankcardInfoDialog = false;
this.getMyAssetList(); // 更新数据
}else {
this.$message({type:'error',message: res.message ? res.message : '修改失败' });
this.$message({type:'error',message: res.message || res.msg? res.message || res.msg : '修改失败' });
}
});
}
......@@ -342,7 +342,7 @@
if(res.code == 1 && res.data) {
this.bankOptions = res.data
}else {
let msg = res.message ? res.message : '获取银行列表失败'
let msg = res.message || res.msg ? res.message || res.msg: '获取银行列表失败'
this.$message({type:'error',message: msg});
}
});
......
......@@ -538,7 +538,7 @@
} else {
this.$message({
type: 'error',
message: res.message
message: res.message || res.msg
})
}
})
......@@ -635,7 +635,7 @@
} else {
this.$message({
type: 'error',
message: res.message
message: res.message || res.msg
})
}
})
......
......@@ -200,7 +200,7 @@
aLink.click();
document.body.removeChild(aLink);
}else {
this.$message({type:'error',message: res.message ? res.message: '导出失败'});
this.$message({type:'error',message: res.message || res.msg ? res.message || res.msg: '导出失败'});
}
});
},
......@@ -231,7 +231,7 @@
this.withdrawlogList = res.data.list;
this.total = res.data.count;
} else {
this.$message({type: 'error',message: res.message ? res.message : '数据请求失败'});
this.$message({type: 'error',message: res.message || res.msg? res.message || res.msg : '数据请求失败'});
}
});
},
......@@ -261,7 +261,7 @@
console.log(222,this.orderGoodsDetail);
}
}else {
this.$message({type: 'error',message: res.message ? res.message : '数据请求失败'});
this.$message({type: 'error',message: res.message || res.msg? res.message || res.msg: '数据请求失败'});
}
});
......
......@@ -299,10 +299,10 @@
aLink.click();
document.body.removeChild(aLink);
}else {
this.$message({type:'warning',message: res.message ? res.message: '导出失败'});
this.$message({type:'warning',message: res.message || res.msg ? res.message || res.msg: '导出失败'});
}
}else {
this.$message({type:'error',message: res.message ? res.message: '导出失败'});
this.$message({type:'error',message: res.message || res.msg ? res.message || res.msg: '导出失败'});
}
});
},
......@@ -431,7 +431,7 @@
this.resetAddInvoiceForm();
this.getWithdrawlogDetails();
}else {
this.$message({type:'success',message: res.message ? res.message : '补充发票信息失败' });
this.$message({type:'success',message: res.message || res.msg ? res.message || res.msg: '补充发票信息失败' });
}
});
}
......
......@@ -318,7 +318,7 @@
this.isOpen = true;
this.title = "修改运费模板";
}else {
this.$message({type:'error',message: res.message ? res.message : '获取运费模板详情失败'});
this.$message({type:'error',message: res.message || res.msg ? res.message || res.msg : '获取运费模板详情失败'});
}
});
},
......
......@@ -350,7 +350,7 @@ export default {
item.fp= Number(item.fp/100)
item.np = Number(item.np/100)
})
this.$message({type:'error',message: res.message ? res.message : '新增失败'});
this.$message({type:'error',message: res.message || res.msg ? res.message || res.msg : '新增失败'});
}
});
}else { // 否则 是修改
......@@ -363,7 +363,7 @@ export default {
item.fp= Number(item.fp/100)
item.np = Number(item.np/100)
})
this.$message({type:'error',message: res.message ? res.message : '修改失败'});
this.$message({type:'error',message: res.message || res.msg ? res.message || res.msg : '修改失败'});
}
});
}
......
<template>
<div class="goods-img">
<div class="goods-img" ref="goodsDetail">
<el-form ref="goodsDeForm" :model="goodsDeForm" label-width="150px" size="small">
<el-form-item label="商品详情:" prop="description">
<span class="tip-span up-img-tip" style="display: block;line-height: 34px;">上传图片详情,用于商品详情页展示</span>
......
......@@ -75,7 +75,7 @@ export default {
}
}
}else {
this.$message({type: 'error',message: res.message ? res.message : '上传图片失败'});
this.$message({type: 'error',message: res.message || res.msg ? res.message || res.msg : '上传图片失败'});
}
});
} // res.length > 0 end
......
......@@ -536,7 +536,7 @@
this.vediosrc = ''
this.$notify.error({
title: '错误',
message: res.message
message: res.message || res.msg
});
}
}).catch((err) => {
......@@ -658,7 +658,7 @@
}
}
}else {
this.$message({type: "error",message: res.message ? res.message : ""});
this.$message({type: "error",message: res.message || res.msg ? res.message || res.msg : ""});
}
});
},
......
......@@ -565,7 +565,7 @@
// 多规格【规格组合】数据 -- start --//
if ( this.radioguide==2&&spsjData2.specs_group && spsjData2.specs_group.length > 0 ) {
for(let i = 0; i < spsjData2.specs_group.length; i++) {
let itemObj = spsjData2.specs_group[i][0];
let itemObj = spsjData2.specs_group[i];
for (let itemKey in itemObj) {
// 有多余字段,可能为空,需要对有效字段单独判断
// Number后,有三中情况:0,正数,负数,NaN
......@@ -585,7 +585,11 @@
goodsPriceMsg = '[ 商品售价 ]中,库存量不能为空,并且只能填大于0的整数'
isGoodsPrice = false;
break
} else {
} else if( Number(itemObj['js_price'])> Number(itemObj['price'])) {
goodsPriceMsg = '[ 商品售价 ]中,销售指导价不能低于供货结算价'
isGoodsPrice = false;
break
}else {
goodsPriceMsg = '';
isGoodsPrice = true;
}
......@@ -635,7 +639,11 @@
} else if ( !Number(slingleSpeObj['stock']) || Number(slingleSpeObj['stock']) <0 ) {
goodsPriceMsg = '[ 商品售价 ]中,库存量不能为空,并且只能填大于0的整数'
isGoodsPrice = false;
} else {
} else if( Number(slingleSpeObj['js_price'])> Number(slingleSpeObj['price'])) {
goodsPriceMsg = '[ 商品售价 ]中,销售指导价不能低于供货结算价'
isGoodsPrice = false;
}else {
goodsPriceMsg = ''
isGoodsPrice = true;
}
......@@ -691,18 +699,18 @@
if(!isGoodsPrice) {
if ( goodsPriceMsg ) {
this.$message({type:'error',message: goodsPriceMsg });
this.setFloorNavMountClick(2);
this.setFloorNavMountClick(1);
return
}
}
if(!isGoodsDetailsImgMsg) {
this.$message({type:'error',message:'商品详情未填写完整'});
this.setFloorNavMountClick(3);
this.setFloorNavMountClick(2);
return
}
if(!isGoodsAfterSaleMsg) {
this.$message({type:'error',message:'售后及服务未填写完整'});
this.$message({type:'error',message:'商品属性或售后及服务未填写完整'});
this.setFloorNavMountClick(4);
return
}
......@@ -846,7 +854,7 @@ debugger
} else {
// 如果保存失败,将价格还原,仅处理 多规格数据
this.$refs.goodsparameter.priceReduce()
let msg = res.message ? res.message : '编辑失败'
let msg = res.message || res.msg ? res.message || res.msg : '编辑失败'
this.$message({type: 'error', message: msg});
}
});
......@@ -872,7 +880,7 @@ debugger
}else {
// 如果保存失败,将价格还原,仅处理 多规格数据
this.$refs.goodsparameter.priceReduce()
let msg = res.message ? res.message : '新增失败'
let msg = res.message || res.msg ? res.message || res.msg : '新增失败'
this.$message({type: 'error', message: msg});
}
});
......
......@@ -13,7 +13,7 @@
<el-radio-button :label="2"
>仓库中的商品({{ downsale_count }}</el-radio-button
>
<el-radio-button :label="3">审核记录</el-radio-button>
<el-radio-button :label="3">审核记录{{ upsale_count }}</el-radio-button>
<el-radio-button :label="4"
>最近删除({{ del_count }}</el-radio-button
>
......@@ -458,6 +458,7 @@ export default {
goods_id: "",
},
// editisOpen: false,//编辑
upsale_count:'',//审核记录
downsale_count: "", //仓库数量
onsale_count: "", //上架数量
del_count: "", //删除数量
......@@ -561,7 +562,7 @@ export default {
if(res.code==1){
this.getList();
}else{
this.$message.error(res.message);
this.$message.error(res.message || res.msg || res.msg);
}
})
},
......@@ -678,7 +679,7 @@ export default {
done();
this.$message({
type: "warning",
message: res.message,
message: res.message || res.msg,
});
}
});
......@@ -745,7 +746,7 @@ export default {
} else {
this.$message({
type: "success",
message: res.message ? res.message : "操作失败",
message: res.message || res.msg ? res.message || res.msg : "操作失败",
});
}
});
......@@ -799,7 +800,7 @@ export default {
} else {
this.$message({
type: "success",
message: res.message ? res.message : "批量取消失败",
message: res.message || res.msg ? res.message || res.msg : "批量取消失败",
});
}
this.getList();
......@@ -828,7 +829,7 @@ export default {
} else {
this.$message({
type: "error",
message: res.message ? res.message : "操作失败",
message: res.message || res.msg ? res.message || res.msg : "操作失败",
});
}
});
......@@ -929,7 +930,7 @@ export default {
} else {
this.$message({
type: "error",
message: res.message ? res.message : "导出失败",
message: res.message || res.msg ? res.message || res.msg : "导出失败",
});
}
});
......@@ -964,7 +965,7 @@ export default {
} else if (res.code == 0) {
this.$message({
type: "error",
message: res.message,
message: res.message || res.msg,
});
this.isHotEditGoods = false;
}
......@@ -1068,6 +1069,7 @@ export default {
this.downsale_count = res.data.downsale_count; //仓库数量
this.onsale_count = res.data.onsale_count; //上架数量
this.del_count = res.data.del_count; //删除数量
this.upsale_count = res.data.upsale_count
}
});
},
......
......@@ -185,7 +185,7 @@ export default {
this.$refs.cascaderDom.$refs.panel.activePath = []
this.form.desc = ''
} else {
msg = res.message ? res.message : '导入失败'
msg = res.message || res.msg ? res.message || res.msg : '导入失败'
this.$message({ type:'error', message: msg })
}
this.info()
......
......@@ -538,7 +538,7 @@ export default {
this.goShippingDialog = false
this.handleInfo()
}else {
this.$message({type:'error',message: res.message ? res.message : '发货失败'});
this.$message({type:'error',message: res.message || res.msg ? res.message || res.msg : '发货失败'});
}
});
}
......@@ -562,7 +562,7 @@ export default {
this.goShippingDialog = false
this.handleInfo()
}else {
this.$message({type:'error',message: res.message ? res.message : '补单发货失败'});
this.$message({type:'error',message: res.message || res.msg ? res.message || res.msg : '补单发货失败'});
}
});
}
......@@ -585,7 +585,7 @@ export default {
this.goShippingDialog = false
this.handleInfo()
}else {
this.$message({type:'error',message: res.message ? res.message : '发货失败'});
this.$message({type:'error',message: res.message || res.msg ? res.message || res.msg : '发货失败'});
}
});
}
......@@ -612,7 +612,7 @@ export default {
this.goShippingDialog = false
this.handleInfo()
}else {
this.$message({type:'error',message: res.message ? res.message : '补单发货失败'});
this.$message({type:'error',message: res.message || res.msg ? res.message || res.msg : '补单发货失败'});
}
});
}
......@@ -753,7 +753,7 @@ export default {
this.modifyinfoDialog = false
this.handleInfo()
}else {
this.$message({type:'error',message:res.message ? res.message : '修改失败'});
this.$message({type:'error',message:res.message || res.msg ? res.message || res.msg : '修改失败'});
}
})
},
......@@ -774,7 +774,7 @@ export default {
this.dialogCheck = true
this.activities = res.data.order_track ? res.data.order_track : [];
}else {
this.$message({type:'error',message: res.message ? res.message : '获取数据失败' });
this.$message({type:'error',message: res.message || res.msg ? res.message || res.msg : '获取数据失败' });
}
})
},
......
......@@ -528,7 +528,7 @@
this.goShippingDialog = false
this.getListOrder();
} else {
this.$message({ type: 'error', message: res.message ? res.message : '发货失败' });
this.$message({ type: 'error', message: res.message || res.msg ? res.message || res.msg : '发货失败' });
}
});
......@@ -835,7 +835,7 @@
this.total = res.data.count || 0
this.tableDataList = res.data.data
} else {
this.$message({ type: "error", message: res.message ? res.message : "查询订单失败" });
this.$message({ type: "error", message: res.message || res.msg ? res.message || res.msg : "查询订单失败" });
}
})
},
......@@ -876,7 +876,7 @@
document.body.removeChild(aLink);
this.$message({ type: 'success', message: '导出成功,注意下载表格' });
} else {
this.$message({ type: 'error', message: res.message ? res.message : '导出失败' });
this.$message({ type: 'error', message: res.message || res.msg ? res.message || res.msg : '导出失败' });
}
});
},
......@@ -901,7 +901,7 @@
aLink.click();
document.body.removeChild(aLink);
} else {
this.$message({ type: 'error', message: res.message ? res.message : '导出失败' });
this.$message({ type: 'error', message: res.message || res.msg ? res.message || res.msg : '导出失败' });
}
});
},
......@@ -992,7 +992,7 @@
this.$message({ type: 'success', message: '批量发货成功' });
}
} else {
this.$message({ type: 'error', message: res.message ? res.message : '批量发货失败' });
this.$message({ type: 'error', message: res.message || res.msg ? res.message || res.msg : '批量发货失败' });
}
this.getListOrder();
......@@ -1065,7 +1065,7 @@
this.dialogExpress = true
this.activities = res.data.order_track ? res.data.order_track : [];
} else {
this.$message({ type: 'error', message: res.message ? res.message : '获取数据失败' });
this.$message({ type: 'error', message: res.message || res.msg ? res.message || res.msg : '获取数据失败' });
}
})
},
......@@ -1111,7 +1111,7 @@
//console.log('备注留言返回原始数据',res.data.order.remark);
// this.$router.push({path: '/system/goods/management'});
} else if (res.code == 0) {
let msg = res.message ? res.message : '暂无数据'
let msg = res.message || res.msg ? res.message || res.msg : '暂无数据'
this.$message({ type: 'error', message: msg });
}
})
......
......@@ -679,7 +679,7 @@
if(res.code == 1) {
this.$message({type:'success',message:'操作成功'});
}else {
msg = res.message ? res.message : '操作失败'
msg = res.message || res.msg ? res.message || res.msg : '操作失败'
this.$message({type:'error',message:msg});
}
this.isASTypeDialog = false;
......@@ -701,7 +701,7 @@
if(res.code == 1) {
this.$message({type:'success',message:'操作成功'});
}else {
msg = res.message ? res.message : '操作失败'
msg = res.message || res.msg ? res.message || res.msg : '操作失败'
this.$message({type:'error',message:msg});
}
this.isASTypeDialog = false;
......@@ -723,7 +723,7 @@
if(res.code == 1) {
this.$message({type:'success',message:'操作成功'});
}else {
msg = res.message ? res.message : '操作失败'
msg = res.message || res.msg ? res.message || res.msg : '操作失败'
this.$message({type:'error',message:msg});
}
this.isASTypeDialog = false;
......@@ -745,7 +745,7 @@
if(res.code == 1) {
this.$message({type:'success',message:'操作成功'});
}else {
msg = res.message ? res.message : '操作失败'
msg = res.message || res.msg ? res.message || res.msg : '操作失败'
this.$message({type:'error',message:msg});
}
this.isASTypeDialog = false;
......@@ -770,7 +770,7 @@
if(res.code == 1) {
this.asAddressOptions = res.data.list;
}else {
let msg = res.message ? res.message : '获取售后地址失败'
let msg = res.message || res.msg ? res.message || res.msg : '获取售后地址失败'
this.$message({type:'error',message: msg});
}
});
......
......@@ -526,7 +526,7 @@ import {dateFormat} from '@/utils'
done();
this.$message({
type: 'warning',
message: res.message
message: res.message || res.msg
});
}
})
......@@ -558,7 +558,7 @@ import {dateFormat} from '@/utils'
this.$message({
type: 'warning',
message: res.message
message: res.message || res.msg
});
}
})
......
......@@ -167,7 +167,7 @@ export default {
this.getGoodsLogistics();
}else {
this.$message({
message: res.message,
message: res.message || res.msg,
type: "error",
});
this.dialogDelete = false;
......@@ -189,7 +189,7 @@ export default {
this.dialogVisible = false;
} else {
this.$message({
message: res.message,
message: res.message || res.msg,
type: "error",
});
this.dialogVisible = false;
......@@ -203,7 +203,7 @@ export default {
this.tableData = res.data;
}else {
this.$message({
message: res.message,
message: res.message || res.msg,
type: "error",
});
}
......
......@@ -215,7 +215,7 @@ export default {
} else if (res.code == 0) {
this.$message({
type: "error",
message: res.message,
message: res.message || res.msg,
});
}
});
......@@ -231,7 +231,7 @@ export default {
this.getGroupList();
} else {
this.$message({
message: res.message,
message: res.message || res.msg,
type: "error",
});
}
......@@ -255,7 +255,7 @@ export default {
this.getGroupList();
} else {
this.$message({
message: res.message,
message: res.message || res.msg,
type: "error",
});
}
......@@ -276,7 +276,7 @@ export default {
this.tableData = res.data.list;
} else {
this.$message({
message: res.message,
message: res.message || res.msg,
type: "error",
});
}
......
......@@ -293,7 +293,7 @@ export default {
this.getUnitList();
} else {
this.$message({
message: res.message,
message: res.message||res.msg,
type: "error",
});
this.dialogVisible = false;
......@@ -316,7 +316,7 @@ export default {
this.getUnitList();
} else {
this.$message({
message: res.message,
message: res.message || res.msg,
type: "error",
});
this.dialogVisible = false;
......@@ -340,7 +340,7 @@ export default {
this.getPackList();
} else {
this.$message({
message: res.message,
message: res.message||res.msg,
type: "error",
});
this.dialogVisible = false;
......@@ -363,7 +363,7 @@ export default {
this.getPackList();
} else {
this.$message({
message: res.message,
message: res.message||res.msg,
type: "error",
});
this.dialogVisible = false;
......@@ -390,7 +390,7 @@ export default {
this.getUnitList();
} else {
this.$message({
message: res.message,
message: res.message||res.msg,
type: "error",
});
this.dialogDelete = false;
......@@ -410,7 +410,7 @@ export default {
this.getPackList();
} else {
this.$message({
message: res.message,
message: res.message||res.msg,
type: "error",
});
this.dialogDelete = false;
......@@ -425,7 +425,7 @@ export default {
this.tableData = res.data;
} else {
this.$message({
message: res.message,
message: res.message||res.msg,
type: "error",
});
}
......@@ -438,7 +438,7 @@ export default {
this.tableData = res.data;
} else {
this.$message({
message: res.message,
message: res.message||res.msg,
type: "error",
});
}
......
......@@ -316,7 +316,7 @@
if(res.code == 1) {
this.$message({type:"success",message: '验证码发送成功'});
}else {
this.$message({type:"error",message: res.message ? res.message : '验证码发送失败'});
this.$message({type:"error",message: res.message || res.msg ? res.message || res.msg : '验证码发送失败'});
}
});
},
......
......@@ -508,7 +508,7 @@
this.brandList = [];
}
}else {
this.$message({ type: 'error',message: res.message ? res.message : '获取品牌列表数据失败' });
this.$message({ type: 'error',message: res.message || res.msg ? res.message || res.msg : '获取品牌列表数据失败' });
}
});
},
......@@ -646,7 +646,7 @@
}
}else {
this.$message({type: 'error',message: res.message ? res.message : '获取品牌失败' });
this.$message({type: 'error',message: res.message || res.msg ? res.message || res.msg : '获取品牌失败' });
}
});
......@@ -739,7 +739,7 @@
this.getList();
this.isOpen = false;
}else {
this.$message({ type: 'error', message: res.message ? res.message : "提交失败"});
this.$message({ type: 'error', message: res.message || res.msg ? res.message || res.msg : "提交失败"});
}
});
}
......@@ -757,7 +757,7 @@
this.getList();
this.isOpen = false;
}else {
this.$message({ type: 'error', message: res.message ? res.message : "提交失败"});
this.$message({ type: 'error', message: res.message || res.msg ? res.message || res.msg : "提交失败"});
}
}).catch(() => {});
}
......
......@@ -743,7 +743,7 @@
this.isOpen = false;
this.getShop();
}else {
this.$message({type: 'error',message: res.message ? res.message : '操作失败'});
this.$message({type: 'error',message: res.message || res.msg ? res.message || res.msg : '操作失败'});
}
});
}).catch(() => {});
......
......@@ -308,7 +308,7 @@ export default {
} else {
this.$message({
type: "error",
message: res.message,
message: res.message || res.msg,
});
}
});
......@@ -329,7 +329,7 @@ export default {
} else {
this.$message({
type: "error",
message: res.message,
message: res.message || res.msg,
});
this.dialogDelete = false;
}
......@@ -361,7 +361,7 @@ export default {
} else {
this.$message({
type: "error",
message: res.message,
message: res.message || res.msg,
});
}
});
......@@ -378,7 +378,7 @@ export default {
} else {
this.$message({
type: "error",
message: res.message,
message: res.message || res.msg,
});
}
});
......
......@@ -422,7 +422,7 @@ export default {
} else {
this.$message({
type: "error",
message: res.message,
message: res.message || res.msg,
});
}
});
......@@ -463,7 +463,7 @@ export default {
} else {
this.$message({
type: "error",
message: res.message,
message: res.message || res.msg,
});
}
this.loading = false;
......@@ -501,7 +501,7 @@ export default {
this.dialogVisible = false;
} else {
this.$message({
message: res.message,
message: res.message || res.msg,
type: "error",
});
}
......@@ -521,7 +521,7 @@ export default {
this.dialogVisible = false;
} else {
this.$message({
message: res.message,
message: res.message || res.msg,
type: "error",
});
}
......@@ -558,7 +558,7 @@ export default {
this.dialogDelete = false;
} else {
this.$message({
message: res.message,
message: res.message || res.msg,
type: "error",
});
this.dialogDelete = false;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论