Jason/water_dealer-agent
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: Jason:online-agent
Branches Tags
Jason:main Jason:test Jason:online-agent
..
compare: Jason:main
Branches Tags
Jason:test Jason:online-agent Jason:main

1 Commits
online-age ... main

Author SHA1 Message Date
zhangdongxue
88155a968b merge 2023-12-12 10:08:44 +08:00
17 changed files with 192 additions and 286 deletions
Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

5
.env
View File

@@ -1,7 +1,8 @@
NODE_ENV=production NODE_ENV=production
VUE_APP_PREVIEW=false VUE_APP_PREVIEW=false
# <!-- //水感应正式环境--> # <!-- //水感应正式环境-->
VUE_APP_API_BASE_URL=https://api.shui.shuiganying.com/api # VUE_APP_API_BASE_URL=https://douhuo.douhuofalv.com/agent
# <!-- // 水感应测试--> # <!-- // 水感应测试-->
# VUE_APP_API_BASE_URL=https://shuitest.shuiganying.com/api # VUE_APP_API_BASE_URL=https://api.douhuotest.douhuofalv.com/agent
VUE_APP_API_BASE_URL=https://shuitest.shuiganying.com/api

13
.env.development
View File

@@ -1,15 +1,16 @@
### ###
# @Author: Aimee~ # @Author: Aimee~
# @Date: 2023-05-11 11:17:32 # @Date: 2023-05-11 11:17:32
# @LastEditTime: 2023-12-12 15:52:34 # @LastEditTime: 2023-07-28 09:49:14
# @LastEditors: Aimee # @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
# @FilePath: /water_dealer-agent/.env.development # @FilePath: /douhuo-agent/.env.development
# @Description: 正式环境测试环境更改 # @Description: 正式环境测试环境更改
### ###
NODE_ENV=development NODE_ENV=development
VUE_APP_PREVIEW=true VUE_APP_PREVIEW=true
# <!-- //水感应正式环境--> # <!-- //水感应正式环境-->
VUE_APP_API_BASE_URL=https://api.shui.shuiganying.com/api # VUE_APP_API_BASE_URL=https://douhuo.douhuofalv.com/agent
# <!-- // 水感应测试--> # <!-- //水感应测试-->
# VUE_APP_API_BASE_URL=https://shuitest.shuiganying.com/api # VUE_APP_API_BASE_URL=https://api.douhuotest.douhuofalv.com/agent
VUE_APP_API_BASE_URL=https://shuitest.shuiganying.com/api

13
.env.preview
View File

@@ -1,15 +1,16 @@
### ###
# @Author: Aimee~ # @Author: Aimee~
# @Date: 2023-05-11 11:17:32 # @Date: 2023-05-11 11:17:32
# @LastEditTime: 2023-12-12 15:52:50 # @LastEditTime: 2023-07-28 10:09:13
# @LastEditors: Aimee # @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
# @FilePath: /water_dealer-agent/.env.preview # @FilePath: /douhuo-agent/.env.preview
# @Description: # @Description:
### ###
NODE_ENV=production NODE_ENV=production
VUE_APP_PREVIEW=true VUE_APP_PREVIEW=true
# <!-- //水感应正式环境--> # <!-- //水感应正式环境-->
VUE_APP_API_BASE_URL=https://api.shui.shuiganying.com/api # VUE_APP_API_BASE_URL=https://douhuo.douhuofalv.com/agent
# <!-- // 水感应测试--> # <!-- //水感应测试-->
# VUE_APP_API_BASE_URL=https://shuitest.shuiganying.com/api # VUE_APP_API_BASE_URL=https://api.douhuotest.douhuofalv.com/agent
VUE_APP_API_BASE_URL=https://shuitest.shuiganying.com/api

12
README.md
View File

@@ -1,14 +1,12 @@
<!-- <!--
* @Author: Aimee~ * @Author: Aimee~
* @Date: 2023-05-11 12:02:45 * @Date: 2023-05-11 12:02:45
* @LastEditTime: 2023-12-12 16:31:35 * @LastEditTime: 2023-12-12 10:08:00
* @LastEditors: Aimee * @LastEditors: Aimee
* @FilePath: /water_dealer-agent/README.md * @FilePath: /water_dealer-agent/README.md
* @Description: 备注信息 * @Description: 备注信息
--> -->
# 组件 # 水感应 分公司 中台(数据展示及分公司数据) 线下
ant-design-vue
# 水感应 分公司 中台(数据展示及分公司数据) 水感应分公司管理 (线上)
打包后文件件需要有一个 static 文件存放 打包后文件件需要有一个 static 文件存放
'/static/vue.min.js' '/static/vue.min.js'
'/static/vue-router.min.js' '/static/vue-router.min.js'
@@ -19,12 +17,10 @@ ant-design-vue
# node 版本 node-v14.21.3 # node 版本 node-v14.21.3
# 水感应测试-存放路径 # 水感应测试-存放路径
/home/wwwroot/Development/Douhuo/agent
# 水感应正式-存放路径 # 水感应正式-存放路径
OSS_ACCESS_KEY=LTAI5tHYDoN6trRhsBmRvD7h oss://douhuo-agent/
OSS_SECRET_KEY=k3e6veUY45WM8QMMMyRKYr0KjiOXzC
oss://sgy-agent-web/
# 运行 yarn run dev # 运行 yarn run dev
# 打包 yarn build # 打包 yarn build

12
public/index.html vendored
View File

@@ -1,11 +1,3 @@
<!--
* @Author: Aimee~
* @Date: 2023-08-03 17:36:19
* @LastEditTime: 2023-12-12 16:12:55
* @LastEditors: Aimee
* @FilePath: /water_dealer-agent/public/index.html
* @Description:
-->
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh-cmn-Hans"> <html lang="zh-cmn-Hans">
@@ -14,7 +6,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>logo.png"> <link rel="icon" href="<%= BASE_URL %>logo.png">
<title> 水感应分公司管理 WaterFeel.Vip</title> <title> 水感应经销商管理后台 WaterFeel.Vip</title>
<style>.first-loading-wrp{display:flex;justify-content:center;align-items:center;flex-direction:column;min-height:420px;height:100%}.first-loading-wrp>h1{font-size:128px}.first-loading-wrp .loading-wrp{padding:98px;display:flex;justify-content:center;align-items:center}.dot{animation:antRotate 1.2s infinite linear;transform:rotate(45deg);position:relative;display:inline-block;font-size:32px;width:32px;height:32px;box-sizing:border-box}.dot i{width:14px;height:14px;position:absolute;display:block;background-color:#1890ff;border-radius:100%;transform:scale(.75);transform-origin:50% 50%;opacity:.3;animation:antSpinMove 1s infinite linear alternate}.dot i:nth-child(1){top:0;left:0}.dot i:nth-child(2){top:0;right:0;-webkit-animation-delay:.4s;animation-delay:.4s}.dot i:nth-child(3){right:0;bottom:0;-webkit-animation-delay:.8s;animation-delay:.8s}.dot i:nth-child(4){bottom:0;left:0;-webkit-animation-delay:1.2s;animation-delay:1.2s}@keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@-webkit-keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@keyframes antSpinMove{to{opacity:1}}@-webkit-keyframes antSpinMove{to{opacity:1}}</style> <style>.first-loading-wrp{display:flex;justify-content:center;align-items:center;flex-direction:column;min-height:420px;height:100%}.first-loading-wrp>h1{font-size:128px}.first-loading-wrp .loading-wrp{padding:98px;display:flex;justify-content:center;align-items:center}.dot{animation:antRotate 1.2s infinite linear;transform:rotate(45deg);position:relative;display:inline-block;font-size:32px;width:32px;height:32px;box-sizing:border-box}.dot i{width:14px;height:14px;position:absolute;display:block;background-color:#1890ff;border-radius:100%;transform:scale(.75);transform-origin:50% 50%;opacity:.3;animation:antSpinMove 1s infinite linear alternate}.dot i:nth-child(1){top:0;left:0}.dot i:nth-child(2){top:0;right:0;-webkit-animation-delay:.4s;animation-delay:.4s}.dot i:nth-child(3){right:0;bottom:0;-webkit-animation-delay:.8s;animation-delay:.8s}.dot i:nth-child(4){bottom:0;left:0;-webkit-animation-delay:1.2s;animation-delay:1.2s}@keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@-webkit-keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@keyframes antSpinMove{to{opacity:1}}@-webkit-keyframes antSpinMove{to{opacity:1}}</style>
<!-- require cdn assets css --> <!-- require cdn assets css -->
<% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %> <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %>
@@ -27,7 +19,7 @@
</noscript> </noscript>
<div id="app"> <div id="app">
<div class="first-loading-wrp"> <div class="first-loading-wrp">
<h1> 水感应分公司管理</h1> <h1> 水感应经销商管理后台</h1>
<div class="loading-wrp"> <div class="loading-wrp">
<span class="dot dot-spin"><i></i><i></i><i></i><i></i></span> <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
</div> </div>

17
src/api/statistical.js
View File

@@ -1,8 +1,8 @@
/* /*
* @Author: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git * @Author: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
* @Date: 2023-07-07 14:02:05 * @Date: 2023-07-07 14:02:05
* @LastEditors: Aimee * @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
* @LastEditTime: 2023-12-12 11:47:55 * @LastEditTime: 2023-07-31 13:58:48
* @FilePath: /water_dealer-agent/src/api/statistical.js * @FilePath: /water_dealer-agent/src/api/statistical.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
@@ -10,18 +10,13 @@
import request from '@/utils/request' import request from '@/utils/request'
// 获取 首页数据看板数据 // 获取 首页数据看板数据
export function getMiddlesUserDatas (item, value) { export function getMiddlesUserDatas (item) {
const params = {
time_type: item
}
if (value !== null) {
params.start_at = value[0]
params.end_at = value[1]
}
return request({ return request({
url: '/middles/user/datas', url: '/middles/user/datas',
method: 'get', method: 'get',
params: params params: {
time_type: item
}
}) })
} }

6
src/config/defaultSettings.js
View File

@@ -1,9 +1,9 @@
/* /*
* @Author: Aimee~ * @Author: Aimee~
* @Date: 2022-06-12 15:05:53 * @Date: 2022-06-12 15:05:53
* @LastEditTime: 2023-12-12 16:13:22 * @LastEditTime: 2022-06-13 09:33:54
* @LastEditors: Aimee * @LastEditors: Aimee
* @FilePath: /water_dealer-agent/src/config/defaultSettings.js * @FilePath: /gl-agent/src/config/defaultSettings.js
* @Description: 修改默认配置 * @Description: 修改默认配置
*/ */
/** /**
@@ -31,7 +31,7 @@ var defaultValue = {
menu: { menu: {
locale: true locale: true
}, },
title: ' 水感应分公司管理', title: ' 水感应经销商管理后台',
pwa: false, pwa: false,
production: process.env.NODE_ENV === 'production' && process.env.VUE_APP_PREVIEW !== 'true' production: process.env.NODE_ENV === 'production' && process.env.VUE_APP_PREVIEW !== 'true'
} }

10
src/config/router.config.js
View File

@@ -1,9 +1,9 @@
/* /*
* @Author: Aimee~ * @Author: Aimee~
* @Date: 2023-05-11 12:02:45 * @Date: 2023-05-11 12:02:45
* @LastEditTime: 2023-12-12 16:13:30 * @LastEditTime: 2023-07-05 15:03:09
* @LastEditors: Aimee * @LastEditors: Aimee
* @FilePath: /water_dealer-agent/src/config/router.config.js * @FilePath: /douhuo-agent/src/config/router.config.js
* @Description: 路由 * @Description: 路由
*/ */
import { import {
@@ -16,7 +16,7 @@ import user from './routes/user'
import coupon from './routes/coupon' import coupon from './routes/coupon'
import permission from './routes/permission' import permission from './routes/permission'
import sales from './routes/sales' import sales from './routes/sales'
// import cityExperienceOfficer from './routes/cityExperienceOfficer' import cityExperienceOfficer from './routes/cityExperienceOfficer'
export const asyncRouterMap = [{ export const asyncRouterMap = [{
path: '/', path: '/',
@@ -38,7 +38,7 @@ export const asyncRouterMap = [{
} }
}, },
...detail, ...detail,
// ...cityExperienceOfficer, ...cityExperienceOfficer,
...stock, ...stock,
...sales, ...sales,
...user, ...user,
@@ -67,7 +67,7 @@ export const constantRouterMap = [{
name: 'Login', name: 'Login',
component: () => import('@/views/auth/Login'), component: () => import('@/views/auth/Login'),
meta: { meta: {
title: '登陆水感应分公司管理' title: '登陆水感应经销商系统'
} }
}, },
{ {

14
src/config/routes/sales.js
View File

@@ -1,11 +1,3 @@
/*
* @Author: Aimee~
* @Date: 2023-10-30 15:25:23
* @LastEditTime: 2023-12-12 11:04:30
* @LastEditors: Aimee
* @FilePath: /water_dealer-agent/src/config/routes/sales.js
* @Description: 零售订单
*/
import { import {
RouteView RouteView
} from '@/layouts' } from '@/layouts'
@@ -14,7 +6,7 @@ export default [{
path: '/sales', path: '/sales',
name: 'StockIndex', name: 'StockIndex',
meta: { meta: {
title: '订单管理', title: '销售管理',
icon: 'bank' icon: 'bank'
}, },
component: RouteView, component: RouteView,
@@ -23,7 +15,7 @@ export default [{
path: '/sales/online', path: '/sales/online',
name: 'SalesOnline', name: 'SalesOnline',
meta: { meta: {
title: '零售订单', title: '线上零售订单',
icon: 'unordered-list' icon: 'unordered-list'
}, },
component: () => import('@/views/sales/Online') component: () => import('@/views/sales/Online')
@@ -32,7 +24,7 @@ export default [{
path: '/sales/stock', path: '/sales/stock',
name: 'SalesStock', name: 'SalesStock',
meta: { meta: {
title: '进货订单', title: '线上进货订单',
icon: 'unordered-list' icon: 'unordered-list'
}, },
component: () => import('@/views/sales/OnStock') component: () => import('@/views/sales/OnStock')

140
src/config/routes/stock.js
View File

@@ -1,11 +1,3 @@
/*
* @Author: Aimee~
* @Date: 2023-10-30 15:25:23
* @LastEditTime: 2023-12-12 11:02:36
* @LastEditors: Aimee
* @FilePath: /water_dealer-agent/src/config/routes/stock.js
* @Description: 库存管理
*/
import { import {
RouteView RouteView
} from '@/layouts' } from '@/layouts'
@@ -19,72 +11,74 @@ export default [{
}, },
component: RouteView, component: RouteView,
children: [ children: [
{ {
path: '/stock/dealer/in', path: '/stock/ins',
name: 'DealerIn', name: 'StockIns',
component: () => import('@/views/stock/DealerIn'),
meta: { meta: {
title: '经销商入库管理', title: '分公司库存管理',
icon: 'import' icon: 'control'
} },
}, component: RouteView,
{ redirect: '/stock/in',
path: '/stock/dealer/out', children: [
name: 'DealerOut', {
component: () => import('@/views/stock/DealerOut'), path: '/stock/in',
name: 'StockIn',
component: () => import('@/views/stock/In'),
meta: {
title: '入库管理',
icon: 'import'
}
},
{
path: '/sales/offline',
name: 'SalesOffline',
meta: {
title: '线下出货列表',
icon: 'unordered-list'
},
component: () => import('@/views/sales/Offline')
}
// {
// path: '/stock/out',
// name: 'StockOut',
// component: () => import('@/views/stock/Out'),
// meta: {
// title: '出库管理',
// icon: 'export'
// }
// }
]
},
{
path: '/stock/dealer',
name: 'StockDealer',
meta: { meta: {
title: '经销商出库管理', title: '经销商库存管理',
icon: 'export' icon: 'usergroup-add'
} },
} component: RouteView,
// { redirect: '/stock/dealer/in',
// path: '/stock/ins', children: [
// name: 'StockIns', {
// meta: { path: '/stock/dealer/in',
// title: '分公司库存管理', name: 'DealerIn',
// icon: 'control' component: () => import('@/views/stock/DealerIn'),
// }, meta: {
// component: RouteView, title: '入库管理',
// redirect: '/stock/in', icon: 'import'
// children: [ }
// { },
// path: '/stock/in', {
// name: 'StockIn', path: '/stock/dealer/out',
// component: () => import('@/views/stock/In'), name: 'DealerOut',
// meta: { component: () => import('@/views/stock/DealerOut'),
// title: '入库管理', meta: {
// icon: 'import' title: '出库管理',
// } icon: 'export'
// }, }
// { }
// path: '/sales/offline', ]
// name: 'SalesOffline', }
// meta: {
// title: '线下出货列表',
// icon: 'unordered-list'
// },
// component: () => import('@/views/sales/Offline')
// }
// // {
// // path: '/stock/out',
// // name: 'StockOut',
// // component: () => import('@/views/stock/Out'),
// // meta: {
// // title: '出库管理',
// // icon: 'export'
// // }
// // }
// ]
// },
// {
// path: '/stock/dealer',
// name: 'StockDealer',
// meta: {
// title: '经销商入库管理',
// icon: 'usergroup-add'
// },
// component: RouteView,
// redirect: '/stock/dealer/in'
// }
] ]
}] }]

4
src/layouts/BasicLayout.vue
View File

@@ -18,7 +18,7 @@
</template> </template>
<template v-slot:rightContentRender> <template v-slot:rightContentRender>
<span class="rightContentRenderTitle">欢迎使用水感应分公司管理</span> <span class="rightContentRenderTitle">欢迎使用水感应经销商端</span>
<right-content :is-mobile="isMobile" :theme="settings.theme" :top-menu="settings.layout === 'topmenu'" /> <right-content :is-mobile="isMobile" :theme="settings.theme" :top-menu="settings.layout === 'topmenu'" />
</template> </template>
@@ -61,7 +61,7 @@ export default {
menus: [], menus: [],
// 侧栏收起状态 // 侧栏收起状态
collapsed: false, collapsed: false,
title: ' 水感应分公司管理 ', title: ' 水感应代理商 ',
logo: '', logo: '',
settings: { settings: {
// 布局类型 // 布局类型

2
src/layouts/UserLayout.vue
View File

@@ -6,7 +6,7 @@
<div class="header"> <div class="header">
<a href="/"> <a href="/">
<span class="title">欢迎登录</span> <span class="title">欢迎登录</span>
<span class="des">欢迎使用水感应分公司管理</span> <span class="des">欢迎使用水感应经销商端</span>
</a> </a>
</div> </div>
</div> </div>

14
src/utils/screenLog.js
View File

@@ -1,22 +1,14 @@
/*
* @Author: Aimee~
* @Date: 2023-08-03 17:36:19
* @LastEditTime: 2023-12-12 16:13:49
* @LastEditors: Aimee
* @FilePath: /water_dealer-agent/src/utils/screenLog.js
* @Description: 关键字
*/
/* eslint-disable */ /* eslint-disable */
export const printANSI = () => { export const printANSI = () => {
// console.clear() // console.clear()
// ASCII - ANSI Shadow // ASCII - ANSI Shadow
let text = `水感应分公司管理 let text = `水感应大数据综合管理后台
PUBLISHED: 1.0.0-10.0.0 PUBLISHED: 1.0.0-10.0.0
EMAIL: yuzhankeji@163.com EMAIL: yuzhankeji@163.com
CREATED_AT: ${BUILD_DATE}` CREATED_AT: ${BUILD_DATE}`
console.log(`%c${text}`, 'color: #fc4d50') console.log(`%c${text}`, 'color: #fc4d50')
console.log(`%c可以植入广告`, 'color: #fc4d50') console.log(`%c可以植入广告`, 'color: #fc4d50')
console.log('%c感谢使用 水感应分公司管理', 'color: #fc4d50; font-size: 14px; font-family: Hiragino Sans GB,Microsoft YaHei,\\\\5FAE\\8F6F\\96C5\\9ED1,Droid Sans Fallback,Source Sans,Wenquanyi Micro Hei,WenQuanYi Micro Hei Mono,WenQuanYi Zen Hei,Apple LiGothic Medium,SimHei,ST Heiti,WenQuanYi Zen Hei Sharp,sans-serif;') console.log('%c感谢使用 水感应大数据综合管理后台', 'color: #fc4d50; font-size: 14px; font-family: Hiragino Sans GB,Microsoft YaHei,\\\\5FAE\\8F6F\\96C5\\9ED1,Droid Sans Fallback,Source Sans,Wenquanyi Micro Hei,WenQuanYi Micro Hei Mono,WenQuanYi Zen Hei,Apple LiGothic Medium,SimHei,ST Heiti,WenQuanYi Zen Hei Sharp,sans-serif;')
console.log('%cThanks for ShuiGanYing - Vip!', 'color: #fc4d50; font-size: 14px; font-weight: 300; text-shadow:#000 1px 0 0,#000 0 1px 0,#000 -1px 0 0,#000 0 -1px 0;') console.log('%cThanks for DouHuo - Vip!', 'color: #fc4d50; font-size: 14px; font-weight: 300; text-shadow:#000 1px 0 0,#000 0 1px 0,#000 -1px 0 0,#000 0 -1px 0;')
} }

30
src/views/home/Index.vue
View File

@@ -1,18 +1,10 @@
<!--
* @Author: Aimee~
* @Date: 2023-08-03 17:36:19
* @LastEditTime: 2023-12-12 16:06:46
* @LastEditors: Aimee
* @FilePath: /water_dealer-agent/src/views/home/Index.vue
* @Description: index
-->
<template> <template>
<a-row :gutter="[24, 24]"> <a-row :gutter="[24, 24]">
<!-- <a-col :lg="10" :md="24" :sm="24" :xl="8" :xxl="7"> <!-- <a-col :lg="10" :md="24" :sm="24" :xl="8" :xxl="7">
<UserInfo /> <UserInfo />
</a-col> --> </a-col> -->
<a-col :lg="24" :md="24" :sm="24" :xl="24" :xxl="24"> <a-col :lg="24" :md="24" :sm="24" :xl="24" :xxl="24">
<Count v-if="info != {}" :info="info" /> <Count v-if="info!=={}" :info="info" />
</a-col> </a-col>
<!-- <!--
<a-col :lg="24" :md="24" :sm="24" :xl="24" :xxl="24"> <a-col :lg="24" :md="24" :sm="24" :xl="24" :xxl="24">
@@ -34,9 +26,8 @@ export default {
}, },
data () { data () {
return { return {
info: [], info: {},
serarchkey: 'year', serarchkey: 'today'
searchValue: null
} }
}, },
computed: { computed: {
@@ -52,17 +43,8 @@ export default {
created () { created () {
this.getInfo() this.getInfo()
// 监听是否切换了日，周，月，年 // 监听是否切换了日，周，月，年
this.eventBus.$on('updateHomeDataByType', (item) => { this.eventBus.$on('updateHomeDataByType', (type) => {
if (item.type === 'custom' && item.value == null) { this.serarchkey = type.type
return
} else if (item.type === 'custom' && item.value !== null) {
this.serarchkey = item.type
this.searchValue = item.value
this.getInfo()
return
}
this.serarchkey = item.type
this.searchValue = item.value
this.getInfo() this.getInfo()
}) })
}, },
@@ -71,7 +53,7 @@ export default {
}, },
methods: { methods: {
getInfo () { getInfo () {
getMiddlesUserDatas(this.serarchkey, this.searchValue).then(res => { getMiddlesUserDatas(this.serarchkey).then(res => {
this.info = res this.info = res
}).catch(err => { }).catch(err => {
this.$notification.error(err) this.$notification.error(err)

129
src/views/home/components/Count.vue
View File

@@ -2,7 +2,7 @@
<a-row> <a-row>
<a-row :gutter="24"> <a-row :gutter="24">
<!-- 分公司库存 --> <!-- 分公司库存 -->
<!-- <a-col <a-col
v-if="info.middle" v-if="info.middle"
:sm="24" :sm="24"
:md="12" :md="12"
@@ -12,14 +12,15 @@
> >
<chart-card :loading="loading" title="分公司总库存(瓶)" :total="info.middle.total"> <chart-card :loading="loading" title="分公司总库存(瓶)" :total="info.middle.total">
<template slot="footer"> <template slot="footer">
<!-- <trend flag="up"> <span slot="term">{{ $t('线上库存') }}</span>{{ info.middle.online_stock }}瓶</trend> -->
<trend flag="down"> <trend flag="down">
<span slot="term">{{ $t('线下库存') }}</span>{{ info.middle.offline_stock }}瓶 <span slot="term">{{ $t('线下库存') }}</span>{{ info.middle.offline_stock }}瓶
</trend> </trend>
</template> </template>
</chart-card> </chart-card>
</a-col> --> </a-col>
<!-- 经销商总库存 --> <!-- 经销商总库存 -->
<!-- <a-col <a-col
:sm="24" :sm="24"
:md="12" :md="12"
:xl="12" :xl="12"
@@ -36,59 +37,53 @@
</div> </div>
<template slot="footer">{{ $t('经销商总数') }}<span style="margin-right:20px;"> {{ info.agent.users | NumberFormat }} 人</span></template> <template slot="footer">{{ $t('经销商总数') }}<span style="margin-right:20px;"> {{ info.agent.users | NumberFormat }} 人</span></template>
</chart-card> </chart-card>
</a-col> --> </a-col>
</a-row> </a-row>
<a-col
:span="24" <a-col :span="24" >
v-for="(item, index) in info" <a-card :bordered="false" title="用户数据">
:key="index"> <template #extra>
<a-card :bordered="false" :title="item.title">
<template v-if="index === 0" #extra>
<a-dropdown v-model="visible"> <a-dropdown v-model="visible">
<a class="ant-dropdown-link" @click="e => e.preventDefault()">{{ searchs[typeIndex].title }} <a-icon type="down" /></a> <a class="ant-dropdown-link" @click="e => e.preventDefault()">{{ searchs[typeIndex].title }} <a-icon type="down" /></a>
<a-menu slot="overlay" @click="handleMenuClick"> <a-menu slot="overlay" @click="handleMenuClick">
<a-menu-item <a-menu-item
v-for="iit in searchs" v-for="item in searchs"
:key="iit.key"> :key="item.key">
<a href="javascript:;">{{ iit.title }}</a> <a href="javascript:;">{{ item.title }}</a>
</a-menu-item> </a-menu-item>
</a-menu> </a-menu>
</a-dropdown> </a-dropdown>
<a-range-picker
style="margin-left:40px;"
v-if="type == 'custom'"
:placeholder="['开始日期', '结束日期']"
:value="rang_at"
:ranges="{ Today: [moment(), moment()], 'This Month': [moment(), moment().endOf('month')] }"
@change="onCreateChange" />
</template> </template>
<a-row> <a-row v-if="info.users">
<a-col <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
:sm="24" <info title="用户总数量(人)" :value="''+info.users.all" :bordered="true" />
:md="12" </a-col>
:xl="8" <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
:xxl="8" <info title="新增代理数(人)" :value="''+info.users.new_agents" :bordered="true" />
v-for="(it, idx) in item.data" </a-col>
:key="idx" <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
class="mt20"> <info title="新增创客数(人)" :value="''+info.users.new_makers" :bordered="true"/>
<info :title="it.title" :value="''+ it.number" :bordered="(idx + 1) === item.data.length ? false : true" /> </a-col>
<a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
<info title="新增VIP数(人)" :value="''+info.users.new_vips" :bordered="true"/>
</a-col>
<a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
<info title="新增游客数量(人)" :value="''+info.users.new_visitors"/>
</a-col> </a-col>
</a-row> </a-row>
</a-card> </a-card>
</a-col> </a-col>
<a-col :span="24" v-if="info.sales_quantity">
<!-- <a-col :span="24" v-if="info.sales_quantity">
<a-card :bordered="false" title="累计销售数量"> <a-card :bordered="false" title="累计销售数量">
<a-row> <a-row>
<a-col <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
:sm="24" <info title="累计销售数量(瓶)" :value="''+info.sales_quantity.online_all" :bordered="true" />
:md="12" </a-col>
:xl="8" <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
:xxl="8" <info title="线上销售数量(瓶)" :value="''+info.sales_quantity.online_retail" :bordered="true"/>
class="mt20" </a-col>
v-for="(item, index) in info.sales_quantity" <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
:key="index"> <info title="线下出货数量(瓶)" :value="''+info.sales_quantity.offline" />
<info :title="item.title" :value="'' + item.number" :bordered="true" />
</a-col> </a-col>
</a-row> </a-row>
</a-card> </a-card>
@@ -96,19 +91,19 @@
<a-col :span="24" v-if="info.sales_amount"> <a-col :span="24" v-if="info.sales_amount">
<a-card :bordered="false" title="售卖数据管理"> <a-card :bordered="false" title="售卖数据管理">
<a-row> <a-row>
<a-col <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
:sm="24" <info title="售卖数据管理总数(元)" :value="''+info.sales_amount.online_agent_all" :bordered="true"/>
:md="12" </a-col>
:xl="8" <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
:xxl="8" <info title="线上销售金额(元)" :value="''+info.sales_amount.online_sell" :bordered="true"/>
class="mt20" </a-col>
v-for="(item, index) in info.sales_amount" <a-col :sm="24" :md="12" :xl="8" :xxl="8" class="mt20">
:key="index"> <info title="线下出货金额总和(元)" :value="''+info.sales_amount.offline_sell" />
<info :title="item.title" :value="'' + item.number" :bordered="true" />
</a-col> </a-col>
</a-row> </a-row>
</a-card> </a-card>
</a-col> --> </a-col>
<!-- <a-col :span="24" v-if="info.b_recheck"> <!-- <a-col :span="24" v-if="info.b_recheck">
<a-card :bordered="false" title="复审业务操作"> <a-card :bordered="false" title="复审业务操作">
<a-row> <a-row>
@@ -124,6 +119,7 @@
</a-row> </a-row>
</a-card> </a-card>
</a-col> --> </a-col> -->
</a-row> </a-row>
</template> </template>
@@ -140,7 +136,6 @@
NumberInfo, NumberInfo,
MiniSmoothArea MiniSmoothArea
} from '@/components' } from '@/components'
import moment from 'moment'
export default { export default {
components: { components: {
@@ -157,9 +152,9 @@ export default {
}, },
props: { props: {
info: { info: {
type: Array, type: Object,
default: () => { default: () => {
return [] return {}
} }
} }
}, },
@@ -167,35 +162,21 @@ export default {
data: () => ({ data: () => ({
visible: false, visible: false,
loading: false, loading: false,
type: 'year', type: 'today',
typeIndex: 0, typeIndex: 0,
searchs: [ searchs: [
{ key: 'year', title: '本年' },
{ key: 'month', title: '本月' },
{ key: 'week', title: '本周' },
{ key: 'today', title: '本日' }, { key: 'today', title: '本日' },
{ key: 'custom', title: '自定义时间' } { key: 'week', title: '本周' },
], { key: 'month', title: '本月' },
rang_at: null, // 开始时间 结束时间 { key: 'year', title: '本年' }
date2: null ]
}), }),
methods: { methods: {
moment,
handleMenuClick (e) { handleMenuClick (e) {
this.typeIndex = this.searchs.findIndex(item => item.key === e.key) this.typeIndex = this.searchs.findIndex(item => item.key === e.key)
this.visible = false this.visible = false
this.type = e.key this.type = e.key
if (this.type === 'custom') { this.eventBus.$emit('updateHomeDataByType', { type: e.key })
return
} else {
this.date2 = null
}
this.eventBus.$emit('updateHomeDataByType', { type: e.key, value: this.date2 })
},
onCreateChange (dates, dateStrings) {
this.rang_at = dates
this.date2 = dates.length === 2 ? dateStrings : null
this.eventBus.$emit('updateHomeDataByType', { type: this.type, value: this.date2 })
} }
} }
} }

57
src/views/user/Index.vue
View File

@@ -5,26 +5,26 @@
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline"> <a-form layout="inline">
<a-row :gutter="48"> <a-row :gutter="48">
<a-col :md="6" :sm="24"> <a-col :md="8" :sm="24">
<a-form-item label="用户昵称"> <a-form-item label="用户昵称">
<a-input v-model="queryParam.nickname" placeholder="用户昵称" /> <a-input v-model="queryParam.nickname" placeholder="用户昵称" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="24"> <a-col :md="8" :sm="24">
<a-form-item label="用户手机号"> <a-form-item label="用户手机号">
<a-input v-model="queryParam.username" placeholder="用户手机号" /> <a-input v-model="queryParam.username" placeholder="用户手机号" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="24"> <a-col :md="8" :sm="24">
<a-form-item label="身份筛选" has-feedback> <a-form-item label="身份筛选" has-feedback>
<a-select v-model="queryParam.identity_id" placeholder="身份筛选"> <a-select v-model="queryParam.identity_id" placeholder="身份筛选">
<a-select-option v-for="item in indentitys" :key="item.id" :value="item.id">{{ item.name }}</a-select-option> <a-select-option v-for="item in indentitys" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="24"> <a-col :md="8" :sm="24">
<a-button type="primary" @click="search"><a-icon type="search" />搜索</a-button> <a-button type="primary" @click="search"><a-icon type="search" />搜索</a-button>
<!-- <a-button class="ml8" type="primary" @click="onAddRole"><a-icon type="plus" />新增</a-button> --> <a-button class="ml8" type="primary" @click="onAddRole"><a-icon type="plus" />新增</a-button>
<a-button class="ml8" @click="resetSearch"><a-icon type="undo" />重置</a-button> <a-button class="ml8" @click="resetSearch"><a-icon type="undo" />重置</a-button>
</a-col> </a-col>
</a-row> </a-row>
@@ -55,10 +55,6 @@
<div slot="parent" slot-scope="text, record">{{ record.parent.nickname }}<div>{{ record.parent.username }}</div></div> <div slot="parent" slot-scope="text, record">{{ record.parent.nickname }}<div>{{ record.parent.username }}</div></div>
<span slot="created_at" slot-scope="text, record">{{ record.created_at }}</span> <span slot="created_at" slot-scope="text, record">{{ record.created_at }}</span>
<div slot="order_count" slot-scope="text, record" style="color: #1890ff">{{ record.order.count + '（单）' || '-' }}</div>
<div slot="order_price" slot-scope="text, record" style="color: #1890ff">{{ record.order.price + '（元）' || '-' }}</div>
<div slot="stock" slot-scope="text, record" style="color: #1890ff">{{ record.stock + '（件)' || '-' }}</div>
<!-- 操作 --> <!-- 操作 -->
<div slot="actions" slot-scope="text, record"> <div slot="actions" slot-scope="text, record">
<a class="ant-dropdown-link" @click="onEdit(record)">更改推荐人</a> <a class="ant-dropdown-link" @click="onEdit(record)">更改推荐人</a>
@@ -91,52 +87,35 @@ const columns = [
title: '昵称', title: '昵称',
scopedSlots: { customRender: 'nickname' }, scopedSlots: { customRender: 'nickname' },
align: 'center', align: 'center',
width: 140 width: 200
}, },
{ {
title: '真实姓名', title: '真实姓名',
scopedSlots: { customRender: 'name' }, scopedSlots: { customRender: 'name' },
align: 'center', align: 'center',
width: 120 width: 140
}, },
{ {
title: '用户手机', title: '用户手机',
scopedSlots: { customRender: 'username' }, scopedSlots: { customRender: 'username' },
align: 'center', align: 'center',
width: 130 width: 140
}, },
{ {
title: '身份', title: '身份',
scopedSlots: { customRender: 'identity' }, scopedSlots: { customRender: 'identity' },
align: 'center', align: 'center',
width: 120 width: 140
}, },
{ {
title: '邀请码', title: '邀请码',
scopedSlots: { customRender: 'invite' }, scopedSlots: { customRender: 'invite' },
align: 'center', align: 'center',
width: 130 width: 140
} }
], ],
width: 300, width: 300,
align: 'center' align: 'center'
}, {
title: '当前库存',
scopedSlots: { customRender: 'stock' },
width: 120,
align: 'center'
},
{
title: '消费订单量',
scopedSlots: { customRender: 'order_count' },
width: 120,
align: 'center'
},
{
title: '消费订单额',
scopedSlots: { customRender: 'order_price' },
width: 120,
align: 'center'
}, },
{ {
title: '推荐人手机号', title: '推荐人手机号',
@@ -149,15 +128,15 @@ const columns = [
dataIndex: 'created_at', dataIndex: 'created_at',
width: 200, width: 200,
align: 'center' align: 'center'
},
{
title: '操作',
dataIndex: 'status10',
scopedSlots: { customRender: 'actions' },
align: 'center',
width: 160,
fixed: 'right'
} }
// {
// title: '操作',
// dataIndex: 'status10',
// scopedSlots: { customRender: 'actions' },
// align: 'center',
// width: 160,
// fixed: 'right'
// }
] ]
export default { export default {