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

修改一些bug完善，新增app更新新功能

master
lemon橪 2021-05-21 16:45:47 +08:00
parent 38dc952a07
commit 41093b2032
14 changed files with 633 additions and 470 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,10 +17,10 @@ export default {
* @description api请求基础路径
*/
api_dev: {
common: 'http://192.168.0.103:8890/',
common: 'https://common-api.pickmall.cn',
buyer: 'https://buyer-api.pickmall.cn',
seller: 'https://store-api.pickmall.cn',
manager: 'http://192.168.0.103:8887'
manager: 'https://admin-api.pickmall.cn'
},
api_prod: {
common: 'https://common-api.pickmall.cn',

3
manager/src/views/distribution/distributionOrder.vue
View File

@ -202,6 +202,7 @@
this.loading = false;
if (res.success) {
this.data = res.result.records;
this.total = res.result.total;
}
});
@ -239,7 +240,7 @@
}
};
</script>
<style lang="scss">
<style lang="scss" >
@import "@/styles/table-common.scss";
</style>

8
manager/src/views/member/list/index.vue
View File

@ -40,11 +40,11 @@
<FormItem label="手机号码" prop="mobile" style="width: 90%;">
<Input v-model="addMemberForm.mobile" maxlength="11" placeholder="请输入手机号码" />
</FormItem>
<FormItem label="会员名称" prop="username" style="width: 90%">
<FormItem label="会员名称" prop="uname" style="width: 90%">
<Input v-model="addMemberForm.username" maxlength="15" placeholder="请输入会员名称" />
</FormItem>
<FormItem label="会员密码" prop="password" style="width: 90%">
<FormItem label="会员密码" prop="pwd" style="width: 90%">
<Input type="password" password v-model="addMemberForm.password" maxlength="20" placeholder="请输入会员密码" />
</FormItem>
</Form>
@ -165,8 +165,8 @@ export default {
message: "请输入正确的手机号",
},
],
username: [{ required: true, message: "请输入会员名称" }],
password: [{ required: true, message: "请输入密码" }],
uname: [{ required: true, message: "请输入会员名称" }],
pwd: [{ required: true, message: "请输入密码" }],
},
ruleValidate: {}, //修改验证
submitLoading: false, // 添加或编辑提交状态

38
manager/src/views/member/list/memberDetail.vue
View File

@ -231,21 +231,21 @@
</TabPane>
<TabPane label="TA的余额" name="wallet">
<div class="pointsTitle" style="justify-content: flex-start; text-align: left;">
<div style="width: 120px;">
<div style="min-width: 120px; margin-right:20px">
<div class="points-top-title">
余额
</div>
<div class="points-top-text">
{{memberWalletInfo.memberDeposit?memberWalletInfo.memberDeposit:0 | unitPrice('￥')}}
{{memberWalletInfo.memberWallet?memberWalletInfo.memberWallet:0 | unitPrice('￥')}}
</div>
</div>
<div style="width: 120px;">
<div style="min-width: 120px;">
<div class="points-top-title">
冻结余额
</div>
<div class="points-top-text">
{{memberWalletInfo.frozenDeposit?memberWalletInfo.frozenDeposit:0 | unitPrice('￥')}}
{{memberWalletInfo.memberFrozenWallet?memberWalletInfo.memberFrozenWallet:0 | unitPrice('￥')}}
</div>
</div>
</div>
@ -750,23 +750,23 @@
minWidth: 120,
},
{
title: "业务类型",
key: "serviceType",
width: 150,
render: (h, params) => {
if (params.row.serviceType == "BALANCE_WITHDRAWAL") {
return h('div', [h('span', {}, '余额提现'),]);
} else if (params.row.serviceType == "BALANCE_PAY") {
return h('div', [h('span', {}, '余额支付'),]);
} else if (params.row.serviceType == "BALANCE_REFUND") {
return h('div', [h('span', {}, '余额退款'),]);
} else if (params.row.serviceType == "BALANCE_RECHARGE") {
return h('div', [h('span', {}, '余额充值'),]);
} else if (params.row.serviceType == "BALANCE_COMMISSION") {
return h('div', [h('span', {}, '佣金提成'),]);
}
title: "业务类型",
key: "serviceType",
width: 200,
render: (h, params) => {
if (params.row.serviceType == "WALLET_WITHDRAWAL") {
return h("div", [h("span", {}, "余额提现")]);
} else if (params.row.serviceType == "WALLET_PAY") {
return h("div", [h("span", {}, "余额支付")]);
} else if (params.row.serviceType == "WALLET_REFUND") {
return h("div", [h("span", {}, "余额退款")]);
} else if (params.row.serviceType == "WALLET_RECHARGE") {
return h("div", [h("span", {}, "余额充值")]);
} else {
return h("div", [h("span", {}, "佣金提成")]);
}
},
},
{
title: "变动金额",
key: "money",

2
manager/src/views/order/after-order/afterSaleOrder.vue
View File

@ -29,10 +29,8 @@
<Option value="PASS">通过售后</Option>
<Option value="REFUSE">拒绝售后</Option>
<Option value="BUYER_RETURN">买家退货，待卖家收货</Option>
<Option value="SELLER_RE_DELIVERY">商家换货/补发</Option>
<Option value="SELLER_CONFIRM">卖家确认收货</Option>
<Option value="SELLER_TERMINATION">卖家终止售后</Option>
<Option value="BUYER_CONFIRM">买家确认收货</Option>
<Option value="BUYER_CANCEL">买家取消售后</Option>
<Option value="COMPLETE">完成售后</Option>
</Select>

17
manager/src/views/order/order/orderList.vue
View File

@ -93,6 +93,20 @@ export default {
title: "订单来源",
key: "clientType",
width: 95,
render: (h, params) => {
if (params.row.clientType == "H5") {
return h("div",{},"移动端");
}else if(params.row.clientType == "PC") {
return h("div",{},"PC端");
}else if(params.row.clientType == "WECHAT_MP") {
return h("div",{},"小程序端");
}else if(params.row.clientType == "APP") {
return h("div",{},"移动应用端");
}
else{
return h("div",{},params.row.clientType);
}
},
},
{
title: "买家名称",
@ -251,7 +265,8 @@ export default {
confirmPrice(v) {
this.$Modal.confirm({
title: "提示",
content: "<p>您确定要收款吗？线下收款涉及库存变更，需异步进行，等待约一分钟刷新列表查看</p>",
content:
"<p>您确定要收款吗？线下收款涉及库存变更，需异步进行，等待约一分钟刷新列表查看</p>",
onOk: () => {
API_Order.orderPay(v.sn).then((res) => {
if (res.success) {

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

@ -41,38 +41,38 @@
</Page>
</Row>
<Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="1100">
<Form ref="form" :model="form" :label-width="100">
<FormItem label="文章标题" prop="title">
<Input v-model="form.title" clearable style="width: 40%" />
</FormItem>
<FormItem label="文章分类" prop="categoryId">
<Select v-model="treeValue" placeholder="请选择" clearable style="width: 180px">
<Option :value="treeValue" style="display: none">{{
<Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="1100">
<Form ref="form" :model="form" :label-width="100">
<FormItem label="文章标题" prop="title">
<Input v-model="form.title" clearable style="width: 40%" />
</FormItem>
<FormItem label="文章分类" prop="categoryId">
<Select v-model="treeValue" placeholder="请选择" clearable style="width: 180px">
<Option :value="treeValue" style="display: none">{{
treeValue
}}
</Option>
<Tree :data="treeData" @on-select-change="handleCheckChange"></Tree>
</Select>
</FormItem>
<FormItem label="文章排序" prop="sort">
<Input type="number" v-model="form.sort" clearable style="width: 10%" />
</FormItem>
<FormItem class="form-item-view-el" label="文章内容" prop="content">
<editor v-model="form.content"></editor>
</FormItem>
<FormItem label="是否展示" prop="openStatus">
<i-switch size="large" v-model="form.openStatus" :true-value="open" :false-value="close">
<span slot="open">展示</span>
<span slot="close">隐藏</span>
</i-switch>
</FormItem>
</Form>
<div slot="footer">
<Button type="text" @click="modalVisible = false">取消</Button>
<Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
</div>
</Modal>
</Option>
<Tree :data="treeData" @on-select-change="handleCheckChange"></Tree>
</Select>
</FormItem>
<FormItem label="文章排序" prop="sort">
<Input type="number" v-model="form.sort" clearable style="width: 10%" />
</FormItem>
<FormItem class="form-item-view-el" label="文章内容" prop="content">
<editor v-model="form.content"></editor>
</FormItem>
<FormItem label="是否展示" prop="openStatus">
<i-switch size="large" v-model="form.openStatus" :true-value="open" :false-value="close">
<span slot="open">展示</span>
<span slot="close">隐藏</span>
</i-switch>
</FormItem>
</Form>
<div slot="footer">
<Button type="text" @click="modalVisible = false">取消</Button>
<Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
</div>
</Modal>
</Card>
</Col>
@ -123,6 +123,7 @@ export default {
searchTreeValue: "", // 切换
form: {
// 添加或编辑表单对象初始化数据
openStatus:false,
title: "",
categoryId: "",
sort: 1,
@ -347,7 +348,7 @@ export default {
level: 0,
children: [],
id: "0",
categoryId: 0
categoryId: 0,
});
}
});
@ -379,13 +380,7 @@ export default {
//为了在是否展示一列展示开关 需要改一下数据类型，最终提交再次更改
this.data = [];
if (res.result.records.length > 0) {
res.result.records.forEach((item) => {
if (item.openStatus == "OPEN") {
item.openStatus = true;
} else {
item.openStatus = false;
}
})
this.data = res.result.records;
}
}
@ -395,11 +390,7 @@ export default {
},
handleSubmit() {
if (this.form.openStatus) {
this.form.openStatus = "OPEN";
} else {
this.form.openStatus = "CLOSE";
}
this.$refs.form.validate((valid) => {
if (valid) {
this.submitLoading = true;
@ -412,6 +403,7 @@ export default {
this.$Message.success("操作成功");
this.getDataList();
this.modalVisible = false;
}
});
} else {
@ -422,6 +414,8 @@ export default {
this.$Message.success("操作成功");
this.getDataList();
this.modalVisible = false;
}
});
}
@ -449,11 +443,7 @@ export default {
this.form.content = res.result.content;
this.form.title = res.result.title;
this.form.sort = res.result.sort;
if (res.result.openStatus == "OPEN") {
this.form.openStatus = true;
} else {
this.form.openStatus = false;
}
this.form.openStatus = res.result.openStatus
}
});
},

13
manager/src/views/promotion/pointsGoodsCategory/pointsGoodsCategory.vue
View File

@ -17,16 +17,9 @@
primary-key="id"
>
<template slot="action" slot-scope="scope">
<Dropdown transfer="true" trigger="click">
<Button type="primary" size="small">
操作
<Icon type="ios-arrow-down"></Icon>
</Button>
<DropdownMenu slot="list">
<DropdownItem @click.native="edit(scope.row)">编辑</DropdownItem>
<DropdownItem @click.native="remove(scope.row)">删除</DropdownItem>
</DropdownMenu>
</Dropdown>
<Button @click.native="edit(scope.row)" style="margin-right:10px;" size="small">编辑</Button>
<Button @click.native="remove(scope.row)" type="primary" size="small">删除</Button>
</template>
</tree-table>

1
manager/src/views/seller/bill/accountStatementBill.vue
View File

@ -12,6 +12,7 @@
<DatePicker v-model="selectDate" type="daterange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px">
</DatePicker>
</Form-item>
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
</Form>
</Row>

50
manager/src/views/seller/bill/bill.vue
View File

@ -6,18 +6,20 @@
<Row @keydown.enter.native="handleSearch">
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
<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 label="出帐时间" prop="createTime">
<DatePicker v-model="selectDate" type="daterange" format="yyyy-MM-dd HH:mm:ss" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px">
</DatePicker>
</Form-item>
<Form-item label="筛选状态">
<Select v-model="searchForm.billStatus" style="width:160px">
<Option value="">全部</Option>
<Option value="OUT">已出账</Option>
<Option value="CHECK">已核对</Option>
<Option value="COMPLETE">已完成</Option>
</Select>
</Form-item>
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
</Form>
</Row>
@ -26,14 +28,11 @@
<Button @click="delAll">批量删除</Button>
</Row>
<Row>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
@on-sort-change="changeSort"
@on-selection-change="changeSelect">
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
</Table>
</Row>
<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]"
<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>
</Row>
</Card>
@ -88,6 +87,7 @@ export default {
order: "desc", // 默认排序方式
startDate: "", // 起始时间
endDate: "", // 终止时间
billStatus:"" //状态
},
selectDate: null, // 选择一个时间段
form: {
@ -114,7 +114,7 @@ export default {
title: "账单号",
key: "sn",
minWidth: 200,
tooltip: true
tooltip: true,
},
{
title: "生成时间",
@ -126,14 +126,14 @@ export default {
key: "startTime",
width: 200,
render: (h, params) => {
return h('div', params.row.startTime +"~"+params.row.endTime)
}
return h("div", params.row.startTime + "~" + params.row.endTime);
},
},
{
title: "店铺名称",
key: "storeName",
minWidth: 120,
tooltip: true
tooltip: true,
},
{
@ -152,16 +152,16 @@ export default {
key: "billStatus",
width: 100,
render: (h, params) => {
if(params.row.billStatus == 'OUT'){
return h('div', '已出账')
} else if (params.row.billStatus == 'CHECK') {
return h('div', '已对账')
} else if (params.row.billStatus == 'EXAMINE') {
return h('div', '已审核')
}else{
return h('div', '已付款')
if (params.row.billStatus == "OUT") {
return h("div", "已出账");
} else if (params.row.billStatus == "CHECK") {
return h("div", "已对账");
} else if (params.row.billStatus == "EXAMINE") {
return h("div", "已审核");
} else {
return h("div", "已付款");
}
}
},
},
{
title: "操作",

663
manager/src/views/sys/app-version/appVersion.vue
View File

@ -2,84 +2,46 @@
<div class="search">
<Row>
<Col>
<Card>
<Row @keydown.enter.native="handleSearch">
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
<Form-item label="系统类型" prop="orderSn">
<Select
v-model="searchForm.type"
placeholder="请选择系统类型"
clearable
style="width: 200px"
>
<Option value="IOS">苹果</Option>
<Option value="ANDROID">安卓</Option>
</Select>
</Form-item>
<Form-item style="margin-left:-35px;" class="br">
<Button @click="handleSearch" type="primary" icon="ios-search">搜索</Button>
</Form-item>
</Form>
</Row>
<Row class="operation" style="margin-top: 20px">
<Button @click="addAppVersion" type="primary">添加</Button>
</Row>
<Row class="padding-row">
<Table
:loading="loading"
border
:columns="columns"
:data="data"
ref="table"
sortable="custom"
@on-sort-change="changeSort"
@on-selection-change="changeSelect"
></Table>
</Row>
<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"
show-total
show-elevator
show-sizer
></Page>
</Row>
</Card>
<Card>
<Row @keydown.enter.native="handleSearch">
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
<Form-item label="系统类型" prop="orderSn">
<Select v-model="searchForm.type" placeholder="请选择系统类型" clearable style="width: 200px">
<Option value="IOS">苹果</Option>
<Option value="ANDROID">安卓</Option>
</Select>
</Form-item>
<Button @click="handleSearch" type="primary" icon="ios-search">搜索</Button>
</Form>
</Row>
<Row class="operation" style="margin-top: 20px">
<Button @click="addAppVersion" type="primary">添加</Button>
</Row>
<Row class="padding-row">
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
</Row>
<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" show-total show-elevator show-sizer></Page>
</Row>
</Card>
</Col>
</Row>
<Modal
:title="modalTitle"
v-model="modalVisible"
:mask-closable="false"
:width="1000"
>
<Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="1000">
<Form ref="form" :model="form" :label-width="100" :rules="formValidate">
<FormItem label="版本名称" prop="versionName">
<Input v-model="form.versionName" maxlength="15" clearable style="width: 40%"/>
<Input v-model="form.versionName" maxlength="15" clearable style="width: 40%" />
</FormItem>
<FormItem label="版本号" prop="version">
<Input v-model="form.version" maxlength="15" clearable style="width: 40%"/>
<Input v-model="form.version" maxlength="15" clearable style="width: 40%" />
</FormItem>
<FormItem label="更新时间" prop="versionUpdateDate">
<DatePicker
v-model="form.versionUpdateDate"
type="datetime"
format="yyyy-MM-dd HH:mm:ss"
clearable
placeholder="请选择"
style="width: 200px"
></DatePicker>
<DatePicker v-model="form.versionUpdateDate" type="datetime" format="yyyy-MM-dd HH:mm:ss" clearable placeholder="请选择" style="width: 200px"></DatePicker>
</FormItem>
<FormItem label="强制更新">
<RadioGroup type="button" button-style="solid" v-model="form.forceUpdate">
<Radio label="1">强制更新</Radio>
<Radio label="0">非强制更新</Radio>
<Radio :label="true">强制更新</Radio>
<Radio :label="false">非强制更新</Radio>
</RadioGroup>
</FormItem>
<FormItem label="类型">
@ -89,10 +51,10 @@
</RadioGroup>
</FormItem>
<FormItem label="下载地址" prop="downloadUrl">
<Input v-model="form.downloadUrl" maxlength="100" clearable style="width: 40%"/>
<Input v-model="form.downloadUrl" maxlength="100" clearable style="width: 40%" />
</FormItem>
<FormItem class="form-item-view-el" label="更新内容" prop="content">
<editor v-model="form.content"></editor>
<Input v-model="form.content" :rows="6" maxlength="100" show-word-limit type="textarea" placeholder="Enter something..." />
</FormItem>
</Form>
<div slot="footer">
@ -102,11 +64,7 @@
</Modal>
<div>
<!-- 查看版本信息 -->
<Modal
:title="queryModalTitle"
v-model="queryModalVisible"
:width="700"
>
<Modal :title="queryModalTitle" v-model="queryModalVisible" :width="700">
<Form>
<div class="div-version">
<FormItem label="版本名称:">
@ -150,315 +108,308 @@
</template>
<script>
import * as API_Setting from "@/api/setting";
import editor from "@/views/my-components/lili/editor";
import * as API_Setting from "@/api/setting";
export default {
name: "orderList",
components: {
export default {
name: "orderList",
components: {
editor
},
data() {
return {
queryModalVisible: false, // 版本信息modal
queryModalTitle: "查看更新信息", // modal标题
loading: true, // 表单加载状态
modalVisible: false, // 添加app版本模态框
modalTitle: "", // 添加app版本标题
modalType: 0, // 新增、编辑标识
searchForm: {
// 搜索框初始化对象
pageNumber: 1, // 当前页数
pageSize: 10, // 页面大小
sort: "createTime", // 默认排序字段
order: "desc", // 默认排序方式
type: ""
},
data() {
return {
queryModalVisible: false, // 版本信息modal
queryModalTitle: "查看更新信息", // modal标题
loading: true, // 表单加载状态
modalVisible: false, // 添加app版本模态框
modalTitle: "", // 添加app版本标题
modalType: 0, // 新增、编辑标识
searchForm: {
// 搜索框初始化对象
pageNumber: 1, // 当前页数
pageSize: 10, // 页面大小
sort: "createTime", // 默认排序字段
order: "desc", // 默认排序方式
type: "",
},
form: {
// 添加或编辑表单对象初始化数据
versionName: "",
version: "",
forceUpdate: 1,
type: "IOS",
downloadUrl: "",
content: "",
versionUpdateDate: "",
},
versionUpdateDate: "", // 更新时间
// 表单验证规则
formValidate: {
version: [
{ required: true, message: "版本号不能为空", trigger: "blur" },
],
versionName: [
{ required: true, message: "版本名称不能为空", trigger: "blur" },
],
downloadUrl: [
{ required: true, message: "下载地址不能为空", trigger: "blur" },
],
versionUpdateDate: [{ required: true, message: "更新时间不能为空" }],
},
submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据
selectCount: 0, // 多选计数
columns: [
{
title: "版本名称",
key: "versionName",
minWidth: 100,
},
form: {
// 添加或编辑表单对象初始化数据
versionName: "",
version: "",
forceUpdate: 1,
type: "IOS",
downloadUrl: "",
content: "",
versionUpdateDate: ""
{
title: "版本号",
key: "version",
minWidth: 120,
},
versionUpdateDate: "", // 更新时间
// 表单验证规则
formValidate: {
version: [
{required: true, message: '版本号不能为空', trigger: 'blur'},
],
versionName: [
{required: true, message: '版本名称不能为空', trigger: 'blur'},
],
downloadUrl: [
{required: true, message: '下载地址不能为空', trigger: 'blur'},
],
versionUpdateDate: [{required: true, message: "更新时间不能为空"}],
},
submitLoading: false, // 添加或编辑提交状态
selectList: [], // 多选数据
selectCount: 0, // 多选计数
columns: [
{
title: "版本名称",
key: "versionName",
minWidth: 100,
{
title: "强制更新",
key: "forceUpdate",
width: 100,
render: (h, params) => {
return h(
"div",
{
props: {
color: params.row.forceUpdate ? "primary" : "default",
},
},
params.row.forceUpdate == 0 ? "非强制" : "强制"
);
},
{
title: "版本号",
key: "version",
minWidth: 120,
},
{
title: "类型",
key: "type",
minWidth: 80,
render: (h, params) => {
if (params.row.type == "IOS") {
return h("div", [h("span", {}, "苹果")]);
} else {
return h("div", [h("span", {}, "安卓")]);
}
},
{
title: "强制更新",
key: "forceUpdate",
width: 100,
render: (h, params) => {
},
return h(
"div",
{
title: "更新时间",
key: "versionUpdateDate",
minWidth: 120,
sortable: true,
},
{
title: "操作",
key: "action",
align: "center",
width: 230,
render: (h, params) => {
return h("div", [
h(
"Button",
{
props: {
color: params.row.forceUpdate ? "primary" : "default",
type: "info",
size: "small",
},
style: {
marginRight: "5px",
},
on: {
click: () => {
this.detail(params.row);
},
},
},
params.row.forceUpdate == 0 ? "非强制" : "强制"
);
"查看"
),
h(
"Button",
}
},
{
title: "类型",
key: "type",
minWidth: 80,
render: (h, params) => {
if (params.row.type == "IOS") {
return h('div', [h('span', {}, '苹果'),]);
} else {
return h('div', [h('span', {}, '安卓'),]);
}
}
},
{
title: "更新时间",
key: "versionUpdateDate",
minWidth: 120,
sortable: true,
},
{
title: "操作",
key: "action",
align: "center",
width: 230,
render: (h, params) => {
return h("div", [
h(
"Button",
{
props: {
type: "info",
size: "small",
},
style: {
marginRight: "5px",
},
on: {
click: () => {
this.detail(params.row);
},
{
props: {
type: "info",
size: "small",
ghost: true,
},
style: {
marginRight: "5px",
},
on: {
click: () => {
this.editAppVersion(params.row);
},
},
"查看"
),
h(
"Button",
{
props: {
type: "info",
size: "small",
ghost:true
},
style: {
marginRight: "5px",
},
on: {
click: () => {
this.editAppVersion(params.row);
},
},
"修改"
),
h(
"Button",
{
props: {
type: "error",
size: "small",
},
style: {
marginRight: "5px",
},
on: {
click: () => {
this.remove(params.row);
},
},
"修改"
),
h(
"Button",
{
props: {
type: "error",
size: "small",
},
style: {
marginRight: "5px",
},
on: {
click: () => {
this.remove(params.row);
},
},
},
"删除"
),
]);
},
},
"删除"
),
]);
},
],
data: [], // 表单数据
total: 0, // 表单数据总数
},
],
data: [], // 表单数据
total: 0, // 表单数据总数
};
},
methods: {
init() {
this.getData();
},
changePage(v) {
this.searchForm.pageNumber = v;
this.getData();
},
changePageSize(v) {
this.searchForm.pageSize = v;
this.getData();
},
handleSearch() {
this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10;
this.getData();
},
changeSort(e) {
this.searchForm.sort = e.key;
this.searchForm.order = e.order;
if (e.order === "normal") {
this.searchForm.order = "";
}
this.getData();
},
changeSelect(e) {
this.selectList = e;
this.selectCount = e.length;
},
getData() {
this.loading = true;
API_Setting.appVersionPage(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;
},
//添加app版本信息
addAppVersion() {
this.modalVisible = true;
this.modalTitle = "添加APP版本信息";
const versionUpdateDate = this.$options.filters.unixToDate(
new Date() / 1000
);
this.form = {
forceUpdate: 0,
type: "IOS",
versionUpdateDate: versionUpdateDate,
content: " ",
};
},
methods: {
init() {
this.getData();
},
changePage(v) {
this.searchForm.pageNumber = v;
this.getData();
},
changePageSize(v) {
this.searchForm.pageSize = v;
this.getData();
},
handleSearch() {
this.searchForm.pageNumber = 1;
this.searchForm.pageSize = 10;
this.getData();
},
changeSort(e) {
this.searchForm.sort = e.key;
this.searchForm.order = e.order;
if (e.order === "normal") {
this.searchForm.order = "";
}
this.getData();
},
changeSelect(e) {
this.selectList = e;
this.selectCount = e.length;
},
getData() {
this.loading = true;
API_Setting.appVersionPage(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;
},
//添加app版本信息
addAppVersion() {
this.modalVisible = true;
this.modalTitle = "添加APP版本信息"
const versionUpdateDate = this.$options.filters.unixToDate(
new Date() / 1000
);
this.form = {
forceUpdate: 0,
type: "IOS",
versionUpdateDate: versionUpdateDate,
content: " "
}
},
//添加app版本信息
editAppVersion(v) {
this.modalVisible = true;
this.modalTitle = "修改APP版本信息"
this.modalType = 1
this.form = v
},
//保存app版本信息
saveAppVersion() {
this.$refs.form.validate((valid) => {
if (valid) {
this.submitLoading = true;
const versionUpdateDate = this.$options.filters.unixToDate(
this.form.versionUpdateDate / 1000
);
this.form.versionUpdateDate = versionUpdateDate
this.form.updateTime = versionUpdateDate
if (this.modalType == 0) {
// 添加 避免编辑后传入id等数据 记得删除
delete this.form.id;
API_Setting.addVersion(this.form).then((res) => {
this.submitLoading = false;
if (res && res.success) {
this.$Message.success("添加成功");
this.modalVisible = false
this.getData();
}
});
} else {
API_Setting.editVersion(this.form, this.form.id).then((res) => {
this.submitLoading = false;
if (res && res.success) {
this.$Message.success("修改成功");
this.modalVisible = false
this.getData();
}
});
}
}
})
},
remove(v) {
this.$Modal.confirm({
title: "确认删除",
content: "您确认要删除么?",
loading: true,
onOk: () => {
// 删除
API_Setting.deleteVersion(v.id).then(res => {
this.$Modal.remove();
if (res.success) {
this.$Message.success("删除成功");
//添加app版本信息
editAppVersion(v) {
this.modalVisible = true;
this.modalTitle = "修改APP版本信息";
this.modalType = 1;
this.form = v;
},
//保存app版本信息
saveAppVersion() {
this.$refs.form.validate((valid) => {
if (valid) {
this.submitLoading = true;
const versionUpdateDate = this.$options.filters.unixToDate(
this.form.versionUpdateDate / 1000
);
this.form.versionUpdateDate = versionUpdateDate;
this.form.updateTime = versionUpdateDate;
if (this.modalType == 0) {
// 添加 避免编辑后传入id等数据 记得删除
delete this.form.id;
API_Setting.addVersion(this.form).then((res) => {
this.submitLoading = false;
if (res && res.success) {
this.$Message.success("添加成功");
this.modalVisible = false;
this.getData();
}
});
} else {
API_Setting.editVersion(this.form, this.form.id).then((res) => {
this.submitLoading = false;
if (res && res.success) {
this.$Message.success("修改成功");
this.modalVisible = false;
this.getData();
}
});
}
});
},
detail(v) {
this.queryModalVisible = true
this.form = JSON.parse(JSON.stringify(v))
//时间格式化有问题，所以另外单独给时间赋值
this.versionUpdateDate = this.form.versionUpdateDate
},
}
});
},
mounted() {
this.init();
remove(v) {
this.$Modal.confirm({
title: "确认删除",
content: "您确认要删除么?",
loading: true,
onOk: () => {
// 删除
API_Setting.deleteVersion(v.id).then((res) => {
this.$Modal.remove();
if (res.success) {
this.$Message.success("删除成功");
this.getData();
}
});
},
});
},
};
detail(v) {
this.queryModalVisible = true;
this.form = JSON.parse(JSON.stringify(v));
//时间格式化有问题，所以另外单独给时间赋值
this.versionUpdateDate = this.form.versionUpdateDate;
},
},
mounted() {
this.init();
},
};
</script>
<style lang="scss" scoped>
.ivu-form-item {
margin-bottom: 14px;
vertical-align: top;
zoom: 1;
}
.search-form{
.ivu-form-item {
margin-bottom: 14px;
vertical-align: top;
zoom: 1;
}
.search-form {
width: 100%;
}
// 建议引入通用样式 可删除下面样式代码
@import "@/styles/table-common.scss";
// 建议引入通用样式 可删除下面样式代码
@import "@/styles/table-common.scss";
</style>

2
seller/src/api/distribution.js
View File

@ -51,7 +51,7 @@ export const getDistributionSetting = (id, params) => {
//获取分销订单列表
export const getDistributionOrder = (params) => {
return getRequest('/distribution/order/getByPage', params)
return getRequest('/distributionOrder', params)
}

16
seller/src/libs/routerJson.js
View File

@ -145,7 +145,7 @@ export const result = [
url: "",
children: null,
permTypes: []
}
}
]
},
{
@ -454,6 +454,20 @@ export const result = [
url: "",
permTypes: [],
children: null
},
{
name: "distributionOrder",
showAlways: true,
level: 2,
type: 0,
title: "分销订单",
path: "distributionOrder",
component: "distribution/distributionOrder",
icon: "md-person",
isMenu: true,
url: "",
permTypes: [],
children: null
}
]
}

200
seller/src/views/distribution/distributionOrder.vue Normal file
View File

@ -0,0 +1,200 @@
<template>
<div class="search">
<Row>
<Col>
<Card>
<Row v-show="openSearch" @keydown.enter.native="handleSearch">
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
<Form-item label="订单编号" prop="orderSn">
<Input type="text" v-model="searchForm.orderSn" placeholder="请输入订单编号" clearable style="width: 200px" />
</Form-item>
<Form-item label="订单时间">
<DatePicker type="daterange" v-model="timeRange" format="yyyy-MM-dd" placeholder="选择时间" style="width: 210px"></DatePicker>
</Form-item>
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
</Form>
</Row>
<Row class="padding-row">
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"></Table>
</Row>
<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"
show-total show-elevator show-sizer></Page>
</Row>
</Card>
</Col>
</Row>
</div>
</template>
<script>
import { getDistributionOrder } from "@/api/distribution";
import { orderStatusList } from "./dataJson";
export default {
name: "distributionOrder",
components: {},
data() {
return {
timeRange: [], // 范围时间
orderStatusList, // 订单状态列表
distributionId: this.$route.query.id, // 分销id
openSearch: true, // 显示搜索
openTip: true, // 显示提示
loading: true, // 表单加载状态
searchForm: {
// 搜索框初始化对象
pageNumber: 1, // 当前页数
pageSize: 10, // 页面大小
},
columns: [
{
title: "订单编号",
key: "orderSn",
minWidth: 120,
tooltip: true,
},
{
title: "实付金额",
key: "orderPrice",
width: 130,
sortable: false,
render: (h, params) => {
if (params.row.orderPrice == null) {
return h("div", this.$options.filters.unitPrice(0, "￥"));
} else {
return h(
"div",
this.$options.filters.unitPrice(params.row.orderPrice, "￥")
);
}
},
},
{
title: "退款金额",
key: "returnMoney",
width: 130,
sortable: false,
render: (h, params) => {
if (params.row.orderPrice == null) {
return h("div", this.$options.filters.unitPrice(0, "￥"));
} else {
return h(
"div",
this.$options.filters.unitPrice(params.row.returnMoney, "￥")
);
}
},
},
{
title: "商品名称",
key: "goodsName",
minWidth: 120,
tooltip: true,
},
{
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", "待提现");
}
},
},
{
title: "佣金金额",
key: "rebateGrade",
width: 120,
sortable: false,
render: (h, params) => {
if (params.row.rebateGrade == null) {
return h("div", this.$options.filters.unitPrice(0, "￥"));
} else {
return h(
"div",
this.$options.filters.unitPrice(params.row.rebateGrade, "￥")
);
}
},
},
{
title: "创建时间",
key: "createTime",
width: 180,
sortable: false,
},
],
data: [], // 表单数据
total: 0, // 表单数据总数
};
},
methods: {
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();
},
getDataList() {
this.searchForm.distributionId = this.distributionId;
this.loading = true;
if (this.timeRange && this.timeRange[0]) {
let startTime = this.timeRange[0];
let endTime = this.timeRange[1];
this.searchForm.startTime = this.$options.filters.unixToDate(
startTime / 1000
);
this.searchForm.endTime = this.$options.filters.unixToDate(
endTime / 1000
);
}
console.log(this.searchForm);
// 带多条件搜索参数获取表单数据 请自行修改接口
getDistributionOrder(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;
},
},
mounted() {
this.init();
},
watch: {
$route(e) {
this.distributionId = e.query.id ? e.query.id : undefined;
this.getDataList();
},
},
};
</script>
<style lang="scss" >
@import "@/styles/table-common.scss";
</style>