Merge refs/remotes/origin/master into refs/heads/master

闫增涛

2024-03-20 1daa00227f03bc3a370dc1311b7166df17368929

 pages/testLogin/index.js

@@ -40,6 +40,9 @@
          icon: "error",
          duration: 2000
        })
        this.setData({
          loading: false
        })
      }
    });
  },
@@ -74,7 +77,7 @@
        } else if (secretData) {
          defaultUser = {
            nickName: secretData.credential,
            avatarUrl: "../../static/images/index/tab.png",
            avatarUrl: "",
            userId: res.userId
          }
        }