Commit d4462fc9 authored by youjie's avatar youjie

no message

parent 73fdf525
...@@ -58,7 +58,7 @@ export default { ...@@ -58,7 +58,7 @@ export default {
bindingRecommendCodeRequired: '请输入推荐码', bindingRecommendCodeRequired: '请输入推荐码',
backStep: '上一步', backStep: '上一步',
registerSuccess: '注册成功', registerSuccess: '注册成功',
registerSuccessText: '一起奔赴阳光、沙滩与烟火气吧~', registerSuccessText: '恭喜注册成功!',
agreementText: '「我同意使用条款与隐私政策」', agreementText: '「我同意使用条款与隐私政策」',
forgetPassword: '忘记密码', forgetPassword: '忘记密码',
newPassword: '新密码', newPassword: '新密码',
......
...@@ -68,6 +68,46 @@ ...@@ -68,6 +68,46 @@
</a-form> </a-form>
</a-space> </a-space>
<!-- 谷歌登录 -->
<!-- <div v-else-if="loginMsg.reType === 1" class="login-form-content google-content">
<div class="google-auth-container">
<div
id="g_id_onload"
data-client_id="13534363185-3utcasahjr950mf6uumq8upefl0fu2rl.apps.googleusercontent.com"
data-context="signin"
data-ux_mode="popup"
data-callback="googleCallback"
data-auto_select="false"
data-itp_support="true"
></div>
<div
class="g_id_signin"
data-type="standard"
data-shape="rectangular"
data-theme="outline"
data-text="signin_with"
data-size="large"
data-locale="en-US"
data-logo_alignment="center"
data-width="360"
></div>
</div>
</div> -->
<!-- Line登录 -->
<!-- <div v-else-if="loginMsg.reType === 3" class="login-form-content scan-content">
<div class="qr-container">
<div class="qr-box line-qr-box">
<div class="qr-code-placeholder">
<i class="ki-outline ki-message-text"></i>
</div>
</div>
<p class="scan-instruction">{{ t('login.scanTip') }}</p>
<p class="scan-status">{{ t('login.scanWaiting') }}</p>
</div>
</div> -->
<div class="mt-[40px] flex items-center justify-center"> <div class="mt-[40px] flex items-center justify-center">
<a-divider orientation="center" class="text-[16px] text-[#EEEFEB]"></a-divider> <a-divider orientation="center" class="text-[16px] text-[#EEEFEB]"></a-divider>
<span class="text-nowrap primary1-3 px-[14px]">{{ t('login.othenLogin') }}</span> <span class="text-nowrap primary1-3 px-[14px]">{{ t('login.othenLogin') }}</span>
...@@ -78,9 +118,9 @@ ...@@ -78,9 +118,9 @@
<div class="w-[42px] h-[42px] <div class="w-[42px] h-[42px]
rounded-full bg-[#FFF] rounded-full bg-[#FFF]
flex items-center justify-center cursor-pointer loginForm-item" flex items-center justify-center cursor-pointer loginForm-item"
v-for="(item,index) in loginTypes" :key="index" v-for="(method,index) in loginMethods" :key="index"
@click="toggleLoginType(item.value)"> @click="toggleLoginType(method.key)">
<img :src="item.url" alt="" class="w-[14px] h-[14px]"/> <img :src="method.url" alt="" class="w-[14px] h-[14px]"/>
</div> </div>
</div> </div>
</div> </div>
...@@ -104,7 +144,6 @@ import { useSystemConfigStore } from '@/stores/index' ...@@ -104,7 +144,6 @@ import { useSystemConfigStore } from '@/stores/index'
import ErpUserService from '@/services/ErpUserService' import ErpUserService from '@/services/ErpUserService'
import { ApiResult } from '@/types/ApiResult' import { ApiResult } from '@/types/ApiResult'
import loginHeader from "./components/header.vue"; import loginHeader from "./components/header.vue";
import loginForm from "./components/loginForm.vue";
import f from '@/assets/images/login_f.png' import f from '@/assets/images/login_f.png'
import G from '@/assets/images/login_G.png' import G from '@/assets/images/login_G.png'
import tel from '@/assets/images/login_tel.png' import tel from '@/assets/images/login_tel.png'
...@@ -132,25 +171,29 @@ const loginMsg = reactive({ ...@@ -132,25 +171,29 @@ const loginMsg = reactive({
password: '',//123456 password: '',//123456
}) })
const loginTypes = ref([ const loginMethods = ref([
// { key: 'account', label: 'login.accountLogin', icon: 'ki-user' },
// { key: 'wechat', label: 'login.wechatLogin', icon: 'ki-whatsapp' },
// { key: 'google', label: 'login.googleLogin', icon: 'ki-google' },
// { key: 'line', label: 'login.lineLogin', icon: 'ki-message-text' },
{ {
label: 'f', label: 'f',
value: 7, key: 7,
url: f, url: f,
}, },
{ {
label: 'G', label: 'G',
value: 1, key: 1,
url: G, url: G,
}, },
{ {
label: 'tel', label: 'tel',
value: 0, key: 0,
url: tel, url: tel,
}, },
{ {
label: 'inline', label: 'inline',
value: 3, key: 3,
url: line, url: line,
}, },
]) ])
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment