pc商品列表样式修改,商家注释添加,订单统计,退订单按钮样式
parent
133febe7a7
commit
07f41f5cb6
|
@ -283,4 +283,3 @@ export default {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
|
@ -189,7 +189,6 @@ export default {
|
||||||
selectedItem: {
|
selectedItem: {
|
||||||
// 监听已选条件,来调用列表接口
|
// 监听已选条件,来调用列表接口
|
||||||
handler (val) {
|
handler (val) {
|
||||||
console.log(val);
|
|
||||||
let classification = [];
|
let classification = [];
|
||||||
this.params.brandId = ''
|
this.params.brandId = ''
|
||||||
this.params.prop = ''
|
this.params.prop = ''
|
||||||
|
@ -248,7 +247,7 @@ export default {
|
||||||
this.$set(this.tabBar, 'second', second)
|
this.$set(this.tabBar, 'second', second)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
cateClick (item, index) { // 点选分类
|
cateClick (item, index) { // 点选分类
|
||||||
switch (index) {
|
switch (index) {
|
||||||
case 1:
|
case 1:
|
||||||
this.$router.push({
|
this.$router.push({
|
||||||
|
@ -636,7 +635,8 @@ export default {
|
||||||
> div:first-child {
|
> div:first-child {
|
||||||
width: 100px;
|
width: 100px;
|
||||||
background: #eee;
|
background: #eee;
|
||||||
padding: 10px 0 0 10px;
|
padding-left: 10px;
|
||||||
|
line-height: 30px;
|
||||||
}
|
}
|
||||||
> div:last-child {
|
> div:last-child {
|
||||||
width: 1100px;
|
width: 1100px;
|
||||||
|
|
|
@ -32,7 +32,11 @@ router.afterEach(route => {
|
||||||
|
|
||||||
Vue.prototype.linkTo = function (url) {
|
Vue.prototype.linkTo = function (url) {
|
||||||
if (url.substr(0, 1) === '/') { // 非外部链接,没有origin,只有路由地址
|
if (url.substr(0, 1) === '/') { // 非外部链接,没有origin,只有路由地址
|
||||||
window.open(location.origin + url, '_blank');
|
if (router.mode === 'hash') {
|
||||||
|
window.open(location.origin + '/#' + url, '_blank');
|
||||||
|
} else {
|
||||||
|
window.open(location.origin + url, '_blank');
|
||||||
|
}
|
||||||
} else { // 外部链接,完整的url地址
|
} else { // 外部链接,完整的url地址
|
||||||
window.open(url, '_blank')
|
window.open(url, '_blank')
|
||||||
}
|
}
|
||||||
|
|
|
@ -69,7 +69,7 @@
|
||||||
>人评价
|
>人评价
|
||||||
</div>
|
</div>
|
||||||
<div class="goods-show-seller">
|
<div class="goods-show-seller">
|
||||||
<Tag v-if="item.selfOperated" style="padding:0 4px;" size="small" color="error">自营</Tag><span>{{ item.storeName }}</span>
|
<Tag v-if="item.selfOperated" style="padding:0 4px;" size="default" color="error">自营</Tag><span>{{ item.storeName }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -412,7 +412,7 @@ export default {
|
||||||
});
|
});
|
||||||
this.$Modal.warning({
|
this.$Modal.warning({
|
||||||
title: '以下商品超出配送区域' || title,
|
title: '以下商品超出配送区域' || title,
|
||||||
content: content.toString(),
|
content: content.toString()
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if (res.result.memberAddress) {
|
if (res.result.memberAddress) {
|
||||||
|
|
|
@ -404,6 +404,7 @@ export default {
|
||||||
this.modalTitle = "添加文章";
|
this.modalTitle = "添加文章";
|
||||||
this.treeValue = '';
|
this.treeValue = '';
|
||||||
this.form = {
|
this.form = {
|
||||||
|
sort: 1,
|
||||||
content:''
|
content:''
|
||||||
};
|
};
|
||||||
this.$refs.form.resetFields();
|
this.$refs.form.resetFields();
|
||||||
|
|
|
@ -146,7 +146,10 @@
|
||||||
<div>
|
<div>
|
||||||
<h4>订退单统计</h4>
|
<h4>订退单统计</h4>
|
||||||
<div class="breadcrumb" style="margin-bottom:20px;">
|
<div class="breadcrumb" style="margin-bottom:20px;">
|
||||||
<span @click="clickTab(item,index)" :class="{'active':item.selected}" v-for="(item,index) in orderType" :key="index"> {{item.title}}</span>
|
<RadioGroup v-model="orderOrRefund" type="button" size="small" button-style="solid">
|
||||||
|
<Radio :label="true">订单</Radio>
|
||||||
|
<Radio :label="false">退单</Radio>
|
||||||
|
</RadioGroup>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<Table stripe :columns="columns" :data="data"></Table>
|
<Table stripe :columns="columns" :data="data"></Table>
|
||||||
|
@ -173,17 +176,8 @@ export default {
|
||||||
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
orderOrRefund: true, // 订单还是单
|
||||||
total: "0", // 总数
|
total: "0", // 总数
|
||||||
orderType: [ // 订单类型
|
|
||||||
{
|
|
||||||
title: "订单",
|
|
||||||
selected: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: "退单",
|
|
||||||
selected: false,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
// 订单状态
|
// 订单状态
|
||||||
orderStatusList: {
|
orderStatusList: {
|
||||||
UNDELIVERED: "待发货",
|
UNDELIVERED: "待发货",
|
||||||
|
@ -459,20 +453,17 @@ export default {
|
||||||
},
|
},
|
||||||
deep: true,
|
deep: true,
|
||||||
},
|
},
|
||||||
|
orderOrRefund:{ // 订单还是退单
|
||||||
|
handler (val) {
|
||||||
|
if (val) {
|
||||||
|
this.getOrderList();
|
||||||
|
} else {
|
||||||
|
this.getOrderRefundList();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
clickTab(item, index) {
|
|
||||||
this.refundIndex = index;
|
|
||||||
this.orderType.forEach((res) => {
|
|
||||||
res.selected = false;
|
|
||||||
});
|
|
||||||
if (item.title == "退单") {
|
|
||||||
this.getOrderRefundList();
|
|
||||||
} else {
|
|
||||||
this.getOrderList();
|
|
||||||
}
|
|
||||||
item.selected = true;
|
|
||||||
},
|
|
||||||
// 订单图
|
// 订单图
|
||||||
initOrderChart() {
|
initOrderChart() {
|
||||||
// 默认已经加载 legend-filter 交互
|
// 默认已经加载 legend-filter 交互
|
||||||
|
|
|
@ -30,7 +30,6 @@
|
||||||
"stompjs": "^2.3.3",
|
"stompjs": "^2.3.3",
|
||||||
"swiper": "^6.3.5",
|
"swiper": "^6.3.5",
|
||||||
"uuid": "^8.3.2",
|
"uuid": "^8.3.2",
|
||||||
"view-design": "^4.2.0",
|
|
||||||
"vue": "^2.6.10",
|
"vue": "^2.6.10",
|
||||||
"vue-awesome": "^4.0.2",
|
"vue-awesome": "^4.0.2",
|
||||||
"vue-awesome-swiper": "^4.1.1",
|
"vue-awesome-swiper": "^4.1.1",
|
||||||
|
@ -59,6 +58,7 @@
|
||||||
"less-loader": "^6.2.0",
|
"less-loader": "^6.2.0",
|
||||||
"style-loader": "^2.0.0",
|
"style-loader": "^2.0.0",
|
||||||
"style-resources-loader": "^1.3.2",
|
"style-resources-loader": "^1.3.2",
|
||||||
|
"view-design": "^4.6.1",
|
||||||
"vue-cli-plugin-style-resources-loader": "^0.1.4",
|
"vue-cli-plugin-style-resources-loader": "^0.1.4",
|
||||||
"vue-template-compiler": "^2.6.10"
|
"vue-template-compiler": "^2.6.10"
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
<Row class="operation padding-row">
|
<Row class="operation padding-row">
|
||||||
<Button @click="add" type="primary">添加</Button>
|
<Button @click="add" type="primary">添加</Button>
|
||||||
</Row>
|
</Row>
|
||||||
<Table :loading="loading" border :columns="columns" :data="data" ref="table" @on-selection-change="changeSelect">
|
<Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" @on-selection-change="changeSelect">
|
||||||
<!-- 商品栏目格式化 -->
|
<!-- 商品栏目格式化 -->
|
||||||
<template slot="goodsSlot" slot-scope="{row}">
|
<template slot="goodsSlot" slot-scope="{row}">
|
||||||
<div style="margin-top: 5px;height: 70px; display: flex;">
|
<div style="margin-top: 5px;height: 70px; display: flex;">
|
||||||
|
|
|
@ -57,6 +57,7 @@
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:data="data"
|
:data="data"
|
||||||
ref="table"
|
ref="table"
|
||||||
|
class="mt_10"
|
||||||
sortable="custom"
|
sortable="custom"
|
||||||
></Table>
|
></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="page">
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
</Dropdown>
|
</Dropdown>
|
||||||
</Row>
|
</Row>
|
||||||
|
|
||||||
<Table :loading="loading" border :columns="columns" :data="data" ref="table" @on-selection-change="changeSelect">
|
<Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" @on-selection-change="changeSelect">
|
||||||
<!-- 商品栏目格式化 -->
|
<!-- 商品栏目格式化 -->
|
||||||
<template slot="goodsSlot" slot-scope="{row}">
|
<template slot="goodsSlot" slot-scope="{row}">
|
||||||
<div style="margin-top: 5px;height: 90px; display: flex;">
|
<div style="margin-top: 5px;height: 90px; display: flex;">
|
||||||
|
@ -73,7 +73,7 @@
|
||||||
<Modal title="更新库存" v-model="updateStockModalVisible" :mask-closable="false" :width="500">
|
<Modal title="更新库存" v-model="updateStockModalVisible" :mask-closable="false" :width="500">
|
||||||
<Tabs value="updateStock">
|
<Tabs value="updateStock">
|
||||||
<TabPane label="手动规格更新" name="updateStock">
|
<TabPane label="手动规格更新" name="updateStock">
|
||||||
<Table :columns="updateStockColumns" :data="stockList" border :span-method="handleSpan"></Table>
|
<Table class="mt_10" :columns="updateStockColumns" :data="stockList" border :span-method="handleSpan"></Table>
|
||||||
</TabPane>
|
</TabPane>
|
||||||
<TabPane label="批量规格更新" name="stockAll">
|
<TabPane label="批量规格更新" name="stockAll">
|
||||||
<Input type="number" v-model="stockAllUpdate" placeholder="统一规格修改" />
|
<Input type="number" v-model="stockAllUpdate" placeholder="统一规格修改" />
|
||||||
|
|
|
@ -137,7 +137,7 @@
|
||||||
规格详细
|
规格详细
|
||||||
<div slot="content">
|
<div slot="content">
|
||||||
<div slot="content">
|
<div slot="content">
|
||||||
<Table :columns="skuTableColumn" :data="skuTableData" style="
|
<Table class="mt_10" :columns="skuTableColumn" :data="skuTableData" style="
|
||||||
width: 100%;
|
width: 100%;
|
||||||
.ivu-table-overflowX {
|
.ivu-table-overflowX {
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
|
|
|
@ -52,6 +52,7 @@
|
||||||
<transition name="view-message">
|
<transition name="view-message">
|
||||||
<div v-if="showMesTitleList" class="message-title-list-con">
|
<div v-if="showMesTitleList" class="message-title-list-con">
|
||||||
<Table
|
<Table
|
||||||
|
class="mt_10"
|
||||||
ref="messageList"
|
ref="messageList"
|
||||||
:loading="loading"
|
:loading="loading"
|
||||||
:columns="mesTitleColumns"
|
:columns="mesTitleColumns"
|
||||||
|
@ -314,14 +315,17 @@
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
// 改变页数
|
||||||
changePage(v) {
|
changePage(v) {
|
||||||
this.params.pageNumber = v;
|
this.params.pageNumber = v;
|
||||||
this.refreshMessage();
|
this.refreshMessage();
|
||||||
},
|
},
|
||||||
|
// 改变页码
|
||||||
changePageSize(v) {
|
changePageSize(v) {
|
||||||
this.params.pageSize = v;
|
this.params.pageSize = v;
|
||||||
this.refreshMessage();
|
this.refreshMessage();
|
||||||
},
|
},
|
||||||
|
// 刷新消息
|
||||||
refreshMessage() {
|
refreshMessage() {
|
||||||
let status = "UN_READY";
|
let status = "UN_READY";
|
||||||
let type = this.currentMessageType;
|
let type = this.currentMessageType;
|
||||||
|
@ -342,8 +346,6 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
//获取全部数据
|
//获取全部数据
|
||||||
getAll() {
|
getAll() {
|
||||||
API_Index.getAllMessage(this.params).then(res => {
|
API_Index.getAllMessage(this.params).then(res => {
|
||||||
|
@ -359,6 +361,7 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
// 删除消息
|
||||||
deleteMessage(id) {
|
deleteMessage(id) {
|
||||||
API_Index.deleteMessage(id).then(res => {
|
API_Index.deleteMessage(id).then(res => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
|
@ -369,6 +372,7 @@
|
||||||
backMesTitleList() {
|
backMesTitleList() {
|
||||||
this.showMesTitleList = true;
|
this.showMesTitleList = true;
|
||||||
},
|
},
|
||||||
|
// 设置当前消息分类
|
||||||
setCurrentMesType(type) {
|
setCurrentMesType(type) {
|
||||||
if (this.currentMessageType !== type) {
|
if (this.currentMessageType !== type) {
|
||||||
this.showMesTitleList = true;
|
this.showMesTitleList = true;
|
||||||
|
|
|
@ -87,6 +87,7 @@ export default {
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
// 初始化编辑器
|
||||||
initEditor() {
|
initEditor() {
|
||||||
let that = this;
|
let that = this;
|
||||||
this.editor = new E(`#${this.id}`);
|
this.editor = new E(`#${this.id}`);
|
||||||
|
@ -171,16 +172,19 @@ export default {
|
||||||
}
|
}
|
||||||
this.editor.create();
|
this.editor.create();
|
||||||
},
|
},
|
||||||
|
// html预览
|
||||||
editHTML() {
|
editHTML() {
|
||||||
this.dataEdit = this.data;
|
this.dataEdit = this.data;
|
||||||
this.showHTMLModal = true;
|
this.showHTMLModal = true;
|
||||||
},
|
},
|
||||||
|
// 保存
|
||||||
editHTMLOk() {
|
editHTMLOk() {
|
||||||
this.editor.txt.html(this.dataEdit);
|
this.editor.txt.html(this.dataEdit);
|
||||||
this.$emit("input", this.data);
|
this.$emit("input", this.data);
|
||||||
this.$emit("on-change", this.data);
|
this.$emit("on-change", this.data);
|
||||||
this.showHTMLModal = false;
|
this.showHTMLModal = false;
|
||||||
},
|
},
|
||||||
|
// 清空编辑器
|
||||||
clear() {
|
clear() {
|
||||||
this.$Modal.confirm({
|
this.$Modal.confirm({
|
||||||
title: "确认清空",
|
title: "确认清空",
|
||||||
|
|
|
@ -83,6 +83,7 @@ export default {
|
||||||
this.grade = grade;
|
this.grade = grade;
|
||||||
return grade;
|
return grade;
|
||||||
},
|
},
|
||||||
|
// 强度验证方法
|
||||||
strengthChange() {
|
strengthChange() {
|
||||||
if (!this.currentValue) {
|
if (!this.currentValue) {
|
||||||
this.tipStyle = "password-tip-none";
|
this.tipStyle = "password-tip-none";
|
||||||
|
@ -108,11 +109,13 @@ export default {
|
||||||
this.strengthValue = 100;
|
this.strengthValue = 100;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
// 输入框change事件
|
||||||
handleChange(v) {
|
handleChange(v) {
|
||||||
this.strengthChange();
|
this.strengthChange();
|
||||||
this.$emit("input", this.currentValue);
|
this.$emit("input", this.currentValue);
|
||||||
this.$emit("on-change", this.currentValue, this.grade, this.strength);
|
this.$emit("on-change", this.currentValue, this.grade, this.strength);
|
||||||
},
|
},
|
||||||
|
// 回显当前密码
|
||||||
setCurrentValue(value) {
|
setCurrentValue(value) {
|
||||||
if (value === this.currentValue) {
|
if (value === this.currentValue) {
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -55,28 +55,28 @@ export default {
|
||||||
props: {
|
props: {
|
||||||
value: String,
|
value: String,
|
||||||
size: String,
|
size: String,
|
||||||
placeholder: {
|
placeholder: { // input提示信息
|
||||||
type: String,
|
type: String,
|
||||||
default: "图片链接"
|
default: "图片链接"
|
||||||
},
|
},
|
||||||
showInput: {
|
showInput: { // 显示图片链接
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: true
|
default: true
|
||||||
},
|
},
|
||||||
disabled: {
|
disabled: { // 是否不可选中
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false
|
||||||
},
|
},
|
||||||
readonly: {
|
readonly: { // 是否只读
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false
|
||||||
},
|
},
|
||||||
maxSize: {
|
maxSize: { // 图片最大尺寸
|
||||||
type: Number,
|
type: Number,
|
||||||
default: 5
|
default: 5
|
||||||
},
|
},
|
||||||
maxlength: Number,
|
maxlength: Number, // 最大长度
|
||||||
icon: {
|
icon: { // 上传按钮图标
|
||||||
type: String,
|
type: String,
|
||||||
default: "ios-cloud-upload-outline"
|
default: "ios-cloud-upload-outline"
|
||||||
}
|
}
|
||||||
|
@ -91,11 +91,13 @@ export default {
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
// 初始化
|
||||||
init() {
|
init() {
|
||||||
this.accessToken = {
|
this.accessToken = {
|
||||||
accessToken: this.getStore("accessToken")
|
accessToken: this.getStore("accessToken")
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
// 格式校验
|
||||||
handleFormatError(file) {
|
handleFormatError(file) {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
this.$Notice.warning({
|
this.$Notice.warning({
|
||||||
|
@ -106,6 +108,7 @@ export default {
|
||||||
" ’格式不正确, 请选择 .jpg .jpeg .png .gif .bmp格式文件"
|
" ’格式不正确, 请选择 .jpg .jpeg .png .gif .bmp格式文件"
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
// 大小校验
|
||||||
handleMaxSize(file) {
|
handleMaxSize(file) {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
this.$Notice.warning({
|
this.$Notice.warning({
|
||||||
|
@ -113,10 +116,12 @@ export default {
|
||||||
desc: "所选文件‘ " + file.name + " ’大小过大, 不得超过 " + this.maxSize + "M."
|
desc: "所选文件‘ " + file.name + " ’大小过大, 不得超过 " + this.maxSize + "M."
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
// 上传前
|
||||||
beforeUpload() {
|
beforeUpload() {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
return true;
|
return true;
|
||||||
},
|
},
|
||||||
|
// 上传成功
|
||||||
handleSuccess(res, file) {
|
handleSuccess(res, file) {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
|
@ -127,15 +132,18 @@ export default {
|
||||||
this.$Message.error(res.message);
|
this.$Message.error(res.message);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
// 上传失败
|
||||||
handleError(error, file, fileList) {
|
handleError(error, file, fileList) {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
this.$Message.error(error.toString());
|
this.$Message.error(error.toString());
|
||||||
},
|
},
|
||||||
|
// 上传成功回显
|
||||||
handleChange(v) {
|
handleChange(v) {
|
||||||
this.$emit("input", this.currentValue);
|
this.$emit("input", this.currentValue);
|
||||||
this.$emit("on-change", this.currentValue);
|
this.$emit("on-change", this.currentValue);
|
||||||
this.$attrs.rollback && this.$attrs.rollback()
|
this.$attrs.rollback && this.$attrs.rollback()
|
||||||
},
|
},
|
||||||
|
// 初始值
|
||||||
setCurrentValue(value) {
|
setCurrentValue(value) {
|
||||||
if (value === this.currentValue) {
|
if (value === this.currentValue) {
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -63,34 +63,34 @@ export default {
|
||||||
vuedraggable
|
vuedraggable
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
value: {
|
value: { // 默认值
|
||||||
type: Object
|
type: Object
|
||||||
},
|
},
|
||||||
draggable: {
|
draggable: { // 是否可拖拽改变位置
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: true
|
default: true
|
||||||
},
|
},
|
||||||
multiple: {
|
multiple: { // 多选
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: true
|
default: true
|
||||||
},
|
},
|
||||||
maxSize: {
|
maxSize: { // 大小限制 MB
|
||||||
type: Number,
|
type: Number,
|
||||||
default: 5
|
default: 5
|
||||||
},
|
},
|
||||||
disable:{
|
disable:{ // 禁止上传
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false
|
||||||
},
|
},
|
||||||
remove:{
|
remove:{ // 移除图片
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: true
|
default: true
|
||||||
},
|
},
|
||||||
limit: {
|
limit: { // 上传总数限制
|
||||||
type: Number,
|
type: Number,
|
||||||
default: 10
|
default: 10
|
||||||
},
|
},
|
||||||
isView: {
|
isView: { // 显示上传按钮
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,6 +41,7 @@
|
||||||
border
|
border
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:data="data"
|
:data="data"
|
||||||
|
class="mt_10"
|
||||||
ref="table"
|
ref="table"
|
||||||
sortable="custom"
|
sortable="custom"
|
||||||
@on-sort-change="changeSort"
|
@on-sort-change="changeSort"
|
||||||
|
|
|
@ -49,6 +49,7 @@
|
||||||
<Table
|
<Table
|
||||||
:loading="loading"
|
:loading="loading"
|
||||||
border
|
border
|
||||||
|
class="mt_10"
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:data="data"
|
:data="data"
|
||||||
ref="table"
|
ref="table"
|
||||||
|
|
|
@ -49,6 +49,7 @@
|
||||||
<Table
|
<Table
|
||||||
:loading="loading"
|
:loading="loading"
|
||||||
border
|
border
|
||||||
|
class="mt_10"
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:data="data"
|
:data="data"
|
||||||
ref="table"
|
ref="table"
|
||||||
|
|
|
@ -107,7 +107,7 @@
|
||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
<Card>
|
<Card>
|
||||||
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom">
|
<Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom">
|
||||||
<!-- 商品栏目格式化 -->
|
<!-- 商品栏目格式化 -->
|
||||||
<template slot="goodsSlot" slot-scope="{row}">
|
<template slot="goodsSlot" slot-scope="{row}">
|
||||||
<div style="margin-top: 5px; height: 80px; display: flex">
|
<div style="margin-top: 5px; height: 80px; display: flex">
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
</Button>
|
</Button>
|
||||||
</download-excel>
|
</download-excel>
|
||||||
</div>
|
</div>
|
||||||
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"></Table>
|
<Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="page">
|
||||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
|
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
|
||||||
show-total show-elevator show-sizer></Page>
|
show-total show-elevator show-sizer></Page>
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
</Poptip>
|
</Poptip>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
<Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
|
||||||
<Row type="flex" justify="end" class="page">
|
<Row type="flex" justify="end" class="page">
|
||||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
|
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
|
||||||
show-total show-elevator show-sizer></Page>
|
show-total show-elevator show-sizer></Page>
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
<Button @click="handleReset" class="search-btn">重置</Button>
|
<Button @click="handleReset" class="search-btn">重置</Button>
|
||||||
</Form>
|
</Form>
|
||||||
</Row>
|
</Row>
|
||||||
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
|
<Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
|
||||||
<!-- 订单详情格式化 -->
|
<!-- 订单详情格式化 -->
|
||||||
<template slot="orderSlot" slot-scope="scope">
|
<template slot="orderSlot" slot-scope="scope">
|
||||||
<a @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
|
<a @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
<Button @click="delAll" class="ml_10">批量下架</Button>
|
<Button @click="delAll" class="ml_10">批量下架</Button>
|
||||||
<!-- <Button @click="upAll">批量上架</Button> -->
|
<!-- <Button @click="upAll">批量上架</Button> -->
|
||||||
</Row>
|
</Row>
|
||||||
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
|
<Table class="mt_10" :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
|
||||||
<template slot-scope="{ row }" slot="action">
|
<template slot-scope="{ row }" slot="action">
|
||||||
<Button v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'" type="info" size="small" style="margin-right: 10px" @click="edit(row)">编辑</Button>
|
<Button v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'" type="info" size="small" style="margin-right: 10px" @click="edit(row)">编辑</Button>
|
||||||
<Button v-if="row.promotionStatus !== 'CLOSE'" type="error" size="small" @click="remove(row)">下架</Button>
|
<Button v-if="row.promotionStatus !== 'CLOSE'" type="error" size="small" @click="remove(row)">下架</Button>
|
||||||
|
|
|
@ -62,7 +62,7 @@
|
||||||
<Button type="primary" @click="openSkuList">选择商品</Button>
|
<Button type="primary" @click="openSkuList">选择商品</Button>
|
||||||
<Button type="error" ghost style="margin-left: 10px" @click="delSelectGoods">批量删除</Button>
|
<Button type="error" ghost style="margin-left: 10px" @click="delSelectGoods">批量删除</Button>
|
||||||
</div>
|
</div>
|
||||||
<Table border :columns="columns" :data="form.promotionGoodsList" @on-selection-change="changeSelect">
|
<Table class="mt_10" border :columns="columns" :data="form.promotionGoodsList" @on-selection-change="changeSelect">
|
||||||
<template slot-scope="{ row }" slot="QRCode">
|
<template slot-scope="{ row }" slot="QRCode">
|
||||||
<img :src="row.QRCode || '../../../assets/lili.png'" width="50px" height="50px" alt="" />
|
<img :src="row.QRCode || '../../../assets/lili.png'" width="50px" height="50px" alt="" />
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
<div style="position:relative">
|
<div style="position:relative">
|
||||||
<Spin size="large" fix v-if="tableLoading">
|
<Spin size="large" fix v-if="tableLoading">
|
||||||
</Spin>
|
</Spin>
|
||||||
<Table disabled-hover :columns="liveGoodsColumns" :data="liveGoodsData">
|
<Table class="mt_10" disabled-hover :columns="liveGoodsColumns" :data="liveGoodsData">
|
||||||
|
|
||||||
<template slot-scope="{ row }" slot="goodsName">
|
<template slot-scope="{ row }" slot="goodsName">
|
||||||
<div class="flex-goods">
|
<div class="flex-goods">
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
</Alert>
|
</Alert>
|
||||||
</Row>
|
</Row>
|
||||||
<h3 class="act-goods">活动商品</h3>
|
<h3 class="act-goods">活动商品</h3>
|
||||||
<Table :loading="loading" border :columns="goodsColumns" :data="goodsData" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
|
<Table class="mt_10" :loading="loading" border :columns="goodsColumns" :data="goodsData" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
|
||||||
<template slot-scope="{ row, index }" slot="price">
|
<template slot-scope="{ row, index }" slot="price">
|
||||||
<Input v-model="row.price" :disabled="status==='view'" @input="goodsData[index].price = row.price" />
|
<Input v-model="row.price" :disabled="status==='view'" @input="goodsData[index].price = row.price" />
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -37,6 +37,7 @@
|
||||||
<Table
|
<Table
|
||||||
:loading="loading"
|
:loading="loading"
|
||||||
border
|
border
|
||||||
|
class="mt_10"
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:data="data"
|
:data="data"
|
||||||
ref="table"
|
ref="table"
|
||||||
|
|
|
@ -1,75 +1,72 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="search">
|
<div class="search">
|
||||||
<Row>
|
<Card>
|
||||||
<Col>
|
<Row @keydown.enter.native="handleSearch">
|
||||||
<Card>
|
<Form
|
||||||
<Row @keydown.enter.native="handleSearch">
|
ref="searchForm"
|
||||||
<Form
|
:model="searchForm"
|
||||||
ref="searchForm"
|
inline
|
||||||
:model="searchForm"
|
:label-width="70"
|
||||||
inline
|
class="search-form"
|
||||||
:label-width="70"
|
>
|
||||||
class="search-form"
|
<Form-item label="开始时间" prop="startDay">
|
||||||
>
|
<DatePicker
|
||||||
<Form-item label="开始时间" prop="startDay">
|
type="date"
|
||||||
<DatePicker
|
v-model="searchForm.startDate"
|
||||||
type="date"
|
format="yyyy-MM-dd HH:mm:ss"
|
||||||
v-model="searchForm.startDate"
|
placeholder="请选择"
|
||||||
format="yyyy-MM-dd HH:mm:ss"
|
clearable
|
||||||
placeholder="请选择"
|
style="width: 200px"
|
||||||
clearable
|
></DatePicker>
|
||||||
style="width: 200px"
|
</Form-item>
|
||||||
></DatePicker>
|
<Form-item label="结束时间" prop="endDate">
|
||||||
</Form-item>
|
<DatePicker
|
||||||
<Form-item label="结束时间" prop="endDate">
|
type="date"
|
||||||
<DatePicker
|
v-model="searchForm.endDate"
|
||||||
type="date"
|
format="yyyy-MM-dd HH:mm:ss"
|
||||||
v-model="searchForm.endDate"
|
di
|
||||||
format="yyyy-MM-dd HH:mm:ss"
|
placeholder="请选择"
|
||||||
di
|
clearable
|
||||||
placeholder="请选择"
|
style="width: 200px"
|
||||||
clearable
|
></DatePicker>
|
||||||
style="width: 200px"
|
</Form-item>
|
||||||
></DatePicker>
|
<Form-item label="状态" prop="orderStatus">
|
||||||
</Form-item>
|
<Select v-model="searchForm.billStatus" placeholder="请选择" clearable style="width: 200px">
|
||||||
<Form-item label="状态" prop="orderStatus">
|
<Option value="OUT">已出账</Option>
|
||||||
<Select v-model="searchForm.billStatus" placeholder="请选择" clearable style="width: 200px">
|
<Option value="CHECK">已对账</Option>
|
||||||
<Option value="OUT">已出账</Option>
|
<Option value="COMPLETE">已完成</Option>
|
||||||
<Option value="CHECK">已对账</Option>
|
</Select>
|
||||||
<Option value="COMPLETE">已完成</Option>
|
</Form-item>
|
||||||
</Select>
|
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
|
||||||
</Form-item>
|
<Button @click="handleReset" class="search-btn">重置</Button>
|
||||||
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
|
</Form>
|
||||||
<Button @click="handleReset" class="search-btn">重置</Button>
|
</Row>
|
||||||
</Form>
|
<Table
|
||||||
</Row>
|
:loading="loading"
|
||||||
<Table
|
border
|
||||||
:loading="loading"
|
:columns="columns"
|
||||||
border
|
:data="data"
|
||||||
:columns="columns"
|
ref="table"
|
||||||
:data="data"
|
class="mt_10"
|
||||||
ref="table"
|
sortable="custom"
|
||||||
sortable="custom"
|
@on-sort-change="changeSort"
|
||||||
@on-sort-change="changeSort"
|
@on-selection-change="changeSelect"
|
||||||
@on-selection-change="changeSelect"
|
></Table>
|
||||||
></Table>
|
<Row type="flex" justify="end" class="page">
|
||||||
<Row type="flex" justify="end" class="page">
|
<Page
|
||||||
<Page
|
:current="searchForm.pageNumber"
|
||||||
:current="searchForm.pageNumber"
|
:total="total"
|
||||||
:total="total"
|
:page-size="searchForm.pageSize"
|
||||||
:page-size="searchForm.pageSize"
|
@on-change="changePage"
|
||||||
@on-change="changePage"
|
@on-page-size-change="changePageSize"
|
||||||
@on-page-size-change="changePageSize"
|
:page-size-opts="[10, 20, 50]"
|
||||||
:page-size-opts="[10, 20, 50]"
|
size="small"
|
||||||
size="small"
|
show-total
|
||||||
show-total
|
show-elevator
|
||||||
show-elevator
|
show-sizer
|
||||||
show-sizer
|
></Page>
|
||||||
></Page>
|
</Row>
|
||||||
</Row>
|
</Card>
|
||||||
</Card>
|
|
||||||
</Col>
|
|
||||||
</Row>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
|
@ -144,7 +144,10 @@
|
||||||
<div>
|
<div>
|
||||||
<h4>订退单统计</h4>
|
<h4>订退单统计</h4>
|
||||||
<div class="breadcrumb" style="margin-bottom:20px;">
|
<div class="breadcrumb" style="margin-bottom:20px;">
|
||||||
<span @click="clickTab(item,index)" :class="{'active':item.selected}" v-for="(item,index) in orderType" :key="index"> {{item.title}}</span>
|
<RadioGroup v-model="orderOrRefund" type="button" size="small" button-style="solid">
|
||||||
|
<Radio :label="true">订单</Radio>
|
||||||
|
<Radio :label="false">退单</Radio>
|
||||||
|
</RadioGroup>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<Table stripe :columns="columns" :data="data"></Table>
|
<Table stripe :columns="columns" :data="data"></Table>
|
||||||
|
@ -168,18 +171,8 @@ export default {
|
||||||
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
orderOrRefund: true, // 订单还是退单
|
||||||
total: "0", // 订单总数
|
total: "0", // 订单总数
|
||||||
orderType: [
|
|
||||||
// tab切换状态
|
|
||||||
{
|
|
||||||
title: "订单",
|
|
||||||
selected: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: "退单",
|
|
||||||
selected: false,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
// 订单状态
|
// 订单状态
|
||||||
orderStatusList: {
|
orderStatusList: {
|
||||||
UNDELIVERED: "待发货",
|
UNDELIVERED: "待发货",
|
||||||
|
@ -460,20 +453,17 @@ export default {
|
||||||
},
|
},
|
||||||
deep: true,
|
deep: true,
|
||||||
},
|
},
|
||||||
|
orderOrRefund:{ // 订单还是退单
|
||||||
|
handler (val) {
|
||||||
|
if (val) {
|
||||||
|
this.getOrderList();
|
||||||
|
} else {
|
||||||
|
this.getOrderRefundList();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
clickTab(item, index) {
|
|
||||||
this.refundIndex = index;
|
|
||||||
this.orderType.forEach((res) => {
|
|
||||||
res.selected = false;
|
|
||||||
});
|
|
||||||
if (item.title == "退单") {
|
|
||||||
this.getOrderRefundList();
|
|
||||||
} else {
|
|
||||||
this.getOrderList();
|
|
||||||
}
|
|
||||||
item.selected = true;
|
|
||||||
},
|
|
||||||
// 订单图
|
// 订单图
|
||||||
initOrderChart() {
|
initOrderChart() {
|
||||||
// 默认已经加载 legend-filter 交互
|
// 默认已经加载 legend-filter 交互
|
||||||
|
|
Loading…
Reference in New Issue