@@ -30,11 +30,8 @@ | |||||
"pages/managelicenseplate/managelicenseplate", | "pages/managelicenseplate/managelicenseplate", | ||||
"pages/payrule/payrule", | "pages/payrule/payrule", | ||||
"pages/game/index", | "pages/game/index", | ||||
<<<<<<< Updated upstream | |||||
"pages/grade/grade" | |||||
======= | |||||
"pages/grade/grade", | |||||
"pages/index/gameentry/gentry" | "pages/index/gameentry/gentry" | ||||
>>>>>>> Stashed changes | |||||
], | ], | ||||
"tabBar": { | "tabBar": { | ||||
"color": "#9F9F9F", | "color": "#9F9F9F", | ||||
@@ -141,17 +141,13 @@ var config = { | |||||
* title | * title | ||||
* 描述 | * 描述 | ||||
*/ | */ | ||||
<<<<<<< Updated upstream | |||||
getWeapNote: '/mall/getWeapNote', | getWeapNote: '/mall/getWeapNote', | ||||
scoreLevelInfo: '/mall/scoreLevelInfo', | scoreLevelInfo: '/mall/scoreLevelInfo', | ||||
getWeRunData: '/user/getWeRunData' | |||||
======= | |||||
getWeapNote:'/mall/getWeapNote', | |||||
getWeRunData: '/user/getWeRunData', | |||||
/** | /** | ||||
* 小程序获取游戏路径 | * 小程序获取游戏路径 | ||||
*/ | */ | ||||
getGame:'/game/getOne' | getGame:'/game/getOne' | ||||
>>>>>>> Stashed changes | |||||
}, | }, | ||||
weapp: { | weapp: { | ||||