diff --git a/ebike-user/pages/user/home/home.vue b/ebike-user/pages/user/home/home.vue index 41b0ca2..95fa5f4 100644 --- a/ebike-user/pages/user/home/home.vue +++ b/ebike-user/pages/user/home/home.vue @@ -477,6 +477,33 @@ //结束用车 function endRiding() { + checkBikeEnding(); + } + + function checkBikeEnding(callback){ + const { + bikeCode + } = orderData; + const params={bikeCode} + //运营区和停车区检查 + const arrMethod=[callOrdereApi("userOrders/checkBikeInOperation", params, "get") + ,callOrdereApi("userOrders/checkBikeInParking", params, "get")] + Promise.all(arrMethod).then(([res1,res2])=>{ + if(res1.code!=200){ + showModelMessage(res1.message); + return; + } + + if(res2.code!=200){ + showModelMessage(res2.message); + return; + } + doneRide(); + }); + } + + //完成骑行 + function doneRide(){ const { userId } = oUser; @@ -500,7 +527,6 @@ completeRiding(); openOrderPay(); }) - } //继续骑行 需要开锁 diff --git a/ebike-user/pages/user/scan/scancode.vue b/ebike-user/pages/user/scan/scancode.vue index 4f6bda7..40fd6f5 100644 --- a/ebike-user/pages/user/scan/scancode.vue +++ b/ebike-user/pages/user/scan/scancode.vue @@ -64,6 +64,7 @@ const showWorn = ref(false); const oUser = uni.getStorageSync("wechat_user"); let type = null; + let errdata=null; onLoad((options) => { type = options["type"]; @@ -80,6 +81,8 @@ result } = res.detail; if (!result || result.indexOf("number") == -1) { + if(errdata==result) return; + errdata=result; showModelMessage("无效的车辆二维码"); return; } diff --git a/ebike-user/utils/config.js b/ebike-user/utils/config.js index 8a54766..71ecd4f 100644 --- a/ebike-user/utils/config.js +++ b/ebike-user/utils/config.js @@ -1,5 +1,5 @@ const config = { - apiUrl: "http://192.168.2.151:10010/", + apiUrl: "http://192.168.2.239:10010/", //apiUrl: "https://www.cdzhuojing.cn/", cdnPath: "/", ERR_OK: 200,