Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # pages/personCenter/mine/mine.js
2025-06-03 09:10:45 +08:00 · 2025-06-03 09:10:45 +08:00 · 1fbbd52cb7
commit 1fbbd52cb7
parent 50b454adcf b9f5543d78
1 changed files with 4 additions and 2 deletions
--- a/pages/personCenter/mine/mine.js
+++ b/pages/personCenter/mine/mine.js
@ -7,13 +7,15 @@ Page({
   * 页面的初始数据
   */
  data: {
-    items: [null, null],
-    yt: "",
+    items: [null],
+    cxz1: "",
+    hello: "",
    nickName: "",
    userAvatar: "",
    phoneNumber: "",
    userAccount: "",
    invitationCode: "",
+    test: "",
    currentBalance: "", // 当前余额
    withdrawalAmount: "",   // 提现中的余额
    withdrawnAmount: "",    // 已提现的余额