diff --git a/components/shop/shop.wxss b/components/shop/shop.wxss index ce9ed90..6ba6b8d 100644 --- a/components/shop/shop.wxss +++ b/components/shop/shop.wxss @@ -134,7 +134,7 @@ .components .body .shop .posi .posi_logo .shopVoList { white-space: nowrap !important; overflow-y: scroll; - height: 60rpx !important; + /* height: 60rpx !important; */ width: 360rpx; font-size: 16px; color: #333; diff --git a/ext.json b/ext.json index dcaba26..68b5548 100644 --- a/ext.json +++ b/ext.json @@ -2,44 +2,34 @@ "ext": { "attr": { "car": { - "tjd": { - "payPath": "", - "tjdAppId": "wx6945d1bda68d7993" - }, "etcp": { - "payPath": "pages/pay/order-pay-open/main", - "etcpAppId": "wxc07f9d67923d676d", - "etcpCallbackUrl": "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback" - }, - "bolink": { - "payPath": "pages/park/park", - "bolinkAppId": "wxbd08b4baa10fcc1d" - }, - "version": "release" + "etcpAppId": "wx192b7d2e8dcbefd0", + "etcpVersion": "release", + "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback" + } }, - "mchId": "1539123951", + "mchId": "1604439800", "imgProxy": [ { - "newUrl": "https://c.malls.iformall.com/img", + "newUrl": "https://ctest.malls.iformall.com/img", "orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com" }, { - "newUrl": "https://c.malls.iformall.com/img1", + "newUrl": "https://ctest.malls.iformall.com/img1", "orgUrl": "https://formall.oss-accelerate.aliyuncs.com" }, { - "newUrl": "https://c.malls.iformall.com/img2", + "newUrl": "https://ctest.malls.iformall.com/img2", "orgUrl": "https://wx.qlogo.cn" } ], - "configUrl": "https://c.malls.iformall.com/C/api", - "ifStoreApp": "0", + "configUrl": "https://ctest.malls.iformall.com/C/api", "ifHaveWebSocket": "0", "ifHaveCarModular": "1" }, - "name": "欢乐城万象金街", - "weappId": "wxde54451891094c16", - "appVersion": "C.5.1.1" + "name": "金泸商务", + "weappId": "wx649b3be73c1afe47", + "appVersion": "C.test.5.2.0" }, "debug": false, "tabBar": { @@ -75,7 +65,8 @@ "selectedIconPath": "assets/images/user-a.png" } ], - "custom": true + "color": "#abb1be", + "selectedColor": "#b2743d" }, "window": { "backgroundTextStyle": "dark", @@ -89,7 +80,7 @@ "provider": "wx2b03c6e691cd7370" } }, - "extAppid": "wxde54451891094c16", + "extAppid": "wx649b3be73c1afe47", "extEnable": true, "permission": { "scope.userLocation": { diff --git a/index/passCar.js b/index/passCar.js index 3989011..ecab177 100644 --- a/index/passCar.js +++ b/index/passCar.js @@ -555,9 +555,23 @@ Page({ url: `/pages/addPark/addPark?flags=managepalte` }); }).catch(err => { - wx.navigateTo({ - url: `/pages/getphoneInfo/index?mineFlag=passCar`, + wx.showModal({ + title: '提示', + content: '登陆后方可添加车牌,现在登录?', + showCancel: true, + complete: (res) => { + if (res.cancel) { + return + } + + if (res.confirm) { + wx.navigateTo({ + url: `/pages/getphoneInfo/index?mineFlag=passCar`, + }) + } + } }) + }) }, passc: function () { diff --git a/project.config.json b/project.config.json index 9dda0a2..e4bfda1 100644 --- a/project.config.json +++ b/project.config.json @@ -35,7 +35,7 @@ }, "compileType": "miniprogram", "libVersion": "2.11.2", - "appid": "wx453ae0d37f3550d0", + "appid": "wxfa336cad86ed598d", "projectname": "C", "simulatorType": "wechat", "simulatorPluginLibVersion": {},