+
{{ row.operatorMemberNickname }}
在
{{ formatPast(row.createTime) }}
@@ -36,6 +36,12 @@
{{ row.memberNickname }}
的动态
+
+ {{ row.operatorMemberNickname }}
+ 在
+ {{ formatPast(row.createTime) }}
+ 收藏/喜欢了你
+
@@ -52,6 +58,23 @@ import { FormInstance } from 'element-plus'
import { dateFormatter, formatPast } from '@/utils/formatTime'
import * as operationApi from "@/api/member/operation"
+import { strict } from 'assert'
+
+const props = defineProps({
+ memberRecentId: {
+ type: [String, Number],
+ default: ""
+ },
+ memberId: {
+ type: [String, Number],
+ default: ""
+ },
+ // 操作类型 user 用户,recent动态
+ type: {
+ type: String,
+ default: "recent"
+ },
+})
const queryFormRef = ref
()
@@ -61,13 +84,28 @@ const list = ref([])
// 表单搜索
const queryParams = ref({
- bizType: "1",
operatorMemberNickname: "",
+ memberId: props.memberId,
+ memberRecentId: props.memberRecentId,
createTime: [],
pageNo: 1,
pageSize: 10,
})
+watch(() => props.memberId, (newVal) => {
+ if (newVal) {
+ queryParams.value.memberId = newVal as any
+ getList()
+ }
+})
+
+watch(() => props.memberRecentId, (newVal) => {
+ if (newVal) {
+ queryParams.value.memberRecentId = newVal as any
+ getList()
+ }
+})
+
/** 搜索按钮操作 */
const handleQuery = async () => {
queryParams.value.pageNo = 1
@@ -84,7 +122,16 @@ const resetQuery = () => {
const getList = async () => {
loading.value = true
try {
- const data = await operationApi.OperationApi.getOperationPage(queryParams.value)
+ const _params: any = {
+ ...queryParams.value
+ }
+ if (props.type == "user") {
+ _params.bizType = 4
+ }
+ if (props.type == "recent") {
+ _params.bizType = 1
+ }
+ const data = await operationApi.OperationApi.getOperationPage(_params)
list.value = data.list
total.value = data.total
} finally {
diff --git a/src/views/member/recent/cmp/report-page.vue b/src/views/member/recent/cmp/report-page.vue
index 0a5bdb26..383998a1 100644
--- a/src/views/member/recent/cmp/report-page.vue
+++ b/src/views/member/recent/cmp/report-page.vue
@@ -55,6 +55,14 @@ import { dateFormatter, formatPast } from '@/utils/formatTime'
import * as operationApi from "@/api/member/operation"
+const props = defineProps({
+ memberId: {
+ type: String,
+ default: () => { }
+ },
+})
+
+
const queryFormRef = ref()
const total = ref(0)
@@ -63,13 +71,22 @@ const list = ref([])
// 表单搜索
const queryParams = ref({
- bizType: "2",
+ bizType: "6",
+ memberId: "",
operatorMemberNickname: "",
createTime: [],
pageNo: 1,
pageSize: 10,
})
+watch(() => props.memberId, (newVal) => {
+ if (newVal) {
+ queryParams.value.memberId = newVal as any
+ getList()
+ }
+})
+
+
/** 搜索按钮操作 */
const handleQuery = async () => {
queryParams.value.pageNo = 1
diff --git a/src/views/member/recent/cmp/shield-page.vue b/src/views/member/recent/cmp/shield-page.vue
index 31ee6893..c7d57a0f 100644
--- a/src/views/member/recent/cmp/shield-page.vue
+++ b/src/views/member/recent/cmp/shield-page.vue
@@ -53,6 +53,13 @@ import { dateFormatter, formatPast } from '@/utils/formatTime'
import * as operationApi from "@/api/member/operation"
+const props = defineProps({
+ memberId: {
+ type: [String, Number],
+ default: ""
+ },
+})
+
const queryFormRef = ref()
const total = ref(0)
@@ -61,13 +68,21 @@ const list = ref([])
// 表单搜索
const queryParams = ref({
- bizType: "3",
+ bizType: "5",
+ operatorMemberId: props.memberId,
operatorMemberNickname: "",
createTime: [],
pageNo: 1,
pageSize: 10,
})
+watch(() => props.memberId, (newVal) => {
+ if (newVal) {
+ queryParams.value.operatorMemberId = newVal as any
+ getList()
+ }
+})
+
/** 搜索按钮操作 */
const handleQuery = async () => {
queryParams.value.pageNo = 1
diff --git a/src/views/member/recent/cmp/visit-page.vue b/src/views/member/recent/cmp/visit-page.vue
new file mode 100644
index 00000000..d227711e
--- /dev/null
+++ b/src/views/member/recent/cmp/visit-page.vue
@@ -0,0 +1,128 @@
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+ 重置
+
+
+
+
+
+
+
+
+ {{ row.member.memberNickname }}
+
+
+
+
+
+ {{ row.member.memberNickname }}
+ 在
+ {{ formatPast(row.viewStartTime) }}
+ 访问了
+ {{ row.memberNickname }}
+ 的动态
+ ,持续时间:{{ row.viewSecond }}秒
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/member/recent/router/recent.detail.vue b/src/views/member/recent/router/recent.detail.vue
index 19ec82bd..7de64975 100644
--- a/src/views/member/recent/router/recent.detail.vue
+++ b/src/views/member/recent/router/recent.detail.vue
@@ -29,16 +29,18 @@
-
+
-
+
-
+
-
-
+
+
+
+
@@ -53,6 +55,7 @@ import RecentCard from '@/views/member/recent/cmp/recent-card.vue'
import LikePage from "@/views/member/recent/cmp/like-page.vue"
import ReportPage from "@/views/member/recent/cmp/report-page.vue"
import ShieldPage from "@/views/member/recent/cmp/shield-page.vue"
+import VisitPage from "@/views/member/recent/cmp/visit-page.vue"
import { useTagsViewStore } from '@/store/modules/tagsView'
diff --git a/src/views/member/user/detail/index.vue b/src/views/member/user/detail/index.vue
index 4988035a..c240d2cf 100644
--- a/src/views/member/user/detail/index.vue
+++ b/src/views/member/user/detail/index.vue
@@ -30,31 +30,45 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -88,6 +102,11 @@ import UserBalanceList from './UserBalanceList.vue'
import { CardTitle } from '@/components/Card/index'
import { ElMessage } from 'element-plus'
+import LikePage from "@/views/member/recent/cmp/like-page.vue"
+import ReportPage from "@/views/member/recent/cmp/report-page.vue"
+import ShieldPage from "@/views/member/recent/cmp/shield-page.vue"
+import VisitPage from "@/views/member/recent/cmp/visit-page.vue"
+
defineOptions({ name: 'MemberDetail' })
const loading = ref(true) // 加载中