diff --git a/pages.json b/pages.json
index a918896..60ec098 100644
--- a/pages.json
+++ b/pages.json
@@ -77,7 +77,7 @@
 	"subPackages": [{
 		"root": "pages/sub_basic",
 		"pages": [{
-				"path": "register/index",
+				"path": "register",
 				"style": {
 					"navigationBarTitleText": "注册",
 					"app-plus": {
@@ -86,7 +86,7 @@
 				}
 			},
 			{
-				"path": "login/index",
+				"path": "login",
 				"style": {
 					"navigationBarTitleText": "登录",
 					"app-plus": {
@@ -95,13 +95,13 @@
 				}
 			},
 			{
-				"path": "network/index",
+				"path": "network",
 				"style": {
 					"navigationBarTitleText": "网络错误"
 				}
 			},
 			{
-				"path": "forgetPwd/index",
+				"path": "forgetPwd",
 				"style": {
 					"navigationBarTitleText": "忘记密码",
 					"app-plus": {
@@ -110,13 +110,13 @@
 				}
 			},
 			{
-				"path": "verification/index",
+				"path": "verification",
 				"style": {
 					"navigationBarTitleText": "手机认证"
 				}
 			},
 			{
-				"path": "forgetPwd/question",
+				"path": "question",
 				"style": {
 					"navigationBarTitleText": "密保验证"
 				}
@@ -126,13 +126,13 @@
 	}, {
 		"root": "pages/sub_index",
 		"pages": [{
-				"path": "activeDetails/index",
+				"path": "activeDetails",
 				"style": {
 					"navigationBarTitleText": "活动详情"
 				}
 			},
 			{
-				"path": "issueQuestion/index",
+				"path": "issueQuestion",
 				"style": {
 					"navigationBarTitleText": "发布咨询",
 					"app-plus": {
@@ -141,7 +141,7 @@
 				}
 			},
 			{
-				"path": "qrcode/index",
+				"path": "qrcode",
 				"style": {
 					"navigationBarTitleText": "我的码",
 					"app-plus": {
@@ -150,7 +150,7 @@
 				}
 			},
 			{
-				"path": "introduce/index",
+				"path": "introduce",
 				"style": {
 					"navigationBarTitleText": "市民卡简介",
 					"app-plus": {
@@ -159,37 +159,37 @@
 				}
 			},
 			{
-				"path": "getCityCard/index",
+				"path": "getCityCard",
 				"style": {
 					"navigationBarTitleText": "市民卡办理"
 				}
 			},
 			{
-				"path": "activateCard/index",
+				"path": "activateCard",
 				"style": {
 					"navigationBarTitleText": "开卡"
 				}
 			},
 			{
-				"path": "cardApply/index",
+				"path": "cardApply",
 				"style": {
 					"navigationBarTitleText": "卡应用"
 				}
 			},
 			{
-				"path": "chat/index",
+				"path": "chat",
 				"style": {
 					"navigationBarTitleText": "咨询"
 				}
 			},
 			{
-				"path": "chatIssue/index",
+				"path": "chatIssue",
 				"style": {
 					"navigationBarTitleText": "咨询库"
 				}
 			},
 			{
-				"path": "offlineHelp/index",
+				"path": "offlineHelp",
 				"style": {
 					"navigationBarTitleText": "网点查询",
 					"app-plus": {
@@ -203,25 +203,25 @@
 				}
 			},
 			{
-				"path": "question/index",
+				"path": "question",
 				"style": {
 					"navigationBarTitleText": "常见问题"
 				}
 			},
 			{
-				"path": "busRecords/index",
+				"path": "busRecords",
 				"style": {
 					"navigationBarTitleText": "乘车记录"
 				}
 			},
 			{
-				"path": "chatDetails/index",
+				"path": "chatDetails",
 				"style": {
 					"navigationBarTitleText": "详情"
 				}
 			},
 			{
-				"path": "scanView/index",
+				"path": "scanView",
 				"style": {
 					"navigationBarTitleText": "二维码扫描结果",
 					"app-plus": {
@@ -230,7 +230,7 @@
 				}
 			},
 			{
-				"path": "scanView/pay",
+				"path": "pay",
 				"style": {
 					"navigationBarTitleText": "二维码扫描结果",
 					"app-plus": {
@@ -242,13 +242,13 @@
 	}, {
 		"root": "pages/sub_mine",
 		"pages": [{
-				"path": "reportheLoss/index",
+				"path": "reportheLoss",
 				"style": {
 					"navigationBarTitleText": "挂失"
 				}
 			},
 			{
-				"path": "lock/index",
+				"path": "lock",
 				"style": {
 					"navigationBarTitleText": "手势解锁",
 					"app-plus": {
@@ -261,7 +261,7 @@
 				}
 			},
 			{
-				"path": "billsDetails/index",
+				"path": "billsDetails",
 				"style": {
 					"navigationBarTitleText": "账单详情",
 					"app-plus": {
@@ -270,55 +270,61 @@
 				}
 			},
 			{
-				"path": "accountSafe/index",
+				"path": "shop",
+				"style": {
+					"navigationBarTitleText": "商户管理"
+				}
+			},
+			{
+				"path": "accountSafe",
 				"style": {
 					"navigationBarTitleText": "账户安全"
 				}
 			},
 			{
-				"path": "bindBankCard/index",
+				"path": "bindBankCard",
 				"style": {
 					"navigationBarTitleText": "绑定市民卡"
 				}
 			},
 			{
-				"path": "changeLoginPwd/index",
+				"path": "changeLoginPwd",
 				"style": {
 					"navigationBarTitleText": "修改登录密码"
 				}
 			},
 			{
-				"path": "changePayPwd/index",
+				"path": "changePayPwd",
 				"style": {
 					"navigationBarTitleText": "设置支付密码"
 				}
 			},
 			{
-				"path": "findPayPwd/index",
+				"path": "findPayPwd",
 				"style": {
 					"navigationBarTitleText": "找回密码"
 				}
 			},
 			{
-				"path": "otherPay/index",
+				"path": "otherPay",
 				"style": {
 					"navigationBarTitleText": "支付(指纹)"
 				}
 			},
 			{
-				"path": "otherLogin/index",
+				"path": "otherLogin",
 				"style": {
 					"navigationBarTitleText": "指纹/手势/人脸登录"
 				}
 			},
 			{
-				"path": "leaveMsgDetail/index",
+				"path": "leaveMsgDetail",
 				"style": {
 					"navigationBarTitleText": "留言详情"
 				}
 			},
 			{
-				"path": "cashFlow/index",
+				"path": "cashFlow",
 				"style": {
 					"navigationBarTitleText": "我的足迹",
 					"app-plus": {
@@ -327,79 +333,85 @@
 				}
 			},
 			{
-				"path": "agreement/index",
+				"path": "agreement",
 				"style": {
 					"navigationBarTitleText": "用户协议"
 				}
 			},
 			{
-				"path": "bindSxy/index",
+				"path": "bindSxy",
 				"style": {
 					"navigationBarTitleText": "签约"
 				}
 			},
 			{
-				"path": "agreementSign/index",
+				"path": "agreementSign",
 				"style": {
 					"navigationBarTitleText": "市民卡免密代扣签约协议"
 				}
 			},
 			{
-				"path": "unbindBankCard/index",
+				"path": "unbindBankCard",
 				"style": {
 					"navigationBarTitleText": "解绑市民卡"
 				}
 			},
 			{
-				"path": "personalMsg/index",
+				"path": "personalMsg",
 				"style": {
 					"navigationBarTitleText": "我的信息"
 				}
 			},
 			{
-				"path": "leaveMsg/index",
+				"path": "leaveMsg",
 				"style": {
 					"navigationBarTitleText": "留言"
 				}
 			},
 			{
-				"path": "message/index",
+				"path": "message",
 				"style": {
-					"navigationBarTitleText": "我的消息"
+					"navigationBarTitleText": "消息"
 				}
 			},
 			{
-				"path": "integral/index",
+				"path": "integral",
 				"style": {
 					"navigationBarTitleText": "我的积分"
 				}
 			},
 			{
-				"path": "voucher/index",
+				"path": "voucher",
 				"style": {
 					"navigationBarTitleText": "我的卡券"
 				}
 			},
 			{
-				"path": "bindEmail/index",
+				"path": "bindEmail",
 				"style": {
 					"navigationBarTitleText": "设置邮箱"
 				}
 			},
 			{
-				"path": "question/index",
+				"path": "question",
 				"style": {
 					"navigationBarTitleText": "密保"
 				}
 			},
 			{
-				"path": "setQuestion/index",
+				"path": "setQuestion",
 				"style": {
 					"navigationBarTitleText": "设置密保"
 				}
 			},
 			{
-				"path": "integralQuery/index",
+				"path": "setting",
+				"style": {
+					"navigationBarTitleText": "我的设置"
+				}
+			},
+			{
+				"path": "integralQuery",
 				"style": {
 					"navigationBarTitleText": "积分查询"
 						//#ifdef APP-PLUS
@@ -428,6 +440,12 @@
 				}
 			},
 			{
+				"path": "queryBills",
+				"style": {
+					"navigationBarTitleText": "查询订单"
+				}
+			},
+			{
 				"path": "queryDate",
 				"style": {
 					"navigationBarTitleText": "门诊预约"