Skip to content

S
shop-new
提交 08af4830 authored 作者: huaxinzhu's avatar huaxinzhu
浏览文件
操作

新接口优化01

上级 6a1747fb
显示空白字符变更
内嵌 并排
正在显示 包含 91 行增加 和 468 行删除
src/views/platformlogin.vue
浏览文件 @ 08af4830
...@@ -13,10 +13,11 @@ ...@@ -13,10 +13,11 @@
gotosso() { gotosso() {
var ticket = this.$route.query.ticket; var ticket = this.$route.query.ticket;
this.$store.dispatch('Login', {"ticket": ticket}).then((res) => { this.$store.dispatch('Login', {"ticket": ticket}).then((res) => {
if (res.token != "") { if (res.token != "") {
// 获取客户是否有审核信息 // 获取客户是否有审核信息
getShopInf().then(res => { getShopInf().then(res => {
if(res.code === 1) { //if(res.code === 1) {
switch(res.data.state) { switch(res.data.state) {
case 0: case 0:
switch(res.data.status){ switch(res.data.status){
...@@ -45,21 +46,25 @@ ...@@ -45,21 +46,25 @@
}); });
break; break;
} }
}else { //}
if(res && res.msg) {
Notification.error({
title: '提示：',
message: res.msg
})
}else {
Notification.error({
title: '提示：',
message: '刷新浏览器后，再次登录，若仍不行，请联系我们！'
})
}
}
});
// else {
// if(res && res.msg) {
// Notification.error({
// title: '提示：',
// message: res.msg
// })
// }else {
// Notification.error({
// title: '提示：',
// message: '刷新浏览器后，再次登录，若仍不行，请联系我们！'
// })
// }
// }
});
} else { } else {
this.$store.dispatch('Statistic') this.$store.dispatch('Statistic')
this.$store.dispatch('FedLogOut') this.$store.dispatch('FedLogOut')
...@@ -73,8 +78,7 @@ ...@@ -73,8 +78,7 @@
}, 1000) }, 1000)
} }
this.loading = false this.loading = false
}) }).catch(() => {
.catch(() => {
this.$store.dispatch('FedLogOut') this.$store.dispatch('FedLogOut')
var ssa = window.location.host var ssa = window.location.host
setTimeout(function () { setTimeout(function () {
......
src/views/system/asset/balance/index.vue
浏览文件 @ 08af4830
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
return { return {
fullHeight: 0, fullHeight: 0,
tableHeight: 0, tableHeight: 0,
loading: true, // 遮罩层 loading: false, // 遮罩层
ids: [], // 选中数组 ids: [], // 选中数组
total: 0, // 总条数 total: 0, // 总条数
assetList: [], // 商户余额变动日志表格数据 assetList: [], // 商户余额变动日志表格数据
...@@ -93,12 +93,9 @@ ...@@ -93,12 +93,9 @@
}, },
/** 查询商户余额变动日志列表 */ /** 查询商户余额变动日志列表 */
getList() { getList() {
this.loading = true; listAsset(this.queryParams).then(res => {
//console.log("重点注意shopid", this.queryParams) this.assetList = res.data.list;
listAsset(this.queryParams).then(response => { this.total = res.data.total;
this.assetList = response.data.list;
this.total = response.data.total;
this.loading = false;
}); });
}, },
// 取消按钮 // 取消按钮
......
src/views/system/asset/bankcard/index.vue
浏览文件 @ 08af4830
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
//银行 //银行
bankList: [], bankList: [],
// 遮罩层 // 遮罩层
loading: true, loading: false,
// 选中数组 // 选中数组
ids: [], ids: [],
// 非单个禁用 // 非单个禁用
...@@ -216,8 +216,10 @@ ...@@ -216,8 +216,10 @@
methods: { methods: {
//获取银行名称列表 //获取银行名称列表
getBankNameList() { getBankNameList() {
listBankname().then(response => { listBankname().then(res => {
this.bankList = response.data if(res.data) {
this.bankList = res.data
}
}); });
}, },
//类型改变 //类型改变
...@@ -245,17 +247,15 @@ ...@@ -245,17 +247,15 @@
}, },
/** 查询商户银行卡列表 */ /** 查询商户银行卡列表 */
getList() { getList() {
this.loading = true;
listBankcard(this.queryParams).then(response => { listBankcard(this.queryParams).then(response => {
this.bankcardList = response.data.list; this.bankcardList = response.data.data;
//console.log(this.bankcardList) //this.total = response.data.count;
this.total = response.data.total; this.total = 1;
if (this.total >= 3) { if (this.total >= 3) {
this.isAddbank = true; this.isAddbank = true;
}else { }else {
this.isAddbank = false; this.isAddbank = false;
} }
this.loading = false;
}); });
}, },
// 取消按钮 // 取消按钮
......
src/views/system/asset/verifyrecord/index.vue
浏览文件 @ 08af4830
...@@ -65,8 +65,8 @@ ...@@ -65,8 +65,8 @@
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.page"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.limit"
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改商户账单对话框 --> <!-- 添加或修改商户账单对话框 -->
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
isBlance: true, isBlance: true,
billId: 0, billId: 0,
// 遮罩层 // 遮罩层
loading: true, loading: false,
// 选中数组 // 选中数组
ids: [], ids: [],
// 非单个禁用 // 非单个禁用
...@@ -142,8 +142,8 @@ ...@@ -142,8 +142,8 @@
sellerId: 0, sellerId: 0,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, page: 1,
pageSize: 10, limit: 10,
shopId: 0, shopId: 0,
money: null, money: null,
org_money: null, org_money: null,
...@@ -209,11 +209,9 @@ ...@@ -209,11 +209,9 @@
}, },
/** 查询商户账单列表 */ /** 查询商户账单列表 */
getList() { getList() {
this.loading = true;
listVerifyrecord(this.queryParams).then(response => { listVerifyrecord(this.queryParams).then(response => {
this.verifyrecordList = response.data.list; this.verifyrecordList = response.data.list;
this.total = response.data.total; this.total = response.data.total;
this.loading = false;
}); });
}, },
// 取消按钮 // 取消按钮
...@@ -244,7 +242,7 @@ ...@@ -244,7 +242,7 @@
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.page = 1;
this.getList(); this.getList();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
......
src/views/system/asset/withdrawlog/index.vue
浏览文件 @ 08af4830
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.page"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.limit"
@pagination="getList" @pagination="getList"
/> />
</el-card> </el-card>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
fullHeight: 0, fullHeight: 0,
tableHeight: 0, tableHeight: 0,
// 遮罩层 // 遮罩层
loading: true, loading: false,
// 选中数组 // 选中数组
ids: [], ids: [],
// 非单个禁用 // 非单个禁用
...@@ -67,8 +67,8 @@ ...@@ -67,8 +67,8 @@
open: false, open: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, page: 1,
pageSize: 10, limit: 10,
sellerId: 0, sellerId: 0,
}, },
// 表单参数 // 表单参数
...@@ -128,18 +128,14 @@ ...@@ -128,18 +128,14 @@
}, },
/** 查询商户提现列表 */ /** 查询商户提现列表 */
getList() { getList() {
this.loading = true;
this.queryParams.sellerId = this.sellerId; this.queryParams.sellerId = this.sellerId;
//console.log(127, this.queryParams);
listWithdrawlog(this.queryParams).then(response => { listWithdrawlog(this.queryParams).then(response => {
if (response) { if (response) {
this.withdrawlogList = response.data.list; this.withdrawlogList = response.data.data;
this.total = response.data.total; this.total = response.data.count;
} else { } else {
this.$message({message: '数据出错啦！', type: 'error'}); this.$message({message: '数据出错啦！', type: 'error'});
} }
this.loading = false;
}); });
}, },
// 取消按钮 // 取消按钮
......
src/views/system/freight/freight_list/index.vue
浏览文件 @ 08af4830
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
fullHeight: 0, fullHeight: 0,
tableHeight: 0, tableHeight: 0,
// 遮罩层 // 遮罩层
loading: true, loading: false,
// 选中数组 // 选中数组
ids: [], ids: [],
// 非单个禁用 // 非单个禁用
...@@ -192,11 +192,11 @@ ...@@ -192,11 +192,11 @@
}, },
/** 查询freight列表 */ /** 查询freight列表 */
getList() { getList() {
this.loading = true; listFreight(this.queryParams).then(res => {
listFreight(this.queryParams).then(response => { if(res.data) {
this.freightList = response.data.data.list; this.freightList = res.data.list;
this.total = response.data.data.count; this.total = res.data.count;
this.loading = false; }
}); });
}, },
// 取消按钮 // 取消按钮
...@@ -317,13 +317,14 @@ ...@@ -317,13 +317,14 @@
}).then(async()=> { }).then(async()=> {
this.loading = true; this.loading = true;
let delResult = await delFreight(ids); let delResult = await delFreight(ids);
this.loading = false;
if(delResult.code === 1) { if(delResult.code === 1) {
this.$message({type: 'success',message: delResult.msg}); this.$message({type: 'success',message: delResult.msg});
this.getList();
} }
if(delResult.code === 0) { if(delResult.code === 0) {
this.$message({type: 'error',message: delResult.msg}); this.$message({type: 'error',message: delResult.msg});
} }
this.loading = false;
}).catch(()=> {}); }).catch(()=> {});
}, },
} //methods结束 } //methods结束
......
src/views/system/freight/freight_list/indexbtn.vue
浏览文件 @ 08af4830
...@@ -271,9 +271,10 @@ export default { ...@@ -271,9 +271,10 @@ export default {
item.fp= Number(item.fp*100).toFixed(); item.fp= Number(item.fp*100).toFixed();
item.np = Number(item.np*100).toFixed(); item.np = Number(item.np*100).toFixed();
}) })
//console.log(275,this.goodsDate); this.loading = true
addFreight(this.goodsDate).then(response => { addFreight(this.goodsDate).then(res => {
if(response.data.code === 1) { //console.log(275,res);
if(res.code === 1) {
this.$emit("closeIndexbtn",false); this.$emit("closeIndexbtn",false);
if(this.goodsDate.Id === 0) { if(this.goodsDate.Id === 0) {
this.$message({ message: '新增成功', type: 'success'}); this.$message({ message: '新增成功', type: 'success'});
......
src/views/system/goods/add/index.vue
浏览文件 @ 08af4830
<template> <template>
<div class="app-container goods" v-loading="loading"> <div class="app-container" v-loading="loading">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span style="font-size: 18px; float:left;margin-top: 4px;">{{title}}</span> <p class="card-header-title"><span class="blue-block-goods"></span>确认商品所在目录</p>
<el-button style="float: right; margin: 0 10px 0 20px;" size="mini" type="info" plain @click="submitForm(0)">保 存 草 稿
</el-button>
<el-button style="float: right;" size="mini" type="primary" @click="submitForm(1)">提 交 上 架
</el-button>
</div> </div>
<el-tabs type="border-card">
<el-tab-pane label="商品信息">
<Goodsinfomation ref="childGoodsInf" :infomationdatas='infomationdata' @infomationclick='infomationclick'/>
</el-tab-pane>
<el-tab-pane label="商品图片">
<Goodsimg :imgdata='imgdate' @imgclicks='imgclick'/>
</el-tab-pane>
<el-tab-pane label="商品规格">
<Guide :guidedata='guidedate' @guideclicks='guideclick'/>
</el-tab-pane>
<el-tab-pane label="商品参数">
<Goodsparameter :parameterdata='parameterdata' @parameterclicks='parameterclick'/>
</el-tab-pane>
</el-tabs>
</el-card> </el-card>
</div> </div>
</template> </template>
<script> <script>
import {getGoods,GetFreight} from '@/api/module/goods'
import descartes from "@/utils/dikaerjs.js";
import Guide from './components/guide'
import Goodsinfomation from './components/goodsinfomation'
import Goodsimg from './components/goodsimg'
import Goodsparameter from './components/goodsparameter'
import {addGoods} from '@/api/module/goods'
export default { export default {
name: 'goods',
data() { data() {
return { return {
infomationdata: {}, loading: false
parameterdata: {},
goodsOnsale: 0,
loading: false,
applyStatus: '',
title: "添加新商品",
imgdate: {},
guidedate: {},
parameterdate: {},
params: {
applyStatus: 0
},
expressTemplateIdList: [], //'原来绑定的运费模板已经被删除',
expressTemplateList: [],
}
},
components: {
Guide,
Goodsinfomation,
Goodsimg,
Goodsparameter
},
created() {
this.getFreight();//运费模板数据，回显匹配专用
this.getParams();
},
methods: {
// 运费模板
getFreight() {
GetFreight(this.queryParams).then(res => {
this.expressTemplateList = res.data;
this.expressTemplateIdList = this.expressTemplateList.filter(function(item) {
return item.Id;
})
});
},
getParams() {
let goodsId = this.$route.query.goodsId;
if (goodsId > 0) {
this.title = "编辑商品信息";
this.genGoodsInfo(goodsId);
}
},
// 获取商品详情
genGoodsInfo(goodsId) {
this.loading = true;
const goods_id = goodsId;
getGoods(goods_id).then(res => {
console.log(9999,res);
if(res.code === 1 && res.data) {
this.goodsOnsale = res.data.isOnsale;
// 对发货时效单独处理
if(res.data.Delayompensate == 0) {
res.data.Delayompensate = '';
}
//res.data.freightId 返回的值类型有 0（string/number）|| ‘全国包邮通用模板’（string）|| 310(number)
let resourceType = '1'; // 为了单元框正常显示，先给一个默认值，// 字符串 ‘0’,代表 数据为单独运费
let serviceagsTagsVal = [];
if(res.data.ServiceagsTags) {
serviceagsTagsVal = JSON.parse(res.data.ServiceagsTags);
}
// 库存，后台返回字段更换，提前处理 specOption
if( res.data.goodsSpecs.specOption && res.data.goodsSpecs.specOption.length > 0) {
res.data.goodsSpecs.specOption.forEach(function(item){
if(item.stock) {
item['goodsNowStock'] = item.stock;
}
});
}
this.infomationdata = {
goodsId: res.data.goodsId,
goodsName: res.data.goodsName,
categoryId: res.data.categoryId,
scPrice: res.data.scPrice / 100,
price: res.data.price / 100,
jsPrice: res.data.jsPrice / 100,
goodsNowStock: res.data.goodsNowStock,
producingArea: res.data.producingArea,
weight: res.data.weight,
unit: res.data.unit,
goodsBrand: res.data.goodsBrand,
wlPrice: res.data.wlPrice,
pywlPrice: res.data.pywlPrice,
resource: resourceType,
Delayompensate: res.data.Delayompensate,
aftersaleTime: res.data.aftersaleTime,
mark: res.data.mark,
serviceagsTags: serviceagsTagsVal,
description: res.data.description,
freightId: res.data.freightId,
outGoodsId: res.data.outGoodsId,
};
this.guidedate = res.data.goodsSpecs;
this.guidedate["goodsSpec"] = res.data.goodsSpec;
this.parameterdata = res.data.Params ? res.data.Params : {};
this.imgdate = {
"ruleFormdialogImageUrl": res.data.image,
"ruleFormdialogImageUrlplus": res.data.defaultImage
};
}else if(res.code === 0) {
if(res.msg) {
this.$message({type:'error',message: res.msg});
}else {
this.$message({type:'error',message: '数据出错啦'});
}
}
this.loading = false;
});
},
info() {
addgoods(this.listQuery).then(res => {
this.list = res.data.items
this.total = res.data.total
this.listLoading = false
})
},
//商品信息
infomationclick(type) {
Object.assign(this.params, type);
},
//商品图片
imgclick(type) {
let img = [];
type.ruleFormdialogImageUrl.forEach((res, index) => {
img.push(res.url)
})
this.params["imgs"] = img;
this.params["defaultImg"] = ''
if(type.ruleFormdialogImageUrlplus.length > 0) {
this.params["defaultImg"] = type.ruleFormdialogImageUrlplus[0].url;
}
},
//规格
guideclick(type, specsGroup) {
this.params["specs"] = type;
this.params["specsGroup"] = specsGroup;
// 浮点处理
if(this.params.specs && this.params.specs.length > 0) {
for(let i = 0; i < this.params.specs.length; i++) {
if(this.params.specs[i].jsPrice ) {
this.params.specs[i].jsPrice = parseInt(this.params.specs[i].jsPrice * 100);
}
if(this.params.specs[i].price ) {
this.params.specs[i].price = parseInt(this.params.specs[i].price * 100);
}
if(this.params.specs[i].scPrice ) {
this.params.specs[i].scPrice = parseInt(this.params.specs[i].scPrice * 100);
}
}
}
},
//参数
parameterclick(type) {
this.params["goodsPram"] = type;
},
/** 确定按钮 */
submitForm(status) {
this.params.applyStatus = 0;
this.params.isOnsale = this.goodsOnsale;
if(status === 1) {
this.params.applyStatus = 1;
}
if(this.params.resource == 0) {
this.params.freightId = 0;
}else if(this.params.resource == 1) {
this.params.wlPrice = 0;
this.params.pywlPrice = 0;
// 运费模板字段单独处理,兼容老数据
if(this.params.freightId === '全国包邮通用模板' || this.params.freightId == 0) {
this.params.freightId = 310;
}
}
console.log("gogogogog",this.params);
//return ;
// 商品信息 表单字段校验
let isGoodInfMsg = this.$refs['childGoodsInf'].validateGoodsInfForm();
// 商品图片 校验
let isGoodSImgMsg = 'defaultImg' in this.params;
if(!isGoodInfMsg) {
if(!('goodsName' in this.params)) {
this.$message({type: 'error',message: '[ 商品信息 ] 未填写完整！'});
return;
}
if('goodsName' in this.params) {
if(this.params.goodsName === '') {
this.$message({type: 'error',message: '[ 商品信息 ] 中 商品名称未填写！'});
return;
}
if(this.params.categoryId === 0) {
this.$message({type: 'error',message: '[ 商品信息 ] 中 商品分类未填写！'});
return;
}
if(this.params.scPrice === '') {
this.$message({type: 'error',message: '[ 商品信息 ] 中 市场原价未填写！'});
return;
}
if(this.params.price === '') {
this.$message({type: 'error',message: '[ 商品信息 ] 中 指导售价未填写！'});
return;
}
if(this.params.jsPrice === '') {
this.$message({type: 'error',message: '[ 商品信息 ] 中 结算价格未填写！'});
return;
}
if(this.params.goodsNowStock === '') {
this.$message({type: 'error',message: '[ 商品信息 ] 中 商品库存未填写！'});
return;
}
if(this.params.unit === '') {
this.$message({type: 'error',message: '[ 商品信息 ] 中 商品单位未填写！'});
return;
}
if(this.params.goodsBrand === '') {
this.$message({type: 'error',message: '[ 商品信息 ] 中 商品名称未填写！'});
return;
}
}
}
if(!isGoodSImgMsg) {
this.$message({type: 'error',message: '[ 商品图片 ] 未上传图片！'});
return;
}else {
if('defaultImg' in this.params) {
if(this.params.defaultImg === '') {
this.$message({type: 'error',message: '[ 商品图片 ] 中 商品主图未上传！'});
return;
}
if(this.params.imgs.length === 0) {
this.$message({type: 'error',message: '[ 商品图片 ] 中 商品轮播图未上传！'});
return;
}
}
}
this.loading = true;
addGoods(this.params).then(res => {
if (res.code === 1) {
this.$message({
message: res.msg,
type: 'success'
});
this.$emit('closeDialog',false);
if (this.goodsOnsale) {
var redUrl = '/system/goods/onsale';
} else {
var redUrl = '/system/goods/offsale';
}
this.$router.push({
path: redUrl
});
} else if(res.code === 0) {
if(res.msg) {
this.$message.error(res.msg);
}else {
this.$message.error("操作失败！");
}
}
this.loading = false;
});
},
//------ 通用方法 -----
verifiesForm(type,fieldName,obj) {
// 先判断类型，字符串类型type === text, 下拉形式字段 select
if(type === 'text') {
// 没有这个属性，肯定没有填写，抛出提示
if(!(fieldName in obj)) {
return 1;
}
}
if(type === 'select') {
}
// 如果有这个属性，那么进一步判断，这个必填值是否填写
// if(fieldName in obj && !obj[fieldName]) {
// return 2
// }
} }
} }
} }
</script> </script>
<style scoped lang="scss" type="text/stylus">
ul, li {
list-style: none;
margin: 0;
padding: 0;
}
.ullist {
border: 1px solid #e7eaec;
padding: 10px;
margin-bottom: 10px;
}
.el-input-group {
width: calc(100% - 60px);
}
.addbtn {
background-color: #5bc0de !important;
color: #fff !important;
border-radius: 0 4px 4px 0;
}
/deep/.el-card__body {
height: calc(100% - 50px);
overflow: hidden;
}
.el-tabs { <style scoped lang="scss" type="text/css">
height: 100%; .card-header-title {
overflow: hidden; display: flex;
/deep/.el-tabs__content {
height: calc(100% - 50px);
overflow-y: scroll;
} }
} .blue-block-goods {
width: 5px;
.eldelbtn { height: 20px;
height: 30px; background: #3A84FF;
padding: 5px 20px !important; display: inline-block;
margin-left: -3px; line-height: 1.4em;
} vertical-align: middle;
.childlist {
margin-top: 10px;
}
.el-button--medium {
padding: 10px 12px;
}
.dfbtn {
position: relative;
}
.goods .el-tabs__content {
height: 100%;
overflow-y: scroll;
} }
</style> </style>
src/views/system/retreat/address.vue
浏览文件 @ 08af4830
...@@ -175,12 +175,10 @@ ...@@ -175,12 +175,10 @@
methods: { methods: {
// 获取列表 // 获取列表
getList() { getList() {
this.loading = true;
getAddressList(this.queryParams).then(res => { getAddressList(this.queryParams).then(res => {
if(res.code === 1 && res.data.data) { if(res.data.data) {
this.addressList = res.data.data; this.addressList = res.data.data;
this.total = res.data.count; this.total = res.data.count;
this.loading = false;
} }
}); });
}, },
...@@ -261,26 +259,26 @@ ...@@ -261,26 +259,26 @@
// 修改 // 修改
handleUpdate(row) { handleUpdate(row) {
this.isOpen = true;
this.areaList = []; this.areaList = [];
const roleIds = row.id || this.ids; const roleIds = row.id || this.ids;
//this.loading = true; this.loading = true;
getAddressDetails(roleIds).then(res => { getAddressDetails(roleIds).then(res => {
if(res && res.data) { if(res.data) {
this.isOpen = true;
// 处理 三级联动回显 // 处理 三级联动回显
let areaListAry = res.data.address_ids.split(","); let areaListAry = res.data.address_ids ? res.data.address_ids.split(",") : [];
for(let i = 0; i < areaListAry.length; i++) { for(let i = 0; i < areaListAry.length; i++) {
this.areaList.push(Number(areaListAry[i])); this.areaList.push(Number(areaListAry[i]));
} }
this.addressForm = res.data; this.addressForm = res.data;
} }
this.loading = false;
}); });
}, },
cancel() { cancel() {
this.areaList = []; this.areaList = [];
this.resetForm('addressForm'); this.resetForm('addressForm');
this.isOpen = false; this.isOpen = false;
}, },
save(form) { save(form) {
if(typeof this.addressForm.address_ids === "string") { if(typeof this.addressForm.address_ids === "string") {
......
src/views/system/retreat/retreat/index.vue
浏览文件 @ 08af4830
...@@ -86,8 +86,8 @@ ...@@ -86,8 +86,8 @@
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.page"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.limit"
@pagination="getList" @pagination="getList"
/> />
<!-- 售后申请信息对话框 --> <!-- 售后申请信息对话框 -->
...@@ -337,9 +337,10 @@ ...@@ -337,9 +337,10 @@
export default { export default {
name: "retreat", name: "retreat",
data() { data() {
return { return {
// 遮罩层
loading: false,
fullHeight: 0, fullHeight: 0,
tableHeight: 0, tableHeight: 0,
//退货地址 //退货地址
...@@ -404,8 +405,6 @@ ...@@ -404,8 +405,6 @@
reject: false, reject: false,
//退货地址 //退货地址
reback: false, reback: false,
// 遮罩层
loading: true,
// 选中数组 // 选中数组
ids: [], ids: [],
// 非单个禁用 // 非单个禁用
...@@ -424,11 +423,11 @@ ...@@ -424,11 +423,11 @@
open: false, open: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, page: 1,
pageSize: 10, limit: 10,
applyTime: [], applyTime: [],
beginTime: 0, beginTime: '',
endTime: 0, endTime: '',
goodsId: null, goodsId: null,
goodsName: null, goodsName: null,
userNeed: null, userNeed: null,
...@@ -487,8 +486,8 @@ ...@@ -487,8 +486,8 @@
// select组件，clear的时候，将addTimeInterval的值，初始化为null，判断当其值为null时，赋值为数组 // select组件，clear的时候，将addTimeInterval的值，初始化为null，判断当其值为null时，赋值为数组
if(!this.queryParams.applyTime && typeof(this.queryParams.applyTime) !== "undefined") { if(!this.queryParams.applyTime && typeof(this.queryParams.applyTime) !== "undefined") {
this.queryParams.applyTime = []; this.queryParams.applyTime = [];
this.queryParams.beginTime = 0; this.queryParams.beginTime = '';
this.queryParams.endTime = 0; this.queryParams.endTime = '';
} }
} }
}, },
...@@ -612,13 +611,10 @@ ...@@ -612,13 +611,10 @@
/** 查询售后申请信息列表 */ /** 查询售后申请信息列表 */
getList() { getList() {
this.loading = true;
listRetreat(this.queryParams).then(response => { listRetreat(this.queryParams).then(response => {
//console.log(response.data) //console.log(response.data)
this.retreatList = response.data.list; this.retreatList = response.data.list;
this.total = response.data.total; this.total = response.data.total;
this.loading = false;
}); });
}, },
// 取消按钮 // 取消按钮
...@@ -641,14 +637,14 @@ ...@@ -641,14 +637,14 @@
this.queryParams.beginTime = new Date(this.queryParams.applyTime[0]).getTime() / 1000; this.queryParams.beginTime = new Date(this.queryParams.applyTime[0]).getTime() / 1000;
this.queryParams.endTime = new Date(this.queryParams.applyTime[1]).getTime() / 1000; this.queryParams.endTime = new Date(this.queryParams.applyTime[1]).getTime() / 1000;
} }
this.queryParams.pageNum = 1; this.queryParams.page = 1;
this.getList(); this.getList();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.queryParams.beginTime = 0; this.queryParams.beginTime = '';
this.queryParams.endTime = 0; this.queryParams.endTime = '';
this.handleQuery(); this.handleQuery();
}, },
//同意申请并发货 //同意申请并发货
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论