Browse Source

merge修改

tags/2.2.4
海洋之声 6 years ago
parent
commit
901577eb70
2 changed files with 2 additions and 9 deletions
  1. +1
    -4
      app.json
  2. +1
    -5
      config/config.js

+ 1
- 4
app.json View File

@@ -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",


+ 1
- 5
config/config.js View File

@@ -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: {


Loading…
Cancel
Save