开始调整微信公众号首次登录的逻辑0.3

pages/index/login.vue

@@ -26,7 +26,7 @@
       sheep.$platform.useProvider().bind(code, state);
     }
 	if(!res){
-		showAuthModal("首次登录输入手机");
+		showAuthModal("officialAccountFirstLogin");
 		return;
 	}
     // 检测 H5 登录回调

sheep/api/member/auth.js

@@ -43,6 +43,17 @@ const AuthUtil = {
       },
     });
   },
+  // 微信公众号首次登录校验手机
+  OfficialEnterLogin: (mobile, scene) => {
+    return request({
+      url: '/member/auth/social-login-validate-sms-code',
+      method: 'POST',
+      data: {
+        mobile,
+        scene,
+      },
+    });
+  },
   // 登出系统
   logout: () => {
     return request({

sheep/components/s-auth-modal/components/register.vue → sheep/components/s-auth-modal/components/officialAccountFirstLogin.vue

@@ -1,19 +1,16 @@
 <!-- 短信登录 - smsLogin  -->
 <template>
 	<view>
-		<!-- 标题栏 -->
-		<!-- <view class="head-box ss-m-b-60">
-      <view class="ss-flex ss-m-b-20">
-		  <view class="head-title-active ss-m-r-40" @tap="showAuthModal('accountLogin')">
-		    账号登录
-		  </view>
-        <view class="head-title head-title-line head-title-animation">短信登录</view>
-        
-      </view>
-      <view class="head-subtitle">未注册的手机号，验证后自动注册账号</view>
-    </view> -->
-
-
+		<view class="head-box " >
+			<view class="ss-flex ss-m-b-20">
+				<view
+				class="isActive head-title"
+					>
+					您首次登录，请输入手机号验证
+				</view>
+		
+			</view>
+		</view>
 		<!-- 表单项 -->
 		<uni-forms ref="smsLoginRef" v-model="state.model" :rules="state.rules" validateTrigger="bind" labelWidth="140"
 			labelAlign="center" class="loginUniForm">
@@ -32,17 +29,11 @@
 			<uni-forms-item name="code" label="验证码" class="loginUniFormItem">
 				<uni-easyinput placeholder="请输入验证码" v-model="state.model.code" :inputBorder="false" type="number"
 					maxlength="4">
-					<!-- <template v-slot:right>
-            <button class="ss-reset-button login-btn-start" @tap="smsLoginSubmit"> 登录 </button>
-          </template> -->
 				</uni-easyinput>
 			</uni-forms-item>
 		</uni-forms>
 		<view style="display: flex;justify-content: space-between;margin-top: 20rpx;">
-			<!-- <button class="ss-reset-button forgot-btn" @tap="showAuthModal('resetPassword')">
-		  忘记密码
-		</button> -->
-			<button class="ss-reset-button login-btn-start" @tap="smsLoginSubmit"> 登录 </button>
+			<button class="ss-reset-button login-btn-start" @tap="OfficialEnterLogin"> 继续登录 </button>
 		</view>
 	</view>
 </template>
@@ -93,7 +84,7 @@
 	});
 
 	// 短信登录
-	async function smsLoginSubmit() {
+	async function OfficialEnterLogin() {
 
 		// 参数校验
 		const validate = await unref(smsLoginRef)
@@ -104,12 +95,7 @@
 		if (!validate) {
 			return;
 		}
-		if (!props.agreeStatus) {
-			emits('onConfirm', true)
-			//onConfirm(true)
-			sheep.$helper.toast('请勾选同意');
-			return;
-		}
+
 		// 提交数据
 		const {
 			code

sheep/components/s-auth-modal/s-auth-modal.vue

@@ -1,7 +1,6 @@
 <template>
 	<!-- 规格弹窗 -->
 	<su-popup :show="authType !== ''" round="10" :showClose="true" @close="closeAuthModal">
-		{{authType}}
 		<view class="login-wrap">
 			<!-- 标题栏 -->
 			<view class="head-box " v-if="['accountLogin', 'smsLogin'].includes(authType)">
@@ -49,6 +48,10 @@
 					<text>微信授权登录</text>
 				</view>
 			</view>
+			
+			<!-- 1. 微信公众号授权登录 第一次登陆时弹窗绑定手机号 accountLogin -->
+			<officialAccountFirstLogin v-if="authType === 'officialAccountFirstLogin'" :agreeStatus="state.protocol" @onConfirm="onConfirm" />
+			
 			<!-- 1. 账号密码登录 accountLogin -->
 			<account-login v-if="authType === 'accountLogin'" :agreeStatus="state.protocol" @onConfirm="onConfirm" />
 
@@ -66,7 +69,8 @@
 
 			<!-- 6. 微信小程序授权 -->
 			<mp-authorization v-if="authType === 'mpAuthorization'" />
-
+			
+			
 			<!-- 7. 第三方登录 -->
 			<view v-if="['accountLogin', 'smsLogin'].includes(authType)"
 				class="auto-login-box ss-flex ss-flex-col ss-row-center ss-col-center">
@@ -123,6 +127,7 @@
 	import changeMobile from './components/change-mobile.vue';
 	import changePassword from './components/change-password.vue';
 	import mpAuthorization from './components/mp-authorization.vue';
+	import officialAccountFirstLogin from './components/officialAccountFirstLogin'
 	import {
 		closeAuthModal,
 		showAuthModal

sheep/components/s-user-card/s-user-card.vue

@@ -17,9 +17,9 @@
 				</view>
 			</view>
 			<view class="right-box ss-m-r-30">
-				<!-- <button class="ss-reset-button" style="margin-right: 20rpx;">
+				<button class="ss-reset-button" style="margin-right: 20rpx;" @tap="showAuthModal('officialAccountFirstLogin')">
 					<text class="cicon-service-o"></text>
-				</button> -->
+				</button>
 				<button class="ss-reset-button" @tap="sheep.$router.go('/pages/user/setting')">
 					<text class="cicon-settings-o"></text>
 				</button>