|
|
@@ -1,4 +1,3 @@
|
|
|
-<<<<<<< HEAD
|
|
|
{
|
|
|
"pages": [{
|
|
|
"path": "pages/index/index",
|
|
|
@@ -16,22 +15,12 @@
|
|
|
{
|
|
|
"path": "pages/public/register",
|
|
|
"style": {
|
|
|
- "navigationBarTitleText": "注册",
|
|
|
- "app-plus": {
|
|
|
- "titleNView": {
|
|
|
- "type": "transparent"
|
|
|
- }
|
|
|
- }
|
|
|
+ "navigationBarTitleText": "注冊"
|
|
|
}
|
|
|
}, {
|
|
|
"path": "pages/public/login",
|
|
|
"style": {
|
|
|
- "navigationBarTitleText": "登录",
|
|
|
- "app-plus": {
|
|
|
- "titleNView": {
|
|
|
- "type": "transparent"
|
|
|
- }
|
|
|
- }
|
|
|
+ "navigationBarTitleText": "登錄"
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
@@ -55,48 +44,6 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-=======
|
|
|
-{
|
|
|
- "pages": [{
|
|
|
- "path": "pages/index/index",
|
|
|
- "style": {
|
|
|
- "enablePullDownRefresh": true,
|
|
|
- "navigationBarTitleText": "首页"
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- "path": "pages/public/register",
|
|
|
- "style": {
|
|
|
- "navigationBarTitleText": "注冊"
|
|
|
- }
|
|
|
- }, {
|
|
|
- "path": "pages/public/login",
|
|
|
- "style": {
|
|
|
- "navigationBarTitleText": "登錄"
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- "path": "pages/public/wxLogin",
|
|
|
- "style": {
|
|
|
- "navigationBarTitleText": "微信登录",
|
|
|
- "app-plus": {
|
|
|
- "titleNView": {
|
|
|
- "type": "transparent"
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- "path": "pages/public/forget",
|
|
|
- "style": {
|
|
|
- "navigationBarTitleText": "忘记密码",
|
|
|
- "app-plus": {
|
|
|
- "titleNView": {
|
|
|
- "type": "transparent"
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
->>>>>>> 664813b4d743d342756f921ab7f8e49d6da916a7
|
|
|
},
|
|
|
{
|
|
|
"path": "pages/user/user",
|
|
|
@@ -122,12 +69,6 @@
|
|
|
"selectedIconPath": "static/tabBar/tab-home-current.png",
|
|
|
"text": "首页"
|
|
|
},
|
|
|
- {
|
|
|
- "pagePath": "pages/transaction/transaction",
|
|
|
- "iconPath": "static/tabBar/tab-home.png",
|
|
|
- "selectedIconPath": "static/tabBar/tab-home-current.png",
|
|
|
- "text": "交易"
|
|
|
- },
|
|
|
{
|
|
|
"pagePath": "pages/user/user",
|
|
|
"iconPath": "static/tabBar/tab-my.png",
|
