diff --git a/app.json b/app.json index 8ea3446..783a32d 100644 --- a/app.json +++ b/app.json @@ -30,11 +30,8 @@ "pages/managelicenseplate/managelicenseplate", "pages/payrule/payrule", "pages/game/index", -<<<<<<< Updated upstream - "pages/grade/grade" -======= + "pages/grade/grade", "pages/index/gameentry/gentry" ->>>>>>> Stashed changes ], "tabBar": { "color": "#9F9F9F", diff --git a/config/config.js b/config/config.js index d0cf556..39ca670 100755 --- a/config/config.js +++ b/config/config.js @@ -141,17 +141,13 @@ var config = { * title * 描述 */ -<<<<<<< Updated upstream getWeapNote: '/mall/getWeapNote', scoreLevelInfo: '/mall/scoreLevelInfo', - getWeRunData: '/user/getWeRunData' -======= - getWeapNote:'/mall/getWeapNote', + getWeRunData: '/user/getWeRunData', /** * 小程序获取游戏路径 */ getGame:'/game/getOne' ->>>>>>> Stashed changes }, weapp: {