From 6c857dd1f7e5f3b626023ab2cec4771acc2ab847 Mon Sep 17 00:00:00 2001
From: mazengfei <331023091@qq.com>
Date: Mon, 9 Mar 2026 21:59:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                              | 3 ++-
 .../sw/dualscreen/activity/fragment/pay/NumberPayFragment.kt  | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 690caab..490c2dd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -65,7 +65,8 @@
         <activity android:name="com.sw.dualscreen.activity.CollectedFoodActivity"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity android:name="com.sw.dualscreen.activity.PayActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+            android:launchMode="singleTask"/>
 
         <provider
             android:name="androidx.core.content.FileProvider"
diff --git a/app/src/main/java/com/sw/dualscreen/activity/fragment/pay/NumberPayFragment.kt b/app/src/main/java/com/sw/dualscreen/activity/fragment/pay/NumberPayFragment.kt
index 3dc5c6b..227493b 100644
--- a/app/src/main/java/com/sw/dualscreen/activity/fragment/pay/NumberPayFragment.kt
+++ b/app/src/main/java/com/sw/dualscreen/activity/fragment/pay/NumberPayFragment.kt
@@ -50,6 +50,8 @@ class NumberPayFragment : BaseFragment<FragmentNumberPayBinding>() {
                     }, 1000)
                     return@getMemberInfoByPhone
                 }
+                //肯定是会员
+                memberInfo.member = true
                 //绑定订单使用faceUserId
                 payActivity.bindOrder(memberInfo.faceUserId ?: "") { bindResult ->
                     if (bindResult.not()) {
@@ -59,7 +61,7 @@ class NumberPayFragment : BaseFragment<FragmentNumberPayBinding>() {
                     }
                     binding.root.postDelayed({
                         payActivity.hideWaitingDialog()
-                        payActivity.showPayInfo(type = 1, isVip = true, memberInfo = memberInfo)
+                        payActivity.showPayInfo(type = 1, isVip = memberInfo.member, memberInfo = memberInfo)
                         payActivity.hidePayTab()
                     }, 1000)
                 }