diff --git a/src/manifest.json b/src/manifest.json index fd10c80d..1cd8c604 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,239 +1,254 @@ { - "name": "荷塘月色", - "appid": "__UNI__5B53E65", - "description": "聊天交友app", - "versionName": "2025.10", - "versionCode": 0, - "transformPx": false, - "app-plus": { - "usingComponents": true, - "nvueCompiler": "uni-app", - "nvueStyleCompiler": "uni-app", - "compilerVersion": 3, - "nvueLaunchMode": "fast", - "splashscreen": { - "alwaysShowBeforeRender": true, - "waiting": true, - "autoclose": true, - "delay": 0 + "name" : "荷塘月色", + "appid" : "__UNI__5B53E65", + "description" : "聊天交友app", + "versionName" : "2025.10", + "versionCode" : 0, + "transformPx" : false, + "app-plus" : { + "usingComponents" : true, + "nvueCompiler" : "uni-app", + "nvueStyleCompiler" : "uni-app", + "compilerVersion" : 3, + "nvueLaunchMode" : "fast", + "splashscreen" : { + "alwaysShowBeforeRender" : true, + "waiting" : true, + "autoclose" : true, + "delay" : 0 + }, + "safearea" : { + "bottom" : { + "offset" : "none" + } + }, + "modules" : { + "Payment" : {}, + "Share" : {}, + "VideoPlayer" : {}, + "OAuth" : {}, + "Camera" : {}, + "Geolocation" : {} + }, + "distribute" : { + "android" : { + "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "minSdkVersion" : 21, + "schemes" : "shopro", + "excludePermissions" : [ + "" + ] + }, + "ios" : { + "urlschemewhitelist" : [ "baidumap", "iosamap" ], + "dSYMs" : false, + "privacyDescription" : { + "NSPhotoLibraryUsageDescription" : "需要同意访问您的相册选取图片才能完善该条目", + "NSPhotoLibraryAddUsageDescription" : "需要同意访问您的相册才能保存该图片", + "NSCameraUsageDescription" : "需要同意访问您的摄像头拍摄照片才能完善该条目", + "NSUserTrackingUsageDescription" : "开启追踪并不会获取您在其它站点的隐私信息,该行为仅用于标识设备,保障服务安全和提升浏览体验" + }, + "urltypes" : "shopro", + "capabilities" : { + "entitlements" : { + "com.apple.developer.associated-domains" : [ "applinks:shopro.sheepjs.com" ] + } + }, + "idfa" : true + }, + "sdkConfigs" : { + "speech" : {}, + "ad" : {}, + "oauth" : { + "apple" : {}, + "weixin" : { + "appid" : "wxae7a0c156da9383b", + "UniversalLinks" : "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/" + } + }, + "payment" : { + "weixin" : { + "__platform__" : [ "ios", "android" ], + "appid" : "wxae7a0c156da9383b", + "UniversalLinks" : "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/" + }, + "alipay" : { + "__platform__" : [ "ios", "android" ] + } + }, + "share" : { + "weixin" : { + "appid" : "wxae7a0c156da9383b", + "UniversalLinks" : "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/" + } + }, + "maps" : {}, + "geolocation" : { + "system" : { + "__platform__" : [ "ios", "android" ] + } + } + }, + "orientation" : [ "portrait-primary" ], + "splashscreen" : { + "androidStyle" : "default", + "iosStyle" : "common", + "useOriginalMsgbox" : true, + "android" : { + "hdpi" : "C:/Users/20513/Pictures/login-bg.png", + "xhdpi" : "C:/Users/20513/Pictures/login-bg.png", + "xxhdpi" : "C:/Users/20513/Pictures/login-bg.png" + } + }, + "icons" : { + "android" : { + "hdpi" : "unpackage/res/icons/72x72.png", + "xhdpi" : "unpackage/res/icons/96x96.png", + "xxhdpi" : "unpackage/res/icons/144x144.png", + "xxxhdpi" : "unpackage/res/icons/192x192.png" + }, + "ios" : { + "appstore" : "unpackage/res/icons/1024x1024.png", + "ipad" : { + "app" : "unpackage/res/icons/76x76.png", + "app@2x" : "unpackage/res/icons/152x152.png", + "notification" : "unpackage/res/icons/20x20.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "proapp@2x" : "unpackage/res/icons/167x167.png", + "settings" : "unpackage/res/icons/29x29.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "spotlight" : "unpackage/res/icons/40x40.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png" + }, + "iphone" : { + "app@2x" : "unpackage/res/icons/120x120.png", + "app@3x" : "unpackage/res/icons/180x180.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "notification@3x" : "unpackage/res/icons/60x60.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "settings@3x" : "unpackage/res/icons/87x87.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png", + "spotlight@3x" : "unpackage/res/icons/120x120.png" + } + } + } + }, + "nativePlugins" : { + "AP-FaceDetectModule" : { + "__plugin_info__" : { + "name" : "AP-FaceDetectModule", + "description" : "阿里云金融级实人认证SDK", + "platforms" : "Android,iOS", + "url" : "", + "android_package_name" : "", + "ios_bundle_id" : "", + "isCloud" : false, + "bought" : -1, + "pid" : "", + "parameters" : {} + } + } + } }, - "safearea": { - "bottom": { - "offset": "none" - } - }, - "modules": { - "Payment": {}, - "Share": {}, - "VideoPlayer": {}, - "OAuth": {}, - "Camera": {}, - "Geolocation": {} - }, - "distribute": { - "android": { - "permissions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "minSdkVersion": 21, - "schemes": "shopro", - "excludePermissions": [ - "" + "quickapp" : {}, + "quickapp-native" : { + "icon" : "/static/logo.png", + "package" : "com.example.demo", + "features" : [ + { + "name" : "system.clipboard" + } ] - }, - "ios": { - "urlschemewhitelist": ["baidumap", "iosamap"], - "dSYMs": false, - "privacyDescription": { - "NSPhotoLibraryUsageDescription": "需要同意访问您的相册选取图片才能完善该条目", - "NSPhotoLibraryAddUsageDescription": "需要同意访问您的相册才能保存该图片", - "NSCameraUsageDescription": "需要同意访问您的摄像头拍摄照片才能完善该条目", - "NSUserTrackingUsageDescription": "开启追踪并不会获取您在其它站点的隐私信息,该行为仅用于标识设备,保障服务安全和提升浏览体验" + }, + "quickapp-webview" : { + "icon" : "/static/logo.png", + "package" : "com.example.demo", + "minPlatformVersion" : 1070, + "versionName" : "1.0.0", + "versionCode" : 100 + }, + "mp-weixin" : { + "appid" : "wx66186af0759f47c9", + "setting" : { + "urlCheck" : false, + "minified" : true, + "postcss" : true }, - "urltypes": "shopro", - "capabilities": { - "entitlements": { - "com.apple.developer.associated-domains": ["applinks:shopro.sheepjs.com"] - } + "optimization" : { + "subPackages" : true }, - "idfa": true - }, - "sdkConfigs": { - "speech": {}, - "ad": {}, - "oauth": { - "apple": {}, - "weixin": { - "appid": "wxae7a0c156da9383b", - "UniversalLinks": "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/" - } + "plugins" : {}, + "lazyCodeLoading" : "requiredComponents", + "usingComponents" : {}, + "permission" : {}, + "requiredPrivateInfos" : [ "chooseAddress" ] + }, + "mp-alipay" : { + "usingComponents" : true + }, + "mp-baidu" : { + "usingComponents" : true + }, + "mp-toutiao" : { + "usingComponents" : true + }, + "mp-jd" : { + "usingComponents" : true + }, + "h5" : { + "darkmode" : true, + "template" : "index.html", + "router" : { + "mode" : "history", + "base" : "/" }, - "payment": { - "weixin": { - "__platform__": ["ios", "android"], - "appid": "wxae7a0c156da9383b", - "UniversalLinks": "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/" - }, - "alipay": { - "__platform__": ["ios", "android"] - } + "sdkConfigs" : { + "maps" : {} }, - "share": { - "weixin": { - "appid": "wxae7a0c156da9383b", - "UniversalLinks": "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/" - } + "async" : { + "timeout" : 20000 }, - "maps": {}, - "geolocation": { - "system": { - "__platform__": ["ios", "android"] - } + "title" : "聊天交友", + "optimization" : { + "treeShaking" : { + "enable" : true + } } - }, - "orientation": ["portrait-primary"], - "splashscreen": { - "androidStyle": "default", - "iosStyle": "common", - "useOriginalMsgbox": true, - "android": { - "hdpi": "C:/Users/20513/Pictures/login-bg.png", - "xhdpi": "C:/Users/20513/Pictures/login-bg.png", - "xxhdpi": "C:/Users/20513/Pictures/login-bg.png" - } - }, - "icons": { - "android": { - "hdpi": "unpackage/res/icons/72x72.png", - "xhdpi": "unpackage/res/icons/96x96.png", - "xxhdpi": "unpackage/res/icons/144x144.png", - "xxxhdpi": "unpackage/res/icons/192x192.png" - }, - "ios": { - "appstore": "unpackage/res/icons/1024x1024.png", - "ipad": { - "app": "unpackage/res/icons/76x76.png", - "app@2x": "unpackage/res/icons/152x152.png", - "notification": "unpackage/res/icons/20x20.png", - "notification@2x": "unpackage/res/icons/40x40.png", - "proapp@2x": "unpackage/res/icons/167x167.png", - "settings": "unpackage/res/icons/29x29.png", - "settings@2x": "unpackage/res/icons/58x58.png", - "spotlight": "unpackage/res/icons/40x40.png", - "spotlight@2x": "unpackage/res/icons/80x80.png" - }, - "iphone": { - "app@2x": "unpackage/res/icons/120x120.png", - "app@3x": "unpackage/res/icons/180x180.png", - "notification@2x": "unpackage/res/icons/40x40.png", - "notification@3x": "unpackage/res/icons/60x60.png", - "settings@2x": "unpackage/res/icons/58x58.png", - "settings@3x": "unpackage/res/icons/87x87.png", - "spotlight@2x": "unpackage/res/icons/80x80.png", - "spotlight@3x": "unpackage/res/icons/120x120.png" - } - } - } }, - "nativePlugins": {} - }, - "quickapp": {}, - "quickapp-native": { - "icon": "/static/logo.png", - "package": "com.example.demo", - "features": [ - { - "name": "system.clipboard" - } - ] - }, - "quickapp-webview": { - "icon": "/static/logo.png", - "package": "com.example.demo", - "minPlatformVersion": 1070, - "versionName": "1.0.0", - "versionCode": 100 - }, - "mp-weixin": { - "appid": "wx66186af0759f47c9", - "setting": { - "urlCheck": false, - "minified": true, - "postcss": true - }, - "optimization": { - "subPackages": true - }, - "plugins": {}, - "lazyCodeLoading": "requiredComponents", - "usingComponents": {}, - "permission": {}, - "requiredPrivateInfos": ["chooseAddress"] - }, - "mp-alipay": { - "usingComponents": true - }, - "mp-baidu": { - "usingComponents": true - }, - "mp-toutiao": { - "usingComponents": true - }, - "mp-jd": { - "usingComponents": true - }, - "h5": { - "darkmode": true, - "template": "index.html", - "router": { - "mode": "history", - "base": "/" - }, - "sdkConfigs": { - "maps": {} - }, - "async": { - "timeout": 20000 - }, - "title": "聊天交友", - "optimization": { - "treeShaking": { - "enable": true - } - } - }, - "vueVersion": "3", - "_spaceID": "192b4892-5452-4e1d-9f09-eee1ece40639", - "locale": "zh-Hans", - "fallbackLocale": "zh-Hans" + "vueVersion" : "3", + "_spaceID" : "192b4892-5452-4e1d-9f09-eee1ece40639", + "locale" : "zh-Hans", + "fallbackLocale" : "zh-Hans" } diff --git a/src/pages.json b/src/pages.json index 8ca71979..4788b608 100644 --- a/src/pages.json +++ b/src/pages.json @@ -226,6 +226,13 @@ "navigationStyle": "custom" } }, + { + "path": "face-verify", + "style": { + "navigationBarTitleText": "人脸认证", + "navigationStyle": "custom" + } + }, { "path": "recharge", "style": { @@ -247,6 +254,13 @@ "navigationStyle": "custom" } }, + { + "path": "set-wechat", + "style": { + "navigationBarTitleText": "设置微信", + "navigationStyle": "custom" + } + }, { "path": "about", "style": { diff --git a/src/pages/home/components/scroll-user.vue b/src/pages/home/components/scroll-user.vue index 133e3d98..1d3c4d66 100644 --- a/src/pages/home/components/scroll-user.vue +++ b/src/pages/home/components/scroll-user.vue @@ -4,7 +4,6 @@ :loadMoreStatus="loadMoreStatus" @refresh="refreshList" @loadMore="listLoadMore" - @scroll="scroll" :scroll-top="scrollTop" > @@ -49,7 +48,7 @@ scene: string; }>(); - const scrollTop = ref(0); + const scrollTop = ref(1); const userCity = computed(() => sheep.$store('user').userCity); const params = reactive({ scene: props.scene, @@ -75,10 +74,6 @@ }, ); - const scroll = (e: any) => { - scrollTop.value = e.detail.scrollTop; - }; - const detail = (user: any) => { uni.navigateTo({ url: `/pages/home/detail?memberId=${user.memberId}`, diff --git a/src/pages/home/detail.vue b/src/pages/home/detail.vue index d4141daf..2d4d9fbd 100644 --- a/src/pages/home/detail.vue +++ b/src/pages/home/detail.vue @@ -15,7 +15,8 @@ - + - + - + - - - - @@ -90,7 +86,6 @@ issueProvince: '', issueCity: '', issueDistrict: '', - issueAddress: '', }); const coverPic = computed(() => { return params.coverPic.map((item: any) => JSON.parse(item.response).data); @@ -161,7 +156,7 @@ // 发布朋友圈 const publishMoments = async () => { - if (!params.description || !params.issueProvince || !params.issueAddress) + if (!params.description || !params.issueProvince) return uni.showToast({ title: '请填写内容', icon: 'error' }); if (!params.coverPic || !params.coverPic.length) return uni.showToast({ title: '请上传图片', icon: 'error' }); diff --git a/src/pages/profile/apply-vip.vue b/src/pages/profile/apply-vip.vue index f96f07ce..be0b489d 100644 --- a/src/pages/profile/apply-vip.vue +++ b/src/pages/profile/apply-vip.vue @@ -10,7 +10,7 @@ VIP @@ -26,7 +26,7 @@ {{ item.title }} - ¥{{ fen2yuan(item.preferentialPrice) }} + + ¥{{ fen2yuan(item.preferentialPrice) }} + ¥{{ fen2yuan(item.originalPrice) }} @@ -80,13 +80,13 @@ 开通即视为同意 - 《VIP会员服务协议》 + 《VIP会员协议》 和 - 《自动续费协议》 + 《会员充值协议》 - @@ -142,7 +142,7 @@ { title: '专属身份标识', desc: '昵称后展示 VIP 标识,提升可信度' }, ]; const payMethod = ref<'alipay' | 'wechat'>('alipay'); // 支付方式:alipay / wechat - const openTypeList = ref(); // 会员类型列表 + const openTypeList = ref([]); // 会员类型列表 const curOpenTypeId = ref(); // 当前选择的会员类型id const currentOpenType = computed(() => openTypeList.value?.find((item) => item.id === curOpenTypeId.value), diff --git a/src/pages/profile/components/user-ablum.vue b/src/pages/profile/components/user-ablum.vue index aa26b6fb..3e6bdf91 100644 --- a/src/pages/profile/components/user-ablum.vue +++ b/src/pages/profile/components/user-ablum.vue @@ -9,7 +9,7 @@ hover-class="navigator-hover" > - 上传相册 + 上传相册 diff --git a/src/pages/profile/face-verify.vue b/src/pages/profile/face-verify.vue new file mode 100644 index 00000000..8adbf8bf --- /dev/null +++ b/src/pages/profile/face-verify.vue @@ -0,0 +1,37 @@ + + + diff --git a/src/pages/profile/feedback.vue b/src/pages/profile/feedback.vue index 72fac35e..d6041156 100644 --- a/src/pages/profile/feedback.vue +++ b/src/pages/profile/feedback.vue @@ -1,6 +1,6 @@ diff --git a/src/pages/profile/use-ablum.ts b/src/pages/profile/use-ablum.ts index 5415d5c1..832ea7ec 100644 --- a/src/pages/profile/use-ablum.ts +++ b/src/pages/profile/use-ablum.ts @@ -7,7 +7,11 @@ export default function useAblum() { // 获取用户相册 const getUserAlbum = async () => { - const { data = null } = await RecentApi.getUserAlbum({ pageNo: 1, pageSize: 20 }); + const { data = null } = await RecentApi.getUserAlbum({ + pageNo: 1, + pageSize: 20, + resourceType: 'IMAGE', + }); ablumList.value = data.list ?? []; }; diff --git a/src/sheep/api/member/recent.ts b/src/sheep/api/member/recent.ts index 83609b29..4df07b53 100644 --- a/src/sheep/api/member/recent.ts +++ b/src/sheep/api/member/recent.ts @@ -150,7 +150,7 @@ const RecentApi = { }, }); }, - // 保存用户相册 + // 保存用户相册单个照片资源 saveUserAlbum: (data: any) => { return request({ url: '/member/photo/upload', @@ -162,15 +162,15 @@ const RecentApi = { }, }); }, - // 移除用户相册 + // 删除用户相册单个照片 deleteUserAlbum: (id: any) => { return request({ url: '/member/photo/delete', - method: 'GET', + method: 'DELETE', params: { id }, custom: { showLoading: true, - loadingMsg: '操作中', + loadingMsg: '删除中', }, }); }, @@ -290,6 +290,18 @@ const RecentApi = { }, }); }, + // 更新用户设置 + updateWeChatInfo: (data: any) => { + return request({ + url: '/member/user/update-wechat', + method: 'PUT', + data, + custom: { + showLoading: true, + loadingMsg: '保存中', + }, + }); + }, }; export default RecentApi; diff --git a/src/sheep/components/moment-card/moment-card.vue b/src/sheep/components/moment-card/moment-card.vue index 7d549de9..fb07e40a 100644 --- a/src/sheep/components/moment-card/moment-card.vue +++ b/src/sheep/components/moment-card/moment-card.vue @@ -3,21 +3,25 @@ - + - - {{ member?.memberNickname }} - - - 真人认证 - + {{ member?.memberNickname }} + + {{ formatDate(data.createTime, 'YYYY-MM-DD HH:mm') }} + + + + + + {{ item.tagTitle }} - {{ formatDate(data.createTime) }} {{ getGender(member.memberSex) }}·{{ member.memberAge }}岁 @@ -26,7 +30,7 @@ - + {{ data.description }} -