ytj

build/webpack.base.conf.js

@@ -71,7 +71,7 @@ module.exports = {
         test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
         loader: 'url-loader',
         options: {
-          limit: 10000,
+          limit: 10000000,
           name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
         }
       }

package.json

@@ -46,6 +46,7 @@
     "friendly-errors-webpack-plugin": "^1.6.1",
     "html-webpack-plugin": "^2.30.1",
     "node-notifier": "^5.1.2",
+    "node-sass": "^4.9.3",
     "optimize-css-assets-webpack-plugin": "^3.2.0",
     "ora": "^1.2.0",
     "portfinder": "^1.0.13",
@@ -53,12 +54,14 @@
     "postcss-loader": "^2.0.8",
     "postcss-url": "^7.2.1",
     "rimraf": "^2.6.0",
+    "sass-loader": "^7.1.0",
     "semver": "^5.3.0",
     "shelljs": "^0.7.6",
     "uglifyjs-webpack-plugin": "^1.1.1",
     "url-loader": "^0.5.8",
+    "vue-lazyload": "^1.2.6",
     "vue-loader": "^13.3.0",
-    "vue-style-loader": "^3.0.1",
+    "vue-style-loader": "^3.1.2",
     "vue-template-compiler": "^2.5.2",
     "webpack": "^3.6.0",
     "webpack-bundle-analyzer": "^2.9.0",

src/config/index.js

@@ -1,6 +1,6 @@
 export default {
   appid: 'wx7320287e057bbeee',
-  redirect_uri: encodeURIComponent(window.location.href),
+  redirect_uri: encodeURIComponent(window.location.href + '#/index'),
   response_type: 'code',
   scope: 'snsapi_userinfo',
   state: '12313'

src/page/getCode/index.vue

@@ -0,0 +1,15 @@
+<template>
+  <div></div>
+</template>
+
+<script>
+import wechatConfig from '@/config/index'
+export default {
+  created () {
+    let url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${wechatConfig.appid}&redirect_uri=${wechatConfig.redirect_uri}&response_type=${wechatConfig.response_type}&scope=${wechatConfig.scope}&state=${wechatConfig.state}#wechat_redirect`
+    window.location.href = url
+  }
+}
+</script>
+ <style lang="scss" scoped>
+</style>

src/page/index/index.vue

@@ -167,9 +167,11 @@ export default {
     }
   },
   created () {
-    this.getUserInfo({ luckdrawid: this.lotteryId }).then((res) => {
+    console.log(this.toolClass.UrlSearch(location.search))
+    localStorage.setItem('code', this.toolClass.UrlSearch(location.search).code)
+    this.code = localStorage.getItem('code')
+    this.getUserInfo({ code: this.code, luckdrawid: this.lotteryId }).then((res) => {
       this.data.userInfo = this.userInfo
-      console.log(this.data.userInfo)
       if (this.data.userInfo.record) {
         this.winning = this.data.userInfo.record.PrizeName
         this.showDialog = true
@@ -276,5 +278,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@font-face {
+  font-family: myFont;
+  src: url("../../assets/hkhb.ttf")
+}
 @import "page.scss";
 </style>

src/page/index/page.scss

@@ -1,7 +1,4 @@
-@font-face {
-  font-family: myFont;
-  src: url("../../assets/font/hkhb.ttf")
-}
+// @import  '../../assets/hkhb.ttf'
 body * {
   font-family: myFont;
 }

src/page/lotteryList/index.vue

@@ -31,7 +31,8 @@ export default {
     })
   },
   created () {
-    this.getUserInfo({ luckdrawid: this.lotteryId }).then((res) => {
+    this.code = localStorage.getItem('code')
+    this.getUserInfo({ code: this.code, luckdrawid: this.lotteryId }).then((res) => {
       this.data.userInfo = this.userInfo
       this.getLotteryList({ userid: this.data.userInfo.user.Id }).then((res) => {
         this.data.list = this.list

src/router/index.js

@@ -1,5 +1,6 @@
 import Vue from 'vue'
 import Router from 'vue-router'
+import getCode from '@/page/getCode'
 import index from '@/page/index'
 import lotteryList from '@/page/lotteryList'
 import lotteryDetail from '@/page/lotteryDetail'
@@ -10,11 +11,13 @@ export default new Router({
   routes: [
     {
       path: '/',
+      name: 'getCode',
+      component: getCode
+    },
+    {
+      path: '/index',
       name: 'index',
-      component: index,
-      meta: {
-        id: '1'
-      }
+      component: index
     },
     {
       path: '/lotteryList',

src/store/app.js

@@ -5,20 +5,16 @@ const http = {}
 // 请求数据
 http.getUserInfo = (data) => {
   return new Promise((resolve, reject) => {
-    Ajax(api.system.getCode.url, {
-      method: api.system.getCode.method
-    }).then((result) => {
-      Ajax(api.lottery.userInfo.url, {
-        method: api.lottery.userInfo.method,
-        queryData: {
-          code: result.code,
-          luckdrawid: data.luckdrawid
-        }
-      }).then(res => {
-        resolve(res)
-      }).catch((err) => {
-        reject(err)
-      })
+    Ajax(api.lottery.userInfo.url, {
+      method: api.lottery.userInfo.method,
+      queryData: {
+        code: data.code,
+        luckdrawid: data.luckdrawid
+      }
+    }).then(res => {
+      resolve(res)
+    }).catch((err) => {
+      reject(err)
     })
   })
 }

src/util/api.js

@@ -1,5 +1,4 @@
-import wechatConfig from '@/config/index'
-const baseUrl = '/api'
+const baseUrl = '/check-api'
 const wechat = ''
 
 const $api = {
@@ -28,12 +27,6 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${wechat}/user/record/:id`
     }
-  },
-  system: {
-    getCode: {
-      method: 'get',
-      url: `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${wechatConfig.appid}&redirect_uri=${wechatConfig.redirect_uri}&response_type=${wechatConfig.response_type}&scope=${wechatConfig.scope}&state=${wechatConfig.state}#wechat_redirect`
-    }
   }
 }
 export default $api

src/util/util.js

@@ -1,3 +1,4 @@
+import wechatConfig from '@/config/index'
 const toolClass = {
   dateFormat: (timestamp) => {
     let date = new Date(timestamp)
@@ -19,6 +20,22 @@ const toolClass = {
       min = '0' + min
     }
     return y + '-' + m + '-' + d + ' ' + h + ':' + min
+  },
+  UrlSearch: (urls) => {
+    let url = urls // 获取url中"?"符后的字串
+    let theRequest = {}
+    if (url.indexOf('?') !== -1) {
+      let str = url.substr(1)
+      let strs = str.split('&')
+      for (var i = 0; i < strs.length; i++) {
+        theRequest[strs[i].split('=')[0]] = unescape(strs[i].split('=')[1])
+      }
+    }
+    return theRequest
+  },
+  getCode: () => {
+    let url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${wechatConfig.appid}&redirect_uri=${wechatConfig.redirect_uri}&response_type=${wechatConfig.response_type}&scope=${wechatConfig.scope}&state=${wechatConfig.state}#wechat_redirect`
+    window.location.href = url
   }
 }