diff --git a/ext.json b/ext.json
index 68b5548..1528913 100644
--- a/ext.json
+++ b/ext.json
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
{
"ext": {
"attr": {
@@ -96,4 +97,7 @@
"chooseLocation",
"getLocation"
]
-}
\ No newline at end of file
+}
+=======
+{"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
diff --git a/index/passCar.wxml b/index/passCar.wxml
index 6652deb..13b627c 100644
--- a/index/passCar.wxml
+++ b/index/passCar.wxml
@@ -1,218 +1,218 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.carNumber}}
-
-
-
-
-
-
-
-
-
-
-
- 券您有停车券可使用哦
-
- {{quantitle}}
- {{totalTicketNum}} 张可用
-
-
-
-
-
-
- 入场时间:
- {{stopFees.entranceTime}}
-
-
- 停车时长:
- {{timecha}}
-
-
- 待缴费用:
- {{stopFees.remainingFee}}元
-
-
- 备注:
- {{remark}}
-
-
-
- 系统提示:
- {{stopFees.sysNotice}}
-
-
-
-
-
- 立即支付
-
- 立即支付
-
-
-
-
- 立即支付
-
- 立即支付
-
-
-
-
- 立即支付
-
- 立即支付
-
-
-
-
- 立即支付
-
- 立即支付
-
-
-
-
-
- 立即支付
-
- 立即支付
-
-
-
- 立即支付
-
-
-
-
-
-
-
-
- 添加车牌
-
- 车辆入场后,才能绑车牌
-
-
-
-
- 我的支付订单
-
-
-
-
-
-
-
- 我的停车券
-
-
-
-
-
-
-
- 车辆管理
-
-
-
-
-
-
-
- 缴费规则
-
-
-
-
-
-
-
- 常见问题
-
-
-
-
-
-
- 使用说明
-
-
-
-
-
-
-
-
-
-
- 智慧停车即将上线
- 敬请期待
-
-
-
-
-
-
-
- 请您敬请期待
- 我们正在筹备一大波优惠活动
-
-
-
-
-
- 停车券
-
-
-
-
-
-
-
-
-
-
- {{item.title}}
-
-
- {{item.subTitle}}
-
-
- 售价:{{item.salePrice/100}}元{{item.price/100}}元
- {{item.price/100}}小时
-
-
-
-
-
- 有效期至:
- {{item.expiredTime}}
-
-
-
-
-
- {{content}}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.carNumber}}
+
+
+
+
+
+
+
+
+
+
+
+ 券您有停车券可使用哦
+
+ {{quantitle}}
+ {{totalTicketNum}} 张可用
+
+
+
+
+
+
+ 入场时间:
+ {{stopFees.entranceTime}}
+
+
+ 停车时长:
+ {{timecha}}
+
+
+ 待缴费用:
+ {{stopFees.remainingFee}}元
+
+
+ 备注:
+ {{remark}}
+
+
+
+ 系统提示:
+ {{stopFees.sysNotice}}
+
+
+
+
+
+ 立即支付
+
+ 立即支付
+
+
+
+
+ 立即支付
+
+ 立即支付
+
+
+
+
+ 立即支付
+
+ 立即支付
+
+
+
+
+ 立即支付
+
+ 立即支付
+
+
+
+
+
+ 立即支付
+
+ 立即支付
+
+
+
+ 立即支付
+
+
+
+
+
+
+
+
+ 添加车牌
+
+ 车辆入场后,才能绑车牌
+
+
+
+
+ 我的支付订单
+
+
+
+
+
+
+
+ 我的停车券
+
+
+
+
+
+
+
+ 车辆管理
+
+
+
+
+
+
+
+ 缴费规则
+
+
+
+
+
+
+
+ 常见问题
+
+
+
+
+
+
+ 使用说明
+
+
+
+
+
+
+
+
+
+
+ 智慧停车即将上线
+ 敬请期待
+
+
+
+
+
+
+
+ 请您敬请期待
+ 我们正在筹备一大波优惠活动
+
+
+
+
+
+ 停车券
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+ {{item.subTitle}}
+
+
+ 售价:{{item.salePrice/100}}元{{item.price/100}}元
+ {{item.price/100}}小时
+
+
+
+
+
+ 有效期至:
+ {{item.expiredTime}}
+
+
+
+
+
+ {{content}}
+
+
\ No newline at end of file