剩余需求,此版本部分访问地址还是指向本地,下一版代码进行修改

This commit is contained in:
1378012178@qq.com 2025-02-28 15:59:25 +08:00
parent 8723f38b54
commit c05f7ed2c8
41 changed files with 19032 additions and 4332 deletions

View File

@ -1,5 +1,5 @@
## 盛安到家1.0管理系统
- 盛安到家1.0管理系统基于vue、element-ui构建开发实现盛安到家1.0管理系统前端功能,提供一套更优的前端解决方案
## 盛安小象1.0管理系统
- 盛安小象1.0管理系统基于vue、element-ui构建开发实现盛安小象1.0管理系统前端功能,提供一套更优的前端解决方案
- 前后端分离通过token进行数据交互可独立部署
- 主题定制通过scss变量统一一站式定制
- 动态菜单,通过菜单管理统一管理访问路由

View File

@ -15,8 +15,8 @@ module.exports = {
proxyTable: devEnv.OPEN_PROXY === false ? {} : {
'/proxyApi': {
// target: "https://sausers.blxinchuang.com/sqx_fast/",
// target: "http://192.168.2.222:8187/sqx_fast/",
target: "https://admin.sjajk.com/sqx_fast/", //生产需替换
target: "http://localhost:8187/sqx_fast/",
// target: "https://admin.sjajk.com/sqx_fast/", //生产需替换
changeOrigin: true,
pathRewrite: {
'^/proxyApi': ''

View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<!-- <script type="text/javascript" src="//api.map.baidu.com/api?v=2.0&ak=miP4RMG1yZoROVRSqTPghvUaRb68iGUB"></script> -->
<title>盛安到家1.0系统</title>
<title>盛安小象1.0系统</title>
<% if (process.env.NODE_ENV === 'production') { %>
<!-- 生产环境 -->
<script>document.write('<script src="./config/index.js?t=' + new Date().getTime() + '"><\/script>');</script>

14185
pnpm-lock.yaml Normal file

File diff suppressed because it is too large Load Diff

View File

@ -21,6 +21,41 @@ const globalRoutes = [
{ path: '/login', component: _import('common/login'), name: 'login', meta: { title: '登录' } }
]
// 添加 dashboard 到 globalRoutes
globalRoutes.push({
path: '/dashboard',
component: _import('common/dashboard'),
name: 'dashboard',
meta: { title: '驾驶舱', isTab: true },
beforeEnter(to, from, next) {
let token = Vue.cookie.get('token')
if (!token || !/\S/.test(token)) {
clearLoginInfo()
next({ name: 'login' })
}
next();
}
});
// 添加 dashboard 到 globalRoutes
globalRoutes.push({
path: '/dashboard_',
component: _import('common/dashboard'),
name: 'dashboard_',
meta: { title: '驾驶舱', isTab: true },
beforeEnter(to, from, next) {
let token = Vue.cookie.get('token')
if (!token || !/\S/.test(token)) {
clearLoginInfo()
next({ name: 'login' })
}
// next()
window.open('/dashboard', '_blank');
// 取消当前导航
next(false);
}
});
// 主入口路由(需嵌套上左右整体布局)
const mainRoutes = {
path: '/',
@ -156,7 +191,7 @@ const mainRoutes = {
{ path: '/artificerPartitioningDetails', component: _import('bl/artificer/artificerPartitioningDetails'), name: 'artificerPartitioningDetails', meta: { title: '技师分成明细配置列表', isTab: true } },
{ path: '/artificerRechargeReward', component: _import('bl/artificer/artificerRechargeReward'), name: 'artificerRechargeReward', meta: { title: '技师充值奖励配置列表', isTab: true } },
{ path: '/blPingjiaTag', component: _import('bl/pingjiaTag/blPingjiaTag'), name: 'blPingjiaTag', meta: { title: '用户评价标签', isTab: true } },
{ path: '/shipinquan', component: _import('bl/shipinquan/shipinquan'), name: 'shipinquan', meta: { title: '视频圈', isTab: true } },
{ path: '/shipinquan', component: _import('bl/shipinquan/shipinquan'), name: 'shipinquan', meta: { title: '视频圈', isTab: true } }
],
beforeEnter(to, from, next) {
let token = Vue.cookie.get('token')

View File

@ -1,7 +1,7 @@
import Vue from 'vue'
const serverUrl = "https://admin.sjajk.com/sqx_fast/";//生产需替换
// const serverUrl = "http://192.168.2.222:8187/sqx_fast/";
// const serverUrl = "https://admin.sjajk.com/sqx_fast/";//生产需替换
const serverUrl = "http://localhost:8187/sqx_fast/";
// const serverUrl = "http://120.46.52.165/sqx_fast/";
// const serverUrl = "https://sausers.blxinchuang.com/sqx_fast/";

View File

@ -3,10 +3,7 @@
<!-- 列表 -->
<div style="display: inline-block">
<span>状态</span>
<el-select
clearable
v-model="status"
style="width: 150px;">
<el-select clearable v-model="status" style="width: 150px;">
<el-option value="" label="全部"></el-option>
<el-option value="0" label="申请中"></el-option>
<el-option value="1" label="已授权"></el-option>
@ -15,123 +12,66 @@
</div>
<div style="margin-left:10px;display: inline-block">
<span>姓名</span>
<el-input
style="width: 200px"
placeholder="请输入姓名"
v-model="name">
<el-input style="width: 200px" placeholder="请输入姓名" v-model="name">
</el-input>
</div>
<div style="margin-left:10px;display: inline-block">
<span>电话</span>
<el-input
style="width: 200px"
placeholder="请输入电话"
v-model="phone">
<el-input style="width: 200px" placeholder="请输入电话" v-model="phone">
</el-input>
</div>
<div style="margin-left:10px;display: inline-block;">
<span>申请开始时间</span>
<el-date-picker style="width: 160px;" v-model="startTime" align="right"
type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择开始时间">
<el-date-picker style="width: 160px;" v-model="startTime" align="right" type="datetime" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" placeholder="选择开始时间">
</el-date-picker>&nbsp;&nbsp;&nbsp;
</div>
<div style="margin-left:10px;display: inline-block;">
<span>申请截止时间</span>
<el-date-picker style="width: 160px;" v-model="endTime" align="right" type="datetime"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择截止时间">
<el-date-picker style="width: 160px;" v-model="endTime" align="right" type="datetime" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" placeholder="选择截止时间">
</el-date-picker>
</div>
<el-button
style="margin-left: 10px"
size="mini"
type="primary"
icon="document"
@click="handleSelect"
>查询
<el-button style="margin-left: 10px" size="mini" type="primary" icon="document" @click="handleSelect">查询
</el-button>
<el-button
style="margin-left: 10px"
size="mini"
type="primary"
icon="document"
@click="handleClear"
>重置
<el-button style="margin-left: 10px" size="mini" type="primary" icon="document" @click="handleClear">重置
</el-button>
<el-table v-loading="tableDataLoading" :data="tableData.list">
<el-table-column
prop="id"
label="编号"
width="80"
>
<el-table-column prop="id" label="编号" width="80">
</el-table-column>
<el-table-column
prop="userId"
label="用户ID"
width="80"
>
<el-table-column prop="userId" label="用户ID" width="80">
</el-table-column>
<el-table-column prop="avatar" label="头像">
<template slot-scope="scope">
<img
v-if="scope.row.avatar && scope.row.avatar != ''"
:src="scope.row.avatar"
width="40"
height="40"
/>
<img v-if="scope.row.avatar && scope.row.avatar != ''" :src="scope.row.avatar" width="40"
height="40" />
<span v-else>暂无图片</span>
</template>
</el-table-column>
<el-table-column
prop="userName"
label="昵称"
width="120"
>
<el-table-column prop="userName" label="昵称" width="120">
</el-table-column>
<el-table-column
prop="name"
label="姓名"
width="120"
>
<el-table-column prop="name" label="姓名" width="120">
</el-table-column>
<el-table-column
prop="phone"
label="手机号"
width="120"
>
<el-table-column prop="phone" label="手机号" width="120">
</el-table-column>
<el-table-column
prop="level"
label="等级"
width="120"
>
<el-table-column prop="level" label="等级" width="120">
<template slot-scope="scope">
<span v-if="scope.row.level == 1">一级</span>
<span v-if="scope.row.level == 2">二级</span>
</template>
</el-table-column>
<el-table-column
prop="agent"
label="所属代理商"
width="120"
>
<el-table-column prop="agent" label="所属代理商" width="120">
</el-table-column>
<el-table-column
prop="superiorFxy"
label="上级分销"
width="120"
>
<el-table-column prop="superiorFxy" label="上级分销" width="120">
</el-table-column>
<el-table-column
prop="remarks"
label="备注"
width="150"
>
<el-table-column prop="remarks" label="备注" width="150">
</el-table-column>
<el-table-column
prop="createTime"
label="申请时间"
width="150"
>
<el-table-column prop="createTime" label="申请时间" width="150">
</el-table-column>
<el-table-column label="到期时间" width="150">
<template slot-scope="scope">
{{ calcDqsj(scope.row) }}
</template>
</el-table-column>
<el-table-column label="状态" prop="status">
<template slot-scope="scope">
@ -140,148 +80,77 @@
</el-table-column>
<el-table-column label="操作" prop="id" width="300" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
style="margin: 5px"
@click="handleView(scope.row)"
>查看
<el-button size="mini" type="primary" style="margin: 5px" @click="handleView(scope.row)">查看
</el-button>
<el-button v-if="scope.row.status == 0"
size="mini"
type="primary"
style="margin: 5px"
@click="handleEdit(scope.row)"
>修改
<el-button v-if="scope.row.status == 0" size="mini" type="primary" style="margin: 5px"
@click="handleEdit(scope.row)">修改
</el-button>
<el-button v-if="scope.row.status == 0"
size="mini"
type="primary"
style="margin: 5px"
@click="handleDelete(scope.row)"
>删除
<el-button v-if="scope.row.status == 0" size="mini" type="primary" style="margin: 5px"
@click="handleDelete(scope.row)">删除
</el-button>
<el-button v-if="scope.row.status != 1"
size="mini"
type="primary"
style="margin: 5px"
@click="handleApply(scope.row)"
>授权
<el-button v-if="scope.row.status != 1" size="mini" type="primary" style="margin: 5px"
@click="handleApply(scope.row)">授权
</el-button>
<el-button v-if="scope.row.status == 1 || scope.row.status == 2"
size="mini"
type="primary"
style="margin: 5px"
@click="handleCancelApply(scope.row)"
>取消授权
<el-button v-if="scope.row.status == 1 || scope.row.status == 2" size="mini" type="primary"
style="margin: 5px" @click="handleCancelApply(scope.row)">取消授权
</el-button>
<el-button v-if="scope.row.status == 1"
size="mini"
type="primary"
style="margin: 5px"
@click="handleAgent(scope.row)"
>修改代理
</el-button>
<el-button v-if="scope.row.status == 1 && scope.row.blFxyLevel == 1"
size="mini"
type="primary"
style="margin: 5px"
@click="handleSuperiorFxyView(scope.row)"
>修改上级分销
<!-- <el-button v-if="scope.row.status == 1" size="mini" type="primary" style="margin: 5px"
@click="handleAgent(scope.row)">修改代理
</el-button> -->
<el-button v-if="scope.row.status == 1 && scope.row.blFxyLevel == 1" size="mini" type="primary"
style="margin: 5px" @click="handleSuperiorFxyView(scope.row)">修改上级分销
</el-button>
</template>
</el-table-column>
</el-table>
<div style="text-align: center; margin-top: 10px">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:page-sizes="[10, 20, 30, 40]"
:page-size="limit"
:current-page="page"
layout="total,sizes, prev, pager, next,jumper"
:total="tableData.totalCount"
>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
:page-sizes="[10, 20, 30, 40]" :page-size="limit" :current-page="page"
layout="total,sizes, prev, pager, next,jumper" :total="tableData.totalCount">
</el-pagination>
</div>
<!-- 查看 -->
<el-dialog :title="titles" :visible.sync="dialogFormViewVisible" center @close="closeFxy">
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right">用户ID</span>
<el-input
style="width: 50%"
v-model="userId"
type="text"
placeholder=""
:disabled="true"
>
<el-input style="width: 50%" v-model="userId" type="text" placeholder="" :disabled="true">
</el-input>
</div>
<div style="margin-bottom: 10px; display: flex">
<span style="width: 200px; display: inline-block; text-align: right">头像</span>
<div
style="
<div style="
width: 148px;
height: 148px;
border: 1px dashed #c0ccda;
border-radius: 6px;
text-align: center;
line-height: 148px;
"
>
<img
:src="avatar"
class="avatar"
style="border-radius: 6px; width: 148px; height: 148px"
/>
">
<img :src="avatar" class="avatar" style="border-radius: 6px; width: 148px; height: 148px" />
</div>
</div>
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right">昵称</span>
<el-input
style="width: 50%"
v-model="userName"
:disabled="true"
></el-input>
<el-input style="width: 50%" v-model="userName" :disabled="true"></el-input>
</div>
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right">姓名</span>
<el-input
style="width: 50%"
v-model="name"
:disabled="true"
></el-input>
<el-input style="width: 50%" v-model="name" :disabled="true"></el-input>
</div>
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right">手机号</span>
<el-input
style="width: 50%"
v-model="phone"
:disabled="true"
></el-input>
<el-input style="width: 50%" v-model="phone" :disabled="true"></el-input>
</div>
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right">等级</span>
<el-select
clearable
v-model="level"
style="width: 150px;"
:disabled="true">
<el-select clearable v-model="level" style="width: 150px;" :disabled="true">
<el-option :value="1" :key="1" label="一级"></el-option>
<el-option :value="2" :key="2" label="二级"></el-option>
</el-select>&nbsp;&nbsp;
</div>
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right"
>备注</span
>
<el-input
style="width: 50%"
v-model="remarks"
type="textarea"
:rows="4"
:disabled="true"
>
<span style="width: 200px; display: inline-block; text-align: right">备注</span>
<el-input style="width: 50%" v-model="remarks" type="textarea" :rows="4" :disabled="true">
</el-input>
</div>
<div style="margin-bottom: 10px">
@ -293,13 +162,7 @@
</div>
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right">审批意见</span>
<el-input
style="width: 50%"
v-model="opinion"
type="textarea"
:rows="4"
:disabled="true"
>
<el-input style="width: 50%" v-model="opinion" type="textarea" :rows="4" :disabled="true">
</el-input>
</div>
<div slot="footer" class="dialog-footer">
@ -310,79 +173,44 @@
<el-dialog :title="titles" :visible.sync="dialogFormVisible" center @close="closeFxy">
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right">用户ID</span>
<el-input
style="width: 50%"
v-model="userId"
type="text"
placeholder="请选择用户"
:disabled="true"
>
<el-input style="width: 50%" v-model="userId" type="text" placeholder="请选择用户" :disabled="true">
</el-input>
</div>
<div style="margin-bottom: 10px; display: flex">
<span style="width: 200px; display: inline-block; text-align: right">头像</span>
<div
style="
<div style="
width: 148px;
height: 148px;
border: 1px dashed #c0ccda;
border-radius: 6px;
text-align: center;
line-height: 148px;
"
>
<img
:src="avatar"
class="avatar"
style="border-radius: 6px; width: 148px; height: 148px"
/>
">
<img :src="avatar" class="avatar" style="border-radius: 6px; width: 148px; height: 148px" />
</div>
</div>
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right">昵称</span>
<el-input
style="width: 50%"
v-model="userName"
:disabled="true"
></el-input>
<el-input style="width: 50%" v-model="userName" :disabled="true"></el-input>
</div>
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right">姓名</span>
<el-input
style="width: 50%"
v-model="name"
placeholder="请输入姓名"
></el-input>
<el-input style="width: 50%" v-model="name" placeholder="请输入姓名"></el-input>
</div>
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right">手机号</span>
<el-input
style="width: 50%"
v-model="phone"
placeholder="请输入手机号"
></el-input>
<el-input style="width: 50%" v-model="phone" placeholder="请输入手机号"></el-input>
</div>
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right">等级</span>
<el-select
clearable
v-model="level"
style="width: 150px;">
<el-select clearable v-model="level" style="width: 150px;">
<el-option :value="1" :key="1" label="一级"></el-option>
<el-option :value="2" :key="2" label="二级"></el-option>
</el-select>&nbsp;&nbsp;
</div>
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right"
>备注</span
>
<el-input
style="width: 50%"
v-model="remarks"
type="textarea"
:rows="4"
placeholder="请输入备注"
>
<span style="width: 200px; display: inline-block; text-align: right">备注</span>
<el-input style="width: 50%" v-model="remarks" type="textarea" :rows="4" placeholder="请输入备注">
</el-input>
</div>
<div slot="footer" class="dialog-footer">
@ -394,52 +222,27 @@
<el-dialog title="上级分销员列表" :visible.sync="dialogFxyListFormVisible" width="60%" center>
<div style="margin-left: 10px; display: inline-block;">
<span>昵称</span>
<el-input
style="width: 200px"
placeholder="请输入姓名"
v-model="fxyName"
></el-input>
<el-input style="width: 200px" placeholder="请输入姓名" v-model="fxyName"></el-input>
</div>
<div style="margin-left: 10px; display: inline-block">
<span>手机号</span>
<el-input
style="width: 200px"
placeholder="请输入手机号"
v-model="fxyPhone"
></el-input>
<el-input style="width: 200px" placeholder="请输入手机号" v-model="fxyPhone"></el-input>
</div>
<div style="margin-left: 10px; display: inline-block">
<span>邀请码</span>
<el-input
style="width: 200px"
placeholder="请输入邀请码"
v-model="invitationCode"
></el-input>
<el-input style="width: 200px" placeholder="请输入邀请码" v-model="invitationCode"></el-input>
</div>
<el-button
style="margin-left: 10px;"
size="mini"
type="primary"
icon="document"
<el-button style="margin-left: 10px;" size="mini" type="primary" icon="document"
@click="handleSelectSuperiorFxy">查询
</el-button>
<el-button
style="margin-left: 10px"
size="mini"
type="primary"
icon="document"
@click="handleClearFxy">重置
<el-button style="margin-left: 10px" size="mini" type="primary" icon="document" @click="handleClearFxy">重置
</el-button>
<el-table :data="fxyTableData.list" style="width: 100%">
<el-table-column prop="userId" label="用户ID"></el-table-column>
<el-table-column prop="avatar" label="头像">
<template slot-scope="scope">
<img
v-if="scope.row.avatar && scope.row.avatar != ''"
:src="scope.row.avatar"
width="40"
height="40"
/>
<img v-if="scope.row.avatar && scope.row.avatar != ''" :src="scope.row.avatar" width="40"
height="40" />
<span v-else>暂无图片</span>
</template>
</el-table-column>
@ -448,26 +251,16 @@
<el-table-column prop="invitationCode" label="邀请码"></el-table-column>
<el-table-column label="操作" prop="id">
<template slot-scope="scope">
<el-button
style="margin: 10px 0"
size="mini"
type="primary"
icon="document"
@click="handleAddFxy(scope.row)"
>设置
<el-button style="margin: 10px 0" size="mini" type="primary" icon="document"
@click="handleAddFxy(scope.row)">设置
</el-button>
</template>
</el-table-column>
</el-table>
<div style="text-align: center; margin-top: 10px">
<el-pagination
@size-change="handleFxySizeChange"
@current-change="handleFxyCurrentChange"
:page-size="fxyLimit"
:current-page="fxyPage"
layout="total, prev, pager, next,jumper"
:total="fxyTableData.totalCount"
></el-pagination>
<el-pagination @size-change="handleFxySizeChange" @current-change="handleFxyCurrentChange"
:page-size="fxyLimit" :current-page="fxyPage" layout="total, prev, pager, next,jumper"
:total="fxyTableData.totalCount"></el-pagination>
</div>
</el-dialog>
<!-- <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<用户列表<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -->
@ -475,82 +268,44 @@
<el-dialog :title="titles" :visible.sync="dialogApproveFormVisible" center @close="closeFxy">
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right">用户ID</span>
<el-input
style="width: 50%"
v-model="userId"
type="text"
placeholder="请选择用户"
:disabled="true"
>
<el-input style="width: 50%" v-model="userId" type="text" placeholder="请选择用户" :disabled="true">
</el-input>
</div>
<div style="margin-bottom: 10px; display: flex">
<span style="width: 200px; display: inline-block; text-align: right">头像</span>
<div
style="
<div style="
width: 148px;
height: 148px;
border: 1px dashed #c0ccda;
border-radius: 6px;
text-align: center;
line-height: 148px;
"
>
<img
:src="avatar"
class="avatar"
style="border-radius: 6px; width: 148px; height: 148px"
/>
">
<img :src="avatar" class="avatar" style="border-radius: 6px; width: 148px; height: 148px" />
</div>
</div>
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right">昵称</span>
<el-input
style="width: 50%"
v-model="userName"
:disabled="true"
></el-input>
<el-input style="width: 50%" v-model="userName" :disabled="true"></el-input>
</div>
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right">姓名</span>
<el-input
style="width: 50%"
v-model="name"
placeholder="请输入姓名"
:disabled="true"
></el-input>
<el-input style="width: 50%" v-model="name" placeholder="请输入姓名" :disabled="true"></el-input>
</div>
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right">手机号</span>
<el-input
style="width: 50%"
v-model="phone"
placeholder="请输入手机号"
:disabled="true"
></el-input>
<el-input style="width: 50%" v-model="phone" placeholder="请输入手机号" :disabled="true"></el-input>
</div>
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right">等级</span>
<el-select
clearable
v-model="level"
style="width: 150px;"
:disabled="true">
<el-select clearable v-model="level" style="width: 150px;" :disabled="true">
<el-option :value="1" :key="1" label="一级"></el-option>
<el-option :value="2" :key="2" label="二级"></el-option>
</el-select>&nbsp;&nbsp;
</div>
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right"
>备注</span
>
<el-input
style="width: 50%"
v-model="remarks"
type="textarea"
:rows="4"
:disabled="true"
>
<span style="width: 200px; display: inline-block; text-align: right">备注</span>
<el-input style="width: 50%" v-model="remarks" type="textarea" :rows="4" :disabled="true">
</el-input>
</div>
<div style="margin-bottom: 10px">
@ -562,13 +317,7 @@
</div>
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right">审批意见</span>
<el-input
style="width: 50%"
v-model="opinion"
type="textarea"
:rows="4"
placeholder="请输入审批意见"
>
<el-input style="width: 50%" v-model="opinion" type="textarea" :rows="4" placeholder="请输入审批意见">
</el-input>
</div>
<div slot="footer" class="dialog-footer">
@ -613,16 +362,62 @@ export default {
fxyLimit: 10,
fxyTableData: {},
invitationCode: "",
configInfo: {},//fxmLimit 1 2 +fxmLimitDays
};
},
methods: {
addDaysToDate(createTimeStr, daysToAdd) {
// Date
let date = new Date(createTimeStr.replace(' ', 'T'));
//
date.setDate(date.getDate() + daysToAdd);
//
let year = date.getFullYear();
let month = String(date.getMonth() + 1).padStart(2, '0');
let day = String(date.getDate()).padStart(2, '0');
let hours = String(date.getHours()).padStart(2, '0');
let minutes = String(date.getMinutes()).padStart(2, '0');
let seconds = String(date.getSeconds()).padStart(2, '0');
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
},
calcDqsj(row) {
if (this.configInfo.fxmLimit == 1) return '永久'
else return this.addDaysToDate(row.createTime, this.configInfo.fxmLimitDays)
},
queryConfig() {
return new Promise((resolve, reject) => {
this.$http({
url: this.$http.adornUrl("commission/fxyConfig/info"),
method: 'get',
params: this.$http.adornParams({
id: 1,
}),
}).then(({ data }) => {
if (data && data.code === 0) {
if (data.data != null) {
resolve(data.data);
} else {
resolve({});
}
} else {
resolve({});
}
}).catch(error => {
resolve({});
});
});
},
showDictValue(data, datas) {
const dictItem = datas.find(item => data === item.id);
return dictItem ? dictItem.value : '';
},
//
handleSelect() {
async handleSelect() {
this.tableDataLoading = true;
this.configInfo = await this.queryConfig()
this.$http({
url: this.$http.adornUrl("commission/fxyApply/findPage"),
method: "get",
@ -1066,6 +861,7 @@ export default {
.customWidth {
width: 80% !important;
}
.el-dialog--center {
text-align: center;
margin-top: 1vh !important;

View File

@ -1,11 +1,18 @@
<template>
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="220px">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
label-width="250px">
<el-row>
<el-col style="background: #ff00001f;line-height: 40px;padding-left: 10px;margin-bottom: 10px;">
<span>分销员的佣金应该由该笔订单服务技师和该技师绑定的上级代理承担</span>
</el-col>
<el-col :span="12">
<el-form-item label="启用分销员功能" prop="isOpen">
<label slot="label">
启用分销员功能
<el-tooltip effect="dark" content="关闭后用户端不展示“我是经纪人”功能,并不参与分佣计算。" placement="right">
<i class="el-icon-question"></i>
</el-tooltip>
</label>
<el-radio-group v-model="dataForm.isOpen">
<el-radio :label="1">开启</el-radio>
<el-radio :label="0">关闭</el-radio>
@ -14,6 +21,15 @@
</el-col>
<el-col :span="12">
<el-form-item label="分销员审核" prop="isApprove">
<label slot="label">
分销员审核
<el-tooltip effect="dark" placement="right">
<template slot="content">
关闭后用户端不展示申请经纪人功能并不参与分佣计算
</template>
<i class="el-icon-question"></i>
</el-tooltip>
</label>
<el-radio-group v-model="dataForm.isApprove">
<el-radio :label="1">开启</el-radio>
<el-radio :label="0">关闭</el-radio>
@ -22,6 +38,15 @@
</el-col>
<el-col>
<el-form-item label="分销提成方式" prop="type">
<label slot="label">
分销提成方式
<!-- <el-tooltip effect="dark" placement="right">
<template slot="content">
abc
</template>
<i class="el-icon-question"></i>
</el-tooltip> -->
</label>
<el-radio-group v-model="dataForm.type">
<el-radio :label="1">按人员来提成</el-radio>
<el-radio :label="2">按服务项目来提成</el-radio>
@ -30,46 +55,88 @@
</el-col>
<el-col :span="12">
<el-form-item label="一级分销返佣(%)" prop="oneRate">
<el-input-number v-model="dataForm.oneRate" controls-position="right" :precision="2" :min="0" :step="1"/>
<label slot="label">
一级分销返佣(%)
<el-tooltip effect="dark" placement="right">
<template slot="content">
一级分销员分佣计算所使用的比例当为0时取一级推荐提成比例
</template>
<i class="el-icon-question"></i>
</el-tooltip>
</label>
<el-input-number v-model="dataForm.oneRate" controls-position="right" :precision="2" :min="0"
:step="1" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="二级分销返佣(%)" prop="twoRate">
<el-input-number v-model="dataForm.twoRate" controls-position="right" :precision="2" :min="0" :step="1"/>
<label slot="label">
二级分销返佣(%)
<el-tooltip effect="dark" placement="right">
<template slot="content">
二级分销员分佣计算所使用的比例当为0时取二级推荐提成比例
</template>
<i class="el-icon-question"></i>
</el-tooltip>
</label>
<el-input-number v-model="dataForm.twoRate" controls-position="right" :precision="2" :min="0"
:step="1" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="技师承担(%)" prop="artificerRate">
<el-input-number v-model="dataForm.artificerRate" controls-position="right" :precision="2" :min="0" :step="1"/>
<label slot="label">
技师承担(%)
<el-tooltip effect="dark" placement="right">
<template slot="content">
一级分销员分佣费用从技师身上扣除的百分比
</template>
<i class="el-icon-question"></i>
</el-tooltip>
</label>
<el-input-number v-model="dataForm.artificerRate" controls-position="right" :precision="2" :min="0"
:step="1" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="技师所属代理承担(%)" prop="agentRate">
<el-input-number v-model="dataForm.agentRate" controls-position="right" :precision="2" :min="0" :step="1"/>
<label slot="label">
技师所属代理承担(%)
<el-tooltip effect="dark" placement="right">
<template slot="content">
二级分销员分佣费用从技师身上扣除的百分比
</template>
<i class="el-icon-question"></i>
</el-tooltip>
</label>
<el-input-number v-model="dataForm.agentRate" controls-position="right" :precision="2" :min="0"
:step="1" />
</el-form-item>
</el-col>
<el-col>
<el-form-item label="邀请用户/下级返佣最高比例(%)" prop="mostRate">
<el-input-number v-model="dataForm.mostRate" controls-position="right" :precision="2" :min="0" :step="1"/>
<label slot="label">
邀请用户/下级返佣最高比例(%)
<el-tooltip effect="dark" placement="right">
<template slot="content">
二级分销员从一级分销员身上分润最大百分比如此处设置10%一级分销员分佣5元二级分销员从一级分销员分润5元*10%
</template>
<i class="el-icon-question"></i>
</el-tooltip>
</label>
<el-input-number v-model="dataForm.mostRate" controls-position="right" :precision="2" :min="0"
:step="1" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邀请用户推广海报背景图" prop="userImage">
<div style="width: 148px;height: 148px;border: 1px dashed #c0ccda;border-radius: 6px;text-align: center;line-height: 148px;">
<el-upload
class="avatar-uploader"
v-model="dataForm.userImage"
:action="uploadUrl"
:show-file-list="false"
:on-success="handleUserImageSuccess"
:on-progress="onUserImageProgress"
>
<img
v-if="dataForm.userImage != ''"
:src="dataForm.userImage"
class="avatar"
style="border-radius: 6px; width: 148px; height: 148px"
/>
<div
style="width: 148px;height: 148px;border: 1px dashed #c0ccda;border-radius: 6px;text-align: center;line-height: 148px;">
<el-upload class="avatar-uploader" v-model="dataForm.userImage" :action="uploadUrl"
:show-file-list="false" :on-success="handleUserImageSuccess"
:on-progress="onUserImageProgress">
<img v-if="dataForm.userImage != ''" :src="dataForm.userImage" class="avatar"
style="border-radius: 6px; width: 148px; height: 148px" />
<i v-else class="el-icon-plus avatar-uploader-icon iconss"></i>
</el-upload>
</div>
@ -77,21 +144,13 @@
</el-col>
<el-col :span="12">
<el-form-item label="邀请分销员推广海报背景图" prop="fxyImage">
<div style="width: 148px;height: 148px;border: 1px dashed #c0ccda;border-radius: 6px;text-align: center;line-height: 148px;">
<el-upload
class="avatar-uploader"
v-model="dataForm.fxyImage"
:action="uploadUrl"
:show-file-list="false"
:on-success="handleFxyImageSuccess"
:on-progress="onFxyImageProgress"
>
<img
v-if="dataForm.fxyImage != ''"
:src="dataForm.fxyImage"
class="avatar"
style="border-radius: 6px; width: 148px; height: 148px"
/>
<div
style="width: 148px;height: 148px;border: 1px dashed #c0ccda;border-radius: 6px;text-align: center;line-height: 148px;">
<el-upload class="avatar-uploader" v-model="dataForm.fxyImage" :action="uploadUrl"
:show-file-list="false" :on-success="handleFxyImageSuccess"
:on-progress="onFxyImageProgress">
<img v-if="dataForm.fxyImage != ''" :src="dataForm.fxyImage" class="avatar"
style="border-radius: 6px; width: 148px; height: 148px" />
<i v-else class="el-icon-plus avatar-uploader-icon iconss"></i>
</el-upload>
</div>
@ -102,22 +161,62 @@
</el-col>
<el-col :span="12">
<el-form-item label="一级分销员门槛费" prop="oneFee">
<el-input-number v-model="dataForm.oneFee" controls-position="right" :precision="2" :min="0" :step="1"/>
<label slot="label">
一级分销员门槛费
<el-tooltip effect="dark" placement="right">
<template slot="content">
申请一级分销员时所缴的手续费
</template>
<i class="el-icon-question"></i>
</el-tooltip>
</label>
<el-input-number v-model="dataForm.oneFee" controls-position="right" :precision="2" :min="0"
:step="1" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="一级推荐提成(%)" prop="oneRecommendRate">
<el-input-number v-model="dataForm.oneRecommendRate" controls-position="right" :precision="2" :min="0" :step="1"/>
<label slot="label">
一级推荐提成(%)
<el-tooltip effect="dark" placement="right">
<template slot="content">
一级分销员推荐提成比例
</template>
<i class="el-icon-question"></i>
</el-tooltip>
</label>
<el-input-number v-model="dataForm.oneRecommendRate" controls-position="right" :precision="2"
:min="0" :step="1" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="二级分销员门槛费" prop="twoFee">
<el-input-number v-model="dataForm.twoFee" controls-position="right" :precision="2" :min="0" :step="1"/>
<label slot="label">
二级分销员门槛费
<el-tooltip effect="dark" placement="right">
<template slot="content">
申请二级分销员时所缴的手续费
</template>
<i class="el-icon-question"></i>
</el-tooltip>
</label>
<el-input-number v-model="dataForm.twoFee" controls-position="right" :precision="2" :min="0"
:step="1" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="二级推荐提成(%)" prop="twoRecommendRate">
<el-input-number v-model="dataForm.twoRecommendRate" controls-position="right" :precision="2" :min="0" :step="1"/>
<label slot="label">
二级推荐提成(%)
<el-tooltip effect="dark" placement="right">
<template slot="content">
二级分销员推荐提成比例
</template>
<i class="el-icon-question"></i>
</el-tooltip>
</label>
<el-input-number v-model="dataForm.twoRecommendRate" controls-position="right" :precision="2"
:min="0" :step="1" />
</el-form-item>
</el-col>
<el-col style="background: rgb(0,161,255,0.12);line-height: 40px;padding-left: 10px;margin-bottom: 10px;">
@ -125,6 +224,16 @@
</el-col>
<el-col>
<el-form-item label="分销码时效性" prop="fxmLimit">
<label slot="label">
分销码时效性
<el-tooltip effect="dark" placement="right">
<template slot="content">
永久性分销员分佣无时间天数限制<br/>
限制时效天数分销员有效分佣天数=注册开始时间+配置天数
</template>
<i class="el-icon-question"></i>
</el-tooltip>
</label>
<el-radio-group v-model="dataForm.fxmLimit">
<el-radio :label="1">永久性</el-radio>
<el-radio :label="2">限制时效天数</el-radio>
@ -133,7 +242,8 @@
</el-col>
<el-col v-if="dataForm.fxmLimit == 2">
<el-form-item label="" prop="fxmLimitDays">
<el-input-number v-model="dataForm.fxmLimitDays" controls-position="right" :precision="2" :min="0" :step="1"/>
<el-input-number v-model="dataForm.fxmLimitDays" controls-position="right" :precision="2" :min="0"
:step="1" />
</el-form-item>
</el-col>
<el-col>

View File

@ -3,190 +3,107 @@
<!-- 列表 -->
<div style="margin-left:10px;display: inline-block">
<span>姓名</span>
<el-input
style="width: 200px"
placeholder="请输入姓名"
v-model="name">
<el-input style="width: 200px" placeholder="请输入姓名" v-model="name">
</el-input>
</div>
<div style="margin-left:10px;display: inline-block">
<span>电话</span>
<el-input
style="width: 200px"
placeholder="请输入电话"
v-model="phone">
<el-input style="width: 200px" placeholder="请输入电话" v-model="phone">
</el-input>
</div>
<div style="margin-left:10px;display: inline-block;">
<span>入驻开始时间</span>
<el-date-picker style="width: 160px;" v-model="startTime" align="right"
type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择开始时间">
<el-date-picker style="width: 160px;" v-model="startTime" align="right" type="datetime" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" placeholder="选择开始时间">
</el-date-picker>&nbsp;&nbsp;&nbsp;
</div>
<div style="margin-left:10px;display: inline-block;">
<span>入驻截止时间</span>
<el-date-picker style="width: 160px;" v-model="endTime" align="right" type="datetime"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择截止时间">
<el-date-picker style="width: 160px;" v-model="endTime" align="right" type="datetime" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" placeholder="选择截止时间">
</el-date-picker>
</div>
<el-button
style="margin-left: 10px"
size="mini"
type="primary"
icon="document"
@click="handleSelect"
>查询
<el-button style="margin-left: 10px" size="mini" type="primary" icon="document" @click="handleSelect">查询
</el-button>
<el-button
style="margin-left: 10px"
size="mini"
type="primary"
icon="document"
@click="handleClear"
>重置
<el-button style="margin-left: 10px" size="mini" type="primary" icon="document" @click="handleClear">重置
</el-button>
<el-table v-loading="tableDataLoading" :data="tableData.list">
<el-table-column
prop="id"
label="编号"
width="80"
>
<el-table-column prop="id" label="编号" width="80">
</el-table-column>
<el-table-column
prop="userId"
label="用户ID"
width="150"
>
<el-table-column prop="userId" label="用户ID">
</el-table-column>
<el-table-column prop="avatar" label="头像">
<template slot-scope="scope">
<img
v-if="scope.row.avatar && scope.row.avatar != ''"
:src="scope.row.avatar"
width="40"
height="40"
/>
<img v-if="scope.row.avatar && scope.row.avatar != ''" :src="scope.row.avatar" width="40"
height="40" />
<span v-else>暂无图片</span>
</template>
</el-table-column>
<el-table-column
prop="userName"
label="昵称"
width="150"
>
<el-table-column label="级别">
<template slot-scope="scope">
<span>{{ calcLevel(scope.row) }}</span>
</template>
</el-table-column>
<el-table-column
prop="name"
label="姓名"
width="150"
>
<el-table-column label="提成比例">
<template slot-scope="scope">
<span>{{ calcRate(scope.row) }}</span>
</template>
</el-table-column>
<el-table-column
prop="phone"
label="手机号"
width="150"
>
<el-table-column prop="userName" label="昵称">
</el-table-column>
<el-table-column
prop="approveTime"
label="入驻时间"
width="180"
>
<el-table-column prop="name" label="姓名">
</el-table-column>
<el-table-column
prop="artificerCount"
label="累计邀请技师"
width="150"
align="right"
>
<el-table-column prop="phone" label="手机号" width="150">
</el-table-column>
<el-table-column
prop="ordersCount"
label="累计成交订单数量"
width="150"
align="right"
>
<el-table-column prop="approveTime" label="入驻时间" width="180">
</el-table-column>
<el-table-column
prop="money"
label="累计获得佣金"
width="150"
align="right"
>
<el-table-column prop="artificerCount" label="累计邀请技师" align="right">
</el-table-column>
<el-table-column prop="ordersCount" label="累计成交订单数量" width="150" align="right">
</el-table-column>
<el-table-column prop="money" label="累计获得佣金" width="150" align="right">
<template slot-scope="scope">
<span style="color: #3E8EF7;cursor: pointer;" @click="moneyDetail(scope.row)">{{ scope.row.money }}</span>
</template>
</el-table-column>
<el-table-column label="操作" prop="id" width="150" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
style="margin: 5px"
@click="handleInvitationView(scope.row)"
>邀请的技师
<el-button size="mini" type="primary" style="margin: 5px"
@click="handleInvitationView(scope.row)">邀请的技师
</el-button>
</template>
</el-table-column>
</el-table>
<div style="text-align: center; margin-top: 10px">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:page-sizes="[10, 20, 30, 40]"
:page-size="limit"
:current-page="page"
layout="total,sizes, prev, pager, next,jumper"
:total="tableData.totalCount"
>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
:page-sizes="[10, 20, 30, 40]" :page-size="limit" :current-page="page"
layout="total,sizes, prev, pager, next,jumper" :total="tableData.totalCount">
</el-pagination>
</div>
<!-- <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 用户列表弹框 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<-->
<el-dialog title="邀请技师列表" :visible.sync="dialogUserListFormVisible" width="60%" center @close="closeUserList">
<div style="margin-left: 10px; display: inline-block;">
<span>姓名</span>
<el-input
style="width: 200px"
placeholder="请输入姓名"
v-model="userName"
></el-input>
<el-input style="width: 200px" placeholder="请输入姓名" v-model="userName"></el-input>
</div>
<div style="margin-left: 10px; display: inline-block">
<span>手机号</span>
<el-input
style="width: 200px"
placeholder="请输入手机号"
v-model="userPhone"
></el-input>
<el-input style="width: 200px" placeholder="请输入手机号" v-model="userPhone"></el-input>
</div>
<el-button
style="margin-left: 10px;"
size="mini"
type="primary"
icon="document"
<el-button style="margin-left: 10px;" size="mini" type="primary" icon="document"
@click="handleSelectUsers">查询
</el-button>
<el-button
style="margin-left: 10px"
size="mini"
type="primary"
icon="document"
@click="handleClearUsers">重置
<el-button style="margin-left: 10px" size="mini" type="primary" icon="document" @click="handleClearUsers">重置
</el-button>
<el-button
style="margin-left: 10px"
size="mini"
type="primary"
icon="document"
<el-button style="margin-left: 10px" size="mini" type="primary" icon="document"
@click="showArtificerView">技师列表
</el-button>
<el-table :data="userTableData.list" style="width: 100%">
<el-table-column prop="userId" label="用户ID"></el-table-column>
<el-table-column prop="avatar" label="头像">
<template slot-scope="scope">
<img
v-if="scope.row.avatar && scope.row.avatar != ''"
:src="scope.row.avatar"
width="40"
height="40"
/>
<img v-if="scope.row.avatar && scope.row.avatar != ''" :src="scope.row.avatar" width="40"
height="40" />
<span v-else>暂无图片</span>
</template>
</el-table-column>
@ -194,72 +111,43 @@
<el-table-column prop="phone" label="手机号"></el-table-column>
<el-table-column label="操作" prop="id">
<template slot-scope="scope">
<el-button
style="margin: 10px 0"
size="mini"
type="primary"
icon="document"
@click="handleCancelInvitation(scope.row)"
>取消邀请
<el-button style="margin: 10px 0" size="mini" type="primary" icon="document"
@click="handleCancelInvitation(scope.row)">取消邀请
</el-button>
</template>
</el-table-column>
</el-table>
<div style="text-align: center; margin-top: 10px">
<el-pagination
@size-change="handleUserSizeChange"
@current-change="handleUserCurrentChange"
:page-size="userLimit"
:current-page="userPage"
layout="total, prev, pager, next,jumper"
:total="userTableData.totalCount"
></el-pagination>
<el-pagination @size-change="handleUserSizeChange" @current-change="handleUserCurrentChange"
:page-size="userLimit" :current-page="userPage" layout="total, prev, pager, next,jumper"
:total="userTableData.totalCount"></el-pagination>
</div>
</el-dialog>
<!-- <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<用户列表<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -->
<!-- <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 技师列表弹框 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<-->
<el-dialog title="技师列表" :visible.sync="dialogArtificerListFormVisible" width="60%" center @close="closeInvitation">
<el-dialog title="技师列表" :visible.sync="dialogArtificerListFormVisible" width="60%" center
@close="closeInvitation">
<div style="margin-left: 10px; display: inline-block;">
<span>姓名</span>
<el-input
style="width: 200px"
placeholder="请输入姓名"
v-model="artificerName"
></el-input>
<el-input style="width: 200px" placeholder="请输入姓名" v-model="artificerName"></el-input>
</div>
<div style="margin-left: 10px; display: inline-block">
<span>手机号</span>
<el-input
style="width: 200px"
placeholder="请输入手机号"
v-model="artificerPhone"
></el-input>
<el-input style="width: 200px" placeholder="请输入手机号" v-model="artificerPhone"></el-input>
</div>
<el-button
style="margin-left: 10px;"
size="mini"
type="primary"
icon="document"
<el-button style="margin-left: 10px;" size="mini" type="primary" icon="document"
@click="handleSelectArtificer">查询
</el-button>
<el-button
style="margin-left: 10px"
size="mini"
type="primary"
icon="document"
<el-button style="margin-left: 10px" size="mini" type="primary" icon="document"
@click="handleClearArtificers">重置
</el-button>
<el-table :data="artificerTableData.list" style="width: 100%">
<el-table-column prop="userId" label="用户ID"></el-table-column>
<el-table-column prop="avatar" label="头像">
<template slot-scope="scope">
<img
v-if="scope.row.avatar && scope.row.avatar != ''"
:src="scope.row.avatar"
width="40"
height="40"
/>
<img v-if="scope.row.avatar && scope.row.avatar != ''" :src="scope.row.avatar" width="40"
height="40" />
<span v-else>暂无图片</span>
</template>
</el-table-column>
@ -267,30 +155,33 @@
<el-table-column prop="phone" label="手机号"></el-table-column>
<el-table-column label="操作" prop="id">
<template slot-scope="scope">
<el-button
style="margin: 10px 0"
size="mini"
type="primary"
icon="document"
@click="handleInvitation(scope.row)"
>邀请
<el-button style="margin: 10px 0" size="mini" type="primary" icon="document"
@click="handleInvitation(scope.row)">邀请
</el-button>
</template>
</el-table-column>
</el-table>
<div style="text-align: center; margin-top: 10px">
<el-pagination
@size-change="handleArtificerSizeChange"
@current-change="handleArtificerCurrentChange"
:page-size="artificerLimit"
:current-page="artificerPage"
layout="total, prev, pager, next,jumper"
:total="artificerTableData.totalCount"
></el-pagination>
<el-pagination @size-change="handleArtificerSizeChange" @current-change="handleArtificerCurrentChange"
:page-size="artificerLimit" :current-page="artificerPage" layout="total, prev, pager, next,jumper"
:total="artificerTableData.totalCount"></el-pagination>
</div>
</el-dialog>
<!-- <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<技师列表<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -->
<!-- <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 佣金详细信息弹框 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<-->
<el-dialog title="佣金详细信息列表" :visible.sync="yjxxVisible" width="60%" center @close="yjxxVisible = false">
<el-table :data="moneyDetailData.list" style="width: 100%">
<el-table-column prop="createTime" label="日期"></el-table-column>
<el-table-column prop="money" label="金额"></el-table-column>
<el-table-column prop="title" label="详情"></el-table-column>
</el-table>
<div style="text-align: center; margin-top: 10px">
<el-pagination @size-change="handleyjxxSizeChange" @current-change="handleyjxxCurrentChange"
:page-size="yjxxLimit" :current-page="yjxxPage" layout="total, prev, pager, next,jumper"
:total="moneyDetailData.totalCount"></el-pagination>
</div>
</el-dialog>
<!-- <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<技师列表<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -->
</div>
</template>
@ -326,9 +217,50 @@ export default {
artificerPage: 1,
artificerLimit: 10,
artificerTableData: {},
jsjb: [],// minNumber maxNumber level rate
moneyDetailData: [],
yjxxVisible:false,
yjxxPage:1,
yjxxLimit:10,
yjxxUserId:''
};
},
methods: {
calcLevel(row) {
let result = []
if (row.artificerCount == 0) {
result = this.jsjb.filter(item => { return item.minNumber == 0 })
} else {
result = this.jsjb.filter(item => { return row.artificerCount > item.minNumber && row.artificerCount <= item.maxNumber })
}
return result[0] ? result[0].level : ''
},
calcRate(row) {
let result = []
if (row.artificerCount == 0) {
result = this.jsjb.filter(item => { return item.minNumber == 0 })
} else {
result = this.jsjb.filter(item => { return row.artificerCount > item.minNumber && row.artificerCount <= item.maxNumber })
}
return result[0] ? result[0].rate + '%' : ''
},
queryJsjb() {
return new Promise((resolve, reject) => {
this.$http({
url: this.$http.adornUrl("commission/jjrConfigLevel/findList"),
method: "get",
params: this.$http.adornParams({}),
}).then(({ data }) => {
if (data.code == 0) {
resolve(data.data);
} else {
reject([]);
}
}).catch(error => {
reject([]);
});
});
},
showDictValue(data, datas) {
const dictItem = datas.find(item => data === item.id);
return dictItem ? dictItem.value : '';
@ -393,6 +325,25 @@ export default {
this.handleSelectUsers();
this.dialogUserListFormVisible = true;
},
moneyDetail(row) {
if(row){
this.yjxxPage = 1
this.yjxxLimit = 10
this.yjxxUserId = row.userId
}
this.$http({
url: this.$http.adornUrl("commission/jjrData/moneyDetail"),
method: "get",
params: this.$http.adornParams({
page: this.yjxxPage,
limit: this.yjxxLimit,
userId: this.yjxxUserId
}),
}).then(({ data }) => {
this.moneyDetailData = data.data
this.yjxxVisible = true
})
},
handleSelectUsers() {
this.userTableDataLoading = true;
this.$http({
@ -502,7 +453,17 @@ export default {
this.artificerTableDataLoading = false;
});
},
//
handleyjxxSizeChange(val) {
this.yjxxLimit = val;
this.moneyDetail();
},
//
handleyjxxCurrentChange(val) {
this.yjxxPage = val;
this.moneyDetail();
},
//
handleArtificerSizeChange(val) {
this.artificerLimit = val;
@ -560,7 +521,9 @@ export default {
},
},
mounted() {
async mounted() {
let a = await this.queryJsjb()
if (a) this.jsjb = a
this.handleSelect();
},
};
@ -570,6 +533,7 @@ export default {
.customWidth {
width: 80% !important;
}
.el-dialog--center {
text-align: center;
margin-top: 1vh !important;

View File

@ -3,85 +3,37 @@
<!-- 列表 -->
<div style="margin-left:10px;display: inline-block">
<span>编码</span>
<el-input
style="width: 200px"
placeholder="请输入编码"
v-model="qdsCode">
<el-input style="width: 200px" placeholder="请输入编码" v-model="qdsCode">
</el-input>
</div>
<div style="margin-left:10px;display: inline-block">
<span>渠道商</span>
<el-input
style="width: 200px"
placeholder="请输入渠道商"
v-model="name">
<el-input style="width: 200px" placeholder="请输入渠道商" v-model="name">
</el-input>
</div>
<el-button
style="margin-left: 10px"
size="mini"
type="primary"
icon="document"
@click="handleSelect"
>查询
<el-button style="margin-left: 10px" size="mini" type="primary" icon="document" @click="handleSelect">查询
</el-button>
<el-button
style="margin-left: 10px"
size="mini"
type="primary"
icon="document"
@click="handleClear"
>重置
<el-button style="margin-left: 10px" size="mini" type="primary" icon="document" @click="handleClear">重置
</el-button>
<el-button
style="margin-left: 10px"
size="mini"
type="primary"
icon="document"
@click="handleEdit(0)"
>新增渠道码
<el-button style="margin-left: 10px" size="mini" type="primary" icon="document" @click="handleEdit(0)">新增渠道码
</el-button>
<el-table v-loading="tableDataLoading" :data="tableData.list">
<el-table-column
prop="id"
label="序号"
width="80"
>
<el-table-column prop="id" label="序号" width="80">
</el-table-column>
<el-table-column
prop="name"
label="渠道码名称"
width="220"
>
<el-table-column prop="name" label="渠道码名称">
</el-table-column>
<el-table-column
prop="code"
label="编码"
width="150"
>
<el-table-column prop="code" label="编码" width="150">
</el-table-column>
<el-table-column prop="lm" label="所属类目">
<template slot-scope="scope">
{{ showDictValue(scope.row.lm, lmData) }}
</template>
</el-table-column>
<el-table-column
prop="qdsName"
label="渠道商"
width="200"
>
<el-table-column prop="qdsName" label="渠道商" width="200">
</el-table-column>
<el-table-column
prop="userName"
label="绑定人员"
width="150"
>
<el-table-column prop="userName" label="绑定人员">
</el-table-column>
<el-table-column
prop="rate"
label="渠道分成"
width="150"
>
<el-table-column prop="rate" label="渠道分成">
<template slot-scope="scope">
<span>{{ scope.row.rate }}%</span>
</template>
@ -95,132 +47,72 @@
</el-popover>
</template>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="150"
>
</el-table-column>
<el-table-column label="操作" prop="id" width="360" fixed="right">
<el-table-column label="推广时间" width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
style="margin: 5px"
@click="handleEdit(scope.row)"
>编辑
<span>{{ scope.row.startDate }} ~ {{ scope.row.endDate }}</span>
</template>
</el-table-column>
<el-table-column label="操作" prop="id" >
<template slot-scope="scope">
<el-button size="mini" type="primary" style="margin: 5px" @click="handleEdit(scope.row)">编辑
</el-button>
<el-button
size="mini"
type="primary"
style="margin: 5px"
@click="handleDelete(scope.row)"
>删除
<el-button size="mini" type="primary" style="margin: 5px" @click="handleDelete(scope.row)">删除
</el-button>
</template>
</el-table-column>
</el-table>
<div style="text-align: center; margin-top: 10px">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:page-sizes="[10, 20, 30, 40]"
:page-size="limit"
:current-page="page"
layout="total,sizes, prev, pager, next,jumper"
:total="tableData.totalCount"
>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
:page-sizes="[10, 20, 30, 40]" :page-size="limit" :current-page="page"
layout="total,sizes, prev, pager, next,jumper" :total="tableData.totalCount">
</el-pagination>
</div>
<!-- 添加修改 -->
<el-dialog :title="titles" :visible.sync="dialogFormVisible" center @close="closeDialog">
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right">渠道码名称</span>
<el-input
style="width: 50%"
v-model="name"
placeholder="请输入渠道码名称"
></el-input>
<el-input style="width: 50%" v-model="name" placeholder="请输入渠道码名称"></el-input>
</div>
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right">所属类目</span>
<el-select clearable v-model="lm" style="width: 50%">
<el-option
v-for="item in lmData"
:key="item.id"
:label="item.name"
:value="item.id"
>
<el-option v-for="item in lmData" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</div>
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right">渠道分成%</span>
<el-input-number v-model="rate" controls-position="right" :precision="2" :min="0" :step="1" placeholder="请输入渠道分成(%)"/>
<el-input-number v-model="rate" controls-position="right" :precision="2" :min="0" :step="1"
placeholder="请输入渠道分成(%)" />
</div>
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right">绑定人员</span>
<el-input
style="width: 50%"
v-model="userId"
type="text"
placeholder="请选择用户"
:disabled="true"
v-show="false"
>
<el-input style="width: 50%" v-model="userId" type="text" placeholder="请选择用户" :disabled="true"
v-show="false">
</el-input>
<el-input
style="width: 50%"
v-model="userName"
type="text"
placeholder="请选择用户"
:disabled="true"
>
<el-input style="width: 50%" v-model="userName" type="text" placeholder="请选择用户" :disabled="true">
</el-input>
<el-button
style="margin: 10px"
size="mini"
type="primary"
icon="document"
@click="showUsersView()"
>用户列表
<el-button style="margin: 10px" size="mini" type="primary" icon="document" @click="showUsersView()">用户列表
</el-button>
</div>
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right">广告投放成本</span>
<el-input-number v-model="cost" controls-position="right" :precision="2" :min="0" :step="1" placeholder="请输入广告投放成本(元)"/>
<el-input-number v-model="cost" controls-position="right" :precision="2" :min="0" :step="1"
placeholder="请输入广告投放成本(元)" />
</div>
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right">推广时间段</span>
<el-date-picker
v-model="tgDate"
type="daterange"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
<el-date-picker v-model="tgDate" type="daterange" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
</div>
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right">投放地点</span>
<el-input
style="width: 50%"
v-model="address"
placeholder="请输入投放地点"
></el-input>
<el-input style="width: 50%" v-model="address" placeholder="请输入投放地点"></el-input>
</div>
<div style="margin-bottom: 10px">
<span style="width: 200px; display: inline-block; text-align: right"
>备注</span
>
<el-input
style="width: 50%"
v-model="remarks"
type="textarea"
:rows="4"
placeholder="请输入备注"
>
<span style="width: 200px; display: inline-block; text-align: right">备注</span>
<el-input style="width: 50%" v-model="remarks" type="textarea" :rows="4" placeholder="请输入备注">
</el-input>
</div>
<div slot="footer" class="dialog-footer">
@ -232,44 +124,23 @@
<el-dialog title="用户列表" :visible.sync="dialogUserListFormVisible" width="60%" center>
<div style="margin-left: 10px; display: inline-block;">
<span>昵称</span>
<el-input
style="width: 200px"
placeholder="请输入昵称"
v-model="userName"
></el-input>
<el-input style="width: 200px" placeholder="请输入昵称" v-model="userName"></el-input>
</div>
<div style="margin-left: 10px; display: inline-block">
<span>手机号</span>
<el-input
style="width: 200px"
placeholder="请输入手机号"
v-model="phone"
></el-input>
<el-input style="width: 200px" placeholder="请输入手机号" v-model="phone"></el-input>
</div>
<el-button
style="margin-left: 10px;"
size="mini"
type="primary"
icon="document"
<el-button style="margin-left: 10px;" size="mini" type="primary" icon="document"
@click="handleSelectUsers">查询
</el-button>
<el-button
style="margin-left: 10px"
size="mini"
type="primary"
icon="document"
@click="handleClearUsers">重置
<el-button style="margin-left: 10px" size="mini" type="primary" icon="document" @click="handleClearUsers">重置
</el-button>
<el-table :data="userTableData.list" style="width: 100%">
<el-table-column prop="userId" label="用户ID"></el-table-column>
<el-table-column prop="avatar" label="头像">
<template slot-scope="scope">
<img
v-if="scope.row.avatar && scope.row.avatar != ''"
:src="scope.row.avatar"
width="40"
height="40"
/>
<img v-if="scope.row.avatar && scope.row.avatar != ''" :src="scope.row.avatar" width="40"
height="40" />
<span v-else>暂无图片</span>
</template>
</el-table-column>
@ -278,26 +149,16 @@
<el-table-column prop="qdsName" label="渠道商名称"></el-table-column>
<el-table-column label="操作" prop="id">
<template slot-scope="scope">
<el-button
style="margin: 10px 0"
size="mini"
type="primary"
icon="document"
@click="handleAddUser(scope.row)"
>添加
<el-button style="margin: 10px 0" size="mini" type="primary" icon="document"
@click="handleAddUser(scope.row)">添加
</el-button>
</template>
</el-table-column>
</el-table>
<div style="text-align: center; margin-top: 10px">
<el-pagination
@size-change="handleUserSizeChange"
@current-change="handleUserCurrentChange"
:page-size="userLimit"
:current-page="userPage"
layout="total, prev, pager, next,jumper"
:total="userTableData.totalCount"
></el-pagination>
<el-pagination @size-change="handleUserSizeChange" @current-change="handleUserCurrentChange"
:page-size="userLimit" :current-page="userPage" layout="total, prev, pager, next,jumper"
:total="userTableData.totalCount"></el-pagination>
</div>
</el-dialog>
</div>
@ -657,6 +518,7 @@ export default {
.customWidth {
width: 80% !important;
}
.el-dialog--center {
text-align: center;
margin-top: 1vh !important;

View File

@ -20,11 +20,11 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col>
<!-- <el-col>
<el-form-item label="渠道商返佣比例(%)" prop="rate">
<el-input-number v-model="dataForm.rate" controls-position="right" :precision="2" :min="0" :step="1"/>
</el-form-item>
</el-col>
</el-col> -->
<el-col>
<el-form-item label="技师承担(%)" prop="artificerRate">
<el-input-number v-model="dataForm.artificerRate" controls-position="right" :precision="2" :min="0" :step="1"/>

View File

@ -63,13 +63,12 @@
<el-table-column
prop="qdmName"
label="渠道码名称"
width="220"
>
</el-table-column>
<el-table-column
prop="qdsCode"
width="130"
label="编码"
width="150"
>
</el-table-column>
<el-table-column prop="lm" label="所属类目">
@ -80,40 +79,49 @@
<el-table-column
prop="qdsName"
label="渠道商"
width="200"
>
</el-table-column>
<el-table-column
prop="userName"
label="绑定人员"
width="150"
>
</el-table-column>
<el-table-column
prop="rate"
label="渠道分成"
width="150"
>
<template slot-scope="scope">
<span>{{scope.row.rate}}%</span>
</template>
</el-table-column>
<el-table-column
prop="smCount"
label="扫码数量"
width="150"
prop="xyhsmsl"
label="扫码数量-新用户"
>
</el-table-column>
<el-table-column
prop="lyhsmsl"
label="扫码数量-老客户"
>
</el-table-column>
<el-table-column
prop="yxzcpts"
label="有效注册平台数"
>
</el-table-column>
<el-table-column
prop="ordersCount"
label="订单数量"
width="150"
>
</el-table-column>
<el-table-column
prop="money"
prop="zje"
label="订单总金额"
>
</el-table-column>
<el-table-column
prop="qdsfy"
label="累计获得佣金"
width="150"
>
</el-table-column>
<el-table-column

View File

@ -43,6 +43,11 @@
</el-radio-group>
</el-form-item>
</el-col>
<!-- <el-col v-show="dataForm.type == 2">
<el-form-item label="抽成比例(%)">
<el-input-number v-model="dataForm.ccbl" controls-position="right" :precision="2" :min="0" :step="1"/>
</el-form-item>
</el-col> -->
<el-col>
<el-form-item label="邀请业务员推广海报背景图" prop="salesmanImage">
<div style="width: 148px;height: 148px;border: 1px dashed #c0ccda;border-radius: 6px;text-align: center;line-height: 148px;">
@ -131,6 +136,15 @@ export default {
},
//
dataFormSubmit() {
if(this.dataForm.type == 2){
if(!this.dataForm.ccbl){
this.$message({
message: '请输入抽成比例',
type: 'warning'
})
return
}
}
this.$refs['dataForm'].validate((valid) => {
if (valid) {
let saveData = Object.assign({}, this.dataForm);

File diff suppressed because it is too large Load Diff

View File

@ -30,14 +30,16 @@
<div style="display: inline-block;margin-bottom: 6px;">
<span>是否超时</span>
<el-select v-model="overTimeOrders" style="width:150px;margin-left: 10px;" @change="select()">
<el-option v-for="item in statesnumCs" :key="item.value" :label="item.label" :value="item.value">
<el-option v-for="item in statesnumCs" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>&nbsp;&nbsp;&nbsp;&nbsp;
</div>
<div style="display: inline-block;margin-bottom: 6px;">
<span>是否警告</span>
<el-select v-model="warning" style="width:150px;margin-left: 10px;" @change="select()">
<el-option v-for="item in statesnumCs" :key="item.value" :label="item.label" :value="item.value">
<el-option v-for="item in statesnumCs" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>&nbsp;&nbsp;&nbsp;&nbsp;
</div>
@ -53,7 +55,7 @@
<el-button style="margin-left:15px;" size="mini" type="primary" icon="document" @click="cleans">重置
</el-button>
</div>
<el-table v-loading="tableDataLoading" :data="tableData.list">
<el-table v-loading="tableDataLoading" :data="tableData.list" height="550px">
<el-table-column fixed prop="id" label="编号" width="80">
<template slot-scope="scope">
<span>
@ -132,7 +134,8 @@
</el-table-column>
<el-table-column prop="createAt" label="处理状态" width="120" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="danger" :disabled="!isAuth('orderCenter:wancheng')" v-if="scope.row.status==2||scope.row.status==6||scope.row.status==7||scope.row.status==8"
<el-button size="mini" type="danger" :disabled="!isAuth('orderCenter:wancheng')"
v-if="scope.row.status == 2 || scope.row.status == 6 || scope.row.status == 7 || scope.row.status == 8"
@click="wancheng(scope.row)" style="margin:5px;" plain>完成订单</el-button>
<!-- <span v-if="scope.row.type=='1'" style="color: #13ce66;">已处理</span>
<span v-else style="color: #ff4949;">待处理</span>
@ -421,9 +424,13 @@
type: 'warning'
}).then(() => {
this.$http({
url: this.$http.adornUrl('artificer/accomplishOrders?ordersId='+delid),
url: this.$http.adornUrl('app/artificer/accomplishOrders'),
method: 'post',
params: this.$http.adornParams({})
params: this.$http.adornParams({
ordersId: delid,
earlyFinishReason:row.earlyFinishReason,
adminOperation:1
})
}).then(({
data
}) => {

View File

@ -13,8 +13,7 @@
</el-table-column>
<el-table-column prop="couponPicture" label="优惠券图片">
<template slot-scope="scope">
<img v-if="scope.row.couponPicture" :src="scope.row.couponPicture" alt="" width="40"
height="40">
<img v-if="scope.row.couponPicture" :src="scope.row.couponPicture" alt="" width="40" height="40">
</template>
</el-table-column>
<!-- <el-table-column prop="type" label="优惠券类型" width="100">
@ -25,6 +24,8 @@
</el-table-column> -->
<el-table-column prop="money" label="优惠券面值" width="100">
</el-table-column>
<el-table-column prop="goodsName" label="当前绑定商品" width="150">
</el-table-column>
<el-table-column prop="minMoney" label="优惠券最低消费" width="150">
</el-table-column>
<el-table-column prop="endDate" label="优惠券有效期限(天)" width="150">
@ -82,12 +83,11 @@
<span style="width: 200px;display: inline-block;text-align: right;">优惠券图片</span>
<div
style=" width:148px;height:148px;background-color: #fbfdff; border: 1px dashed #c0ccda;border-radius: 6px;text-align: center;line-height: 148px;display: inline-block;">
<el-upload class="avatar-uploader" v-model="couponPicture"
:action="uploadUrl" :show-file-list="false"
:on-success="handleAvatarSuccess1">
<img v-if="couponPicture" :src="couponPicture" class="avatar" style="width: 148px;height: 148px;" />
<i v-else class="el-icon-plus avatar-uploader-icon"
style="font-size: 28px;color: #8c939d"></i>
<el-upload class="avatar-uploader" v-model="couponPicture" :action="uploadUrl"
:show-file-list="false" :on-success="handleAvatarSuccess1">
<img v-if="couponPicture" :src="couponPicture" class="avatar"
style="width: 148px;height: 148px;" />
<i v-else class="el-icon-plus avatar-uploader-icon" style="font-size: 28px;color: #8c939d"></i>
</el-upload>
</div>
</div>
@ -113,6 +113,17 @@
<el-radio :label="2">其他</el-radio>
</el-radio-group>
</div>
<div style="margin-bottom: 10px; display: flex; align-items: center">
<span style="width: 200px; display: inline-block; text-align: right">商城商品</span>
<!-- <el-input style="width:50%;" v-model="materialPackageMinNum" type="text" placeholder="请选择商城商品">
</el-input> -->
<el-button v-if="!addMaterialPackageTag.goodsName" size="mini" type="primary"
:disabled="!isAuth('shopAdmin:update')" @click="addGoodsBtn()">添加商品
</el-button>
<el-tag v-else type="info" closable @close="closeTag" disable-transitions>{{
addMaterialPackageTag.goodsName
}}</el-tag>
</div>
<!-- <div style="margin-bottom: 10px;">
<span style="width: 200px;display: inline-block;text-align: right;">排序</span>
<el-input style="width:50%;" v-model="sort" type="number" :min="0" placeholder="请输入排序号"></el-input>
@ -138,10 +149,10 @@
<el-form-item label="优惠券图片:" :label-width="formLabelWidth">
<div
style=" width:148px;height:148px;background-color: #fbfdff; border: 1px dashed #c0ccda;border-radius: 6px;text-align: center;line-height: 148px;display: inline-block;">
<el-upload class="avatar-uploader" v-model="form.couponPicture"
:action="uploadUrl" :show-file-list="false"
:on-success="handleAvatarSuccess2">
<img v-if="form.couponPicture" :src="form.couponPicture" class="avatar" style="width: 148px;height: 148px;" />
<el-upload class="avatar-uploader" v-model="form.couponPicture" :action="uploadUrl"
:show-file-list="false" :on-success="handleAvatarSuccess2">
<img v-if="form.couponPicture" :src="form.couponPicture" class="avatar"
style="width: 148px;height: 148px;" />
<i v-else class="el-icon-plus avatar-uploader-icon"
style="font-size: 28px;color: #8c939d"></i>
</el-upload>
@ -164,6 +175,17 @@
<el-radio :label="2">其他</el-radio>
</el-radio-group>
</el-form-item>
<div style="margin-bottom: 10px; display: flex; align-items: center">
<span style="width: 200px; display: inline-block; text-align: right">商城商品</span>
<!-- <el-input style="width:50%;" v-model="materialPackageMinNum" type="text" placeholder="请选择商城商品">
</el-input> -->
<el-button v-if="!addMaterialPackageTag.goodsName" size="mini" type="primary"
:disabled="!isAuth('shopAdmin:update')" @click="addGoodsBtn()">添加商品
</el-button>
<el-tag v-else type="info" closable @close="closeTag" disable-transitions>{{
addMaterialPackageTag.goodsName
}}</el-tag>
</div>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible3 = false"> </el-button>
@ -338,8 +360,8 @@
</el-table-column>
<el-table-column fixed prop="userName" label="昵称" width="120">
<template slot-scope="scope">
<span style="color: #f56c6c;"
@click="updates(scope.row)">{{ scope.row.userName ? scope.row.userName : '未设置' }}</span>
<span style="color: #f56c6c;" @click="updates(scope.row)">{{ scope.row.userName ?
scope.row.userName : '未设置' }}</span>
</template>
</el-table-column>
<el-table-column label="图像">
@ -415,6 +437,32 @@
</el-pagination>
</div>
</el-dialog>
<!-- 商城 -->
<el-dialog title="添加商品" :visible.sync="shopDetailsStatus" center>
<el-table v-loading="shopDetailsLoading" :data="shopTableDataList">
<el-table-column fixed prop="id" label="编号" width="80">
</el-table-column>
<el-table-column fixed prop="coverImg" label="商品图片">
<template slot-scope="scope">
<img :src="scope.row.coverImg" alt="" width="60" height="60" />
</template>
</el-table-column>
<el-table-column prop="type" label="商品类型">
<template slot-scope="scope">
<span v-if="scope.row.type == null">暂无分类</span>
<span v-else>{{ scope.row.type.name }}</span>
</template>
</el-table-column>
<el-table-column prop="title" label="商品标题"> </el-table-column>
<el-table-column fixed="right" label="操作">
<template slot-scope="scope">
<el-button size="mini" type="primary" :disabled="!isAuth('shopAdmin:update')"
@click="addGoods(scope.$index, scope.row)">添加
</el-button>
</template>
</el-table-column>
</el-table>
</el-dialog>
</div>
</template>
@ -423,6 +471,8 @@ import { serverPaths } from '@/utils/enumData'
export default {
data() {
return {
shopDetailsLoading: false,
shopDetailsStatus: false,
yhqzssl: 1,//
uploadUrl: serverPaths.uploadUrl,
size: 10,
@ -497,10 +547,52 @@ import { serverPaths } from '@/utils/enumData'
},
],
inviterCode: '',
shopTableDataList: [],
addMaterialPackageTag: {
goodsName: "",
goodsId: "",
},
}
},
methods: {
addGoodsBtn() {
this.addMaterialPackageTag.goodsName = "";
this.addMaterialPackageTag.goodsId = "";
this.shopDetailsStatus = true;
this.getShopDataList()
},
closeTag() {
this.addMaterialPackageTag.goodsName = "";
this.addMaterialPackageTag.goodsId = "";
},
addGoods(index, row) {
this.addMaterialPackageTag.goodsName = row.title;
this.addMaterialPackageTag.goodsId = row.id;
this.shopDetailsStatus = false;
},
//
getShopDataList() {
this.shopDetailsLoading = true
this.$http({
url: this.$http.adornUrl("/admin/coupon/selectListByType"),
method: "get",
params: this.$http.adornParams({}),
}).then(({ data }) => {
if (data && data.data) {
this.shopDetailsLoading = false
let returnData = data.data;
this.shopTableDataList = returnData;
this.totalnum = returnData.totalElements;
} else {
this.shopDetailsLoading = false
this.shopTableDataList = []
}
}).catch(err => {
this.shopDetailsLoading = false
this.shopTableDataList = []
});
},
// /
couponClick(val) {
if (val = 1) {
@ -545,6 +637,8 @@ import { serverPaths } from '@/utils/enumData'
this.money = 0
this.endDate = 1
this.minMoney = 0
this.addMaterialPackageTag.goodsName = '';
this.addMaterialPackageTag.goodsId = '';
this.dialogFormVisible = true
},
handleAvatarSuccess1(file, fileList) {
@ -613,6 +707,7 @@ import { serverPaths } from '@/utils/enumData'
'minMoney': this.minMoney,
'endDate': this.endDate,
'couType': this.couType,
'goodsId': this.addMaterialPackageTag.goodsId
})
}).then(({
data
@ -649,6 +744,8 @@ import { serverPaths } from '@/utils/enumData'
this.form.endDate = row.endDate
this.form.couponPicture = row.couponPicture
this.form.couType = row.couType
this.addMaterialPackageTag.goodsName = row.goodsName;
this.addMaterialPackageTag.goodsId = row.goodsId;
},
amendNoticeTo() {
this.form.minMoney = Number(this.form.minMoney)
@ -682,6 +779,7 @@ import { serverPaths } from '@/utils/enumData'
'minMoney': this.form.minMoney,
'endDate': this.form.endDate,
'couponPicture': this.form.couponPicture,
'goodsId': this.addMaterialPackageTag.goodsId
})
}).then(({
data
@ -1149,6 +1247,4 @@ import { serverPaths } from '@/utils/enumData'
};
</script>
<style>
</style>
<style></style>

View File

@ -0,0 +1,337 @@
html,body{
width: 100%;
height: 100%;
margin: 0;
padding: 0;
}
html{
font-size: 100px;
}
ul,h1,h2,h3,h4,h5,h6,p{
list-style: 0;
padding: 0;
margin: 0;
}
a{
text-decoration: none;
}
/*正文*/
.t_container{
width: 100%;
height: 100%;
min-width: 1360px;
background: url('../img/true.png') no-repeat;
background-size: 100% 100%;
position: relative;
min-height: 756px;
}
.t_header{
width: 100%;
height: 80px;
background: url('../img/linx.png') no-repeat;
background-size: 100% 100%;
position: relative;
}
.t_header span{
color: #fff;
font-size: 0.36rem;
position: absolute;
top: 50%;
margin-top: -0.24rem;
left: 9%;
}
.t_main{
width: 98%;
height: 8.74rem;
margin: 0 auto;
margin-top: 0.2rem;
margin-bottom: 0;
}
.t_left_box{
position: relative;
width: 3.36rem;
height: 4.6rem;
display: inline-block;
text-align: center;
}
.t_l_line{
position: absolute;
top: 0;
left: 0;
}
.t_r_line{
position: absolute;
bottom: 0;
right: 0;
}
.t_center_box{
width: 6.82rem;
display: inline-block;
min-width: 490px;
}
.t_top_box{
width: 100%;
height: 1.13rem;
overflow: hidden;
position: relative;
margin-bottom: 0.2rem;
}
.t_bottom_box{
width: 100%;
height: 3.17rem;
overflow: hidden;
position: relative;
}
.t_right_box{
display: inline-block;
width: 7.8rem;
height: 4.6rem;
position: relative;
min-width: 560px;
}
.b_left_box{
display: inline-block;
width: 5.9rem;
height: 3.6rem;
position: relative;
min-width: 425px;
}
.b_center_box{
display: inline-block;
width: 6rem;
height: 3.6rem;
position: relative;
min-width: 432px;
}
.b_right_box{
display: inline-block;
width: 6rem;
height: 3.6rem;
position: relative;
min-width: 432px;
}
.t_mbox{
width: 3rem;
height: 1.28rem;
position: relative;
margin: 0 auto;
margin-top: 0.2rem;
}
.t_rbox{
background: #D9523F;
}
.t_gbox{
background: #13D0B2;
}
.t_ybox{
background: #F6A645;
}
.t_mbox i{
display: inline-block;
width: 0.46rem;
height: 0.48rem;
position: absolute;
top: 0;
bottom: 0;
left: 20%;
margin: auto;
}
.t_mbox h2{
font-size: 0.28rem;
color: #fff;
position: absolute;
top: 50%;
left: 50%;
}
.t_mbox span{
font-size: 0.2rem;
color: #fff;
position: absolute;
top: 24%;
left: 48%;
}
.t_rbox i{
background: url(../img/indent.png) no-repeat;
background-size: 100% 100%;
}
.t_gbox i{
background: url(../img/vip.png) no-repeat;
background-size: 100% 100%;
}
.t_ybox i{
background: url(../img/consumption.png) no-repeat;
background-size: 100% 100%;
}
.t_nav{
width: 100%;
height: 100%;
}
.t_nav li{
display: inline-block;
width: 30%;
height: 100%;
text-align: center;
position: relative;
}
.t_nav li span{
font-size: 0.16rem;
color: #1AA1FD;
position: absolute;
left: 0;
right: 0;
margin: auto;
top: 25%;
}
.t_nav li h1{
font-size: 0.30rem;
color: #fff;
position: absolute;
left: 0;
right: 0;
margin: auto;
top: 50%;
}
.t_nav li i{
width: 1px;
height: 100%;
position: absolute;
right: -0.2rem;
background: url('../img/sper.png') no-repeat;
background-size: 100% 100%;
}
.t_table{
font-size: 0.16rem;
color: #fff;
width: 94%;
margin: 0 auto;
border-spacing: 0;
text-align: center;
box-sizing: border-box;
margin-top: 12%;
}
.t_table tr{
margin: 0;
padding: 0;
height: 0.42rem;
}
.t_table thead tr{
background: #053A98;
}
.t_table tbody tr td:first-child{
border-left: 1px solid #053A98;
}
.t_table td{
border-bottom: 1px solid #053A98;
border-right: 1px solid #053A98;
}
.t_title{
position: absolute;
font-size: 0.18rem;
color: #fff;
left: 5%;
top: 10%;
}
.t_b_h,t_b_m{
position: absolute;
font-size: 0.16rem;
left: 54%;
width: 50%;
height: 4.6rem;
}
.t_b_h span{
position: absolute;
color: #fff;
top: 10%;
}
.t_b_h img{
position: absolute;
width: 0.53rem;
height: 0.53rem;
top: 6%;
left: 24%
}
.t_b_h h3{
font-size: 0.36rem;
color: #F0FF00;
position: absolute;
left: 55%;
top: 8%;
width: 1rem;
}
.t_b_h h3 span{
font-size: 0.2rem;
position: absolute;
left: 50%;
top: 28%;
color: #0072FF;
}
.t_b_m img{
position: absolute;
left: 52%;
top: 22%;
border-top: 1px dotted #F0FF00;
padding: 0 0.18rem;
padding-top: 20px;
width: 3.19rem;
height: 1.67rem;
}
.t_b_box,.t_b_box1,.t_b_box2,.t_b_box3{
width: 1.3rem;
height: 0.56rem;
border: 1px dotted #F0FF00;
border-radius: 5px;
position: absolute;
}
.t_b_box{
top: 68%;
left: 56%;
}
.t_b_box span,.t_b_box1 span,.t_b_box2 span,.t_b_box3 span{
font-size: 0.14rem;
color: #fff;
position: absolute;
left: 10%;
}
.t_b_box i,.t_b_box1 i,.t_b_box2 i,.t_b_box3 i{
width: 20px;
height: 20px;
position: absolute;
top: 50%;
left: 15%
}
.t_b_box i{
background: url('../img/t.png') no-repeat;
background-size: 100% 100%;
}
.t_b_box1 i{
background: url('../img/s.png') no-repeat;
background-size: 100% 100%;
}
.t_b_box2 i{
background: url('../img/j.png') no-repeat;
background-size: 100% 100%;
}
.t_b_box3 i{
background: url('../img/g.png') no-repeat;
background-size: 100% 100%;
}
.t_b_box h2,.t_b_box1 h2,.t_b_box2 h2,.t_b_box3 h2{
font-size: 0.18rem;
color: #fff;
position: absolute;
top: 30%;
left: 40%;
}
.t_b_box1{
top: 68%;
left: 78%;
}
.t_b_box2{
top: 84%;
left: 56%;
}
.t_b_box3{
top: 84%;
left: 78%;
}

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
src/views/common/img/g.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
src/views/common/img/j.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
src/views/common/img/s.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
src/views/common/img/t.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1740643891246" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9900" xmlns:xlink="http://www.w3.org/1999/xlink" width="100" height="100"><path d="M424.87757431 440.0236721c4.2719763 0 8.54395259-1.68289975 11.90975211-5.04869927 3.23634569-3.23634569 4.91924543-7.63777581 4.91924543-11.90975208l-0.12945382-349.784241c0-2.20071506-1.29453827-4.2719763-3.49525334-5.17815308-2.20071506-0.9061768-4.53088395-0.38836148-6.08432987 1.29453827L313.6767368 187.07089383 155.09579852 29.26667852c-2.97743803-2.97743803-7.24941431-4.91924543-11.9097521-4.91924543-4.66033778 0-8.80286025 1.81235358-11.90975211 4.91924543l-107.70558418 107.18776889c-3.10689185 2.97743803-4.91924543 7.24941431-4.91924544 11.90975209 0 4.66033778 1.81235358 8.93231408 4.91924544 11.90975211l158.45148444 157.8042153-114.95499852 114.43718322c-1.55344592 1.55344592-2.07126124 3.88361482-1.16508444 6.2137837 0.9061768 2.20071506 2.97743803 3.49525333 5.17815308 3.49525334l353.79730962-2.20071507z m0 0M423.45358222 584.23523555c4.2719763 0 8.67340642 1.68289975 11.90975209 4.91924543 3.3657995 3.3657995 4.91924543 7.63777581 4.91924544 11.90975211l-0.12945383 352.76167901c0 2.20071506-1.29453827 4.2719763-3.49525333 5.17815308-2.20071506 0.9061768-4.53088395 0.38836148-6.08432987-1.16508443l-118.1913442-117.6735289-158.58093827 157.93366913c-2.97743803 2.97743803-7.24941431 4.91924543-11.9097521 4.91924544-4.66033778 0-8.80286025-1.81235358-11.9097521-4.91924544l-107.7055842-107.18776888c-3.10689185-3.10689185-4.91924543-7.24941431-4.91924543-11.9097521 0-4.66033778 1.81235358-8.93231408 4.91924543-11.9097521l158.45148445-157.67476148-114.95499852-114.56663703c-1.55344592-1.55344592-2.07126124-4.01306864-1.29453828-6.2137837 0.9061768-2.20071506 2.97743803-3.49525333 5.17815309-3.49525334l353.79730963-0.9061768z m0 0M601.71150222 437.43459555c-4.2719763 0-8.54395259-1.68289975-11.90975209-5.04869925-3.3657995-3.23634569-4.91924543-7.63777581-4.91924544-11.90975211l0.12945383-349.78424099c0-2.20071506 1.29453827-4.2719763 3.49525333-5.17815307 2.20071506-0.9061768 4.53088395-0.38836148 6.08432988 1.29453826l118.32079802 117.67352889 158.58093828-157.80421531c3.10689185-2.97743803 7.24941431-4.91924543 11.9097521-4.91924544 4.66033778 0 8.80286025 1.81235358 11.90975209 4.91924544l107.57613037 107.18776889c3.10689185 2.97743803 4.91924543 7.24941431 4.91924544 11.90975211 0 4.66033778-1.81235358 8.93231408-4.91924544 11.90975209L844.43742815 315.48909037l114.95499852 114.43718321c1.55344592 1.55344592 2.07126124 3.88361482 1.16508444 6.2137837-0.9061768 2.20071506-2.97743803 3.49525333-5.17815308 3.49525333l-353.66785581-2.20071506z m0 0M601.84095605 584.23523555c-4.2719763 0-8.67340642 1.68289975-11.9097521 4.91924543-3.3657995 3.3657995-5.04869925 7.63777581-5.04869926 11.90975211l0.12945383 352.76167901c0 2.20071506 1.29453827 4.2719763 3.49525333 5.17815308 2.20071506 0.9061768 4.53088395 0.38836148 6.08432988-1.16508443l118.32079802-117.6735289 158.58093828 157.93366913c3.10689185 2.97743803 7.24941431 4.91924543 11.9097521 4.91924544 4.66033778 0 8.80286025-1.81235358 11.90975209-4.91924544l107.57613037-107.18776888c3.10689185-3.10689185 4.91924543-7.24941431 4.91924544-11.9097521 0-4.66033778-1.81235358-8.93231408-4.91924544-11.9097521l-158.45148444-157.93366914 115.08445235-114.56663703c1.55344592-1.55344592 2.07126124-4.01306864 1.29453826-6.2137837-0.9061768-2.20071506-2.97743803-3.49525333-5.17815307-3.49525334l-353.79730964-0.64726914z m0 0" fill="#ffffff" p-id="9901"></path></svg>

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 175 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,14 @@
$(function(){
var whdef = 100/1920;// 表示1920的设计图,使用100PX的默认值
var wH = window.innerHeight;// 当前窗口的高度
var wW = window.innerWidth;// 当前窗口的宽度
var rem = wW * whdef;// 以默认比例值乘以当前窗口宽度,得到该宽度下的相应FONT-SIZE值
$('html').css('font-size', rem + "px");
});
$(window).resize(function (){// 绑定到窗口的这个事件中
var whdef = 100/1920;// 表示1920的设计图,使用100PX的默认值
var wH = window.innerHeight;// 当前窗口的高度
var wW = window.innerWidth;// 当前窗口的宽度
var rem = wW * whdef;// 以默认比例值乘以当前窗口宽度,得到该宽度下的相应FONT-SIZE值
$('html').css('font-size', rem + "px");
});

View File

@ -3,7 +3,7 @@
<div class="site-content__wrapper">
<div class="site-content">
<div class="login-main">
<h3 class="login-title">盛安到家1.0管理系统</h3>
<h3 class="login-title">盛安小象1.0管理系统</h3>
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" status-icon>
<el-form-item prop="userName">
<el-input v-model="dataForm.userName" placeholder="帐号"></el-input>

File diff suppressed because it is too large Load Diff

View File

@ -2,7 +2,7 @@
<nav class="site-navbar" :class="'site-navbar--' + navbarLayoutType">
<div class="site-navbar__header">
<h1 class="site-navbar__brand">
<a class="site-navbar__brand-lg" href="javascript:;">盛安到家1.0系统</a>
<a class="site-navbar__brand-lg" href="javascript:;">盛安小象1.0系统</a>
<a class="site-navbar__brand-mini" href="javascript:;">
<img src="~@/assets/img/avatar.png" style="width: 30px;height: 30px; border-radius: 50%;">
</a>

View File

@ -691,7 +691,6 @@ export default {
materialName: this.projectName,
}),
}).then(({ data }) => {
console.log("12332hhhh", data);
if (data.code == 0) {
this.tableDataLoading = false;
let returnData = data.data;

View File

@ -736,9 +736,9 @@
xhr = new XMLHttpRequest();
xhr.withCredentials = false;
xhr.open('POST', "https://admin.sjajk.com/sqx_fast/alioss/upload");//
// xhr.open('POST', "https://admin.sjajk.com/sqx_fast/alioss/upload");//
// xhr.open('POST', "https://sausers.blxinchuang.com/sqx_fast/alioss/upload");
// xhr.open('POST', "http://localhost:8187/sqx_fast/alioss/upload");
xhr.open('POST', "http://localhost:8187/sqx_fast/alioss/upload");
xhr.onload = function() {
var json;