Merge branch 'master' of https://gitlab.ezijing.com/ezijing/transport-weapp-h5

src/components/beforeEnter/Before.js

@@ -6,14 +6,12 @@ export default class Before {
 
   async update(to, from, next) {
     if (to.meta.requiredLogin) {
-      const isLogin =
-        store.state.isLogin || (await store.dispatch('checkLogin'))
+      const isLogin = store.state.isLogin || (await store.dispatch('checkLogin'))
       if (isLogin) {
+        wx.miniProgram.postMessage({ data: { token: store.state.token } })
         next()
       } else {
-        store.state.isWeapp
-          ? wx.miniProgram.redirectTo({ url: '/pages/login/index' })
-          : next('/login')
+        store.state.isWeapp ? wx.miniProgram.redirectTo({ url: '/pages/login/index' }) : next('/login')
       }
       return
     }

src/pages/my/learned/index.vue

 <template>
-  <div class="learned"></div>
+  <div class="learned">
+    <div class="learned-header">
+      <h3 class="learned-header__title">选择已学课程：</h3>
+      <div class="learned-header__choose"></div>
+    </div>
+  </div>
 </template>
 
 <script>

src/router/routes.js

@@ -157,16 +157,25 @@ export default [
     component: () => import('../pages/pay/index.vue'),
     meta: { requiredLogin: true }
   },
+  // 下载资料
   {
     path: '/download',
     name: 'download',
     component: () => import('../pages/download/index.vue'),
     meta: { requiredLogin: true }
   },
+  // 学习提醒
   {
     path: '/my/alarm',
     name: 'MyAlarm',
     component: () => import('../pages/my/alarm/index.vue'),
     meta: { requiredLogin: true }
+  },
+  // 已学课程
+  {
+    path: '/my/learned',
+    name: 'MyLearned',
+    component: () => import('../pages/my/learned/index.vue'),
+    meta: { requiredLogin: true }
   }
 ]

src/store/index.js

 import Vue from 'vue'
 import Vuex from 'vuex'
+import Cookies from 'js-cookie'
+
 import { getUser, logout } from '@/api/account'
 Vue.use(Vuex)
 export default new Vuex.Store({
@@ -38,10 +40,12 @@ export default new Vuex.Store({
       const isLogin = await getUser()
         .then(response => {
           commit('setUser', response)
+          commit('setToken', Cookies.get('TGC'))
           return true
         })
         .catch(() => {
           commit('setUser', {})
+          commit('setToken', '')
           return false
         })
       commit('setIsLogin', isLogin)