Merge branch 'dev-v1.0.0' of https://git.banshouhui.com/wuzhenzhe/study into dev-v1.0.0

package-lock.json

@@ -15256,6 +15256,16 @@
         "which-boxed-primitive": "^1.0.2"
       }
     },
+    "uni-read-pages": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/uni-read-pages/-/uni-read-pages-1.0.5.tgz",
+      "integrity": "sha512-GkrrZ0LX0vn9R5k6RKEi0Ez3Q3e2vUpjXQ8Z6/K/d28KudI9ajqgt8WEjQFlG5EPm1K6uTArN8LlqmZTEixDUA=="
+    },
+    "uni-simple-router": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/uni-simple-router/-/uni-simple-router-2.0.6.tgz",
+      "integrity": "sha512-n5gepoT3QcBrvVLeTCY/DjUjC4m1hNzwFlOa1VlCsww/4/34MGfvegpN9OWR8jOxxtUPKGHLAG0yODL/ITCwbw=="
+    },
     "unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",

package.json

@@ -29,6 +29,8 @@
     "core-js": "^3.6.5",
     "flyio": "^0.6.2",
     "regenerator-runtime": "^0.12.1",
+    "uni-read-pages": "^1.0.5",
+    "uni-simple-router": "^2.0.6",
     "vue": "^2.6.11",
     "vuex": "^3.2.0"
   },

src/App.vue

@@ -3,8 +3,6 @@ export default {
   onLaunch: function () {
     // 版本更新
     this.updateApp()
-    // 检查登录是否已过期
-    this.checkLogin()
   },
   onShow: function () {
     console.log('App Show')
@@ -13,27 +11,6 @@ export default {
     console.log('App Hide')
   },
   methods: {
-    checkLogin() {
-      if (this.vuex_token) {
-        uni.checkSession({
-          success: (result) => {
-            //session_key 未过期，并且在本生命周期一直有效
-            console.log("session未过期", result)
-          },
-          fail: (error) => {
-            // session_key 已经失效，需要重新执行登录流程
-            console.log("error", error)
-            this.$u.route({
-              url: 'pages/login/index'
-            })
-          }
-        })
-      } else {
-        this.$u.route({
-          url: 'pages/login/index'
-        })
-      }
-    },
     /* 版本更新 */
     updateApp() {
       if (uni.canIUse('getUpdateManager')) {

src/common/http.interceptor.js

@@ -45,7 +45,7 @@ const install = (Vue, vm) => {
 			vm.$u.toast('验证失败，请重新登录');
 			setTimeout(() => {
 				// 此为uView的方法，详见路由相关文档
-				vm.$u.route('/pages/user/login')
+				vm.$u.route('/pages/login/index')
 			}, 1500)
 			return false;
 		} else {

src/main.js

@@ -2,7 +2,8 @@ import Vue from 'vue'
 import App from './App'
 import store from '@/store'
 import vuexStore from "@/store/$u.mixin.js"
-
+import {router,RouterMount} from './router.js' 
+Vue.use(router)
 Vue.config.productionTip = false
 
 App.mpType = 'app'
@@ -24,4 +25,10 @@ Vue.use(httpInterceptor, app)
 import httpApi from '@/common/http.api.js'
 Vue.use(httpApi, app)
 
+// #ifdef H5
+RouterMount(app,router,'#app')
+// #endif
+
+// #ifndef H5
 app.$mount()
+// #endif

src/pages.json

@@ -5,6 +5,7 @@
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/index/index",
+			"name": "index",
 			"style": {
 				"navigationBarTitleText": "题库",
 				"navigationStyle": "custom",
@@ -13,6 +14,7 @@
 		},
 		{
 			"path": "pages/index/cert",
+			"name": "cert",
 			"style": {
 				"navigationBarTitleText": "证书",
 				"navigationStyle": "custom",
@@ -21,6 +23,7 @@
 		},
 		{
 			"path": "pages/index/mine",
+			"name": "mine",
 			"style": {
 				"navigationBarTitleText": "个人中心",
 				"disableScroll": true
@@ -33,6 +36,7 @@
 			"pages": [
 				{
 					"path": "index",
+					"name": "login",
 					"style": {
 						"navigationBarTitleText": "授权登录",
 						"enablePullDownRefresh": false,
@@ -46,6 +50,7 @@
 			"pages": [
 				{
 					"path": "detail",
+					"name": "learnDetail",
 					"style": {
 						"navigationBarTitleText": "题库详情"
 					}
@@ -67,6 +72,7 @@
 			"pages": [
 				{
 					"path": "detail",
+					"name": "certDetail",
 					"style": {
 						"navigationBarTitleText": "证书详情"
 					}
@@ -78,8 +84,8 @@
 			"pages": [
 				{
 					"path": "customer",
+					"name": "mineCustomer",
 					"style": {
-						"navigationStyle": "custom",
 						"navigationBarTitleText": "联系客服",
 						"enablePullDownRefresh": false,
 						"disableScroll": true

src/pages/index/mine.vue

@@ -14,7 +14,7 @@
 			<u-cell-group>
 				<u-cell-item icon="star" title="个人信息" value="完善度40%"></u-cell-item>
 				<u-cell-item icon="photo" title="我的题库"></u-cell-item>
-				<u-cell-item icon="coupon" title="联系客服"></u-cell-item>
+				<u-cell-item icon="coupon" title="联系客服" @tap="toUrl('pages/mine/customer')"></u-cell-item>
 				<u-cell-item icon="coupon" title="退出登录" @tap="logout"></u-cell-item>
 			</u-cell-group>
 		</view>
@@ -46,6 +46,11 @@
 					url: 'pages/login/index'
 				})
 			},
+			toUrl(url) {
+				this.$u.route({
+					url: url
+				})
+			},
 			logout() {
 				this.$u.vuex('vuex_token', '')
         this.$u.vuex('userInfo', {})

src/pages/login/index.vue

@@ -18,18 +18,8 @@ export default {
     }
   },
   onShow() {
-    this.checkLogin()
   },
   methods: {
-    checkLogin() {
-      if (this.vuex_token) {
-        uni.checkSession({
-          success: (result) => {
-            this.$u.route({ type: 'back' })
-          }
-        })
-      }
-    },
     wxLogin() {
       // 获取code 小程序专有，用户登录凭证。
       uni.getUserProfile({

src/pages/mine/customer.vue

+<template>
+	<view class="content">
+		<view>
+			<text class="title">{{title}}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				title: '我的客服'
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+	.content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.logo {
+		height: 200rpx;
+		width: 200rpx;
+		margin: 200rpx auto 50rpx auto;
+	}
+
+	.text-area {
+		display: flex;
+		justify-content: center;
+	}
+
+	.title {
+		font-size: 36rpx;
+		color: #8f8f94;
+	}
+</style>

src/router.js

+import { RouterMount, createRouter } from 'uni-simple-router'
+import store from '@/store/index.js'
+
+const router = createRouter({
+  platform: process.env.VUE_APP_PLATFORM,
+  routes: [...ROUTES],
+})
+
+// 检测登录白名单，无需登录也可访问的页面
+const whiteList = ['index', 'cert', 'mine', 'login']
+
+// 全局路由前置守卫
+router.beforeEach((to, from, next) => {
+  const token = store.state.vuex_token
+  // 进入需要授权的页面，未登录跳转
+  if (!whiteList.includes(to.name) && !token) {
+    next({ name: 'login', NAVTYPE: 'push' })
+  }
+  next()
+})
+
+// 全局路由后置守卫
+router.afterEach((to, from) => {
+  console.log('跳转结束')
+})
+
+export { router, RouterMount }

vue.config.js

+const TransformPages = require('uni-read-pages')
+const {webpack} = new TransformPages()
+module.exports = {
+	configureWebpack: {
+		plugins: [
+			new webpack.DefinePlugin({
+				ROUTES: webpack.DefinePlugin.runtimeValue(() => {
+					const tfPages = new TransformPages({
+						includes: ['path', 'name', 'aliasPath']
+					});
+					return JSON.stringify(tfPages.routes)
+				}, true )
+			})
+		]
+	}
+}
\ No newline at end of file