diff --git a/src/api/circle.js b/src/api/circle.js index ee173ba..c91db59 100644 --- a/src/api/circle.js +++ b/src/api/circle.js @@ -146,7 +146,6 @@ export function setNotice(data) { // 后台查询交易圈统计 export function getCircleStatistics(data) { - debugger; return request({ url: "/admin/group/collect/query", method: "post", @@ -156,10 +155,18 @@ export function getCircleStatistics(data) { // 后台查询交易圈当日统计 export function getCurrentDayCircleData(data) { - debugger; return request({ url: "/admin/group/collect/queryToday", method: "post", data }); } + +// 后台查询学院列表 +export function getListCustomer(data) { + return request({ + url: "/admin/group/college/listCustomer", + method: "post", + data + }); +} diff --git a/src/views/circle/data/components/studentList.vue b/src/views/circle/data/components/studentList.vue index a84e144..b4046ce 100644 --- a/src/views/circle/data/components/studentList.vue +++ b/src/views/circle/data/components/studentList.vue @@ -10,20 +10,41 @@ > - - - + + + + + + - - - + + + @@ -34,38 +55,157 @@ + + + + + + + + + - - - - - +
+ + +
+ @@ -80,4 +220,8 @@ export default { .table-area { padding: 20px; } +.pagination-wrap { + display: flex; + justify-content: flex-end; +} diff --git a/src/views/circle/detail/components/forbidSpeak.vue b/src/views/circle/detail/components/forbidSpeak.vue index 7e6cb1f..fc5dcb3 100644 --- a/src/views/circle/detail/components/forbidSpeak.vue +++ b/src/views/circle/detail/components/forbidSpeak.vue @@ -25,12 +25,13 @@ import { addCommentBlack } from "@/api/videoLive"; export default { props: { productId: { - type: Number + type: Number | String }, productType: { type: Number }, scope: { + // 范围类型 1产品 2产品类型 3全局 type: Number } }, diff --git a/src/views/circle/detail/components/privateChat.vue b/src/views/circle/detail/components/privateChat.vue index 1444c83..e952ec4 100644 --- a/src/views/circle/detail/components/privateChat.vue +++ b/src/views/circle/detail/components/privateChat.vue @@ -5,7 +5,7 @@ 返回群聊 -
{{ userInfo.userName }}
+
{{ userInfo.privateUserName }}({{ userInfo.privateUserId }})
私聊中
@@ -63,6 +63,9 @@ export default { align-items: center; h5 { margin: 0 0 0 10px; + font-size: 14px; + color: #999; + font-weight: normal; } } p { diff --git a/src/views/circle/detail/index.vue b/src/views/circle/detail/index.vue index cad1ee3..185a6f7 100644 --- a/src/views/circle/detail/index.vue +++ b/src/views/circle/detail/index.vue @@ -126,6 +126,7 @@