Merge branch 'master' into dev-1.1.2

wupengfei

6 小时以前 4ef86d8a1f494caa1e136ff78f9ea258d01164b1

 apps/cMiniApp/src/subpackages/login/authorization/authorization.vue

@@ -25,7 +25,8 @@
      v-model="state.policyChecked"
      policyBtnText="若手机号未注册，将为您直接注册账号，注册即为同意"
    />
    <div class="other-login-channel-wrapper" v-if="!isLoginByWeb">
    <!-- <div class="other-login-channel-wrapper" v-if="!isLoginByWeb"> -->
    <div class="other-login-channel-wrapper" v-if="NODE_ENV === 'development'">
      <nut-divider>其他登录方式</nut-divider>
      <div class="other-login-channel-list">
        <div class="other-login-channel-list-item" @click="goLoginByForm()">
@@ -34,7 +35,7 @@
          </div>
          <div class="other-login-channel-list-item-text">验证码登录</div>
        </div>
        <!-- <div
        <div
          class="other-login-channel-list-item"
          @click="goLoginByForm(LoginFormTabs.AccountLogin)"
        >
@@ -42,7 +43,7 @@
            <img :src="IconPassword" />
          </div>
          <div class="other-login-channel-list-item-text">账户登录</div>
        </div> -->
        </div>
      </div>
    </div>
  </LoginPageLayout>
@@ -61,6 +62,8 @@
import IconPassword from '@/assets/login/icon-btn-password.png';
import { LoginFormTabs } from '../constants';
import * as authServices from '@12333/services/apiV2/auth';
import { NODE_ENV } from '@/constants';
console.log('NODE_ENV: ', NODE_ENV);

defineOptions({
  name: 'authorization',