Merge pull request #4 from PanJiaChen/master

sync
This commit is contained in:
szueric 2019-06-12 16:51:06 +08:00 committed by GitHub
commit 0f5ea1867a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 28 additions and 22 deletions

View File

@ -839,16 +839,20 @@ export default {
that.$emit('crop-upload-fail', err, field, ki)
}
})
},
closeHandler(e) {
if (this.value && (e.key == 'Escape' || e.keyCode == 27)) {
this.off()
}
}
},
created() {
// esc
document.addEventListener('keyup', (e) => {
if (this.value && (e.key == 'Escape' || e.keyCode == 27)) {
this.off()
}
})
}
document.addEventListener('keyup', this.closeHandler)
},
destroyed() {
document.removeEventListener('keyup', this.closeHandler)
},
}
</script>

View File

@ -9,7 +9,7 @@
:placeholder="fillPlaceHolder"
:readonly="readonly"
:disabled="disabled"
:autoComplete="autoComplete"
:autocomplete="autoComplete"
:required="required"
type="email"
class="material-input"
@ -24,7 +24,7 @@
:placeholder="fillPlaceHolder"
:readonly="readonly"
:disabled="disabled"
:autoComplete="autoComplete"
:autocomplete="autoComplete"
:required="required"
type="url"
class="material-input"
@ -40,7 +40,7 @@
:step="step"
:readonly="readonly"
:disabled="disabled"
:autoComplete="autoComplete"
:autocomplete="autoComplete"
:max="max"
:min="min"
:minlength="minlength"
@ -59,7 +59,7 @@
:placeholder="fillPlaceHolder"
:readonly="readonly"
:disabled="disabled"
:autoComplete="autoComplete"
:autocomplete="autoComplete"
:max="max"
:min="min"
:required="required"
@ -76,7 +76,7 @@
:placeholder="fillPlaceHolder"
:readonly="readonly"
:disabled="disabled"
:autoComplete="autoComplete"
:autocomplete="autoComplete"
:required="required"
type="tel"
class="material-input"
@ -91,7 +91,7 @@
:placeholder="fillPlaceHolder"
:readonly="readonly"
:disabled="disabled"
:autoComplete="autoComplete"
:autocomplete="autoComplete"
:minlength="minlength"
:maxlength="maxlength"
:required="required"

View File

@ -5,7 +5,8 @@
<slot />
</div>
</div>
<img :src="image" class="pan-thumb">
<!-- eslint-disable-next-line -->
<div :style="{backgroundImage: `url(${image})`}" class="pan-thumb"></div>
</div>
</template>
@ -52,7 +53,8 @@ export default {
.pan-thumb {
width: 100%;
height: 100%;
background-size: 100%;
background-position: center center;
background-size: cover;
border-radius: 50%;
overflow: hidden;
position: absolute;
@ -60,7 +62,7 @@ export default {
transition: all 0.3s ease-in-out;
}
.pan-thumb:after {
/* .pan-thumb:after {
content: '';
width: 8px;
height: 8px;
@ -71,7 +73,7 @@ export default {
margin: -4px 0 0 -4px;
background: radial-gradient(ellipse at center, rgba(14, 14, 14, 1) 0%, rgba(125, 126, 125, 1) 100%);
box-shadow: 0 0 1px rgba(255, 255, 255, 0.9);
}
} */
.pan-info {
position: absolute;

View File

@ -6,7 +6,7 @@ import { getToken } from '@/utils/auth'
// create an axios instance
const service = axios.create({
baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
withCredentials: true, // send cookies when cross-domain requests
// withCredentials: true, // send cookies when cross-domain requests
timeout: 5000 // request timeout
})

View File

@ -7,7 +7,7 @@
<PlatformDropdown v-model="postForm.platforms" />
<SourceUrlDropdown v-model="postForm.source_uri" />
<el-button v-loading="loading" style="margin-left: 10px;" type="success" @click="submitForm">
Publush
Publish
</el-button>
<el-button v-loading="loading" type="warning" @click="draftForm">
Draft
@ -36,7 +36,7 @@
</el-col>
<el-col :span="10">
<el-form-item label-width="120px" label="Publush Time:" class="postInfo-container-item">
<el-form-item label-width="120px" label="Publish Time:" class="postInfo-container-item">
<el-date-picker v-model="displayTime" type="datetime" format="yyyy-MM-dd HH:mm:ss" placeholder="Select date and time" />
</el-form-item>
</el-col>

View File

@ -1,6 +1,6 @@
<template>
<div class="login-container">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on" label-position="left">
<div class="title-container">
<h3 class="title">Login Form</h3>
@ -17,7 +17,7 @@
name="username"
type="text"
tabindex="1"
auto-complete="on"
autocomplete="on"
/>
</el-form-item>
@ -34,7 +34,7 @@
placeholder="Password"
name="password"
tabindex="2"
auto-complete="on"
autocomplete="on"
@keyup.native="checkCapslock"
@blur="capsTooltip = false"
@keyup.enter.native="handleLogin"