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

修改部分页面ui以及bug

master
lemon橪 2021-06-23 18:08:22 +08:00
parent ea396405df
commit 2391f71d9a
16 changed files with 324 additions and 462 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buyer/src/pages/forgetPassword.vue
View File

@ -93,13 +93,13 @@
</div> </div>
<div class="foot"> <div class="foot">
<Row type="flex" justify="space-around" class="help"> <Row type="flex" justify="space-around" class="help">
<a class="item" href="https://lilishop.com" target="_blank">帮助</a> <a class="item" href="https://pickmall.cn/" target="_blank">帮助</a>
<a class="item" href="https://lilishop.com" target="_blank">隐私</a> <a class="item" href="https://pickmall.cn/" target="_blank">隐私</a>
<a class="item" href="https://lilishop.com" target="_blank">条款</a> <a class="item" href="https://pickmall.cn/" target="_blank">条款</a>
</Row> </Row>
<Row type="flex" justify="center" class="copyright"> <Row type="flex" justify="center" class="copyright">
Copyright © 2020 - Present Copyright © 2020 - Present
<a href="http://lili.cn" target="_blank" style="margin: 0 5px" <a href="https://pickmall.cn/" target="_blank" style="margin: 0 5px"
>lili-shop</a >lili-shop</a
> >
版权所有 版权所有

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

@ -17,14 +17,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.109:8890', // common: 'http://192.168.0.109:8890',
buyer: 'http://192.168.0.109:8888', // buyer: 'http://192.168.0.109:8888',
seller: 'http://192.168.0.109:8889', // seller: 'http://192.168.0.109:8889',
manager: 'http://192.168.0.109:8887' // manager: 'http://192.168.0.109:8887'
}, },
api_prod: { api_prod: {
common: "https://common-api.pickmall.cn", common: "https://common-api.pickmall.cn",

4
manager/src/views/distribution/distributionGoods.vue
View File

@ -67,10 +67,12 @@ export default {
{ {
type: "selection", type: "selection",
width: 60, width: 60,
align: "center" align: "center",
fixed: "left",
}, },
{ {
title: "商品图片", title: "商品图片",
fixed: "left",
key: "thumbnail", key: "thumbnail",
width: 120, width: 120,
align: "center", align: "center",

2
manager/src/views/main-components/footer.vue
View File

@ -8,7 +8,7 @@
<Row type="flex" justify="center" class="copyright"> <Row type="flex" justify="center" class="copyright">
Copyright © 2020 - Present Copyright © 2020 - Present
<a <a
href="http://lili.cn" href="https://pickmall.cn/"
target="_blank" target="_blank"
style="margin:0 5px;" style="margin:0 5px;"
>lili-shop</a> {{ $t('rights') }} >lili-shop</a> {{ $t('rights') }}

19
manager/src/views/page/article-manage/articleList.vue
View File

@ -57,7 +57,7 @@
<Input type="number" v-model="form.sort" clearable style="width: 10%" /> <Input type="number" v-model="form.sort" clearable style="width: 10%" />
</FormItem> </FormItem>
<FormItem class="form-item-view-el" label="文章内容" prop="content"> <FormItem class="form-item-view-el" label="文章内容" prop="content">
<editor openXss v-model="form.content"></editor> <editor openXss v-model="form.content"></editor>
</FormItem> </FormItem>
<FormItem label="是否展示" prop="openStatus"> <FormItem label="是否展示" prop="openStatus">
<i-switch size="large" v-model="form.openStatus" :true-value="open" :false-value="close"> <i-switch size="large" v-model="form.openStatus" :true-value="open" :false-value="close">
@ -435,28 +435,13 @@ export default {
this.form.categoryId = res.result.categoryId; this.form.categoryId = res.result.categoryId;
this.treeValue = data.articleCategoryName; this.treeValue = data.articleCategoryName;
this.form.id = data.id; this.form.id = data.id;
this.form.content = htmlEscape(res.result.content); this.form.content =res.result.content;
this.form.title = res.result.title; this.form.title = res.result.title;
this.form.sort = res.result.sort; this.form.sort = res.result.sort;
this.form.openStatus = res.result.openStatus; this.form.openStatus = res.result.openStatus;
} }
}); });
}, },
htmlEscape(text) {
return text.replace(/[<>"&]/g, function (match, pos, originalText) {
switch (match) {
case "<":
return "&lt;";
case ">":
return "&gt;";
case "&":
return "&amp;";
case '"':
return "&quot;";
}
});
},
remove(v) { remove(v) {
this.$Modal.confirm({ this.$Modal.confirm({
title: "确认删除", title: "确认删除",

2
manager/src/views/promotion/coupon/coupon.vue
View File

@ -161,7 +161,7 @@ export default {
}, },
{ {
title: "活动时间", title: "活动时间",
width: 150,
render: (h, params) => { render: (h, params) => {
if (params.row.getType === "ACTIVITY") { if (params.row.getType === "ACTIVITY") {
return h("div", "长期有效"); return h("div", "长期有效");

135
manager/src/views/promotion/pointsGoods/pointsGoods.vue
View File

@ -2,78 +2,37 @@
<div class="search"> <div class="search">
<Card> <Card>
<Row> <Row>
<Form <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
ref="searchForm"
:model="searchForm"
inline
:label-width="70"
class="search-form"
>
<Form-item label="商品名称"> <Form-item label="商品名称">
<Input <Input type="text" v-model="searchForm.goodsName" placeholder="请输入商品名称" clearable style="width: 200px" />
type="text"
v-model="searchForm.goodsName"
placeholder="请输入商品名称"
clearable
style="width: 200px"
/>
</Form-item> </Form-item>
<Form-item label="积分区间"> <Form-item label="积分区间">
<Input <Input type="text" v-model="searchForm.pointsS" placeholder="请输入开始区间" clearable style="width: 200px" />
type="text"
v-model="searchForm.pointsS"
placeholder="请输入开始区间"
clearable
style="width: 200px"
/>
- -
<Input <Input type="text" v-model="searchForm.pointsE" placeholder="请输入结束区间" clearable style="width: 200px" />
type="text"
v-model="searchForm.pointsE"
placeholder="请输入结束区间"
clearable
style="width: 200px"
/>
</Form-item> </Form-item>
<Form-item label="状态"> <Form-item label="状态">
<Select v-model="searchForm.promotionStatus" style="width: 200px"> <Select v-model="searchForm.promotionStatus" style="width: 200px">
<Option <Option v-for="item in statusList" :value="item.value" :key="item.value">{{ item.label }}</Option>
v-for="item in statusList"
:value="item.value"
:key="item.value"
>{{ item.label }}</Option
>
</Select> </Select>
</Form-item> </Form-item>
<Form-item label="SKU编码"> <Form-item label="SKU编码">
<Input <Input type="text" v-model="searchForm.skuId" placeholder="请输入SKU编码" clearable style="width: 200px" />
type="text"
v-model="searchForm.skuId"
placeholder="请输入SKU编码"
clearable
style="width: 200px"
/>
</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>
<Row class="operation padding-row"> <Row class="operation padding-row">
<Button @click="addPointsGoods" type="primary" >添加积分商品</Button> <Button @click="addPointsGoods" type="primary">添加积分商品</Button>
</Row> </Row>
<Table <Table :loading="loading" border :columns="columns" :data="data" ref="table">
:loading="loading"
border
:columns="columns"
:data="data"
ref="table"
>
<template slot-scope="{ row }" slot="goodsName"> <template slot-scope="{ row }" slot="goodsName">
<div> <div>
<a class="mr_10" @click="linkTo(row.goodsSku.goodsId,row.goodsSku.skuId)">{{row.goodsSku.goodsName}}</a> <a class="mr_10" @click="linkTo(row.goodsSku.goodsId,row.goodsSku.skuId)">{{row.goodsSku.goodsName}}</a>
<Poptip trigger="hover" title="扫码在手机中查看" transfer> <Poptip trigger="hover" title="扫码在手机中查看" transfer>
<div slot="content"> <div slot="content">
<vue-qr :text="wapLinkTo(row.goodsSku.goodsId,row.goodsSku.skuId)" :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr> <vue-qr :text="wapLinkTo(row.goodsSku.goodsId,row.goodsSku.skuId)" :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
</div> </div>
<img src="../../../assets/qrcode.svg" style="vertical-align:middle;" class="hover-pointer" width="20" height="20" alt=""> <img src="../../../assets/qrcode.svg" style="vertical-align:middle;" class="hover-pointer" width="20" height="20" alt="">
</Poptip> </Poptip>
@ -94,48 +53,15 @@
</template> </template>
<template slot-scope="{ row }" slot="action"> <template slot-scope="{ row }" slot="action">
<Button <Button v-if="row.promotionStatus == 'NEW'" type="info" size="small" @click="edit(row.id)" style="margin-right: 5px">编辑</Button>
v-if="row.promotionStatus == 'NEW'" <Button v-if="row.promotionStatus == 'START'" type="warning" size="small" @click="statusChanged(row.id, 'CLOSE')" style="margin-right: 5px">停用</Button>
type="info" <Button v-if="row.promotionStatus == 'CLOSE'" type="warning" size="small" @click="statusChanged(row.id, 'START')" style="margin-right: 5px">启用</Button>
size="small" <Button type="error" size="small" @click="close(row.id)">删除</Button>
@click="edit(row.id)"
style="margin-right: 5px"
>编辑</Button
>
<Button
v-if="row.promotionStatus == 'START'"
type="warning"
size="small"
@click="statusChanged(row.id, 'CLOSE')"
style="margin-right: 5px"
>停用</Button
>
<Button
v-if="row.promotionStatus == 'CLOSE'"
type="warning"
size="small"
@click="statusChanged(row.id, 'START')"
style="margin-right: 5px"
>启用</Button
>
<Button type="error" size="small" @click="close(row.id)"
>删除</Button
>
</template> </template>
</Table> </Table>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<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"
:current="searchForm.pageNumber" show-total show-elevator show-sizer></Page>
: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>
</Row> </Row>
</Card> </Card>
</div> </div>
@ -159,55 +85,62 @@ export default {
pageSize: 10, // 页面大小 pageSize: 10, // 页面大小
order: "desc", // 默认排序方式 order: "desc", // 默认排序方式
}, },
statusList: [ // 活动状态 statusList: [
// 活动状态
{ label: "未开始", value: "NEW" }, { label: "未开始", value: "NEW" },
{ label: "已开始", value: "START" }, { label: "已开始", value: "START" },
{ label: "已结束", value: "END" }, { label: "已结束", value: "END" },
{ label: "已关闭", value: "CLOSE" }, { label: "已关闭", value: "CLOSE" },
], ],
columns: [ // 表头 columns: [
// 表头
{ {
title: "商品名称", title: "商品名称",
slot: "goodsName", slot: "goodsName",
minWidth: 120, minWidth: 150,
fixed: "left",
tooltip: true, tooltip: true,
}, },
{ {
title: "市场价", title: "市场价",
slot: "price", slot: "price",
width: 100,
}, },
{ {
title: "结算价", title: "结算价",
slot: "settlementPrice", slot: "settlementPrice",
width: 100,
}, },
{
title: "分类",
key: "pointsGoodsCategoryName",
},
{ {
title: "库存数量", title: "库存数量",
slot: "quantity", slot: "quantity",
width: 100,
}, },
{ {
title: "活动剩余库存", title: "活动剩余库存",
key: "activeStock", key: "activeStock",
width: 150,
}, },
{ {
title: "兑换积分", title: "兑换积分",
key: "points", key: "points",
width: 100,
}, },
{ {
title: "所属店铺", title: "所属店铺",
key: "storeName", key: "storeName",
width: 100,
}, },
{ {
title: "活动开始时间", title: "活动开始时间",
slot: "startTime", slot: "startTime",
minWidth:100 minWidth: 150,
}, },
{ {
title: "状态", title: "状态",
key: "promotionStatus", key: "promotionStatus",
width: 100,
render: (h, params) => { render: (h, params) => {
let text = "未知", let text = "未知",
color = ""; color = "";
@ -227,10 +160,16 @@ export default {
return h("div", [h("Tag", { props: { color: color } }, text)]); return h("div", [h("Tag", { props: { color: color } }, text)]);
}, },
}, },
{
title: "分类",
key: "pointsGoodsCategoryName",
width: 100,
},
{ {
title: "操作", title: "操作",
slot: "action", slot: "action",
align: "center", align: "center",
fixed: "right",
width: 150, width: 150,
}, },
], ],
@ -327,5 +266,5 @@ export default {
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
@import "@/styles/table-common.scss"; @import "@/styles/table-common.scss";
</style> </style>

38
seller/src/views/goods/goods-seller/goods.vue
View File

@ -4,7 +4,7 @@
<Row @keydown.enter.native="handleSearch"> <Row @keydown.enter.native="handleSearch">
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form"> <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
<Form-item label="商品名称" prop="goodsName"> <Form-item label="商品名称" prop="goodsName">
<Input type="text" v-model="searchForm.goodsName" placeholder="请输入商品名称" clearable style="width: 200px"/> <Input type="text" v-model="searchForm.goodsName" placeholder="请输入商品名称" clearable style="width: 200px" />
</Form-item> </Form-item>
<Form-item label="状态" prop="status"> <Form-item label="状态" prop="status">
<Select v-model="searchForm.marketEnable" placeholder="请选择" clearable style="width: 200px"> <Select v-model="searchForm.marketEnable" placeholder="请选择" clearable style="width: 200px">
@ -19,7 +19,7 @@
</Select> </Select>
</Form-item> </Form-item>
<Form-item label="商品编号" prop="sn"> <Form-item label="商品编号" prop="sn">
<Input type="text" v-model="searchForm.sn" placeholder="商品编号" clearable style="width: 200px"/> <Input type="text" v-model="searchForm.sn" placeholder="商品编号" clearable style="width: 200px" />
</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>
<Button @click="handleReset" class="search-btn">重置</Button> <Button @click="handleReset" class="search-btn">重置</Button>
@ -55,8 +55,7 @@
</div> </div>
<Poptip trigger="hover" title="扫码在手机中查看" transfer> <Poptip trigger="hover" title="扫码在手机中查看" transfer>
<div slot="content"> <div slot="content">
<vue-qr :text="wapLinkTo(row.id,row.skuId)" :margin="0" colorDark="#000" colorLight="#fff" <vue-qr :text="wapLinkTo(row.id,row.skuId)" :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
:size="150"></vue-qr>
</div> </div>
<img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt=""> <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
</Poptip> </Poptip>
@ -67,15 +66,21 @@
</Table> </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" <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-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>
</Row> </Row>
</Card> </Card>
<Modal title="更新库存" v-model="updateStockModalVisible" :mask-closable="false" :width="500"> <Modal title="更新库存" v-model="updateStockModalVisible" :mask-closable="false" :width="500">
<Input type="number" v-model="stockAllUpdate" placeholder="全部修改，如不需全部修改，则不需输入"/> <Tabs value="updateStock">
<Table :columns="updateStockColumns" :data="stockList" border :span-method="handleSpan"></Table> <TabPane label="手动规格更新" name="updateStock">
<Table :columns="updateStockColumns" :data="stockList" border :span-method="handleSpan"></Table>
</TabPane>
<TabPane label="批量规格更新" name="stockAll">
<Input type="number" v-model="stockAllUpdate" placeholder="统一规格修改" />
</TabPane>
</Tabs>
<div slot="footer"> <div slot="footer">
<Button type="text" @click="updateStockModalVisible = false">取消</Button> <Button type="text" @click="updateStockModalVisible = false">取消</Button>
<Button type="primary" @click="updateStock">更新</Button> <Button type="primary" @click="updateStock">更新</Button>
@ -86,8 +91,7 @@
<Modal title="批量设置运费模板" v-model="shipTemplateModal" :mask-closable="false" :width="500"> <Modal title="批量设置运费模板" v-model="shipTemplateModal" :mask-closable="false" :width="500">
<Form ref="shipTemplateForm" :model="shipTemplateForm" :label-width="120"> <Form ref="shipTemplateForm" :model="shipTemplateForm" :label-width="120">
<FormItem class="form-item-view-el" label="运费" prop="freightPayer"> <FormItem class="form-item-view-el" label="运费" prop="freightPayer">
<RadioGroup type="button" button-style="solid" @on-change="logisticsTemplateUndertakerChange" <RadioGroup type="button" button-style="solid" @on-change="logisticsTemplateUndertakerChange" v-model="shipTemplateForm.freightPayer">
v-model="shipTemplateForm.freightPayer">
<Radio label="STORE"> <Radio label="STORE">
<span>卖家承担运费</span> <span>卖家承担运费</span>
</Radio> </Radio>
@ -259,9 +263,9 @@ export default {
key: "goodsType", key: "goodsType",
width: 130, width: 130,
render: (h, params) => { render: (h, params) => {
if (params.row.goodsType === 'PHYSICAL_GOODS') { if (params.row.goodsType === "PHYSICAL_GOODS") {
return h("div", "实物商品"); return h("div", "实物商品");
} else if (params.row.goodsType === 'VIRTUAL_GOODS') { } else if (params.row.goodsType === "VIRTUAL_GOODS") {
return h("div", "虚拟商品"); return h("div", "虚拟商品");
} else { } else {
return h("div", "电子卡券"); return h("div", "电子卡券");
@ -455,10 +459,10 @@ export default {
this.getDataList(); this.getDataList();
}, },
addGoods() { addGoods() {
this.$router.push({name: "goods-operation"}); this.$router.push({ name: "goods-operation" });
}, },
editGoods(v) { editGoods(v) {
this.$router.push({name: "goods-operation-edit", query: {id: v.id}}); this.$router.push({ name: "goods-operation-edit", query: { id: v.id } });
}, },
//批量操作 //批量操作
@ -481,7 +485,7 @@ export default {
} }
}, },
getStockDetail(id) { getStockDetail(id) {
getGoodsSkuListDataSeller({goodsId: id, pageSize: 1000}).then((res) => { getGoodsSkuListDataSeller({ goodsId: id, pageSize: 1000 }).then((res) => {
if (res.success) { if (res.success) {
this.updateStockModalVisible = true; this.updateStockModalVisible = true;
this.stockAllUpdate = undefined; this.stockAllUpdate = undefined;
@ -491,7 +495,7 @@ export default {
}, },
updateStock() { updateStock() {
let updateStockList = this.stockList.map((i) => { let updateStockList = this.stockList.map((i) => {
let j = {skuId: i.id, quantity: i.quantity}; let j = { skuId: i.id, quantity: i.quantity };
if (this.stockAllUpdate) { if (this.stockAllUpdate) {
j.quantity = this.stockAllUpdate; j.quantity = this.stockAllUpdate;
} }

2
seller/src/views/login.vue
View File

@ -162,7 +162,7 @@ export default {
} }
.login { .login {
height: 100%; height: 100%;
background: url("../assets/background.svg") no-repeat; background: url("../assets/background.png") no-repeat;
background-size: 100%; background-size: 100%;
background-position-y: bottom; background-position-y: bottom;
background-color: #edf0f3; background-color: #edf0f3;

8
seller/src/views/main-components/footer.vue
View File

@ -1,14 +1,14 @@
<template> <template>
<div class="foot"> <div class="foot">
<Row type="flex" justify="space-around" class="help"> <Row type="flex" justify="space-around" class="help">
<a class="item" href="https://lilishop.com" target="_blank">{{ $t('help') }}</a> <a class="item" href="https://pickmall.cn/" target="_blank">{{ $t('help') }}</a>
<a class="item" href="https://lilishop.com" target="_blank">{{ $t('privacy') }}</a> <a class="item" href="https://pickmall.cn/" target="_blank">{{ $t('privacy') }}</a>
<a class="item" href="https://lilishop.com" target="_blank">{{ $t('terms') }}</a> <a class="item" href="https://pickmall.cn/" target="_blank">{{ $t('terms') }}</a>
</Row> </Row>
<Row type="flex" justify="center" class="copyright"> <Row type="flex" justify="center" class="copyright">
Copyright © 2020 - Present Copyright © 2020 - Present
<a <a
href="http://lili.cn" href="https://pickmall.cn/"
target="_blank" target="_blank"
style="margin:0 5px;" style="margin:0 5px;"
>lili-shop</a> {{ $t('rights') }} >lili-shop</a> {{ $t('rights') }}

7
seller/src/views/order/order/orderList.vue
View File

@ -53,8 +53,8 @@ export default {
// 搜索框初始化对象 // 搜索框初始化对象
pageNumber: 1, // 当前页数 pageNumber: 1, // 当前页数
pageSize: 10, // 页面大小 pageSize: 10, // 页面大小
sort: "createTime", // 默认排序字段 sort: "", // 默认排序字段
order: "desc", // 默认排序方式 order: "", // 默认排序方式
startDate: "", // 起始时间 startDate: "", // 起始时间
endDate: "", // 终止时间 endDate: "", // 终止时间
orderSn: "", orderSn: "",
@ -146,8 +146,7 @@ export default {
title: "下单时间", title: "下单时间",
key: "createTime", key: "createTime",
width: 170, width: 170,
sortable: true,
sortType: "desc",
}, },
{ {

5
seller/src/views/order/order/virtualOrderList.vue
View File

@ -69,7 +69,7 @@ export default {
orderSn: "", orderSn: "",
buyerName: "", buyerName: "",
orderStatus: "", orderStatus: "",
orderType:"VIRTUAL" orderType: "VIRTUAL",
}, },
selectDate: null, selectDate: null,
form: { form: {
@ -200,8 +200,6 @@ export default {
let result = await verificationCode(this.orderCode); let result = await verificationCode(this.orderCode);
if (result.success) { if (result.success) {
this.$router.push({ this.$router.push({
name: "order-detail", name: "order-detail",
query: { sn: result.result.sn || this.orderCode }, query: { sn: result.result.sn || this.orderCode },
@ -228,6 +226,7 @@ export default {
this.searchForm = {}; this.searchForm = {};
this.searchForm.pageNumber = 1; this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10; this.searchForm.pageSize = 10;
this.searchForm.orderType = "VIRTUAL";
this.selectDate = null; this.selectDate = null;
this.searchForm.startDate = ""; this.searchForm.startDate = "";
this.searchForm.endDate = ""; this.searchForm.endDate = "";

500
seller/src/views/order/receiptManager/receipt.vue
View File

@ -2,39 +2,15 @@
<div class="search"> <div class="search">
<Card> <Card>
<Row @keydown.enter.native="handleSearch"> <Row @keydown.enter.native="handleSearch">
<Form <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
ref="searchForm"
:model="searchForm"
inline
:label-width="70"
class="search-form"
>
<Form-item label="订单编号" prop="orderSn"> <Form-item label="订单编号" prop="orderSn">
<Input <Input type="text" v-model="searchForm.orderSn" clearable placeholder="请输入订单编号" style="width: 200px" />
type="text"
v-model="searchForm.orderSn"
clearable
placeholder="请输入订单编号"
style="width: 200px"
/>
</Form-item> </Form-item>
<Form-item label="会员名称" prop="memberName"> <Form-item label="会员名称" prop="memberName">
<Input <Input type="text" v-model="searchForm.memberName" clearable placeholder="请输入会员名称" style="width: 200px" />
type="text"
v-model="searchForm.memberName"
clearable
placeholder="请输入会员名称"
style="width: 200px"
/>
</Form-item> </Form-item>
<Form-item label="发票抬头" prop="receiptTitle"> <Form-item label="发票抬头" prop="receiptTitle">
<Input <Input type="text" v-model="searchForm.receiptTitle" clearable placeholder="请输入发票抬头" style="width: 200px" />
type="text"
v-model="searchForm.receiptTitle"
clearable
placeholder="请输入发票抬头"
style="width: 200px"
/>
</Form-item> </Form-item>
<Form-item label="状态" prop="receiptStatus"> <Form-item label="状态" prop="receiptStatus">
<Select v-model="searchForm.receiptStatus" placeholder="请选择" clearable style="width: 200px"> <Select v-model="searchForm.receiptStatus" placeholder="请选择" clearable style="width: 200px">
@ -46,275 +22,261 @@
<Button @click="handleReset" class="search-btn">重置</Button> <Button @click="handleReset" class="search-btn">重置</Button>
</Form> </Form>
</Row> </Row>
<Table <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
: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 <a @click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
@click="$router.push({name: 'order-detail',query: {sn: scope.row.orderSn}})">{{scope.row.orderSn}}</a>
</template> </template>
</Table> </Table>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">
<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"
:current="searchForm.pageNumber" show-total show-elevator show-sizer></Page>
: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>
</Row> </Row>
</Card> </Card>
</div> </div>
</template> </template>
<script> <script>
import * as API_Order from "@/api/order"; import * as API_Order from "@/api/order";
export default { export default {
name: "storeBill", name: "storeBill",
components: {}, components: {},
data() { data() {
return { return {
loading: true, // 表单加载状态 loading: true, // 表单加载状态
searchForm: { searchForm: {
// 搜索框初始化对象 // 搜索框初始化对象
pageNumber: 1, // 当前页数 pageNumber: 1, // 当前页数
pageSize: 10, // 页面大小 pageSize: 10, // 页面大小
sort: "createTime", // 默认排序字段 sort: "createTime", // 默认排序字段
order: "desc", // 默认排序方式 order: "desc", // 默认排序方式
receiptStatus: "", // 起始时间 receiptStatus: "", // 起始时间
},
form: {
// 添加或编辑表单对象初始化数据
sn: "",
sellerName: "",
startTime: "",
endTime: "",
billPrice: "",
},
// 表单验证规则
formValidate: {},
submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据
selectCount: 0, // 多选计数
columns: [
{
title: "订单号",
key: "orderSn",
minWidth: 120,
slot: "orderSlot",
}, },
form: { {
// 添加或编辑表单对象初始化数据 title: "会员名称",
sn: "", key: "memberName",
sellerName: "", minWidth: 90,
startTime: "", tooltip: true,
endTime: "",
billPrice: "",
}, },
// 表单验证规则
formValidate: {},
submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据
selectCount: 0, // 多选计数
columns: [
{
title: "订单号",
key: "orderSn",
minWidth: 120,
slot: "orderSlot",
},
{
title: "会员名称",
key: "memberName",
minWidth: 90,
tooltip: true
},
{ {
title: "发票抬头", title: "发票抬头",
key: "receiptTitle", key: "receiptTitle",
minWidth: 90, minWidth: 90,
tooltip: true tooltip: true,
render: (h, params) => {
return h("div", params.row.receiptTitle || "暂未填写");
}, },
{ },
title: "纳税人识别号", {
key: "taxpayerId", title: "纳税人识别号",
minWidth: 100, key: "taxpayerId",
tooltip: true minWidth: 100,
tooltip: true,
render: (h, params) => {
return h("div", params.row.taxpayerId || "暂未填写");
}, },
{ },
title: "发票内容", {
key: "receiptContent", title: "发票内容",
minWidth: 120, key: "receiptContent",
tooltip: true minWidth: 120,
tooltip: true,
render: (h, params) => {
return h("div", params.row.receiptContent || "暂未填写");
}, },
{ },
title: "发票金额", {
key: "billPrice", title: "发票金额",
width: 90, key: "billPrice",
render: (h, params) => { width: 150,
return h( render: (h, params) => {
"div", return h(
this.$options.filters.unitPrice(params.row.receiptPrice, "￥") "div",
); this.$options.filters.unitPrice(params.row.receiptPrice, "￥")
}, );
}, },
{ },
title: "发票状态", {
key: "receiptStatus", title: "发票状态",
width: 90, key: "receiptStatus",
tooltip: true, width: 90,
render: (h, params) => { tooltip: true,
if(params.row.receiptStatus == 0){ render: (h, params) => {
return h( if (params.row.receiptStatus == 0) {
"div", return h("div", "未开票");
"未开票" } else {
); return h("div", "已开票");
}else{
return h(
"div",
"已开票"
);
}
},
},
{
title: "订单状态",
key: "orderStatus",
width: 90,
render: (h, params) => {
if (params.row.orderStatus == "UNPAID") {
return h('div', [h('span', { }, '未付款'),]);
} else if (params.row.orderStatus == "PAID") {
return h('div', [h('span', { }, '已付款'),]);
} else if (params.row.orderStatus == "UNDELIVERED") {
return h('div', [h('span', { }, '待发货'),]);
}else if (params.row.orderStatus == "DELIVERED") {
return h('div', [h('span', { }, '已发货'),]);
}else if (params.row.orderStatus == "COMPLETED") {
return h('div', [h('span', { }, '已完成'),]);
}else if (params.row.orderStatus == "TAKE") {
return h('div', [h('span', { }, '待核验'),]);
}else if (params.row.orderStatus == "CANCELLED") {
return h('div', [h('span', { }, '已取消'),]);
}
} }
}, },
{ },
title: "操作", {
key: "action", title: "订单状态",
align: "center", key: "orderStatus",
width: 80, width: 90,
render: (h, params) => { render: (h, params) => {
return h("div", [ if (params.row.orderStatus == "UNPAID") {
h( return h("div", [h("span", {}, "未付款")]);
"Button", } else if (params.row.orderStatus == "PAID") {
{ return h("div", [h("span", {}, "已付款")]);
props: { } else if (params.row.orderStatus == "UNDELIVERED") {
type: "info", return h("div", [h("span", {}, "待发货")]);
size: "small", } else if (params.row.orderStatus == "DELIVERED") {
}, return h("div", [h("span", {}, "已发货")]);
attrs: { } else if (params.row.orderStatus == "COMPLETED") {
disabled: params.row.orderStatus == "COMPLETED" && params.row.receiptStatus == 0? false : true, return h("div", [h("span", {}, "已完成")]);
}, } else if (params.row.orderStatus == "TAKE") {
style: { return h("div", [h("span", {}, "待核验")]);
marginRight: "5px", } else if (params.row.orderStatus == "CANCELLED") {
}, return h("div", [h("span", {}, "已取消")]);
on: { }
click: () => { },
this.invoicing(params.row); },
}, {
title: "操作",
key: "action",
align: "center",
width: 80,
render: (h, params) => {
return h("div", [
h(
"Button",
{
props: {
type: "info",
size: "small",
},
attrs: {
disabled:
params.row.orderStatus == "COMPLETED" &&
params.row.receiptStatus == 0
? false
: true,
},
style: {
marginRight: "5px",
},
on: {
click: () => {
this.invoicing(params.row);
}, },
}, },
"开票" },
), "开票"
]); ),
}, ]);
}, },
], },
data: [], // 表单数据 ],
total: 0, // 表单数据总数 data: [], // 表单数据
}; total: 0, // 表单数据总数
};
},
methods: {
init() {
this.getData();
}, },
methods: { changePage(v) {
init() { this.searchForm.pageNumber = v;
this.getData(); this.getData();
}, this.clearSelectAll();
changePage(v) { },
this.searchForm.pageNumber = v; changePageSize(v) {
this.getData(); this.searchForm.pageSize = v;
this.clearSelectAll(); this.getData();
}, },
changePageSize(v) { handleSearch() {
this.searchForm.pageSize = v; this.searchForm.pageNumber = 1;
this.getData(); this.searchForm.pageSize = 10;
}, this.getData();
handleSearch() { },
this.searchForm.pageNumber = 1; handleReset() {
this.searchForm.pageSize = 10; this.searchForm = {};
this.getData(); this.searchForm.pageNumber = 1;
}, this.searchForm.pageSize = 10;
handleReset() { this.getData();
this.searchForm = {} },
this.searchForm.pageNumber = 1; changeSort(e) {
this.searchForm.pageSize = 10; this.searchForm.sort = e.key;
this.getData(); this.searchForm.order = e.order;
}, if (e.order === "normal") {
changeSort(e) { this.searchForm.order = "";
this.searchForm.sort = e.key; }
this.searchForm.order = e.order; this.getData();
if (e.order === "normal") { },
this.searchForm.order = ""; clearSelectAll() {
} this.$refs.table.selectAll(false);
this.getData(); },
}, changeSelect(e) {
clearSelectAll() { this.selectList = e;
this.$refs.table.selectAll(false); this.selectCount = e.length;
}, },
changeSelect(e) { selectDateRange(v) {
this.selectList = e; if (v) {
this.selectCount = e.length; this.searchForm.startDate = v[0];
}, this.searchForm.endDate = v[1];
selectDateRange(v) { }
if (v) { },
this.searchForm.startDate = v[0]; getData() {
this.searchForm.endDate = v[1]; this.loading = true;
} API_Order.getReceiptPage(this.searchForm).then((res) => {
},
getData() {
this.loading = true;
API_Order.getReceiptPage(this.searchForm).then((res) => {
this.loading = false;
if (res.success) {
this.data = res.result.records;
this.total = res.result.total;
}
});
this.total = this.data.length;
this.loading = false; this.loading = false;
}, if (res.success) {
//开发票 this.data = res.result.records;
invoicing(params){ this.total = res.result.total;
this.$Modal.confirm({ }
title: "确认开票", });
content: "您确认已经开具发票 ?", this.total = this.data.length;
loading: true, this.loading = false;
onOk: () => {
API_Order.invoicing(params.id).then((res) => {
if (res.success) {
this.$Message.success("开票成功");
}
this.$Modal.remove();
this.getData();
});
}
});
},
}, },
activated() { //开发票
this.init(); invoicing(params) {
this.$Modal.confirm({
title: "确认开票",
content: "您确认已经开具发票 ?",
loading: true,
onOk: () => {
API_Order.invoicing(params.id).then((res) => {
if (res.success) {
this.$Message.success("开票成功");
}
this.$Modal.remove();
this.getData();
});
},
});
}, },
}; },
mounted() {
this.init();
},
activated() {
this.init();
},
};
</script> </script>
<style lang="scss"> <style lang="scss">
// 建议引入通用样式 可删除下面样式代码 // 建议引入通用样式 可删除下面样式代码
@import "@/styles/table-common.scss"; @import "@/styles/table-common.scss";
</style> </style>

4
seller/src/views/promotion/live/addLive.vue
View File

@ -517,7 +517,7 @@ export default {
if (res.success) { if (res.success) {
this.$Message.success("修改成功!"); this.$Message.success("修改成功!");
this.$router.push({ path: "/storePromotion/live" }); this.$router.push({ path: "/promotion/live" });
} }
this.spinShow = false; this.spinShow = false;
}); });
@ -528,7 +528,7 @@ export default {
if (res.success) { if (res.success) {
this.$Message.success("添加成功!"); this.$Message.success("添加成功!");
this.$router.push({ path: "/storePromotion/live" }); this.$router.push({ path: "/promotion/live" });
} }
this.spinShow = false; this.spinShow = false;
}); });

34
seller/src/views/promotion/pintuan/pintuan.scss
View File

@ -1,41 +1,11 @@
.search { .search {
.operation { .operation {
margin-bottom: 2vh; margin-bottom: 2vh;
} }
.select-count {
font-weight: 600;
color: #40a9ff;
}
.select-clear {
margin-left: 10px;
}
.page { .page {
margin-top: 2vh; margin-top: 2vh;
} }
.drop-down {
margin-left: 5px;
}
} }
.row {
.newPromotionView { margin-bottom: 5px;
width: 80%;
flex-direction: column;
align-items: center;
justify-content: center;
Input {
flex-direction: row;
}
.slotSpan {
flex-direction: column;
align-items: center;
justify-content: center;
}
} }

2
seller/src/views/promotion/pintuan/pintuan.vue
View File

@ -52,6 +52,7 @@
@on-selection-change="changeSelect" @on-selection-change="changeSelect"
> >
<template slot-scope="{ row }" slot="action"> <template slot-scope="{ row }" slot="action">
<div class="row">
<Button <Button
type="primary" type="primary"
size="small" size="small"
@ -97,6 +98,7 @@
@click="close(row)" @click="close(row)"
>关闭</Button >关闭</Button
> >
</div>
</template> </template>
</Table> </Table>
<Row type="flex" justify="end" class="page"> <Row type="flex" justify="end" class="page">