Skip to content

S
shop-new
提交 1465c103 authored 作者: PC-20210205TDZC\Administrator's avatar PC-20210205TDZC\Administrator
浏览文件
操作

Merge branch 'dev_hxz' of http://120.27.146.32:8888/wangfulong/shop-new into dev_hxz

上级 2261701c 2adddc4c
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 653 行增加 和 452 行删除
.env.development
浏览文件 @ 1465c103
......@@ -3,7 +3,7 @@ ENV = 'development'
# 正式环境
#VUE_APP_BASE_API = 'http://sjapi.jxhh.com'
#VUE_APP_BASE_SYS_API = 'http://sysapi.jxhh.com'
VUE_APP_BASE_SYS_API = 'http://sysapi.jxhh.com'
# 开发环境
#VUE_APP_BASE_API = 'http://192.168.111.34:8200'
VUE_APP_BASE_API = 'http://192.168.26.179:8200'
......
public/index.html
浏览文件 @ 1465c103
......@@ -228,7 +228,7 @@
}
}
};
xhttp.open("GET", 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true);
xhttp.open("GET", '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 直接上正式，以防上线忘改
xhttp.send();
}
</script>
......
src/api/module/bankcard.js
浏览文件 @ 1465c103
......@@ -171,10 +171,17 @@ export function addInvoiceData (data) {
}
// 获取验证码
// export function getCheckCodeData(data) {
// return request({
// url: '/system/withdrawlog/getCheckCode',
// method: 'post',
// data: data
// })
// }
export function getCheckCodeData(data) {
return request({
url: '/system/withdrawlog/getCheckCode',
method: 'post',
url: '/local/seller/sendMobile',
method: 'get',
data: data
})
}
......
src/api/module/operation/index.js
浏览文件 @ 1465c103
// import request from '@/utils/request';
import request from '@/utils/request';
import axios from 'axios'
// 获取分类列表
//
// // 获取分类列表
// export function getDocList (docType) {
// return request({
// url: '/api/v1/document/externalTypeListALL?docType='+docType,
// url: '//sysapi.jxhh.com/api/v1/document/externalTypeListALL?docType='+docType,
// method: 'get'
// })
// }
//
// // 查询文档
// //
// // // 查询文档
// export function getDoc (query) {
// return request({
// url: '/api/v1/document/externalShow',
......
src/views/system/asset/myAsset/index.vue
浏览文件 @ 1465c103
......@@ -4,7 +4,7 @@
<!-- 商品信息 -->
<div class="card-header-custom">
<div class="card-header-title">
<span class="blue-block blue-block-goods-title"></span>账号资产
<span class="blue-block blue-block-goods-title"></span>账户资产
</div>
<div class="card-header-handle">
<el-button plain type="primary" size="small" @click="explainWithdrawal">提现说明</el-button>
......@@ -111,7 +111,7 @@
</el-form-item>
<el-form-item label="对公银行账号：" prop="bank_account_sn">
<el-input v-model="bankcardForm.bank_account_sn" placeholder="请输入快递单号" style="width: 70%"></el-input>
<el-input v-model="bankcardForm.bank_account_sn" placeholder="请输入对公银行账号" style="width: 70%"></el-input>
</el-form-item>
<el-form-item>
......@@ -204,15 +204,7 @@
getBankDetailsData({ id: id }).then(res=> {
if(res.code == 1 && res.data) {
this.addBankcardInfoDialog = true;
if(res.data.bank_name) {
for(let i = 0; i < this.bankOptions.length; i++) {
if(res.data.bank_name == this.bankOptions[i].name) {
this.bankcardForm.bank_name = this.bankOptions[i].code;
break
}
}
}
this.bankcardForm.bank_name = res.data.bank_name
this.bankcardForm.bankAccountName = res.data.corporate_account_name;
this.bankcardForm.bank_branch_name = res.data.bank_branch_name;
this.bankcardForm.bank_account_sn = res.data.bank_account_sn;
......@@ -232,7 +224,7 @@
type: 'warning'
}).then(async ()=> {
let delResult = await delBankcardData({id: indexId});
console.log('删除结果',delResult);
// console.log('删除结果',delResult);
if (delResult.code == 1) {
this.$message({type:'success',message:'删除成功'});
this.getMyAssetList();
......@@ -255,7 +247,7 @@
submitBankcard() {
let params = {
bank_name: '',
bank_name: this.bankcardForm.bank_name,
bank_branch_name: this.bankcardForm.bank_branch_name,
bank_account_sn: this.bankcardForm.bank_account_sn
}
......@@ -308,6 +300,11 @@
/** 初始化 添加 银行卡 数据 */
resetAddBankcardForm() {
this.bankcardForm = {
bank_name: '',
bank_branch_name: '',
bank_account_sn: '',
}
this.$refs['bankcardForm'].resetFields();
},
......
src/views/system/asset/wddetails.vue
浏览文件 @ 1465c103
......@@ -3,6 +3,7 @@
<el-card class="box-card">
<p class="card-header-tip">
提现状态：<span class="pay-status">{{ payStatusFormatter(withdrawInfo.pay_status) }}</span>
<!-- 提现状态：<strong>{{ payStatusFormatter(withdrawInfo.pay_status) }}</strong>-->
<span>如果您是电子发票，则不用填写快递公司和单号信息，需上传电子发票图片，同时将电子发票发送至电子邮箱，查看</span>
<span class="checked-email-rule" @click="isViewSendRuleDialog = true">【电子邮箱及发票发送格式】</span>
</p>
......@@ -81,7 +82,7 @@
<p><span class="span-title spe-1">附件：</span>电子发票</p>
</div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="isViewSendRuleDialog = false" >取 消</el-button>
<el-button type="primary" @click="isViewSendRuleDialog = false" size="small">关 闭</el-button>
</span>
</el-dialog>
......@@ -147,8 +148,19 @@
width="40%"
center>
<el-form :model="viewInvoiceForm" label-width="150px" class="add-invoice-form" size="small">
<el-form-item label="快递公司：" >
<el-input v-model="viewInvoiceForm.express_name" placeholder="请输入快递单号" disabled style="width: 80%;"></el-input>
<!-- <el-form-item label="快递公司：" >-->
<!-- <el-input v-model="viewInvoiceForm.express_name" placeholder="请输入快递单号" disabled style="width: 80%;"></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="快递公司：" prop="express_name">
<el-select v-model="viewInvoiceForm.express_name" disabled placeholder="请选择快递公司" style="width: 80%;">
<el-option
v-for="item in expressLists"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="快递单号：">
......@@ -163,12 +175,12 @@
:preview-src-list="viewInvoiceForm.invoiceImgList">
</el-image>
</div>
<div class="textTip">最多上传一张图片，仅限jpg/png格式，大小限制在500kb以内</div>
<!-- <div class="textTip">最多上传一张图片，仅限jpg/png格式，大小限制在500kb以内</div>-->
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="isViewInvoiceAgainDialog = false" size="small">确 定</el-button>
<el-button type="primary" @click="isViewInvoiceAgainDialog = false" size="small">关 闭</el-button>
</span>
</el-dialog>
......@@ -274,14 +286,20 @@
/** 导出商品明细 */
exportGoodsDetails() {
exportGoodsDetailsData( {id: this.withdrawId} ).then(res=> {
if (res.code == 1 && res.data) {
const aLink = document.createElement('a');
aLink.href = res.data;
//aLink.download = '订单.xls'; //下载的文件名
aLink.style.display = 'none';
document.body.appendChild(aLink);
aLink.click();
document.body.removeChild(aLink);
//debugger
if (res.code == 1) {
if(res.data) {
this.$message({type:'success',message:'导出成功'});
const aLink = document.createElement('a');
aLink.href = res.data;
//aLink.download = '订单.xls'; //下载的文件名
aLink.style.display = 'none';
document.body.appendChild(aLink);
aLink.click();
document.body.removeChild(aLink);
}else {
this.$message({type:'warning',message: res.message ? res.message: '导出失败'});
}
}else {
this.$message({type:'error',message: res.message ? res.message: '导出失败'});
}
......@@ -307,7 +325,7 @@
});
return false;
}
let isImgSize = (file.size / 1024 / 1024 / 1024) > 500;
let isImgSize = (file.size / 1024 ) > 500;
if (isImgSize) {
this.$message({
message: '上传图片大小不能超过500kb',
......@@ -395,10 +413,16 @@
this.$refs.addInvoiceForm.validate((valid)=> {
if (valid) {
params.id = this.withdrawId;
params.express_company = this.addInvoiceForm.express_name;
//params.express_company = this.addInvoiceForm.express_name;
params.express_no = this.addInvoiceForm.express_sn;
params.invoice_img = this.invoiceImgBase64List
for(let i = 0; i < this.expressLists.length; i++) {
if(this.addInvoiceForm.express_name == this.expressLists[i].value) {
params.express_company = this.expressLists[i].label
}
}
addInvoiceData(params).then(res=> {
if(res.code == 1) {
this.$message({type:'success',message: '补充发票信息成功'});
......@@ -503,6 +527,7 @@
color: #333333;
padding: 0 15px;
margin-bottom: 0;
overflow: hidden;
}
.pay-status {
margin: 0 10px;
......
src/views/system/asset/withdraw/index.vue
浏览文件 @ 1465c103
......@@ -20,7 +20,7 @@
<el-form-item label="提现至：" prop="bank_id">
<el-select v-model="assetForm.bank_id" placeholder="选择到账银行卡" style="width:420px;">
<el-option v-for="item in bankList" :key="item.id" :label="item.bank_name" :value="item.id"></el-option>
<el-option v-for="item in bankList" :key="item.id" :label="formatBankName(item.bank_name,item.bank_account_sn)" :value="item.id"></el-option>
</el-select>
<span class="withdraw-tip">
您还没有账户，<span class="spe-span-a" @click="goToAddBank">去添加</span>
......@@ -30,7 +30,8 @@
<el-form-item label="提现金额：">
<el-input v-model="withdrawalBalance" disabled placeholder="全部提现金额" style="width:420px;"/>
<span class="withdraw-tip">
提现金额为全部的可提现余额，手续费将从您的提现金额中扣除，以实际到账为准（开票以实际到账金额开具）
不允许手动输入，提现金额为全部的可提现余额，手续费将从您的提现金额中扣除，以实际到账为准（开票以实际到账金额开具）。
提现金额至少为100元才可以操作提现
</span>
<p class="withdraw-tip-spe">当前提现手续费为：{{ chargeCount }} 元</p>
</el-form-item>
......@@ -55,7 +56,7 @@
<div class="footer-btn">
<el-button type="primary" @click="submitForm" :disabled="inSureCashOut" style="margin-right:20px;">确 定</el-button>
<el-button @click="resetAssetForm">取 消</el-button>
<!-- <el-button @click="resetAssetForm">取 消</el-button>-->
</div>
</el-card>
</div>
......@@ -182,9 +183,12 @@
// 倒计时效果
this.getCode()
getCheckCodeData({seller_id: this.seller_id}).then(response => {
if (response.code == 0) {
this.msgSuccess(response.msg);
// 获取验证码接口
getCheckCodeData().then(res => {
if (res.code == 1) {
this.$message({type:'success',message: '验证码发送成功'});
}else {
this.$message({type:'error',message: res.message ? res.message : '发送失败'});
}
});
},
......@@ -233,6 +237,11 @@
/** 提交按钮 */
submitForm() {
if( Number(this.withdrawalBalance) < 100) {
this.$message({type: 'warning',message: '提现金额至少为100才可操作提现'});
return;
}
this.$refs["assetForm"].validate(valid => {
if (valid) {
applyWithdraw(this.assetForm).then(res => {
......@@ -247,6 +256,22 @@
}
});
},
/** 提现 银行卡名称 + ***后四位卡号 */
formatBankName(name,num) {
let newBnakName = '';
let newNum = '';
// 为了以防万一，先将num转为字符串
let numStr = num + '';
if(numStr && numStr.length > 4) {
newNum = '****' + numStr.substring(numStr.length-4)
}else {
newNum = numStr
}
newBnakName = name + ' (' + newNum + ')'
return newBnakName
}
} //methods结束
};
</script>
......
src/views/system/freight/freight_list/index.vue
浏览文件 @ 1465c103
......@@ -32,15 +32,15 @@
</el-form>
</div>
<el-table v-loading="loading" :data="freightList" :height="tableHeight" @selection-change="handleSelectionChange">
<el-table :data="freightList" :height="tableHeight" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="ID" align="center" prop="Id"/>
<el-table-column label="模板名称" align="center" prop="Name"/>
<el-table-column label="排序" align="center" prop="Sort"/>
<el-table-column label="是否是默认模板" align="center" :formatter="formatDefault" prop="IsDefault"/>
<el-table-column label="ID" align="center" prop="id"/>
<el-table-column label="模板名称" align="center" prop="name"/>
<el-table-column label="排序" align="center" prop="sort"/>
<el-table-column label="是否是默认模板" align="center" :formatter="formatDefault" prop="is_default"/>
<!-- <el-table-column label="类型" align="center" :formatter="formatType" prop="ChargeType"/> -->
<el-table-column label="启用状态" align="center" :formatter="formaStatus" prop="Publish"/>
<el-table-column label="创建时间" align="center" :formatter="formatTime" prop="Created"/>
<el-table-column label="启用状态" align="center" :formatter="formaStatus" prop="publish"/>
<el-table-column label="创建时间" align="center" :formatter="formatTime" prop="created"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
......@@ -84,8 +84,6 @@
return {
fullHeight: 0,
tableHeight: 0,
// 遮罩层
loading: false,
// 选中数组
ids: [],
// 非单个禁用
......@@ -148,9 +146,9 @@
this.isOpen = val;
this.getList();
},
// 模板是否启用状态
/** 启用状态 格式化*/
formaStatus(row) {
let isPublish = row.Publish;
let isPublish = row.publish;
let publish = '';
if(isPublish === 1) {
publish = '启用';
......@@ -161,7 +159,7 @@
return publish
},
formatType(row) {
var typese = row.ChargeType
var typese = row.chargeType
var optDess = ''
if (typese == 1) {
optDess = "按重量"
......@@ -172,7 +170,7 @@
},
//格式化状态
formatDefault(row) {
var types = row.IsDefault
var types = row.is_default
var optDes = ''
if (types == 1) {
optDes = "是"
......@@ -183,7 +181,7 @@
},
//格式化时间
formatTime(row) {
var Time = row.Created
var Time = row.created
var newtime = ""
if (Time > 0) {
newtime = dateFormat(Time * 1000, "Y-m-d H:i:s");
......@@ -194,7 +192,7 @@
getList() {
listFreight(this.queryParams).then(res => {
if(res.data) {
debugger
//
this.freightList = res.data.list;
this.total = res.data.count;
}
......@@ -208,7 +206,7 @@
// 表单重置
reset() {
this.form = {
id: null,
id: 0,
seller_id: null,
name: null,
sort: null,
......@@ -234,7 +232,7 @@
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.Id)
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
......@@ -247,12 +245,12 @@
this.reset();
this.isOpen = true;
this.form = {
Id: 0,
Sort: 0,
Name: "0",
IsDefault: 0,
ChargeType: 0,
Dispatching: [
id: 0,
sort: 0,
name: "",
isDefault: 0,
chargeType: 0,
dispatching: [
{
a: "全国",
f: 500,
......@@ -261,20 +259,18 @@
np: 5,
}
],
Disdispatching: "",
Publish: 0,
disDispatching: "",
publish: 0,
};
this.title = "添加运费模板";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.Id
const id = row.id
getFreight(id).then(response => {
let formdate = response.data
debugger
response.data.Dispatching = JSON.parse(formdate.Dispatching)
console.log("点击修改获取的数据：",formdate.Dispatching);
//let formdate = response.data
//response.data.dispatching = JSON.parse(formdate.dispatching)
this.form = response.data
this.isOpen = true;
this.title = "修改运费模板";
......@@ -283,10 +279,10 @@
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
debugger
if (valid) {
if (this.form.id != null) {
if (this.form.id != 0) {
updateFreight(this.form).then(response => {
if (response.code === 0) {
this.msgSuccess("修改成功");
......@@ -311,23 +307,19 @@
* */
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.Id || this.ids;
debugger
const ids = row.id || this.ids;
this.$confirm('是否确认删除运费模板编号为“' + ids + '"的数据？','警告',{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async()=> {
this.loading = true;
let delResult = await delFreight(ids);
if(delResult.code === 1) {
this.$message({type: 'success',message: delResult.msg});
this.$message({type: 'success',message: '删除成功'});
this.getList();
} else {
this.$message({type: 'error',message: delResult.msg ? delResult.msg : '删除失败'});
}
if(delResult.code === 0) {
this.$message({type: 'error',message: delResult.msg});
}
this.loading = false;
}).catch(()=> {});
},
} //methods结束
......
src/views/system/freight/freight_list/indexbtn.vue
浏览文件 @ 1465c103
......@@ -3,26 +3,26 @@
<el-form class='el_form' ref="form" label-width="100px">
<el-form-item label="排序">
<el-input
v-model="goodsDate.Sort"
v-model="goodsDate.sort"
placeholder=""
style="width: 70%"
></el-input>
</el-form-item>
<el-form-item label="模板名称">
<el-input
v-model="goodsDate.Name"
v-model="goodsDate.name"
placeholder=""
style="width: 70%"
></el-input>
</el-form-item>
<el-form-item label="是否默认">
<el-radio-group v-model="goodsDate.IsDefault">
<el-radio-group v-model="goodsDate.is_default">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="计费方式">
<el-radio-group v-model="goodsDate.ChargeType">
<el-radio-group v-model="goodsDate.charge_type">
<el-radio :label="1">按重量</el-radio>
<el-radio :label="2">按数量</el-radio>
</el-radio-group>
......@@ -39,7 +39,7 @@
<p class="col_pr">管理</p>
</div>
<div
v-for="(item, index) in goodsDate.Dispatching"
v-for="(item, index) in goodsDate.dispatching"
:key="index"
class="tablessst"
>
......@@ -106,20 +106,19 @@
</el-form-item>
<el-form-item label="不配送区域">
<el-input
v-model="goodsDate.Disdispatching"
v-model="goodsDate.dis_dispatching"
placeholder=""
style="width: 80%"
disabled
>
<template slot="prepend">
<span @click="opendias(goodsDate.Disdispatching, 1, 99)"
>选择</span
>
<span @click="opendias(goodsDate.dis_dispatching, 1, 99)"
>选择</span>
</template>
</el-input>
</el-form-item>
<el-form-item label="状态">
<el-radio-group v-model="goodsDate.Publish">
<el-radio-group v-model="goodsDate.publish">
<el-radio :label="1">启用</el-radio>
<el-radio :label="0">禁用</el-radio>
</el-radio-group>
......@@ -201,16 +200,16 @@ export default {
disabledate: [], //不能选择
dialogVisible: false,
goodsDate: {
Id:0,
Sort: 0,
Name: "0",
IsDefault: 0,
ChargeType: 0,
Dispatching: [
id:0,
sort: 0,
name: "0",
is_default: 0,
charge_type: 0,
dispatching: [
{ a: "全国", f: 500, fp: 10, n: 100, np: 5 }
],
Disdispatching: "",
Publish: 0,
dis_dispatching: "",
publish: 0,
},
};
},
......@@ -226,9 +225,9 @@ export default {
if(checkListString.substr(0,1) === ',') {
checkListString = checkListString.slice(1);
}
this.goodsDate.Disdispatching = checkListString;
this.goodsDate.dis_dispatching = checkListString;
}else{
this.goodsDate.Dispatching[this.btnindex].a = this.checkList.join()
this.goodsDate.dispatching[this.btnindex].a = this.checkList.join()
}
this.dialogVisible = false
},
......@@ -240,13 +239,13 @@ export default {
},
opendias(type, i, index) {
this.goodsDate.Dispatching.forEach((element) => {
this.goodsDate.dispatching.forEach((element) => {
let arrd = element.a.split(',')
for(let i=0;i<arrd.length;i++){
this.disabledate.push(arrd[i]);
}
});
let arr = this.goodsDate.Disdispatching.split(',');
let arr = this.goodsDate.dis_dispatching.split(',');
for(let i=0;i<arr.length;i++){
this.disabledate.push(arr[i]);
}
......@@ -266,25 +265,30 @@ export default {
this.dialogVisible = true;
},
handleinfomationclick() {//提交
this.goodsDate.Dispatching.forEach(item=>{
/** 运费模板 修改/新增 的保存 */
handleinfomationclick() {
this.goodsDate.dispatching.forEach(item=>{
item.fp= Number(item.fp*100).toFixed();
item.np = Number(item.np*100).toFixed();
})
this.loading = true
addFreight(this.goodsDate).then(res => {
//console.log(275,res);
if(res.code === 1) {
this.$emit("closeIndexbtn",false);
if(this.goodsDate.Id === 0) {
if(this.goodsDate.id === 0) {
this.$message({ message: '新增成功', type: 'success'});
}else {
this.$message({ message: '修改成功', type: 'success'});
}
}else {
this.goodsDate.dispatching.forEach(item=>{
item.fp= Number(item.fp/100).toFixed();
item.np = Number(item.np/100).toFixed();
})
}
this.loading = false;
});
},
/** 配送区域 添加参数 操作 */
addguild() {
//添加
let arrchild = {
......@@ -294,15 +298,11 @@ export default {
n: "",
np: "",
};
this.$set(
this.goodsDate.Dispatching,
this.goodsDate.Dispatching.length,
arrchild
);
this.$set(this.goodsDate.dispatching, this.goodsDate.dispatching.length, arrchild);
},
/** 删除 运费模板 */
deletearrinput(index) {
//删除
this.goodsDate.Dispatching.splice(index, 1);
this.goodsDate.dispatching.splice(index, 1);
},
info() {
this.goodsDate = this.option
......
src/views/system/goods/add/components/goodsinfomation.vue
浏览文件 @ 1465c103
......@@ -360,7 +360,7 @@
return file;
}, ()=>{
this.$message({
message:'商品图片尺寸必须为800 * 800，请重新选择!',
message:'商品图片尺寸必须为800 * 800像素，请重新选择!',
type: 'warning'
});
return Promise.reject();
......@@ -379,9 +379,9 @@
if(res.data) {
urlObj.url = res.data.image_url;
this.goodsImgFileList.push(urlObj);
// this.goodsImgFileList.forEach(item=> {
// this.goodsInfoForm.imgs.push(item.url)
// })
this.goodsImgFileList.forEach(item=> {
this.goodsInfoForm.imgs.push(item.url)
})
this.$message({type:'success',message:'图片上传成功'});
// 只清除一次，不浪费哦
if(this.goodsImgFileList.length === 1) {
......
src/views/system/goods/add/components/goodsparameter.vue
浏览文件 @ 1465c103
......@@ -318,9 +318,11 @@ export default {
});
},
// 如果保存失败，将乘以100的价格还原
/**如果保存失败，将乘以100的价格还原
* 当多规格数据时候，才调用
* */
priceReduce() {
debugger
// debugger
if(this.parameterdata.pamTableList && this.parameterdata.pamTableList.length > 0) {
this.parameterdata.pamTableList.forEach((item)=> {
if(item[0].js_price) {
......@@ -336,20 +338,21 @@ export default {
item[0].sl_price = item[0].sl_price / 100;
}
})
}else {
if(this.singleSpecTable[0].js_price) {
this.singleSpecTable[0].js_price = this.singleSpecTable[0].js_price / 100
}
if(this.singleSpecTable[0].price) {
this.singleSpecTable[0].price = this.singleSpecTable[0].price / 100
}
if(this.singleSpecTable[0].sc_price) {
this.singleSpecTable[0].sc_price = this.singleSpecTable[0].sc_price / 100
}
if(this.singleSpecTable[0].sl_price) {
this.singleSpecTable[0].sl_price = this.singleSpecTable[0].sl_price / 100
}
}
// else {
// if(this.singleSpecTable[0].js_price) {
// this.singleSpecTable[0].js_price = this.singleSpecTable[0].js_price / 100
// }
// if(this.singleSpecTable[0].price) {
// this.singleSpecTable[0].price = this.singleSpecTable[0].price / 100
// }
// if(this.singleSpecTable[0].sc_price) {
// this.singleSpecTable[0].sc_price = this.singleSpecTable[0].sc_price / 100
// }
// if(this.singleSpecTable[0].sl_price) {
// this.singleSpecTable[0].sl_price = this.singleSpecTable[0].sl_price / 100
// }
// }
},
// 删除 单个规格的图片
......
src/views/system/goods/add/index.vue
浏览文件 @ 1465c103
......@@ -577,7 +577,7 @@
delete this.goodsAllData.specs_group;
}
// 商品id 不为 0 是修改
// 修改 商品id不为 0
if( this.goodsAllData.goods_id ) {
// 商品id 为 0 是新增
let goodsStatus = 1;
......@@ -587,6 +587,7 @@
goodsStatus = 3;
}
updateGoodsNew(this.goodsAllData).then(res=> {
//debugger
if( res.code === 1 ) {
this.$message({type: 'success', message:'编辑成功'});
this.initAllGoodsInfo();
......@@ -594,15 +595,16 @@
path: '/system/goods/management',
query: { goodsStatus: goodsStatus }
});
}
if(res.code === 0) {
} else {
// 如果保存失败，将价格还原,仅处理 多规格数据
this.$refs.goodsparameter.priceReduce()
let msg = res.message ? res.message : '编辑失败'
this.$message({type: 'error', message: msg});
}
});
}else {
// 商品id 为 0 是新增
//debugger
// 新增 商品id 为 0
let goodsStatus = 1;
if ( this.goodsAllData.submit === 0 ) {
goodsStatus = 2;
......@@ -617,9 +619,8 @@
path: '/system/goods/management',
query: { goodsStatus: goodsStatus }
});
}
if(res.code === 0) {
// 如果保存失败，将价格还原
}else {
// 如果保存失败，将价格还原,仅处理 多规格数据
this.$refs.goodsparameter.priceReduce()
let msg = res.message ? res.message : '新增失败'
this.$message({type: 'error', message: msg});
......
src/views/system/order/components/orderDetail.vue
浏览文件 @ 1465c103
......@@ -178,8 +178,11 @@
<el-input size="mini" v-model="addressForm.tel" placeholder="请输入联系电话"></el-input>
</el-form-item>
<el-form-item label="收货地址：">
<el-cascader v-model="addressForm.areaList" :props='props' ref="ssqCascader" placeholder="请选择具体的省市区" style="width:100%"></el-cascader>
<el-cascader v-model="addressForm.areaList" :props='props' @change="handleChanges" ref="ssqCascader" placeholder="请选择具体的省市区" style="width:100%"></el-cascader>
</el-form-item>
<!-- <el-form-item label="省市区：" prop="address_ids">-->
<!-- <el-cascader v-model="areaList" :props='props' @change="handleChanges" placeholder="请选择具体的省市区" style="width:100%"></el-cascader>-->
<!-- </el-form-item>-->
<el-form-item label="街道：">
<el-input size="mini" v-model="addressForm.street" placeholder="请输入街道"></el-input>
</el-form-item>
......@@ -590,13 +593,15 @@ export default {
if(this.orderDetail.mobile) {
this.addressForm.tel = this.orderDetail.mobile;
}
// if(this.orderDetail.provice && this.orderDetail.city && this.orderDetail.district) {
// this.addressForm.areaList.push(this.orderDetail.provice) //this.orderDetail.provice + this.orderDetail.city + this.orderDetail.district
// this.addressForm.areaList.push(this.orderDetail.this.city) //this.orderDetail.provice + this.orderDetail.city + this.orderDetail.district
// this.addressForm.areaList.push(this.orderDetail.district) //this.orderDetail.provice + this.orderDetail.city + this.orderDetail.district
// }else {
// this.addressForm.areaList = []
// }
if(this.orderDetail.provice && this.orderDetail.city && this.orderDetail.district) {
this.addressForm.areaList[0] = Number(this.orderDetail.provice)
this.addressForm.areaList[1] = Number(this.orderDetail.city)
this.addressForm.areaList[2] = Number(this.orderDetail.district)
//console.log(66,this.addressForm.areaList);
}else {
this.addressForm.areaList = []
}
if(this.orderDetail.street) {
this.addressForm.street = this.orderDetail.street;
......@@ -605,8 +610,6 @@ export default {
this.addressForm.address = this.orderDetail.address;
}
this.modifyinfoDialog = true
},
/** 保存 买家信息 */
......@@ -788,6 +791,10 @@ export default {
resolve(result)
})
},
handleChanges(value) {
this.addressForm.areaList = value;
console.log(797,value);
},
}
}
</script>
......
src/views/system/order/index.vue
浏览文件 @ 1465c103
......@@ -595,7 +595,6 @@
this.$refs.upload.clearFiles();
this.isDeliveryOpen = false;
this.excelList = [];
//console.log(88,this.excelList);
},
// 提交导入数据
......@@ -609,6 +608,7 @@
deliveryOrderExport(this.excelList).then(res => {
if (res.code === 1) {
this.isDeliveryOpen = false;
this.excelList = [];
this.$message({type: 'success', message: '批量发货成功'});
this.getListOrder();
} else {
......
src/views/system/retreat/edit.vue
浏览文件 @ 1465c103
......@@ -149,8 +149,8 @@
<el-button class="as-btn" type="primary" @click="refuseHandle(4)" :disabled="isFinishedButtonDisabled">拒绝退货退款</el-button>
</div>
<div class="as-handle-btn" v-if="onlyOrRefundBtnType == 3">
<el-button class="as-btn" type="primary" @click="refuseHandle(4)" :disabled="isFinishedButtonDisabled">拒收包裹</el-button>
<el-button class="as-btn" type="primary" @click="agreeHandle(1)" :disabled="isFinishedButtonDisabled">确定退款</el-button>
<el-button class="as-btn" type="primary" @click="refuseHandle(4)" :disabled="isFinishedButtonDisabled || returnRefundDisabled">拒收包裹</el-button>
<el-button class="as-btn" type="primary" @click="agreeHandle(1)" :disabled="isFinishedButtonDisabled || returnRefundDisabled" >确定退款</el-button>
</div>
</el-card>
......@@ -265,7 +265,8 @@
sellerId: 0,
asAddressOptions: [],
order_refund_address:'',
isFinishedButtonDisabled: false
isFinishedButtonDisabled: false,
returnRefundDisabled: false, // 仅 退货退款 订单，需要此参数，控制，拒收包裹-同意退款按钮是否可以点击
} // return end
},
watch: {
......@@ -479,6 +480,7 @@
this.onlyOrRefundBtnType = 1
}else if(row.refund_type == 2) {
this.onlyOrRefundBtnType = (row.status == 1) ? 2 : 3
this.returnRefundDisabled = (row.status == 2) ? true : false // 仅 退货退款 订单，当买家未回填物流单号时，不允许点击 “拒收包裹” 按钮
}else {
this.onlyOrRefundBtnType = 0;
}
......@@ -676,13 +678,21 @@
reasonFormatter(type) {
let reasonText = ''
if ( type == 1 ) {
reasonText = '其他'
reasonText = '协商一致退款'
} else if( type == 2 ) {
reasonText = '漏发'
reasonText = '质量问题'
}else if( type == 3 ) {
reasonText = '协商一致'
reasonText = '物流问题'
}else if( type == 4 ) {
reasonText = '质量不符'
reasonText = '假冒品牌'
}else if( type == 5 ) {
reasonText = '少件/漏发/破损/污渍'
}else if( type == 6 ) {
reasonText = '7天无理由'
}else if( type == 7 ) {
reasonText = '拍错/多拍/不想要'
}else if( type == 8 ) {
reasonText = '其他'
}
return reasonText
},
......
src/views/system/retreat/retreat/index.vue
浏览文件 @ 1465c103
......@@ -79,10 +79,14 @@
</el-table-column>
<el-table-column label="退换货原因" align="center" prop="reason">
<template slot-scope="scope">
<span v-if="scope.row.reason==1">其他</span>
<span v-if="scope.row.reason==2">漏发</span>
<span v-if="scope.row.reason==3">协商一致</span>
<span v-if="scope.row.reason==4">质量不符</span>
<span v-if="scope.row.reason==1">协商一致退款</span>
<span v-if="scope.row.reason==2">质量问题</span>
<span v-if="scope.row.reason==3">物流问题</span>
<span v-if="scope.row.reason==4">假冒品牌</span>
<span v-if="scope.row.reason==5">少件/漏发/破损/污渍</span>
<span v-if="scope.row.reason==6">7天无理由</span>
<span v-if="scope.row.reason==7">拍错/多拍/不想要</span>
<span v-if="scope.row.reason==8">其他</span>
</template>
</el-table-column>
<el-table-column label="申请时间" align="center" prop="created_time">
......@@ -172,10 +176,14 @@
// 退换货原因
needMsgOptions: [
{value: -1,label: '全部原因'},
{value: 3,label: '协商一致退款'},
{value: 1,label: '其他'},
{value: 2,label: '漏发'},
{value: 4,label: '质量不符'},
{value: 1,label: '协商一致退款'},
{value: 2,label: '质量问题'},
{value: 3,label: '物流问题'},
{value: 4,label: '假冒品牌'},
{value: 5,label: '少件/漏发/破损/污渍'},
{value: 6,label: '7天无理由'},
{value: 7,label: '拍错/多拍/不想要'},
{value: 8,label: '其他'},
],
fullHeight: 0,
afterSaleHeight: 200,
......@@ -195,12 +203,13 @@
}
},
created() {
this.searchList();
this.$nextTick(() => {
this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight
})
},
mounted() {},
mounted() {
this.searchList();
},
methods: {
/** 顶部 状态页签切换
* 1-未处理；2-处理中；3-已完成
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论