diff --git a/miniapp/pages/login/login.vue b/miniapp/pages/login/login.vue index 0fe6a77..5815039 100644 --- a/miniapp/pages/login/login.vue +++ b/miniapp/pages/login/login.vue @@ -33,6 +33,12 @@ + 登录即表示同意 《用户协议》 @@ -50,6 +56,7 @@ const userStore = useUserStore() const loading = ref(false) const tipText = ref('使用微信账号快速登录') const statusBarHeight = ref(0) +const agreed = ref(false) // 获取状态栏高度 const sysInfo = uni.getSystemInfoSync() @@ -67,6 +74,10 @@ function goBack() { /** 微信一键登录 */ async function onWxLogin() { + if (!agreed.value) { + uni.showToast({ title: '请先同意用户协议和隐私政策', icon: 'none' }) + return + } loading.value = true tipText.value = '登录中...' try { @@ -227,6 +238,12 @@ function goPrivacy() { align-items: center; } +.check-icon { + width: 32rpx; + height: 32rpx; + margin-right: 8rpx; +} + .footer-text { font-size: 22rpx; color: #ccc; diff --git a/miniapp/static/ic_check.png b/miniapp/static/ic_check.png new file mode 100644 index 0000000..9935ac5 Binary files /dev/null and b/miniapp/static/ic_check.png differ diff --git a/miniapp/static/ic_check_s.png b/miniapp/static/ic_check_s.png new file mode 100644 index 0000000..3657637 Binary files /dev/null and b/miniapp/static/ic_check_s.png differ diff --git a/server/appsettings.json b/server/appsettings.json index c186f79..23786d1 100644 --- a/server/appsettings.json +++ b/server/appsettings.json @@ -21,10 +21,10 @@ "WeChat": { "AppId": "wxd62aec23fcb79bc6", "AppSecret": "2b3b9d15fee1ed3e6204d67c86facfaf", - "MchId": "1742482400", - "MchApiV3Key": "1djcnfLHDJi3944HDLJK3015698fD1Oy", - "MchSerialNo": "6D9B2C7B3B12CD03D76090EB946F1B6F2FA8051C", - "MchPrivateKeyPem": "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQD3NZeEFc7UGujMK54+Z2xj0oJT/ykvIILqpCQ5M3DI4whuVu4C9LJwLWiRi5NTid8irx0p6kxgPw958e/szLnjmKJsURJWKWlz7VRcj4H1a888Xdam0kVFmWmdYjrIISl/NZfiKEys80KVGrBN/pIu3UZIQ9rvFaAiRK5ARTA5KINrXGnjQKMF7jgWZoVmc+nJhvh68Wo8H3ys8SzOMaTSinjlmcdCIgUzDJJp7tVIj6uCWR2JSouJyVE0nZRa5GHLujlj8sX2zLvpRm8txu3ksgFbVF/hPxAcRQ0qHjyowzKsHmJDUU9/Ms4yeLqzaM9cDuEYTPcWkmkDdD2DeDi1AgMBAAECggEBAMgv1t24hz/N9rz3iXLBb826N53roB8wtbNrboX/uRKEf1xS+vTb0O/0ZZyPKaPZnx9ILVa3DFhYWKEIoaDh/JppDQan9DBf4qxlAQ7fi38BadVZrCx1VHFTFWrElBNif2crMC6NMeJQL5fs/955C0n2GCcHA/DeU0nM0krrfGybYal93ufr2OranRSoDAYWxNks/VG7RzBJdj5kxe8pdLFDU7l1d52V5C4whBEjZMpp5JoEBsYTEbQ/pcU5i4LhE1OPVNRRHteMNgCSVICZr5xmtSNRy0XkAUTm+5Z3P+iP8IWIdkcrrlKFaZOjQTn21xCWhYeSmTWMkTQ8PfgrlsECgYEA//tkpck73ZcQQQBf7OOj1lFGFKN0KdiONYMrsXLQ5yud3jfWAUQ0PEqEa+4HadwK/S+lq0g3IXRQ1SuLyZSTYOAPVohIv9bVxh7oAoBZbMluLEE9E38AtcTMS3FiigMac+X8z3bJWIA0IJSvWD5JTHxJ/VZeUShdEQAKwY3lAtECgYEA9zoKc4M8Jfx5ga4X15SffKk4S+t51PY5lbuT/507/o+8imjMiuaoIGGjRd0vylOrACS/QriAnqusyvxpF9nYSLWDYMJPloKfxf+BYvQB8tv088afHzw2Q0K2yFyZzfW/i+uBZc4UaPrRmtUgEU/NNWreOmfbr+j7BDiotTNQ6KUCgYABlfcbp9F9H/Bz1qLBfu+G5l3+xrxzfenznupoYQO2SujhdYsX2upP7U5AtOrK1xgiVWc7VmkxBd1yVKC7EPaQxRKTQKjit1v/rDVXvp/PMrhCAe1073Z7qcpyNTOdE0PYr/YO+vdoWvL3uLQVYd1mYea7cQuIiS16a3ulk1F14QKBgQCYWVoLaPnt5rHx6hijLuFBbv5UOp3vUHSYAunnATvxWR40pPQ3PICqw8Bb0zwaEIk2I28BbLVGEkD/LaCNpB8WX1TAkb194K0Y1KUlF30D7ev7NZDlLLO7qyb8PaRCOYh6bvxkgiQttTLpmSCTynuIyXx8vXex5X6aUVgVobPgSQKBgAnOA6G1UeJKjIARPNXEyOLu+8N3+bWVonhNQfMrTN9Aa5YCrkYkQPIzbHMzlPCL/uiK91yk+wvgAohvpQysQe54KkqZxK5ucjUGwqNRGMAkmlS+669wKEcx5tYzek00sQzQVBFWDJeH/xtJEbw30bTPuSDtBhMV3OgwiuJeuRm5" + "MchId": "1744231030", + "MchApiV3Key": "zvjisau124246IHMHUxclkeoiu124124", + "MchSerialNo": "6958B55699474D6E32B42DCDB2461792FA62C6F7", + "MchPrivateKeyPem": "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCtV5XRYZbeWoQ+2VR1EtMMKA81iyEOB4RqcWlr2y4hJobx4fGald+MhsycR8ajHOR2AK2uhOsAcEbdwKFDkyiPq4ttbLBB1tt/jMDl0e/myupLN8qoYu46QbQzQHlwCXFSBB3O7TU2jQjOWrV8v+3K3pSVXQHflJ+G+jICW/0F5z+ndiJxuwECtHp84pb86DrdS9t9xEvIeZggCZv7jMsf49tjVEWPtuDlHHma47g7NsZ7pxOJjnnDkONuNQU2BaPmWSU4r8AEzGjAmKUL31qJ8zKBCh7y8nq5vmCv2EZyzzmAOpRKTGfalGaRcP/AqPqa7QuSOZ3pFiUX66iemawrAgMBAAECggEAT3ROH+NznAgxhf1oUSGHy5KxJgHX7O5VK9VAVUfqJRfb0xOWAx2fknJXZ2sfCbU8ozo8Yjpa3aCZWxvoz2istu4Swt2HDSbHBfgmkzFfnZJ1QnUYV4bBW8KyLqvm/gvV/ZoVb7wbIB4VY0EA32W6Qbs0sCIpsaoWVXBpa9tuZz2OluJ8Me/uK4bOxGDgSJyhhtNYrsuAB+2WmSkzFZnO+qhVYnKaotvBpknTWlys1f1h+SeycCF1j9+XWobybzFwYwyNbNHMcBNfZeJ1rRkvhOgFBiwQ8/+EgFvg7vuSfouRoK/JnEg9uLdNcqe+fyIK6sxVOYE5abGx+j93Bq0nQQKBgQDkdg9oGGBO9l0BFot5VBwHOzQtDLLPjI2AkZW74zwifFP0f8x3Cso6vM409BhG9Ayxc8Ih1LWlmeDPQ0opqyefAfr3sS7187Hz5ZHAsTPTwRn75sbIfb78P2aEGccdIJAFa8H2fSbBXxHFt+UrpwWXhskwcBIni9RkOTmA8+lahQKBgQDCPKQgx48wnwN2TgEstqnkHFu5mrAj6tA4fvp8gBrlr7QI4oIJYGVZlCFTi91ynmkTrgZAYfrvscp4KddRKVfI2/Cu+7/XWFlANpI2gn6PL7rKWtmsOO4EyQPKOPf98YWgpc9RADHnpnyCFflPGUryEfb/AyW7rJZCkyUWo36i7wKBgDQ0xlCDQX7JzXbyL+0Jy13bqZCh1jqXY759hjnpM1SuFIFKsu6BCLVjb7uqC+Iq4ruqODKC6P9uqnCyb8AV3Hf5e+AeHR0XExMo4qWl2LIK7mUh10r5cSszUbneKiH9zutuNGSfNLv7fZQw8a2H/T8jDdaDxaJD0cUVTo6pLioBAoGAIlaaJXliJRRXhliv+HmqeztQM/XW4eKnQPWhztTO7IAtccypdILoJ/f6FE0LrzG2HdaMIGGx/SIPS0MKX7zRWh8X47d56NYjoSiEnMJhIWssuI1rIflGiu4Gj3+Wx/wkxYvKpOVF7VAPfufnlUZBa54lblveFdmjDs34ppHs110CgYBCi+ReBMnMraMU9EACJLIKwUxA+OL/r9RSG606aVwXyXFruufnfxiYV6qqLH3b0DvG4lJaJnMTE4wrHy1QdIb3HpCtDO1pLsITom7p6KMqSzK4KTW7uZEmft1Vd3n8qzBMlUVrTk1G0REAQjEy5zGZHwAR5bLWSRPyTL0x/RNY5Q==" }, "Upload": { "MaxFileSizeBytes": 5242880,