gxwebsoft
/
websoft-cms
1
0
Fork 4
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

改造登录页面

master^2
科技小王子 6 months ago
parent
a58c56ebe8
commit
05389ccb9c
3 changed files with 53 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      pages/item/index.vue
  2. 89
      pages/passport/login.vue
  3. 2
      utils/common.ts

6
pages/item/index.vue
View File

@ -12,10 +12,10 @@
</div> </div>
</template> </template>
<el-descriptions title="应用参数" :column="2" border> <el-descriptions title="应用参数" :column="2" border>
<!-- <el-descriptions-item label="租户ID">{{form.tenantId}}</el-descriptions-item>-->
<!-- <el-descriptions-item label="插件ID">{{form.menuId || '-'}}</el-descriptions-item>-->
<el-descriptions-item :span="2" label="应用名称">{{form.tenantName}}</el-descriptions-item> <el-descriptions-item :span="2" label="应用名称">{{form.tenantName}}</el-descriptions-item>
<!-- <el-descriptions-item label="管理地址"><a class="cursor-pointer" @click="openUrl(`https://${form.domain}`)">{{form.domain}}</a></el-descriptions-item>-->
<el-descriptions-item v-if="form.isBuy" label="租户ID"><span class="text-orange-500">{{form.tenantId}}</span></el-descriptions-item>
<el-descriptions-item v-if="form.isBuy" label="插件ID"><span class="text-orange-500">{{form.menuId || '-'}}</span></el-descriptions-item>
<el-descriptions-item label="控制台"><a class="cursor-pointer" @click="openUrl(`https://${form.domain}`)">{{form.domain}}</a></el-descriptions-item>
<el-descriptions-item v-for="(item,index) in form.parameters" :key="index" :label="item.name">{{ item.value }}</el-descriptions-item> <el-descriptions-item v-for="(item,index) in form.parameters" :key="index" :label="item.name">{{ item.value }}</el-descriptions-item>
</el-descriptions> </el-descriptions>
<template v-if="form.accounts && form.accounts.length > 0"> <template v-if="form.accounts && form.accounts.length > 0">

89
pages/passport/login.vue
View File

@ -80,13 +80,13 @@
<!-- 注册界面 --> <!-- 注册界面 -->
<el-space class="tabs pt-5 text-xl flex justify-center" v-if="!loginBar"> <el-space class="tabs pt-5 text-xl flex justify-center" v-if="!loginBar">
<el-tabs v-model="activeName" class="demo-tabs "> <el-tabs v-model="activeName" class="demo-tabs ">
<el-tab-pane label="手机号注册" name="sms">
<span class="text-sm text-gray-400">
未注册手机号验证通过后将自动注册
</span>
<div class="custom-style my-4">
<el-tab-pane label="注册账号" name="sms">
<div class="custom-style ">
<el-form :model="form" label-width="auto" class="w-[330px]"> <el-form :model="form" label-width="auto" class="w-[330px]">
<el-form-item> <el-form-item>
<span class="text-sm text-gray-400 mb-4">
未注册手机号验证通过后将自动注册
</span>
<el-input class="w-full" size="large" maxlength="11" placeholder="请输入手机号码" v-model="form.phone"> <el-input class="w-full" size="large" maxlength="11" placeholder="请输入手机号码" v-model="form.phone">
<template #prepend>+86</template> <template #prepend>+86</template>
</el-input> </el-input>
@ -101,39 +101,10 @@
</el-space> </el-space>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-checkbox v-model="form.isAgree">我已阅读并同意</el-checkbox>
<a href="#" class="text-gray-700">《用户协议》</a>
<a href="#" class="text-gray-700">《隐私政策》</a>
<a href="#" class="text-gray-700">《产品服务协议》</a>
<el-input class="w-full" size="large" placeholder="公司名称|品牌名称" v-model="form.companyName" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" size="large" class="w-full" :disabled="!form.isAgree" @click="onRegister">注册</el-button>
</el-form-item>
</el-form>
</div>
</el-tab-pane>
<el-tab-pane label="账号密码注册" name="account">
<div class="custom-style my-4">
<el-form :model="form" label-width="auto" class="w-[330px]">
<el-form-item>
<el-input class="w-full" size="large" maxlength="30" placeholder="登录账号" v-model="form.username" />
</el-form-item>
<el-form-item>
<el-input type="password" size="large" maxlength="30" placeholder="登录密码" v-model="form.password" />
</el-form-item>
<el-form-item>
<el-input class="w-full" size="large" maxlength="11" placeholder="请输入手机号码" v-model="form.phone">
<template #prepend>+86</template>
</el-input>
</el-form-item>
<el-form-item>
<el-space class="flex justify-between w-full">
<el-input size="large" placeholder="短信验证码" maxlength="6" class="w-full" v-model="form.code" @keyup.enter.prevent="onSubmitBySms" />
<el-button size="large" class="w-full" :disabled="!!countdownTime" @click="checkUser">
<span v-if="!countdownTime">发送验证码</span>
<span v-else>已发送 {{ countdownTime }} s</span>
</el-button>
</el-space>
<el-input class="w-full" size="large" placeholder="邮箱地址" v-model="form.email" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-checkbox v-model="form.isAgree">我已阅读并同意</el-checkbox> <el-checkbox v-model="form.isAgree">我已阅读并同意</el-checkbox>
@ -147,6 +118,41 @@
</el-form> </el-form>
</div> </div>
</el-tab-pane> </el-tab-pane>
<!-- <el-tab-pane label="账号密码注册" name="account">-->
<!-- <div class="custom-style my-4">-->
<!-- <el-form :model="form" label-width="auto" class="w-[330px]">-->
<!-- <el-form-item>-->
<!-- <el-input class="w-full" size="large" maxlength="30" placeholder="登录账号" v-model="form.username" />-->
<!-- </el-form-item>-->
<!-- <el-form-item>-->
<!-- <el-input type="password" size="large" maxlength="30" placeholder="登录密码" v-model="form.password" />-->
<!-- </el-form-item>-->
<!-- <el-form-item>-->
<!-- <el-input class="w-full" size="large" maxlength="11" placeholder="请输入手机号码" v-model="form.phone">-->
<!-- <template #prepend>+86</template>-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item>-->
<!-- <el-space class="flex justify-between w-full">-->
<!-- <el-input size="large" placeholder="短信验证码" maxlength="6" class="w-full" v-model="form.code" @keyup.enter.prevent="onSubmitBySms" />-->
<!-- <el-button size="large" class="w-full" :disabled="!!countdownTime" @click="checkUser">-->
<!-- <span v-if="!countdownTime">发送验证码</span>-->
<!-- <span v-else>已发送 {{ countdownTime }} s</span>-->
<!-- </el-button>-->
<!-- </el-space>-->
<!-- </el-form-item>-->
<!-- <el-form-item>-->
<!-- <el-checkbox v-model="form.isAgree">我已阅读并同意</el-checkbox>-->
<!-- <a href="#" class="text-gray-700">《用户协议》</a>-->
<!-- <a href="#" class="text-gray-700">《隐私政策》</a>-->
<!-- <a href="#" class="text-gray-700">《产品服务协议》</a>-->
<!-- </el-form-item>-->
<!-- <el-form-item>-->
<!-- <el-button type="primary" size="large" class="w-full" :disabled="!form.isAgree" @click="onRegister">注册</el-button>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </div>-->
<!-- </el-tab-pane>-->
</el-tabs> </el-tabs>
</el-space> </el-space>
</el-card> </el-card>
@ -186,9 +192,15 @@ const countdownTime = ref(0);
// 验证码倒计时定时器 // 验证码倒计时定时器
let countdownTimer: number | null = null; let countdownTimer: number | null = null;
if(getIdBySpm(0) == 'register'){
loginBar.value = false;
}
// 配置信息 // 配置信息
const { form } = useFormData<User>({ const { form } = useFormData<User>({
userId: undefined, userId: undefined,
companyName: undefined,
email: undefined,
username: '', username: '',
phone: '', phone: '',
password: '', password: '',
@ -255,9 +267,6 @@ const navigateTo = (url: string) => {
} }
const onLoginBar = () => { const onLoginBar = () => {
// if(loginBar.value){
// return navigateTo(`/passport/register`)
// }
loginBar.value = !loginBar.value loginBar.value = !loginBar.value
activeName.value = loginBar.value ? 'account' : 'sms' activeName.value = loginBar.value ? 'account' : 'sms'
} }
@ -329,7 +338,7 @@ const onRegister = async () => {
text: 'Loading' text: 'Loading'
}) })
await useClientRequest<ApiResult<LoginResult>>('/register',{method: "post",body: { await useClientRequest<ApiResult<LoginResult>>('/register',{method: "post",body: {
companyName: '应用名称',
companyName: form.companyName,
username: form.phone, username: form.phone,
phone: form.phone, phone: form.phone,
password: form.password, password: form.password,

2
utils/common.ts
View File

@ -172,7 +172,7 @@ export function loginAdminByToken(): void {
const user = useUser(); const user = useUser();
const uid = user.value?.userId; const uid = user.value?.userId;
const tid = user.value?.tenantId; const tid = user.value?.tenantId;
openSpmUrl(`https://${tid}.websoft.top/token-login`,undefined, uid, true,true)
openSpmUrl(`https://console.websoft.top/token-login`,undefined, uid, true,true)
} }

Write Preview
Loading…
Cancel
Save