From ebc04d7d5216509a302076ba2fc0577e5d20bc12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E7=BE=A4?= <9079645+huang-zequn@user.noreply.gitee.com> Date: Fri, 19 Sep 2025 17:19:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=AE=9D=E4=B8=80=E9=94=AE=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .hbuilderx/launch.json | 9 + api/auth.js | 16 +- common.scss | 4 +- manifest.json | 25 +- pages.json | 15 + pages/login_package/bind-phone/bind-phone.vue | 247 ++++++ pages/login_package/login/login.vue | 707 ++++++++++++------ static/login/WXICON.png | Bin 0 -> 7445 bytes static/login/ZFB.png | Bin 0 -> 6401 bytes utils/enumUtils.js | 1 + utils/request.js | 7 +- 11 files changed, 779 insertions(+), 252 deletions(-) create mode 100644 .hbuilderx/launch.json create mode 100644 pages/login_package/bind-phone/bind-phone.vue create mode 100644 static/login/WXICON.png create mode 100644 static/login/ZFB.png diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json new file mode 100644 index 0000000..8ae452a --- /dev/null +++ b/.hbuilderx/launch.json @@ -0,0 +1,9 @@ +{ + "version" : "1.0", + "configurations" : [ + { + "playground" : "standard", + "type" : "uni-app:app-android" + } + ] +} diff --git a/api/auth.js b/api/auth.js index d4374aa..dc5fef4 100644 --- a/api/auth.js +++ b/api/auth.js @@ -146,5 +146,19 @@ export function bindInvitationCode(params) { data: params, }); } +// 微信一键登录 +export function wechatLogin(params) { + return request({ + url: `/auth/loginByWechat?wechatCode=${params.wechatCode}&isValid=${params.isValid}`, + method: "post" + }); +} - +// 支付宝一键登录 +export function alipayLogin(params) { + return request({ + url: "/auth/loginByAlipay", + method: "post", + data: params, + }); +} diff --git a/common.scss b/common.scss index 8cd6fae..bb39f80 100644 --- a/common.scss +++ b/common.scss @@ -299,8 +299,8 @@ font-size: 26rpx; color: #999999; position: fixed; - bottom: 0; - height: 210rpx; + bottom: 24rpx; + // height: 210rpx; width: calc(100% - 80rpx); .policy_a_warp{ color: $app-policy-color; diff --git a/manifest.json b/manifest.json index 788a6ac..b468157 100644 --- a/manifest.json +++ b/manifest.json @@ -23,7 +23,8 @@ /* 模块配置 */ "modules" : { "Payment" : {}, - "Camera" : {} + "Camera" : {}, + "OAuth" : {} }, /* 应用发布信息 */ "distribute" : { @@ -76,6 +77,12 @@ "appid" : "wx7a5902cd556d9396", "UniversalLinks" : "https://app.tbmall.xin/uni-universallinks/__UNI__4910728/" } + }, + "oauth" : { + "weixin" : { + "appid" : "wx7a5902cd556d9396", + "UniversalLinks" : "https://app.tbmall.xin/uni-universallinks/__UNI__4910728/" + } } }, "icons" : { @@ -117,6 +124,22 @@ /*忽略版本提示*/ "compatible" : { "ignoreVersion" : true + }, + "nativePlugins" : { + "Hyy-Alipay" : { + "__plugin_info__" : { + "name" : "【免费开源】支付宝,授权,授权登录", + "description" : "用过支付宝原生sdk,原生授权登录,更安全,有问题请联系作者", + "platforms" : "Android", + "url" : "https://ext.dcloud.net.cn/plugin?id=11931", + "android_package_name" : "", + "ios_bundle_id" : "", + "isCloud" : true, + "bought" : 1, + "pid" : "11931", + "parameters" : {} + } + } } }, /* 快应用特有相关 */ diff --git a/pages.json b/pages.json index dbd2c58..6e27754 100644 --- a/pages.json +++ b/pages.json @@ -416,6 +416,11 @@ "style": { "navigationStyle": "custom" } + },{ + "path": "bind-phone/bind-phone", + "style": { + "navigationStyle": "custom" + } }, { "path": "register/register", "style": { @@ -544,5 +549,15 @@ "bottom": "env(safe-area-inset-bottom)" } } + }, + "condition" : { //模式配置,仅开发期间生效 + "current": 0, //当前激活的模式(list 的索引项) + "list": [ + { + "name": "", //模式名称 + "path": "", //启动页面,必选 + "query": "" //启动参数,在页面的onLoad函数里面得到 + } + ] } } \ No newline at end of file diff --git a/pages/login_package/bind-phone/bind-phone.vue b/pages/login_package/bind-phone/bind-phone.vue new file mode 100644 index 0000000..84774f6 --- /dev/null +++ b/pages/login_package/bind-phone/bind-phone.vue @@ -0,0 +1,247 @@ + + + + + diff --git a/pages/login_package/login/login.vue b/pages/login_package/login/login.vue index a7ac7d9..72a594e 100644 --- a/pages/login_package/login/login.vue +++ b/pages/login_package/login/login.vue @@ -1,279 +1,496 @@ diff --git a/static/login/WXICON.png b/static/login/WXICON.png new file mode 100644 index 0000000000000000000000000000000000000000..6ccb3916955d9884f6278fdd0f36e7b79228afff GIT binary patch literal 7445 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 P00000NkvXXu0mjf0YOlk literal 0 HcmV?d00001 diff --git a/utils/enumUtils.js b/utils/enumUtils.js index 6f6304c..debfe8f 100644 --- a/utils/enumUtils.js +++ b/utils/enumUtils.js @@ -23,6 +23,7 @@ export const SMS_TYPE = { "PASSWD": "passwd", "LOGIN": "login", "REGISTER": "register", + "WECHAT": "wechatValid" } // 图片类型 图片分类:COMMON-公共,CATEGORY-商品类目图标,BRAND-品牌LOGO,SHOP-店铺LOGO,GOODS-商品图片,SPECS-商品规格图片 diff --git a/utils/request.js b/utils/request.js index 4efd934..e818328 100644 --- a/utils/request.js +++ b/utils/request.js @@ -48,7 +48,7 @@ function request(options) { success: (res) => { if (isShowLoading) { // 请求之前做一些事 - uni.hideToast(); + uni.hideToast(); } let data = res.data; @@ -64,7 +64,8 @@ function request(options) { }); return; } - if (data.bizcode === 100) { + // 601 微信登录没注册 + if (data.bizcode === 100 || data.bizcode === 601) { resolve(data); // 成功时返回数据 } else if (data.bizcode === 201) { if ([201, 200].includes(data.errcode)) { @@ -107,7 +108,7 @@ function request(options) { fail: (error) => { if (isShowLoading) { // 请求之前做一些事 - uni.hideToast(); + uni.hideToast(); } uni.showToast({ title: "服务器异常,稍后再试",