| 
																	
																	
																	
																 | 
																@@ -1,3 +1,4 @@ | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																<<<<<<< HEAD | 
															
														
														
													
														
															
																 | 
																 | 
																{
 | 
																 | 
																 | 
																{
 | 
															
														
														
													
														
															
																 | 
																 | 
																  "ext": {
 | 
																 | 
																 | 
																  "ext": {
 | 
															
														
														
													
														
															
																 | 
																 | 
																    "attr": {
 | 
																 | 
																 | 
																    "attr": {
 | 
															
														
														
													
												
													
														
															
																| 
																	
																		
																	
																	
																		
																	
																	
																 | 
																@@ -110,4 +111,109 @@ | 
															
														
														
													
														
															
																 | 
																 | 
																    "chooseLocation",
 | 
																 | 
																 | 
																    "chooseLocation",
 | 
															
														
														
													
														
															
																 | 
																 | 
																    "getLocation"
 | 
																 | 
																 | 
																    "getLocation"
 | 
															
														
														
													
														
															
																 | 
																 | 
																  ]
 | 
																 | 
																 | 
																  ]
 | 
															
														
														
													
														
															
																 | 
																 | 
																} | 
																 | 
																 | 
																 | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																} | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																======= | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																<<<<<<< HEAD | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																{ | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																  "ext": { | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    "attr": { | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      "car": { | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        "etcp": { | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																          "etcpAppId": "wx192b7d2e8dcbefd0", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																          "etcpVersion": "release", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																          "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback" | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        } | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      }, | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      "mchId": "1604439800", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      "imgProxy": [ | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        { | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																          "newUrl": "https://ctest.malls.iformall.com/img", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																          "orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com" | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        }, | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        { | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																          "newUrl": "https://ctest.malls.iformall.com/img1", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																          "orgUrl": "https://formall.oss-accelerate.aliyuncs.com" | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        }, | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        { | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																          "newUrl": "https://ctest.malls.iformall.com/img2", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																          "orgUrl": "https://wx.qlogo.cn" | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        } | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      ], | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      "configUrl": "https://ctest.malls.iformall.com/C/api", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      "ifHaveWebSocket": "0", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      "ifHaveCarModular": "1" | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    }, | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    "name": "金泸商务", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    "weappId": "wx649b3be73c1afe47", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    "appVersion": "C.test.5.2.0" | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																  }, | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																  "debug": false, | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																  "tabBar": { | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    "list": [ | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      { | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        "text": "首页", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        "iconPath": "assets/images/home.png", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        "pagePath": "index/index", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        "selectedIconPath": "assets/images/home-a.png" | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      }, | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      { | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        "text": "首页", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        "iconPath": "assets/images/home.png", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        "pagePath": "pages/theme/index1/index", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        "selectedIconPath": "assets/images/home-a.png" | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      }, | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      { | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        "text": "门店", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        "iconPath": "assets/images/mendian.png", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        "pagePath": "index/searchbar", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        "selectedIconPath": "assets/images/mendian-a.png" | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      }, | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      { | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        "text": "停车", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        "iconPath": "assets/images/park.png", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        "pagePath": "index/passCar", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        "selectedIconPath": "assets/images/park-a.png" | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      }, | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      { | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        "text": "我的", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        "iconPath": "assets/images/user.png", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        "pagePath": "index/user", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        "selectedIconPath": "assets/images/user-a.png" | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      } | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    ], | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    "color": "#abb1be", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    "selectedColor": "#b2743d" | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																  }, | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																  "window": { | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    "backgroundTextStyle": "dark", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    "navigationBarTextStyle": "black", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    "navigationBarTitleText": "", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    "navigationBarBackgroundColor": "#FFFFFF" | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																  }, | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																  "plugins": { | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    "live-player-plugin": { | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      "version": "1.3.4", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      "provider": "wx2b03c6e691cd7370" | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    } | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																  }, | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																  "extAppid": "wx649b3be73c1afe47", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																  "extEnable": true, | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																  "permission": { | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    "scope.userLocation": { | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      "desc": "你的位置信息将用于小程序位置接口的效果展示" | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    } | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																  }, | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																  "directCommit": false, | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																  "networkTimeout": { | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    "request": 30000, | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    "downloadFile": 10000 | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																  }, | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																  "requiredPrivateInfos": [ | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    "chooseLocation", | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    "getLocation" | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																  ] | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																} | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																======= | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																{"ext": {"attr": {"car": {"etcp": {"etcpAppId": "wx192b7d2e8dcbefd0", "etcpVersion": "release", "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback"}}, "mchId": "1604439800", "imgProxy": [{"newUrl": "https://ctest.malls.iformall.com/img", "orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com"}, {"newUrl": "https://ctest.malls.iformall.com/img1", "orgUrl": "https://formall.oss-accelerate.aliyuncs.com"}, {"newUrl": "https://ctest.malls.iformall.com/img2", "orgUrl": "https://wx.qlogo.cn"}], "configUrl": "https://ctest.malls.iformall.com/C/api", "businessSwitch": "1", "ifHaveWebSocket": "0", "ifHaveCarModular": "1"}, "name": "金泸商务", "weappId": "wx649b3be73c1afe47", "appVersion": "C.test.5.2.0"}, "debug": false, "tabBar": {"list": [{"text": "首页", "iconPath": "assets/images/home.png", "pagePath": "index/index", "selectedIconPath": "assets/images/home-a.png"}, {"text": "首页", "iconPath": "assets/images/home.png", "pagePath": "pages/theme/index1/index", "selectedIconPath": "assets/images/home-a.png"}, {"text": "门店", "iconPath": "assets/images/mendian.png", "pagePath": "index/searchbar", "selectedIconPath": "assets/images/mendian-a.png"}, {"text": "停车", "iconPath": "assets/images/park.png", "pagePath": "index/passCar", "selectedIconPath": "assets/images/park-a.png"}, {"text": "我的", "iconPath": "assets/images/user.png", "pagePath": "index/user", "selectedIconPath": "assets/images/user-a.png"}], "color": "#abb1be", "selectedColor": "#b2743d"}, "window": {"backgroundTextStyle": "dark", "navigationBarTextStyle": "black", "navigationBarTitleText": "", "navigationBarBackgroundColor": "#FFFFFF"}, "plugins": {"auto-points-plugin": {"version": "1.3.0", "provider": "wxfab2bf944bfc4da6"}, "live-player-plugin": {"version": "1.3.4", "provider": "wx2b03c6e691cd7370"}}, "extAppid": "wx649b3be73c1afe47", "extEnable": true, "permission": {"scope.userLocation": {"desc": "你的位置信息将用于小程序位置接口的效果展示"}}, "directCommit": false, "networkTimeout": {"request": 30000, "downloadFile": 10000}, "requiredPrivateInfos": ["chooseLocation", "getLocation"]} | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																>>>>>>> 42dcb4192ca7185c085634b25a12e8665a5bc3d6 | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																>>>>>>> 7d9ae037a909300bc673bd25ffc51a5d88de70b4 |