解决pages.json冲突

pages.json

@@ -163,174 +163,4 @@
 			"query": "" //启动参数，在页面的onLoad函数里面得到
 		}]
 	}
-  "pages": [
-    {
-      "path": "pages/client/index",
-      "style": {
-        "navigationBarTitleText": "客户",
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/client-list/index",
-      "style": {
-        "navigationBarTitleText": "客户列表",
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/search/index",
-      "style": {
-        "navigationBarTitleText": "客户搜索",
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/add-user/index",
-      "style": {
-        "navigationBarTitleText": "添加客户",
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/trade/index",
-      "style": {
-        "navigationBarTitleText": "交易",
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/mall/index",
-      "style": {
-        "navigationBarTitleText": "商城"
-      }
-    },
-    {
-      "path": "pages/mine/index",
-      "style": {
-        "navigationBarTitleText": "我的"
-      }
-    },
-    {
-      "path": "pages/login/index",
-      "style": {
-        "navigationBarTitleText": "登录",
-        "enablePullDownRefresh": false,
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/agreement/index",
-      "style": {
-        "navigationBarTitleText": "用户与隐私协议"
-      }
-    },
-    {
-      "path": "pages/client-detail/index",
-      "style": {
-        "navigationBarTitleText": "客户详情",
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/client-credit/index",
-      "style": {
-        "navigationBarTitleText": "客户授信",
-        "navigationStyle": "custom",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/client-signing/index",
-      "style": {
-        "navigationBarTitleText": "客户签约",
-        "navigationStyle": "custom",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/client-credit-limit/index",
-      "style": {
-        "navigationBarTitleText": "授信额度",
-        "navigationStyle": "custom",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/client-credit-list/index",
-      "style": {
-        "navigationBarTitleText": "客户授信列表",
-        "navigationStyle": "custom",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/my-offer/index",
-      "style": {
-        "navigationBarTitleText": "我的报价",
-		 "navigationStyle": "custom",
-        "enablePullDownRefresh": false
-      }
-    }
-      ,{
-            "path" : "pages/submit-quotation/index",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "提交报价",
-				 "navigationStyle": "custom",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
-  "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "uni-app",
-    "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8",
-    "backgroundColorTop": "#FFFFFF"
-  },
-  "tabBar": {
-    "color": "#888",
-    "selectedColor": "#007AFF",
-    "borderStyle": "white",
-    "backgroundColor": "#f9f9f9",
-    "list": [
-      {
-        "pagePath": "pages/client/index",
-        "iconPath": "static/imgs/tabbar/client-gray.png",
-        "selectedIconPath": "static/imgs/tabbar/client-blue.png",
-        "text": "客户"
-      },
-      {
-        "pagePath": "pages/trade/index",
-        "iconPath": "static/imgs/tabbar/trade-gray.png",
-        "selectedIconPath": "static/imgs/tabbar/trade-blue.png",
-        "text": "交易"
-      },
-      {
-        "pagePath": "pages/mall/index",
-        "iconPath": "static/imgs/tabbar/mall-gray.png",
-        "selectedIconPath": "static/imgs/tabbar/mall-blue.png",
-        "text": "纸商城"
-      },
-      {
-        "pagePath": "pages/mine/index",
-        "iconPath": "static/imgs/tabbar/mine-gray.png",
-        "selectedIconPath": "static/imgs/tabbar/mine-blue.png",
-        "text": "我的"
-      }
-    ]
-  },
-  "condition": {
-    //模式配置，仅开发期间生效
-    "current": 0, //当前激活的模式(list 的索引项)
-    "list": [
-      {
-        "name": "", //模式名称
-        "path": "", //启动页面，必选
-        "query": "" //启动参数，在页面的onLoad函数里面得到
-      }
-    ]
-  }
 }