From 86cbc11db3b3177df9cbdc19e38878d6a3c3b2a5 Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Tue, 5 Jun 2018 16:39:14 +0800
Subject: [PATCH] =?UTF-8?q?feature[litemall-admin]:=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E7=99=BB=E9=99=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E7=9B=AE=E5=89=8D=E4=B8=8D=E6=94=AF=E6=8C=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 litemall-admin/src/permission.js              |  2 +-
 litemall-admin/src/router/index.js            |  1 -
 .../src/views/login/authredirect.vue          | 10 ---
 litemall-admin/src/views/login/index.vue      | 53 +--------------
 .../src/views/login/socialsignin.vue          | 68 -------------------
 5 files changed, 3 insertions(+), 131 deletions(-)
 delete mode 100644 litemall-admin/src/views/login/authredirect.vue
 delete mode 100644 litemall-admin/src/views/login/socialsignin.vue

diff --git a/litemall-admin/src/permission.js b/litemall-admin/src/permission.js
index 73ec8946..e9937a51 100644
--- a/litemall-admin/src/permission.js
+++ b/litemall-admin/src/permission.js
@@ -14,7 +14,7 @@ function hasPermission(roles, permissionRoles) {
   return roles.some(role => permissionRoles.indexOf(role) >= 0)
 }
 
-const whiteList = ['/login', '/authredirect']// no redirect whitelist
+const whiteList = ['/login']// no redirect whitelist
 
 router.beforeEach((to, from, next) => {
   NProgress.start() // start progress bar
diff --git a/litemall-admin/src/router/index.js b/litemall-admin/src/router/index.js
index 35b95a6c..35ed5fd1 100644
--- a/litemall-admin/src/router/index.js
+++ b/litemall-admin/src/router/index.js
@@ -29,7 +29,6 @@ import Layout from '../views/layout/Layout'
 **/
 export const constantRouterMap = [
   { path: '/login', component: _import('login/index'), hidden: true },
-  { path: '/authredirect', component: _import('login/authredirect'), hidden: true },
   { path: '/404', component: _import('error/404'), hidden: true },
   { path: '/401', component: _import('error/401'), hidden: true },
   {
diff --git a/litemall-admin/src/views/login/authredirect.vue b/litemall-admin/src/views/login/authredirect.vue
deleted file mode 100644
index 7cf37e81..00000000
--- a/litemall-admin/src/views/login/authredirect.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<script>
-  export default {
-    name: 'authredirect',
-    created() {
-      const hash = window.location.search.slice(1)
-      window.opener.location.href = window.location.origin + '/login#' + hash
-      window.close()
-    }
-  }
-</script>
diff --git a/litemall-admin/src/views/login/index.vue b/litemall-admin/src/views/login/index.vue
index 880f7328..b92048dd 100644
--- a/litemall-admin/src/views/login/index.vue
+++ b/litemall-admin/src/views/login/index.vue
@@ -2,7 +2,7 @@
   <div class="login-container">
     <el-form class="login-form" autoComplete="on" :model="loginForm" :rules="loginRules" ref="loginForm" label-position="left">
       <div class="title-container">
-        <h3 class="title">系统登录</h3>
+        <h3 class="title">管理员登录</h3>
       </div>
       <el-form-item prop="username">
         <span class="svg-container svg-container_login">
@@ -27,26 +27,13 @@
         <span>管理员用户名 : admin123</span>
         <span>管理员密码 : admin123</span>
       </div>
-
-      <el-button class="thirdparty-button" type="primary" @click="showDialog=true">第三方登录</el-button>
     </el-form>
 
-    <el-dialog title="第三方登录" :visible.sync="showDialog" append-to-body>
-      本地不能模拟，请结合自己业务进行模拟！！！
-      <br/>
-      <br/>
-      <br/>
-      <social-sign />
-    </el-dialog>
-
   </div>
 </template>
 
 <script>
-import SocialSign from './socialsignin'
-
 export default {
-  components: { SocialSign },
   name: 'login',
   data() {
     const validateUsername = (rule, value, callback) => {
@@ -73,8 +60,7 @@ export default {
         password: [{ required: true, trigger: 'blur', validator: validatePassword }]
       },
       passwordType: 'password',
-      loading: false,
-      showDialog: false
+      loading: false
     }
   },
   methods: {
@@ -99,31 +85,7 @@ export default {
           return false
         }
       })
-    },
-    afterQRScan() {
-      // const hash = window.location.hash.slice(1)
-      // const hashObj = getQueryObject(hash)
-      // const originUrl = window.location.origin
-      // history.replaceState({}, '', originUrl)
-      // const codeMap = {
-      //   wechat: 'code',
-      //   tencent: 'code'
-      // }
-      // const codeName = hashObj[codeMap[this.auth_type]]
-      // if (!codeName) {
-      //   alert('第三方登录失败')
-      // } else {
-      //   this.$store.dispatch('LoginByThirdparty', codeName).then(() => {
-      //     this.$router.push({ path: '/' })
-      //   })
-      // }
     }
-  },
-  created() {
-    // window.addEventListener('hashchange', this.afterQRScan)
-  },
-  destroyed() {
-    // window.removeEventListener('hashchange', this.afterQRScan)
   }
 }
 </script>
@@ -210,12 +172,6 @@ $light_gray:#eee;
       text-align: center;
       font-weight: bold;
     }
-    .set-language {
-      color: #fff;
-      position: absolute;
-      top: 5px;
-      right: 0px;
-    }
   }
   .show-pwd {
     position: absolute;
@@ -226,10 +182,5 @@ $light_gray:#eee;
     cursor: pointer;
     user-select: none;
   }
-  .thirdparty-button {
-    position: absolute;
-    right: 35px;
-    bottom: 28px;
-  }
 }
 </style>
diff --git a/litemall-admin/src/views/login/socialsignin.vue b/litemall-admin/src/views/login/socialsignin.vue
deleted file mode 100644
index bdd11120..00000000
--- a/litemall-admin/src/views/login/socialsignin.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
-  <div class="social-signup-container">
-    <div class="sign-btn" @click="wechatHandleClick('wechat')">
-      <span class="wx-svg-container"><svg-icon icon-class="wechat" class="icon"></svg-icon></span> 微信
-    </div>
-    <div class="sign-btn" @click="tencentHandleClick('tencent')">
-      <span class="qq-svg-container"><svg-icon icon-class="qq" class="icon"></svg-icon></span> QQ
-    </div>
-  </div>
-</template>
-
-<script>
-import openWindow from '@/utils/openWindow'
-
-export default {
-  name: 'social-signin',
-  methods: {
-    wechatHandleClick(thirdpart) {
-      this.$store.commit('SET_AUTH_TYPE', thirdpart)
-      const appid = 'xxxxx'
-      const redirect_uri = encodeURIComponent('xxx/redirect?redirect=' + window.location.origin + '/authredirect')
-      const url = 'https://open.weixin.qq.com/connect/qrconnect?appid=' + appid + '&redirect_uri=' + redirect_uri + '&response_type=code&scope=snsapi_login#wechat_redirect'
-      openWindow(url, thirdpart, 540, 540)
-    },
-    tencentHandleClick(thirdpart) {
-      this.$store.commit('SET_AUTH_TYPE', thirdpart)
-      const client_id = 'xxxxx'
-      const redirect_uri = encodeURIComponent('xxx/redirect?redirect=' + window.location.origin + '/authredirect')
-      const url = 'https://graph.qq.com/oauth2.0/authorize?response_type=code&client_id=' + client_id + '&redirect_uri=' + redirect_uri
-      openWindow(url, thirdpart, 540, 540)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-	.social-signup-container {
-	  margin: 20px 0;
-	  .sign-btn {
-	    display: inline-block;
-	    cursor: pointer;
-	  }
-	  .icon {
-	    color: #fff;
-	    font-size: 30px;
-	    margin-top: 6px;
-	  }
-	  .wx-svg-container,
-	  .qq-svg-container {
-	    display: inline-block;
-	    width: 40px;
-	    height: 40px;
-	    line-height: 40px;
-	    text-align: center;
-	    padding-top: 1px;
-	    border-radius: 4px;
-	    margin-bottom: 20px;
-	    margin-right: 5px;
-	  }
-	  .wx-svg-container {
-	    background-color: #8dc349;
-	  }
-	  .qq-svg-container {
-	    background-color: #6BA2D6;
-	    margin-left: 50px;
-	  }
-	}
-</style>