Merge remote-tracking branch 'origin/devPartner' into devPartner

jiangping

2023-12-20 af4a912b4c50cc03d1f147ac4778b87e4ff4d2ac

 bicycle/unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -364,12 +364,19 @@
    },
    minute: function minute() {
      this.show3 = false;
      console.log(this.info.rideStatus);
      if (this.info.rideStatus != -1) {
        this.show6 = true;
      }
    },
    settlement: function settlement() {
      if (this.info.depositStatus === 2) {
        uni.showToast({
          title: '结算申请提交成功，请耐心等待退款！',
          icon: 'none',
          duration: 2000
        });
        return;
      }
      this.show6 = false;
      this.show3 = true;
    },
@@ -381,43 +388,102 @@
    },
    // 跳转
    jump: function jump(item) {
      if (item.id === 3) {
        uni.navigateTo({
          url: '/pages/pricingRules/pricingRules'
        });
      } else if (item.id === 4) {
        uni.navigateTo({
          url: '/pages/consumptionDetails/consumptionDetails'
        });
      } else if (item.id === 2) {
        if (this.info.rideStatus === 1) {
          uni.showToast({
            title: '骑行中不能结算押金',
            icon: 'none',
            duration: 2000
          });
          return;
        }
        if (this.info.depositStatus === 1) {
          this.show3 = true;
        } else {
          uni.showToast({
            title: '您暂无押金，无需结算！',
            icon: 'none',
            duration: 2000
          });
        }
      } else if (item.id === 1) {
        if (this.info.depositStatus === 1) {
          uni.showToast({
            title: '押金已充值',
            icon: 'none',
            duration: 2000
          });
          return;
        }
        this.show1 = true;
      }
      var _this4 = this;
      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
        return _regenerator.default.wrap(function _callee2$(_context2) {
          while (1) {
            switch (_context2.prev = _context2.next) {
              case 0:
                _context2.next = 2;
                return _this4.refresh();
              case 2:
                if (!(item.id === 3)) {
                  _context2.next = 6;
                  break;
                }
                uni.navigateTo({
                  url: '/pages/pricingRules/pricingRules'
                });
                _context2.next = 27;
                break;
              case 6:
                if (!(item.id === 4)) {
                  _context2.next = 10;
                  break;
                }
                uni.navigateTo({
                  url: '/pages/consumptionDetails/consumptionDetails'
                });
                _context2.next = 27;
                break;
              case 10:
                if (!(item.id === 2)) {
                  _context2.next = 17;
                  break;
                }
                if (!(_this4.info.rideStatus === 1)) {
                  _context2.next = 14;
                  break;
                }
                uni.showToast({
                  title: '骑行中不能结算押金',
                  icon: 'none',
                  duration: 2000
                });
                return _context2.abrupt("return");
              case 14:
                if (_this4.info.depositStatus === 1) {
                  _this4.show3 = true;
                } else if (_this4.info.depositStatus === 2) {
                  uni.showToast({
                    title: '结算申请提交成功，请耐心等待退款！',
                    icon: 'none',
                    duration: 2000
                  });
                } else {
                  uni.showToast({
                    title: '您暂无押金，无需结算！',
                    icon: 'none',
                    duration: 2000
                  });
                }
                _context2.next = 27;
                break;
              case 17:
                if (!(item.id === 1)) {
                  _context2.next = 27;
                  break;
                }
                if (!(_this4.info.depositStatus === 1)) {
                  _context2.next = 23;
                  break;
                }
                uni.showToast({
                  title: '押金已充值',
                  icon: 'none',
                  duration: 2000
                });
                return _context2.abrupt("return");
              case 23:
                if (!(_this4.info.depositStatus === 2)) {
                  _context2.next = 26;
                  break;
                }
                uni.showToast({
                  title: '结算申请提交成功，请耐心等待退款！',
                  icon: 'none',
                  duration: 2000
                });
                return _context2.abrupt("return");
              case 26:
                _this4.show1 = true;
              case 27:
              case "end":
                return _context2.stop();
            }
          }
        }, _callee2);
      }))();
    },
    // 骑行明细
    toRidingDetails: function toRidingDetails() {
@@ -505,110 +571,140 @@
    },
    // 扫码租车
    carRental: function carRental() {
      // 判断有没有交押金
      if (this.info.depositStatus === 0) {
        this.show1 = true;
        return;
      }
      var that = this;
      if (!that.disable) {
        that.disable = true;
        // 扫码解锁骑行
        uni.scanCode({
          success: function () {
            var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(result) {
              var res, num, timer;
              return _regenerator.default.wrap(function _callee3$(_context3) {
                while (1) {
                  switch (_context3.prev = _context3.next) {
                    case 0:
                      // 打开开锁弹框
                      that.show5 = true;
                      // 调用开锁接口
                      _context3.next = 3;
                      return that.$u.api.openLock({
                        code: result.result
                      });
                    case 3:
                      res = _context3.sent;
                      if (res.code === 200) {
                        that.disable = false;
                        that.show6 = false;
                        that.show5 = true;
                        // 循环次数
                        num = 1; // 循环查看解锁结果
                        timer = setInterval( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
                          var res1;
                          return _regenerator.default.wrap(function _callee2$(_context2) {
                            while (1) {
                              switch (_context2.prev = _context2.next) {
                                case 0:
                                  num += 1;
                                  _context2.next = 3;
                                  return that.$u.api.refreshLock({
                                    id: res.data.id
                                  });
                                case 3:
                                  res1 = _context2.sent;
                                  // 开锁成功
                                  if (res1.data.status === 1) {
                                    that.refresh();
                                    clearInterval(timer);
                                    that.show5 = false;
                                    setTimeout(function () {
                                      that.show2 = true;
                                    }, 500);
                                  }
                                  // 开锁失败
                                  if (res1.data.status === 3) {
                                    that.refresh();
                                    clearInterval(timer);
                                    that.show5 = false;
                                    uni.showToast({
                                      title: '开锁失败',
                                      icon: 'error',
                                      duration: 2000
                                    });
                                  }
                                  // 开锁超时
                                  if (num === 180) {
                                    that.refresh();
                                    clearInterval(timer);
                                    that.show5 = false;
                                    uni.showToast({
                                      title: '开锁超时',
                                      icon: 'error',
                                      duration: 2000
                                    });
                                  }
                                case 7:
                                case "end":
                                  return _context2.stop();
                              }
                            }
                          }, _callee2);
                        })), 1000);
                      } else {
                        that.show5 = false;
                        that.disable = false;
                      }
                    case 5:
                    case "end":
                      return _context3.stop();
                  }
      var _this5 = this;
      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
        var that;
        return _regenerator.default.wrap(function _callee5$(_context5) {
          while (1) {
            switch (_context5.prev = _context5.next) {
              case 0:
                _context5.next = 2;
                return _this5.refresh();
              case 2:
                if (!(_this5.info.depositStatus === 0)) {
                  _context5.next = 7;
                  break;
                }
              }, _callee3);
            }));
            function success(_x) {
              return _success.apply(this, arguments);
                _this5.show1 = true;
                return _context5.abrupt("return");
              case 7:
                if (!(_this5.info.depositStatus === 2)) {
                  _context5.next = 10;
                  break;
                }
                uni.showToast({
                  title: '结算申请提交成功，请耐心等待退款！',
                  icon: 'none',
                  duration: 2000
                });
                return _context5.abrupt("return");
              case 10:
                that = _this5;
                if (!that.disable) {
                  that.disable = true;
                  // 扫码解锁骑行
                  uni.scanCode({
                    success: function () {
                      var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(result) {
                        var res, num, timer;
                        return _regenerator.default.wrap(function _callee4$(_context4) {
                          while (1) {
                            switch (_context4.prev = _context4.next) {
                              case 0:
                                // 打开开锁弹框
                                that.show5 = true;
                                // 调用开锁接口
                                _context4.next = 3;
                                return that.$u.api.openLock({
                                  code: result.result
                                });
                              case 3:
                                res = _context4.sent;
                                if (res.code === 200) {
                                  that.disable = false;
                                  that.show6 = false;
                                  that.show5 = true;
                                  // 循环次数
                                  num = 1; // 循环查看解锁结果
                                  timer = setInterval( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
                                    var res1;
                                    return _regenerator.default.wrap(function _callee3$(_context3) {
                                      while (1) {
                                        switch (_context3.prev = _context3.next) {
                                          case 0:
                                            num += 1;
                                            _context3.next = 3;
                                            return that.$u.api.refreshLock({
                                              id: res.data.id
                                            });
                                          case 3:
                                            res1 = _context3.sent;
                                            // 开锁成功
                                            if (res1.data.status === 1) {
                                              that.refresh();
                                              clearInterval(timer);
                                              that.show5 = false;
                                              setTimeout(function () {
                                                that.show2 = true;
                                              }, 500);
                                            }
                                            // 开锁失败
                                            if (res1.data.status === 3) {
                                              that.refresh();
                                              clearInterval(timer);
                                              that.show5 = false;
                                              uni.showToast({
                                                title: '开锁失败',
                                                icon: 'error',
                                                duration: 2000
                                              });
                                            }
                                            // 开锁超时
                                            if (num === 180) {
                                              that.refresh();
                                              clearInterval(timer);
                                              that.show5 = false;
                                              uni.showToast({
                                                title: '开锁超时',
                                                icon: 'error',
                                                duration: 2000
                                              });
                                            }
                                          case 7:
                                          case "end":
                                            return _context3.stop();
                                        }
                                      }
                                    }, _callee3);
                                  })), 1000);
                                } else {
                                  that.show5 = false;
                                  that.disable = false;
                                }
                              case 5:
                              case "end":
                                return _context4.stop();
                            }
                          }
                        }, _callee4);
                      }));
                      function success(_x) {
                        return _success.apply(this, arguments);
                      }
                      return success;
                    }(),
                    fail: function fail() {
                      that.disable = false;
                    }
                  });
                }
              case 12:
              case "end":
                return _context5.stop();
            }
            return success;
          }(),
          fail: function fail() {
            that.disable = false;
          }
        });
      }
        }, _callee5);
      }))();
    },
    // 获取经纬度
    getAddress: function getAddress() {
@@ -744,91 +840,91 @@
    },
    // 刷新骑行状态
    refreshStatus: function refreshStatus() {
      var _this4 = this;
      this.timer = setInterval( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
      var _this6 = this;
      this.timer = setInterval( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
        var res;
        return _regenerator.default.wrap(function _callee4$(_context4) {
        return _regenerator.default.wrap(function _callee6$(_context6) {
          while (1) {
            switch (_context4.prev = _context4.next) {
            switch (_context6.prev = _context6.next) {
              case 0:
                _context4.next = 2;
                return _this4.$u.api.home();
                _context6.next = 2;
                return _this6.$u.api.home();
              case 2:
                res = _context4.sent;
                res = _context6.sent;
                if (!(res.code === 200)) {
                  _context4.next = 13;
                  _context6.next = 13;
                  break;
                }
                _this4.info = res.data;
                _this6.info = res.data;
                // 骑行中
                if (!(res.data.rideStatus === 1)) {
                  _context4.next = 7;
                  _context6.next = 7;
                  break;
                }
                return _context4.abrupt("return");
                return _context6.abrupt("return");
              case 7:
                _this4.show2 = false;
                _this6.show2 = false;
                // 已换车
                if (!(res.data.rideStatus === 2)) {
                  _context4.next = 11;
                  _context6.next = 11;
                  break;
                }
                _this4.show6 = true;
                return _context4.abrupt("return");
                _this6.show6 = true;
                return _context6.abrupt("return");
              case 11:
                if (res.data.rideStatus === -1) {
                  _this4.show6 = false;
                  _this6.show6 = false;
                }
                clearInterval(_this4.timer);
                clearInterval(_this6.timer);
              case 13:
              case "end":
                return _context4.stop();
                return _context6.stop();
            }
          }
        }, _callee4);
        }, _callee6);
      })), 10000);
    },
    // 获取首页信息
    getHomeInfo: function getHomeInfo() {
      var _this5 = this;
      var _this7 = this;
      this.$u.api.home().then(function (res) {
        if (res.code === 200) {
          _this5.info = res.data;
          _this7.info = res.data;
          // 是否弹出广告图
          if (res.data.adList.length > 0) {
            _this5.show = true;
            _this7.show = true;
          }
          // 解锁中
          if (res.data.rideStatus === 0) {
            _this5.show5 = true;
            _this7.show5 = true;
            // 循环次数
            var num = 1;
            // 循环查看解锁结果
            var timer = setInterval( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
            var timer = setInterval( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
              var res1;
              return _regenerator.default.wrap(function _callee5$(_context5) {
              return _regenerator.default.wrap(function _callee7$(_context7) {
                while (1) {
                  switch (_context5.prev = _context5.next) {
                  switch (_context7.prev = _context7.next) {
                    case 0:
                      num += 1;
                      _context5.next = 3;
                      return _this5.$u.api.refreshLock({
                      _context7.next = 3;
                      return _this7.$u.api.refreshLock({
                        id: res.data.memberRidesResponse.rideId
                      });
                    case 3:
                      res1 = _context5.sent;
                      res1 = _context7.sent;
                      // 开锁成功
                      if (res1.data.status === 1) {
                        clearInterval(timer);
                        _this5.show5 = false;
                        _this7.show5 = false;
                        setTimeout(function () {
                          _this5.show2 = true;
                          _this7.show2 = true;
                        }, 500);
                      }
                      // 开锁失败
                      if (res1.data.status === 3) {
                        clearInterval(timer);
                        _this5.show5 = false;
                        _this7.show5 = false;
                        uni.showToast({
                          title: '开锁失败',
                          icon: 'error',
@@ -838,7 +934,7 @@
                      // 开锁超时
                      if (num === 180) {
                        clearInterval(timer);
                        _this5.show5 = false;
                        _this7.show5 = false;
                        uni.showToast({
                          title: '开锁超时',
                          icon: 'error',
@@ -847,77 +943,77 @@
                      }
                    case 7:
                    case "end":
                      return _context5.stop();
                      return _context7.stop();
                  }
                }
              }, _callee5);
              }, _callee7);
            })), 1000);
          }
          // 骑行中
          if (res.data.rideStatus === 1) {
            _this5.show2 = true;
            _this5.refreshStatus();
            _this7.show2 = true;
            _this7.refreshStatus();
          }
          if (res.data.rideStatus === 5) {
            _this5.show5 = true;
            _this7.show5 = true;
          }
          if (res.data.rideStatus === 2) {
            _this5.show6 = true;
            _this5.refreshStatus();
            _this7.show6 = true;
            _this7.refreshStatus();
          }
          // 是否营业
          if (res.data.isBusiness === 0) {
            _this5.title = '暂停营业提醒';
            _this5.content = res.data.unBusinessTips;
            _this5.show4 = true;
            _this7.title = '暂停营业提醒';
            _this7.content = res.data.unBusinessTips;
            _this7.show4 = true;
            return;
          }
          // 是否停止服务
          if (res.data.isStopServe === 1) {
            _this5.title = '暂停服务提醒';
            _this5.content = res.data.stopServeTips;
            _this5.show4 = true;
            _this7.title = '暂停服务提醒';
            _this7.content = res.data.stopServeTips;
            _this7.show4 = true;
          }
        }
      });
    },
    // 刷新首页信息
    refresh: function refresh() {
      var _this6 = this;
      var _this8 = this;
      this.$u.api.home().then(function (res) {
        if (res.code === 200) {
          _this6.info = res.data;
          _this8.info = res.data;
          // 解锁中
          if (res.data.rideStatus === 0) {
            _this6.show5 = true;
            _this8.show5 = true;
            // 循环次数
            var num = 1;
            // 循环查看解锁结果
            var timer = setInterval( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
            var timer = setInterval( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8() {
              var res1;
              return _regenerator.default.wrap(function _callee6$(_context6) {
              return _regenerator.default.wrap(function _callee8$(_context8) {
                while (1) {
                  switch (_context6.prev = _context6.next) {
                  switch (_context8.prev = _context8.next) {
                    case 0:
                      num += 1;
                      _context6.next = 3;
                      return _this6.$u.api.refreshLock({
                      _context8.next = 3;
                      return _this8.$u.api.refreshLock({
                        id: res.data.memberRidesResponse.rideId
                      });
                    case 3:
                      res1 = _context6.sent;
                      res1 = _context8.sent;
                      // 开锁成功
                      if (res1.data.status === 1) {
                        clearInterval(timer);
                        _this6.show5 = false;
                        _this8.show5 = false;
                        setTimeout(function () {
                          _this6.show2 = true;
                          _this8.show2 = true;
                        }, 500);
                      }
                      // 开锁失败
                      if (res1.data.status === 3) {
                        clearInterval(timer);
                        _this6.show5 = false;
                        _this8.show5 = false;
                        uni.showToast({
                          title: '开锁失败',
                          icon: 'error',
@@ -927,7 +1023,7 @@
                      // 开锁超时
                      if (num === 180) {
                        clearInterval(timer);
                        _this6.show5 = false;
                        _this8.show5 = false;
                        uni.showToast({
                          title: '开锁超时',
                          icon: 'error',
@@ -936,21 +1032,21 @@
                      }
                    case 7:
                    case "end":
                      return _context6.stop();
                      return _context8.stop();
                  }
                }
              }, _callee6);
              }, _callee8);
            })), 1000);
          }
          if (res.data.rideStatus === 1) {
            _this6.show2 = true;
            _this6.refreshStatus();
            _this8.show2 = true;
            _this8.refreshStatus();
          }
          if (res.data.rideStatus === 5) {
            _this6.show5 = true;
            _this8.show5 = true;
          }
          if (res.data.rideStatus === 2) {
            _this6.show6 = true;
            _this8.show6 = true;
          }
        }
      });