From 2e1edcb7518f20dec30dbd6e1686e9e6b558ec15 Mon Sep 17 00:00:00 2001
From: tj <1378534974@qq.com>
Date: 星期三, 16 四月 2025 17:05:12 +0800
Subject: [PATCH] 43	首页登录->首页登录  1.首页弹窗协议同意后,不能默认自动勾选,还需要用户手动勾选  2.退出登录后,再次登录需要手动勾选与用户协议(目前是默认勾选了) 44	首页登录->邀请码  邀请码默认填入“邀请码(选填) 47	数据统计->饼状图数据分类统计问题  1、只统计快递 无需统计还款其他分类  2、图形上下间隔过大" 48	数据统计	天、周、月、年  1.数据统计只统计快递类的,其他分类不需要统计展示,例如取件码记录  2.包括周、月、年的统计环状图,只需要统计快递分类的

---
 app/src/main/java/com/example/firstapp/activity/VipActivity.kt |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/example/firstapp/activity/VipActivity.kt b/app/src/main/java/com/example/firstapp/activity/VipActivity.kt
index 9cf1f11..34a255c 100644
--- a/app/src/main/java/com/example/firstapp/activity/VipActivity.kt
+++ b/app/src/main/java/com/example/firstapp/activity/VipActivity.kt
@@ -252,8 +252,9 @@
                         Toast.makeText(this@VipActivity, "请勾选协议", Toast.LENGTH_LONG).show()
                         return@launch // 直接 return,不往下执行
                     }
-                    Toast.makeText(this@VipActivity, "功能暂未开放", Toast.LENGTH_LONG).show()
-                    return@launch
+//                    Toast.makeText(this@VipActivity, "功能暂未开放", Toast.LENGTH_LONG).show()
+//                    return@launch
+                    doWechatPay()
 
 
                 } catch (e: Exception) {
@@ -266,6 +267,23 @@
 
     }
 
+    private fun doWechatPay() {
+        val map=HashMap<String,String>()
+        map["appId"]="wxb4ba3c02aa476ea1"
+        map["partnerid"]="1900006771"
+        map["package"]="Sign=WXPay"
+        map["noncestr"]="2ac6c60ebfe7e549fbbc922ac54269bb"
+        map["timeStamp"]="1606317975"
+        map["prepayid"]="wx25232614962974fb29d1227819cc3e000g"
+        map["sign"]="wx25232614962974fb29d1227819cc3e000g"
+        PayAbility.wxPay(this, map, Observer { success ->
+            if (success == 0) {
+                Toast.makeText(this@VipActivity, "支付失败", Toast.LENGTH_LONG).show()
+            } else {
+                Toast.makeText(this@VipActivity, "支付成功", Toast.LENGTH_LONG).show()
+            }
+        })
+    }
 
     private fun vipCardInit() {
         val recyclerView = findViewById<RecyclerView>(R.id.recycler_view)

--
Gitblit v1.9.3