From 2f2c1cb7f953411c5a648d9a44a18dfaddced12e Mon Sep 17 00:00:00 2001
From: wangjiahai <1556608@qq.com>
Date: Thu, 23 Nov 2023 18:06:43 +0800
Subject: [PATCH] 1111

---
 main.js    |  3 ---
 pages.json | 15 +++++++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/main.js b/main.js
index 83a4af2..ab4974b 100644
--- a/main.js
+++ b/main.js
@@ -4,9 +4,6 @@ import Vue from 'vue'
 // vuex
 import store from './store'
 
-import mixin from './common/mixin'
-Vue.mixin(mixin)
-
 import api from '@/common/request.api.js'
 Vue.prototype.$api = api
 
diff --git a/pages.json b/pages.json
index 4fd1062..0480bba 100644
--- a/pages.json
+++ b/pages.json
@@ -38,6 +38,13 @@
 					"scrollIndicator": false //禁用原生导航栏,
 				}
 			}
+		},
+		{
+			"path": "pages/card/card_booking",
+			"style": {
+				"navigationBarTitleText": "预约提货",
+				"enablePullDownRefresh": false
+			}
 		}
 	],
 	"globalStyle": {
@@ -53,10 +60,14 @@
 		"backgroundColor": "#ffffff",
 		"list": [{
 			"pagePath": "pages/card/card",
-			"text": "首页"
+			"text": "礼包",
+			"iconPath": "static/ze_bag_1.png",
+			"selectedIconPath": "static/ze_bag2.png"
 		}, {
 			"pagePath": "pages/home/UserFragment",
-			"text": "我的"
+			"text": "兑换记录",
+			"iconPath": "static/ze_underway1.png",
+			"selectedIconPath": "static/ze_underway2.png"
 		}]
 	},
 	"uniIdRouter": {}