From cc6ab7021c3aef6ca3bbf05f8bcb5bfe0e6f6096 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 16:52:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
bicycle/unpackage/dist/dev/mp-weixin/pages/index/index.js | 1236 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 845 insertions(+), 391 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 3b61212..854c53c 100644
--- a/bicycle/unpackage/dist/dev/mp-weixin/pages/index/index.js
+++ b/bicycle/unpackage/dist/dev/mp-weixin/pages/index/index.js
@@ -103,10 +103,16 @@
try {
components = {
uPopup: function () {
- return Promise.all(/*! import() | node-modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-popup/u-popup.vue */ 265))
+ return Promise.all(/*! import() | node-modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-popup/u-popup.vue */ 293))
+ },
+ uIcon: function () {
+ return Promise.all(/*! import() | node-modules/uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-icon/u-icon.vue */ 301))
},
uModal: function () {
- return Promise.all(/*! import() | node-modules/uview-ui/components/u-modal/u-modal */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-modal/u-modal")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-modal/u-modal.vue */ 273))
+ return Promise.all(/*! import() | node-modules/uview-ui/components/u-modal/u-modal */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-modal/u-modal")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-modal/u-modal.vue */ 310))
+ },
+ tram: function () {
+ return __webpack_require__.e(/*! import() | components/tram/tram */ "components/tram/tram").then(__webpack_require__.bind(null, /*! @/components/tram/tram.vue */ 318))
},
}
} catch (e) {
@@ -131,6 +137,24 @@
var _h = _vm.$createElement
var _c = _vm._self._c || _h
var g0 = (_vm.info.deposit / 100).toFixed(2)
+ var m0 =
+ _vm.info &&
+ _vm.info.memberRidesResponse &&
+ _vm.info.memberRidesResponse.discountMember &&
+ _vm.info.memberRidesResponse.discountMember.limitType === 1
+ ? _vm.convertMinutesToHours(
+ _vm.info.memberRidesResponse.discountMember.surplusTime
+ )
+ : null
+ var m1 =
+ _vm.info &&
+ _vm.info.memberRidesResponse &&
+ _vm.info.memberRidesResponse.discountMember &&
+ _vm.info.memberRidesResponse.discountMember.limitType === 1
+ ? _vm.convertMinutesToHours(
+ _vm.info.memberRidesResponse.discountMember.surplusTime
+ )
+ : null
if (!_vm._isMounted) {
_vm.e0 = function ($event) {
_vm.show1 = false
@@ -171,6 +195,8 @@
{
$root: {
g0: g0,
+ m0: m0,
+ m1: m1,
},
}
)
@@ -220,6 +246,11 @@
var _vuex = __webpack_require__(/*! vuex */ 33);
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+var tram = function tram() {
+ __webpack_require__.e(/*! require.ensure | components/tram/tram */ "components/tram/tram").then((function () {
+ return resolve(__webpack_require__(/*! @/components/tram/tram.vue */ 318));
+ }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
+};
var _default = {
data: function data() {
return {
@@ -268,70 +299,343 @@
info: {},
content: '',
timer: null,
- isDisabled: true
+ isDisabled: true,
+ tcList: [],
+ type: 1,
+ types: [{
+ name: '鑷杞�',
+ id: 1
+ }, {
+ name: '鐢靛姩杞�',
+ id: 2
+ }],
+ eleBusinessArea: [{
+ points: [],
+ fillColor: "#0077FF12",
+ strokeColor: "#0077FF",
+ strokeWidth: 3,
+ zIndex: 7
+ }],
+ onPullDownRefresh: false,
+ timerdian: null
};
+ },
+ components: {
+ tram: tram
},
computed: _objectSpread({}, (0, _vuex.mapState)(['navHeight', 'statusbarHeight', 'userInfo'])),
onLoad: function onLoad(options) {
var _this = this;
- return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
- return _regenerator.default.wrap(function _callee$(_context) {
+ return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+ var that;
+ return _regenerator.default.wrap(function _callee3$(_context3) {
while (1) {
- switch (_context.prev = _context.next) {
+ switch (_context3.prev = _context3.next) {
case 0:
+ that = _this;
if (!(JSON.stringify(_this.userInfo) == '{}')) {
- _context.next = 3;
+ _context3.next = 4;
break;
}
- _context.next = 3;
+ _context3.next = 4;
return _this.$onLaunched;
- case 3:
- _context.next = 5;
+ case 4:
+ _context3.next = 6;
return _this.getAddress();
- case 5:
- _context.next = 7;
- return _this.getHomeInfo();
- case 7:
- _context.next = 9;
+ case 6:
+ _context3.next = 8;
return _this.getSite();
- case 9:
- if (decodeURIComponent(options.scene) !== 'undefined') {
- console.log(decodeURIComponent(options.scene));
- _this.carRentalCopy(decodeURIComponent(options.scene));
- }
+ case 8:
+ _this.$u.api.home().then( /*#__PURE__*/function () {
+ var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(res) {
+ var code, typeName, _typeName, num, timer, _code, arr;
+ return _regenerator.default.wrap(function _callee2$(_context2) {
+ while (1) {
+ switch (_context2.prev = _context2.next) {
+ case 0:
+ if (!(res.code === 200)) {
+ _context2.next = 13;
+ break;
+ }
+ code = decodeURIComponent(options.scene);
+ if (res.data.memberRidesResponse && res.data.memberRidesResponse.ridesType === 0 && code !== 'undefined' && res.data.rideStatus !== 2) {
+ typeName = '';
+ if (code.substring(0, code.indexOf('-')) === 'ebike') {
+ typeName = '鐢靛姩杞�';
+ } else {
+ typeName = '鑷杞�';
+ }
+ uni.showToast({
+ title: "\u5F53\u524D\u5B58\u5728\u672A\u7ED3\u7B97\u81EA\u884C\u8F66\u8BA2\u5355\uFF0C\u8BF7\u5148\u7ED3\u7B97\u8BA2\u5355\u540E\u518D\u626B\u7801\u79DF".concat(typeName),
+ icon: 'none'
+ });
+ } else if (res.data.memberRidesResponse && res.data.memberRidesResponse.ridesType === 1 && code !== 'undefined') {
+ _typeName = '';
+ if (code.substring(0, code.indexOf('-')) === 'ebike') {
+ _typeName = '鐢靛姩杞�';
+ } else {
+ _typeName = '鑷杞�';
+ }
+ uni.showToast({
+ title: "\u5F53\u524D\u5B58\u5728\u672A\u7ED3\u7B97\u7535\u52A8\u8F66\u8BA2\u5355\uFF0C\u8BF7\u5148\u7ED3\u7B97\u8BA2\u5355\u540E\u518D\u626B\u7801\u79DF".concat(_typeName),
+ icon: 'none'
+ });
+ }
+ // 鑷杞�
+ if (res.data.memberRidesResponse && res.data.memberRidesResponse.ridesType === 0) {
+ // 瑙ｉ攣涓�
+ if (res.data.rideStatus === 0) {
+ _this.show5 = true;
+ // 寰幆娆℃暟
+ num = 1; // 寰幆鏌ョ湅瑙ｉ攣缁撴灉
+ timer = setInterval( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+ var res1;
+ return _regenerator.default.wrap(function _callee$(_context) {
+ while (1) {
+ switch (_context.prev = _context.next) {
+ case 0:
+ num += 1;
+ _context.next = 3;
+ return _this.$u.api.refreshLock({
+ id: res.data.memberRidesResponse.rideId
+ });
+ case 3:
+ res1 = _context.sent;
+ // 寮�閿佹垚鍔�
+ if (res1.data.status === 1) {
+ clearInterval(timer);
+ _this.show5 = false;
+ setTimeout(function () {
+ _this.show2 = true;
+ }, 500);
+ }
+ // 寮�閿佸け璐�
+ if (res1.data.status === 3) {
+ clearInterval(timer);
+ _this.show5 = false;
+ uni.showToast({
+ title: '寮�閿佸け璐�',
+ icon: 'error',
+ duration: 2000
+ });
+ }
+ // 寮�閿佽秴鏃�
+ if (num === 180) {
+ clearInterval(timer);
+ _this.show5 = false;
+ uni.showToast({
+ title: '寮�閿佽秴鏃�',
+ icon: 'error',
+ duration: 2000
+ });
+ }
+ case 7:
+ case "end":
+ return _context.stop();
+ }
+ }
+ }, _callee);
+ })), 1000);
+ }
+ // 楠戣涓�
+ if (res.data.rideStatus === 1) {
+ _this.show2 = true;
+ _this.refreshStatus();
+ }
+ if (res.data.rideStatus === 5) {
+ _this.show5 = true;
+ }
+ if (res.data.rideStatus === 2) {
+ _this.show6 = true;
+ _this.refreshStatus();
+ }
+ } else if (res.data.memberRidesResponse && res.data.memberRidesResponse.ridesType === 1) {
+ that.$refs.d_tram.info = _objectSpread(_objectSpread(_objectSpread({}, res.data.memberRidesResponse.discountMember), res.data.memberRidesResponse), {}, {
+ deposit: res.data.deposit,
+ goodsOrderId: res.data.goodsOrderId
+ });
+ // 楠戣涓�
+ if (res.data.rideStatus === 1) {
+ that.$refs.d_tram.d_show3 = true;
+ }
+ // 涓存椂閿佽溅
+ if (res.data.rideStatus === 4) {
+ that.$refs.d_tram.d_show4 = true;
+ }
+ // 杞鍒锋柊鐢佃溅楠戣鐘舵��
+ that.refreshTram();
+ // 娌℃湁楠戣璁㈠崟
+ } else if (!res.data.memberRidesResponse) {
+ if (decodeURIComponent(options.scene) !== 'undefined') {
+ _code = decodeURIComponent(options.scene);
+ if (_code.substring(0, _code.indexOf('-')) === 'ebike') {
+ console.log('鐢靛姩杞�');
+ _this.carRentalCopy(decodeURIComponent(options.scene), 2);
+ } else {
+ console.log('鑷杞�');
+ _this.carRentalCopy(decodeURIComponent(options.scene), 1);
+ }
+ }
+ }
+ // 鏄惁钀ヤ笟
+ if (!(res.data.isBusiness === 0)) {
+ _context2.next = 9;
+ break;
+ }
+ _this.title = '鏆傚仠钀ヤ笟鎻愰啋';
+ _this.content = res.data.unBusinessTips;
+ _this.show4 = true;
+ return _context2.abrupt("return");
+ case 9:
+ // 鏄惁鍋滄鏈嶅姟
+ if (res.data.isStopServe === 1) {
+ _this.title = '鏆傚仠鏈嶅姟鎻愰啋';
+ _this.content = res.data.stopServeTips;
+ _this.show4 = true;
+ }
+ _this.tcList = res.data.discountList;
+ arr = JSON.parse(res.data.eleBusinessArea);
+ _this.eleBusinessArea[0].points = arr.map(function (item) {
+ return {
+ latitude: item.lat,
+ longitude: item.lng
+ };
+ });
+ case 13:
+ case "end":
+ return _context2.stop();
+ }
+ }
+ }, _callee2);
+ }));
+ return function (_x) {
+ return _ref.apply(this, arguments);
+ };
+ }());
+ uni.$on('update', function (data) {
+ _this.carRental();
+ });
case 10:
case "end":
- return _context.stop();
+ return _context3.stop();
}
}
- }, _callee);
+ }, _callee3);
}))();
+ },
+ onPullDownRefresh: function onPullDownRefresh() {
+ this.onPullDownRefresh = true;
+ this.refresh();
+ },
+ onShow: function onShow() {
+ this.refresh();
},
onPageScroll: function onPageScroll(e) {
this.top = e.scrollTop;
},
methods: {
- // 寰俊鎵撳紑灏忕▼搴忓紑閿佹柟娉�
- carRentalCopy: function carRentalCopy(code) {
+ // 鍒嗛挓杞崲
+ convertMinutesToHours: function convertMinutesToHours(minutes) {
+ var hours = Math.floor(minutes / 60); // 璁＄畻灏忔椂鏁�
+ var remainingMinutes = minutes % 60; // 璁＄畻鍓╀綑鐨勫垎閽熸暟
+ if (hours > 0 && remainingMinutes > 0) {
+ return "".concat(hours, "\u5C0F\u65F6").concat(remainingMinutes, "\u5206\u949F");
+ } else if (hours == 0) {
+ return "".concat(remainingMinutes, "\u5206\u949F");
+ } else if (remainingMinutes == 0) {
+ return "".concat(hours, "\u5C0F\u65F6");
+ }
+ },
+ clickcontrol: function clickcontrol() {
+ var mapObjs = uni.createMapContext('mapId', this);
+ mapObjs.moveToLocation({
+ complete: function complete(res) {
+ console.log('绉诲姩瀹屾垚:', res);
+ }
+ });
+ },
+ getEleBikeList: function getEleBikeList() {
var _this2 = this;
- return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
- var that, res, num, timer;
- return _regenerator.default.wrap(function _callee3$(_context3) {
+ return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+ var res;
+ return _regenerator.default.wrap(function _callee4$(_context4) {
while (1) {
- switch (_context3.prev = _context3.next) {
+ switch (_context4.prev = _context4.next) {
case 0:
- _context3.next = 2;
- return _this2.refresh();
+ _context4.next = 2;
+ return _this2.$u.api.eleBikeList({});
case 2:
- if (!(_this2.info.depositStatus === 0)) {
- _context3.next = 7;
+ res = _context4.sent;
+ if (res.code === 200) {
+ _this2.markers = [];
+ res.data.forEach(function (item, index) {
+ _this2.markers.push({
+ id: index,
+ width: 40,
+ height: 40,
+ latitude: item.latitude,
+ longitude: item.longitude,
+ title: item.name,
+ iconPath: '/static/icon/ic_bike@2x.png'
+ });
+ });
+ _this2.clickcontrol();
+ }
+ case 4:
+ case "end":
+ return _context4.stop();
+ }
+ }
+ }, _callee4);
+ }))();
+ },
+ clickType: function clickType(id) {
+ this.type = id;
+ if (id === 1) {
+ this.getSite();
+ } else {
+ this.getEleBikeList();
+ }
+ },
+ purchase: function purchase(id) {
+ uni.navigateTo({
+ url: "/pages/packageDetails/packageDetails?id=".concat(id)
+ });
+ },
+ jumpTC: function jumpTC() {
+ uni.navigateTo({
+ url: '/pages/setMenu/setMenu'
+ });
+ },
+ // 寰俊鎵撳紑灏忕▼搴忓紑閿佹柟娉�
+ carRentalCopy: function carRentalCopy(code, type) {
+ var _this3 = this;
+ return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
+ var that, ddd, res, num, timer, _res;
+ return _regenerator.default.wrap(function _callee6$(_context6) {
+ while (1) {
+ switch (_context6.prev = _context6.next) {
+ case 0:
+ that = _this3;
+ _context6.next = 3;
+ return _this3.$u.api.home();
+ case 3:
+ ddd = _context6.sent;
+ if (!(ddd.code === 200)) {
+ _context6.next = 28;
break;
}
- _this2.show1 = true;
- return _context3.abrupt("return");
- case 7:
- if (!(_this2.info.depositStatus === 2)) {
- _context3.next = 10;
+ _this3.info = ddd.data;
+ // 鍒ゆ柇鏈夋病鏈変氦鎶奸噾
+ if (!(_this3.info.depositStatus === 0)) {
+ _context6.next = 11;
+ break;
+ }
+ _this3.show1 = true;
+ return _context6.abrupt("return");
+ case 11:
+ if (!(_this3.info.depositStatus === 2)) {
+ _context6.next = 14;
break;
}
uni.showToast({
@@ -339,42 +643,45 @@
icon: 'none',
duration: 2000
});
- return _context3.abrupt("return");
- case 10:
- that = _this2;
+ return _context6.abrupt("return");
+ case 14:
+ if (!(type === 1)) {
+ _context6.next = 24;
+ break;
+ }
if (that.disable) {
- _context3.next = 18;
+ _context6.next = 22;
break;
}
that.disable = true;
// 鎵撳紑寮�閿佸脊妗�
that.show5 = true;
// 璋冪敤寮�閿佹帴鍙�
- _context3.next = 16;
+ _context6.next = 20;
return that.$u.api.openLock({
code: code
});
- case 16:
- res = _context3.sent;
+ case 20:
+ res = _context6.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() {
+ timer = setInterval( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
var res1;
- return _regenerator.default.wrap(function _callee2$(_context2) {
+ return _regenerator.default.wrap(function _callee5$(_context5) {
while (1) {
- switch (_context2.prev = _context2.next) {
+ switch (_context5.prev = _context5.next) {
case 0:
num += 1;
- _context2.next = 3;
+ _context5.next = 3;
return that.$u.api.refreshLock({
id: res.data.id
});
case 3:
- res1 = _context2.sent;
+ res1 = _context5.sent;
// 寮�閿佹垚鍔�
if (res1.data.status === 1) {
that.refresh();
@@ -408,21 +715,35 @@
}
case 7:
case "end":
- return _context2.stop();
+ return _context5.stop();
}
}
- }, _callee2);
+ }, _callee5);
})), 1000);
} else {
that.show5 = false;
that.disable = false;
}
- case 18:
+ case 22:
+ _context6.next = 28;
+ break;
+ case 24:
+ _context6.next = 26;
+ return that.$u.api.getBikeChargingRule({
+ code: code
+ });
+ case 26:
+ _res = _context6.sent;
+ if (_res.code === 200) {
+ that.$refs.d_tram.info = _res.data;
+ that.$refs.d_tram.d_show1 = true;
+ }
+ case 28:
case "end":
- return _context3.stop();
+ return _context6.stop();
}
}
- }, _callee3);
+ }, _callee6);
}))();
},
jumpX: function jumpX() {
@@ -432,7 +753,7 @@
},
jumpMap: function jumpMap() {
uni.navigateTo({
- url: '/pages/maps/maps'
+ url: "/pages/maps/maps?type=".concat(this.type)
});
},
// 璁′环瑙勫垯
@@ -442,12 +763,12 @@
});
},
getSite: function getSite() {
- var _this3 = this;
+ var _this4 = this;
this.$u.api.rentSiteList().then(function (res) {
if (res.code === 200) {
- _this3.markers = [];
+ _this4.markers = [];
res.data.forEach(function (item, index) {
- _this3.markers.push({
+ _this4.markers.push({
id: index,
width: 40,
height: 40,
@@ -458,19 +779,20 @@
addr: item.addr
});
});
+ _this4.clickcontrol();
}
});
},
// 缁撶畻
settlement1: function settlement1() {
- var _this4 = this;
+ var _this5 = this;
if (this.isDisabled) {
this.isDisabled = false;
this.$u.api.goodsOrderSettlement({}).then(function (res) {
if (res.code === 200) {
- _this4.show3 = false;
- _this4.show6 = false;
- _this4.show7 = false;
+ _this5.show3 = false;
+ _this5.show6 = false;
+ _this5.show7 = false;
uni.showToast({
title: '缁撶畻鐢宠鎻愪氦鎴愬姛锛岃鑰愬績绛夊緟閫�娆撅紒',
icon: 'none',
@@ -479,9 +801,9 @@
// this.refresh()
}
}).finally(function () {
- _this4.refresh();
- _this4.show3 = false;
- _this4.isDisabled = true;
+ _this5.refresh();
+ _this5.show3 = false;
+ _this5.isDisabled = true;
});
}
},
@@ -511,47 +833,47 @@
},
// 璺宠浆
jump: function jump(item) {
- var _this5 = this;
- return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
- return _regenerator.default.wrap(function _callee4$(_context4) {
+ var _this6 = this;
+ return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
+ return _regenerator.default.wrap(function _callee7$(_context7) {
while (1) {
- switch (_context4.prev = _context4.next) {
+ switch (_context7.prev = _context7.next) {
case 0:
- _context4.next = 2;
- return _this5.refresh();
+ _context7.next = 2;
+ return _this6.refresh();
case 2:
if (!(item.id === 3)) {
- _context4.next = 6;
+ _context7.next = 6;
break;
}
uni.navigateTo({
url: '/pages/pricingRules/pricingRules'
});
- _context4.next = 31;
+ _context7.next = 31;
break;
case 6:
if (!(item.id === 4)) {
- _context4.next = 10;
+ _context7.next = 10;
break;
}
uni.navigateTo({
url: '/pages/consumptionDetails/consumptionDetails'
});
- _context4.next = 31;
+ _context7.next = 31;
break;
case 10:
if (!(item.id === 2)) {
- _context4.next = 19;
+ _context7.next = 19;
break;
}
- if (_this5.userInfo.mobile) {
- _context4.next = 13;
+ if (_this6.userInfo.mobile) {
+ _context7.next = 13;
break;
}
- return _context4.abrupt("return");
+ return _context7.abrupt("return");
case 13:
- if (!(_this5.info.rideStatus === 1)) {
- _context4.next = 16;
+ if (!(_this6.info.rideStatus === 1)) {
+ _context7.next = 16;
break;
}
uni.showToast({
@@ -559,11 +881,11 @@
icon: 'none',
duration: 2000
});
- return _context4.abrupt("return");
+ return _context7.abrupt("return");
case 16:
- if (_this5.info.depositStatus === 1) {
- _this5.show3 = true;
- } else if (_this5.info.depositStatus === 2) {
+ if (_this6.info.depositStatus === 1) {
+ _this6.show3 = true;
+ } else if (_this6.info.depositStatus === 2) {
uni.showToast({
title: '缁撶畻鐢宠鎻愪氦鎴愬姛锛岃鑰愬績绛夊緟閫�娆撅紒',
icon: 'none',
@@ -576,21 +898,21 @@
duration: 2000
});
}
- _context4.next = 31;
+ _context7.next = 31;
break;
case 19:
if (!(item.id === 1)) {
- _context4.next = 31;
+ _context7.next = 31;
break;
}
- if (_this5.userInfo.mobile) {
- _context4.next = 22;
+ if (_this6.userInfo.mobile) {
+ _context7.next = 22;
break;
}
- return _context4.abrupt("return");
+ return _context7.abrupt("return");
case 22:
- if (!(_this5.info.depositStatus === 1)) {
- _context4.next = 27;
+ if (!(_this6.info.depositStatus === 1)) {
+ _context7.next = 27;
break;
}
uni.showToast({
@@ -598,10 +920,10 @@
icon: 'none',
duration: 2000
});
- return _context4.abrupt("return");
+ return _context7.abrupt("return");
case 27:
- if (!(_this5.info.depositStatus === 2)) {
- _context4.next = 30;
+ if (!(_this6.info.depositStatus === 2)) {
+ _context7.next = 30;
break;
}
uni.showToast({
@@ -609,15 +931,15 @@
icon: 'none',
duration: 2000
});
- return _context4.abrupt("return");
+ return _context7.abrupt("return");
case 30:
- _this5.show1 = true;
+ _this6.show1 = true;
case 31:
case "end":
- return _context4.stop();
+ return _context7.stop();
}
}
- }, _callee4);
+ }, _callee7);
}))();
},
// 楠戣鏄庣粏
@@ -652,7 +974,6 @@
that.show1 = false;
that.info.depositStatus = 1;
that.carRental();
- that.refresh();
uni.showToast({
title: '鍏呭�兼垚鍔�',
icon: 'success',
@@ -662,13 +983,11 @@
},
fail: function fail(err) {
that.disable = false;
- console.log(err);
}
});
}
}).catch(function (err) {
that.disable = false;
- console.log(err);
});
}
} else {
@@ -706,25 +1025,34 @@
},
// 鎵爜绉熻溅
carRental: function carRental() {
- var _this6 = this;
- return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
- var that;
- return _regenerator.default.wrap(function _callee7$(_context7) {
+ var _this7 = this;
+ return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10() {
+ var that, res;
+ return _regenerator.default.wrap(function _callee10$(_context10) {
while (1) {
- switch (_context7.prev = _context7.next) {
+ switch (_context10.prev = _context10.next) {
case 0:
- _context7.next = 2;
- return _this6.refresh();
- case 2:
- if (!(_this6.info.depositStatus === 0)) {
- _context7.next = 7;
+ that = _this7;
+ _context10.next = 3;
+ return _this7.$u.api.home();
+ case 3:
+ res = _context10.sent;
+ if (!(res.code === 200)) {
+ _context10.next = 15;
break;
}
- _this6.show1 = true;
- return _context7.abrupt("return");
- case 7:
- if (!(_this6.info.depositStatus === 2)) {
- _context7.next = 10;
+ _this7.info = res.data;
+
+ // 鍒ゆ柇鏈夋病鏈変氦鎶奸噾
+ if (!(_this7.info.depositStatus === 0)) {
+ _context10.next = 11;
+ break;
+ }
+ _this7.show1 = true;
+ return _context10.abrupt("return");
+ case 11:
+ if (!(_this7.info.depositStatus === 2)) {
+ _context10.next = 14;
break;
}
uni.showToast({
@@ -732,115 +1060,128 @@
icon: 'none',
duration: 2000
});
- return _context7.abrupt("return");
- case 10:
- that = _this6;
- if (!that.disable) {
- that.disable = true;
- // 鎵爜瑙ｉ攣楠戣
- uni.scanCode({
- success: function () {
- var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(result) {
- var text, res, num, timer;
- return _regenerator.default.wrap(function _callee6$(_context6) {
- while (1) {
- switch (_context6.prev = _context6.next) {
- case 0:
- text = decodeURIComponent(result.path);
- text = text.substring(text.lastIndexOf('?') + 7, text.length);
- // 鎵撳紑寮�閿佸脊妗�
+ return _context10.abrupt("return");
+ case 14:
+ // 鎵爜鑾峰彇杞﹁締淇℃伅
+ uni.scanCode({
+ success: function () {
+ var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9(result) {
+ var code, res, bicycle, num, timer;
+ return _regenerator.default.wrap(function _callee9$(_context9) {
+ while (1) {
+ switch (_context9.prev = _context9.next) {
+ case 0:
+ code = decodeURIComponent(result.path).split('=')[1];
+ _context9.next = 3;
+ return that.$u.api.getBikeChargingRule({
+ code: code
+ });
+ case 3:
+ res = _context9.sent;
+ if (!(res.code === 200 && res.data.ridesType === 0)) {
+ _context9.next = 13;
+ break;
+ }
+ that.disable = true;
+ that.show5 = true;
+ // 璋冪敤寮�閿佹帴鍙�
+ _context9.next = 9;
+ return that.$u.api.openLock({
+ code: code
+ });
+ case 9:
+ bicycle = _context9.sent;
+ if (bicycle.code === 200) {
+ that.disable = false;
+ that.show6 = false;
that.show5 = true;
- // 璋冪敤寮�閿佹帴鍙�
- _context6.next = 5;
- return that.$u.api.openLock({
- code: text
- });
- case 5:
- res = _context6.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 _callee5() {
- var res1;
- return _regenerator.default.wrap(function _callee5$(_context5) {
- while (1) {
- switch (_context5.prev = _context5.next) {
- case 0:
- num += 1;
- _context5.next = 3;
- return that.$u.api.refreshLock({
- id: res.data.id
+
+ // 寰幆娆℃暟
+ num = 1; // 寰幆鏌ョ湅瑙ｉ攣缁撴灉
+ timer = setInterval( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8() {
+ var res1;
+ return _regenerator.default.wrap(function _callee8$(_context8) {
+ while (1) {
+ switch (_context8.prev = _context8.next) {
+ case 0:
+ num += 1;
+ _context8.next = 3;
+ return that.$u.api.refreshLock({
+ id: bicycle.data.id
+ });
+ case 3:
+ res1 = _context8.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
});
- case 3:
- res1 = _context5.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 _context5.stop();
- }
+ }
+ // 寮�閿佽秴鏃�
+ if (num === 180) {
+ that.refresh();
+ clearInterval(timer);
+ that.show5 = false;
+ uni.showToast({
+ title: '寮�閿佽秴鏃�',
+ icon: 'error',
+ duration: 2000
+ });
+ }
+ case 7:
+ case "end":
+ return _context8.stop();
}
- }, _callee5);
- })), 1000);
- } else {
- that.show5 = false;
- that.disable = false;
- }
- case 7:
- case "end":
- return _context6.stop();
- }
+ }
+ }, _callee8);
+ })), 1000);
+ } else {
+ that.show5 = false;
+ that.disable = false;
+ }
+ _context9.next = 14;
+ break;
+ case 13:
+ if (res.code === 200 && res.data.ridesType === 1) {
+ that.$refs.d_tram.info = res.data;
+ that.$refs.d_tram.d_show1 = true;
+ }
+ case 14:
+ case "end":
+ return _context9.stop();
}
- }, _callee6);
- }));
- function success(_x) {
- return _success.apply(this, arguments);
- }
- return success;
- }(),
- fail: function fail() {
- that.disable = false;
+ }
+ }, _callee9);
+ }));
+ function success(_x2) {
+ return _success.apply(this, arguments);
}
- });
- }
- case 12:
+ return success;
+ }(),
+ fail: function fail() {
+ that.disable = false;
+ }
+ });
+ case 15:
case "end":
- return _context7.stop();
+ return _context10.stop();
}
}
- }, _callee7);
+ }, _callee10);
}))();
},
// 鑾峰彇缁忕含搴�
@@ -977,213 +1318,326 @@
},
// 鍒锋柊楠戣鐘舵��
refreshStatus: function refreshStatus() {
- var _this7 = this;
- this.timer = setInterval( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8() {
+ var _this8 = this;
+ this.timer = setInterval( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11() {
var res;
- return _regenerator.default.wrap(function _callee8$(_context8) {
+ return _regenerator.default.wrap(function _callee11$(_context11) {
while (1) {
- switch (_context8.prev = _context8.next) {
+ switch (_context11.prev = _context11.next) {
case 0:
- _context8.next = 2;
- return _this7.$u.api.home();
+ _context11.next = 2;
+ return _this8.$u.api.home();
case 2:
- res = _context8.sent;
+ res = _context11.sent;
if (!(res.code === 200)) {
- _context8.next = 13;
+ _context11.next = 13;
break;
}
- _this7.info = res.data;
+ _this8.info = res.data;
// 楠戣涓�
if (!(res.data.rideStatus === 1)) {
- _context8.next = 7;
+ _context11.next = 7;
break;
}
- return _context8.abrupt("return");
+ return _context11.abrupt("return");
case 7:
- _this7.show2 = false;
+ _this8.show2 = false;
// 宸叉崲杞�
if (!(res.data.rideStatus === 2)) {
- _context8.next = 11;
+ _context11.next = 11;
break;
}
- _this7.show6 = true;
- return _context8.abrupt("return");
+ _this8.show6 = true;
+ return _context11.abrupt("return");
case 11:
if (res.data.rideStatus === -1) {
- _this7.show6 = false;
+ _this8.show6 = false;
}
- clearInterval(_this7.timer);
+ clearInterval(_this8.timer);
case 13:
case "end":
- return _context8.stop();
+ return _context11.stop();
}
}
- }, _callee8);
+ }, _callee11);
})), 10000);
+ },
+ // 鍒锋柊鐢佃溅淇℃伅
+ refreshTram: function refreshTram() {
+ var _this9 = this;
+ this.timerdian = setInterval(function () {
+ _this9.$u.api.home().then(function (res) {
+ if (res.code === 200) {
+ _this9.info = res.data;
+ // 鏈煡鍒伴獞琛岃鍗�
+ if (!res.data.memberRidesResponse) {
+ _this9.$refs.d_tram.d_show = false;
+ _this9.$refs.d_tram.d_show1 = false;
+ _this9.$refs.d_tram.d_show2 = false;
+ _this9.$refs.d_tram.d_show3 = false;
+ _this9.$refs.d_tram.d_show4 = false;
+ _this9.$refs.d_tram.d_show5 = false;
+ _this9.$refs.d_tram.d_show6 = false;
+ _this9.$refs.d_tram.d_show7 = false;
+ _this9.$refs.d_tram.d_show8 = false;
+ _this9.$refs.d_tram.d_show9 = false;
+ clearInterval(_this9.timerdian);
+ _this9.timerdian = null;
+ }
+ }
+ });
+ }, 30000);
},
// 鑾峰彇棣栭〉淇℃伅
getHomeInfo: function getHomeInfo() {
- var _this8 = this;
- this.$u.api.home().then(function (res) {
- if (res.code === 200) {
- _this8.info = res.data;
- // 鏄惁寮瑰嚭骞垮憡鍥�
- if (res.data.adList.length > 0) {
- _this8.show = true;
- }
- // 瑙ｉ攣涓�
- if (res.data.rideStatus === 0) {
- _this8.show5 = true;
- // 寰幆娆℃暟
- var num = 1;
- // 寰幆鏌ョ湅瑙ｉ攣缁撴灉
- var timer = setInterval( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9() {
- var res1;
- return _regenerator.default.wrap(function _callee9$(_context9) {
- while (1) {
- switch (_context9.prev = _context9.next) {
- case 0:
- num += 1;
- _context9.next = 3;
- return _this8.$u.api.refreshLock({
- id: res.data.memberRidesResponse.rideId
- });
- case 3:
- res1 = _context9.sent;
- // 寮�閿佹垚鍔�
- if (res1.data.status === 1) {
- clearInterval(timer);
- _this8.show5 = false;
- setTimeout(function () {
- _this8.show2 = true;
- }, 500);
- }
- // 寮�閿佸け璐�
- if (res1.data.status === 3) {
- clearInterval(timer);
- _this8.show5 = false;
- uni.showToast({
- title: '寮�閿佸け璐�',
- icon: 'error',
- duration: 2000
- });
- }
- // 寮�閿佽秴鏃�
- if (num === 180) {
- clearInterval(timer);
- _this8.show5 = false;
- uni.showToast({
- title: '寮�閿佽秴鏃�',
- icon: 'error',
- duration: 2000
- });
- }
- case 7:
- case "end":
- return _context9.stop();
+ var _this10 = this;
+ var that = this;
+ this.$u.api.home().then( /*#__PURE__*/function () {
+ var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee13(res) {
+ var num, timer, arr;
+ return _regenerator.default.wrap(function _callee13$(_context13) {
+ while (1) {
+ switch (_context13.prev = _context13.next) {
+ case 0:
+ if (!(res.code === 200)) {
+ _context13.next = 13;
+ break;
}
- }
- }, _callee9);
- })), 1000);
- }
- // 楠戣涓�
- if (res.data.rideStatus === 1) {
- _this8.show2 = true;
- _this8.refreshStatus();
- }
- if (res.data.rideStatus === 5) {
- _this8.show5 = true;
- }
- if (res.data.rideStatus === 2) {
- _this8.show6 = true;
- _this8.refreshStatus();
- }
- // 鏄惁钀ヤ笟
- if (res.data.isBusiness === 0) {
- _this8.title = '鏆傚仠钀ヤ笟鎻愰啋';
- _this8.content = res.data.unBusinessTips;
- _this8.show4 = true;
- return;
- }
- // 鏄惁鍋滄鏈嶅姟
- if (res.data.isStopServe === 1) {
- _this8.title = '鏆傚仠鏈嶅姟鎻愰啋';
- _this8.content = res.data.stopServeTips;
- _this8.show4 = true;
- }
- }
- });
+ _this10.info = res.data;
+ // 鏄惁寮瑰嚭骞垮憡鍥�
+ if (res.data.adList.length > 0 && !res.data.memberRidesResponse) {
+ _this10.show = true;
+ }
+ // 鑷杞�
+ if (res.data.memberRidesResponse && res.data.memberRidesResponse.ridesType === 0) {
+ // 瑙ｉ攣涓�
+ if (res.data.rideStatus === 0) {
+ _this10.show5 = true;
+ // 寰幆娆℃暟
+ num = 1; // 寰幆鏌ョ湅瑙ｉ攣缁撴灉
+ timer = setInterval( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee12() {
+ var res1;
+ return _regenerator.default.wrap(function _callee12$(_context12) {
+ while (1) {
+ switch (_context12.prev = _context12.next) {
+ case 0:
+ num += 1;
+ _context12.next = 3;
+ return _this10.$u.api.refreshLock({
+ id: res.data.memberRidesResponse.rideId
+ });
+ case 3:
+ res1 = _context12.sent;
+ // 寮�閿佹垚鍔�
+ if (res1.data.status === 1) {
+ clearInterval(timer);
+ _this10.show5 = false;
+ setTimeout(function () {
+ _this10.show2 = true;
+ }, 500);
+ }
+ // 寮�閿佸け璐�
+ if (res1.data.status === 3) {
+ clearInterval(timer);
+ _this10.show5 = false;
+ uni.showToast({
+ title: '寮�閿佸け璐�',
+ icon: 'error',
+ duration: 2000
+ });
+ }
+ // 寮�閿佽秴鏃�
+ if (num === 180) {
+ clearInterval(timer);
+ _this10.show5 = false;
+ uni.showToast({
+ title: '寮�閿佽秴鏃�',
+ icon: 'error',
+ duration: 2000
+ });
+ }
+ case 7:
+ case "end":
+ return _context12.stop();
+ }
+ }
+ }, _callee12);
+ })), 1000);
+ }
+ // 楠戣涓�
+ if (res.data.rideStatus === 1) {
+ _this10.show2 = true;
+ _this10.refreshStatus();
+ }
+ if (res.data.rideStatus === 5) {
+ _this10.show5 = true;
+ }
+ if (res.data.rideStatus === 2) {
+ _this10.show6 = true;
+ _this10.refreshStatus();
+ }
+ } else if (res.data.memberRidesResponse && res.data.memberRidesResponse.ridesType === 1) {
+ that.$refs.d_tram.info = _objectSpread(_objectSpread(_objectSpread({}, res.data.memberRidesResponse.discountMember), res.data.memberRidesResponse), {}, {
+ deposit: res.data.deposit,
+ goodsOrderId: res.data.goodsOrderId
+ });
+ // 楠戣涓�
+ if (res.data.rideStatus === 1) {
+ that.$refs.d_tram.d_show3 = true;
+ }
+ // 涓存椂閿佽溅
+ if (res.data.rideStatus === 4) {
+ that.$refs.d_tram.d_show4 = true;
+ }
+ }
+ // 鏄惁钀ヤ笟
+ if (!(res.data.isBusiness === 0)) {
+ _context13.next = 9;
+ break;
+ }
+ _this10.title = '鏆傚仠钀ヤ笟鎻愰啋';
+ _this10.content = res.data.unBusinessTips;
+ _this10.show4 = true;
+ return _context13.abrupt("return");
+ case 9:
+ // 鏄惁鍋滄鏈嶅姟
+ if (res.data.isStopServe === 1) {
+ _this10.title = '鏆傚仠鏈嶅姟鎻愰啋';
+ _this10.content = res.data.stopServeTips;
+ _this10.show4 = true;
+ }
+ _this10.tcList = res.data.discountList;
+ arr = JSON.parse(res.data.eleBusinessArea);
+ _this10.eleBusinessArea[0].points = arr.map(function (item) {
+ return {
+ latitude: item.lat,
+ longitude: item.lng
+ };
+ });
+ case 13:
+ case "end":
+ return _context13.stop();
+ }
+ }
+ }, _callee13);
+ }));
+ return function (_x3) {
+ return _ref6.apply(this, arguments);
+ };
+ }());
},
// 鍒锋柊棣栭〉淇℃伅
- refresh: function refresh() {
- var _this9 = this;
+ refresh: function refresh(type) {
+ var _this11 = this;
this.$u.api.home().then(function (res) {
+ uni.stopPullDownRefresh();
if (res.code === 200) {
- _this9.info = res.data;
- // 瑙ｉ攣涓�
- if (res.data.rideStatus === 0) {
- _this9.show5 = true;
- // 寰幆娆℃暟
- var num = 1;
- // 寰幆鏌ョ湅瑙ｉ攣缁撴灉
- var timer = setInterval( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10() {
- var res1;
- return _regenerator.default.wrap(function _callee10$(_context10) {
- while (1) {
- switch (_context10.prev = _context10.next) {
- case 0:
- num += 1;
- _context10.next = 3;
- return _this9.$u.api.refreshLock({
- id: res.data.memberRidesResponse.rideId
- });
- case 3:
- res1 = _context10.sent;
- // 寮�閿佹垚鍔�
- if (res1.data.status === 1) {
- clearInterval(timer);
- _this9.show5 = false;
- setTimeout(function () {
- _this9.show2 = true;
- }, 500);
- }
- // 寮�閿佸け璐�
- if (res1.data.status === 3) {
- clearInterval(timer);
- _this9.show5 = false;
- uni.showToast({
- title: '寮�閿佸け璐�',
- icon: 'error',
- duration: 2000
+ _this11.info = res.data;
+ if (type === 'tram') {
+ _this11.refreshTram();
+ }
+ // 鏈煡鍒伴獞琛岃鍗�
+ if (!res.data.memberRidesResponse && _this11.onPullDownRefresh) {
+ _this11.show1 = false;
+ _this11.show2 = false;
+ _this11.show3 = false;
+ _this11.show4 = false;
+ _this11.show5 = false;
+ _this11.show6 = false;
+ _this11.show7 = false;
+ _this11.$refs.d_tram.d_show = false;
+ _this11.$refs.d_tram.d_show1 = false;
+ _this11.$refs.d_tram.d_show2 = false;
+ _this11.$refs.d_tram.d_show3 = false;
+ _this11.$refs.d_tram.d_show4 = false;
+ _this11.$refs.d_tram.d_show5 = false;
+ _this11.$refs.d_tram.d_show6 = false;
+ _this11.$refs.d_tram.d_show7 = false;
+ _this11.$refs.d_tram.d_show8 = false;
+ _this11.$refs.d_tram.d_show9 = false;
+ _this11.onPullDownRefresh = false;
+ return;
+ }
+ // 鑷杞�
+ if (res.data.memberRidesResponse.ridesType === 0) {
+ // 瑙ｉ攣涓�
+ if (res.data.rideStatus === 0) {
+ _this11.show5 = true;
+ // 寰幆娆℃暟
+ var num = 1;
+ // 寰幆鏌ョ湅瑙ｉ攣缁撴灉
+ var timer = setInterval( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee14() {
+ var res1;
+ return _regenerator.default.wrap(function _callee14$(_context14) {
+ while (1) {
+ switch (_context14.prev = _context14.next) {
+ case 0:
+ num += 1;
+ _context14.next = 3;
+ return _this11.$u.api.refreshLock({
+ id: res.data.memberRidesResponse.rideId
});
- }
- // 寮�閿佽秴鏃�
- if (num === 180) {
- clearInterval(timer);
- _this9.show5 = false;
- uni.showToast({
- title: '寮�閿佽秴鏃�',
- icon: 'error',
- duration: 2000
- });
- }
- case 7:
- case "end":
- return _context10.stop();
+ case 3:
+ res1 = _context14.sent;
+ // 寮�閿佹垚鍔�
+ if (res1.data.status === 1) {
+ clearInterval(timer);
+ _this11.show5 = false;
+ setTimeout(function () {
+ _this11.show2 = true;
+ }, 500);
+ }
+ // 寮�閿佸け璐�
+ if (res1.data.status === 3) {
+ clearInterval(timer);
+ _this11.show5 = false;
+ uni.showToast({
+ title: '寮�閿佸け璐�',
+ icon: 'error',
+ duration: 2000
+ });
+ }
+ // 寮�閿佽秴鏃�
+ if (num === 180) {
+ clearInterval(timer);
+ _this11.show5 = false;
+ uni.showToast({
+ title: '寮�閿佽秴鏃�',
+ icon: 'error',
+ duration: 2000
+ });
+ }
+ case 7:
+ case "end":
+ return _context14.stop();
+ }
}
- }
- }, _callee10);
- })), 1000);
- }
- if (res.data.rideStatus === 1) {
- _this9.show2 = true;
- _this9.refreshStatus();
- }
- if (res.data.rideStatus === 5) {
- _this9.show5 = true;
- }
- if (res.data.rideStatus === 2) {
- _this9.show6 = true;
+ }, _callee14);
+ })), 1000);
+ }
+ if (res.data.rideStatus === 1) {
+ _this11.show2 = true;
+ _this11.refreshStatus();
+ }
+ if (res.data.rideStatus === 5) {
+ _this11.show5 = true;
+ }
+ if (res.data.rideStatus === 2) {
+ _this11.show6 = true;
+ }
+ } else if (res.data.memberRidesResponse.ridesType === 1) {
+ _this11.$refs.d_tram.info = _objectSpread(_objectSpread(_objectSpread({}, res.data.memberRidesResponse.discountMember), res.data.memberRidesResponse), {}, {
+ deposit: res.data.deposit,
+ goodsOrderId: res.data.goodsOrderId
+ });
+ // 楠戣涓�
+ if (res.data.rideStatus === 1) {
+ _this11.$refs.d_tram.d_show3 = true;
+ }
+ // 涓存椂閿佽溅
+ if (res.data.rideStatus === 4) {
+ _this11.$refs.d_tram.d_show4 = true;
+ }
}
}
});
--
Gitblit v1.9.3