0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev

This commit is contained in:
easy 2023-01-10 15:29:38 +08:00
parent 30f930ef30 54855c5263
commit 02d91eaec4
5 changed files with 1517 additions and 1485 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components.d.ts vendored
View File

@ -7,16 +7,25 @@ export {}
declare module '@vue/runtime-core' {
export interface GlobalComponents {
ABadge: typeof import('ant-design-vue/es')['Badge']
AButton: typeof import('ant-design-vue/es')['Button']
ACard: typeof import('ant-design-vue/es')['Card']
ACheckbox: typeof import('ant-design-vue/es')['Checkbox']
ACol: typeof import('ant-design-vue/es')['Col']
ADatePicker: typeof import('ant-design-vue/es')['DatePicker']
ADivider: typeof import('ant-design-vue/es')['Divider']
AForm: typeof import('ant-design-vue/es')['Form']
AFormItem: typeof import('ant-design-vue/es')['FormItem']
AInput: typeof import('ant-design-vue/es')['Input']
AInputGroup: typeof import('ant-design-vue/es')['InputGroup']
AInputNumber: typeof import('ant-design-vue/es')['InputNumber']
AInputPassword: typeof import('ant-design-vue/es')['InputPassword']
AModal: typeof import('ant-design-vue/es')['Modal']
APopconfirm: typeof import('ant-design-vue/es')['Popconfirm']
ARow: typeof import('ant-design-vue/es')['Row']
ASelect: typeof import('ant-design-vue/es')['Select']
ATooltip: typeof import('ant-design-vue/es')['Tooltip']
AUpload: typeof import('ant-design-vue/es')['Upload']
BadgeStatus: typeof import('./src/components/BadgeStatus/index.vue')['default']
CardBox: typeof import('./src/components/CardBox/index.vue')['default']
GeoComponent: typeof import('./src/components/GeoComponent/index.vue')['default']

4
src/api/bind.ts Normal file
View File

@ -0,0 +1,4 @@
import { get } from '@/utils/request'
// 三方应用账户信息
export const applicationInfo = (code: string) => get(`/application/sso/bind-code/${code}`)

12
src/views/account/Center/bind/index.vue
View File

@ -108,6 +108,8 @@
import { getImage } from '@/utils/comm';
import { Form } from 'ant-design-vue';
import { applicationInfo } from '@/api/bind';
const useForm = Form.useForm;
interface formData {
@ -115,6 +117,16 @@ interface formData {
password: string;
captcha: string;
}
// 三方应用信息
const getAppInfo = async () => {
const code: string = '73ab60c88979a1475963a5dde31e374b';
const res = await applicationInfo(code);
console.log('getAppInfo: ', res);
};
getAppInfo();
// 登录表单
const formData = ref<formData>({
username: '',
password: '',

69
src/views/user/Login/index.vue
View File

@ -109,22 +109,25 @@
</a-button>
</a-form-item>
</a-form>
<div style="margin-top: 20">
<a-divider plain style="height: 12">
<div style="margin-top: 20px">
<a-divider plain style="height: 12px">
<div
style="color: '#807676d9', fontSize: 12"
style="color: #807676d9, font-size: 12px"
>
其他方式登录
</div>
</a-divider>
<div
style="position: 'relative', bottom: '10px'"
style="position: relative, bottom: 10px; text-align: center"
>
<a-button
v-for="(item, index) in bindings"
:key="index"
type="link"
@Click="handleClickOther(item)"
>
<Button type="link" @Click="handle">
<img
style="width: 32, height: 33"
style="width: 32px, height: 33px"
:alt="item.name"
:src="
iconMap.get(
@ -132,7 +135,7 @@
) || defaultImg
"
/>
</Button>
</a-button>
</div>
</div>
</div>
@ -174,7 +177,7 @@ import {
import Cookies from 'js-cookie';
import { useUserInfo } from '@/store/userInfo';
import { LocalStore } from '@/utils/comm';
import { TOKEN_KEY, Version_Code } from '@/utils/variable';
import { BASE_API_PATH, TOKEN_KEY, Version_Code } from '@/utils/variable';
const store = useUserInfo();
const router = useRouter();
@ -203,6 +206,11 @@ const codeConfig = ref(false);
const loading = ref(false);
const bindings = ref<any[]>();
const defaultImg = getImage('/apply/provider1.png');
const iconMap = new Map();
iconMap.set('dingtalk-ent-app', getImage('/bind/dingtalk.png'));
iconMap.set('wechat-webapp', getImage('/bind/wechat-webapp.png'));
const onFinish = async () => {
form.remember
? Cookies.set('user', encodeURIComponent(JSON.stringify(form)), {
@ -213,18 +221,20 @@ const onFinish = async () => {
try {
loading.value = true;
const res: any = await authLogin(form);
if (res.status === 200) {
if (res.success) {
store.$patch({
...res.result,
username: form.username,
});
LocalStore.set(TOKEN_KEY, res?.result.token);
const resp: any = await getInitSet();
if (resp.status === 200) {
if (resp.success) {
router.push('/demo');
}
}
} catch (error) {
form.verifyCode = '';
getCode();
loading.value = false;
}
};
@ -253,11 +263,11 @@ const getCookie = () => {
const getOpen = () => {
systemVersion().then((res: any) => {
if (res.status === 200 && res.result) {
if (res.success && res.result) {
LocalStore.set(Version_Code, res.result.edition);
if (res.result.edition !== 'community') {
bindInfo().then((res: any) => {
if (res.status === 200) {
if (res.success) {
bindings.value = res.result;
}
});
@ -266,6 +276,16 @@ const getOpen = () => {
});
};
const handleClickOther = (item: any) => {
LocalStore.set('onLogin', 'no');
window.open(`${BASE_API_PATH}/application/sso/${item.id}/login`);
window.onstorage = (e) => {
if (e.newValue) {
window.location.href = '/';
}
};
};
const screenRotation = (width: number, height: number) => {
LoginWarpStyle.backgroundImage = `url(${bgImage})`;
};
@ -335,11 +355,12 @@ screenRotation(screenWidth.value, screenHeight.value);
.top {
width: 100%;
text-align: center;
// text-align: center;
.header {
height: 44px;
line-height: 44px;
text-align: center;
a {
text-decoration: none;
@ -371,6 +392,7 @@ screenRotation(screenWidth.value, screenHeight.value);
font-size: 22px;
font-family: Avenir, 'Helvetica Neue', Arial, Helvetica,
sans-serif;
text-align: center;
}
.main {
@ -426,6 +448,27 @@ screenRotation(screenWidth.value, screenHeight.value);
flex-direction: row;
margin-bottom: 30px;
}
.verifyCode {
.login-code-input {
width: 70%;
float: left;
}
.login-code {
width: 30%;
height: 32px;
float: left;
background-color: #e4e6e7;
img {
cursor: pointer;
vertical-align: middle;
}
.login-code-img {
width: 100%;
height: 100%;
}
}
}
}
}
}

2904
yarn.lock
View File

File diff suppressed because it is too large Load Diff