Browse Source

login openid

charblus 5 years ago
parent
commit
5ddc721c13
4 changed files with 48 additions and 45 deletions
  1. 9 9
      build/webpack.base.conf.js
  2. 1 17
      src/App.vue
  3. 2 1
      src/config.js
  4. 36 18
      src/pages/me/Me.vue

+ 9 - 9
build/webpack.base.conf.js

@@ -54,15 +54,15 @@ let baseWebpackConfig = {
   },
   module: {
     rules: [
-      {
-        test: /\.(js|vue)$/,
-        loader: 'eslint-loader',
-        enforce: 'pre',
-        include: [resolve('src'), resolve('test')],
-        options: {
-          formatter: require('eslint-friendly-formatter')
-        }
-      },
+      // {
+      //   test: /\.(js|vue)$/,
+      //   loader: 'eslint-loader',
+      //   enforce: 'pre',
+      //   include: [resolve('src'), resolve('test')],
+      //   options: {
+      //     formatter: require('eslint-friendly-formatter')
+      //   }
+      // },
       {
         test: /\.vue$/,
         loader: 'mpvue-loader',

+ 1 - 17
src/App.vue

@@ -1,24 +1,8 @@
 
 <script>
-import {showSuccess} from '@/util'
-import config from '@/config'
-import qcloud from 'wafer2-client-sdk'
+
 export default {
   async created () {
-    let user = wx.getStorageSync('userInfo')
-    if (!user) {
-      qcloud.setLoginUrl(config.loginUrl)
-      qcloud.login({
-        success: function (userInfo) {
-          showSuccess('登录成功')
-          wx.setStorageSync('userInfo', userInfo)
-        },
-        fail: function (err) {
-          console.log('登录失败', err)
-        }
-      })
-    }
-
     // const res = await get('/weapp/demo')
     // console.log(123, res)
     // wx.request({

+ 2 - 1
src/config.js

@@ -4,6 +4,7 @@ const host = 'http://localhost:5757'
 
 const config = {
   host,
-  loginUrl: `${host}/weapp/login`
+  loginUrl: `${host}/weapp/login`,
+  userUrl: `${host}/weapp/user`
 }
 export default config

+ 36 - 18
src/pages/me/Me.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="container">
-    <button  open-type="getUserInfo" @click="login">登录</button>
+    <button v-if='!userinfo.openId'  open-type="getUserInfo" @click="login">登录</button>
     <div class="userinfo" >
       <img :src="userInfo.avatarUrl" alt="">
       <p>{{userInfo.nickName}}</p>
     </div>
     <YearProgress></YearProgress>
-    <button @click="scanBook" class='btn'>添加图书</button>
+    <button v-if='userinfo.openId' @click="scanBook" class='btn'>添加图书</button>
   </div>
 </template>
 
@@ -21,29 +21,47 @@ export default {
   },
   data () {
     return {
-      isLogin: false,
-      userInfo: { }
+      userInfo: {
+        avatarUrl: '../../../static/img/unlogin.png',
+        nickName: '未登录'
+      }
     }
   },
   methods: {
     login () {
-      qcloud.setLoginUrl(config.loginUrl)
-      qcloud.login({
-        success: function (userInfo) {
-          console.log('登录成功', userInfo)
-          showSuccess('登录成功')
-          wx.setStorageSync('userInfo', userInfo)
-        },
-        fail: function (err) {
-          console.log('登录失败', err)
-        }
-      })
-      this.userInfo = wx.getStorageSync('userInfo')
+      let user = wx.getStorageSync('userInfo')
+      if (!user) {
+        qcloud.setLoginUrl(config.loginUrl)
+        qcloud.login({
+          success: (userInfo) => {
+            qcloud.request({
+              url: config.userUrl,
+              login: true,
+              success: (userRes) => {
+                showSuccess('登录成功')
+                wx.setStorageSync('userInfo', userRes.data.data)
+                this.userInfo = userRes.data.data
+              }
+            })
+          },
+          fail: function (err) {
+            console.log('登录失败', err)
+          }
+        })
+      }
+    },
+    onShow () {
+      let userInfo = wx.getStorageSync('userInfo')
+      if (userInfo) {
+        this.userInfo = userInfo
+      }
     },
     scanBook () {
       wx.scanCode({
-        success (res) {
-          console.log(res)
+        success: (res) => {
+          if (res.result) {
+            console.log(res.result)
+          }
         }
       })
     }