|
|
@@ -46,10 +46,10 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="x-login-wrap">
|
|
|
- <div class="login-tab">
|
|
|
+ <div class="login-tab" v-if="loginWay != 2">
|
|
|
<span @click="loginWay = 0" v-bind:class="{'active': loginWay === 0 }">密码登录</span>
|
|
|
<span @click="loginWay = 3" v-bind:class="{'active': loginWay === 3 }">短信登录</span>
|
|
|
- <span @click="getScan">微信登录</span>
|
|
|
+ <span @click="ShowWechatCoe(1)" v-bind:class="{'active': loginWay === 1 }" id="weChatBtn">微信登录</span>
|
|
|
</div>
|
|
|
<!--账号密码登录-->
|
|
|
<div class="x-login" v-if="loginWay === 0">
|
|
|
@@ -128,27 +128,21 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<!--微信扫码登录-->
|
|
|
- <div>
|
|
|
- <!--<div class="x-login scan-login" v-if="loginWay === 1">-->
|
|
|
- <!--<div class="x-login-form">-->
|
|
|
- <!--<div class="scan-header">-->
|
|
|
- <!--<span>微信登录</span>-->
|
|
|
- <!--<img src="images/logo/saoma.png" alt="" @click="loginWay = 0"/>-->
|
|
|
- <!--</div>-->
|
|
|
- <!--<div class="scan-body">-->
|
|
|
- <!--<div class="img">-->
|
|
|
- <!--<img src="/images/logo/sao.png" alt=""/>-->
|
|
|
- <!--</div>-->
|
|
|
- <!--<div class="content">-->
|
|
|
- <!--<img src="/images/logo/saosao.png" alt="">-->
|
|
|
- <!--<div>-->
|
|
|
- <!--<span>打开 <b>微信</b></span>-->
|
|
|
- <!--<div>扫一扫登录</div>-->
|
|
|
- <!--</div>-->
|
|
|
- <!--</div>-->
|
|
|
- <!--</div>-->
|
|
|
- <!--</div>-->
|
|
|
- <!--</div>-->
|
|
|
+ <div class="x-login scan-login" v-if="loginWay === 1">
|
|
|
+ <div class="x-login-form">
|
|
|
+ <div class="scan-body">
|
|
|
+ <div class="img">
|
|
|
+ <div id="login_container"></div>
|
|
|
+ </div>
|
|
|
+ <div class="content">
|
|
|
+ <img src="/images/logo/saosao.png" alt="">
|
|
|
+ <div>
|
|
|
+ <span>打开 <b>微信</b></span>
|
|
|
+ <div>扫一扫登录</div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<!--绑定账号-->
|
|
|
<div class="x-login bind-login" v-if="loginWay === 2">
|
|
|
@@ -208,9 +202,9 @@
|
|
|
<div v-html="loginStyle.footUrl || ''" class="footer"></div>
|
|
|
</div>
|
|
|
</template>
|
|
|
-
|
|
|
<script>
|
|
|
import Loading from '~components/common/loading/Loading.vue'
|
|
|
+ var wxLogin = function () {}
|
|
|
export default {
|
|
|
name: 'login',
|
|
|
components: {
|
|
|
@@ -400,6 +394,10 @@
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ ShowWechatCoe () {
|
|
|
+ wxLogin()
|
|
|
+ this.loginWay = 1
|
|
|
+ },
|
|
|
// 获取用户错误次数
|
|
|
validUserName () {
|
|
|
if (this.login.username) {
|
|
|
@@ -895,7 +893,7 @@
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
|
-<style lang="scss" type="text/scss" scoped>
|
|
|
+<style lang="scss" type="text/scss">
|
|
|
@import '~assets/scss/mixins';
|
|
|
@import '~assets/scss/variables';
|
|
|
.x-navbar{
|
|
|
@@ -1197,8 +1195,6 @@
|
|
|
}
|
|
|
}
|
|
|
.scan-login {
|
|
|
- box-shadow: -2px 1px 6px 0px rgba(0, 0, 0, 0.06);
|
|
|
- border-radius: 6px;
|
|
|
.x-login-form{
|
|
|
padding: 0;
|
|
|
.scan-header {
|
|
|
@@ -1226,24 +1222,26 @@
|
|
|
}
|
|
|
}
|
|
|
.scan-body {
|
|
|
- margin: 22px auto 0;
|
|
|
- padding-bottom: 38px;
|
|
|
+ margin: 0 auto;
|
|
|
+ padding: 22px 0 38px;
|
|
|
text-align: center ;
|
|
|
div.img{
|
|
|
+ position: relative;
|
|
|
margin: 0 auto;
|
|
|
width: 180px;
|
|
|
height: 182px;
|
|
|
line-height: 182px;
|
|
|
text-align: center;
|
|
|
- border: 1px solid #dcdcdc;
|
|
|
+ /*border: 1px solid #dcdcdc;*/
|
|
|
img{
|
|
|
width: 162px;
|
|
|
height: 165px;
|
|
|
}
|
|
|
}
|
|
|
+ #login_container{ position: absolute;left: -60px;top: -12px; z-index: 10;}
|
|
|
div.content {
|
|
|
width: 138px;
|
|
|
- margin: 58px auto 0;
|
|
|
+ margin: 38px auto 0;
|
|
|
text-align: center;
|
|
|
overflow: hidden;
|
|
|
img{
|
huangb