diff --git a/.env.production b/.env.production index 66da123..3cd1502 100644 --- a/.env.production +++ b/.env.production @@ -2,6 +2,6 @@ ENV = 'production' # 如果使用 Nginx 代理后端接口,那么此处需要改为 '/',文件查看 Docker 部署篇,Nginx 配置 # 接口地址,注意协议,如果你没有配置 ssl,需要将 https 改为 http -VUE_APP_BASE_API = 'https://eladmin.vip' +VUE_APP_BASE_API = '' # 如果接口是 http 形式, wss 需要改为 ws -VUE_APP_WS_API = 'wss://eladmin.vip' +VUE_APP_WS_API = '' diff --git a/.gitignore b/.gitignore index 1978bc2..1002b14 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .DS_Store node_modules/ dist/ +build/ demo/ npm-debug.log* yarn-debug.log* diff --git a/package.json b/package.json index d2e2761..cc84ed7 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "@stomp/stompjs": "^6.1.2", "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^1.0.2", + "amfe-flexible": "^2.2.1", "axios": "1.7.4", "babel-eslint": "^8.2.2", "clipboard": "2.0.4", @@ -61,6 +62,7 @@ "qrcodejs2": "^0.0.2", "qs": "^6.10.1", "screenfull": "4.2.0", + "simple-drawing-board": "^3.1.3", "sortablejs": "1.8.4", "vod-js-sdk-v6": "^1.7.1-beta.1", "vue": "^2.6.14", @@ -74,8 +76,7 @@ "vuex": "3.1.0", "wangeditor": "^4.7.11", "webpack": "^4.47.0", - "xlsx": "^0.18.5", - "amfe-flexible": "^2.2.1" + "xlsx": "^0.18.5" }, "devDependencies": { "@babel/parser": "^7.7.4", @@ -111,7 +112,8 @@ "svgo": "1.2.0", "tasksfile": "^5.1.1", "vue-template-compiler": "2.7.15", - "vue2-editor": "^2.10.3" + "vue2-editor": "^2.10.3", + "zip-webpack-plugin": "^4.0.3" }, "engines": { "node": ">=8.9", diff --git a/src/api/pop.js b/src/api/pop.js new file mode 100644 index 0000000..eae3de3 --- /dev/null +++ b/src/api/pop.js @@ -0,0 +1,19 @@ +import { get, post } from '@/utils/request' + +// 查询升级弹窗详情 +export const queryPopContent = (params) => get('/admin/upgradePop/queryPopContent', params) + +// 升级弹窗内容更新 +export const updateContent = (params) => post('/admin/upgradePop/updateContent', params) + +// 查询保证金支付开关状态:true打开 false关闭 +export const queryMarginPaymentStatus = (params) => get('/admin/crm/queryMarginPaymentStatus', params) + +// 更改保证金支付开关状态 +export const updateMarginPaymentStatus = (params) => get('/admin/crm/updateMarginPaymentStatus', params) + +// 更改保证金支付开关状态 +export const querySignTime = (params) => get('/admin/crm/querySignTime', params) + +// 设置保证金-佣金支付签约时间 +export const setSignTime = (params) => post('/admin/crm/setSignTime', params) diff --git a/src/api/videoLive.js b/src/api/videoLive.js index d62ae52..bb8df86 100644 --- a/src/api/videoLive.js +++ b/src/api/videoLive.js @@ -208,20 +208,20 @@ export function addCommentBlack(data) { }); } // 解除用户禁言 -export function removeCommentBlack(params) { +export function removeCommentBlack(data) { return request({ url: "/admin/comment/removeCommentBlack", - method: "get", - params + method: "post", + data }); } // 中台查询禁言列表 -export function queryCommentBlackList(params) { +export function queryCommentBlackList(data) { return request({ url: "/admin/comment/queryCommentBlackList", - method: "get", - params + method: "post", + data }); } diff --git a/src/router/routers.js b/src/router/routers.js index 96cc3e1..681c43f 100644 --- a/src/router/routers.js +++ b/src/router/routers.js @@ -105,35 +105,35 @@ export const constantRouterMap = [ { path: "/circle", component: Layout, - hidden: false, + hidden: true, name: "圈子管理", children: [ + // { + // path: "indexYy", + // component: () => import("@/views/circle/list/indexYy"), + // name: "圈子列表(运营)", + // meta: { title: "圈子列表(运营)" } + // }, + // { + // path: "indexTg", + // component: () => import("@/views/circle/list/indexTg"), + // name: "圈子列表(投顾)", + // meta: { title: "圈子列表(投顾)" } + // }, + // { + // path: "indexYx", + // component: () => import("@/views/circle/list/indexYx"), + // name: "圈子列表(营销)", + // meta: { title: "圈子列表(营销)" } + // }, + // { + // path: "indexZj", + // component: () => import("@/views/circle/list/indexZj"), + // name: "圈子列表(助教)", + // meta: { title: "圈子列表(助教)" } + // }, { - path: "indexYy", - component: () => import("@/views/circle/list/indexYy"), - name: "圈子列表(运营)", - meta: { title: "圈子列表(运营)" } - }, - { - path: "indexTg", - component: () => import("@/views/circle/list/indexTg"), - name: "圈子列表(投顾)", - meta: { title: "圈子列表(投顾)" } - }, - { - path: "indexYx", - component: () => import("@/views/circle/list/indexYx"), - name: "圈子列表(营销)", - meta: { title: "圈子列表(营销)" } - }, - { - path: "indexZj", - component: () => import("@/views/circle/list/indexZj"), - name: "圈子列表(助教)", - meta: { title: "圈子列表(助教)" } - }, - { - path: "detail/:id", + path: "detail", component: () => import("@/views/circle/detail/index"), name: "圈子详情", meta: { title: "圈子详情" } diff --git a/src/views/circle/detail/components/forbidSpeak.vue b/src/views/circle/detail/components/forbidSpeak.vue new file mode 100644 index 0000000..50deee9 --- /dev/null +++ b/src/views/circle/detail/components/forbidSpeak.vue @@ -0,0 +1,83 @@ + + diff --git a/src/views/circle/detail/components/messageSend.vue b/src/views/circle/detail/components/messageSend.vue index a58573f..791c882 100644 --- a/src/views/circle/detail/components/messageSend.vue +++ b/src/views/circle/detail/components/messageSend.vue @@ -2,10 +2,10 @@
- - + +
- 设为精选 + 设为精选 发送并推送 +
- {{ item.createTime }} + {{ item.createTime | timefilter }}
+

没有更多了...

diff --git a/src/views/circle/detail/components/userList.vue b/src/views/circle/detail/components/userList.vue index 4991db3..c35e23d 100644 --- a/src/views/circle/detail/components/userList.vue +++ b/src/views/circle/detail/components/userList.vue @@ -1,10 +1,14 @@ diff --git a/src/views/circle/detail/components/userLnteractList.vue b/src/views/circle/detail/components/userLnteractList.vue index df2a82e..d0583fc 100644 --- a/src/views/circle/detail/components/userLnteractList.vue +++ b/src/views/circle/detail/components/userLnteractList.vue @@ -1,19 +1,19 @@ diff --git a/src/views/order/administration/agreementDetails.vue b/src/views/order/administration/agreementDetails.vue new file mode 100644 index 0000000..1c0be0f --- /dev/null +++ b/src/views/order/administration/agreementDetails.vue @@ -0,0 +1,139 @@ + + + + + + + diff --git a/src/views/order/administration/belowThresholdOrder.vue b/src/views/order/administration/belowThresholdOrder.vue new file mode 100644 index 0000000..b9ddb3c --- /dev/null +++ b/src/views/order/administration/belowThresholdOrder.vue @@ -0,0 +1,650 @@ + + + + diff --git a/src/views/order/administration/index.vue b/src/views/order/administration/index.vue new file mode 100644 index 0000000..1cf53b3 --- /dev/null +++ b/src/views/order/administration/index.vue @@ -0,0 +1,1736 @@ + + + + + diff --git a/src/views/order/administration/refundApplication.vue b/src/views/order/administration/refundApplication.vue new file mode 100644 index 0000000..a7efa40 --- /dev/null +++ b/src/views/order/administration/refundApplication.vue @@ -0,0 +1,217 @@ + + + + + diff --git a/src/views/order/administration/refundLication.vue b/src/views/order/administration/refundLication.vue new file mode 100644 index 0000000..388f989 --- /dev/null +++ b/src/views/order/administration/refundLication.vue @@ -0,0 +1,225 @@ + + + + + diff --git a/src/views/order/administration/signingReview.vue b/src/views/order/administration/signingReview.vue new file mode 100644 index 0000000..3e9d56f --- /dev/null +++ b/src/views/order/administration/signingReview.vue @@ -0,0 +1,161 @@ + + + + + diff --git a/src/views/order/list/agreementDetails.vue b/src/views/order/list/agreementDetails.vue new file mode 100644 index 0000000..9ca5519 --- /dev/null +++ b/src/views/order/list/agreementDetails.vue @@ -0,0 +1,127 @@ + + + + + diff --git a/src/views/order/list/index.vue b/src/views/order/list/index.vue new file mode 100644 index 0000000..1661acc --- /dev/null +++ b/src/views/order/list/index.vue @@ -0,0 +1,1130 @@ + + + + + diff --git a/src/views/order/list/refundApplication.vue b/src/views/order/list/refundApplication.vue new file mode 100644 index 0000000..2b285bb --- /dev/null +++ b/src/views/order/list/refundApplication.vue @@ -0,0 +1,198 @@ + + + + + diff --git a/src/views/order/marketingList/index.vue b/src/views/order/marketingList/index.vue new file mode 100644 index 0000000..39ec3bb --- /dev/null +++ b/src/views/order/marketingList/index.vue @@ -0,0 +1,544 @@ +