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

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui

master
Chopper 2022-07-13 19:06:42 +08:00
parent 6c5994202b 00e229e7f4
commit 752c1086a0
10 changed files with 476 additions and 336 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buyer/src/components/goodsDetail/ShowGoodsDetail.vue
View File

@ -225,7 +225,6 @@ export default {
width: 1200px; width: 1200px;
margin: 15px auto; margin: 15px auto;
display: flex; display: flex;
overflow: scroll;
overflow-x: hidden; overflow-x: hidden;
flex-direction: row; flex-direction: row;
@ -310,6 +309,9 @@ export default {
.item-intro-img { .item-intro-img {
width: 100%; width: 100%;
min-height: 300px; min-height: 300px;
/deep/ img{
margin:0 auto;
}
} }
.item-intro-img img{ .item-intro-img img{
max-width: 1000px; max-width: 1000px;

2
buyer/src/components/indexDecorate/modelList/Seckill.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="seckill"> <div class="seckill" v-if="goodsList.length">
<div class="aside hover-pointer" @click="goToSeckill"> <div class="aside hover-pointer" @click="goToSeckill">
<div class="title">{{ actName }}</div> <div class="title">{{ actName }}</div>
<div class="hour"> <div class="hour">

4
buyer/src/pages/Index.vue
View File

@ -52,7 +52,7 @@ export default {
methods: { methods: {
getIndexData () { getIndexData () {
// 获取首页装修数据 // 获取首页装修数据
indexData({ clientType: 'PC' }).then((res) => { indexData({ clientType: 'PC' }).then(async (res) => {
if (res.success) { if (res.success) {
let dataJson = JSON.parse(res.result.pageData); let dataJson = JSON.parse(res.result.pageData);
// 秒杀活动不是装修的数据，需要调用接口判断是否有秒杀商品 // 秒杀活动不是装修的数据，需要调用接口判断是否有秒杀商品
@ -65,7 +65,7 @@ export default {
this.carouselLarge = true this.carouselLarge = true
this.carouselOpacity = true this.carouselOpacity = true
} else if (type === 'seckill') { } else if (type === 'seckill') {
let seckill = this.getListByDay() let seckill = await this.getListByDay()
dataJson.list[i].options.list = seckill dataJson.list[i].options.list = seckill
} }
} }

660
buyer/src/pages/home/memberCenter/Distribution.vue
View File

@ -1,190 +1,293 @@
<template> <template>
<div class='wrapper'> <div class="wrapper">
<card _Title='我的分销'/> <card _Title="我的分销" />
<!-- 分销申请 --> <!-- 分销申请 -->
<div v-if="status === 0">
<Alert type="warning">分销商申请</Alert>
<Form ref="form" :model="applyForm" :rules="rules">
<FormItem label="姓名" prop="name">
<Input v-model="applyForm.name"></Input>
</FormItem>
<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> <div v-if="status === 0">
<Button type="primary" :loading="applyLoading" @click="apply">提交申请</Button> <Alert type="warning">分销商申请</Alert>
</FormItem> <Form ref="form" :model="applyForm" :rules="rules">
</Form> <FormItem label="姓名" prop="name">
</div> <Input v-model="applyForm.name"></Input>
<!-- 分销审核 --> </FormItem>
<div v-if="status === 1"> <FormItem label="身份证号" prop="idNumber">
<Alert type="success"> <Input v-model="applyForm.idNumber"></Input>
您提交的信息正在审核 </FormItem>
<template slot="desc">提交认证申请后，工作人员将在三个工作日进行核对完成审核</template> <FormItem label="银行开户行" prop="settlementBankBranchName">
</Alert> <Input v-model="applyForm.settlementBankBranchName"></Input>
</div> </FormItem>
<!-- 分销提现、商品、订单 --> <FormItem label="银行开户名" prop="settlementBankAccountName">
<div v-if="status === 2"> <Input v-model="applyForm.settlementBankAccountName"></Input>
<div class="box"> </FormItem>
<div class="mb_20 account-price"> <FormItem label="银行账号" prop="settlementBankAccountNum">
<span class="subTips">可提现金额：</span> <Input v-model="applyForm.settlementBankAccountNum"></Input>
<span class="fontsize_48 global_color">￥{{ result.canRebate | unitPrice }}</span> </FormItem>
<span class="subTips">冻结金额：</span>
<span class="">￥{{ result.commissionFrozen | unitPrice }}</span>
<Button type="primary" size="small" class="ml_20" @click="withdrawApplyModal = true">申请提现</Button>
</div>
</div>
<Tabs :value="tabName" @on-click="tabPaneChange">
<TabPane label="已选商品" name="goodsChecked">
<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="price">
<span> ￥{{ row.price | unitPrice }}</span>
</template>
<template slot-scope="{ row }" slot="commission">
<span> ￥{{ row.commission | unitPrice }}</span>
</template>
<template slot-scope="{ row }" slot="action">
<Button type="success" size="small" style="margin-right: 5px" @click="fenxiao(row)">分销商品</Button>
<Button type="error" size="small" @click="selectGoods(row.id, false)">取消选择</Button>
</template>
</Table>
<div class="page-size">
<Page
:current="params.pageNumber"
:total="goodsData.total"
:page-size="params.pageSize"
@on-change="changePage"
size="small"
show-total
show-elevator
></Page>
</div>
</TabPane>
<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="price">
<span> ￥{{ row.price | unitPrice }}</span>
</template>
<template slot-scope="{ row }" slot="commission">
<span> ￥{{ row.commission | unitPrice }}</span>
</template>
<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="params.pageNumber"
:total="goodsData.total"
:page-size="params.pageSize"
@on-change="changePage"
size="small"
show-total
show-elevator
></Page>
</div>
</TabPane>
<TabPane label="提现记录" name="log">
<Table stripe :columns="logColumns" :data="logData.records">
<template slot-scope="{ row }" slot="sn">
<span>{{row.sn}}</span>
</template>
<template slot-scope="{ row }" slot="time">
<span>{{row.createTime}}</span>
</template>
<template slot-scope="{ row }" slot="price">
<span v-if="row.distributionCashStatus == 'REFUSE'" style="color: green"> +￥{{ row.price | unitPrice }}</span>
<span v-else style="color: red"> -￥{{ row.price | unitPrice }}</span>
</template>
<template slot-scope="{ row }" slot="status">
<span> {{row.distributionCashStatus == "APPLY" ? "待处理" : row.distributionCashStatus == "PASS" ? "通过" : "拒绝"}}</span>
</template>
</Table>
<div class="page-size">
<Page
:current="logParams.pageNumber"
:total="logData.total"
:page-size="logParams.pageSize"
@on-change="changePageLog"
size="small"
show-total
show-elevator
></Page>
</div>
</TabPane>
</Tabs>
</div>
<!-- 未开放 -->
<div v-if="status === 3">
<Alert type="error">
分销功能暂未开启
<template slot="desc">提交认证申请后，工作人员将在三个工作日进行核对完成审核</template>
</Alert>
</div>
<Modal v-model="withdrawApplyModal" width="530"> <FormItem>
<p slot="header"> <Button type="primary" :loading="applyLoading" @click="apply"
<Icon type="edit"></Icon> >提交申请</Button
<span>提现金额</span> >
</p> </FormItem>
<div> </Form>
<Input
v-model="withdrawPrice"
size="large"
number
maxlength="9"
><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>
<div style="width:200px;height:200px;border:1px solid #eee;">
<vue-qr :text="qrcode" :callback="qrcodeData" :margin="0" colorDark="#000" colorLight="#fff" :size="200"></vue-qr>
<Button class="download-btn" type="success" @click="downloadQrcode">下载二维码</Button>
</div>
<div class="mt_10">商品链接：<Input style="width:400px" v-model="qrcode"></Input></div>
</Modal>
</div> </div>
<!-- 分销审核 -->
<div v-if="status === 1">
<Alert type="success">
您提交的信息正在审核
<template slot="desc"
>提交认证申请后，工作人员将在三个工作日进行核对完成审核</template
>
</Alert>
</div>
<!-- 分销提现、商品、订单 -->
<div v-if="status === 2">
<div class="tips">
<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>
<Button
type="primary"
size="small"
class="ml_20"
@click="withdrawApplyModal = true"
>申请提现</Button
>
</div>
</div>
<Tabs :value="tabName" @on-click="tabPaneChange">
<TabPane label="已选商品" name="goodsChecked">
<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="price">
<span> ￥{{ row.price | unitPrice }}</span>
</template>
<template slot-scope="{ row }" slot="commission">
<span> ￥{{ row.commission | unitPrice }}</span>
</template>
<template slot-scope="{ row }" slot="action">
<Button
type="success"
size="small"
style="margin-right: 5px"
@click="fenxiao(row)"
>分销商品</Button
>
<Button
type="error"
size="small"
@click="selectGoods(row.id, false)"
>取消选择</Button
>
</template>
</Table>
<div class="page-size">
<Page
:current="params.pageNumber"
:total="goodsData.total"
:page-size="params.pageSize"
@on-change="changePage"
size="small"
show-total
show-elevator
></Page>
</div>
</TabPane>
<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="price">
<span> ￥{{ row.price | unitPrice }}</span>
</template>
<template slot-scope="{ row }" slot="commission">
<span> ￥{{ row.commission | unitPrice }}</span>
</template>
<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="params.pageNumber"
:total="goodsData.total"
:page-size="params.pageSize"
@on-change="changePage"
size="small"
show-total
show-elevator
></Page>
</div>
</TabPane>
<TabPane label="提现记录" name="log">
<Table stripe :columns="logColumns" :data="logData.records">
<template slot-scope="{ row }" slot="sn">
<span>{{ row.sn }}</span>
</template>
<template slot-scope="{ row }" slot="time">
<span>{{ row.createTime }}</span>
</template>
<template slot-scope="{ row }" slot="price">
<span
v-if="row.distributionCashStatus == 'VIA_AUDITING'"
style="color: green"
>
+￥{{ row.price | unitPrice }}</span
>
<span v-else style="color: red">
-￥{{ row.price | unitPrice }}</span
>
</template>
<template slot-scope="{ row }" slot="status">
<span>
{{
row.distributionCashStatus == "APPLY"
? "待处理"
: row.distributionCashStatus == "VIA_AUDITING"
? "通过"
: "拒绝"
}}</span
>
</template>
</Table>
<div class="page-size">
<Page
:current="logParams.pageNumber"
:total="logData.total"
:page-size="logParams.pageSize"
@on-change="changePageLog"
size="small"
show-total
show-elevator
></Page>
</div>
</TabPane>
</Tabs>
</div>
<!-- 未开放 -->
<div v-if="status === 3">
<Alert type="error">
分销功能暂未开启
<template slot="desc"
>提交认证申请后，工作人员将在三个工作日进行核对完成审核</template
>
</Alert>
</div>
<Modal v-model="withdrawApplyModal" width="530">
<p slot="header">
<Icon type="edit"></Icon>
<span>提现金额</span>
</p>
<div>
<Input v-model="withdrawPrice" size="large" number maxlength="9"
><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>
<div style="width: 200px; height: 200px; border: 1px solid #eee">
<vue-qr
:text="qrcode"
:callback="qrcodeData"
:margin="0"
colorDark="#000"
colorLight="#fff"
:size="200"
></vue-qr>
<Button class="download-btn" type="success" @click="downloadQrcode"
>下载二维码</Button
>
</div>
<div class="mt_10">
商品链接：<Input style="width: 400px" v-model="qrcode"></Input>
</div>
</Modal>
</div>
</template> </template>
<script> <script>
import {distribution, applyDistribution, distCash, distCashHistory, getDistGoodsList, selectDistGoods} from '@/api/member.js' import {
import { IDCard } from '@/plugins/RegExp.js'; distribution,
import {checkBankno} from '@/plugins/Foundation' applyDistribution,
import vueQr from 'vue-qr'; distCash,
distCashHistory,
getDistGoodsList,
selectDistGoods,
} from "@/api/member.js";
import { IDCard } from "@/plugins/RegExp.js";
import { checkBankno } from "@/plugins/Foundation";
import vueQr from "vue-qr";
export default { export default {
name: 'Distribution', name: "Distribution",
components: { vueQr }, components: { vueQr },
data () { data() {
return { return {
status: 0, // 申请状态，0为未申请 1 申请中 2 申请完成 3 功能暂未开启 status: 0, // 申请状态，0为未申请 1 申请中 2 申请完成 3 功能暂未开启
applyForm: {}, // 申请表单 applyForm: {}, // 申请表单
rules: { // 验证规则 rules: {
name: [{required: true, message: '请输入真实姓名'}], // 验证规则
name: [{ required: true, message: "请输入真实姓名" }],
idNumber: [ idNumber: [
{required: true, message: '请输入身份证号'}, { required: true, message: "请输入身份证号" },
{pattern: IDCard, message: '请输入正确的身份证号'} { pattern: IDCard, message: "请输入正确的身份证号" },
], ],
settlementBankBranchName: [ settlementBankBranchName: [
{ {
@ -193,7 +296,6 @@ export default {
// 可以单个或者同时写两个触发验证方式 // 可以单个或者同时写两个触发验证方式
trigger: "blur", trigger: "blur",
}, },
], ],
settlementBankAccountName: [ settlementBankAccountName: [
{ {
@ -221,7 +323,7 @@ export default {
}, },
], ],
}, },
tabName: 'goodsChecked', // 当前所在tab tabName: "goodsChecked", // 当前所在tab
result: {}, // 审核结果 result: {}, // 审核结果
applyLoading: false, // 申请加载状态 applyLoading: false, // 申请加载状态
goodsLoading: false, // 列表加载状态 goodsLoading: false, // 列表加载状态
@ -229,136 +331,155 @@ export default {
withdrawPrice: 0, // 提现金额 withdrawPrice: 0, // 提现金额
goodsData: {}, // 商品数据 goodsData: {}, // 商品数据
logData: {}, // 日志数据 logData: {}, // 日志数据
goodsColumns: [ // 商品表头 goodsColumns: [
{title: '商品名称', slot: 'name', width: 400}, // 商品表头
{title: '商品价格', slot: 'price'}, { title: "商品名称", slot: "name", width: 400 },
{title: '佣金', slot: 'commission'}, { title: "商品价格", slot: "price" },
{title: '操作', slot: 'action', minWidth: 120} { title: "佣金", slot: "commission" },
{ title: "操作", slot: "action", minWidth: 120 },
], ],
logColumns: [ // 日志表头 logColumns: [
{title: '编号', slot: 'sn'}, // 日志表头
{title: '申请时间', slot: 'time'}, { title: "编号", slot: "sn" },
{title: '提现金额', slot: 'price'}, { title: "申请时间", slot: "time" },
{title: '提现状态', slot: 'status'} { title: "提现金额", slot: "price" },
{ title: "提现状态", slot: "status" },
], ],
params: { // 商品请求参数 params: {
// 商品请求参数
pageNumber: 1, pageNumber: 1,
pageSize: 20, pageSize: 20,
checked: true checked: true,
}, },
orderParams: { // 订单商品请求参数 orderParams: {
// 订单商品请求参数
pageNumber: 1, pageNumber: 1,
pageSize: 20 pageSize: 20,
}, },
logParams: { // 日志参数 logParams: {
// 日志参数
pageNumber: 1, pageNumber: 1,
pageSize: 20 pageSize: 20,
sort: "createTime",
order: "desc",
}, },
qrcode: '', // 二维码 qrcode: "", // 二维码
qrcodeShow: false, // 显示二维码 qrcodeShow: false, // 显示二维码
base64Img: '', // base64编码 base64Img: "", // base64编码
goodsNameCurr: ''// 当前分销商品名称 goodsNameCurr: "", // 当前分销商品名称
} };
}, },
mounted () { mounted() {
this.distribution() this.distribution();
}, },
methods: { methods: {
apply () { // 申请成为分销商 apply() {
this.$refs.form.validate(valid => { // 申请成为分销商
this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
this.applyLoading = true this.applyLoading = true;
applyDistribution(this.form).then(res => { applyDistribution(this.form).then((res) => {
this.applyLoading = false this.applyLoading = false;
if (res.success) { if (res.success) {
this.$Message.success('申请已提交，请等待管理员审核') this.$Message.success("申请已提交，请等待管理员审核");
this.status = 1; this.status = 1;
} }
}) });
} }
}) });
}, },
withdraw () { // 申请提现 withdraw() {
distCash({price: this.withdrawPrice}).then(res => { // 申请提现
this.withdrawApplyModal = false distCash({ price: this.withdrawPrice }).then((res) => {
this.withdrawApplyModal = false;
this.price = 0; this.price = 0;
if (res.success) { if (res.success) {
this.$Message.success('申请已提交，请等待审核') this.$Message.success("申请已提交，请等待审核");
this.distribution() this.distribution();
this.getLog() this.getLog();
} else { } else {
this.$Message.error(res.message) this.$Message.error(res.message);
} }
}) });
}, },
qrcodeData (data64) { // 二维码base64地址 qrcodeData(data64) {
this.base64Img = data64 // 二维码base64地址
this.base64Img = data64;
}, },
downloadQrcode () { // 下载二维码 downloadQrcode() {
let a = document.createElement('a'); // 生成一个a元素 // 下载二维码
let event = new MouseEvent('click'); // 创建一个单击事件 let a = document.createElement("a"); // 生成一个a元素
a.download = this.goodsNameCurr || 'photo' let event = new MouseEvent("click"); // 创建一个单击事件
a.download = this.goodsNameCurr || "photo";
a.href = this.base64Img; // 将生成的URL设置为a.href属性 a.href = this.base64Img; // 将生成的URL设置为a.href属性
a.dispatchEvent(event); // 触发a的单击事件 a.dispatchEvent(event); // 触发a的单击事件
}, },
tabPaneChange (tab) { // tab栏切换 tabPaneChange(tab) {
if (tab === 'goodsChecked') { // tab栏切换
if (tab === "goodsChecked") {
this.params.checked = true; this.params.checked = true;
this.params.pageNUmber = 1 this.params.pageNUmber = 1;
this.getGoodsData() this.getGoodsData();
} else if (tab === 'goodsUncheck') { } else if (tab === "goodsUncheck") {
this.params.checked = false this.params.checked = false;
this.getGoodsData() this.getGoodsData();
} else if (tab === 'log') { } else if (tab === "log") {
this.logParams.pageNumber = 1 this.logParams.pageNumber = 1;
this.getLog() this.getLog();
} }
}, },
changePage (val) { // 修改页码 changePage(val) {
// 修改页码
this.params.pageNumber = val; this.params.pageNumber = val;
this.getGoodsData() this.getGoodsData();
}, },
changePageLog (val) { // 修改页码 日志 changePageLog(val) {
// 修改页码 日志
this.logParams.pageNumber = val; this.logParams.pageNumber = val;
this.getLog() this.getLog();
}, },
selectGoods (id, checked) { // 选择商品 selectGoods(id, checked) {
// 选择商品
let params = { let params = {
distributionGoodsId: id, distributionGoodsId: id,
checked: checked checked: checked,
} };
selectDistGoods(params).then(res => { selectDistGoods(params).then((res) => {
if (res.success) { if (res.success) {
this.$Message.success('操作成功！') this.$Message.success("操作成功！");
this.getGoodsData() this.getGoodsData();
} }
}) });
}, },
fenxiao (row) { // 分销商品 fenxiao(row) {
this.qrcode = `${location.origin}/goodsDetail?skuId=${row.skuId}&goodsId=${row.goodsId}&distributionId=${this.result.id}` // 分销商品
this.goodsNameCurr = row.goodsName this.qrcode = `${location.origin}/goodsDetail?skuId=${row.skuId}&goodsId=${row.goodsId}&distributionId=${this.result.id}`;
this.goodsNameCurr = row.goodsName;
this.qrcodeShow = true; this.qrcodeShow = true;
}, },
getGoodsData () { // 商品数据 getGoodsData() {
getDistGoodsList(this.params).then(res => { // 商品数据
if (res.success) this.goodsData = res.result getDistGoodsList(this.params).then((res) => {
}) if (res.success) this.goodsData = res.result;
});
}, },
getLog () { // 提现历史 getLog() {
distCashHistory(this.logParams).then(res => { // 提现历史
if (res.success) this.logData = res.result distCashHistory(this.logParams).then((res) => {
}) if (res.success) this.logData = res.result;
});
}, },
distribution () { // 获取分销商信息 distribution() {
// 获取分销商信息
distribution().then((res) => { distribution().then((res) => {
if (res.result) { if (res.result) {
this.result = res.result; this.result = res.result;
let type = res.result.distributionStatus; let type = res.result.distributionStatus;
if (type === 'PASS') { if (type === "PASS") {
this.status = 2; this.status = 2;
this.getGoodsData() this.getGoodsData();
} else if (type === 'RETREAT' || type === 'REFUSE') { } else if (type === "RETREAT" || type === "REFUSE") {
this.status = 0; this.status = 0;
} else { } else {
this.status = 1; this.status = 1;
@ -367,15 +488,15 @@ export default {
this.status = 3; this.status = 3;
} else { } else {
// 没有资格申请 先去实名认证 // 没有资格申请 先去实名认证
this.status = 0 this.status = 0;
} }
}); });
} },
} },
} };
</script> </script>
<style scoped lang='scss'> <style scoped lang="scss">
.box { .box {
margin: 20px 0; margin: 20px 0;
} }
@ -392,11 +513,11 @@ export default {
.fontsize_48 { .fontsize_48 {
font-size: 48px; font-size: 48px;
} }
.goods-msg{ .goods-msg {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 3px; padding: 3px;
&:hover{ &:hover {
color: $theme_color; color: $theme_color;
cursor: pointer; cursor: pointer;
} }
@ -406,4 +527,17 @@ export default {
top: -200px; top: -200px;
left: 200px; left: 200px;
} }
/depp/ .ivu-alert-message {
p {
margin: 4px 0;
}
}
.tips{
background:#f7f7f7;
padding: 16px;
border-radius: .4em;
>p{
margin: 6px 0;
}
}
</style> </style>

4
buyer/src/pages/home/userCenter/MyTracks.vue
View File

@ -111,8 +111,8 @@ export default {
this.spinShow = true; this.spinShow = true;
tracksList(this.params).then((res) => { tracksList(this.params).then((res) => {
this.spinShow = false; this.spinShow = false;
if (res.success && res.result) { if (res.success && res.result.records.length) {
this.list = res.result; this.list = res.result.records;
} else { } else {
this.list = []; this.list = [];
} }

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

@ -102,19 +102,7 @@
slot: 'goodsMsg', slot: 'goodsMsg',
minWidth: 150 minWidth: 150
}, },
{
title: "退款金额",
key: "returnMoney",
minWidth:80,
sortable: false,
render: (h, params) => {
if(params.row.sellBackRebate == null){
return h("div", this.$options.filters.unitPrice(0, '￥'));
}else{
return h("div", this.$options.filters.unitPrice(params.row.sellBackRebate, '￥'));
}
}
},
{ {
title: "分销商", title: "分销商",
key: "distributionName", key: "distributionName",
@ -134,7 +122,7 @@
}, },
{ {
title: "佣金金额", title: "佣金金额",
key: "rebateGrade", key: "rebate",
minWidth:80, minWidth:80,
sortable: false, sortable: false,
render: (h, params) => { render: (h, params) => {
@ -237,11 +225,11 @@
}, },
filterStatusColor (status) { // 状态tag标签颜色 filterStatusColor (status) { // 状态tag标签颜色
const arr = [ const arr = [
{status: 'WAIT_BILL', color: 'magenta'}, {status: 'WAIT_BILL', color: 'blue'},
{status: 'WAIT_CASH', color: 'warning'}, {status: 'WAIT_CASH', color: 'orange'},
{status: 'COMPLETE_CASH', color: 'success'}, {status: 'COMPLETE_CASH', color: 'green'},
{status: 'CANCEL', color: 'default'}, {status: 'CANCEL', color: 'red'},
{status: 'REFUND', color: 'error'}, {status: 'REFUND', color: 'magenta'},
] ]
for (let i=0;i<arr.length;i++) { for (let i=0;i<arr.length;i++) {
if (arr[i].status === status) { if (arr[i].status === status) {

1
manager/src/views/lili-floor-renovation/wap/config.js
View File

@ -532,6 +532,7 @@ export const modelData = [
title: [{context: "这是一条公告"}], title: [{context: "这是一条公告"}],
color: "#666", color: "#666",
bk_color: "#FFF", bk_color: "#FFF",
direction:"horizontal",
img: 'http://files.sxcfx.cn/upload/20220318/71e5d27aca82aeedf647052e1e4ceaaa.png' img: 'http://files.sxcfx.cn/upload/20220318/71e5d27aca82aeedf647052e1e4ceaaa.png'
} }
] ]

45
manager/src/views/lili-floor-renovation/wap/decorate.vue
View File

@ -217,6 +217,23 @@
<Input v-model="item.bk_color" /> <Input v-model="item.bk_color" />
</div> </div>
</div> </div>
<div
class="decorate-view"
v-if="item.title != void 0 && !res.notTitle && res.type == 'notice'"
>
<div class="decorate-view-title">方向</div>
<div class="decorate-view">
<Select
style="width: 200px"
@on-change="changeDirection($event, item)"
v-model="item.direction"
>
{{item.direction}}
<Option label="横向" value="horizontal"></Option>
<Option label="纵向" value="vertical"></Option>
</Select>
</div>
</div>
<!-- 填写标题 --> <!-- 填写标题 -->
<div <div
@ -364,10 +381,11 @@
v-if=" v-if="
res.type != 'tpl_ad_list' && res.type != 'tpl_ad_list' &&
res.type != 'tpl_activity_list' && res.type != 'tpl_activity_list' &&
!res.notAdd !res.notAdd &&
res.direction != 'horizontal'
" "
type="primary" type="primary"
@click="addDecorate(res.type)" @click="addDecorate(res.type, res)"
ghost ghost
>添加</Button >添加</Button
> >
@ -414,6 +432,14 @@ export default {
}, },
props: ["res"], props: ["res"],
methods: { methods: {
// 改变横纵切换title内容
changeDirection(val, data) {
if (val == "horizontal") {
const props = {...data}
data.title = []
data.title.push( props.title[0]);
}
},
// 选择风格 // 选择风格
selectStyle() { selectStyle() {
this.styleFlag = !this.styleFlag; this.styleFlag = !this.styleFlag;
@ -455,7 +481,7 @@ export default {
}, },
// 打开图片选择器 // 打开图片选择器
liliDialogFlag(flag) { liliDialogFlag(flag) {
this.$refs.liliDialog.clearGoodsSelected() this.$refs.liliDialog.clearGoodsSelected();
this.$refs.liliDialog.goodsFlag = flag; this.$refs.liliDialog.goodsFlag = flag;
this.$refs.liliDialog.flag = true; this.$refs.liliDialog.flag = true;
}, },
@ -482,11 +508,16 @@ export default {
}); });
}, },
//添加设置 //添加设置
addDecorate(type) { addDecorate(type, data) {
if (type === "notice") { if (type === "notice") {
this.res.options.list[0].title.push({ console.log(data)
content: "", if (data.options.list[0].direction == "vertical") {
}); this.res.options.list[0].title.push({
content: "",
});
} else {
this.$Message.error("仅纵向支持多添加");
}
} else { } else {
let way = { let way = {
img: "https://picsum.photos/id/264/200/200", img: "https://picsum.photos/id/264/200/200",

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

@ -94,7 +94,7 @@ export default {
title: "退款状态", title: "退款状态",
key: "isRefund", key: "isRefund",
fixed: "right", fixed: "right",
width: 95, width: 120,
render: (h, params) => { render: (h, params) => {
if (params.row.isRefund == "1") { if (params.row.isRefund == "1") {
return h("div", [ return h("div", [
@ -102,7 +102,11 @@ export default {
]); ]);
} else { } else {
return h("div", [ return h("div", [
h("Tag", { props: { color: "orange" } }, "未退款"), h("span", [
h("Tag", { props: { color: "orange" } }, "未退款"),
h("span", params.row.errorMessage || ''),
]),
// h("Tag", { props: { color: "orange" } }, "未退款"),
]); ]);
} }
}, },

56
seller/src/views/distribution/distributionOrder.vue
View File

@ -49,38 +49,7 @@ export default {
tooltip: true, 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: "商品名称", title: "商品名称",
key: "goodsName", key: "goodsName",
@ -94,27 +63,32 @@ export default {
sortable: false, sortable: false,
render: (h, params) => { render: (h, params) => {
if (params.row.distributionOrderStatus == "COMPLETE_CASH") { if (params.row.distributionOrderStatus == "COMPLETE_CASH") {
return h("div", "提现完成"); return h("Tag", { props: { color: "green" } },"提现完成");
} else if (params.row.distributionOrderStatus == "WAIT_BILL") { } else if (params.row.distributionOrderStatus == "WAIT_BILL") {
return h("div", "待结算"); return h("Tag", { props: { color: "blue" } } ,"待结算");
} else if (params.row.distributionOrderStatus == "WAIT_CASH") { } else if (params.row.distributionOrderStatus == "WAIT_CASH") {
return h("div", "待提现"); return h("Tag", { props: { color: "orange" } }, "待提现");
} else if (params.row.distributionOrderStatus == "CANCEL") {
return h("Tag", { props: { color: "red" } }, "订单已取消");
}else if (params.row.distributionOrderStatus == "REFUND") {
return h("Tag", { props: { color: "magenta" } }, "退款");
} }
}, },
}, },
{ {
title: "佣金金额", title: "佣金金额",
key: "rebateGrade", key: "rebate",
width: 120, width: 120,
sortable: false, sortable: false,
render: (h, params) => { render: (h, params) => {
if (params.row.rebateGrade == null) { if (params.row.rebate == null) {
return h("div", this.$options.filters.unitPrice(0, "￥")); return h("div", this.$options.filters.unitPrice(0, "￥"));
} else { } else {
return h( return h(
"div", "div",
this.$options.filters.unitPrice(params.row.rebateGrade, "￥") this.$options.filters.unitPrice(params.row.rebate, "￥")
); );
} }
}, },
@ -125,6 +99,12 @@ export default {
width: 180, width: 180,
sortable: false, sortable: false,
}, },
{
title: "解冻日期（T+1）",
key: "settleCycle",
width: 180,
sortable: false,
},
], ],
data: [], // 表单数据 data: [], // 表单数据
total: 0, // 表单数据总数 total: 0, // 表单数据总数