From c386fa0158a7bc496513ec6615e6b10a5836354f Mon Sep 17 00:00:00 2001 From: yezian Date: Tue, 23 Apr 2024 19:08:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=A9=BA=E9=97=B4=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=9B=E5=AE=8C=E5=96=84MyModal=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=EF=BC=9B=E9=83=A8=E5=88=86=E7=BB=9F=E4=B8=80=E5=8D=A1=E7=89=87?= =?UTF-8?q?=E5=A1=AB=E5=85=85=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 8 +- components/CreatePostModal/index.jsx | 2 +- components/GetWechatModal/index.jsx | 3 - components/MediaPickerModal/index.jsx | 22 +++-- components/MyModal/index.jsx | 94 ++++++++++++++----- components/SpacePost/index.jsx | 6 +- screeens/CreateImagePost/index.jsx | 9 +- screeens/CreateVideoPost/index.jsx | 9 +- screeens/SpaceSetting/AgencySetting/index.jsx | 2 +- .../CollaboratorSetting/index.jsx | 57 +++++++---- .../SelectSpaceSettingItem/index.jsx | 2 +- 11 files changed, 143 insertions(+), 71 deletions(-) diff --git a/app.json b/app.json index fe141e7..b3ec5fd 100644 --- a/app.json +++ b/app.json @@ -21,8 +21,8 @@ "supportsTablet": true, "bundleIdentifier": "com.jueweijue.ironfans", "infoPlist": { - "NSPhotoLibraryUsageDescription": "允许铁粉空间访问您的相册", - "NSPhotoLibraryAddUsageDescription": "允许铁粉空间保存图片到相册" + "NSPhotoLibraryUsageDescription": "当您授权允许访问相册后，您能够在APP中浏览相册中的图片，以便您选择合适的图片进行上传，用于头像或其他位置", + "NSPhotoLibraryAddUsageDescription": "当您授权允许保存图片到相册后，您能够将APP内容保存到本地，以便您稍后在相册中继续查看" } }, "android": { @@ -52,8 +52,8 @@ [ "expo-media-library", { - "photosPermission": "允许铁粉空间访问您的相册，以便您选择合适的图片进行上传", - "savePhotosPermission": "允许铁粉空间保存图片到相册，以便您稍后在相册中继续查看", + "photosPermission": "当您授权允许访问相册后，您能够在APP中浏览相册中的图片，以便您选择合适的图片进行上传，用于头像或其他位置", + "savePhotosPermission": "当您授权允许保存图片到相册后，您能够将APP内容保存到本地，以便您稍后在相册中继续查看", "isAccessMediaLocationEnabled": true } ], diff --git a/components/CreatePostModal/index.jsx b/components/CreatePostModal/index.jsx index 55e5676..2f73002 100644 --- a/components/CreatePostModal/index.jsx +++ b/components/CreatePostModal/index.jsx @@ -73,7 +73,7 @@ export default function CreatePostModal({ visible, setVisible }) { { - setVisible(false); const editedAssets = await changeToLocalUri(assets); setAssets(editedAssets); + setVisible(false); }} onCancel={() => { setVisible(false); @@ -300,20 +306,18 @@ export default function MediaPickerModal({ title="权限申请" content="该功能需要开启存储权限，用于选择上传媒体文件" confirmText="继续" - cancel={() => { - setRequestModalVisible(false); - }} - confirm={() => { + custom={() => { setRequestModalVisible(false); requestMediaLibraryPermissions(); }} + customText="继续" /> { setOverlayVisible(false); }} diff --git a/components/MyModal/index.jsx b/components/MyModal/index.jsx index 1b99a1e..bcc2be7 100644 --- a/components/MyModal/index.jsx +++ b/components/MyModal/index.jsx @@ -8,8 +8,11 @@ export default function MyModal({ title, content, confirm, + custom, + customText, confirmText, cancelText, + confirmLeft = false, }) { const tailwind = useTailwind(); return ( @@ -41,32 +44,77 @@ export default function MyModal({ {content} - setVisible(false)} - style={tailwind( - "border-r-2 border-t-2 border-[#2c2b2f] basis-1/2 pt-1 justify-center items-center" - )} - > - - {cancelText ? cancelText : "取消"} - - - - - {confirmText ? confirmText : "确认"} - - + + {customText ? customText : "确认"} + + + ) : ( + <> + {confirmLeft && ( + + + {confirmText ? confirmText : "确认"} + + + )} + setVisible(false)} + style={ + confirmLeft + ? tailwind( + "border-t-2 border-[#2c2b2f] basis-1/2 pt-1 justify-center items-center" + ) + : tailwind( + "border-r-2 border-t-2 border-[#2c2b2f] basis-1/2 pt-1 justify-center items-center" + ) + } + > + + {cancelText ? cancelText : "取消"} + + + {!confirmLeft && ( + + + {confirmText ? confirmText : "确认"} + + + )} + + )} diff --git a/components/SpacePost/index.jsx b/components/SpacePost/index.jsx index 173f79a..82937ce 100644 --- a/components/SpacePost/index.jsx +++ b/components/SpacePost/index.jsx @@ -285,7 +285,11 @@ export default function SpacePost({ data }) { ...tailwind("text-sm font-medium"), }} > - {data.is_ironfan_visible === 1 ? "铁粉" : "超粉"}免费查看 + {data.is_ironfan_visible === 1 + ? "铁粉免费查看" + : data.is_superfanship_enabled === 1 + ? "超粉免费查看" + : "付费解锁"} { - setIsBlockModalVisible(false); - }} - confirm={() => { + custom={() => { setIsBlockModalVisible(false); setTimeout( () => navigation.replace("VisibleToOneselfSpacePosts"), 500 ); }} + customText="去修改" /> @@ -335,7 +332,7 @@ export default function CreateImagePost({ navigation, route }) { style={{ gap: 8, ...tailwind( - "flex flex-col mt-auto mb-2 bg-[#17171A] rounded-3xl" + "flex flex-col mt-auto mb-2 bg-[#17161A] rounded-3xl" ), }} > diff --git a/screeens/CreateVideoPost/index.jsx b/screeens/CreateVideoPost/index.jsx index f3d122b..ad076e8 100644 --- a/screeens/CreateVideoPost/index.jsx +++ b/screeens/CreateVideoPost/index.jsx @@ -19,7 +19,6 @@ import baseRequest from "../../utils/baseRequest"; import { generateSignature } from "../../utils/crypto"; import MyModal from "../../components/MyModal"; -//todo:使用更新后的MyModal组件，禁止关闭弹窗 export default function CreateVideoPost({ navigation, route }) { const tailwind = useTailwind(); const insets = useSafeAreaInsets(); @@ -226,16 +225,14 @@ export default function CreateVideoPost({ navigation, route }) { setVisible={setIsBlockModalVisible} title="当前无法发帖" content="您当前审核未通过动态过多，请修改后再试" - cancel={() => { - setIsBlockModalVisible(false); - }} - confirm={() => { + custom={() => { setIsBlockModalVisible(false); setTimeout( () => navigation.replace("VisibleToOneselfSpacePosts"), 500 ); }} + customText="去修改" /> @@ -311,7 +308,7 @@ export default function CreateVideoPost({ navigation, route }) { style={{ gap: 8, ...tailwind( - "flex flex-col mt-auto mb-2 bg-[#17171A] rounded-3xl" + "flex flex-col mt-auto mb-2 bg-[#17161A] rounded-3xl" ), }} > diff --git a/screeens/SpaceSetting/AgencySetting/index.jsx b/screeens/SpaceSetting/AgencySetting/index.jsx index e5fa2da..70c5614 100644 --- a/screeens/SpaceSetting/AgencySetting/index.jsx +++ b/screeens/SpaceSetting/AgencySetting/index.jsx @@ -367,7 +367,7 @@ export default function AgencySetting({ navigation, route }) { style={{ gap: 12, ...tailwind( - "flex flex-col w-full bg-[#17171A] rounded-3xl px-4 py-6" + "flex flex-col w-full bg-[#17161A] rounded-3xl px-4 py-6" ), }} > diff --git a/screeens/SpaceSetting/CollaboratorSetting/index.jsx b/screeens/SpaceSetting/CollaboratorSetting/index.jsx index 4863e5c..a2c5097 100644 --- a/screeens/SpaceSetting/CollaboratorSetting/index.jsx +++ b/screeens/SpaceSetting/CollaboratorSetting/index.jsx @@ -350,24 +350,49 @@ export default function CollaboratorSetting({ navigation, route }) { (item) => item.collaborator_mid === selfMid ); return ( - - - 合伙人昵称：{selfData.collaborator_account.name} - - - ID：{selfData.collaborator_account.user_id} - - - 分成比例：{data.sharing_ratio * 100}% - - + + + + 合伙人昵称：{selfData[0]?.collaborator_account?.name} + + + ID：{selfData[0]?.collaborator_account?.user_id} + + + 分成比例：{selfData[0]?.sharing_ratio * 100}% + + + + + 注意事项： + + + 1、总分成比例由当前空间主人设置，您的个人分成比例由代运营进行设置； + + + 2、您的个人收益计算公式为：空间收益x个人分成比例=个人收益，收益将以钻石形式发放至您的钱包； + + + 3、若您对收益情况存在任何疑问，请联系人工客服。 + + + + ); } @@ -451,7 +476,7 @@ export default function CollaboratorSetting({ navigation, route }) { style={{ gap: 12, ...tailwind( - "flex flex-col w-full bg-[#17171A] rounded-3xl px-4 py-6" + "flex flex-col w-full bg-[#17161A] rounded-3xl px-4 py-6" ), }} > diff --git a/screeens/SpaceSetting/SelectSpaceSettingItem/index.jsx b/screeens/SpaceSetting/SelectSpaceSettingItem/index.jsx index 29dade5..27ff6c8 100644 --- a/screeens/SpaceSetting/SelectSpaceSettingItem/index.jsx +++ b/screeens/SpaceSetting/SelectSpaceSettingItem/index.jsx @@ -16,7 +16,6 @@ import baseRequest from "../../../utils/baseRequest"; import { generateSignature } from "../../../utils/crypto"; import Toast from "react-native-toast-message"; -//todo:修改MyModal组件，让确认按钮摆在左边 export default function SelectSpaceSettingItem({ navigation, route, data }) { const blurhash = "LcKUTa%gOYWBYRt6xuoJo~s8V@fk"; @@ -211,6 +210,7 @@ export default function SelectSpaceSettingItem({ navigation, route, data }) { setIsExitSpaceModalVisible(false); handleExitSpace(); }} + confirmLeft /> );