feat: 微信支付宝登录对接

.hbuilderx/launch.json

@@ -2,7 +2,7 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "playground" : "standard",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
         }
     ]

api/auth.js

@@ -149,16 +149,19 @@ export function bindInvitationCode(params) {
 // 微信一键登录
 export function wechatLogin(params) {
 	return request({
-		url: `/auth/loginByWechat?wechatCode=${params.wechatCode}&isValid=${params.isValid}`,
+		url: `/auth/loginByWechat`,
-		method: "post"
+		method: "post",
+		data: params,
+		cha:1
 	});
 }
 
 // 支付宝一键登录
 export function alipayLogin(params) {
 	return request({
-		url: "/auth/loginByAlipay",
+		url: "/auth/loginByAlipayNew",
 		method: "post",
 		data: params,
+		cha:1
 	});
 }

manifest.json

@@ -82,7 +82,8 @@
                     "weixin" : {
                         "appid" : "wx7a5902cd556d9396",
                         "UniversalLinks" : "https://app.tbmall.xin/uni-universallinks/__UNI__4910728/"
-                    }
+                    },
+                    "apple" : {}
                 }
             },
             "icons" : {

pages/login_package/bind-phone/bind-phone.vue

@@ -62,7 +62,7 @@
 <script>
 import { SMS_TYPE } from "@/utils/enumUtils.js";
 import { getUserList } from "@/api/common.js";
-import { wechatLogin } from "@/api/auth.js";
+import { wechatLogin,alipayLogin } from "@/api/auth.js";
 import {
   setStorageFun,
   TOKEN_NAME,
@@ -77,7 +77,7 @@ export default {
       form: {
         mobile: null,
         smsCode: null, // 验证码
-        wechatCode: null,
+        token: null,
       },
       inputCss: {
         height: "80rpx",
@@ -89,17 +89,14 @@ export default {
       countdown: false, // 清空倒计时
       butLoading: false,
       disabled: false,
+      type: 1, //1.微信 2.支付宝
     };
   },
-  onLoad() {
-    const pages = getCurrentPages();
-    const currentPage = pages[pages.length - 1];
-    const id = currentPage.options?.key;
-    if (id) {
-      this.disabled = true;
-    }
 
-    this.form.wechatCode = id;
+  onLoad(option) {
+    this.form.token = option.token;
+    this.type = option.type;
+    console.log("-----1", option, this.form.token, this.type );
   },
   methods: {
     jumpMine() {
@@ -130,13 +127,12 @@ export default {
         mobile: form.mobile,
         smsCode: form.smsCode,
         isValid: true,
-		wechatCode: form.id,
+        token: form.token,
       };
-
+      const response = this.type == 1 ? await wechatLogin(params) : await alipayLogin(params);
-      const response = await wechatLogin(params);
+      console.log("微信登录接口返回:", params, response);
-      console.log("微信登录接口返回:", response);
+      if (response && response.bizcode === 100) {
-      if (resp && resp.bizcode === 100) {
+        const data = response.data;
-        const data = resp.data;
         setStorageFun(TOKEN_NAME, data.token);
         // 用于无感登录
         setStorageFun(USER_KEY, "");
@@ -153,7 +149,7 @@ export default {
         setStorageFun(USER_LOGIN_TIME, currentTimeStamp);
         this.$refs.uToastRef.show({
           type: "success",
-          message: resp.msg,
+          message: response.msg,
         });
         setTimeout(() => {
           uni.switchTab({
@@ -180,7 +176,7 @@ export default {
 
       const params = {
         mobile: form.mobile,
-        type: SMS_TYPE.WECHAT,
+        type:this.type == 1 ? SMS_TYPE.WECHAT : SMS_TYPE.ALIPAY,
       };
       const response = await getUserList(params);
       if (response && response.bizcode === 100) {
@@ -200,7 +196,7 @@ export default {
 .header_ {
   display: flex;
   align-items: center;
-  padding: 0 30rpx;
+  padding: calc(24rpx + env(safe-area-inset-bottom)) 30rpx 0 30rpx;
   .title_ {
     font-weight: bold;
     font-size: 36rpx;

pages/login_package/login/login.vue

@@ -2,13 +2,7 @@
 	<view class="login_warp">
 		<view class="login_logo_warp">
 			<view style="text-align: center">
-        <up-image
+				<up-image src="/static/logo.png" width="90" height="118" bgColor="#f1f6ff00" radius="10"></up-image>
-          src="/static/logo.png"
-          width="90"
-          height="118"
-          bgColor="#f1f6ff00"
-          radius="10"
-        ></up-image>
 			</view>
 			<!-- <view style="margin-top: 20rpx;">
 				  <up-image src="/static/logo_z.png" width="100" height="40" bgColor="#f1f6ff00"></up-image>
@@ -16,59 +10,27 @@
 		</view>
 		<view class="login_info">
 			<view class="login_info_item">
-        <up-input
+				<up-input placeholder="请输入手机号/账户名称" border="surround" v-model="form.name" :customStyle="inputCss"
-          placeholder="请输入手机号/账户名称"
+					@change="checkNameParam"></up-input>
-          border="surround"
-          v-model="form.name"
-          :customStyle="inputCss"
-          @change="checkNameParam"
-        ></up-input>
 			</view>
 			<!-- 密码登录 -->
 			<view class="login_info_item" v-if="loginWay === 'password'">
-        <up-input
+				<up-input placeholder="请输入密码" border="surround" v-model="form.password" :customStyle="inputCss"
-          placeholder="请输入密码"
+					:type="isShow ? 'text' : 'password'" @change="checkParam">
-          border="surround"
-          v-model="form.password"
-          :customStyle="inputCss"
-          :type="isShow ? 'text' : 'password'"
-          @change="checkParam"
-        >
 					<template #suffix style="margin-right: 10rpx">
-            <up-image
+						<up-image v-if="isShow" src="/static/login/show.png" width="20" height="20" bgColor="#f1f6ff00"
-              v-if="isShow"
+							@click="isShow = false"></up-image>
-              src="/static/login/show.png"
+						<up-image v-else src="/static/login/hidden.png" width="20" height="20" bgColor="#f1f6ff00"
-              width="20"
+							@click="isShow = true"></up-image>
-              height="20"
-              bgColor="#f1f6ff00"
-              @click="isShow = false"
-            ></up-image>
-            <up-image
-              v-else
-              src="/static/login/hidden.png"
-              width="20"
-              height="20"
-              bgColor="#f1f6ff00"
-              @click="isShow = true"
-            ></up-image>
 					</template>
 				</up-input>
 			</view>
 			<!-- 验证码登录 -->
 			<view class="login_info_item" v-else>
-        <up-input
+				<up-input placeholder="请输入验证码" border="surround" v-model="form.code" :customStyle="inputCss">
-          placeholder="请输入验证码"
-          border="surround"
-          v-model="form.code"
-          :customStyle="inputCss"
-        >
 					<template #suffix style="margin-right: 10rpx">
 						<view v-if="countdown" class="code-warp">
-              <up-count-down
+							<up-count-down :time="60 * 1000" format="ss" @finish="countdown = false"></up-count-down>
-                :time="60 * 1000"
-                format="ss"
-                @finish="countdown = false"
-              ></up-count-down>
 							<text style="margin-left: 10rpx">s</text>
 						</view>
 						<view v-else @click="getMobileCode" class="code_msg">
@@ -82,62 +44,35 @@
 				<text style="margin-left: 10rpx">登录</text>
 			</view>
 			<view class="cut_way_warp">
-        <view v-if="loginWay === 'password'" @click="loginWay = 'code'"
+				<view v-if="loginWay === 'password'" @click="loginWay = 'code'">验证码登录</view>
-          >验证码登录</view
+				<view v-if="loginWay === 'code'" @click="loginWay = 'password'">密码登录登录</view>
-        >
-        <view v-if="loginWay === 'code'" @click="loginWay = 'password'"
-          >密码登录登录</view
-        >
 				<view @click="jumpForgot">忘记密码</view>
 				<view @click="jumpRegister">注册</view>
 			</view>
 		</view>
-    <view>
+		<view v-if="!isIOS">
 			<view class="other_login">其他登录方式</view>
 			<view class="login_other_icon">
 				<view class="login_other_item" @click="wechatOneLogin">
-          <up-image
+					<up-image src="/static/login/WXICON.png" width="44" height="44" bgColor="#f1f6ff00"></up-image>
-            src="/static/login/WXICON.png"
-            width="44"
-            height="44"
-            bgColor="#f1f6ff00"
-          ></up-image>
 					微信登录
 				</view>
-        <!-- <view class="login_other_item" @click="alipayOneLogin">
+				<view class="login_other_item" @click="alipayOneLogin">
-          <up-image
+					<up-image src="/static/login/ZFB.png" width="44" height="44" bgColor="#f1f6ff00"></up-image>
-            src="/static/login/ZFB.png"
-            width="44"
-            height="44"
-            bgColor="#f1f6ff00"
-          ></up-image>
 					支付宝登录
-        </view> -->
+				</view>
 			</view>
 		</view>
 		<view class="policy_warp">
-      <up-checkbox
+			<up-checkbox name="isCheck" usedAlone v-model:checked="isPolicy" shape="circle" activeColor="#7934F6"
-        name="isCheck"
+				size="19" iconSize="18">
-        usedAlone
-        v-model:checked="isPolicy"
-        shape="circle"
-        activeColor="#7934F6"
-        size="19"
-        iconSize="18"
-      >
 				<template #label>
 					<text>已阅读并同意</text>
-          <text class="policy_a_warp" @click="jumpUserAgreement"
+					<text class="policy_a_warp" @click="jumpUserAgreement">《服务协议》</text>
-            >《服务协议》</text
-          >
 					<text>、</text>
-          <text class="policy_a_warp" @click="jumpPrivacyAgreement"
+					<text class="policy_a_warp" @click="jumpPrivacyAgreement">《隐私政策》</text>
-            >《隐私政策》</text
-          >
 					<text>、</text>
-          <text class="policy_a_warp" @click="jumpProductAgreement"
+					<text class="policy_a_warp" @click="jumpProductAgreement">《售后保障协议》</text>
-            >《售后保障协议》</text
-          >
 				</template>
 			</up-checkbox>
 		</view>
@@ -147,9 +82,18 @@
 
 <script>
 	import InputCodeComm from "@/components/code-comm/code-comm.vue";
-import { SMS_TYPE } from "@/utils/enumUtils.js";
+	import {
-import { getUserList } from "@/api/common.js";
+		SMS_TYPE
-import { loginbysms, loginbypw, wechatLogin, alipayLogin } from "@/api/auth.js";
+	} from "@/utils/enumUtils.js";
+	import {
+		getUserList
+	} from "@/api/common.js";
+	import {
+		loginbysms,
+		loginbypw,
+		wechatLogin,
+		alipayLogin
+	} from "@/api/auth.js";
 	import {
 		setStorageFun,
 		TOKEN_NAME,
@@ -331,27 +275,33 @@ export default {
 					// 1. 调用微信登录API
 					uni.login({
 						provider: "weixin",
-          // onlyAuthorize: true,
+						onlyAuthorize: true,
 						success: async (loginRes) => {
 							console.log("微信登录成功:", loginRes);
 
 							// 2. 发送code到后端换取token
 							const params = {
 								isValid: false,
-              wechatCode: loginRes.code,
+								token: loginRes.code,
 								// 可以根据需要添加其他参数
 							};
+							console.log("微信登录接口返回-1:", params);
 
 							const response = await wechatLogin(params);
-            console.log("微信登录接口返回:", response);
+							console.log("微信登录接口返回-2:", response, response.data, response.data.token);
 
 							if (response && response.bizcode === 100) {
+								if (response.data.userId !== null) {
+									// 登录
 									this.loginWay = "wechat";
 									this.loginFun(response);
-            } else if (response.bizcode === 601) {
+								} else {
+									// 去微信注册
 									uni.navigateTo({
-                url: `/pages/login_package/bind-phone/bind-phone?id=${loginRes.code}`,
+										url: `/pages/login_package/bind-phone/bind-phone?token=${response.data.token}&type=1`,
 									});
+								}
+
 							} else {
 								this.$refs.uToastRef.show({
 									type: "error",
@@ -394,21 +344,29 @@ export default {
 					return;
 				}
 
-      hyyAlipay.openAuthScheme(
+				hyyAlipay.openAuthScheme({
-        {
 						appId: "2021005183625053", // 支付宝分配给开发者的应用 ID
 						scheme: "trustbridgeapp", // manifest.json -> "App常用其他设置" -> "UrlSchemes"里设置
 					},
 					(res) => {
 						console.log("支付宝回调", res);
-
 						alipayLogin({
-            certifyId: res.auth_code,
+							isValid: false,
+							token: res.auth_code,
 						}).then((response) => {
-            console.log("支付宝登录接口返回:", response);
+							console.log("支付宝登录接口返回:", response,response.data.userId !== null);
 							if (response && response.bizcode === 100) {
+								if (response.data.userId !== null) {
+									// 登录
 									this.loginWay = "alipay";
 									this.loginFun(response);
+								} else {
+									// 去微信注册
+									uni.navigateTo({
+										url: `/pages/login_package/bind-phone/bind-phone?token=${response.data.token}&type=2`,
+									});
+								}
+
 							} else {
 								this.$refs.uToastRef.show({
 									type: "error",
@@ -420,6 +378,14 @@ export default {
 				);
 			},
 		},
+		computed: {
+			isIOS() {
+				// #ifdef APP-PLUS
+				return uni.getSystemInfoSync().platform === "ios";
+				// #endif
+				return false;
+			},
+		}
 	};
 </script>
 
@@ -473,6 +439,7 @@ export default {
 		color: #999999;
 		margin-top: 20rpx;
 	}
+
 	.other_login {
 		font-size: 28rpx;
 		text-align: center;
@@ -480,10 +447,12 @@ export default {
 		margin-bottom: 32rpx;
 		color: #999999;
 	}
+
 	.login_other_icon {
 		display: flex;
 		padding: 0 100rpx;
 		justify-content: center;
+
 		.login_other_item {
 			display: flex;
 			flex: 50%;

utils/enumUtils.js

@@ -23,7 +23,8 @@ export const SMS_TYPE = {
 	"PASSWD": "passwd",
 	"LOGIN": "login",
 	"REGISTER": "register",
-	"WECHAT": "wechatValid"
+	"WECHAT": "wechatValid",
+	"ALIPAY": "alipayValid"
 }
 
 // 图片类型 图片分类：COMMON-公共,CATEGORY-商品类目图标,BRAND-品牌LOGO,SHOP-店铺LOGO,GOODS-商品图片,SPECS-商品规格图片

utils/request.js

@@ -46,6 +46,7 @@ function request(options) {
         ...headers, // 使用展开运算符合并默认头和自定义头
       },
       success: (res) => {
+		  console.log('--success-',res)
         if (isShowLoading) {
           // 请求之前做一些事
           uni.hideToast();
@@ -65,7 +66,7 @@ function request(options) {
           return;
         }
         // 601 微信登录没注册
-        if (data.bizcode === 100 || data.bizcode === 601) {
+        if (data.bizcode === 100 ) {
           resolve(data); // 成功时返回数据
         } else if (data.bizcode === 201) {
           if ([201, 200].includes(data.errcode)) {