zhuce
/
lilishop-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更改seller上面之前配置出错的问题

master
lemon橪 2021-08-09 11:11:57 +08:00
parent 86fed0db41
commit c58d70524d
4 changed files with 52 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
manager/src/views/order/flow/paymentLog.vue
View File

@ -14,11 +14,12 @@
</Form-item> </Form-item>
<Form-item label="支付方式" prop="orderStatus"> <Form-item label="支付方式" prop="orderStatus">
<Select v-model="searchForm.paymentMethod" placeholder="请选择" clearable style="width: 200px"> <Select v-model="searchForm.paymentMethod" placeholder="请选择" clearable style="width: 200px">
<Option value="">全部</Option>
<Option value="WECHAT">微信</Option> <Option value="WECHAT">微信</Option>
<Option value="ALIPAY">支付宝</Option> <Option value="ALIPAY">支付宝</Option>
<Option value="WALLET">余额</Option> <Option value="WALLET">余额</Option>
<Option value="BANK_TRANSFER">银行转账</Option> <Option value="BANK_TRANSFER">银行转账</Option>
<Option value="">暂未付款</Option>
</Select> </Select>
</Form-item> </Form-item>
<Form-item label="支付时间"> <Form-item label="支付时间">
@ -29,8 +30,8 @@
</Row> </Row>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10"></Table> <Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10"></Table>
<Row type="flex" justify="end" class="mt_10"> <Row type="flex" justify="end" class="mt_10">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" <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"
size="small" show-total show-elevator show-sizer></Page> show-total show-elevator show-sizer></Page>
</Row> </Row>
</Card> </Card>
</div> </div>
@ -68,13 +69,21 @@ export default {
align: "center", align: "center",
render: (h, params) => { render: (h, params) => {
if (params.row.paymentMethod === "WECHAT") { if (params.row.paymentMethod === "WECHAT") {
return h("div", [h("Tag", {props: {color: "green",},}, "微信"),]); return h("div", [
h("Tag", { props: { color: "green" } }, "微信"),
]);
} else if (params.row.paymentMethod === "ALIPAY") { } else if (params.row.paymentMethod === "ALIPAY") {
return h("div", [h("Tag", {props: {color: "blue",},}, "支付宝"),]); return h("div", [
h("Tag", { props: { color: "blue" } }, "支付宝"),
]);
} else if (params.row.paymentMethod === "WALLET") { } else if (params.row.paymentMethod === "WALLET") {
return h("div", [h("Tag", {props: {color: "geekblue",},}, "余额支付"),]); return h("div", [
h("Tag", { props: { color: "geekblue" } }, "余额支付"),
]);
} else if (params.row.paymentMethod === "BANK_TRANSFER") { } else if (params.row.paymentMethod === "BANK_TRANSFER") {
return h("div", [h("Tag", {props: {color: "orange",},}, "银行转帐"),]); return h("div", [
h("Tag", { props: { color: "orange" } }, "银行转帐"),
]);
} else { } else {
return h("div", [h("Tag", {}, "暂未付款")]); return h("div", [h("Tag", {}, "暂未付款")]);
} }
@ -95,13 +104,19 @@ export default {
key: "clientType", key: "clientType",
width: 130, width: 130,
render: (h, params) => { render: (h, params) => {
if (params.row.clientType === "WECHAT_MP" || params.row.clientType === '小程序') { if (
params.row.clientType === "WECHAT_MP" ||
params.row.clientType === "小程序"
) {
return h("div", [h("span", {}, "小程序")]); return h("div", [h("span", {}, "小程序")]);
} else if (params.row.clientType === "APP") { } else if (params.row.clientType === "APP") {
return h("div", [h("span", {}, "APP")]); return h("div", [h("span", {}, "APP")]);
} else if (params.row.clientType === "PC") { } else if (params.row.clientType === "PC") {
return h("div", [h("span", {}, "PC网页")]); return h("div", [h("span", {}, "PC网页")]);
} else if (params.row.clientType === "H5" || params.row.clientType === 'wap') { } else if (
params.row.clientType === "H5" ||
params.row.clientType === "wap"
) {
return h("div", [h("span", {}, "移动端")]); return h("div", [h("span", {}, "移动端")]);
} }
}, },
@ -168,8 +183,9 @@ export default {
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
this.getDataList(); this.getDataList();
}, },
changeDate (val) { // 改变日期格式 changeDate(val) {
this.searchForm.paymentTime = val // 改变日期格式
this.searchForm.paymentTime = val;
}, },
// 获取列表 // 获取列表
getDataList() { getDataList() {

26
manager/src/views/order/flow/refundLog.vue
View File

@ -6,24 +6,22 @@
<Form-item label="订单号" prop="orderSn"> <Form-item label="订单号" prop="orderSn">
<Input type="text" v-model="searchForm.orderSn" placeholder="订单/交易号" clearable style="width: 200px" /> <Input type="text" v-model="searchForm.orderSn" placeholder="订单/交易号" clearable style="width: 200px" />
</Form-item> </Form-item>
<Form-item label="退款状态" prop="orderStatus"> <Form-item label="退款状态">
<Select v-model="searchForm.isRefund" placeholder="请选择" clearable style="width: 200px"> <Select v-model="searchForm.isRefund" placeholder="请选择" clearable style="width: 200px">
<Option value="false">未退款</Option> <Option value="false">未退款</Option>
<Option value="true">已退款</Option> <Option value="true">已退款</Option>
</Select> </Select>
</Form-item> </Form-item>
<Form-item label="退款时间"> <Form-item label="退款时间">
<DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd" clearable <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
@on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
</Form-item> </Form-item>
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button> <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
</Form> </Form>
</Row> </Row>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10"></Table> <Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10"></Table>
<Row type="flex" justify="end" class="mt_10"> <Row type="flex" justify="end" class="mt_10">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" <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"
@on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" show-total show-elevator show-sizer></Page>
size="small" show-total show-elevator show-sizer></Page>
</Row> </Row>
</Card> </Card>
</div> </div>
@ -67,13 +65,13 @@ export default {
title: "第三方付款流水", title: "第三方付款流水",
key: "paymentReceivableNo", key: "paymentReceivableNo",
minWidth: 150, minWidth: 150,
tooltip: true tooltip: true,
}, },
{ {
title: "第三方退款流水", title: "第三方退款流水",
key: "receivableNo", key: "receivableNo",
minWidth: 130, minWidth: 130,
tooltip: true tooltip: true,
}, },
{ {
title: "退款金额", title: "退款金额",
@ -90,7 +88,7 @@ export default {
title: "申请时间", title: "申请时间",
key: "createTime", key: "createTime",
minWidth: 200, minWidth: 200,
tooltip: true tooltip: true,
}, },
{ {
title: "退款状态", title: "退款状态",
@ -99,9 +97,13 @@ export default {
width: 95, width: 95,
render: (h, params) => { render: (h, params) => {
if (params.row.isRefund == "1") { if (params.row.isRefund == "1") {
return h("div", [h("Tag", {props: {color: "green",},}, "已退款")]); return h("div", [
h("Tag", { props: { color: "green" } }, "已退款"),
]);
} else { } else {
return h("div", [h("Tag", {props: {color: "orange",},}, "未退款")]); return h("div", [
h("Tag", { props: { color: "orange" } }, "未退款"),
]);
} }
}, },
}, },
@ -150,7 +152,7 @@ export default {
} }
}); });
this.loading = false; this.loading = false;
} },
}, },
mounted() { mounted() {
this.init(); this.init();

1
seller/src/api/index.js
View File

@ -6,6 +6,7 @@ import {
deleteRequest, deleteRequest,
getRequestWithNoToken, getRequestWithNoToken,
postRequestWithNoToken, postRequestWithNoToken,
commonUrl,
} from "@/libs/axios"; } from "@/libs/axios";
//获取所有city //获取所有city

16
seller/src/config/index.js
View File

@ -18,14 +18,14 @@ export default {
* @description api请求基础路径 * @description api请求基础路径
*/ */
api_dev: { api_dev: {
// common: "https://common-api.pickmall.cn", common: "https://common-api.pickmall.cn",
// buyer: "https://buyer-api.pickmall.cn", buyer: "https://buyer-api.pickmall.cn",
// seller: "https://store-api.pickmall.cn", seller: "https://store-api.pickmall.cn",
// manager: "https://admin-api.pickmall.cn" manager: "https://admin-api.pickmall.cn"
common: 'http://192.168.0.100:8890', // common: 'http://192.168.0.100:8890',
buyer: 'http://192.168.0.100:8888', // buyer: 'http://192.168.0.100:8888',
seller: 'http://192.168.0.100:8889', // seller: 'http://192.168.0.100:8889',
manager: 'http://192.168.0.100:8887' // manager: 'http://192.168.0.100:8887'
}, },
api_prod: { api_prod: {
common: "https://common-api.pickmall.cn", common: "https://common-api.pickmall.cn",