From 4e7e747d2a594b9f68d2d45b90bebc401d77724e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 17 十月 2023 19:01:01 +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 | 178 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 124 insertions(+), 54 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 a854da8..91acd5b 100644
--- a/bicycle/unpackage/dist/dev/mp-weixin/pages/index/index.js
+++ b/bicycle/unpackage/dist/dev/mp-weixin/pages/index/index.js
@@ -35,7 +35,7 @@
/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
/* harmony import */ var _index_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./index.vue?vue&type=style&index=0&lang=css& */ 174);
/* harmony import */ var _index_vue_vue_type_style_index_1_id_57280228_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./index.vue?vue&type=style&index=1&id=57280228&lang=scss&scoped=true& */ 176);
-/* harmony import */ var _HBuilderX_3_8_12_20230817_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 33);
+/* harmony import */ var _HBuilderX_3_8_12_20230817_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../../../../鍔炲叕/HBuilderX.3.8.12.20230817/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 36);
var renderjs
@@ -103,10 +103,10 @@
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 */ 246))
+ 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 */ 255))
},
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 */ 254))
+ 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 */ 263))
},
}
} catch (e) {
@@ -131,36 +131,6 @@
var _h = _vm.$createElement
var _c = _vm._self._c || _h
var g0 = (_vm.info.deposit / 100).toFixed(2)
- var g1 = _vm.info.memberRidesResponse
- ? _vm.info.memberRidesResponse.rideStartTime.substring(10, 16)
- : null
- var g2 = _vm.info.memberRidesResponse
- ? (_vm.info.memberRidesResponse.rideTime / 60).toFixed(1)
- : null
- var g3 = _vm.info.memberRidesResponse
- ? (_vm.info.memberRidesResponse.baseTime / 60).toFixed(1)
- : null
- var g4 = _vm.info.memberRidesResponse
- ? (_vm.info.memberRidesResponse.basePrice / 100).toFixed(2)
- : null
- var g5 = _vm.info.memberRidesResponse
- ? (_vm.info.memberRidesResponse.unitPrice / 100).toFixed(2)
- : null
- var g6 = _vm.info.memberRidesResponse
- ? _vm.info.memberRidesResponse.rideStartTime.substring(5, 16)
- : null
- var g7 = _vm.info.memberRidesResponse
- ? _vm.info.memberRidesResponse.rideEndTime.substring(11, 16)
- : null
- var g8 = _vm.info.memberRidesResponse
- ? (_vm.info.memberRidesResponse.baseTime / 60).toFixed(1)
- : null
- var g9 = _vm.info.memberRidesResponse
- ? (_vm.info.memberRidesResponse.basePrice / 100).toFixed(2)
- : null
- var g10 = _vm.info.memberRidesResponse
- ? (_vm.info.memberRidesResponse.unitPrice / 100).toFixed(2)
- : null
if (!_vm._isMounted) {
_vm.e0 = function ($event) {
_vm.show = false
@@ -178,7 +148,7 @@
_vm.show1 = false
}
_vm.e5 = function ($event) {
- _vm.show1 = false
+ _vm.show5 = false
}
_vm.e6 = function ($event) {
_vm.show2 = false
@@ -192,22 +162,15 @@
_vm.e9 = function ($event) {
_vm.show4 = false
}
+ _vm.e10 = function ($event) {
+ _vm.show7 = false
+ }
}
_vm.$mp.data = Object.assign(
{},
{
$root: {
g0: g0,
- g1: g1,
- g2: g2,
- g3: g3,
- g4: g4,
- g5: g5,
- g6: g6,
- g7: g7,
- g8: g8,
- g9: g9,
- g10: g10,
},
}
)
@@ -251,10 +214,10 @@
value: true
});
exports.default = void 0;
-var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 58));
-var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 60));
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 30));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 32));
var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
-var _vuex = __webpack_require__(/*! vuex */ 30);
+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 _default = {
@@ -264,12 +227,22 @@
longitude: null,
bgImg: __webpack_require__(/*! @/static/images/bg_service@2x.png */ 169),
show: false,
+ // 骞垮憡
show1: false,
+ // 缂寸撼鎶奸噾
show2: false,
+ // 楠戣涓�
show3: false,
+ // 纭缁撶畻
show4: false,
+ // 鎻愮ず
show5: false,
+ // 寮�閿�
show6: false,
+ // 宸茶繕杞�
+ show7: false,
+ // 纭缁撶畻寮规
+
active: false,
markers: [],
functionList: [{
@@ -320,6 +293,11 @@
}))();
},
methods: {
+ jumpMap: function jumpMap() {
+ uni.navigateTo({
+ url: '/pages/maps/maps'
+ });
+ },
// 璁′环瑙勫垯
jumpgz: function jumpgz() {
uni.navigateTo({
@@ -355,20 +333,24 @@
orderId: this.info.goodsOrderId
}).then(function (res) {
if (res.code === 200) {
+ _this3.refresh();
uni.showToast({
title: '缁撶畻鎴愬姛锛�',
icon: 'success',
duration: 2000
});
- _this3.info.rideStatus = -1;
- _this3.info.depositStatus = 0;
+ // this.info.rideStatus = -1
+ // this.info.depositStatus = 0
_this3.show3 = false;
+ _this3.show7 = false;
}
});
},
minute: function minute() {
this.show3 = false;
- this.show6 = true;
+ if (this.info.rideStatus !== -1) {
+ this.show6 = true;
+ }
},
settlement: function settlement() {
this.show6 = false;
@@ -392,7 +374,9 @@
});
} else if (item.id === 2) {
if (this.info.depositStatus === 1) {
- this.settlement1();
+ // this.settlement1()
+ // this.show7 = true
+ this.show3 = true;
} else {
uni.showToast({
title: '鎮ㄦ殏鏃犳娂閲戯紝鏃犻渶缁撶畻锛�',
@@ -401,6 +385,14 @@
});
}
} else if (item.id === 1) {
+ if (this.info.depositStatus === 1) {
+ uni.showToast({
+ title: '鎶奸噾宸插厖鍊�',
+ icon: 'none',
+ duration: 2000
+ });
+ return;
+ }
this.show1 = true;
}
},
@@ -431,12 +423,14 @@
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
});
- that.info.depositStatus = 1;
}
},
fail: function fail(err) {
@@ -524,6 +518,7 @@
res1 = _context2.sent;
// 寮�閿佹垚鍔�
if (res1.data.status === 1) {
+ that.refresh();
clearInterval(timer);
that.show5 = false;
setTimeout(function () {
@@ -532,6 +527,7 @@
}
// 寮�閿佸け璐�
if (res1.data.status === 3) {
+ that.refresh();
clearInterval(timer);
that.show5 = false;
uni.showToast({
@@ -541,7 +537,8 @@
});
}
// 寮�閿佽秴鏃�
- if (num === 10) {
+ if (num === 120) {
+ that.refresh();
clearInterval(timer);
that.show5 = false;
uni.showToast({
@@ -754,7 +751,7 @@
});
}
// 寮�閿佽秴鏃�
- if (num === 10) {
+ if (num === 120) {
clearInterval(timer);
_this4.show5 = false;
uni.showToast({
@@ -794,6 +791,79 @@
}
});
},
+ // 鍒锋柊棣栭〉淇℃伅
+ refresh: function refresh() {
+ var _this5 = this;
+ this.$u.api.home().then(function (res) {
+ if (res.code === 200) {
+ _this5.info = res.data;
+ // 瑙ｉ攣涓�
+ if (res.data.rideStatus === 0) {
+ _this5.show5 = true;
+ // 寰幆娆℃暟
+ var num = 1;
+ // 寰幆鏌ョ湅瑙ｉ攣缁撴灉
+ var 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 _this5.$u.api.refreshLock({
+ id: res.data.memberRidesResponse.rideId
+ });
+ case 3:
+ res1 = _context5.sent;
+ // 寮�閿佹垚鍔�
+ if (res1.data.status === 1) {
+ clearInterval(timer);
+ _this5.show5 = false;
+ setTimeout(function () {
+ _this5.show2 = true;
+ }, 500);
+ }
+ // 寮�閿佸け璐�
+ if (res1.data.status === 3) {
+ clearInterval(timer);
+ _this5.show5 = false;
+ uni.showToast({
+ title: '寮�閿佸け璐�',
+ icon: 'error',
+ duration: 2000
+ });
+ }
+ // 寮�閿佽秴鏃�
+ if (num === 120) {
+ clearInterval(timer);
+ _this5.show5 = false;
+ uni.showToast({
+ title: '寮�閿佽秴鏃�',
+ icon: 'error',
+ duration: 2000
+ });
+ }
+ case 7:
+ case "end":
+ return _context5.stop();
+ }
+ }
+ }, _callee5);
+ })), 1000);
+ }
+ if (res.data.rideStatus === 1) {
+ _this5.show2 = true;
+ }
+ if (res.data.rideStatus === 5) {
+ _this5.show5 = true;
+ }
+ if (res.data.rideStatus === 2) {
+ _this5.show6 = true;
+ }
+ }
+ });
+ },
// 鎷ㄦ墦鐢佃瘽
calling: function calling(mobile) {
uni.makePhoneCall({
--
Gitblit v1.9.3