代码提交

yudao-mall-uniapp-master/sheep/components/s-auth-modal/s-auth-modal.vue

@@ -1,13 +1,9 @@
 <template>
   <!-- 规格弹窗 -->
   <su-popup :show="authType !== ''" round="10" :showClose="true" @close="closeAuthModal">
-    <view class="login-wrap">
+    <view class="login-wrap" style="min-height: 300rpx;">
       <!-- 1. 账号密码登录 accountLogin -->
-      <account-login
+      <account-login v-if="authType === 'accountLogin'" :agreeStatus="state.protocol" @onConfirm="onConfirm" />
-        v-if="authType === 'accountLogin'"
-        :agreeStatus="state.protocol"
-        @onConfirm="onConfirm"
-      />
 
       <!-- 2. 短信登录  smsLogin -->
       <sms-login v-if="authType === 'smsLogin'" :agreeStatus="state.protocol" @onConfirm="onConfirm" />
@@ -25,10 +21,8 @@
       <mp-authorization v-if="authType === 'mpAuthorization'" />
 
       <!-- 7. 第三方登录 -->
-      <view
+      <view v-if="['accountLogin', 'smsLogin'].includes(authType)"
-        v-if="['accountLogin', 'smsLogin'].includes(authType)"
+        class="auto-login-box ss-flex ss-flex-col ss-row-center ss-col-center">
-        class="auto-login-box ss-flex ss-flex-col ss-row-center ss-col-center"
-      >
         <!-- 7.1 微信小程序的快捷登录 -->
         <view v-if="sheep.$platform.name === 'WechatMiniProgram'" class="ss-flex register-box">
           <!-- <view class="register-title">还没有账号?</view> -->
@@ -54,31 +48,18 @@
         </button> -->
 
         <!-- 7.3 iOS 登录 TODO 芋艿：等后面搞 App 再弄 -->
-        <button
+        <button v-if="sheep.$platform.os === 'ios' && sheep.$platform.name === 'App'" @tap="thirdLogin('apple')"
-          v-if="sheep.$platform.os === 'ios' && sheep.$platform.name === 'App'"
+          class="ss-reset-button auto-login-btn">
-          @tap="thirdLogin('apple')"
+          <image class="auto-login-img" :src="sheep.$url.static('/static/img/shop/platform/apple.png')" />
-          class="ss-reset-button auto-login-btn"
-        >
-          <image
-            class="auto-login-img"
-            :src="sheep.$url.static('/static/img/shop/platform/apple.png')"
-          />
         </button>
       </view>
 
       <!-- 用户协议的勾选 -->
-      <view
+      <view v-if="['accountLogin', 'smsLogin'].includes(authType)" class="agreement-box ss-flex ss-row-center"
-        v-if="['accountLogin', 'smsLogin'].includes(authType)"
+        :class="{ shake: currentProtocol }">
-        class="agreement-box ss-flex ss-row-center"
-        :class="{ shake: currentProtocol }"
-      >
         <label class="radio ss-flex ss-col-center" @tap="onChange">
-          <radio
+          <radio :checked="state.protocol" color="var(--ui-BG-Main)" style="transform: scale(0.8)"
-            :checked="state.protocol"
+            @tap.stop="onChange" />
-            color="var(--ui-BG-Main)"
-            style="transform: scale(0.8)"
-            @tap.stop="onChange"
-          />
           <view class="agreement-text ss-flex ss-col-center ss-m-l-8">
             我已阅读并遵守
             <view class="tcp-text" @tap.stop="onProtocol('用户协议')">