From dcfc81ed6f10214cd20c1e3faca56d4cc231eb80 Mon Sep 17 00:00:00 2001
From: yezian <jueweijue@gmail.com>
Date: Sun, 28 Jan 2024 23:30:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=9A=E5=91=98=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=96=87=E6=A1=88=EF=BC=9B=E6=9B=B4=E6=94=B9=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E4=B8=BA=E5=8A=A8=E6=80=81=E9=A1=B5=E9=9D=A2=EF=BC=9B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC=E5=8F=B7=E5=88=B01.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                             |  2 +-
 components/Post/index.jsx            |  2 +-
 screeens/HomeTab/index.jsx           | 46 ++++++++++++++--------------
 screeens/My/index.jsx                | 23 +++++++-------
 screeens/Posts/FeedPosts/index.jsx   |  4 +--
 screeens/Posts/FollowPosts/index.jsx |  2 +-
 6 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/app.json b/app.json
index 0ca6dc5..3137a9b 100644
--- a/app.json
+++ b/app.json
@@ -2,7 +2,7 @@
   "expo": {
     "name": "铁粉空间",
     "slug": "ironfans",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "splash": {
diff --git a/components/Post/index.jsx b/components/Post/index.jsx
index 0c84d5d..647d86a 100644
--- a/components/Post/index.jsx
+++ b/components/Post/index.jsx
@@ -194,7 +194,7 @@ export default function Post({ blur, data }) {
                   <Text
                     style={tailwind("mx-1 text-sm font-medium text-[#FF669E]")}
                   >
-                    会员永久查看所有动态
+                    会员动态
                   </Text>
                   <NativeImage
                     source={require("../../assets/icon/others/pinklink.png")}
diff --git a/screeens/HomeTab/index.jsx b/screeens/HomeTab/index.jsx
index 6e667e8..a71a12b 100644
--- a/screeens/HomeTab/index.jsx
+++ b/screeens/HomeTab/index.jsx
@@ -19,29 +19,6 @@ export default function HomeTab() {
         },
       })}
     >
-      <Tab.Screen
-        name="Stream"
-        component={Stream}
-        options={{
-          title: "发现",
-          headerShown: false,
-          tabBarIcon: ({ focused, color, size }) => {
-            if (focused) {
-              return (
-                <Image
-                  source={require("../../assets/icon/others/streamfocus.png")}
-                />
-              );
-            } else {
-              return (
-                <Image
-                  source={require("../../assets/icon/others/streamblur.png")}
-                />
-              );
-            }
-          },
-        }}
-      />
       <Tab.Screen
         name="Posts"
         component={Posts}
@@ -65,6 +42,29 @@ export default function HomeTab() {
           },
         }}
       />
+      <Tab.Screen
+        name="Stream"
+        component={Stream}
+        options={{
+          title: "发现",
+          headerShown: false,
+          tabBarIcon: ({ focused, color, size }) => {
+            if (focused) {
+              return (
+                <Image
+                  source={require("../../assets/icon/others/streamfocus.png")}
+                />
+              );
+            } else {
+              return (
+                <Image
+                  source={require("../../assets/icon/others/streamblur.png")}
+                />
+              );
+            }
+          },
+        }}
+      />
       <Tab.Screen
         name="My"
         component={My}
diff --git a/screeens/My/index.jsx b/screeens/My/index.jsx
index 10f8014..bff6ac9 100644
--- a/screeens/My/index.jsx
+++ b/screeens/My/index.jsx
@@ -272,7 +272,13 @@ export default function My({ navigation }) {
             )}
           </View>
           {/* 会员 */}
-          <View
+          <TouchableOpacity
+            activeOpacity={1}
+            onPress={() =>
+              navigation.navigate("WebWithoutHeader", {
+                uri: process.env.EXPO_PUBLIC_WEB_URL + "/vip",
+              })
+            }
             style={tailwind(
               "flex flex-col p-2.5 rounded-2xl mt-3.5 bg-[#301024]"
             )}
@@ -289,7 +295,7 @@ export default function My({ navigation }) {
                     style={tailwind("text-base text-[#FF669E] font-medium")}
                   >
                     {data?.is_a_member !== 1
-                      ? "开通会员永久看全场"
+                      ? "开通会员订阅动态"
                       : "尊贵的永久会员"}
                   </Text>
                 </View>
@@ -300,23 +306,18 @@ export default function My({ navigation }) {
                 </Text>
               </View>
               {data?.is_a_member !== 1 && (
-                <TouchableOpacity
-                  onPress={() =>
-                    navigation.navigate("WebWithoutHeader", {
-                      uri: process.env.EXPO_PUBLIC_WEB_URL + "/vip",
-                    })
-                  }
+                <View
                   style={tailwind(
                     "flex justify-center items-center h-9 bg-[#FF669E] rounded-full px-4"
                   )}
                 >
                   <Text style={tailwind("text-white text-sm font-medium")}>
-                    点我看看
+                    ¥99/永久
                   </Text>
-                </TouchableOpacity>
+                </View>
               )}
             </View>
-          </View>
+          </TouchableOpacity>
           {/* 纵向列表设置区 */}
           {data?.role === 3 && (
             <View
diff --git a/screeens/Posts/FeedPosts/index.jsx b/screeens/Posts/FeedPosts/index.jsx
index d74d658..04f6392 100644
--- a/screeens/Posts/FeedPosts/index.jsx
+++ b/screeens/Posts/FeedPosts/index.jsx
@@ -141,7 +141,7 @@ export default function FeedPosts({ blur }) {
               source={require("../../../assets/icon/others/vipbig.png")}
             />
             <Text style={tailwind("text-[#FF669E] text-base font-medium ml-1")}>
-              开通会员永久看全场
+              开通会员订阅动态
             </Text>
           </View>
           <TouchableOpacity
@@ -155,7 +155,7 @@ export default function FeedPosts({ blur }) {
             )}
           >
             <Text style={tailwind("text-white text-sm font-medium")}>
-              点我看看
+              ¥99/永久
             </Text>
           </TouchableOpacity>
         </View>
diff --git a/screeens/Posts/FollowPosts/index.jsx b/screeens/Posts/FollowPosts/index.jsx
index d6f71d2..49df22b 100644
--- a/screeens/Posts/FollowPosts/index.jsx
+++ b/screeens/Posts/FollowPosts/index.jsx
@@ -176,7 +176,7 @@ export default function FollowPosts({ blur }) {
               source={require("../../../assets/icon/others/vipbig.png")}
             />
             <Text style={tailwind("text-[#FF669E] text-base font-medium ml-1")}>
-              开通会员永久看全场
+              开通会员订阅动态
             </Text>
           </View>
           <TouchableOpacity