Browse Source

Merge remote-tracking branch 'origin/master'

master
DX 1 month ago
parent
commit
d9d064a3ac
  1. BIN
      src/assets/imgs/screen/qrsx.png
  2. 24
      src/views/Login/Login.vue
  3. 15
      src/views/Login/Login.vue.rej
  4. 34
      src/views/Login/components/QrCodeForm.vue
  5. 4
      src/views/enterprises/update.vue

BIN
src/assets/imgs/screen/qrsx.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

24
src/views/Login/Login.vue

@ -18,7 +18,7 @@
class="relative flex-1 bg-#fff bg-opacity-90 p-30px dark:bg-[var(--login-bg-color)] lt-sm:p-10px overflow-x-hidden overflow-y-auto"
>
<!-- 右上角的主题语言选择 -->
<div
<!-- <div
class="flex items-center justify-between at-2xl:justify-end at-xl:justify-end"
style="color: var(--el-text-color-primary);"
>
@ -27,16 +27,18 @@
</div>
<div class="flex items-center justify-end space-x-10px h-48px">
</div>
</div>
</div> -->
<!-- 右边的登录界面 -->
<Transition appear enter-active-class="animate__animated animate__bounceInRight" class="rightLogin">
<div
class="m-auto h-[calc(100%-60px)] w-[100%] flex items-center at-2xl:max-w-500px at-lg:max-w-500px at-md:max-w-500px at-xl:max-w-500px"
>
<!-- 账号登录 -->
<LoginForm v-if="isIpAccess" class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
<!-- 二维码登录 -->
<QrCodeForm v-else class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
<!-- 二维码登录 -->
<QrCodeForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
</div>
</Transition>
@ -55,7 +57,17 @@ import { LocaleDropdown } from '@/layout/components/LocaleDropdown'
import { LoginForm, MobileForm, QrCodeForm, RegisterForm, SSOLoginVue, ForgetPasswordForm } from './components'
defineOptions({ name: 'Login' })
const isIpAccess = ref(false)
onMounted(() => {
// const hostname = window.location.hostname
// if(hostname == 'localhost'){
// isIpAccess.value = true;
// }
// else{
// isIpAccess.value = /^(\d{1,3}\.){3}\d{1,3}$/.test(hostname)
// }
// IP访
})
const { t } = useI18n()
const appStore = useAppStore()
const { getPrefixCls } = useDesign()

15
src/views/Login/Login.vue.rej

@ -0,0 +1,15 @@
diff a/src/views/Login/Login.vue b/src/views/Login/Login.vue (rejected hunks)
@@ -34,9 +34,10 @@
class="m-auto h-[calc(100%-60px)] w-[100%] flex items-center at-2xl:max-w-500px at-lg:max-w-500px at-md:max-w-500px at-xl:max-w-500px"
>
-
- <!-- 二维码登录 -->
- <QrCodeForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
+ <!-- 账号登录 -->
+ <LoginForm v-if="isIpAccess" class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
+ <!-- 二维码登录 -->
+ <QrCodeForm v-else class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
</div>
</Transition>

34
src/views/Login/components/QrCodeForm.vue

@ -1,14 +1,17 @@
<template>
<el-row v-show="getShow" class="login-form" style="margin-right: -10px; margin-left: -10px">
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<img src="@/assets/imgs/screen/login-top.png" alt="logo" />
<img class="topImg" src="@/assets/imgs/screen/login-top.png" alt="logo" />
</el-col>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px; margin-bottom:20px; text-align: center">
<img width="320px" height="320px" :src="imageUrl" alt="Converted Image" v-if="imageUrl" />
</el-col>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px; text-align: center">
<img src="@/assets/imgs/screen/login-bottom.png" alt="logo" />
<el-col v-if="!refreshQR" :span="24" style="padding-right: 10px; padding-left: 10px; text-align: center">
<img class="bottomImg" src="@/assets/imgs/screen/login-bottom.png" alt="logo" />
</el-col>
<el-col v-if="refreshQR" :span="24" style="padding-right: 10px; padding-left: 10px; text-align: center">
<img class="bottomImg" src="@/assets/imgs/screen/qrsx.png" alt="logo" @click="handleRefresh" />
</el-col>
</el-row>
</template>
@ -23,6 +26,7 @@ defineOptions({ name: 'QrCodeForm' })
const imageUrl = ref('');
const uuuid =ref('')
const refreshQR = ref(false)
const { t } = useI18n()
const { handleBackLogin, getLoginState } = useLoginState()
@ -30,7 +34,9 @@ const getShow = computed(() => true)
// ID
let intervalId = ref();
const handleRefresh = () => {
window.location.reload()
}
const getimg =async ()=>{
const array = new Uint32Array(4);
@ -65,9 +71,10 @@ const getimg =async ()=>{
//
const startTime = Date.now();
// 10
const tenMinutes = 60 * 1000;
const tenMinutes = 10 *60 * 10000 ;
//
const refaulst = ()=>{
refreshQR.value = false;
//
if (intervalId) {
clearInterval(intervalId.value);
@ -80,6 +87,8 @@ const refaulst = ()=>{
if (Date.now() - startTime >= tenMinutes) {
clearInterval(intervalId.value);
console.log('定时器已停止,已过去 10 分钟。');
refreshQR.value = true;
return;
}
@ -101,3 +110,18 @@ onMounted(() => {
getimg()
})
</script>
<style lang="scss" scoped>
.expired-text{
color: #ff0000;
margin-top: 40px;
margin-right: 10px;
}
.bottomImg{
width:320px;
}
.topImg{
height: 200px;
}
</style>

4
src/views/enterprises/update.vue

@ -41,7 +41,7 @@
</section>
</section>
</el-form-item>
<el-form-item label="企业关联微信用户" prop="address">
<!-- <el-form-item label="企业关联微信用户" prop="address">
<el-select
v-model="formData.enterpriseUserId"
filterable
@ -55,7 +55,7 @@
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="企业地址" prop="address">
<el-input v-model="formData.address" type="textarea" placeholder="请输入企业地址" />
</el-form-item>

Loading…
Cancel
Save