diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 8ae452a..1b8d0f6 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -2,7 +2,7 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "playground" : "standard",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
         }
     ]
diff --git a/api/auth.js b/api/auth.js
index dc5fef4..bcf7f51 100644
--- a/api/auth.js
+++ b/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}`,
-		method: "post"
+		url: `/auth/loginByWechat`,
+		method: "post",
+		data: params,
+		cha:1
 	});
 }
 
 // 支付宝一键登录
 export function alipayLogin(params) {
 	return request({
-		url: "/auth/loginByAlipay",
+		url: "/auth/loginByAlipayNew",
 		method: "post",
 		data: params,
+		cha:1
 	});
 }
diff --git a/manifest.json b/manifest.json
index b468157..0d64746 100644
--- a/manifest.json
+++ b/manifest.json
@@ -82,7 +82,8 @@
                     "weixin" : {
                         "appid" : "wx7a5902cd556d9396",
                         "UniversalLinks" : "https://app.tbmall.xin/uni-universallinks/__UNI__4910728/"
-                    }
+                    },
+                    "apple" : {}
                 }
             },
             "icons" : {
diff --git a/pages/login_package/bind-phone/bind-phone.vue b/pages/login_package/bind-phone/bind-phone.vue
index 84774f6..19400c8 100644
--- a/pages/login_package/bind-phone/bind-phone.vue
+++ b/pages/login_package/bind-phone/bind-phone.vue
@@ -52,7 +52,7 @@
       @click="registerFun"
       :loading="butLoading"
     >
-    登录
+      登录
     </view>
 
     <up-toast ref="uToastRef"></up-toast>
@@ -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 = await wechatLogin(params);
-      console.log("微信登录接口返回:", response);
-      if (resp && resp.bizcode === 100) {
-        const data = resp.data;
+      const response = this.type == 1 ? await wechatLogin(params) : await alipayLogin(params);
+      console.log("微信登录接口返回:", params, response);
+      if (response && response.bizcode === 100) {
+        const data = response.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;
diff --git a/pages/login_package/login/login.vue b/pages/login_package/login/login.vue
index 72a594e..fcba2db 100644
--- a/pages/login_package/login/login.vue
+++ b/pages/login_package/login/login.vue
@@ -1,496 +1,465 @@
 <template>
-  <view class="login_warp">
-    <view class="login_logo_warp">
-      <view style="text-align: center">
-        <up-image
-          src="/static/logo.png"
-          width="90"
-          height="118"
-          bgColor="#f1f6ff00"
-          radius="10"
-        ></up-image>
-      </view>
-      <!-- <view style="margin-top: 20rpx;">
+	<view class="login_warp">
+		<view class="login_logo_warp">
+			<view style="text-align: center">
+				<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>
 			  </view> -->
-    </view>
-    <view class="login_info">
-      <view class="login_info_item">
-        <up-input
-          placeholder="请输入手机号/账户名称"
-          border="surround"
-          v-model="form.name"
-          :customStyle="inputCss"
-          @change="checkNameParam"
-        ></up-input>
-      </view>
-      <!-- 密码登录 -->
-      <view class="login_info_item" v-if="loginWay === 'password'">
-        <up-input
-          placeholder="请输入密码"
-          border="surround"
-          v-model="form.password"
-          :customStyle="inputCss"
-          :type="isShow ? 'text' : 'password'"
-          @change="checkParam"
-        >
-          <template #suffix style="margin-right: 10rpx">
-            <up-image
-              v-if="isShow"
-              src="/static/login/show.png"
-              width="20"
-              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
-          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
-                :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">
-              获取验证码
-            </view>
-          </template>
-        </up-input>
-      </view>
+		</view>
+		<view class="login_info">
+			<view class="login_info_item">
+				<up-input placeholder="请输入手机号/账户名称" border="surround" v-model="form.name" :customStyle="inputCss"
+					@change="checkNameParam"></up-input>
+			</view>
+			<!-- 密码登录 -->
+			<view class="login_info_item" v-if="loginWay === 'password'">
+				<up-input placeholder="请输入密码" border="surround" v-model="form.password" :customStyle="inputCss"
+					:type="isShow ? 'text' : 'password'" @change="checkParam">
+					<template #suffix style="margin-right: 10rpx">
+						<up-image v-if="isShow" src="/static/login/show.png" width="20" 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 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 :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">
+							获取验证码
+						</view>
+					</template>
+				</up-input>
+			</view>
 
-      <view class="login_comm_but login_comm_but_yes" @click="loginFun">
-        <text style="margin-left: 10rpx">登录</text>
-      </view>
-      <view class="cut_way_warp">
-        <view v-if="loginWay === 'password'" @click="loginWay = 'code'"
-          >验证码登录</view
-        >
-        <view v-if="loginWay === 'code'" @click="loginWay = 'password'"
-          >密码登录登录</view
-        >
-        <view @click="jumpForgot">忘记密码</view>
-        <view @click="jumpRegister">注册</view>
-      </view>
-    </view>
-    <view>
-      <view class="other_login">其他登录方式</view>
-      <view class="login_other_icon">
-        <view class="login_other_item" @click="wechatOneLogin">
-          <up-image
-            src="/static/login/WXICON.png"
-            width="44"
-            height="44"
-            bgColor="#f1f6ff00"
-          ></up-image>
-          微信登录
-        </view>
-        <!-- <view class="login_other_item" @click="alipayOneLogin">
-          <up-image
-            src="/static/login/ZFB.png"
-            width="44"
-            height="44"
-            bgColor="#f1f6ff00"
-          ></up-image>
-          支付宝登录
-        </view> -->
-      </view>
-    </view>
-    <view class="policy_warp">
-      <up-checkbox
-        name="isCheck"
-        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
-          >
-          <text>、</text>
-          <text class="policy_a_warp" @click="jumpPrivacyAgreement"
-            >《隐私政策》</text
-          >
-          <text>、</text>
-          <text class="policy_a_warp" @click="jumpProductAgreement"
-            >《售后保障协议》</text
-          >
-        </template>
-      </up-checkbox>
-    </view>
-    <up-toast ref="uToastRef"></up-toast>
-  </view>
+			<view class="login_comm_but login_comm_but_yes" @click="loginFun">
+				<text style="margin-left: 10rpx">登录</text>
+			</view>
+			<view class="cut_way_warp">
+				<view v-if="loginWay === 'password'" @click="loginWay = 'code'">验证码登录</view>
+				<view v-if="loginWay === 'code'" @click="loginWay = 'password'">密码登录登录</view>
+				<view @click="jumpForgot">忘记密码</view>
+				<view @click="jumpRegister">注册</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 src="/static/login/WXICON.png" width="44" height="44" bgColor="#f1f6ff00"></up-image>
+					微信登录
+				</view>
+				<view class="login_other_item" @click="alipayOneLogin">
+					<up-image src="/static/login/ZFB.png" width="44" height="44" bgColor="#f1f6ff00"></up-image>
+					支付宝登录
+				</view>
+			</view>
+		</view>
+		<view class="policy_warp">
+			<up-checkbox name="isCheck" 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>
+					<text>、</text>
+					<text class="policy_a_warp" @click="jumpPrivacyAgreement">《隐私政策》</text>
+					<text>、</text>
+					<text class="policy_a_warp" @click="jumpProductAgreement">《售后保障协议》</text>
+				</template>
+			</up-checkbox>
+		</view>
+		<up-toast ref="uToastRef"></up-toast>
+	</view>
 </template>
 
 <script>
-import InputCodeComm from "@/components/code-comm/code-comm.vue";
-import { SMS_TYPE } from "@/utils/enumUtils.js";
-import { getUserList } from "@/api/common.js";
-import { loginbysms, loginbypw, wechatLogin, alipayLogin } from "@/api/auth.js";
-import {
-  setStorageFun,
-  TOKEN_NAME,
-  USER_KEY,
-  USER_DATA,
-  USER_LOGIN_TIME,
-} from "@/utils/auth.js";
-import CryptoJS from "crypto-js";
+	import InputCodeComm from "@/components/code-comm/code-comm.vue";
+	import {
+		SMS_TYPE
+	} from "@/utils/enumUtils.js";
+	import {
+		getUserList
+	} from "@/api/common.js";
+	import {
+		loginbysms,
+		loginbypw,
+		wechatLogin,
+		alipayLogin
+	} from "@/api/auth.js";
+	import {
+		setStorageFun,
+		TOKEN_NAME,
+		USER_KEY,
+		USER_DATA,
+		USER_LOGIN_TIME,
+	} from "@/utils/auth.js";
+	import CryptoJS from "crypto-js";
 
-// #ifdef APP-PLUS
-const hyyAlipay = uni.requireNativePlugin("Hyy-Alipay");
-// #endif
+	// #ifdef APP-PLUS
+	const hyyAlipay = uni.requireNativePlugin("Hyy-Alipay");
+	// #endif
 
-export default {
-  components: {
-    InputCodeComm,
-  },
-  data() {
-    return {
-      form: {
-        name: null,
-        password: null,
-        code: null,
-      },
-      inputCss: {
-        height: "80rpx",
-        background: "#F3F3F3FF",
-        "border-radius": "30rpx",
-        border: "0rpx",
-        "padding-left": "16px",
-      },
-      loginWay: "password",
-      isShow: false, // 是否显示
-      isPolicy: false, // 是否同意
-      countdown: false, // 清空倒计时
-      loading: false,
-    };
-  },
-  methods: {
-    jumpHome() {
-      // const sysPlatform = getCurrentSysPlatform();
-      // if(sysPlatform === "android"){
-      // 	uni.switchTab({
-      // 	    url: '/pages/message/message',
-      // 	})
-      // }else{
-      uni.switchTab({
-        url: "/pages/home/home",
-      });
-      // }
-    },
-    async loginFun(val = {}) {
-      const then = this;
-      const form = this.form;
-      const params = {};
-      if (!this.isPolicy) {
-        this.$refs.uToastRef.show({
-          type: "error",
-          message: "请阅读完相关协议以及政策，并且勾选同意选项",
-        });
-        return;
-      }
-      let response = val;
-      if (this.loginWay === "password") {
-        params.mobile = form.name;
-        params.password = CryptoJS.MD5(form.password).toString();
-        response = await loginbypw(params);
-      }
-      if (this.loginWay === "code") {
-        params.mobile = form.name;
-        params.smsCode = form.code;
-        response = await loginbysms(params);
-      }
+	export default {
+		components: {
+			InputCodeComm,
+		},
+		data() {
+			return {
+				form: {
+					name: null,
+					password: null,
+					code: null,
+				},
+				inputCss: {
+					height: "80rpx",
+					background: "#F3F3F3FF",
+					"border-radius": "30rpx",
+					border: "0rpx",
+					"padding-left": "16px",
+				},
+				loginWay: "password",
+				isShow: false, // 是否显示
+				isPolicy: false, // 是否同意
+				countdown: false, // 清空倒计时
+				loading: false,
+			};
+		},
+		methods: {
+			jumpHome() {
+				// const sysPlatform = getCurrentSysPlatform();
+				// if(sysPlatform === "android"){
+				// 	uni.switchTab({
+				// 	    url: '/pages/message/message',
+				// 	})
+				// }else{
+				uni.switchTab({
+					url: "/pages/home/home",
+				});
+				// }
+			},
+			async loginFun(val = {}) {
+				const then = this;
+				const form = this.form;
+				const params = {};
+				if (!this.isPolicy) {
+					this.$refs.uToastRef.show({
+						type: "error",
+						message: "请阅读完相关协议以及政策，并且勾选同意选项",
+					});
+					return;
+				}
+				let response = val;
+				if (this.loginWay === "password") {
+					params.mobile = form.name;
+					params.password = CryptoJS.MD5(form.password).toString();
+					response = await loginbypw(params);
+				}
+				if (this.loginWay === "code") {
+					params.mobile = form.name;
+					params.smsCode = form.code;
+					response = await loginbysms(params);
+				}
 
-      const data = response.data;
-      setStorageFun(TOKEN_NAME, data.token);
-      // 用于无感登录
-      setStorageFun(USER_KEY, "");
-      const userInfo = {
-        avatar: data.avatarUrl,
-        name: data.name,
-        userId: data.userId,
-        grade: data.grade,
-        inviteCode: data.inviteCode,
-      };
-      setStorageFun(USER_DATA, userInfo);
-      // 当前登录得时间戳
-      let currentTimeStamp = new Date().getTime();
-      setStorageFun(USER_LOGIN_TIME, currentTimeStamp);
-      this.$refs.uToastRef.show({
-        type: "success",
-        message: response.msg,
-      });
+				const data = response.data;
+				setStorageFun(TOKEN_NAME, data.token);
+				// 用于无感登录
+				setStorageFun(USER_KEY, "");
+				const userInfo = {
+					avatar: data.avatarUrl,
+					name: data.name,
+					userId: data.userId,
+					grade: data.grade,
+					inviteCode: data.inviteCode,
+				};
+				setStorageFun(USER_DATA, userInfo);
+				// 当前登录得时间戳
+				let currentTimeStamp = new Date().getTime();
+				setStorageFun(USER_LOGIN_TIME, currentTimeStamp);
+				this.$refs.uToastRef.show({
+					type: "success",
+					message: response.msg,
+				});
 
-      setTimeout(() => {
-        then.jumpHome();
-      }, 2000);
-    },
-    checkNameParam(val) {
-      // console.log("val",val);
-    },
-    checkParam(val) {
-      // console.log("val",val);
-    },
-    /**
-     * 获取手机验证码
-     */
-    async getMobileCode() {
-      const form = this.form;
-      if (!form.name) {
-        this.$refs.uToastRef.show({
-          type: "error",
-          message: "请输入账号",
-        });
-        return;
-      }
-      this.countdown = true;
+				setTimeout(() => {
+					then.jumpHome();
+				}, 2000);
+			},
+			checkNameParam(val) {
+				// console.log("val",val);
+			},
+			checkParam(val) {
+				// console.log("val",val);
+			},
+			/**
+			 * 获取手机验证码
+			 */
+			async getMobileCode() {
+				const form = this.form;
+				if (!form.name) {
+					this.$refs.uToastRef.show({
+						type: "error",
+						message: "请输入账号",
+					});
+					return;
+				}
+				this.countdown = true;
 
-      const params = {
-        mobile: form.name,
-        type: SMS_TYPE.LOGIN,
-      };
-      const response = await getUserList(params);
-      console.log("responseresponseresponse", response);
-      if (response && response.bizcode === 100) {
-        this.$refs.uToastRef.show({
-          type: "success",
-          message: response.msg,
-        });
-      } else {
-        this.countdown = false;
-      }
-    },
-    jumpForgot() {
-      uni.navigateTo({
-        url: "/pages/rwa_package/setting/forgot-pass?type=3",
-      });
-    },
-    jumpRegister() {
-      uni.navigateTo({
-        url: "/pages/login_package/register/register",
-      });
-    },
-    // 用户协议
-    jumpUserAgreement() {
-      uni.navigateTo({
-        url: "/pages/mine_package/mine_user_agreement/mine_user_agreement?backPath=login",
-      });
-    },
-    // 隐私协议
-    jumpPrivacyAgreement() {
-      uni.navigateTo({
-        url: "/pages/mine_package/mine_privacy_agreement/mine_privacy_agreement?backPath=login",
-      });
-    },
-    // 售后保障协议
-    jumpProductAgreement() {
-      uni.navigateTo({
-        url: "/pages/mine_package/mine_product_agreement/mine_product_agreement?backPath=login",
-      });
-    },
+				const params = {
+					mobile: form.name,
+					type: SMS_TYPE.LOGIN,
+				};
+				const response = await getUserList(params);
+				console.log("responseresponseresponse", response);
+				if (response && response.bizcode === 100) {
+					this.$refs.uToastRef.show({
+						type: "success",
+						message: response.msg,
+					});
+				} else {
+					this.countdown = false;
+				}
+			},
+			jumpForgot() {
+				uni.navigateTo({
+					url: "/pages/rwa_package/setting/forgot-pass?type=3",
+				});
+			},
+			jumpRegister() {
+				uni.navigateTo({
+					url: "/pages/login_package/register/register",
+				});
+			},
+			// 用户协议
+			jumpUserAgreement() {
+				uni.navigateTo({
+					url: "/pages/mine_package/mine_user_agreement/mine_user_agreement?backPath=login",
+				});
+			},
+			// 隐私协议
+			jumpPrivacyAgreement() {
+				uni.navigateTo({
+					url: "/pages/mine_package/mine_privacy_agreement/mine_privacy_agreement?backPath=login",
+				});
+			},
+			// 售后保障协议
+			jumpProductAgreement() {
+				uni.navigateTo({
+					url: "/pages/mine_package/mine_product_agreement/mine_product_agreement?backPath=login",
+				});
+			},
 
-    // 微信登录
-    async wechatOneLogin() {
-      const then = this;
-      this.loading = true;
+			// 微信登录
+			async wechatOneLogin() {
+				const then = this;
+				this.loading = true;
 
-      // 检查是否同意协议
-      if (!this.isPolicy) {
-        this.$refs.uToastRef.show({
-          type: "error",
-          message: "请阅读完相关协议以及政策，并且勾选同意选项",
-        });
-        this.loading = false;
-        return;
-      }
+				// 检查是否同意协议
+				if (!this.isPolicy) {
+					this.$refs.uToastRef.show({
+						type: "error",
+						message: "请阅读完相关协议以及政策，并且勾选同意选项",
+					});
+					this.loading = false;
+					return;
+				}
 
-      try {
-        // 1. 调用微信登录API
-        uni.login({
-          provider: "weixin",
-          // onlyAuthorize: true,
-          success: async (loginRes) => {
-            console.log("微信登录成功:", loginRes);
+				try {
+					// 1. 调用微信登录API
+					uni.login({
+						provider: "weixin",
+						onlyAuthorize: true,
+						success: async (loginRes) => {
+							console.log("微信登录成功:", loginRes);
 
-            // 2. 发送code到后端换取token
-            const params = {
-              isValid: false,
-              wechatCode: loginRes.code,
-              // 可以根据需要添加其他参数
-            };
+							// 2. 发送code到后端换取token
+							const params = {
+								isValid: false,
+								token: loginRes.code,
+								// 可以根据需要添加其他参数
+							};
+							console.log("微信登录接口返回-1:", params);
 
-            const response = await wechatLogin(params);
-            console.log("微信登录接口返回:", response);
+							const response = await wechatLogin(params);
+							console.log("微信登录接口返回-2:", response, response.data, response.data.token);
 
-            if (response && response.bizcode === 100) {
-              this.loginWay = "wechat";
-              this.loginFun(response);
-            } else if (response.bizcode === 601) {
-              uni.navigateTo({
-                url: `/pages/login_package/bind-phone/bind-phone?id=${loginRes.code}`,
-              });
-            } else {
-              this.$refs.uToastRef.show({
-                type: "error",
-                message: response.msg || "微信登录失败",
-              });
-            }
-          },
-          fail: (err) => {
-            this.loading = false;
-            console.error("微信登录失败:", err);
-            this.$refs.uToastRef.show({
-              type: "error",
-              message: "微信登录失败，请重试",
-            });
-          },
-        });
-      } catch (error) {
-        this.loading = false;
-        console.error("微信登录异常:", error);
-        this.$refs.uToastRef.show({
-          type: "error",
-          message: "微信登录异常，请重试",
-        });
-      }
-    },
-    // 支付宝一键登录
-    async alipayOneLogin() {
-      const then = this;
-      this.loading = true;
+							if (response && response.bizcode === 100) {
+								if (response.data.userId !== null) {
+									// 登录
+									this.loginWay = "wechat";
+									this.loginFun(response);
+								} else {
+									// 去微信注册
+									uni.navigateTo({
+										url: `/pages/login_package/bind-phone/bind-phone?token=${response.data.token}&type=1`,
+									});
+								}
 
-      console.log("支付宝登录", hyyAlipay);
+							} else {
+								this.$refs.uToastRef.show({
+									type: "error",
+									message: response.msg || "微信登录失败",
+								});
+							}
+						},
+						fail: (err) => {
+							this.loading = false;
+							console.error("微信登录失败:", err);
+							this.$refs.uToastRef.show({
+								type: "error",
+								message: "微信登录失败，请重试",
+							});
+						},
+					});
+				} catch (error) {
+					this.loading = false;
+					console.error("微信登录异常:", error);
+					this.$refs.uToastRef.show({
+						type: "error",
+						message: "微信登录异常，请重试",
+					});
+				}
+			},
+			// 支付宝一键登录
+			async alipayOneLogin() {
+				const then = this;
+				this.loading = true;
 
-      // 检查是否同意协议
-      if (!this.isPolicy) {
-        this.$refs.uToastRef.show({
-          type: "error",
-          message: "请阅读完相关协议以及政策，并且勾选同意选项",
-        });
-        this.loading = false;
-        return;
-      }
+				console.log("支付宝登录", hyyAlipay);
 
-      hyyAlipay.openAuthScheme(
-        {
-          appId: "2021005183625053", // 支付宝分配给开发者的应用 ID
-          scheme: "trustbridgeapp", // manifest.json -> "App常用其他设置" -> "UrlSchemes"里设置
-        },
-        (res) => {
-          console.log("支付宝回调", res);
+				// 检查是否同意协议
+				if (!this.isPolicy) {
+					this.$refs.uToastRef.show({
+						type: "error",
+						message: "请阅读完相关协议以及政策，并且勾选同意选项",
+					});
+					this.loading = false;
+					return;
+				}
 
-          alipayLogin({
-            certifyId: res.auth_code,
-          }).then((response) => {
-            console.log("支付宝登录接口返回:", response);
-            if (response && response.bizcode === 100) {
-              this.loginWay = "alipay";
-              this.loginFun(response);
-            } else {
-              this.$refs.uToastRef.show({
-                type: "error",
-                message: response.msg || "微信登录失败",
-              });
-            }
-          });
-        }
-      );
-    },
-  },
-};
+				hyyAlipay.openAuthScheme({
+						appId: "2021005183625053", // 支付宝分配给开发者的应用 ID
+						scheme: "trustbridgeapp", // manifest.json -> "App常用其他设置" -> "UrlSchemes"里设置
+					},
+					(res) => {
+						console.log("支付宝回调", res);
+						alipayLogin({
+							isValid: false,
+							token: res.auth_code,
+						}).then((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",
+									message: response.msg || "微信登录失败",
+								});
+							}
+						});
+					}
+				);
+			},
+		},
+		computed: {
+			isIOS() {
+				// #ifdef APP-PLUS
+				return uni.getSystemInfoSync().platform === "ios";
+				// #endif
+				return false;
+			},
+		}
+	};
 </script>
 
 <style lang="scss" scoped>
-.login_warp {
-  height: calc(100vh - 400rpx);
-  padding: 150rpx 50rpx 0;
-}
+	.login_warp {
+		height: calc(100vh - 400rpx);
+		padding: 150rpx 50rpx 0;
+	}
 
-.login_logo_warp {
-  display: grid;
-  justify-content: center;
-}
+	.login_logo_warp {
+		display: grid;
+		justify-content: center;
+	}
 
-.login_info {
-  margin-top: 60rpx;
+	.login_info {
+		margin-top: 60rpx;
 
-  .login_info_item {
-    margin-bottom: 40rpx;
-  }
+		.login_info_item {
+			margin-bottom: 40rpx;
+		}
 
-  .code_msg {
-    font-size: 36rpx;
-    color: $app-bt-bj;
-  }
-}
+		.code_msg {
+			font-size: 36rpx;
+			color: $app-bt-bj;
+		}
+	}
 
-.login_comm_but {
-  background: #cccccc;
-  border-radius: 20rpx;
-  width: 100%;
-  text-align: center;
-  font-weight: 500;
-  font-size: 32rpx;
-  color: #999999;
-  padding: 28rpx 0;
-  display: flex;
-  justify-content: center;
-}
+	.login_comm_but {
+		background: #cccccc;
+		border-radius: 20rpx;
+		width: 100%;
+		text-align: center;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #999999;
+		padding: 28rpx 0;
+		display: flex;
+		justify-content: center;
+	}
 
-.login_comm_but_yes {
-  background: $app-bt-bj;
-  color: #ffffff;
-}
+	.login_comm_but_yes {
+		background: $app-bt-bj;
+		color: #ffffff;
+	}
 
-.cut_way_warp {
-  display: flex;
-  justify-content: space-between;
-  font-weight: 500;
-  font-size: 28rpx;
-  color: #999999;
-  margin-top: 20rpx;
-}
-.other_login {
-  font-size: 28rpx;
-  text-align: center;
-  margin-top: 80rpx;
-  margin-bottom: 32rpx;
-  color: #999999;
-}
-.login_other_icon {
-  display: flex;
-  padding: 0 100rpx;
-  justify-content: center;
-  .login_other_item {
-    display: flex;
-    flex: 50%;
-    font-size: 28rpx;
-    flex-direction: column;
-    align-items: center;
-    margin-bottom: 80rpx;
-  }
-}
-</style>
+	.cut_way_warp {
+		display: flex;
+		justify-content: space-between;
+		font-weight: 500;
+		font-size: 28rpx;
+		color: #999999;
+		margin-top: 20rpx;
+	}
+
+	.other_login {
+		font-size: 28rpx;
+		text-align: center;
+		margin-top: 80rpx;
+		margin-bottom: 32rpx;
+		color: #999999;
+	}
+
+	.login_other_icon {
+		display: flex;
+		padding: 0 100rpx;
+		justify-content: center;
+
+		.login_other_item {
+			display: flex;
+			flex: 50%;
+			font-size: 28rpx;
+			flex-direction: column;
+			align-items: center;
+			margin-bottom: 80rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/utils/enumUtils.js b/utils/enumUtils.js
index debfe8f..818413d 100644
--- a/utils/enumUtils.js
+++ b/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-商品规格图片
diff --git a/utils/request.js b/utils/request.js
index e818328..823c119 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -45,7 +45,8 @@ function request(options) {
         ...defaultHeaders,
         ...headers, // 使用展开运算符合并默认头和自定义头
       },
-      success: (res) => {
+      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)) {