Revert "分销结构优化"

This reverts commit 63b22f4c86.
master
lele0521 2024-01-26 13:35:47 +08:00
parent 0e56c2038d
commit 43159335f8
13 changed files with 373 additions and 891 deletions

View File

@ -1,110 +0,0 @@
import request, {Method} from '@/plugins/request.js';
/**
* 获取当前会员分销信息
*/
export function distribution () {
return request({
url: `/buyer/distribution/distribution`,
method: Method.GET,
needToken: true
});
}
/**
* 申请成为分销员
* @param idNumber 身份证号
* @param name 名字
*/
export function applyDistribution (params) {
return request({
url: `/buyer/distribution/distribution`,
method: Method.POST,
needToken: true,
params
});
}
/**
* 获取分销员订单列表
*/
export function getDistOrderList (params) {
return request({
url: `/buyer/distribution/order`,
method: Method.GET,
needToken: true,
params
});
}
/**
* 获取分销员下级用户列表
*/
export function getDistMemberList (params) {
return request({
url: `/buyer/distribution/distribution/memberList`,
method: Method.GET,
needToken: true,
params
});
}
/**
* 获取分销商商品列表
*/
export function getDistGoodsList (params) {
return request({
url: `/buyer/distribution/goods`,
method: Method.GET,
needToken: true,
params
});
}
/**
* 分销员提现历史
*/
export function distCashHistory (params) {
return request({
url: `/buyer/distribution/cash`,
method: Method.GET,
needToken: true,
params
});
}
/**
* 分销员-团队列表
*/
export function getDistGroupList (params) {
return request({
url: `/buyer/distribution/distribution/groupList`,
method: Method.GET,
needToken: true,
params
});
}
/**
* 分销商提现
*/
export function distCash (params) {
return request({
url: `/buyer/distribution/cash`,
method: Method.POST,
needToken: true,
params
});
}
/**
* 绑定分销
* @param distributionId 商品分销ID
*/
export function getGoodsDistribution (distributionId) {
return request({
url: `/buyer/distribution/distribution/bindingDistribution/${distributionId}`,
method: Method.GET,
needToken: true
});
}

View File

@ -333,7 +333,92 @@ export function clearComplain (id) {
});
}
/**
* 获取当前会员分销信息
*/
export function distribution () {
return request({
url: `/buyer/distribution/distribution`,
method: Method.GET,
needToken: true
});
}
/**
* 申请成为分销商
* @param idNumber 身份证号
* @param name 名字
*/
export function applyDistribution (params) {
return request({
url: `/buyer/distribution/distribution`,
method: Method.POST,
needToken: true,
params
});
}
/**
* 获取分销商订单列表
*/
export function getDistOrderList (params) {
return request({
url: `/buyer/distribution/order`,
method: Method.GET,
needToken: true,
params
});
}
/**
* 获取分销商商品列表
*/
export function getDistGoodsList (params) {
return request({
url: `/buyer/distribution/goods`,
method: Method.GET,
needToken: true,
params
});
}
/**
* 绑定解绑分销商品
* @param distributionGoodsId 分销商品id
* @param checked 分销商品id,true为绑定false为解绑
*/
export function selectDistGoods (params) {
return request({
url: `/buyer/distribution/goods/checked/${params.distributionGoodsId}`,
method: Method.GET,
needToken: true,
params
});
}
/**
* 分销商提现历史
*/
export function distCashHistory (params) {
return request({
url: `/buyer/distribution/cash`,
method: Method.GET,
needToken: true,
params
});
}
/**
* 分销商提现
*/
export function distCash (params) {
return request({
url: `/buyer/distribution/cash`,
method: Method.POST,
needToken: true,
params
});
}
/**
* 我的足迹

View File

@ -1,6 +1,6 @@
<template>
<div class="wrapper">
<card _Title="我的分销"/>
<card _Title="我的分销" />
<!-- 分销申请 -->
<div v-if="status === 0">
@ -12,8 +12,20 @@
<FormItem label="身份证号" prop="idNumber">
<Input v-model="applyForm.idNumber"></Input>
</FormItem>
<FormItem label="银行开户行" prop="settlementBankBranchName">
<Input v-model="applyForm.settlementBankBranchName"></Input>
</FormItem>
<FormItem label="银行开户名" prop="settlementBankAccountName">
<Input v-model="applyForm.settlementBankAccountName"></Input>
</FormItem>
<FormItem label="银行账号" prop="settlementBankAccountNum">
<Input v-model="applyForm.settlementBankAccountNum"></Input>
</FormItem>
<FormItem>
<Button type="primary" :loading="applyLoading" @click="apply"></Button>
<Button type="primary" :loading="applyLoading" @click="apply"
>提交申请</Button
>
</FormItem>
</Form>
</div>
@ -22,69 +34,43 @@
<Alert type="success">
您提交的信息正在审核
<template slot="desc"
>提交认证申请后工作人员将在三个工作日进行核对完成审核
</template
>提交认证申请后工作人员将在三个工作日进行核对完成审核</template
>
</Alert>
</div>
<!-- 分销提现商品订单 -->
<div v-if="status === 2">
<div class="tips">
<p>分销下线付款之后会生成分销订单</p>
<p>交易完成后返佣可提现</p>
<p>
冻结金额用户提现金额即为冻结金额审核通过后扣除冻结金额审核拒绝之后冻结金额返回可提现金额
</p>
<p>可提现金额分销订单佣金T+1解冻后可变为可提现金额</p>
</div>
<div class="box">
<div class="mb_20 account-price">
<span class="subTips">可提现金额()</span>
<span class="fontsize_48 global_color">{{ result.canRebate | unitPrice }}</span>
<span class="subTips">待结算</span>
<span class="">{{ result.commissionFrozen | unitPrice }}</span>
<span class="subTips">总收益()</span>
<span class="">{{ result.rebateTotal | unitPrice }}</span>
<span class="subTips">可提现金额</span>
<span class="fontsize_48 global_color"
>{{ result.canRebate | unitPrice }}</span
>
<span class="subTips">冻结金额</span>
<span class="">{{ result.commissionFrozen | unitPrice }}</span>
<span class="subTips">返利总金额</span>
<span class="">{{ result.rebateTotal | unitPrice }}</span>
<Button
type="primary"
size="small"
class="ml_20"
@click="withdrawApplyModal = true">申请提现
</Button>
@click="withdrawApplyModal = true"
>申请提现</Button
>
</div>
</div>
<Tabs :value="tabName" @on-click="tabPaneChange">
<TabPane label="推广订单" name="order">
<Table stripe :columns="orderColumns" :data="orderData.records">
<template slot-scope="{ row }" slot="createTime">
<span>{{ row.createTime }}</span>
</template>
<template slot-scope="{ row }" slot="goodsName">
<span>{{ row.goodsName }}</span>
</template>
<template slot-scope="{ row }" slot="num">
<span>{{ row.num }}</span>
</template>
<template slot-scope="{ row }" slot="rebate">
<span>{{ row.rebate }}</span>
</template>
<template slot-scope="{ row }" slot="distributionOrderStatus">
<span v-if="row.distributionOrderStatus == 'NO_COMPLETED'"></span>
<span v-else-if="row.distributionOrderStatus == 'COMPLETE'">订单完成</span>
<span v-else-if="row.distributionOrderStatus == 'CANCEL'">订单取消</span>
<span v-else-if="row.distributionOrderStatus == 'REFUND'">订单退款</span>
</template>
</Table>
<div class="page-size">
<Page
:current="orderParams.pageNumber"
:total="orderData.total"
:page-size="orderParams.pageSize"
@on-change="changeOrderPage"
size="small"
show-total
show-elevator
></Page>
</div>
</TabPane>
<TabPane label="推广商品" name="goods">
<TabPane label="已选商品" name="goodsChecked">
<Table stripe :columns="goodsColumns" :data="goodsData.records">
<template slot-scope="{ row }" slot="name">
<div
@ -93,21 +79,20 @@
linkTo(
`/goodsDetail?skuId=${row.skuId}&goodsId=${row.goodsId}`
)
">
"
>
<img
style="vertical-align: top"
:src="row.thumbnail"
width="60"
height="60"
alt=""/>&nbsp; {{ row.goodsName }}
alt=""
/>&nbsp; {{ row.goodsName }}
</div>
</template>
<template slot-scope="{ row }" slot="price">
<span> {{ row.price | unitPrice }}</span>
</template>
<template slot-scope="{ row }" slot="firstProportion">
<span style="margin-left: 10px;"> {{ row.firstProportion }}%</span>
</template>
<template slot-scope="{ row }" slot="commission">
<span> {{ row.commission | unitPrice }}</span>
</template>
@ -116,8 +101,15 @@
type="success"
size="small"
style="margin-right: 5px"
@click="fenxiao(row)">邀请好友
</Button>
@click="fenxiao(row)"
>分销商品</Button
>
<Button
type="error"
size="small"
@click="selectGoods(row.id, false)"
>取消选择</Button
>
</template>
</Table>
<div class="page-size">
@ -132,30 +124,48 @@
></Page>
</div>
</TabPane>
<TabPane label="我的客户" name="member">
<Table stripe :columns="memberColumns" :data="memberData.records">
<template slot-scope="{ row }" slot="nickName">
<span>{{ row.nickName }}</span>
<TabPane label="未选商品" name="goodsUncheck">
<Table stripe :columns="goodsColumns" :data="goodsData.records">
<template slot-scope="{ row }" slot="name">
<div
class="goods-msg"
@click="
linkTo(
`/goodsDetail?skuId=${row.skuId}&goodsId=${row.goodsId}`
)
"
>
<img
style="vertical-align: top"
:src="row.thumbnail"
width="60"
height="60"
alt=""
/>&nbsp; {{ row.goodsName }}
</div>
</template>
<template slot-scope="{ row }" slot="orderPrice">
<span>{{ row.orderPrice }}</span>
<template slot-scope="{ row }" slot="price">
<span> {{ row.price | unitPrice }}</span>
</template>
<template slot-scope="{ row }" slot="rebatePrice">
<span>{{ row.rebatePrice }}</span>
<template slot-scope="{ row }" slot="commission">
<span> {{ row.commission | unitPrice }}</span>
</template>
<template slot-scope="{ row }" slot="orderNum">
<span>{{ row.orderNum }}</span>
</template>
<template slot-scope="{ row }" slot="lastLoginDate">
<span>{{ row.lastLoginDate }}</span>
<template slot-scope="{ row }" slot="action">
<Button
type="primary"
size="small"
style="margin-right: 5px"
@click="selectGoods(row.id, true)"
>选择商品</Button
>
</template>
</Table>
<div class="page-size">
<Page
:current="memberParams.pageNumber"
:total="memberData.total"
:page-size="memberParams.pageSize"
@on-change="changeOrderPage"
:current="params.pageNumber"
:total="goodsData.total"
:page-size="params.pageSize"
@on-change="changePage"
size="small"
show-total
show-elevator
@ -173,11 +183,13 @@
<template slot-scope="{ row }" slot="price">
<span
v-if="row.distributionCashStatus == 'VIA_AUDITING'"
style="color: green">
{{ row.price | unitPrice }}</span
style="color: green"
>
+{{ row.price | unitPrice }}</span
>
<span v-else style="color: red">
{{ row.price | unitPrice }}</span>
-{{ row.price | unitPrice }}</span
>
</template>
<template slot-scope="{ row }" slot="status">
<span>
@ -187,7 +199,8 @@
: row.distributionCashStatus == "VIA_AUDITING"
? "通过"
: "拒绝"
}}</span>
}}</span
>
</template>
</Table>
<div class="page-size">
@ -202,30 +215,6 @@
></Page>
</div>
</TabPane>
<TabPane label="我的团队" name="group">
<Table stripe :columns="groupColumns" :data="groupData.records">
<template slot-scope="{ row }" slot="memberName">
<span>{{ row.memberName }}</span>
</template>
<template slot-scope="{ row }" slot="distributionOrderPrice">
<span>{{ row.distributionOrderPrice }}</span>
</template>
<template slot-scope="{ row }" slot="distributionOrderCount">
<span>{{ row.distributionOrderCount }}</span>
</template>
</Table>
<div class="page-size">
<Page
:current="groupParams.pageNumber"
:total="groupData.total"
:page-size="groupParams.pageSize"
@on-change="changeOrderPage"
size="small"
show-total
show-elevator
></Page>
</div>
</TabPane>
</Tabs>
</div>
<!-- 未开放 -->
@ -233,8 +222,7 @@
<Alert type="error">
分销功能暂未开启
<template slot="desc"
>提交认证申请后工作人员将在三个工作日进行核对完成审核
</template
>提交认证申请后工作人员将在三个工作日进行核对完成审核</template
>
</Alert>
</div>
@ -251,8 +239,7 @@
<Alert type="success">
您提交的申诉正在审核
<template slot="desc"
>提交认证申请后工作人员将在三个工作日进行核对完成审核
</template
>提交认证申请后工作人员将在三个工作日进行核对完成审核</template
>
</Alert>
</div>
@ -263,18 +250,29 @@
</p>
<div>
<Input v-model="withdrawPrice" size="large" number maxlength="9"
><span slot="append"></span></Input>
><span slot="append"></span></Input
>
</div>
<div slot="footer" style="text-align: center">
<Button type="primary" size="large" @click="withdraw"></Button>
</div>
</Modal>
<Modal v-model="qrcodeShow" title="分销商品" width="800">
<Alert type="warning"> 下载二维码或者复制链接分享商品</Alert>
<Alert type="warning"> 下载二维码或者复制链接分享商品 </Alert>
<div class="qrcode">
<div style="width: 150px; height: 150px; ">
<div class="qrcode-platform" style="margin-top: 100px">PC端</div>
<Button style="margin-left: 40px; margin-top: 65px" type="success" @click="copyUrlLink"></Button>
<div style="width: 150px; height: 150px; border: 1px solid #eee">
<vue-qr
:text="qrcode"
:callback="qrcodeData"
:margin="0"
colorDark="#000"
colorLight="#fff"
:size="150"
></vue-qr>
<div class="qrcode-platform">PC端</div>
<Button class="download-btn" type="success" @click="downloadQrcode"
>下载二维码</Button
>
</div>
<div style="width: 150px; height: 150px; border: 1px solid #eee">
<vue-qr
@ -287,13 +285,13 @@
></vue-qr>
<div class="qrcode-platform">移动应用端</div>
<Button class="download-btn" type="success" @click="downloadQrcodeH5"
>下载二维码
</Button
>下载二维码</Button
>
</div>
</div>
<div class="mt_10" style="margin-top: 100px;">
商品链接<Input style="width: 600px" v-model="qrcode"></Input>
</div>
</Modal>
</div>
@ -306,98 +304,92 @@ import {
distCash,
distCashHistory,
getDistGoodsList,
getDistOrderList,
getDistMemberList,
getDistGroupList
} from "@/api/distribution.js";
import {IDCard} from "@/plugins/RegExp.js";
selectDistGoods,
} from "@/api/member.js";
import { IDCard } from "@/plugins/RegExp.js";
import { checkBankno } from "@/plugins/Foundation";
import vueQr from "vue-qr";
export default {
name: "Distribution",
components: {vueQr},
components: { vueQr },
data() {
return {
config: require('@/config'),
config:require('@/config'),
status: 0, // 0 1 2 3
applyForm: {}, //
rules: {
//
name: [{required: true, message: "请输入真实姓名"}],
name: [{ required: true, message: "请输入真实姓名" }],
idNumber: [
{required: true, message: "请输入身份证号"},
{pattern: IDCard, message: "请输入正确的身份证号"},
{ required: true, message: "请输入身份证号" },
{ pattern: IDCard, message: "请输入正确的身份证号" },
],
settlementBankBranchName: [
{
required: true,
message: "请输入银行开户行",
//
trigger: "blur",
},
],
settlementBankAccountName: [
{
required: true,
message: "请输入银行开户名",
//
trigger: "blur",
},
],
//
settlementBankAccountNum: [
{
required: true,
message: "银行账号不正确",
//
trigger: "blur",
},
{
validator: (rule, value, callback) => {
// truefalse
// this.$u.test.mobile()truefalse
return checkBankno(value);
},
message: "银行账号不正确",
},
],
},
tabName: "order", // tab
tabName: "goodsChecked", // tab
result: {}, //
applyLoading: false, //
goodsLoading: false, //
orderLoading: false, //
withdrawApplyModal: false, //
withdrawPrice: 0, //
goodsData: {}, //
orderData:{}, //
memberData:{}, //
logData: {}, //
groupData:{},//
orderColumns:[
//
{title: "下单时间", slot: "createTime", minWidth: 200},
{title: "商品名称", slot: "goodsName", minWidth: 200},
{title: "数量", slot: "num"},
{title: "佣金金额", slot: "rebate"},
{title: "状态", slot: "distributionOrderStatus"},
],
memberColumns:[
//
{title: "客户昵称", slot: "nickName", minWidth: 150},
{title: "成交额", slot: "orderPrice"},
{title: "佣金总额", slot: "rebatePrice"},
{title: "订单数", slot: "orderNum"},
{title: "最近下单时间", slot: "lastLoginDate", minWidth: 150},
],
goodsColumns: [
//
{title: "商品名称", slot: "name", width: 400},
{title: "商品价格", slot: "price"},
{title: "佣金比例", slot: "firstProportion"},
{title: "预计赚", slot: "commission"},
{title: "操作", slot: "action", minWidth: 120},
{ title: "商品名称", slot: "name", width: 400 },
{ title: "商品价格", slot: "price" },
{ title: "佣金", slot: "commission" },
{ title: "操作", slot: "action", minWidth: 120 },
],
logColumns: [
//
{title: "编号", slot: "sn"},
{title: "申请时间", slot: "time"},
{title: "提现金额", slot: "price"},
{title: "提现状态", slot: "status"},
],
groupColumns: [
//
{title: "昵称", slot: "memberName"},
{title: "销售额", slot: "distributionOrderPrice"},
{title: "订单量", slot: "distributionOrderCount"},
{ title: "编号", slot: "sn" },
{ title: "申请时间", slot: "time" },
{ title: "提现金额", slot: "price" },
{ title: "提现状态", slot: "status" },
],
params: {
//
pageNumber: 1,
pageSize: 20,
sort: "createTime",
order: "desc",
checked: true,
},
orderParams: {
//
pageNumber: 1,
pageSize: 20,
sort: "createTime",
order: "desc",
},
memberParams: {
//
pageNumber: 1,
pageSize: 20,
sort: "createTime",
order: "desc",
},
logParams: {
//
@ -406,15 +398,8 @@ export default {
sort: "createTime",
order: "desc",
},
groupParams: {
//
pageNumber: 1,
pageSize: 20,
sort: "createTime",
order: "desc",
},
qrcode: "", //
qrcodeH5: "",//H5
qrcodeH5:"",//H5
qrcodeShow: false, //
base64Img: "", // base64
base64ImgH5: "", // base64H5
@ -442,7 +427,7 @@ export default {
},
withdraw() {
//
distCash({price: this.withdrawPrice}).then((res) => {
distCash({ price: this.withdrawPrice }).then((res) => {
this.withdrawApplyModal = false;
this.price = 0;
if (res.success) {
@ -462,15 +447,6 @@ export default {
// H5base64
this.base64ImgH5 = data64;
},
copyUrlLink(){
navigator.clipboard.writeText(this.qrcode)
.then(() => {
this.$Message.success("复制成功!");
})
.catch(err => {
this.$Message.error("复制失败!");
});
},
downloadQrcode() {
//
let a = document.createElement("a"); // a
@ -479,7 +455,7 @@ export default {
a.href = this.base64Img; // URLa.href
a.dispatchEvent(event); // a
},
downloadQrcodeH5() {
downloadQrcodeH5(){
// H5
let a = document.createElement("a"); // a
let event = new MouseEvent("click"); //
@ -489,33 +465,18 @@ export default {
},
tabPaneChange(tab) {
// tab
if (tab === "goods") {
if (tab === "goodsChecked") {
this.params.checked = true;
this.params.pageNUmber = 1;
this.getGoodsData();
} else if (tab === "goodsUncheck") {
this.params.checked = false;
this.getGoodsData();
}else if (tab === "order") {
this.orderParams.checked = false;
this.getOrderData();
}else if (tab === "member") {
this.memberParams.checked = false;
this.getMemberData();
} else if (tab === "log") {
this.logParams.pageNumber = 1;
this.getLog();
}else if (tab === "group") {
this.groupParams.pageNumber = 1;
this.getGroupData();
}
},
changeOrderPage(val) {
//
this.orderParams.pageNumber = val;
this.getOrderData();
},
changeMemberPage(val) {
//
this.memberParams.pageNumber = val;
this.getMemberData();
},
changePage(val) {
//
this.params.pageNumber = val;
@ -526,6 +487,19 @@ export default {
this.logParams.pageNumber = val;
this.getLog();
},
selectGoods(id, checked) {
//
let params = {
distributionGoodsId: id,
checked: checked,
};
selectDistGoods(params).then((res) => {
if (res.success) {
this.$Message.success("操作成功!");
this.getGoodsData();
}
});
},
fenxiao(row) {
//
this.qrcode = `${this.config.PC_DOMAIN}/goodsDetail?skuId=${row.skuId}&goodsId=${row.goodsId}&distributionId=${this.result.id}`;
@ -533,18 +507,6 @@ export default {
this.goodsNameCurr = row.goodsName;
this.qrcodeShow = true;
},
getOrderData(){
//
getDistOrderList(this.orderParams).then((res) => {
if (res.success) this.orderData = res.result;
});
},
getMemberData(){
//
getDistMemberList(this.memberParams).then((res) => {
if (res.success) this.memberData = res.result;
});
},
getGoodsData() {
//
getDistGoodsList(this.params).then((res) => {
@ -557,14 +519,8 @@ export default {
if (res.success) this.logData = res.result;
});
},
getGroupData() {
//
getDistGroupList(this.groupParams).then((res) => {
if (res.success) this.groupData = res.result;
});
},
//
repaying() {
repaying(){
applyDistribution().then((res) => {
this.applyLoading = false;
if (res.success) {
@ -581,14 +537,14 @@ export default {
let type = res.result.distributionStatus;
if (type === "PASS") {
this.status = 2;
this.getOrderData();
} else if (type === "REFUSE") {
this.getGoodsData();
} else if ( type === "REFUSE") {
this.status = 0;
} else if (type === "RETREAT") {
this.status = 4;
} else if (type === "APPEAL") {
}else if (type === "APPEAL") {
this.status = 5;
} else {
}else {
this.status = 1;
}
} else if (!res.data.success && res.data.code === 22000) {
@ -607,35 +563,28 @@ export default {
.box {
margin: 20px 0;
}
.page-size {
margin: 15px 0px;
text-align: right;
}
.account-price {
font-weight: bold;
}
.subTips {
margin-left: 10px;
}
.fontsize_48 {
font-size: 48px;
}
.goods-msg {
display: flex;
align-items: center;
padding: 3px;
&:hover {
color: $theme_color;
cursor: pointer;
}
}
.download-btn {
// position: relative;
// top: -200px;
@ -643,31 +592,26 @@ export default {
margin-left: 25px;
margin-top: 5px
}
/deep/ .ivu-alert-message {
p {
margin: 4px 0;
}
}
.tips {
background: #f7f7f7;
.tips{
background:#f7f7f7;
padding: 16px;
border-radius: .4em;
> p {
>p{
margin: 6px 0;
}
}
.qrcode {
.qrcode{
display: flex;
justify-content: space-evenly;
padding-top: 10px
}
.qrcode-platform {
.qrcode-platform{
text-align: center;
font-size: 14px;
margin: 5px;

View File

@ -53,11 +53,6 @@ export const getDistributionCash = (params) => {
export const auditDistributionCash = (id,params) => {
return postRequest(`/distribution/cash/audit/${id}`, params)
}
//分销会员列表
export const getDistributionMember = (id,params) => {
return getRequest(`/distribution/distribution/memberList/${id}`, params)
}
//查看分销团队列表
export const getDistributionGroup = (id,params) => {
return getRequest(`/distribution/distribution/groupList/${id}`, params)
}

View File

@ -276,19 +276,7 @@ export const otherRouter = {
title: "查看直播",
name: "live-detail",
component: () => import("@/views/promotions/live/live-detail.vue")
},
{
path: "group-list",
title: "分销团队",
name: "group-list",
component: () => import("@/views/distribution/distributionGroup.vue")
},
{
path: "distribution-member",
title: "分销会员列表",
name: "distribution-member",
component: () => import("@/views/distribution/distributionMember.vue")
},
}
]
};

View File

@ -90,23 +90,19 @@ export default {
{
title: "会员名称",
key: "memberName",
minWidth: 200,
minWidth: 120,
tooltip: true,
},
{
title: "推广单数",
key: "distributionOrderCount",
minWidth: 200,
},
{
title: "推广人数",
key: "peopleNum",
minWidth: 200,
minWidth: 120,
width: 150,
},
{
title: "分销金额",
key: "rebateTotal",
minWidth: 200,
width: 150,
sortable: false,
render: (h, params) => {
return h("priceColorScheme", {props:{value:params.row.rebateTotal,color:this.$mainColor}} );
@ -114,9 +110,9 @@ export default {
},
{
title: "可提现金额",
title: "可金额",
key: "canRebate",
minWidth: 200,
width: 150,
sortable: false,
render: (h, params) => {
return h("priceColorScheme", {props:{value:params.row.canRebate,color:'green'}} );
@ -125,7 +121,7 @@ export default {
{
title: "冻结金额",
key: "commissionFrozen",
minWidth: 200,
width: 150,
sortable: false,
render: (h, params) => {
return h("priceColorScheme", {props:{value:params.row.commissionFrozen,color:'#347dda'}} );
@ -134,7 +130,7 @@ export default {
{
title: "状态",
key: "distributionStatus",
minWidth: 200,
width: 150,
sortable: false,
render: (h, params) => {
if (params.row.distributionStatus == "PASS") {
@ -153,7 +149,7 @@ export default {
key: "action",
align: "center",
fixed: "right",
minWidth: 200,
width: 140,
render: (h, params) => {
return h(
"div",
@ -163,42 +159,7 @@ export default {
justifyContent: "center",
},
},
[h(
"Button",
{
props: {
type: "success",
size: "small",
},
style: {
marginRight: "5px",
},
on: {
click: () => {
this.memberList(params.row);
},
},
},
"下级用户"
),
h(
"Button",
{
props: {
type: "info",
size: "small",
},
style: {
marginRight: "5px",
},
on: {
click: () => {
this.groupList(params.row);
},
},
},
"团队列表"
),
[
h(
"Button",
{
@ -253,14 +214,6 @@ export default {
};
},
methods: {
//
groupList(row){
this.$router.push({ name: "group-list", query: { id: row.id } });
},
memberList(row){
this.$router.push({ name: "distribution-member", query: { id: row.id } });
},
//
init() {
this.getDataList();

View File

@ -102,6 +102,11 @@ export default {
},
},
{
title: "库存",
key: "quantity",
minWidth: 80,
},
{
title: "添加时间",
key: "createTime",

View File

@ -1,103 +0,0 @@
<template>
<div>
<Card>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10"></Table>
<Row type="flex" justify="end" class="page padding-row">
<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>
</div>
</template>
<script>
import {
getDistributionGroup
} from "@/api/distribution";
import {cashStatusList} from './dataJson'
export default {
name: "distributionGroup",
data() {
return {
id: "",//id
cashStatusList, //
loading: true, //
modalVisible: false, //
modalTitle: "", //
result: 'FAIL_AUDITING', //
searchForm: { //
pageNumber: 1, //
pageSize: 10, //
sort: "createTime", //
order: "desc", //
},
handleStatus:'edit',//
form: { //
sn: "",
memberName: "",
price: "",
},
submitLoading: false, //
columns: [
{
title: "昵称",
key: "memberName",
minWidth: 200
},
{
title: "销售额",
key: "distributionOrderPrice",
minWidth: 120
},
{
title: "订单量",
key: "distributionOrderCount",
minWidth: 120
},
],
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.loading = true;
console.log(this.id);
//
getDistributionGroup(this.id,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.id = this.$route.query.id;
this.init();
}
};
</script>

View File

@ -1,114 +0,0 @@
<template>
<div>
<Card>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10"></Table>
<Row type="flex" justify="end" class="page padding-row">
<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>
</div>
</template>
<script>
import {
getDistributionCash,
auditDistributionCash, getDistributionMember
} from "@/api/distribution";
import {cashStatusList} from './dataJson'
export default {
name: "distributionMember",
data() {
return {
id: "",//id
cashStatusList, //
loading: true, //
modalVisible: false, //
modalTitle: "", //
result: 'FAIL_AUDITING', //
searchForm: { //
pageNumber: 1, //
pageSize: 10, //
sort: "createTime", //
order: "desc", //
},
handleStatus:'edit',//
form: { //
sn: "",
memberName: "",
price: "",
},
submitLoading: false, //
columns: [
{
title: "客户昵称",
key: "nickName",
minWidth: 200
},
{
title: "成交额",
key: "orderPrice",
minWidth: 120
},
{
title: "佣金总额",
key: "rebatePrice",
minWidth: 120
},
{
title: "订单数",
key: "orderNum",
minWidth: 130
},
{
title: "最近下单时间",
key: "lastLoginDate",
minWidth: 130
},
],
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.loading = true;
console.log(this.id);
//
getDistributionMember(this.id,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.id = this.$route.query.id;
this.init();
}
};
</script>

View File

@ -11,7 +11,7 @@
style="width: 200px"
/>
</Form-item>
<Form-item label="分销" prop="distributionName">
<Form-item label="分销" prop="distributionName">
<Input
type="text"
v-model="searchForm.distributionName"
@ -104,7 +104,7 @@
},
{
title: "分销",
title: "分销",
key: "distributionName",
tooltip: true,
minWidth:80,

View File

@ -1,7 +1,7 @@
<template>
<div style="background-color: #fff;">
<Form ref="form" :model="form" :label-width="120" style="padding: 10px;">
<Form ref="form" :model="form" :rules="formRule" :label-width="120" style="padding: 10px;">
<Divider orientation="left">分销设置</Divider>
<FormItem label="是否开启分销" prop="isOpen">
@ -10,110 +10,12 @@
<span slot="close">关闭</span>
</i-switch>
</FormItem>
<FormItem label="分销层级" prop="level">
<RadioGroup v-model="form.level" size="large">
<Radio label="1">1</Radio>
<Radio label="2">2</Radio>
</RadioGroup>
<FormItem label="分销关系绑定天数" prop="distributionDay">
<InputNumber :min="1" :max="365" style="width:100px;" v-model="form.distributionDay"></InputNumber>
</FormItem>
<FormItem label="分销模式" prop="mode">
<RadioGroup v-model="form.mode" size="large">
<Radio label="1">指定分销</Radio>
<Radio label="2">人人分销</Radio>
</RadioGroup>
<FormItem label="分销结算天数" prop="cashDay">
<InputNumber :min="0" :max="365" style="width:100px;" v-model="form.cashDay"></InputNumber>
</FormItem>
<FormItem label="分销关系绑定" prop="binding">
<RadioGroup v-model="form.binding" size="large">
<Radio label="ALL">所有用户</Radio>
<Radio label="NEW">新用户</Radio>
</RadioGroup>
</FormItem>
<FormItem label="分销绑定模式" prop="validity">
<RadioGroup v-model="form.validity" size="large">
<Radio label="FOREVER">永久</Radio>
<Radio label="EXP">有效期</Radio>
</RadioGroup>
</FormItem>
<FormItem label="有效期天数" prop="validityDay">
<InputNumber :min="1" :max="365" style="width:200px;" v-model="form.validityDay"></InputNumber>
</FormItem>
<Divider orientation="left">返佣设置</Divider>
<FormItem label="佣金模式" prop="commissionModel">
<RadioGroup v-model="form.commissionModel" size="large">
<Radio label="1">平台承担</Radio>
<Radio label="2">商户承担</Radio>
</RadioGroup>
</FormItem>
<FormItem label="一级佣金比例" prop="firstCommission">
<InputNumber :min="0" :max="100"
v-model="form.firstCommission"
:formatter="value => `${value}%`"
:parser="value => value.replace('%', '')">
</InputNumber>
</FormItem>
<FormItem label="二级佣金比例" prop="secondaryCommission">
<InputNumber :min="0"
:max="100"
v-model="form.secondaryCommission"
:formatter="value => `${value}%`"
:parser="value => value.replace('%', '')">
</InputNumber>
</FormItem>
<FormItem label="自购返佣" prop="selfCommission">
<RadioGroup v-model="form.selfCommission" size="large">
<Radio label="1">开启</Radio>
<Radio label="2">关闭</Radio>
</RadioGroup>
</FormItem>
<FormItem label="推广返佣" prop="promotion">
<RadioGroup v-model="form.promotion" size="large">
<Radio label="1">开启</Radio>
<Radio label="2">关闭</Radio>
</RadioGroup>
</FormItem>
<FormItem label="每日最大推广数量" prop="maxPromotionNum">
<InputNumber :min="0" :max="1000" style="width:200px;" v-model="form.maxPromotionNum"></InputNumber>
</FormItem>
<!-- <Divider orientation="left">提现设置</Divider>-->
<!-- <FormItem label="佣金模式" prop="withdrawalType">-->
<!-- <RadioGroup v-model="form.withdrawalType" type="button" button-style="solid">-->
<!-- <Radio label="1">线下转账</Radio>-->
<!-- <Radio label="2">微信零钱</Radio>-->
<!-- </RadioGroup>-->
<!-- </FormItem>-->
<!-- <FormItem label="提现最低金额" prop="minPrice">-->
<!-- <Input type="number" style="width:200px;" v-model="form.minPrice">-->
<!-- </Input>-->
<!-- </FormItem>-->
<!-- <FormItem label="提现最高金额" prop="maxPrice">-->
<!-- <Input type="number" style="width:200px;" v-model="form.maxPrice">-->
<!-- </Input>-->
<!-- </FormItem>-->
<!-- <FormItem label="提现手续费" prop="fee">-->
<!-- <Input type="number" style="width:200px;" v-model="form.fee">-->
<!-- </Input>-->
<!-- </FormItem>-->
<!-- <FormItem label="是否支持银行卡" prop="withdrawalBank">-->
<!-- <i-switch size="large" v-model="form.withdrawalBank" :true-value="true" :false-value="false">-->
<!-- <span slot="open">开启</span>-->
<!-- <span slot="close">关闭</span>-->
<!-- </i-switch>-->
<!-- </FormItem>-->
<!-- <FormItem label="是否支持微信" prop="withdrawalWechat">-->
<!-- <i-switch size="large" v-model="form.withdrawalWechat" :true-value="true" :false-value="false">-->
<!-- <span slot="open">开启</span>-->
<!-- <span slot="close">关闭</span>-->
<!-- </i-switch>-->
<!-- </FormItem>-->
<!-- <FormItem label="是否支持支付宝" prop="withdrawalAli">-->
<!-- <i-switch size="large" v-model="form.withdrawalAli" :true-value="true" :false-value="false">-->
<!-- <span slot="open">开启</span>-->
<!-- <span slot="close">关闭</span>-->
<!-- </i-switch>-->
<!-- </FormItem>-->
<FormItem>
<Button type="primary" @click="submit"></Button>
</FormItem>
@ -122,8 +24,8 @@
</template>
<script>
import {getSetting, setSetting} from "@/api/index";
import { setSetting, getSetting } from "@/api/index";
import { regular } from "@/utils";
export default {
name: "distributionSetting",
data() {
@ -131,36 +33,20 @@ export default {
form: {
//
isOpen: true,
level: 1, //
mode: 0, //(/)
binding: "NEW", ///
validity: "FOREVER", ///
validityDay: 0, //
commissionModel: 0, ///
firstCommission: 0, //
secondaryCommission: 0, //
selfCommission: 0, //
promotion: 0, //广
maxPromotionNum: 0, //广
// withdrawalType: 0, //线/
// minPrice: 0, //
// maxPrice: 0, //
// fee: 0, //
// withdrawalBank: false, //
// withdrawalWechat: false, //
// withdrawalAli: false, //
distributionDay: 0, //
cashDay: 0, //
},
// formRule: {
// isOpen: [
// regular.REQUIRED
// ],
// distributionDay: [
// regular.REQUIRED
// ],
// cashDay: [
// regular.REQUIRED
// ],
// }
formRule: {
isOpen: [
regular.REQUIRED
],
distributionDay: [
regular.REQUIRED
],
cashDay: [
regular.REQUIRED
],
}
};
},
methods: {

View File

@ -2,22 +2,71 @@
// 统一请求路径前缀在libs/axios.js中修改
import {getRequest, postRequest, putRequest, deleteRequest, importRequest, getRequestWithNoToken} from '@/libs/axios';
//获取分销设置
export const getDistributionSetting = (params) => {
return getRequest(`/distribution/setting`, params)
//获取分销商品列表
export const getDistributionGoods = (params) => {
return getRequest('/distribution/goods', params)
}
// 取消分销商品
export const distributionGoodsCancel = (id) => {
return deleteRequest(`/distribution/goods/cancel/${id}`)
}
// 选择分销商品
export const distributionGoodsCheck = (id,param) => {
return putRequest(`/distribution/goods/checked/${id}`,param)
}
//查询分销商
export const getDistributionListData = (params) => {
return getRequest('/distribution/getByPage', params)
}
//审核分销商
export const auditDistribution = (id, params) => {
return putRequest(`/distribution/audit/${id}`, params)
}
// 清退分销商
export const retreatDistribution = (id, params) => {
return putRequest(`/distribution/retreat/${id}`, params)
}
// 恢复分销商
export const resumeDistribution = (id, params) => {
return putRequest(`/distribution/resume/${id}`, params)
}
//保存更新分销设置
export const saveDistributionSetting = (params) => {
return putRequest('/distribution/setting', params)
return postRequest('/distribution/setting/insertOrUpdate', params)
}
//获取分销设置
export const getDistributionSetting = (id, params) => {
return getRequest(`/distribution/setting/get/${id}`, params)
}
//获取分销订单列表
export const getDistributionOrder = (params) => {
return getRequest('/distribution/order', params)
}
//获取分销商品列表
export const getDistributionGoods = (params) => {
return getRequest('/distribution/goods', params)
//删除分销商品
export const delDistributionGoods = (ids) => {
return deleteRequest(`/distribution/goods/delByIds/${ids}`)
}
//获取分销佣金信息
export const getDistributionCash = (params) => {
return getRequest('/distribution/cash/getByPage', params)
}
//审核分销佣金申请
export const auditDistributionCash = (id,params) => {
return postRequest(`/distribution/cash/audit/${id}`, params)
}

View File

@ -1,96 +0,0 @@
<template>
<div class="search">
<Card style="margin-left: 10px">
<Tabs v-model="type">
<TabPane label="分销设置" name="INFO">
<Form ref="form" :model="form" :label-width="100" >
<FormItem label="是否开启分销" prop="isOpen" class="wangEditor">
<i-switch v-model="form.isOpen"></i-switch>
<span class="desc">开启分销则全店商品具有分销功能</span>
</FormItem>
<FormItem label="一级佣金比例" prop="isOpen">
<InputNumber :min="0" :max="99999" v-model="form.commission" type="number" maxlength="2"
clearable style="width: 20%"/>
</FormItem>
<FormItem label="二级分佣比例" prop="stockWarning">
<InputNumber :min="0" :max="99999" v-model="form.secondaryCommission" type="number"
maxlength="2"
clearable style="width: 20%"/>
</FormItem>
<Form-item>
<Button @click="handleSubmit" :loading="submitLoading" type="primary" style="margin-right: 5px">修改
</Button>
</Form-item>
</Form>
</TabPane>
</Tabs>
</Card>
</div>
</template>
<script>
import {getDistributionSetting, saveDistributionSetting} from "@/api/distribution";
export default {
name: "distributionSetting",
components: {},
data() {
return {
type: "INFO",
form: {
//
isOpen: false, //
commission: 0, //
secondaryCommission: 0, //
},
//
validate: {},
submitLoading: false, //
};
},
methods: {
//
init() {
this.getDistributionSetting();
},
//
getDistributionSetting() {
this.loading = true;
getDistributionSetting().then((res) => {
this.loading = false;
if (res.success) {
this.form = res.result;
}
});
},
//
handleSubmit() {
this.$refs.form.validate((valid) => {
if (valid) {
this.submitLoading = true;
saveDistributionSetting(this.form).then((res) => {
this.submitLoading = false;
if (res.success) {
this.$Message.success("修改成功");
this.getDistributionSetting();
}
});
}
});
},
},
mounted() {
this.init();
},
};
</script>
<style scoped lang="scss">
.desc {
margin-left: 10px;
color: #999;
}
</style>