diff --git a/src/manifest.json b/src/manifest.json index 1cd8c604..b8c90f08 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,7 +2,7 @@ "name" : "荷塘月色", "appid" : "__UNI__5B53E65", "description" : "聊天交友app", - "versionName" : "2025.10", + "versionName" : "0.0.0", "versionCode" : 0, "transformPx" : false, "app-plus" : { @@ -28,7 +28,8 @@ "VideoPlayer" : {}, "OAuth" : {}, "Camera" : {}, - "Geolocation" : {} + "Geolocation" : {}, + "FaceID" : {} }, "distribute" : { "android" : { @@ -66,7 +67,7 @@ "" ], "minSdkVersion" : 21, - "schemes" : "shopro", + "schemes" : "荷塘月色", "excludePermissions" : [ "" ] @@ -80,7 +81,7 @@ "NSCameraUsageDescription" : "需要同意访问您的摄像头拍摄照片才能完善该条目", "NSUserTrackingUsageDescription" : "开启追踪并不会获取您在其它站点的隐私信息,该行为仅用于标识设备,保障服务安全和提升浏览体验" }, - "urltypes" : "shopro", + "urltypes" : "荷塘月色", "capabilities" : { "entitlements" : { "com.apple.developer.associated-domains" : [ "applinks:shopro.sheepjs.com" ] @@ -91,13 +92,7 @@ "sdkConfigs" : { "speech" : {}, "ad" : {}, - "oauth" : { - "apple" : {}, - "weixin" : { - "appid" : "wxae7a0c156da9383b", - "UniversalLinks" : "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/" - } - }, + "oauth" : {}, "payment" : { "weixin" : { "__platform__" : [ "ios", "android" ], diff --git a/src/pages/home/detail.vue b/src/pages/home/detail.vue index 82d5eb5b..a9bfe499 100644 --- a/src/pages/home/detail.vue +++ b/src/pages/home/detail.vue @@ -121,7 +121,12 @@ theme="paragraph" /> - + @@ -301,7 +306,7 @@ await RecentApi.recentOperate({ memberId: userDetail.value.member.memberId, memberRecentId: userDetail.value.id, - action: 'RECENT_REPORT', + action: 'MEMBER_REPORT', reportType: '1', }); return; diff --git a/src/pages/moments/components/scroll-moment.vue b/src/pages/moments/components/scroll-moment.vue index 9c8f6582..d9d190fa 100644 --- a/src/pages/moments/components/scroll-moment.vue +++ b/src/pages/moments/components/scroll-moment.vue @@ -29,13 +29,7 @@ /> - - + + + @@ -67,7 +68,7 @@ city: userCity.value.t, memberId: '', }); - const { listData, loadMoreStatus, refreshList, listLoadMore } = useScroll( + const { isRefreshing, listData, loadMoreStatus, refreshList, listLoadMore } = useScroll( RecentApi.quickPage, params, ); diff --git a/src/pages/profile/my-moment.vue b/src/pages/profile/my-moment.vue index cfc3f3f7..142848ab 100644 --- a/src/pages/profile/my-moment.vue +++ b/src/pages/profile/my-moment.vue @@ -21,15 +21,7 @@ @refresh="refreshList" @loadMore="listLoadMore" > - - - - - + @@ -39,11 +31,11 @@ import ScrollList from '@/sheep/components/scroll-list/scroll-list.vue'; import useScroll from '@/sheep/hooks/use-scroll'; import RecentApi from '@/sheep/api/member/recent'; - import { reactive } from 'vue'; + import { onMounted } from 'vue'; - const params = reactive({}); - const { listData, loadMoreStatus, refreshList, listLoadMore } = useScroll( - RecentApi.myMomentList, - params, - ); + const { listData, loadMoreStatus, refreshList, listLoadMore } = useScroll(RecentApi.myMomentList); + + onMounted(() => { + refreshList(); + }); diff --git a/src/pages/profile/profile.vue b/src/pages/profile/profile.vue index f6c2ea2b..b1aa3d56 100644 --- a/src/pages/profile/profile.vue +++ b/src/pages/profile/profile.vue @@ -103,28 +103,28 @@ :safe-area-inset-bottom="true" > - 我的评价 + 我的评价{{ myEvaluation.evaluateCount }} 身材 - + 颜值 - + 有趣 - + 耐心 - + - 综合评分 1.0 + 综合评分 {{ myEvaluation.avgScore }} { - await RecentApi.myEvaluate(); - myEvaluation.a = 1; - myEvaluationShow.value = true; + const { data = null } = await RecentApi.myEvaluate(); + if (data) { + Object.assign(myEvaluation, data); + myEvaluationShow.value = true; + return; + } + uni.showToast({ title: '查看失败', icon: 'none' }); }; // 关注公众号 @@ -215,7 +225,7 @@ { title: '我的收益', value: '', icon: 'wallet', to: '' }, { title: '访客记录', value: '', icon: 'dong', to: '/pages/profile/view-record' }, { title: '认证中心', value: '', icon: 'user', to: '/pages/profile/face-verify' }, - { title: '我的动态', value: '', icon: 'star', to: '/pages/profile/my-moment' }, + { title: '我的动态√', value: '', icon: 'star', to: '/pages/profile/my-moment' }, { title: '我的评价', value: '', icon: 'view-module', to: '', click: lookMyEvaluation }, { title: '问题反馈√', value: '', icon: 'backtop-rectangle', to: '', click: goFeedback }, // { title: '客服助手', value: '', icon: 'service', to: '' }, diff --git a/src/sheep/api/member/recent.ts b/src/sheep/api/member/recent.ts index a4353bb8..6f63b216 100644 --- a/src/sheep/api/member/recent.ts +++ b/src/sheep/api/member/recent.ts @@ -95,7 +95,7 @@ const RecentApi = { // 查看我的动态 myMomentList: (data: any) => { return request({ - url: '/member/recent/xxx/xxx', + url: '/member/recent/dynamic-page', method: 'POST', data, custom: { @@ -119,7 +119,7 @@ const RecentApi = { // 查看我的评价 myEvaluate: () => { return request({ - url: '/member/recent/xxx/xxx', + url: '/member/recent/evaluate-detail', method: 'POST', custom: { showLoading: true, diff --git a/src/sheep/components/moment-card/moment-card.vue b/src/sheep/components/moment-card/moment-card.vue index 6a4310c1..56c4d176 100644 --- a/src/sheep/components/moment-card/moment-card.vue +++ b/src/sheep/components/moment-card/moment-card.vue @@ -67,7 +67,7 @@ {{ data.operationTotal || 0 }} 喜欢 - + 打招呼 @@ -81,24 +81,23 @@ import { computed, reactive, ref } from 'vue'; import { formatDate } from '@/sheep/util/index'; import { getGender } from '@/sheep/util/index'; - import { onLoad } from '@dcloudio/uni-app'; import useConfigStore from '@/chat-store/configStore.js'; import useChatStore from '@/chat-store/chatStore.js'; import useFriendStore from '@/chat-store/friendStore.js'; import request from '@/common/request'; - const props = defineProps<{ - data: any; - }>(); + const props = withDefaults( + defineProps<{ + data: any; + showChat?: boolean; + }>(), + { + showChat: true, + }, + ); const emit = defineEmits<(e: 'detail') => void>(); const member = computed(() => props.data.member || {}); - const pageId = ref(); - - onLoad((options: any) => { - const { memberId = null } = options; - pageId.value = memberId; - }); const isLike = ref(false); const params = reactive({