6 Commits
wwz ... main

Author SHA1 Message Date
gyq
c356b32b3e 更新 2024-02-21 09:13:01 +08:00
gyq
91ed6c6ef4 优化通道进件 2024-02-21 09:06:19 +08:00
gyq
7beae022d2 1 2024-02-20 16:15:11 +08:00
gyq
17753b55b0 新增收银点 2024-02-20 16:13:51 +08:00
gyq
4e6729fd24 更新版本 2024-02-20 10:16:06 +08:00
gyq
c01152b680 优化 2024-02-20 10:13:42 +08:00
31 changed files with 909 additions and 1228 deletions

View File

@@ -3,4 +3,4 @@ ENV = development
# 本地环境接口地址
# VITE_API_URL = 'http://admintestapi.sxczgkj.cn/admin/'
VITE_API_URL = 'https://openpm.sxczgkj.cn/'
VITE_API_URL = 'http://admintestapi.sxczgkj.cn/admin/'

View File

@@ -2,4 +2,4 @@
ENV = production
# 线上环境接口地址
VITE_API_URL = 'https://openpm.sxczgkj.cn/'
VITE_API_URL = 'http://admintestapi.sxczgkj.cn/admin/'

1
.gitignore vendored
View File

@@ -10,6 +10,7 @@ lerna-debug.log*
node_modules
dist
dist-ssr
dist.zip
*.local
# Editor directories and files

View File

@@ -1,14 +1,16 @@
<!DOCTYPE html>
<html lang="zh-CN">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/favico.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>vue admin</title>
</head>
<html lang="zh-cn">
<body>
<div id="app"></div>
<script type="module" src="/src/main.js"></script>
</body>
</html>
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/favico.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>vue admin</title>
</head>
<body>
<div id="app"></div>
<script type="module" src="/src/main.js"></script>
</body>
</html>

View File

@@ -1,7 +1,7 @@
{
"name": "vue-admin",
"private": true,
"version": "1.3.25",
"version": "1.3.7",
"type": "module",
"scripts": {
"dev": "vite",

View File

@@ -7,28 +7,32 @@ import { dayjs } from 'element-plus';
export function getIndexData() {
return request({
method: "POST",
url: "/agent/index"
url: "/user/getIndexData"
});
}
/**
/**
* 获取首页图表数据
* @returns
*/
export function getChartData() {//收益
export function getChartData(type, reqUserId) {
const m = {
1: '/user/getDayOrder', // 获取近七日收单额
2: '/user/getDayProfit', // 获取近七日收益
3: '/user/getMonthOrder', // 获取近一年的收单额
4: '/user/getMonthProfit' // 获取近一年的收益数据
}
const params = {
year: dayjs().format('YYYY'),
reqUserId: reqUserId
}
return request({
method: "POST",
url: '/agent/profit',
// params
});
}
export function agentamount() {//流水
return request({
method: "POST",
url: '/agent/amount',
// params
method: "GET",
url: m[type],
params
});
}
/**
* 上传OSS
* @param {*} params
@@ -94,16 +98,5 @@ export function unread(params) {
params
});
}
/**
* 身份证姓名认证
* @returns
*/
export function agentidcardoauth(data) {
return request({
method: "POST",
url: "/agent/idcardoauth",
data
});
}

View File

@@ -41,11 +41,11 @@ export function modifyFee(params) {
* 获取收益信息
* @returns
*/
export function queryProfit(data) {
export function queryProfit(params) {
return request({
method: "post",
url: "/agent/accumulateprofit",
data
method: "get",
url: "/agency/queryProfit",
params
});
}
@@ -76,32 +76,22 @@ export function getUserBalance() {
* 提现
* @returns
*/
export function withdrawalProfit(data) {
export function withdrawalProfit(params) {
return request({
method: "post",
url: "/agent/withdrowsub",
data
});
}
/**
* 绑定支付宝
* @returns
*/
export function agentalipay(data) {
return request({
method: "post",
url: "/agent/alipay",
data
method: "get",
url: "/user/withdrawalProfit",
params
});
}
/**
* 获取提现流水
* @returns
*/
export function getUserOutFlow(data) {
export function getUserOutFlow(params) {
return request({
method: "post",
url: "/agent/withdrawerlist",
data
method: "get",
url: "/user/getUserOutFlow",
params
});
}

View File

@@ -1,24 +0,0 @@
import request from "@/utils/request.js";
import { dayjs } from 'element-plus';
/**
* 获取验证码
* @returns
*/
export function agentsendsms(data) {
return request({
method: "post",
url: "/agent/sendsms",
data
});
}
/**
* 重置密码
* @returns
*/
export function agentresetpwd(data) {
return request({
method: "post",
url: "/agent/resetpwd",
data
});
}

View File

@@ -4,11 +4,11 @@ import request from "@/utils/request.js";
* 获取商户列表
* @returns
*/
export function queryCustormerFlow(data) {
export function queryCustormerFlow(params) {
return request({
method: "post",
url: "/agent/storelist",
data
method: "get",
url: "/agency/queryCustormerFlow",
params
});
}
@@ -273,3 +273,16 @@ export function updateAuthentication(params) {
})
}
/**
* 收银点列表
* @param {*} data
* @returns
*/
export function queryMerchantCashPlace(params) {
return request({
method: 'get',
url: '/agency/queryMerchantCashPlace',
params
})
}

View File

@@ -2,7 +2,7 @@ import request from "@/utils/request.js";
export function login(data) {
return request({
method: "POST",
url: "agent/login",
url: "/user/doLogin",
data,
});
}
@@ -26,28 +26,3 @@ export function getNotices(params) {
params
})
}
/**
* 代理商注册
* @param {*} data
* @returns
*/
export function register(data) {
return request({
method: 'post',
url: '/agent/register',
data
})
}
/**
* 发送验证码
* @param {*} data
* @returns
*/
export function agentsendsms(data) {
return request({
method: 'post',
url: '/agent/sendsms',
data
})
}

View File

@@ -4,11 +4,11 @@ import request from "@/utils/request.js";
* 提现申请查询
* @returns
*/
export function getOutFlow(data) {
export function getOutFlow(params) {
return request({
method: "post",
url: "/agent/withdrawerlist",
data
method: "get",
url: "/user/getOutFlow",
params
});
}
@@ -16,10 +16,10 @@ export function getOutFlow(data) {
* 提现审核
* @returns
*/
export function modifyOutFlow(data) {
export function modifyOutFlow(params) {
return request({
method: "post",
url: "/agent/withdrawalreview",
data
method: "get",
url: "/user/modifyOutFlow",
params
});
}

View File

@@ -16,7 +16,7 @@
</template>
<script setup>
import { getChartData,agentamount } from '@/api/home.js'
import { getChartData } from '@/api/home.js'
import * as echarts from "echarts"
import { dayjs } from 'element-plus'
import hooks from '@/hooks'
@@ -41,7 +41,7 @@ const props = defineProps({
})
// 初始化折线图
function initDeicount(yearData = [], yearDataTime = [], sevenData = [], sevenDataTime = []) {
function initDeicount(yearData = [], sevenData = [], sevenDataTime = []) {
if (!chartsObj.lineRef1 && !chartsObj.lineRef2) {
chartsObj.lineRef1 = echarts.init(lineRef1.value);
chartsObj.lineRef2 = echarts.init(lineRef2.value);
@@ -58,7 +58,7 @@ function initDeicount(yearData = [], yearDataTime = [], sevenData = [], sevenDat
xAxis: [
{
type: 'category',
data: yearDataTime,
data: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二'],
axisPointer: {
type: 'shadow'
},
@@ -124,29 +124,26 @@ function chartTypeChange(t) {
async function getChartDataMethod() {
try {
let yearData = ''
let yearDataTime = ''
let sevenData = ''
let sevenDataTime = ''
if (chartType.value == 1) {
// 收益
const res = await getChartData()
yearData = res.year_profit.map(item => item.profit)
yearDataTime = res.year_profit.map(item => item.date)
sevenData = res.m_profit.map(item => item.profit)
sevenDataTime = res.m_profit.map(item => item.date)
const res1 = await getChartData(4, props.userId)
const res2 = await getChartData(2, props.userId)
yearData = res1.map(item => item.price.toFixed(2))
sevenData = res2.map(item => item.price.toFixed(2))
sevenDataTime = res2.map(item => dayjs(item.times).format('MM/DD'))
} else {
// 流水agentamount
const res = await agentamount()
yearData = res.year_amount.map(item => item.amount)
yearDataTime = res.year_amount.map(item => item.date)
sevenData = res.m_amount.map(item => item.amount)
sevenDataTime = res.m_amount.map(item => item.date)
// 流水
const res1 = await getChartData(3, props.userId)
const res2 = await getChartData(1, props.userId)
yearData = res1.map(item => item.consumeFee)
sevenData = res2.map(item => item.consumeFee)
sevenDataTime = res2.map(item => dayjs(item.times).format('MM/DD'))
}
initDeicount(yearData, yearDataTime, sevenData, sevenDataTime)
initDeicount(yearData, sevenData, sevenDataTime)
chartLoading.value = false
} catch (error) {
console.log(error)
}
} catch (error) { }
}
// 批量设置 echarts resize

View File

@@ -9,7 +9,6 @@ import { useUser } from "@/store/user.js";
const router = createRouter({
history: createWebHistory(),
// history: createWebHistory('/dist'),
routes: [...notFoundAndNoPower, ...fullScreenRouting, ...staticRoutes],
});
@@ -18,7 +17,7 @@ router.beforeEach(async (to, from, next) => {
NProgress.start();
const token = _hook.useLocalStorage.get("token");
const storeUser = useUser();
if ((to.path === "/login" || to.path === "/register") && !token) {
if (to.path === "/login" && !token) {
next();
NProgress.done();
} else {

View File

@@ -59,24 +59,6 @@ export const fullScreenRouting = [
isHide: true,
},
},
{
path: "/register",
name: "register",
component: () => import("@/views/register/register.vue"),
meta: {
title: "注册",
isHide: true,
},
},
{
path: "/password",
name: "password",
component: () => import("@/views/password/password.vue"),
meta: {
title: "修改密码",
isHide: true,
},
}
];
/**
@@ -293,121 +275,121 @@ export const asyncRoutes = [
// }
// ]
// },
// {
// path: '/organization',
// component: layout,
// meta: {
// title: '大机构管理',
// // roles: ['MG'],
// isHide: true
// },
// redirect: '/organization/big_organization',
// children: [
// {
// path: '/organization/big_organization',
// component: () => import('@/views/organization/big_organization.vue'),
// meta: {
// title: '大机构',
// icon: 'Tickets'
// }
// },
// {
// path: '/organization/big_organization/agent_detail',
// name: 'agent_detail',
// component: () => import('@/views/organization/agent_detail.vue'),
// meta: {
// title: '机构详情',
// isHide: true,
// activeMenu: '/organization/big_organization'
// }
// }
// ]
// },
// {
// path: '/mini_organization_manage',
// component: layout,
// meta: {
// title: '小机构管理',
// // roles: ['FO'],
// isHide: true
// },
// redirect: '/mini_organization_manage/mini_organization',
// children: [
// {
// path: '/mini_organization/mini_organization',
// component: () => import('@/views/organization/mini_organization.vue'),
// meta: {
// title: '小机构',
// icon: 'SetUp'
// }
// },
// {
// path: '/organization/mini_organization/mini_agent_detail',
// name: 'mini_agent_detail',
// component: () => import('@/views/organization/mini_agent_detail.vue'),
// meta: {
// title: '小机构详情',
// isHide: true,
// activeMenu: '/mini_organization/mini_organization'
// }
// }
// ]
// },
// {
// path: '/agent_manage',
// component: layout,
// meta: {
// title: '大代理管理',
// // roles: ['FO', 'SO'],
// isHide: true
// },
// redirect: '/agent_manage/agent_list',
// children: [
// {
// path: '/agent_manage/agent_list',
// component: () => import('@/views/organization/agent_list.vue'),
// meta: {
// title: '大代理',
// icon: 'Discount'
// }
// }
// ]
// },
// {
// path: '/promotion_manage',
// component: layout,
// meta: {
// title: '代理',
// icon: 'Connection',
// },
// redirect: '/promotion_manage/one_promotion_list',
// children: [
// {
// path: '/promotion_manage/one_promotion_list',
// component: () => import('@/views/organization/one_promotion_list.vue'),
// meta: {
// title: '一级代理',
// icon: 'User',
// // roles: ['FO', 'SO', 'AG']
// }
// },
// {
// path: '/promotion_manage/two_promotion_list',
// component: () => import('@/views/organization/two_promotion_list.vue'),
// meta: {
// title: '二级代理',
// icon: 'User',
// // roles: ['FO', 'SO', 'AG', 'FB']
// }
// }
// ]
// },
{
path: '/organization',
component: layout,
meta: {
title: '大机构管理',
roles: ['MG'],
isHide: true
},
redirect: '/organization/big_organization',
children: [
{
path: '/organization/big_organization',
component: () => import('@/views/organization/big_organization.vue'),
meta: {
title: '大机构',
icon: 'Tickets'
}
},
{
path: '/organization/big_organization/agent_detail',
name: 'agent_detail',
component: () => import('@/views/organization/agent_detail.vue'),
meta: {
title: '机构详情',
isHide: true,
activeMenu: '/organization/big_organization'
}
}
]
},
{
path: '/mini_organization_manage',
component: layout,
meta: {
title: '小机构管理',
roles: ['FO'],
isHide: true
},
redirect: '/mini_organization_manage/mini_organization',
children: [
{
path: '/mini_organization/mini_organization',
component: () => import('@/views/organization/mini_organization.vue'),
meta: {
title: '小机构',
icon: 'SetUp'
}
},
{
path: '/organization/mini_organization/mini_agent_detail',
name: 'mini_agent_detail',
component: () => import('@/views/organization/mini_agent_detail.vue'),
meta: {
title: '小机构详情',
isHide: true,
activeMenu: '/mini_organization/mini_organization'
}
}
]
},
{
path: '/agent_manage',
component: layout,
meta: {
title: '大代理管理',
roles: ['FO', 'SO'],
isHide: true
},
redirect: '/agent_manage/agent_list',
children: [
{
path: '/agent_manage/agent_list',
component: () => import('@/views/organization/agent_list.vue'),
meta: {
title: '大代理',
icon: 'Discount'
}
}
]
},
{
path: '/promotion_manage',
component: layout,
meta: {
title: '代理',
icon: 'Connection',
},
redirect: '/promotion_manage/one_promotion_list',
children: [
{
path: '/promotion_manage/one_promotion_list',
component: () => import('@/views/organization/one_promotion_list.vue'),
meta: {
title: '一级代理',
icon: 'User',
roles: ['FO', 'SO', 'AG']
}
},
{
path: '/promotion_manage/two_promotion_list',
component: () => import('@/views/organization/two_promotion_list.vue'),
meta: {
title: '二级代理',
icon: 'User',
roles: ['FO', 'SO', 'AG', 'FB']
}
}
]
},
{
path: '/shop_manage',
component: layout,
meta: {
title: '商家管理',
// roles: ['FO', 'SO', 'AG', 'FB', 'SB'],
roles: ['FO', 'SO', 'AG', 'FB', 'SB'],
icon: 'Handbag'
},
redirect: '/shop_manage/shop_list',
@@ -417,28 +399,47 @@ export const asyncRoutes = [
name: 'shop_list',
component: () => import('@/views/organization/shop_list.vue'),
meta: {
title: '用户列表',
title: '商家列表',
icon: 'Tickets'
}
},
{
path: '/shop_manage/shop_detail',
name: 'shop_detail',
component: () => import('@/views/organization/shop_detail.vue'),
meta: {
title: '详情',
isHide: true,
activeMenu: '/shop_manage/shop_list'
}
},
{
path: '/shop_manage/maker_apply',
component: () => import('@/views/organization/maker_apply.vue'),
meta: {
title: '创客申请',
icon: 'User'
}
},
// {
// path: '/shop_manage/shop_detail',
// name: 'shop_detail',
// component: () => import('@/views/organization/shop_detail.vue'),
// path: '/shop_manage/cashier_dot',
// component: () => import('@/views/organization/cashier_dot.vue'),
// meta: {
// title: '详情',
// isHide: true,
// activeMenu: '/shop_manage/shop_list'
// title: '收银点列表',
// icon: 'PieChart',
// roles: ['MG']
// }
// },
// {
// path: '/shop_manage/maker_apply',
// component: () => import('@/views/organization/maker_apply.vue'),
// meta: {
// title: '创客申请',
// icon: 'User'
// }
// }
{
path: '/shop_manage/cashierdot_detail',
name: 'cashierdot_detail',
component: () => import('@/views/organization/cashierdot_detail.vue'),
meta: {
title: '详情',
isHide: true,
activeMenu: '/shop_manage/cashier_dot'
}
}
]
},
{
@@ -446,8 +447,7 @@ export const asyncRoutes = [
component: layout,
meta: {
title: '提现管理',
roles: ['admin'],
// roles: ['FO', 'SO'],
roles: ['FO', 'SO'],
isHide: true
},
redirect: '/withdraw_manage/withdraw_list',
@@ -462,32 +462,31 @@ export const asyncRoutes = [
}
]
},
// {
// path: '/device_manage',
// component: layout,
// meta: {
// title: '设备管理',
// isHide: true
// },
// redirect: '/device_manage/device_list',
// children: [
// {
// path: '/device_manage/device_list',
// component: () => import('@/views/device/device_list.vue'),
// meta: {
// title: '设备列表',
// icon: 'TakeawayBox'
// }
// }
// ]
// },
{
path: '/device_manage',
component: layout,
meta: {
title: '设备管理',
isHide: true
},
redirect: '/device_manage/device_list',
children: [
{
path: '/device_manage/device_list',
component: () => import('@/views/device/device_list.vue'),
meta: {
title: '设备列表',
icon: 'TakeawayBox'
}
}
]
},
{
path: '/total_earnings',
component: layout,
meta: {
title: '累计收益管理',
isHide: true,
roles: ['agent']
isHide: true
},
redirect: '/total_earnings/total_earnings_list',
children: [
@@ -501,73 +500,73 @@ export const asyncRoutes = [
}
]
},
// {
// path: '/promotion',
// component: layout,
// meta: {
// title: '推广图片管理',
// isHide: true,
// // roles: ['MG']
// },
// redirect: '/promotion/promotion_list',
// children: [
// {
// path: '/promotion/promotion_list',
// component: () => import('@/views/promotion/promotion_list.vue'),
// meta: {
// title: '推广图片',
// icon: 'PictureRounded'
// }
// }
// ]
// },
// {
// path: '/app_manage',
// component: layout,
// meta: {
// title: 'APP管理',
// icon: 'Iphone',
// // roles: ['MG']
// },
// redirect: '/app_manage/menu_list',
// children: [
// {
// path: '/app_manage/menu_list',
// component: () => import('@/views/app_manage/menu_list.vue'),
// meta: {
// title: '菜单管理',
// icon: 'Tickets'
// }
// }
// ]
// },
// {
// path: '/setting',
// component: layout,
// meta: {
// title: '系统设置',
// icon: 'Setting',
// // roles: ['MG']
// },
// redirect: '/setting/appid_manage',
// children: [
// {
// path: '/setting/appid_manage',
// component: () => import('@/views/setting/appid_manage.vue'),
// meta: {
// title: 'Appid管理',
// icon: 'Tickets'
// }
// }
// ]
// },
{
path: '/promotion',
component: layout,
meta: {
title: '推广图片管理',
isHide: true,
roles: ['MG']
},
redirect: '/promotion/promotion_list',
children: [
{
path: '/promotion/promotion_list',
component: () => import('@/views/promotion/promotion_list.vue'),
meta: {
title: '推广图片',
icon: 'PictureRounded'
}
}
]
},
{
path: '/app_manage',
component: layout,
meta: {
title: 'APP管理',
icon: 'Iphone',
roles: ['MG']
},
redirect: '/app_manage/menu_list',
children: [
{
path: '/app_manage/menu_list',
component: () => import('@/views/app_manage/menu_list.vue'),
meta: {
title: '菜单管理',
icon: 'Tickets'
}
}
]
},
{
path: '/setting',
component: layout,
meta: {
title: '系统设置',
icon: 'Setting',
roles: ['MG']
},
redirect: '/setting/appid_manage',
children: [
{
path: '/setting/appid_manage',
component: () => import('@/views/setting/appid_manage.vue'),
meta: {
title: 'Appid管理',
icon: 'Tickets'
}
}
]
},
{
path: '/notice',
component: layout,
meta: {
title: '消息管理',
isHide: true,
// roles: ['MG']
roles: ['MG']
},
redirect: '/notice/index',
children: [

View File

@@ -4,7 +4,7 @@ import { ENUMS } from "@/utils/enums.js";
export const useConfigure = defineStore("useConfigure", {
state: () => {
return {
projectName: '银收客开放平台代理端',
projectName: '银收客机构管理端',
defaultActive: "/home", // 默认选中的菜单
configure: {
// ---------- 主题 ----------

View File

@@ -30,9 +30,9 @@ export const useUser = defineStore("useUser", {
userlogin(param) {
return login(param).then((res) => {
// console.log(res);
this.userInfo = res.userinfo;
this.userInfo = res;
_hook.useLocalStorage.set("token", this.userInfo.token);
_hook.useLocalStorage.set("userInfo", this.userInfo);
_hook.useLocalStorage.set("userInfo", this.userInfo.user);
return this.userInfo;
});
},
@@ -47,17 +47,17 @@ export const useUser = defineStore("useUser", {
/**
* 获取消息列表
*/
// async getNotices() {
// try {
// const res = await getNotices({
// currPage: 1,
// size: 10
// })
// this.notices.num = res.unread
// this.notices.list = res.list.list
// } catch (error) {
// console.error('获取消息列表error=', error)
// }
// }
async getNotices() {
try {
const res = await getNotices({
currPage: 1,
size: 10
})
this.notices.num = res.unread
this.notices.list = res.list.list
} catch (error) {
console.error('获取消息列表error=', error)
}
}
},
});

View File

@@ -5,8 +5,8 @@ import NProgress from "nprogress";
import router from '@/router'
const service = axios.create({
baseURL: import.meta.env.MODE == 'development' ? '/api/' : 'https://openpm.sxczgkj.cn/proxy/',
// withCredentials: false, // 跨域请求时发送 cookies
baseURL: import.meta.env.MODE == 'development' ? '/api/' : '/api/admin',
// withCredentials: true, // 跨域请求时发送 cookies
timeout: 5000, // 请求超时
});
@@ -20,7 +20,6 @@ service.interceptors.request.use(
// ['X-Token'] 是自定义标题键
// 请根据实际情况修改
config.headers["token"] = _hook.useLocalStorage.get("token");
// config.headers["token"] = '967d5389-d853-48eb-b46e-4353208f5e05';
config.headers["loginName"] = _hook.useLocalStorage.get("userInfo").loginName;
config.headers["userId"] = _hook.useLocalStorage.get("userInfo").userId;
// config.headers['Content-Type'] = 'application/json'
@@ -40,7 +39,7 @@ service.interceptors.response.use(
NProgress.done();
// 对响应数据做点什么
if (+response.status === 200) {
if (+response.data.code == 1) {
if (+response.data.code == '000000') {
return response.data.data;
} else if (+response.data.code == '999999') {
ElMessage.error('登录已过期,请重新登录')
@@ -50,8 +49,8 @@ service.interceptors.response.use(
return Promise.reject('登录已过期,请重新登录')
} else {
// 响应错误
ElMessage.error(response.data.msg)
return Promise.reject(response.data.msg)
ElMessage.error(response.data.message)
return Promise.reject(response.data.message)
}
}
},

View File

@@ -1,10 +1,7 @@
<template>
<div class="card">
<div class="header_title">
<div>
欢迎回来{{ storeUser.userInfo.username }}
</div>
<div v-if="storeUser.userInfo.invite">邀请码:{{ storeUser.userInfo.invite }}</div>
欢迎回来{{ storeUser.userInfo.loginName }}
</div>
<div class="data_row">
<div class="item">
@@ -14,8 +11,8 @@
<div class="info">
<div class="title">团队总流水</div>
<div class="num">
<!-- <count-to :start-val="0" :decimals="2" :end-val="homeData.sumConsumeFee" :duration="1000" /> -->
{{ homeData.sumConsumeFee }}
<count-to :start-val="0" :decimals="2" :end-val="homeData.sumConsumeFee" :duration="1000" />
<!-- {{ homeData.sumConsumeFee }} -->
<span class="i"></span>
</div>
</div>
@@ -27,8 +24,7 @@
<div class="info">
<div class="title">总收益</div>
<div class="num">
<!-- <count-to :start-val="0" :decimals="2" :end-val="homeData.sumfansShareMoney" :duration="1000" /> -->
{{ homeData.sumfansShareMoney }}
<count-to :start-val="0" :decimals="2" :end-val="homeData.sumfansShareMoney" :duration="1000" />
<span class="i"></span>
</div>
</div>
@@ -40,13 +36,12 @@
<div class="info">
<div class="title">今日收益</div>
<div class="num">
<!-- <count-to :start-val="0" :decimals="2" :end-val="homeData.yestedayShareMoney" :duration="1000" /> -->
{{ homeData.yestedayShareMoney }}
<count-to :start-val="0" :decimals="2" :end-val="homeData.yestedayShareMoney" :duration="1000" />
<span class="i"></span>
</div>
</div>
</div>
<div class="item" v-if="storeUser.userInfo.is_admin != 1">
<div class="item">
<div class="icon">
<img class="img" src="../assets/home_icon4.png">
</div>
@@ -63,84 +58,15 @@
<div class="card mt15">
<chart-card :user-id="storeUser.userInfo.userId" />
</div>
<el-dialog :close-on-press-escape="false" :close-on-click-modal="false" :show-close="false" v-model="dialogVisible"
title="实名认证" width="500" :before-close="handleClose">
<el-form ref="ruleFormRef" style="max-width: 600px" :model="ruleForm" :rules="rules" label-width="auto"
class="demo-ruleForm" :size="formSize" status-icon>
<el-form-item label="身份姓名" prop="id_card_name">
<el-input v-model="ruleForm.id_card_name" />
</el-form-item>
<el-form-item label="身份证号" prop="id_number">
<el-input v-model="ruleForm.id_number" />
</el-form-item>
<el-form-item>
<el-button type="primary" :loading="ruleForm.loading" style="width:70%; margin: 0 auto;"
@click="submitFormdialog">
确认
</el-button>
</el-form-item>
</el-form>
</el-dialog>
</template>
<script setup>
import { getIndexData, agentidcardoauth } from '@/api/home.js'
import { getIndexData } from '@/api/home.js'
import { useUser } from "@/store/user.js";
import chartCard from '@/components/chartCard.vue';
import _hook from "@/hooks/index.js";
const storeUser = useUser();
const dialogVisible = ref(storeUser.userInfo.is_id_card == 0 ? true : false)
let ruleForm = reactive({
id_card_name: '',
id_number: '',
loading: false
})
const rules = reactive({
id_card_name: [
{
required: true,
message: '身份姓名不能为空',
trigger: 'change',
},
],
id_number: [
{
required: true,
message: '身份证号不能为空',
trigger: 'change',
},
]
})
const ruleFormRef = ref("");
const submitFormdialog = async () => {
//通过 ref 的值触发验证
await ruleFormRef.value.validate((valid) => {
if (valid) {
ruleForm.loading = true
const data = {
id_card_name: ruleForm.id_card_name,
id_number: ruleForm.id_number
};
agentidcardoauth(data).then((res) => {
ElMessage.success('实名验证通过')
console.log(res)
_hook.useLocalStorage.set("token", res.userinfo.token);
_hook.useLocalStorage.set("userInfo", res.userinfo);
dialogVisible.value = false
ruleForm.loading = false
}).catch(err => {
ruleForm.loading = false
});
}
});
}
let homeData = reactive({
sumConsumeFee: 0,
sumfansShareMoney: 0,
@@ -152,10 +78,10 @@ let homeData = reactive({
async function getIndexDataHandle() {
try {
const res = await getIndexData()
homeData.sumConsumeFee = res.amount_price
homeData.sumfansShareMoney = res.amount_price_income
homeData.yestedayShareMoney = res.amount_price_income_day
homeData.currentFee = res.rate
homeData.sumConsumeFee = res.sumConsumeFee
homeData.sumfansShareMoney = res.sumfansShareMoney
homeData.yestedayShareMoney = res.yestedayShareMoney
homeData.currentFee = res.currentFee
} catch (error) {
console.log(error)
}
@@ -170,10 +96,8 @@ onMounted(() => {
.header_title {
font-size: 18px;
font-weight: bold;
padding: 15px 50px 30px 50px;
padding: 15px 0 30px 0;
border-bottom: 1px solid #ececec;
display: flex;
justify-content: space-between;
}
.data_row {

View File

@@ -64,9 +64,6 @@
<el-dropdown-menu>
<!-- <el-dropdown-item>个人中心</el-dropdown-item> -->
<el-dropdown-item @click="logOut">退出登录</el-dropdown-item>
<router-link :to="{ name: 'password' }">
<el-dropdown-item >修改密码</el-dropdown-item>
</router-link>
</el-dropdown-menu>
</template>
</el-dropdown>
@@ -124,7 +121,7 @@ function toDetail(item) {
})
if (!item.isdeal) {
unread({ noticecode: item.noticecode })
// storeUser.getNotices()
storeUser.getNotices()
}
}
}

View File

@@ -2,23 +2,23 @@
<div class="login-case">
<div class="form-case">
<span class="Hello">Hello !</span>
<span class="title">欢迎登录银收客开放平台代理</span>
<span class="title">欢迎来到银收客</span>
<el-form ref="ruleFormRef" :rules="rules" :model="form">
<el-form-item prop="loginName">
<el-input class="inp" v-model="form.loginName" clearable autocomplete="new-password" size="large"
:prefix-icon="User" placeholder="请输入手机号" style="width: 100%;" />
:prefix-icon="User" placeholder="请输入号" style="width: 100%;" />
</el-form-item>
<el-form-item prop="password">
<el-input class="inp" v-model="form.password" clearable autocomplete="new-password" size="large" type="password"
:prefix-icon="Lock" placeholder="请输入密码" style="width: 100%;" />
</el-form-item>
<!-- <el-form-item>
<el-form-item>
<el-select v-model="form.userType" placeholder="请选择机构类型" size="large" style="width: 100%;">
<el-option key="MG" label="平台" value="MG"></el-option>
<el-option key="FO" label="大机构" value="FO"></el-option>
<el-option key="SO" label="小机构" value="SO"></el-option>
</el-select>
</el-form-item> -->
</el-form-item>
<!-- <el-form-item prop="code">
<div class="code-case">
<el-input class="inp" v-model="form.code" clearable autocomplete="new-password" size="large"
@@ -26,11 +26,6 @@
<verificationCode @getCode="getCode" :key="verificationCodeKey"></verificationCode>
</div>
</el-form-item> -->
<div class="to_register">
<router-link :to="{ name: 'register' }">
<el-text type="primary">注册代理商</el-text>
</router-link>
</div>
<el-form-item>
<el-button type="primary" size="large" :loading="loading" @click="login" style="width: 100%;">登录</el-button>
</el-form-item>
@@ -112,9 +107,9 @@ async function login() {
if (valid) {
loading.value = true
const params = {
account: form.loginName,
password: form.password
// userType: form.userType
loginName: form.loginName,
password: form.password,
userType: form.userType
};
store.userlogin(params).then((res) => {
router.replace("/home");
@@ -171,11 +166,4 @@ _hook.useKeyStroke("Enter", login);
margin-right: 10px;
}
}
.to_register {
display: flex;
justify-content: flex-end;
font-size: 14px;
padding-bottom: 20px;
}
</style>

View File

@@ -77,7 +77,7 @@ const tableOptions = reactive({
// 分页回调
function paginationChange() {
tableOptions.loading = true
// getNoticesAjax()
getNoticesAjax()
}
// 获取消息列表

View File

@@ -0,0 +1,107 @@
<template>
<div class="card">
<el-space>
<el-input v-model="tableOptions.phone" placeholder="请输入手机号" style="width: 200px;" />
<el-input v-model="tableOptions.name" placeholder="请输入姓名" style="width: 200px;" />
<el-button type="primary" icon="Search" @click="searchHandle">搜索</el-button>
<el-button icon="RefreshRight" @click="resizeTable">重置</el-button>
</el-space>
<div class="table mt15">
<el-table ref="table" :data="tableOptions.list" border height="100%" v-loading="tableOptions.loading">
<el-table-column prop="name" label="收银点名称"></el-table-column>
<el-table-column prop="subcode" label="收银点code"></el-table-column>
<el-table-column prop="address" label="收银点地址"></el-table-column>
<el-table-column prop="masterName" label="店铺名称"></el-table-column>
<el-table-column label="操作" width="120">
<template #default="scope">
<RouterLink
:to="{ name: 'cashierdot_detail', query: { id: scope.row.masterUserId, name: scope.row.name, account: scope.row.subcode, merchantcode: scope.row.masterCode } }">
<el-button type="primary" size="small" icon="Search" v-permission="['MG']">
商户详情
</el-button>
</RouterLink>
</template>
</el-table-column>
</el-table>
</div>
<div class="mt15">
<el-pagination layout="prev, pager, next, total, sizes, jumper" background
v-model:current-page="tableOptions.pageNum" v-model:page-size="tableOptions.pageSzie"
:page-size="tableOptions.pageSzie" :page-sizes="[10, 20, 30, 50]" :total="tableOptions.total"
@size-change="paginationChange" @current-change="paginationChange" />
</div>
</div>
</template>
<script setup>
import { onMounted } from 'vue';
import { dayjs, ElMessage } from 'element-plus';
import { queryMerchantCashPlace } from '@/api/shop.js'
const table = ref(null)
// 表格参数
const tableOptions = reactive({
loading: true,
phone: '',
name: '',
list: [],
total: 0,
pageNum: 1,
pageSize: 10
})
// 重置表格
function resizeTable() {
tableOptions.phone = ''
tableOptions.name = ''
searchHandle()
}
// 搜索
function searchHandle() {
tableOptions.pageNum = 1;
paginationChange()
}
// 分页回调
function paginationChange() {
tableOptions.loading = true
getUserMarkAjax()
}
// 审核
async function checkHandle(row, type) {
try {
await updateUserMark({
status: type,
id: row.userId,
remark: ''
})
ElMessage.success('提交成功')
resizeTable()
} catch (error) {
}
}
// 获取创客审核列表
async function getUserMarkAjax() {
try {
const res = await queryMerchantCashPlace({
pageNum: tableOptions.pageNum,
pageSzie: tableOptions.pageSize
})
tableOptions.loading = false
tableOptions.list = res.list
tableOptions.total = res.total
table.value.setScrollTop(0)
} catch (error) {
console.log(error);
}
}
onMounted(() => {
getUserMarkAjax()
})
</script>

View File

@@ -0,0 +1,270 @@
<template>
<div class="card">
<div class="nav_wrap">
<el-radio-group v-model="type">
<el-radio-button :label="item.type" v-for="item in navs" :key="item.type">
{{ item.label }}
</el-radio-button>
</el-radio-group>
</div>
<div class="container mt15">
<div class="compont_wrap">
<component :is="componentList[type]" />
</div>
<div class="shop_info">
<div class="header">
<el-text size="large">商户关联信息</el-text>
</div>
<div class="title_wrap">
<el-text>身份信息关联进件成功的商户数量</el-text>
</div>
<div class="content">
<div class="row">
<el-space>
<el-text>实名身份证</el-text>
<el-text type="warning" tag="ins">{{ authInfo.CertNoCount }}</el-text>
</el-space>
</div>
<div class="row">
<el-space>
<el-text>结算身份证</el-text>
<el-text type="warning" tag="ins">{{ authInfo.countMbiName }}</el-text>
</el-space>
</div>
<div class="row">
<el-space>
<el-text>同名商户</el-text>
<el-text type="warning" tag="ins">{{ authInfo.countAccountCount }}</el-text>
</el-space>
</div>
</div>
<div class="title_wrap">
<el-text>用户IP记录</el-text>
</div>
<div class="mt15">
<el-table :data="tableOptions.list" border height="200" v-loading="tableOptions.loading">
<el-table-column prop="ip" label="IP地址"></el-table-column>
<el-table-column prop="remark" label="操作"></el-table-column>
<el-table-column prop="createtime" label="操作时间">
<template #default="scope">
{{ dayjs(scope.row.createtime).format('YYYY-MM-DD HH:mm:ss') }}
</template>
</el-table-column>
</el-table>
<div class="mt15">
<el-pagination layout="prev, pager, next, total, sizes, jumper" background
v-model:current-page="tableOptions.pageNum" v-model:page-size="tableOptions.pageSzie" small
:page-size="tableOptions.pageSzie" :page-sizes="[10, 20, 30, 50]" :total="tableOptions.total"
@size-change="paginationChange" @current-change="paginationChange" />
</div>
</div>
</div>
</div>
</div>
</template>
<script setup>
import { connectInfo, merchBaseInfo, merchantInfoDetail, merchBaseAccount, messageChannel, userIpPage, merchLicense } from '@/api/shop.js'
import authentication from './components/authentication.vue'
import shopInfo from './components/shopInfo.vue'
import settleInfo from './components/settleInfo.vue'
import aisleInfo from './components/aisleInfo.vue'
import businessLicense from './components/businessLicense.vue'
import { useRoute } from 'vue-router'
import { reactive } from 'vue'
import { dayjs } from 'element-plus'
const route = useRoute()
const authInfo = ref({})
const type = ref(1)
const componentList = {
1: authentication,
2: shopInfo,
3: businessLicense,
4: settleInfo,
5: aisleInfo
}
const navs = reactive([])
// 表格参数
const tableOptions = reactive({
loading: true,
list: [],
total: 0,
pageNum: 1,
pageSzie: 10
})
// 分页回调
function paginationChange() {
tableOptions.loading = true
userIpPageAjax()
}
// 实名认证信息页面(实名个数)
async function connectInfoAjax() {
try {
const res = await connectInfo(route.query.id)
authInfo.value = res
} catch (error) {
console.log('实名认证信息页面error', error)
}
}
// ip记录
async function userIpPageAjax() {
try {
const res = await userIpPage({
userId: route.query.id,
currPage: tableOptions.pageNum,
size: tableOptions.pageSzie
})
tableOptions.loading = false
tableOptions.list = res.list
tableOptions.total = res.total
} catch (error) {
console.log('ip记录', error)
}
}
// 实名认证信息
async function merchantInfoDetailAjax() {
try {
const res = await merchantInfoDetail(route.query.id)
if (res.bankCard.bankname) {
navs.push(
{
type: 1,
label: '实名认证信息'
}
)
}
} catch (error) {
console.error('实名认证信息===', error)
}
}
// 商户基本信息
async function merchBaseInfoAjax() {
try {
const res = await merchBaseInfo(route.query.id)
if (res.merchantBaseInfo.mccname) {
navs.push(
{
type: 2,
label: '商户基本信息'
}
)
}
} catch (error) {
console.log('商户基本信息===', error)
}
}
// 营业执照信息
async function merchLicenseAjax() {
try {
const res = await merchLicense(route.query.id)
if (res.license.principalperson) {
navs.push(
{
type: 3,
label: '营业执照信息'
}
)
}
} catch (error) {
console.log('商户基本信息===', error)
}
}
// 结算信息
async function merchBaseAccountAjax() {
try {
const res = await merchBaseAccount(route.query.id)
if (res.D0.bankCard) {
navs.push(
{
type: 4,
label: '结算信息'
}
)
}
} catch (error) {
console.log('结算信息===', error)
}
}
// 通道进件信息
async function messageChannelAjax() {
try {
const res = await messageChannel(route.query.id, route.query.merchantcode)
if (res.merchantChannelMessage.length) {
navs.push(
{
type: 5,
label: '通道进件信息'
}
)
}
} catch (error) {
console.log('通道进件信息===', error)
}
}
onMounted(async () => {
tableOptions.loading = false
connectInfoAjax()
userIpPageAjax()
await merchantInfoDetailAjax()
await merchBaseInfoAjax()
await merchLicenseAjax()
await merchBaseAccountAjax()
await messageChannelAjax()
type.value = navs[0].type
if (route.query.type && route.query.type == 'msg1') {
type.value = 5
}
})
</script>
<style scoped lang="scss">
@import './components/common.scss';
.nav_wrap {
padding-bottom: 15px;
border-bottom: 1px solid #ececec;
}
.container {
display: flex;
.compont_wrap {
flex: 2;
padding-right: 20px;
}
.shop_info {
flex: 1;
.header {
padding-bottom: 14px;
}
.content {
padding: 14px 20px;
.row {
&:not(:first-child) {
margin-top: 14px;
}
}
}
}
}
</style>

View File

@@ -1,6 +1,17 @@
<template>
<div class="img_box" v-if="fileList.length">
<el-image :src="fileList[0].url" style="width: 150px;height: 150px;display: block;" fit="cover"></el-image>
<div class="mask">
<el-icon @click="previewHandle({ url: fileList[0].url })">
<Search />
</el-icon>
<el-icon @click="fileList = []">
<Delete />
</el-icon>
</div>
</div>
<el-upload ref="uploadRef" v-model:file-list="fileList" list-type="picture-card" :limit="1" :on-exceed="handleExceed"
:auto-upload="false" @change="selectFile" @remove="removeFile" @preview="previewHandle">
:auto-upload="false" @change="selectFile" @remove="removeFile" @preview="previewHandle" v-else>
<el-icon>
<Plus />
</el-icon>
@@ -56,4 +67,35 @@ defineExpose({
.img {
width: 100%;
}
.img_box {
position: relative;
border-radius: 5px;
overflow: hidden;
width: 150px;
height: 150px;
&:hover {
cursor: pointer;
.mask {
display: flex;
}
}
.mask {
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
background-color: rgba(0, 0, 0, 0.5);
display: none;
align-items: center;
justify-content: center;
color: #fff;
font-size: 18px;
gap: 20px;
}
}
</style>

View File

@@ -26,11 +26,11 @@
<el-input v-model="item.valid" disabled placeholder="请输入默认结算方式" style="width: 50%" />
</el-form-item>
<el-form-item label="微信小程序appid">
<el-input v-model="item.wxLiteAppld" :disabled="item.thirdStatus != '-100'" placeholder="请输入微信小程序appid"
<el-input v-model="item.wxLiteAppId" :disabled="item.thirdStatus != '-100'" placeholder="请输入微信小程序appid"
style="width: 50%" />
</el-form-item>
<el-form-item label="微信公众号appld">
<el-input v-model="item.wxPubAppld" :disabled="item.thirdStatus != '-100'" placeholder="请输入微信公众号appld"
<el-input v-model="item.wxPubAppId" :disabled="item.thirdStatus != '-100'" placeholder="请输入微信公众号appld"
style="width: 50%" />
</el-form-item>
<el-form-item label="微信公众号支付路径">
@@ -105,8 +105,8 @@ async function submitHandle(state, index) {
errMsg: form.value[index].remake || '',
userId: route.query.id,
channelId: form.value[index].channel || '',
wxLiteAppld: form.value[index].wxLiteAppld,
wxPubAppld: form.value[index].wxPubAppld,
wxLiteAppId: form.value[index].wxLiteAppId,
wxPubAppId: form.value[index].wxPubAppId,
wxPubPath: form.value[index].wxPubPath
})
loading.value = false

View File

@@ -1,6 +1,6 @@
<template>
<div class="card">
<!-- <div class="data_row">
<div class="data_row">
<div class="item">
<div class="icon">
<img class="img" src="@/assets/home_icon6.png">
@@ -34,7 +34,7 @@
</div>
</div>
</div>
<div class="item">
<!-- <div class="item">
<div class="icon">
<img class="img" src="../assets/home_icon2.png">
</div>
@@ -69,15 +69,15 @@
<span class="i">%</span>
</div>
</div>
</div>
</div>-->
</div> -->
</div>
</div>
<div class="card mt15">
<el-space>
<!-- <el-input placeholder="请输入商户登录号" v-model="tableOptions.agencyCode" style="width: 200px;" /> -->
<el-input placeholder="请输入商户登录号" v-model="tableOptions.agencyCode" style="width: 200px;" />
<el-input placeholder="请输入商户号" v-model="tableOptions.merchantCode" style="width: 200px;" />
<el-input placeholder="请输入商户名称" v-model="tableOptions.merchant_name" style="width: 200px;" />
<!-- <el-input placeholder="请输入用户ID" v-model="tableOptions.reqUserId" style="width: 200px;" />
<el-input placeholder="请输入商户" v-model="tableOptions.phone" style="width: 200px;" />
<el-input placeholder="请输入用户ID" v-model="tableOptions.reqUserId" style="width: 200px;" />
<el-select placeholder="请选择进件状态" v-model="tableOptions.status">
<el-option :value="0" label="待审核"></el-option>
<el-option :value="1" label="审核中"></el-option>
@@ -88,7 +88,7 @@
<el-option :value="1" label="小微"></el-option>
<el-option :value="2" label="个体"></el-option>
<el-option :value="3" label="企业"></el-option>
</el-select> -->
</el-select>
<el-button type="primary" icon="Search" @click="searchHandle">搜索</el-button>
<el-button icon="RefreshRight" @click="resizeTable">重置</el-button>
</el-space>
@@ -96,31 +96,12 @@
<el-table ref="table" :data="tableOptions.list" size="large" stripe border height="100%"
v-loading="tableOptions.loading">
<el-table-column prop="id" label="ID"></el-table-column>
<el-table-column prop="merchant_code" label="商户号"></el-table-column>
<el-table-column prop="merchant_name" label="商家名称">
<el-table-column prop="agencyName" label="商家名称">
<template #default="scope">
<el-text>{{ scope.row.merchant_name || scope.row.merchant_name }}</el-text>
<el-text>{{ scope.row.agencyName || scope.row.agencyCode }}</el-text>
</template>
</el-table-column>
<!-- <el-table-column prop="merchant_alias" label="商户简称"></el-table-column> -->
<!-- <el-table-column prop="merchant_type" label="商户类型">
<template #default="scope">
<el-tag type="info" disable-transitions v-if="scope.row.merchant_type == 0">企业 </el-tag>
<el-tag type="info" disable-transitions v-if="scope.row.merchant_type == 1">微个</el-tag>
</template>
</el-table-column> -->
<el-table-column prop="contacts_name" label="联系人名称"></el-table-column>
<el-table-column prop="contacts_phone" label="手机号"></el-table-column>
<!-- <el-table-column prop="contacts_email" label="联系人邮箱"></el-table-column> -->
<el-table-column prop="mcc_code" label="经营类目"></el-table-column>
<!-- <el-table-column prop="province_code" label="省份代码"></el-table-column> -->
<el-table-column prop="province_name" label="城市">
<template #default="scope">
<el-text>{{ scope.row.province_name}} {{ scope.row.city_name}}</el-text>
</template>
</el-table-column>
<!-- <el-table-column prop="city_code" label="城市代码"></el-table-column> -->
<!-- <el-table-column prop="city_name" label="城市名称"></el-table-column> -->
<el-table-column prop="agencyCode" label="手机号"></el-table-column>
<!-- <el-table-column prop="current_fee" label="推广费率">
<template #default="scope">
<el-text type="info" v-if="scope.row.is_extend == 0"></el-text>
@@ -131,17 +112,17 @@
<template #default="scope">
<el-text>{{ scope.row.sumConsumeFee.toFixed(2) }}</el-text>
</template>
</el-table-column>
<el-table-column prop="inviteNum" label="邀请码"></el-table-column> -->
<!-- <el-table-column prop="agencyName" label="实名状态">
</el-table-column> -->
<el-table-column prop="inviteNum" label="邀请码"></el-table-column>
<el-table-column prop="agencyName" label="实名状态">
<template #default="scope">
<el-tag type="info" disable-transitions v-if="scope.row.status == 0">未实名</el-tag>
<el-tag type="warning" disable-transitions v-if="scope.row.status == 1">审核中</el-tag>
<el-tag type="danger" disable-transitions v-if="scope.row.status == 2">审核失败</el-tag>
<el-tag type="success" disable-transitions v-if="scope.row.status == 3">已审核</el-tag>
</template>
</el-table-column> -->
<!-- <el-table-column prop="sumfansShareMoney" label="累计收款">
</el-table-column>
<el-table-column prop="sumfansShareMoney" label="累计收款">
<template #default="scope">
<el-link type="primary" icon="search" @click="showTotalEarnings(scope.row.id)">
{{ scope.row.sumConsumeFee }}
@@ -159,7 +140,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="商户基本信息">
<el-table-column label="商户基本信息">
<template #default="scope">
<div class="column">
<el-text type="primary" size="small">{{ scope.row.merchantBaseInfo.merchantTypeName }}</el-text>
@@ -249,7 +230,7 @@
</div>
</template>
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column label="创客等级" align="center">
<template #default="scope">
<el-tag type="info" disable-transitions v-if="scope.row.is_extend == 0">普通商户</el-tag>
@@ -261,8 +242,8 @@
<template #default="scope">
{{ dayjs(scope.row.createDt).format('YYYY-MM-DD HH:mm:ss') }}
</template>
</el-table-column>-->
<!-- <el-table-column label="操作" width="150" fixed="right">
</el-table-column>
<el-table-column label="操作" width="150" fixed="right">
<template #default="scope">
<el-button type="primary" size="small" disabled icon="Search" v-permission="['MG']"
v-if="!scope.row.merchantBaseInfo.alias">
@@ -276,7 +257,7 @@
</el-button>
</RouterLink>
</template>
</el-table-column> -->
</el-table-column>
</el-table>
</div>
<div class="mt15">
@@ -358,7 +339,7 @@ function dialogSearchHandle() {
// 分页回调
function dialogPaginationChange() {
dialogTableOptions.loading = true
// getTableDate()
getTableDate()
}
// 获取机构列表
@@ -398,7 +379,7 @@ const tableOptions = reactive({
loading: true,
agencyCode: '', // 商户登录号
merchantCode: '', // 商户号
merchant_name: '',
phone: '',
status: '', // 进件状态。0或无、待审核1、审核中 2、审核失败 3、审核通过
merchantType: '', // 1:小微 2:个体 3:企业
reqUserId: '', // 用户id
@@ -434,20 +415,20 @@ function paginationChange() {
async function queryCustormerFlowHandle() {
try {
const res = await queryCustormerFlow({
// agencyCode: tableOptions.agencyCode,
merchant_code: tableOptions.merchantCode,
merchant_name: tableOptions.merchant_name,
// status: tableOptions.status,
// merchantType: tableOptions.merchantType,
// reqUserId: tableOptions.reqUserId,
page: tableOptions.pageNum,
// pageSzie: tableOptions.pageSzie,
// userType: 'MC',
// isExtend: 'shop',
agencyCode: tableOptions.agencyCode,
merchantCode: tableOptions.merchantCode,
phone: tableOptions.phone,
status: tableOptions.status,
merchantType: tableOptions.merchantType,
reqUserId: tableOptions.reqUserId,
pageNum: tableOptions.pageNum,
pageSzie: tableOptions.pageSzie,
userType: 'MC',
isExtend: 'shop'
})
tableOptions.loading = false
tableOptions.list = res.data
tableOptions.total = res.count
tableOptions.list = res.list
tableOptions.total = res.total
table.value.setScrollTop(0)
} catch (error) { }
}
@@ -500,7 +481,7 @@ function filterData(arr, type) {
onMounted(() => {
queryCustormerFlowHandle()
// queryCustormSumAjax()
queryCustormSumAjax()
})
</script>

View File

@@ -1,221 +0,0 @@
<template>
<div class="login-case">
<div class="form-case">
<span class="Hello">Hello !</span>
<span class="title">欢迎修改银收客开放平台代理</span>
<el-form ref="ruleFormRef" :rules="rules" :model="form">
<el-form-item prop="mobile">
<el-input class="inp" v-model="form.mobile" disabled clearable autocomplete="new-password" size="large"
:prefix-icon="User" placeholder="请输入手机号" style="width: 100%;" />
</el-form-item>
<el-form-item prop="newpassword">
<el-input class="inp" v-model="form.newpassword" newpassword autocomplete="new-password" size="large"
:prefix-icon="User" placeholder="请输入密码" style="width: 100%;" />
</el-form-item>
<el-form-item prop="captcha">
<div class="code-case">
<el-input class="inp" v-model="form.captcha" clearable autocomplete="new-password" size="large"
:prefix-icon="CircleCheck" width="100px" placeholder="验证码" />
<!-- <verificationCode @getCode="getCode" :key="verificationCodeKey"></verificationCode> -->
<el-button style="height:40px;" @click="getCaptcha"
:disabled="textword === '获取验证码' ? false : true">{{ textword
}}</el-button>
</div>
</el-form-item>
<el-form-item>
<el-button type="primary" size="large" :loading="loading" @click="passwords"
style="width: 100%;">修改密码</el-button>
</el-form-item>
</el-form>
</div>
</div>
</template>
<script setup>
import verificationCode from "@/components/verificationCode.vue"
import { User, Lock, CircleCheck } from "@element-plus/icons-vue"
import { useUser } from "@/store/user.js"
import { register } from "@/api/user.js"
import { ElMessage } from "element-plus";
import { agentsendsms, agentresetpwd } from "@/api/password.js"
import _hook from "@/hooks/index.js";
const ruleFormRef = ref("");
const store = useUser();
const router = useRouter();
const loading = ref(false)
onMounted(() => {
// ElMessage({
// message: "请使用用户名为 admin、yonghu1、yonghu2 进行登录测试,来获取不同的权限",
// type: "success",
// duration: 5000,
// });
});
let verificationCodeKey = ref(0);
let trueCode = ref("");
const textword = ref("获取验证码");
const getCaptcha = async () => {
if (textword.value == '获取验证码') {
clickagentsendsms()
console.log(textword.value, 111)
}
let n = 60;
textword.value = n + "秒钟重新获取";
const timer = setInterval(() => {
if (n === 0) {
clearInterval(timer);
textword.value = "获取验证码";
} else {
n--;
textword.value = n + "秒钟重新获取";
}
}, 1000);
}
/**
* @description: 获取正确的验证码值
* @param {*} captcha: 正确的验证码
*/
function getCode(captcha) {
trueCode.value = captcha;
}
const form = reactive({
mobile: _hook.useLocalStorage.get("userInfo").phone,
newpassword: "",
userType: 'MG',
captcha: "",
});
/**
* @description: 自定义验证 - 验证账号
*/
function checkName(rule, value, callback) {
if (value === "") {
callback(new Error("账号不可为空"));
} else {
callback();
}
}
/**
* @description: 自定义验证 - 验证验证码
*/
function checkCode(rule, value, callback) {
if (value === "") {
callback(new Error("验证码不可为空"));
} else if (value !== trueCode.value) {
verificationCodeKey.value++;
callback(new Error("验证码不正确"));
} else {
callback();
}
}
// form 验证
const rules = reactive({
mobile: [{ validator: checkName, required: true, trigger: "blur" }],
newpassword: [{ required: true, message: "密码不可为空", trigger: "blur" }],
captcha: [{ required: true, message: "验证码不能为空", trigger: "blur" }],
});
//验证码
async function clickagentsendsms() {
const res = {
mobile: form.mobile
}
agentsendsms(res).then((res) => {
ElMessage.success('发送成功!')
// router.replace("/home");
}).catch(err => {
});
}
// 密码
async function passwords() {
//通过 ref 的值触发验证
await ruleFormRef.value.validate((valid) => {
if (valid) {
loading.value = true
const datares = {
mobile: form.mobile,
newpassword: form.newpassword,
captcha: form.captcha
};
agentresetpwd(datares).then((res) => {
ElMessage.success('修改成功')
// 清除缓存 / token 等
setTimeout(() => {
_hook.useLocalStorage.clear();
// 使用 reload 时,不需要调用 resetRoute() 重置路由
// 且刷新页面时 pinia 数据会重置
window.location.reload();
}, 1500);
// console.log(res, '返回')
// store.setUserInfo()
// _hook.useLocalStorage.set("token", res.userinfo.token);
// _hook.useLocalStorage.set("userInfo", res.userinfo.userInfo);
// ElMessage.success('修改成功')
// loading.value = false
// router.replace("/home");
}).catch(err => {
loading.value = false
});
}
});
}
// 回车键触发更改操作
_hook.useKeyStroke("Enter", passwords);
</script>
<style lang="scss" scoped>
.login-case {
position: fixed;
top: 0;
bottom: 0;
left: 0;
right: 0;
background: url('../../assets/logo_bg.png') no-repeat right bottom / contain;
}
.form-case {
position: absolute;
display: flex;
flex-direction: column;
// height: 450px;
left: 20%;
top: 50%;
transform: translateY(-50%);
}
.Hello {
font-weight: bold;
font-size: 30px;
color: #000;
margin-bottom: 10px;
}
.title {
font-weight: 600;
font-size: 40px;
color: #000;
margin-bottom: 50px;
}
.code-case {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
.inp {
margin-right: 10px;
}
}
.to_register {
display: flex;
justify-content: flex-end;
font-size: 14px;
padding-bottom: 20px;
}
</style>

View File

@@ -1,199 +0,0 @@
<template>
<div class="login-case">
<div class="form-case">
<span class="Hello">Hello !</span>
<span class="title">欢迎注册银收客开放平台代理</span>
<el-form ref="ruleFormRef" :rules="rules" :model="form">
<el-form-item prop="mobile">
<el-input class="inp" v-model="form.mobile" clearable autocomplete="new-password" size="large"
placeholder="请输入手机号" style="width: 100%;" />
</el-form-item>
<el-form-item prop="password">
<el-input class="inp" v-model="form.password" clearable autocomplete="new-password" size="large"
type="password" placeholder="请输入密码" style="width: 100%;" />
</el-form-item>
<!-- <el-form-item>
<el-select v-model="form.userType" placeholder="请选择机构类型" size="large" style="width: 100%;">
<el-option key="MG" label="平台" value="MG"></el-option>
<el-option key="FO" label="大机构" value="FO"></el-option>
<el-option key="SO" label="小机构" value="SO"></el-option>
</el-select>
</el-form-item> -->
<el-form-item prop="captcha">
<div class="code-case">
<el-input class="inp" v-model="form.captcha" clearable autocomplete="new-password" size="large"
type="text" placeholder="验证码" style="width: 100%;" />
<el-button :type="state.countdown > 0 ? 'info' : 'primary'" :disabled='state.countdown > 0'
@click='sendVerificationCode'>
<span v-if="state.countdown > 0">{{ state.countdown }} 秒后重新发送</span>
<span v-else>发送验证码</span>
</el-button>
</div>
</el-form-item>
<div class="to_register">
<router-link :to="{ name: 'login' }">
<el-text type="primary">登录</el-text>
</router-link>
</div>
<el-form-item>
<el-button type="primary" size="large" :loading="loading" @click="login"
style="width: 100%;">注册</el-button>
</el-form-item>
</el-form>
</div>
</div>
</template>
<script setup>
import { useUser } from "@/store/user.js"
import { register, agentsendsms } from "@/api/user.js"
import { ElMessage } from "element-plus";
import _hook from "@/hooks/index.js";
const ruleFormRef = ref("");
const store = useUser();
const loading = ref(false)
const router = useRouter();
onMounted(() => {
// ElMessage({
// message: "请使用用户名为 admin、yonghu1、yonghu2 进行登录测试,来获取不同的权限",
// type: "success",
// duration: 5000,
// });
});
// 倒计时
const state = reactive({
countdown: 0,
timer: null
})
const sendVerificationCode = () => {
if (form.mobile) {
try {
agentsendsms({
mobile: form.mobile,
event: 'register'
}).then((res) => {
ElMessage.success('验证码发送成功')
state.countdown = 60
state.timer = setInterval(() => {
if (state.countdown > 0) {
state.countdown--
} else {
clearInterval(state.timer)
}
}, 1000)
}).catch(err => {
});
} catch (error) {
}
} else {
ElMessage.error('手机号不可为空')
}
}
const form = reactive({
mobile: "",
password: "",
userType: 'MG',
captcha: "",
});
/**
* @description: 自定义验证 - 验证账号
*/
function checkName(rule, value, callback) {
if (value === "") {
callback(new Error("账号不可为空"));
} else {
callback();
}
}
// form 验证
const rules = reactive({
mobile: [{ validator: checkName, required: true, trigger: "blur" }],
password: [{ required: true, message: "密码不可为空", trigger: "blur" }],
captcha: [{ required: true, message: "密码不可为空", trigger: "blur" }],
});
// 登录
async function login() {
//通过 ref 的值触发验证
await ruleFormRef.value.validate((valid) => {
if (valid) {
loading.value = true
const data = {
mobile: form.mobile,
password: form.password,
captcha: form.captcha
};
register(data).then((res) => {
console.log(res)
ElMessage.success('注册成功')
loading.value = false
_hook.useLocalStorage.set("token",res.userinfo.token);
_hook.useLocalStorage.set("userInfo",res.userinfo);
router.replace("/home");
}).catch(err => {
loading.value = false
});
}
});
}
// 回车键触发登录操作
</script>
<style lang="scss" scoped>
.login-case {
position: fixed;
top: 0;
bottom: 0;
left: 0;
right: 0;
background: url('../../assets/logo_bg.png') no-repeat right bottom / contain;
}
.form-case {
position: absolute;
display: flex;
flex-direction: column;
// height: 450px;
left: 20%;
top: 50%;
transform: translateY(-50%);
}
.Hello {
font-weight: bold;
font-size: 30px;
color: #000;
margin-bottom: 10px;
}
.title {
font-weight: 600;
font-size: 40px;
color: #000;
margin-bottom: 50px;
}
.code-case {
display: flex;
align-items: center;
justify-content: space-between;
.inp {
margin-right: 10px;
}
}
.to_register {
display: flex;
justify-content: flex-end;
font-size: 14px;
padding-bottom: 20px;
}
</style>

View File

@@ -8,8 +8,7 @@
<div class="info">
<div class="title">总收益</div>
<div class="num">
<count-to :start-val="0" :end-val="earnings.sumProfit" :duration="1000" :decimals="2"
prefix="¥" />
<count-to :start-val="0" :end-val="earnings.sumProfit" :duration="1000" :decimals="2" prefix="¥" />
</div>
</div>
</div>
@@ -23,8 +22,8 @@
<count-to :start-val="0" :end-val="earnings.availableBalance" :duration="1000" :decimals="2"
prefix="¥" />
</div>
<div class="btn_wrap" v-if="earnings.is_alipay == '1'">
<div class="btn" v-if="userInfo != 1">
<div class="btn_wrap">
<div class="btn">
<el-button type="primary" size="small" icon="CreditCard"
@click="showWithdraw = true">申请提现</el-button>
</div>
@@ -33,12 +32,6 @@
@click="getUserOutFlowHandleResize">提现记录</el-button>
</div>
</div>
<div class="btn_wrap" v-if="earnings.is_alipay == '0' && userInfo != 1">
<div class="btn">
<el-button type="primary" size="small" icon="CreditCard"
@click="showWithdzfb = true">绑定账号</el-button>
</div>
</div>
</div>
</div>
<div class="item">
@@ -48,36 +41,36 @@
<div class="info">
<div class="title">提现中收益</div>
<div class="num">
<count-to :start-val="0" :end-val="earnings.fronZenAmt" :duration="1000" :decimals="2"
prefix="¥" />
<count-to :start-val="0" :end-val="earnings.fronZenAmt" :duration="1000" :decimals="2" prefix="¥" />
</div>
</div>
</div>
</div>
</div>
<div class="card mt15">
<!-- <el-space>
<el-space>
<el-input placeholder="请输入订单号搜索" v-model="tableOptions.orderNumber" style="width: 200px;" />
<el-input placeholder="请输入商户号搜索" v-model="tableOptions.merchantCode" style="width: 200px;" />
<el-button type="primary" icon="Search" @click="searchHandle">搜索</el-button>
</el-space> -->
</el-space>
<div class="mt15">
<div class="table">
<el-table :data="tableOptions.list" size="large" stripe border height="100%"
v-loading="tableOptions.loading">
<el-table-column prop="profit" label="收益"></el-table-column>
<el-table-column prop="amount" label="收款金额"></el-table-column>
<el-table-column prop="merchant" label="收益来源">
<el-table-column prop="price" label="收益"></el-table-column>
<el-table-column prop="consumeFee" label="收款金额"></el-table-column>
<!-- <el-table-column prop="loginName" label="名称"></el-table-column> -->
<el-table-column prop="merchantName" label="商家名称"></el-table-column>
<el-table-column prop="merchantName" label="收益来源">
<template #default="scope">
<el-text>{{ scope.row.merchant.merchant_name }}</el-text>
<!-- <el-tag disable-transitions style="margin-left: 8px;">{{ typeNames[scope.row.typeCode]
}}</el-tag> -->
<el-text>{{ scope.row.loginName }}</el-text>
<el-tag disable-transitions style="margin-left: 8px;">{{ typeNames[scope.row.typeCode]
}}</el-tag>
</template>
</el-table-column>
<el-table-column prop="createDt" label="时间">
<template #default="scope">
{{ scope.row.create_time }}
{{ dayjs(scope.row.createDt).format('YYYY-MM-DD HH:mm:ss') }}
</template>
</el-table-column>
</el-table>
@@ -90,34 +83,6 @@
@size-change="paginationChange" @current-change="paginationChange" />
</div>
</div>
<el-dialog v-model="showWithdzfb" title="绑定账号" width="600" @closed="formRefzfb.resetFields()">
<el-space>
<el-form ref="formRefzfb" :model="formzfb">
<el-form-item label="账号名" prop="alipay_fullname">
<el-space>
<el-input v-model="formzfb.alipay_fullname" placeholder="请输入姓名" style="width: 450px;" />
</el-space>
</el-form-item>
<el-form-item label="账号" prop="alipay_username">
<el-space>
<el-input v-model="formzfb.alipay_username" placeholder="请输入账号" style="width: 450px;" />
</el-space>
</el-form-item>
<el-form-item label="备注" >
<el-space>
<el-input v-model="formzfb.notes" placeholder="支付宝/对公账号/银行卡" style="width: 450px;" />
</el-space>
</el-form-item>
</el-form>
</el-space>
<template #footer>
<span class="dialog-footer">
<el-button @click="showWithdzfb = false">取消</el-button>
<el-button type="primary" :loading="form.loading" @click="submitHandlezfb">确定</el-button>
</span>
</template>
</el-dialog>
<el-dialog v-model="showWithdraw" title="申请提现" width="600" @closed="formRef.resetFields()">
<el-space>
<el-form ref="formRef" :model="form" :rules="rules">
@@ -125,15 +90,13 @@
<el-space>
<el-input placeholder="请输入提现金额" clearable style="width: 300px;" :model-value="form.num"
@input="numInput" />
<el-button type="primary"
@click="form.num = ((earnings.availableBalance / 100) * 100).toFixed(2)">
<el-button type="primary" @click="form.num = ((earnings.availableBalance / 100) * 100).toFixed(2)">
全部提现({{ ((earnings.availableBalance / 100) * 100).toFixed(2) }})
</el-button>
</el-space>
</el-form-item>
</el-form>
</el-space>
<template #footer>
<span class="dialog-footer">
<el-button @click="showWithdraw = false">取消</el-button>
@@ -141,8 +104,8 @@
</span>
</template>
</el-dialog>
<el-dialog v-model="records.show" title="提现记录" width="1200px">
<!-- <el-row>
<el-dialog v-model="records.show" title="提现记录">
<el-row>
<el-select v-model="records.status" @change="recordsPaginationChange">
<el-option label="全部" value="" key="" />
<el-option label="待审核" :value="0" :key="0" />
@@ -150,85 +113,41 @@
<el-option label="提现失败" :value="2" :key="2" />
<el-option label="审核中" :value="3" :key="3" />
</el-select>
</el-row> -->
</el-row>
<div class="records_table mt15">
<el-table :data="records.list" size="large" border height="100%" v-loading="records.loading">
<el-table-column prop="user_id" label="代理id"></el-table-column>
<el-table-column prop="username" label="代理账户" v-if="userInfo == 1">
<el-table-column prop="id" label="机构id"></el-table-column>
<el-table-column prop="cashAmt" label="提现金额">
<template #default="scope">
<el-text type="primary">{{ scope.row.user.username }}</el-text>
<el-text type="primary">{{ scope.row.cashamt }}</el-text>
</template>
</el-table-column>
<el-table-column prop="nick_name" label="代理昵称" v-if="userInfo == 1">
<el-table-column prop="createDt" label="提现时间" width="250">
<template #default="scope">
<el-text type="primary">{{ scope.row.user.nick_name }}</el-text>
<el-text>{{ dayjs(scope.row.createdt).format('YYYY-MM-DD HH:mm:ss') }}</el-text>
</template>
</el-table-column>
<el-table-column prop="phone" label="代理手机号" v-if="userInfo == 1">
<template #default="scope">
<el-text type="primary">{{ scope.row.user.phone }}</el-text>
</template>
</el-table-column>
<el-table-column prop="alipay_username" label="账户"></el-table-column>
<el-table-column prop="alipay_fullname" label="账号名"></el-table-column>
<el-table-column prop="alipay_notes" label="备注"></el-table-column>
<el-table-column prop="amount" label="提现金额">
<template #default="scope">
<el-text type="primary">{{ scope.row.amount }}</el-text>
</template>
</el-table-column>
<el-table-column prop="create_time" label="提现时间" width="250">
<template #default="scope">
<el-text>{{ scope.row.create_time }}</el-text>
</template>
</el-table-column>
<el-table-column label="待审状态">
<el-table-column label="状态">
<template #default="scope">
<el-tag type="info" disable-transitions v-if="scope.row.status == 0">待审核</el-tag>
<el-tag type="success" disable-transitions v-if="scope.row.status == 1">审核成功</el-tag>
<el-tag type="warning" disable-transitions v-if="scope.row.status == 2">审核失败</el-tag>
<!-- <el-tag type="info" disable-transitions v-if="scope.row.status == 3">审核中</el-tag> -->
<el-tag type="success" disable-transitions v-if="scope.row.status == 1">提现成功</el-tag>
<el-tag type="warning" disable-transitions v-if="scope.row.status == 2">提现失败</el-tag>
<el-tag type="info" disable-transitions v-if="scope.row.status == 3">审核中</el-tag>
</template>
</el-table-column>
<el-table-column label="转账状态">
<template #default="scope">
<el-tag type="success" disable-transitions
v-if="scope.row.status == 1 && scope.row.transfer_status == 3">转账成功</el-tag>
<el-tooltip v-if="scope.row.status == 1 && scope.row.transfer_status == 4" class="box-item"
effect="dark" :content="scope.row.notes" placement="top-start">
<el-tag type="danger" disable-transitions
v-if="scope.row.status == 1 && scope.row.transfer_status == 4 && userInfo == 1">转账失败
<el-icon>
<WarningFilled />
</el-icon></el-tag>
</el-tooltip>
<el-tag type="danger" disable-transitions
v-if="scope.row.status == 1 && scope.row.transfer_status == 4 && userInfo != 1">转账失败
</el-tag>
<!-- <el-tag type="info" disable-transitions v-if="scope.row.status == 3">审核中</el-tag> -->
</template>
</el-table-column>
<!-- <el-table-column prop="cashStatus" label="上级审核信息">
<el-table-column prop="cashStatus" label="上级审核信息">
<template #default="scope">
<el-link type="primary" icon="Search"
@click="showCheckModle(scope.$index, scope.row.cashstatus)">查看进度</el-link>
</template>
</el-table-column> -->
</el-table-column>
</el-table>
</div>
<div class="mt15">
<el-pagination layout="prev, pager, next, total, sizes, jumper" background
v-model:current-page="records.pageNum" v-model:page-size="records.pageSize"
:page-size="records.pageSize" :page-sizes="[10, 20, 30, 50]" :total="records.total"
@size-change="recordsPaginationChange" @current-change="recordsPaginationChange" />
v-model:current-page="records.pageNum" v-model:page-size="records.pageSize" :page-size="records.pageSize"
:page-sizes="[10, 20, 30, 50]" :total="records.total" @size-change="recordsPaginationChange"
@current-change="recordsPaginationChange" />
</div>
<el-dialog v-model="records.showProgress" title="审核进度">
<el-steps :active="rowProgressActive" align-center>
@@ -244,15 +163,10 @@
import hooks from '@/hooks'
import { dayjs } from 'element-plus';
import { typeNames, clearNoNum } from '@/utils/index.js'
import { queryProfit, getUserBalance, withdrawalProfit, getUserOutFlow, agentalipay } from '@/api/organization.js'
import { queryProfit, getUserBalance, withdrawalProfit, getUserOutFlow } from '@/api/organization.js'
import { onMounted, reactive, ref } from 'vue';
import { ElMessage } from 'element-plus'
import _hook from "@/hooks/index.js";
// 本地数据
const userInfo = reactive(
_hook.useLocalStorage.get("userInfo").is_admin
)
// 表格参数
const tableOptions = reactive({
loading: true,
@@ -269,25 +183,18 @@ const tableOptions = reactive({
const earnings = reactive({
sumProfit: 0,
availableBalance: 0,
fronZenAmt: 0,
is_alipay: 0
fronZenAmt: 0
})
// 显示提现弹窗
const formRefzfb = ref()
const formRef = ref()
const showWithdraw = ref(false)
const showWithdzfb = ref(false)
const form = reactive({
num: '',
loading: false
})
const formzfb = reactive({
alipay_username: '',
alipay_fullname: '',
notes:'',
loading: false
})
const rules = reactive({
num: [
{
@@ -307,26 +214,7 @@ function numInput(e) {
form.num = ((earnings.availableBalance / 100) * 100).toFixed(2)
}
}
//提交
async function submitHandlezfb() {
await formRefzfb.value.validate(async (valid) => {
if (valid) {
try {
formzfb.loading = true
await agentalipay({
alipay_username: formzfb.alipay_username,
alipay_fullname: formzfb.alipay_fullname,
notes:formzfb.notes,
})
formzfb.loading = false
showWithdzfb.value = false
getTableDate()
} catch (error) {
formzfb.loading = false
}
}
})
}
// 提交提现申请
async function submitHandle() {
await formRef.value.validate(async (valid) => {
@@ -338,7 +226,7 @@ async function submitHandle() {
})
form.loading = false
showWithdraw.value = false
getTableDate()
getUserBalanceHandle()
} catch (error) {
form.loading = false
}
@@ -405,14 +293,14 @@ function getUserOutFlowHandleResize() {
// 获取提现流水
async function getUserOutFlowHandle() {
try {
const res = await getUserOutFlow({
const { total, list } = await getUserOutFlow({
status: records.status,
page: records.pageNum,
pageNum: records.pageNum,
pageSize: records.pageSize
})
records.loading = false
records.list = res.data
records.total = res.count
records.list = list
records.total = total
} catch (error) {
records.loading = false
}
@@ -434,18 +322,15 @@ function paginationChange() {
async function getTableDate() {
try {
const res = await queryProfit({
reqUserId: hooks.useLocalStorage.get('userInfo').userId,
orderNumber: tableOptions.orderNumber,
merchantCode: tableOptions.merchantCode,
page: tableOptions.pageNum,
pageNum: tableOptions.pageNum,
pageSize: tableOptions.pageSize
})
tableOptions.loading = false
tableOptions.list = res.data
earnings.sumProfit = res.z_profit
earnings.availableBalance = res.pro_profit
earnings.fronZenAmt = res.l_profit
earnings.is_alipay = res.is_alipay
tableOptions.total = res.count
tableOptions.list = res.list
tableOptions.total = res.total
} catch (error) { }
}
@@ -461,7 +346,7 @@ async function getUserBalanceHandle() {
onMounted(() => {
getTableDate()
// getUserBalanceHandle()
getUserBalanceHandle()
})
</script>

View File

@@ -1,6 +1,6 @@
<template>
<div class="card">
<!-- <el-space>
<el-space>
<el-input placeholder="用户名称" v-model="tableOptions.userName" style="width: 200px;" />
<el-input placeholder="商户号" v-model="tableOptions.merchantCode" style="width: 200px;" />
<el-select v-model="tableOptions.status">
@@ -11,80 +11,46 @@
<el-option :key="3" :value="3" label="审核中"></el-option>
</el-select>
<el-button type="primary" icon="Search" @click="searchHandle">搜索</el-button>
</el-space> -->
</el-space>
<div class="table mt15">
<el-table :data="tableOptions.list" size="large" stripe border height="100%" v-loading="tableOptions.loading">
<el-table-column prop="user_id" label="代理id"></el-table-column>
<el-table-column prop="username" label="代理账户">
<el-table-column prop="id" label="机构id"></el-table-column>
<el-table-column prop="merchantCode" label="商户号"></el-table-column>
<el-table-column prop="userName" label="商户名称"></el-table-column>
<el-table-column prop="accountNo" label="账户号"></el-table-column>
<el-table-column prop="cashAmt" label="提现金额">
<template #default="scope">
<el-text type="primary">{{ scope.row.user.username }}</el-text>
<el-text type="primary">{{ scope.row.cashAmt }}</el-text>
</template>
</el-table-column>
<el-table-column prop="nick_name" label="代理昵称">
<el-table-column prop="userId" label="用户id"></el-table-column>
<el-table-column prop="createDt" label="提现时间">
<template #default="scope">
<el-text type="primary">{{ scope.row.user.nick_name }}</el-text>
<el-text>{{ dayjs(scope.row.createDt).format('YYYY-MM-DD HH:mm:ss') }}</el-text>
</template>
</el-table-column>
<el-table-column prop="phone" label="代理手机号">
<el-table-column prop="typeCode" label="提现人身份">
<template #default="scope">
<el-text type="primary">{{ scope.row.user.phone }}</el-text>
<el-tag disable-transitions>{{ typeNames[scope.row.typeCode] }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="alipay_username" label="账户名"></el-table-column>
<el-table-column prop="alipay_fullname" label="账号"></el-table-column>
<el-table-column prop="alipay_notes" label="备注"></el-table-column>
<!-- <el-table-column prop="merchantCode" label="商户号"></el-table-column> -->
<!-- <el-table-column prop="userName" label="商户名称"></el-table-column>
<el-table-column prop="accountNo" label="账户号"></el-table-column> -->
<el-table-column prop="amount" label="提现金额">
<el-table-column label="状态">
<template #default="scope">
<el-text type="primary">{{ scope.row.amount }}</el-text>
<el-tag type="info" v-if="scope.row.status == 0">待审核</el-tag>
<el-tag type="success" v-if="scope.row.status == 1">提现成功</el-tag>
<el-tag type="warning" v-if="scope.row.status == 2">提现失败</el-tag>
<el-tag type="info" v-if="scope.row.status == 3">审核中</el-tag>
</template>
</el-table-column>
<!-- <el-table-column prop="userId" label="用户id"></el-table-column> -->
<!-- <el-table-column prop="notes" label="提现时间">
<template #default="scope">
<el-text>{{ dayjs(scope.row.notes).format('YYYY-MM-DD HH:mm:ss') }}</el-text>
</template>
</el-table-column> -->
<el-table-column prop="create_time" label="提现时间"></el-table-column>
<!-- <el-table-column prop="user" label="提现人身份" >
<template #default="scope">
<el-tag disable-transitions>{{ scope.row.user.nick_name }}</el-tag>
</template>
</el-table-column> -->
<el-table-column label="待审状态" v-if="userInfo == 1">
<template #default="scope">
<el-tag type="info" disable-transitions v-if="scope.row.status == 0">待审核</el-tag>
<el-tag type="success" disable-transitions v-if="scope.row.status == 1">审核成功</el-tag>
<el-tag type="warning" disable-transitions v-if="scope.row.status == 2">审核失败</el-tag>
<!-- <el-tag type="info" disable-transitions v-if="scope.row.status == 3">审核中</el-tag> -->
</template>
</el-table-column>
<el-table-column label="转账状态" v-if="userInfo == 1">
<template #default="scope">
<el-tag type="success" disable-transitions
v-if="scope.row.status == 1 && scope.row.transfer_status == 3">转账成功</el-tag>
<el-tooltip v-if="scope.row.status == 1 && scope.row.transfer_status == 4 && userInfo == 1"
class="box-item" effect="dark" :content="scope.row.notes" placement="top-start">
<el-tag type="danger" disable-transitions
v-if="scope.row.status == 1 && scope.row.transfer_status == 4 && userInfo == 1">转账失败<el-icon>
<WarningFilled />
</el-icon></el-tag>
</el-tooltip>
<!-- <el-tag type="info" disable-transitions v-if="scope.row.status == 3">审核中</el-tag> -->
</template>
</el-table-column>
<!-- <el-table-column prop="cashStatus" label="上级审核信息">
<el-table-column prop="cashStatus" label="上级审核信息">
<template #default="scope">
<el-link type="primary" icon="Search"
@click="showCheckModle(scope.$index, scope.row.cashStatus)">查看进度</el-link>
</template>
</el-table-column> -->
</el-table-column>
<el-table-column label="操作">
<template #default="scope">
<template v-if="scope.row.status == 0 && userInfo == 1">
<template v-if="scope.row.show && scope.row.status != 2">
<el-popconfirm title="是否审核通过?" width="200" confirm-button-text="通过" cancel-button-text="驳回"
@cancel="checkHandle(scope.row, 2)" @confirm="checkHandle(scope.row, 1)">
<template #reference>
@@ -124,7 +90,7 @@ import { typeNames } from '@/utils/index.js'
import { ElMessage } from 'element-plus'
import { dayjs } from 'element-plus'
import hooks from '@/hooks'
import _hook from "@/hooks/index.js";
// 显示进度dialog
const show = ref(false)
// 当前表格索引
@@ -140,6 +106,7 @@ const statusEmun = ref({
"2": '提现失败',
"3": '审核中'
})
// 查看当前进度
function showCheckModle(row, cashStatus) {
show.value = true
@@ -153,18 +120,13 @@ function showCheckModle(row, cashStatus) {
}
})
}
// 本地数据
const userInfo = reactive(
_hook.useLocalStorage.get("userInfo").is_admin
)
// 审核操作
async function checkHandle(row, status) {
console.log(row, status)
try {
await modifyOutFlow({
id: row.id,
type: status
status: status
})
ElMessage.success('提交成功')
paginationChange()
@@ -199,33 +161,36 @@ function paginationChange() {
async function getOutFlowHandle() {
try {
const res = await getOutFlow({
page: tableOptions.pageNum
userName: tableOptions.userName,
merchantCode: tableOptions.merchantCode,
status: tableOptions.status,
pageNum: tableOptions.pageNum,
pageSize: tableOptions.pageSize
})
const userInfo = hooks.useLocalStorage.get('userInfo')
const data = [...res.data];
const data = [...res.list];
console.log(data, '1111111')
// console.log(userInfo.userType)
// for (let item of data) {
// item.show = false;
// const arr = JSON.parse(item.cashStatus);
// // console.log(arr);
// for (let child of arr) {
// if (child.userType == userInfo.userType && child.status == 0) {
// item.show = true;
// }
// }
// }
for (let item of data) {
item.show = false;
const arr = JSON.parse(item.cashStatus);
// console.log(arr);
for (let child of arr) {
if (child.userType == userInfo.userType && child.status == 0) {
item.show = true;
}
}
}
tableOptions.loading = false
tableOptions.list = data
tableOptions.total = res.count
tableOptions.total = res.total
} catch (error) { }
}
onMounted(() => {
getOutFlowHandle()
})
</script>

View File

@@ -6,16 +6,14 @@ import AutoImport from "unplugin-auto-import/vite";
export default defineConfig({
server: {
host: '0.0.0.0',
port: 1111,
open: true,
proxy: {
'/api': {
// target: 'http://192.168.2.161:18071/admin/',
// target: 'http://newadminapi.sxczgkj.cn/admin/',
// target: 'http://admintestapi.sxczgkj.cn/admin/',
// target: 'http://gw.sxczgkj.cn/admin/', // 测试
target: 'http://gw.sxczgkj.cn/admin/', // 测试
// target: 'http://192.168.2.128:18071/admin/',
target: 'http://192.168.2.23:7777/proxy/',
changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, '')
}