Merge branch 'master' of http://git.ycjcjy.com/honghe/h5-draw-lots

src/main.js

@@ -8,8 +8,7 @@ redirect()
 
 Vue.config.productionTip = false
 
-new Vue({
+const app = new Vue({
   router,
-
   render: h => h(App),
 }).$mount('#app')

src/pages/Honghe.vue

@@ -23,7 +23,7 @@
 </template>
 
 <script>
-// const indexJPG = new Array(12).fill(0)
+import { useModel } from '@/store'
 
 export default {
   name: 'Honghe',
@@ -36,6 +36,24 @@ export default {
       showPopup: false
     }
   },
+  computed: {
+    person: {
+      get () {
+        return useModel('person')[0]
+      },
+      set (val) {
+        useModel('person')[1](val)
+      }
+    }
+  },
+  watch: {
+    person: {
+      handler(val) {
+        console.log('-----watch---person----', val)
+      },
+      immediate: true
+    }
+  },
   methods: {
     //关闭
     cancelFrom() {

src/router/index.js

@@ -4,13 +4,14 @@ import Vue from 'vue'
 import Router from 'vue-router'
 import Honghe from '../pages/Honghe.vue'
 import SaveShare from '../pages/SaveShare.vue'
-// import Login from '@/Login.vue'
+import { useModel } from '../store'
+import { getOpenId } from '../utils/wx'
+import { login } from '../services/person'
+import { setToken } from '../utils/token'
 
 Vue.use(Router)
 
-export default new Router({
-
-
+const router = new Router({
   routes: [
 
     //面页
@@ -26,11 +27,26 @@ export default new Router({
       component: SaveShare,
 
     },
+  ]
+})
 
+router.beforeEach((to, from, next) => {
 
+  const [person, setPerson] = useModel('person')
 
+  // 未登录
+  if (!person.personId) {
+    getOpenId().then(openid => {
+      login(openid).then(res => {
+        const { user, token } = res;
+        setPerson(user)
+        setToken(token)
+      })
+    })
+  }
 
-
-  ]
+  // 未登录的正常进行页面加载, 不需要进行页面控制
+  next()
 })
 
+export default router;

src/services/person.js

@@ -2,6 +2,17 @@
 import request from "../utils/request";
 import { baseURL } from "../utils/request";
 
+
+/**
+ * 登录
+ * @param {*} person 
+ * @returns 
+ */
+export function login(openid) {
+  const url = `${baseURL}/login`
+  return request(url, { method: 'POST', body: JSON.stringify({ openid }) })
+}
+
 /**
  * 更新人员信息
  * @param {*} person 

src/store/createStore.js

@@ -0,0 +1,28 @@
+/**
+ * 简易版 store 实现
+ */
+
+import Vue from "vue";
+
+/**
+  * 构建 store, 所有 model 只能通过 initailStates 传递
+  * @param {*} initailStates 
+  */
+export default function createStore(initailStates = {}) {
+  const store = new Vue({
+    data: { $$state: initailStates }
+  })
+
+  function getState(modelName) {
+    return store._data.$$state[modelName]
+  }
+
+  function updateState(modelName, payload) {
+    Vue.set(store._data.$$state, modelName, payload)
+  }
+
+  return {
+    getState,
+    updateState
+  }
+}

src/store/index.js

@@ -0,0 +1,19 @@
+
+import createStore from "./createStore"
+
+const models = {
+  person: {}
+}
+
+const store = createStore(models)
+
+export default store;
+
+export function useModel(modelName) {
+  const state = store.getState(modelName)
+  const update = (value) => {
+    store.updateState(modelName, value)
+  }
+
+  return [state, update]
+}

src/utils/request.js

@@ -1,6 +1,14 @@
 
+import { getToken } from './token'
+
 export default function request (url, options) {
-  return fetch(url, options)
+  const headers = new Headers();
+  headers.append('Content-Type', 'application/json;charset=utf8');
+  headers.append('X-Authorization-JWT', getToken());
+
+  Object.keys(options.headers || {}).forEach(key => headers.append(key, options.headers[key]))
+
+  return fetch(url, {...options, headers })
     .then(response => response.json())
     .then(data => {
       if (data.code === 1000) return data.data
@@ -9,5 +17,5 @@ export default function request (url, options) {
 }
 
 export const baseURL = process.env.NODE_ENV === 'development' ?
-  'http://192.168.1.147:8080/wx' :
-  '/'
+  '/api/wx' :
+  '/api/wx'

src/utils/token.js

@@ -0,0 +1,10 @@
+
+let token = null;
+
+export function setToken(t) {
+  token = t
+}
+
+export function getToken() {
+  return token
+}