From 9d9eefda61d819afddfff8d69e3c304be5d7e341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com> Date: Thu, 2 Sep 2021 10:02:54 +0800 Subject: [PATCH] up --- package.json | 5 +- src/api/index.js | 79 ++++++++++ src/assets/styles/ruoyi.scss | 5 +- src/components/Upload/multiUpload.vue | 3 +- src/router/index.js | 48 +++--- src/views/index1.vue | 211 +++++++++++++++++--------- src/views/index2.vue | 167 ++++++++++++++------ src/views/ums/role/index.vue | 12 +- vue.config.js | 2 +- 9 files changed, 388 insertions(+), 144 deletions(-) diff --git a/package.json b/package.json index c4fed59..f7791c7 100644 --- a/package.json +++ b/package.json @@ -47,19 +47,20 @@ "echarts": "4.2.1", "element-ui": "2.13.2", "file-saver": "2.0.1", - "js-beautify": "1.10.2", "fuse.js": "3.4.4", + "js-beautify": "1.10.2", "js-cookie": "2.2.0", "jsencrypt": "3.0.0-rc.1", "normalize.css": "7.0.0", "nprogress": "0.2.0", "path-to-regexp": "2.4.0", + "quill": "1.3.7", "screenfull": "4.2.0", "sortablejs": "1.8.4", "vue": "2.6.10", "vue-count-to": "1.0.13", - "quill": "1.3.7", "vue-cropper": "0.4.9", + "vue-qr": "^2.5.0", "vue-router": "3.0.2", "vue-splitpane": "1.0.4", "vuedraggable": "2.20.0", diff --git a/src/api/index.js b/src/api/index.js index a23c5ba..05d77da 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -1,5 +1,84 @@ import request from '@/utils/request'; +// 获取订单列表 +export function orderList(data, params) { + return request({ + url: '/order/list', + method: 'post', + data, + params + }); +} +// 获取活动领取名单列表 +export function userList(params) { + return request({ + url: '/aUser/userList', + params + }); +} +// 添加活动领取名单 +export function aUserCreate(data) { + return request({ + url: '/aUser/create', + method: 'post', + data + }); +} +// 修改活动领取名单 +export function aUserUpdate(data) { + return request({ + url: '/aUser/update', + method: 'post', + data + }); +} +// 批量删除活动领取名单 +export function aUserDelete(data) { + return request({ + url: '/aUser/delete', + method: 'post', + data + }); +} + +// 删除订单 +export function orderDelete(params) { + return request({ + url: '/order/delete', + params + }); +} +// 获取二维码列表 +export function qrList(params) { + return request({ + url: '/qr/list', + params + }); +} +// 添加二维码 +export function qrCreate(data) { + return request({ + url: '/qr/create', + method: 'post', + data + }); +} +// 修改二维码 +export function qrUpdate(data) { + return request({ + url: '/qr/update', + method: 'post', + data + }); +} +// 删除二维码 +export function qrDelete(params) { + return request({ + url: '/qr/delete', + params + }); +} + // 获取用户详细信息 export function getList(params) { return request({ diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index c4b9b7c..fa2d745 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -1,4 +1,4 @@ - /** + /** * 通用css样式布局处理 * Copyright (c) 2019 ruoyi */ @@ -110,6 +110,9 @@ padding-left: 0; padding-right: 0; width: inherit; + &.text-danger { + color: #ed5565; + } } .el-tree-node__content > .el-checkbox { diff --git a/src/components/Upload/multiUpload.vue b/src/components/Upload/multiUpload.vue index d1a0efa..be8ee3c 100644 --- a/src/components/Upload/multiUpload.vue +++ b/src/components/Upload/multiUpload.vue @@ -48,7 +48,8 @@ export default { dialogImageUrl: null, useOss: false, //使用oss->true;使用MinIO->false ossUploadUrl: 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com', - minioUploadUrl: 'http://140.143.229.114:1818/minio/upload' + // minioUploadUrl: 'http://140.143.229.114:1818/minio/upload' + minioUploadUrl: process.env.VUE_APP_BASE_API + '/minio/upload' }; }, computed: { diff --git a/src/router/index.js b/src/router/index.js index 29304f1..9717d23 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -61,7 +61,7 @@ export const constantRoutes = [ path: 'index', name: '首页', component: resolve => require(['@/views/index'], resolve), - meta: { title: '首页' }, + meta: { title: '首页', noCache: true, affix: true }, hidden: true } ] @@ -77,7 +77,8 @@ export const asyncRouterMap = [ path: 'index1', component: resolve => require(['@/views/index1'], resolve), name: 'index1', - meta: { title: '客户管理', noCache: true, affix: true, icon: 'user' } + meta: { title: '领取名单', icon: 'user' }, + hidden: true } ] }, @@ -91,33 +92,42 @@ export const asyncRouterMap = [ component: resolve => require(['@/views/index2'], resolve), name: 'index2', meta: { - title: '权益商品', - noCache: true, - affix: true, + title: '活动管理', icon: 'shopping' } + // children: [ + // { + // path: 'index1', + // component: resolve => require(['@/views/index1'], resolve), + // name: 'index1', + // meta: { + // title: '领取名单' + // }, + // hidden: true + // } + // ] } ] }, - { - path: '', - component: Layout, - redirect: 'index3', - children: [ - { - path: 'index3', - component: resolve => require(['@/views/index3'], resolve), - name: 'index3', - meta: { title: '提现订单', noCache: true, affix: true, icon: 'list' } - } - ] - }, + // { + // path: '', + // component: Layout, + // redirect: 'index3', + // children: [ + // { + // path: 'index3', + // component: resolve => require(['@/views/index3'], resolve), + // name: 'index3', + // meta: { title: '提现订单', noCache: true, affix: true, icon: 'list' } + // } + // ] + // }, { path: '/ums', component: Layout, redirect: '/ums/admin', name: 'ums', - meta: { title: '系统设置', noCache: true, affix: true, icon: 'system' }, + meta: { title: '系统设置', icon: 'system' }, children: [ { path: 'admin', diff --git a/src/views/index1.vue b/src/views/index1.vue index b3feb63..31387c5 100644 --- a/src/views/index1.vue +++ b/src/views/index1.vue @@ -4,11 +4,6 @@
筛选搜索 -
- - 查询 - -
+ + + + + + + + + 查询 +
@@ -28,57 +39,77 @@ 数据列表
- 添加顾客 - 批量导入 + 手动添加 + 一键删除 + + 导入 + + + 导出 +
+ + + - - - - + + diff --git a/src/views/ums/role/index.vue b/src/views/ums/role/index.vue index 9d5be1f..1c9a765 100644 --- a/src/views/ums/role/index.vue +++ b/src/views/ums/role/index.vue @@ -93,21 +93,21 @@ size="mini" type="text" @click="handleSelectMenu(scope.$index, scope.row)" - :disabled=" + >分配菜单 + 分配资源 + " --> diff --git a/vue.config.js b/vue.config.js index 895ec6b..b4cad4d 100644 --- a/vue.config.js +++ b/vue.config.js @@ -34,7 +34,7 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://192.168.0.125:1818`, + target: `http://192.168.0.125:1777`, // target: `http://140.143.229.114:1818`, changeOrigin: true, pathRewrite: {