文章分类，订单列表，商品分类，收款记录等页面bug修改
mabo
parent
7331fcbb17
commit
4c0aec2f42
|
|
@ -80,8 +80,8 @@
|
|||
<div>
|
||||
<span>运费：</span><span>+{{ order.order.freightPrice | unitPrice("￥") }}</span><br>
|
||||
</div>
|
||||
<div><span>优惠券：</span><span>-{{ order.order.priceDetailDTO.couponPrice || 0 | unitPrice("￥") }}</span></div>
|
||||
<div><span>活动优惠：</span><span>-{{ order.order.discountPrice | unitPrice("￥") }}</span></div>
|
||||
<div v-if="order.order.priceDetailDTO.couponPrice"><span>优惠券：</span><span>-{{ order.order.priceDetailDTO.couponPrice || 0 | unitPrice("￥") }}</span></div>
|
||||
<div v-if="order.order.discountPrice"><span>活动优惠：</span><span>-{{ order.order.discountPrice | unitPrice("￥") }}</span></div>
|
||||
<div>
|
||||
<span>应付金额：</span>
|
||||
<span class="actrual-price">{{ order.order.flowPrice | unitPrice("￥") }}</span>
|
||||
|
|
|
|||
|
|
@ -17,14 +17,14 @@ export default {
|
|||
* @description api请求基础路径
|
||||
*/
|
||||
api_dev: {
|
||||
// common: "https://common-api.pickmall.cn",
|
||||
// buyer: "https://buyer-api.pickmall.cn",
|
||||
// seller: "https://store-api.pickmall.cn",
|
||||
// manager: "https://admin-api.pickmall.cn"
|
||||
common: 'http://192.168.0.103:8890',
|
||||
buyer: 'http://192.168.0.103:8888',
|
||||
seller: 'http://192.168.0.103:8889',
|
||||
manager: 'http://192.168.0.103:8887'
|
||||
common: "https://common-api.pickmall.cn",
|
||||
buyer: "https://buyer-api.pickmall.cn",
|
||||
seller: "https://store-api.pickmall.cn",
|
||||
manager: "https://admin-api.pickmall.cn"
|
||||
// common: 'http://192.168.0.103:8890',
|
||||
// buyer: 'http://192.168.0.103:8888',
|
||||
// seller: 'http://192.168.0.103:8889',
|
||||
// manager: 'http://192.168.0.103:8887'
|
||||
},
|
||||
api_prod: {
|
||||
common: "https://common-api.pickmall.cn",
|
||||
|
|
|
|||
|
|
@ -52,6 +52,9 @@
|
|||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<template slot-scope="{row}" slot="distributionOrderStatus">
|
||||
<Tag :color="filterStatusColor(row.distributionOrderStatus)">{{filterStatus(row.distributionOrderStatus)}}</Tag>
|
||||
</template>
|
||||
</Table>
|
||||
<Row type="flex" justify="end" class="page">
|
||||
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
|
||||
|
|
@ -121,20 +124,10 @@
|
|||
},
|
||||
{
|
||||
title: "状态",
|
||||
key: "distributionOrderStatus",
|
||||
width: 100,
|
||||
sortable: false,
|
||||
render: (h, params) => {
|
||||
if (params.row.distributionOrderStatus == 'COMPLETE_CASH') {
|
||||
return h('div', '提现完成')
|
||||
} else if (params.row.distributionOrderStatus == 'WAIT_BILL') {
|
||||
return h('div', '待结算')
|
||||
} else if (params.row.distributionOrderStatus == 'WAIT_CASH') {
|
||||
return h('div', '待提现')
|
||||
}
|
||||
}
|
||||
slot: "distributionOrderStatus",
|
||||
width: 120,
|
||||
|
||||
},
|
||||
|
||||
{
|
||||
title: "佣金金额",
|
||||
key: "rebateGrade",
|
||||
|
|
@ -219,6 +212,34 @@
|
|||
},
|
||||
searchChange(val) { // 店铺搜索，键盘点击回调
|
||||
this.getShopList(val)
|
||||
},
|
||||
filterStatus (status) { // 过滤订单状态
|
||||
const arr = [
|
||||
{status: 'WAIT_BILL', title: '待结算'},
|
||||
{status: 'WAIT_CASH', title: '待提现'},
|
||||
{status: 'COMPLETE_CASH', title: '提现完成'},
|
||||
{status: 'CANCEL', title: '订单取消'},
|
||||
{status: 'REFUND', title: '退款'},
|
||||
]
|
||||
for (let i=0;i<arr.length;i++) {
|
||||
if (arr[i].status === status) {
|
||||
return arr[i].title;
|
||||
}
|
||||
}
|
||||
},
|
||||
filterStatusColor (status) { // 状态tag标签颜色
|
||||
const arr = [
|
||||
{status: 'WAIT_BILL', color: 'magenta'},
|
||||
{status: 'WAIT_CASH', color: 'warning'},
|
||||
{status: 'COMPLETE_CASH', color: 'success'},
|
||||
{status: 'CANCEL', color: 'default'},
|
||||
{status: 'REFUND', color: 'error'},
|
||||
]
|
||||
for (let i=0;i<arr.length;i++) {
|
||||
if (arr[i].status === status) {
|
||||
return arr[i].color;
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
|
|
|
|||
|
|
@ -40,13 +40,8 @@
|
|||
{{ scope.row.commissionRate }}%
|
||||
</template>
|
||||
|
||||
<template slot="deleteFlag" slot-scope="scope">
|
||||
<div v-if="scope.row.deleteFlag == 0">
|
||||
<Badge text="正常启用" status="success"></Badge>
|
||||
</div>
|
||||
<div v-if="scope.row.deleteFlag == 1">
|
||||
<Badge text="禁用" status="error"></Badge>
|
||||
</div>
|
||||
<template slot="deleteFlag" slot-scope="{row}">
|
||||
<Tag :class="{'ml_10': row.deleteFlag}" :color="row.deleteFlag == false ? 'success' : 'error'">{{row.deleteFlag == false ? '正常启用' : '禁用'}}</Tag>
|
||||
</template>
|
||||
</Table>
|
||||
|
||||
|
|
@ -129,7 +124,7 @@ import {
|
|||
} from "@/api/goods";
|
||||
|
||||
import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
|
||||
|
||||
import {regular} from "@/utils";
|
||||
export default {
|
||||
name: "lili-components",
|
||||
components: {
|
||||
|
|
@ -172,7 +167,12 @@ export default {
|
|||
brandWay: "", //请求绑定品牌的信息
|
||||
specForm: {},
|
||||
// 表单验证规则
|
||||
formValidate: {},
|
||||
formValidate: {
|
||||
commissionRate: [
|
||||
{required: true, message: '请填写佣金比例'},
|
||||
{pattern: regular.Integer, message: "佣金比例不能为负"},
|
||||
]
|
||||
},
|
||||
columns: [
|
||||
{
|
||||
title: "分类名称",
|
||||
|
|
@ -181,8 +181,6 @@ export default {
|
|||
},
|
||||
{
|
||||
title: "状态",
|
||||
key: "deleteFlag",
|
||||
|
||||
slot: "deleteFlag",
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
</Select>
|
||||
</Form-item>
|
||||
<Form-item label="支付时间">
|
||||
<DatePicker v-model="searchForm" type="datetimerange" format="yyyy-MM-dd" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
|
||||
<DatePicker v-model="searchForm.paymentTime" type="datetime" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="changeDate" placeholder="选择支付时间" style="width: 200px"></DatePicker>
|
||||
</Form-item>
|
||||
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
|
||||
</Form>
|
||||
|
|
@ -53,10 +53,9 @@ export default {
|
|||
pageSize: 10, // 页面大小
|
||||
sort: "createTime", // 默认排序字段
|
||||
order: "desc", // 默认排序方式
|
||||
startDate: "", // 起始时间
|
||||
endDate: "", // 终止时间
|
||||
sn: "",
|
||||
payStatus: "",
|
||||
paymentTime: "",
|
||||
},
|
||||
columns: [
|
||||
{
|
||||
|
|
@ -151,61 +150,30 @@ export default {
|
|||
};
|
||||
},
|
||||
methods: {
|
||||
dropDown() {
|
||||
if (this.drop) {
|
||||
this.dropDownContent = "展开";
|
||||
this.dropDownIcon = "ios-arrow-down";
|
||||
} else {
|
||||
this.dropDownContent = "收起";
|
||||
this.dropDownIcon = "ios-arrow-up";
|
||||
}
|
||||
this.drop = !this.drop;
|
||||
},
|
||||
// 初始化数据
|
||||
init() {
|
||||
this.getDataList();
|
||||
},
|
||||
// 改变页码
|
||||
changePage(v) {
|
||||
this.searchForm.pageNumber = v;
|
||||
this.getDataList();
|
||||
},
|
||||
// 改变页数
|
||||
changePageSize(v) {
|
||||
this.searchForm.pageSize = v;
|
||||
this.getDataList();
|
||||
},
|
||||
// 搜索
|
||||
handleSearch() {
|
||||
this.searchForm.pageNumber = 1;
|
||||
this.searchForm.pageSize = 10;
|
||||
this.getDataList();
|
||||
},
|
||||
handleReset() {
|
||||
this.$refs.searchForm.resetFields();
|
||||
this.searchForm.pageNumber = 1;
|
||||
this.searchForm.pageSize = 10;
|
||||
this.selectDate = null;
|
||||
this.searchForm.startDate = "";
|
||||
this.searchForm.endDate = "";
|
||||
// 重新加载数据
|
||||
this.getDataList();
|
||||
},
|
||||
changeSort(e) {
|
||||
this.searchForm.sort = e.key;
|
||||
this.searchForm.order = e.order;
|
||||
if (e.order === "normal") {
|
||||
this.searchForm.order = "";
|
||||
}
|
||||
this.getDataList();
|
||||
},
|
||||
|
||||
changeSelect(e) {
|
||||
this.selectList = e;
|
||||
this.selectCount = e.length;
|
||||
},
|
||||
selectDateRange(v) {
|
||||
if (v) {
|
||||
this.searchForm.startDate = v[0];
|
||||
this.searchForm.endDate = v[1];
|
||||
}
|
||||
changeDate (val) { // 改变日期格式
|
||||
this.searchForm.paymentTime = val
|
||||
},
|
||||
// 获取列表
|
||||
getDataList() {
|
||||
this.loading = true;
|
||||
API_Order.paymentLog(this.searchForm).then((res) => {
|
||||
|
|
|
|||
|
|
@ -23,6 +23,11 @@
|
|||
type="primary"
|
||||
>订单取消</Button
|
||||
>
|
||||
<Button
|
||||
v-if="orderInfo.order.orderStatus === 'UNPAID'"
|
||||
@click="confirmPrice"
|
||||
type="success"
|
||||
>收款</Button>
|
||||
<Button @click="orderLog" type="primary"
|
||||
>订单日志</Button
|
||||
>
|
||||
|
|
@ -571,6 +576,25 @@ export default {
|
|||
this.showRegion = true;
|
||||
this.regionId = "";
|
||||
},
|
||||
//确认收款
|
||||
confirmPrice() {
|
||||
this.$Modal.confirm({
|
||||
title: "提示",
|
||||
content:
|
||||
"<p>您确定要收款吗？线下收款涉及库存变更，需异步进行，等待约一分钟刷新列表查看</p>",
|
||||
onOk: () => {
|
||||
API_Order.orderPay(this.sn).then((res) => {
|
||||
if (res.success) {
|
||||
this.$Message.success("收款成功");
|
||||
this.getDataList();
|
||||
} else {
|
||||
this.$Message.error(res.message);
|
||||
}
|
||||
});
|
||||
},
|
||||
});
|
||||
},
|
||||
// 获取订单详情
|
||||
getDataList() {
|
||||
this.loading = true;
|
||||
API_Order.orderDetail(this.sn).then((res) => {
|
||||
|
|
|
|||
|
|
@ -207,20 +207,13 @@ export default {
|
|||
title: "操作",
|
||||
key: "action",
|
||||
align: "center",
|
||||
width: 150,
|
||||
width: 100,
|
||||
render: (h, params) => {
|
||||
return h("div", [h("Button", {props: {type: "primary", size: "small",},
|
||||
attrs: {disabled: params.row.orderStatus == "UNPAID" ? false : true,},
|
||||
return h("Button", {props: {type: "info", size: "small",},
|
||||
style: {marginRight: "5px",},
|
||||
on: {click: () => {this.confirmPrice(params.row);},},
|
||||
}, "收款"
|
||||
),
|
||||
h("Button", {props: {type: "info", size: "small",},
|
||||
style: {marginRight: "5px",},
|
||||
on: {click: () => {this.detail(params.row);},},
|
||||
}, "查看"
|
||||
),
|
||||
]);
|
||||
on: {click: () => {this.detail(params.row);},},
|
||||
}, "查看"
|
||||
)
|
||||
},
|
||||
},
|
||||
],
|
||||
|
|
@ -286,25 +279,7 @@ export default {
|
|||
this.total = this.data.length;
|
||||
this.loading = false;
|
||||
},
|
||||
//确认收款
|
||||
confirmPrice(v) {
|
||||
this.$Modal.confirm({
|
||||
title: "提示",
|
||||
content:
|
||||
"<p>您确定要收款吗？线下收款涉及库存变更，需异步进行，等待约一分钟刷新列表查看</p>",
|
||||
onOk: () => {
|
||||
API_Order.orderPay(v.sn).then((res) => {
|
||||
if (res.success) {
|
||||
this.$Message.success("收款成功");
|
||||
this.getDataList();
|
||||
} else {
|
||||
this.$Message.error(res.message);
|
||||
}
|
||||
});
|
||||
},
|
||||
});
|
||||
},
|
||||
|
||||
// 跳转详情页面
|
||||
detail(v) {
|
||||
let sn = v.sn;
|
||||
this.$router.push({
|
||||
|
|
|
|||
|
|
@ -18,14 +18,14 @@ export default {
|
|||
* @description api请求基础路径
|
||||
*/
|
||||
api_dev: {
|
||||
common: 'https://common-api.pickmall.cn',
|
||||
buyer: 'https://buyer-api.pickmall.cn',
|
||||
seller: 'https://store-api.pickmall.cn',
|
||||
manager: 'https://admin-api.pickmall.cn',
|
||||
// common: 'http://192.168.0.106:8890',
|
||||
// buyer: 'http://192.168.0.106:8888',
|
||||
// seller: 'http://192.168.0.106:8889',
|
||||
// manager: 'http://192.168.0.106:8887'
|
||||
// common: 'https://common-api.pickmall.cn',
|
||||
// buyer: 'https://buyer-api.pickmall.cn',
|
||||
// seller: 'https://store-api.pickmall.cn',
|
||||
// manager: 'https://admin-api.pickmall.cn',
|
||||
common: 'http://192.168.0.103:8890',
|
||||
buyer: 'http://192.168.0.103:8888',
|
||||
seller: 'http://192.168.0.103:8889',
|
||||
manager: 'http://192.168.0.103:8887'
|
||||
|
||||
},
|
||||
api_prod: {
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@
|
|||
|
||||
</div>
|
||||
<div class="transaction-card" v-if="item.label=='订单'">
|
||||
|
||||
<div class="card-item">
|
||||
<div class="card-item-label">下单笔数</div>
|
||||
<div class="card-item-value">{{overViewList.orderNum || 0}}</div>
|
||||
|
|
@ -48,7 +47,7 @@
|
|||
</div>
|
||||
<div class="card-item">
|
||||
<div class="card-item-label">下单金额</div>
|
||||
<div class="card-item-value">{{overViewList.orderAmount ? ($options.filters.unitPrice(overViewList.orderAmount )) : 0 }}</div>
|
||||
<div class="card-item-value">{{overViewList.orderAmount || 0 | unitPrice('￥')}}</div>
|
||||
</div>
|
||||
<div class="card-item">
|
||||
<div class="card-item-label">付款笔数</div>
|
||||
|
|
@ -56,7 +55,7 @@
|
|||
</div>
|
||||
<div class="card-item">
|
||||
<div class="card-item-label">付款金额</div>
|
||||
<div class="card-item-value">{{ overViewList.paymentAmount ? ($options.filters.unitPrice(overViewList.paymentAmount)) : 0 }}</div>
|
||||
<div class="card-item-value">{{ overViewList.paymentAmount || 0 | unitPrice('￥')}}</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
@ -141,7 +140,6 @@
|
|||
|
||||
</div>
|
||||
</Card>
|
||||
|
||||
<Card class="card">
|
||||
<div>
|
||||
<h4>订退单统计</h4>
|
||||
|
|
@ -152,9 +150,7 @@
|
|||
<Table stripe :columns="columns" :data="data"></Table>
|
||||
</div>
|
||||
<Page @on-change="(index)=>{refundParams.pageNumber = index}" @on-page-size-change="(size)=>{refundParams.pageSize= size}" class="page" show-total show-elevator :total="total" />
|
||||
|
||||
</div>
|
||||
|
||||
</Card>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue