From 2e3adf807c3c198746d3d51fbab4d71bdf22af81 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 10 十一月 2023 10:14:20 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
bicycle/unpackage/dist/dev/mp-weixin/pages/index/index.js | 294 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 169 insertions(+), 125 deletions(-)
diff --git a/bicycle/unpackage/dist/dev/mp-weixin/pages/index/index.js b/bicycle/unpackage/dist/dev/mp-weixin/pages/index/index.js
index 6f71126..e42ecf1 100644
--- a/bicycle/unpackage/dist/dev/mp-weixin/pages/index/index.js
+++ b/bicycle/unpackage/dist/dev/mp-weixin/pages/index/index.js
@@ -223,6 +223,9 @@
var _default = {
data: function data() {
return {
+ disable: false,
+ top: 0,
+ title: '',
latitude: null,
longitude: null,
bgImg: __webpack_require__(/*! @/static/images/bg_service@2x.png */ 169),
@@ -269,7 +272,7 @@
};
},
computed: _objectSpread({}, (0, _vuex.mapState)(['navHeight', 'statusbarHeight', 'userInfo'])),
- onLoad: function onLoad() {
+ onLoad: function onLoad(options) {
var _this = this;
return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
return _regenerator.default.wrap(function _callee$(_context) {
@@ -283,16 +286,20 @@
_context.next = 3;
return _this.$onLaunched;
case 3:
+ console.log(decodeURIComponent(options.scene));
_this.getAddress();
_this.getHomeInfo();
_this.getSite();
- case 6:
+ case 7:
case "end":
return _context.stop();
}
}
}, _callee);
}))();
+ },
+ onPageScroll: function onPageScroll(e) {
+ this.top = e.scrollTop;
},
methods: {
jumpX: function jumpX() {
@@ -319,7 +326,7 @@
res.data.forEach(function (item, index) {
_this2.markers.push({
id: index,
- width: 30,
+ width: 40,
height: 40,
latitude: item.latitude,
longitude: item.longitude,
@@ -338,22 +345,25 @@
this.isDisabled = false;
this.$u.api.goodsOrderSettlement({}).then(function (res) {
if (res.code === 200) {
- _this3.refresh();
+ _this3.show3 = false;
+ _this3.show6 = false;
+ _this3.show7 = false;
uni.showToast({
title: '缁撶畻鎴愬姛锛�',
icon: 'success',
duration: 2000
});
- _this3.show3 = false;
- _this3.show7 = false;
- _this3.isDisabled = true;
+ _this3.refresh();
}
+ }).finally(function () {
+ _this3.isDisabled = true;
});
}
},
minute: function minute() {
this.show3 = false;
- if (this.info.rideStatus !== -1) {
+ console.log(this.info.rideStatus);
+ if (this.info.rideStatus != -1) {
this.show6 = true;
}
},
@@ -378,6 +388,14 @@
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 {
@@ -402,7 +420,7 @@
// 楠戣鏄庣粏
toRidingDetails: function toRidingDetails() {
uni.navigateTo({
- url: "/pages/ridingDetails/ridingDetails?id=".concat(this.info.goodsOrderId)
+ url: "/pages/ridingDetails/ridingDetails?id=".concat(this.info.goodsOrderId, "&price=").concat(this.info.deposit / 100)
});
},
// 璺宠浆鏁呴殰涓婃姤
@@ -413,35 +431,43 @@
},
// 鎶奸噾鏀粯
depositPayment: function depositPayment() {
+ var that = this;
if (this.active) {
- var that = this;
- this.$u.api.createGoodsOrderPay().then(function (res) {
- if (res.code === 200) {
- wx.requestPayment({
- timeStamp: res.data.timeStamp,
- nonceStr: res.data.nonceStr,
- package: res.data.packageValue,
- signType: 'MD5',
- paySign: res.data.paySign,
- success: function success(res) {
- if (res.errMsg = 'requestPayment:ok') {
- that.show1 = false;
- that.info.depositStatus = 1;
- that.carRental();
- that.refresh();
- uni.showToast({
- title: '鍏呭�兼垚鍔�',
- icon: 'success',
- duration: 2000
- });
+ if (!this.disable) {
+ that.disable = true;
+ that.$u.api.createGoodsOrderPay().then(function (res) {
+ if (res.code === 200) {
+ wx.requestPayment({
+ timeStamp: res.data.timeStamp,
+ nonceStr: res.data.nonceStr,
+ package: res.data.packageValue,
+ signType: 'MD5',
+ paySign: res.data.paySign,
+ success: function success(res) {
+ that.disable = false;
+ if (res.errMsg = 'requestPayment:ok') {
+ that.show1 = false;
+ that.info.depositStatus = 1;
+ that.carRental();
+ that.refresh();
+ uni.showToast({
+ title: '鍏呭�兼垚鍔�',
+ icon: 'success',
+ duration: 2000
+ });
+ }
+ },
+ fail: function fail(err) {
+ that.disable = false;
+ console.log(err);
}
- },
- fail: function fail(err) {
- console.log(err);
- }
- });
- }
- });
+ });
+ }
+ }).catch(function (err) {
+ that.disable = false;
+ console.log(err);
+ });
+ }
} else {
uni.showToast({
title: '璇峰厛鍕鹃�夊崗璁�',
@@ -483,96 +509,104 @@
return;
}
var that = this;
- // 鎵爜瑙ｉ攣楠戣
- 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.show6 = false;
+ 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;
- // 寰幆娆℃暟
- 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
+ // 璋冪敤寮�閿佹帴鍙�
+ _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
});
- }
- // 寮�閿佽秴鏃�
- if (num === 180) {
- that.refresh();
- clearInterval(timer);
- that.show5 = false;
- uni.showToast({
- title: '寮�閿佽秴鏃�',
- icon: 'error',
- duration: 2000
- });
- }
- case 7:
- case "end":
- return _context2.stop();
+ 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;
- }
- case 5:
- case "end":
- return _context3.stop();
+ }, _callee2);
+ })), 1000);
+ } else {
+ that.show5 = false;
+ that.disable = false;
+ }
+ case 5:
+ case "end":
+ return _context3.stop();
+ }
}
- }
- }, _callee3);
- }));
- function success(_x) {
- return _success.apply(this, arguments);
+ }, _callee3);
+ }));
+ function success(_x) {
+ return _success.apply(this, arguments);
+ }
+ return success;
+ }(),
+ fail: function fail() {
+ that.disable = false;
}
- return success;
- }()
- });
+ });
+ }
},
// 鑾峰彇缁忕含搴�
getAddress: function getAddress() {
@@ -720,7 +754,7 @@
case 2:
res = _context4.sent;
if (!(res.code === 200)) {
- _context4.next = 10;
+ _context4.next = 13;
break;
}
_this4.info = res.data;
@@ -733,11 +767,18 @@
case 7:
_this4.show2 = false;
// 宸叉崲杞�
- if (res.data.rideStatus === 2) {
- _this4.show6 = true;
+ if (!(res.data.rideStatus === 2)) {
+ _context4.next = 11;
+ break;
+ }
+ _this4.show6 = true;
+ return _context4.abrupt("return");
+ case 11:
+ if (res.data.rideStatus === -1) {
+ _this4.show6 = false;
}
clearInterval(_this4.timer);
- case 10:
+ case 13:
case "end":
return _context4.stop();
}
@@ -820,15 +861,18 @@
}
if (res.data.rideStatus === 2) {
_this5.show6 = true;
+ _this5.refreshStatus();
}
// 鏄惁钀ヤ笟
if (res.data.isBusiness === 0) {
+ _this5.title = '鏆傚仠钀ヤ笟鎻愰啋';
_this5.content = res.data.unBusinessTips;
_this5.show4 = true;
return;
}
// 鏄惁鍋滄鏈嶅姟
if (res.data.isStopServe === 1) {
+ _this5.title = '鏆傚仠鏈嶅姟鎻愰啋';
_this5.content = res.data.stopServeTips;
_this5.show4 = true;
}
--
Gitblit v1.9.3