From f111683d5936c1fbb42b7fa29123c1fdf742c21f Mon Sep 17 00:00:00 2001
From: wally <18603454788@163.com>
Date: Tue, 10 Mar 2020 09:38:38 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=89=AB=E7=A0=81=E5=8A=9F=E8=83=BD=E5=AE=8C?=
=?UTF-8?q?=E5=96=84=202.=E9=A6=96=E9=A1=B5=E6=B7=BB=E5=8A=A0=E5=88=86?=
=?UTF-8?q?=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
main.js | 23 +-
pages.json | 5 -
pages/apply-code/apply-code.vue | 559 ++++++++++++++--------------
pages/basic-info/basic-info.vue | 36 +-
pages/healthy-card/healthy-card.vue | 14 -
pages/index/components/home.vue | 294 ++++++++-------
pages/index/index.vue | 15 +-
pages/user-code/user-code.vue | 11 +-
8 files changed, 490 insertions(+), 467 deletions(-)
delete mode 100644 pages/healthy-card/healthy-card.vue
diff --git a/main.js b/main.js
index 1b80ae1..c057d11 100644
--- a/main.js
+++ b/main.js
@@ -5,7 +5,15 @@ import App from './App';
import store from './store';
// 白名单页面
-const whitePathList = ['basic-info', 'statistics', 'user-code'];
+const whitePathList = [
+ 'basic-info',
+ 'statistics',
+ 'user-code',
+ 'sign',
+ 'my-signs',
+ 'my-code',
+ 'my-trips',
+];
/**
* 检查url是否在是否在白名单内
* @param {string} url path+query
@@ -27,19 +35,6 @@ Vue.prototype.goHome = () => {
});
};
-/**
- * 打开某个页面
- * @param {string} path 页面完成路径
- * @param {string} query 参数字符串a=x&b=y
- */
-
-// 白名单页面
-const whiteListPath = [
- '/pages/basic-info/basic-info',
- '/pages/statistics/statistics',
- '/pages/user-code/user-code',
-];
-
Vue.prototype.openPage = function(path, query = '') {
let url = query ? `${path}?${query}` : path;
store.commit('user/setPagePath', url);
diff --git a/pages.json b/pages.json
index 163196b..07431cb 100644
--- a/pages.json
+++ b/pages.json
@@ -68,11 +68,6 @@
"navigationBarTitleText": "我的行程"
}
},
- {
- "path": "pages/healthy-card/healthy-card",
- "style": {}
- },
-
{
"path": "pages/service-agreement/service-agreement",
"style": {
diff --git a/pages/apply-code/apply-code.vue b/pages/apply-code/apply-code.vue
index ff837d8..5ef2adb 100644
--- a/pages/apply-code/apply-code.vue
+++ b/pages/apply-code/apply-code.vue
@@ -1,293 +1,310 @@
-
-
+
+
+
+
+
diff --git a/pages/basic-info/basic-info.vue b/pages/basic-info/basic-info.vue
index d7b0e3a..2a3c55c 100644
--- a/pages/basic-info/basic-info.vue
+++ b/pages/basic-info/basic-info.vue
@@ -6,7 +6,7 @@
*姓名
*身份证
*联系方式
-
+
-
+