From 9dfc54bf6e0fdb3c746815707487c6ae50e98905 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 25 二月 2025 18:30:08 +0800
Subject: [PATCH] 更新

---
 bicycle/unpackage/dist/dev/mp-weixin/pages/index/index.js | 1002 +++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 676 insertions(+), 326 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 72731d5..d7f02dc 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,13 @@
 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))
     },
     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 */ 301))
+    },
+    tram: function () {
+      return __webpack_require__.e(/*! import() | components/tram/tram */ "components/tram/tram").then(__webpack_require__.bind(null, /*! @/components/tram/tram.vue */ 309))
     },
   }
 } catch (e) {
@@ -220,6 +223,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 */ 309));
+  }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
+};
 var _default = {
   data: function data() {
     return {
@@ -268,8 +276,28 @@
       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
     };
+  },
+  components: {
+    tram: tram
   },
   computed: _objectSpread({}, (0, _vuex.mapState)(['navHeight', 'statusbarHeight', 'userInfo'])),
   onLoad: function onLoad(options) {
@@ -286,11 +314,15 @@
               _context.next = 3;
               return _this.$onLaunched;
             case 3:
-              console.log(decodeURIComponent(options.scene));
-              _this.getAddress();
-              _this.getHomeInfo();
-              _this.getSite();
+              _context.next = 5;
+              return _this.getAddress();
+            case 5:
+              _context.next = 7;
+              return _this.getHomeInfo();
             case 7:
+              _context.next = 9;
+              return _this.getSite();
+            case 9:
             case "end":
               return _context.stop();
           }
@@ -298,10 +330,192 @@
       }, _callee);
     }))();
   },
+  onPullDownRefresh: function onPullDownRefresh() {
+    this.onPullDownRefresh = true;
+    this.refresh();
+  },
+  onShow: function onShow() {
+    this.refresh();
+  },
   onPageScroll: function onPageScroll(e) {
     this.top = e.scrollTop;
   },
   methods: {
+    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 _callee2() {
+        var res;
+        return _regenerator.default.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _context2.next = 2;
+                return _this2.$u.api.eleBikeList({});
+              case 2:
+                res = _context2.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 _context2.stop();
+            }
+          }
+        }, _callee2);
+      }))();
+    },
+    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) {
+      var _this3 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+        var that, res, num, timer;
+        return _regenerator.default.wrap(function _callee4$(_context4) {
+          while (1) {
+            switch (_context4.prev = _context4.next) {
+              case 0:
+                _context4.next = 2;
+                return _this3.refresh();
+              case 2:
+                if (!(_this3.info.depositStatus === 0)) {
+                  _context4.next = 7;
+                  break;
+                }
+                _this3.show1 = true;
+                return _context4.abrupt("return");
+              case 7:
+                if (!(_this3.info.depositStatus === 2)) {
+                  _context4.next = 10;
+                  break;
+                }
+                uni.showToast({
+                  title: '缁撶畻鐢宠鎻愪氦鎴愬姛锛岃鑰愬績绛夊緟閫�娆撅紒',
+                  icon: 'none',
+                  duration: 2000
+                });
+                return _context4.abrupt("return");
+              case 10:
+                that = _this3;
+                if (that.disable) {
+                  _context4.next = 18;
+                  break;
+                }
+                that.disable = true;
+                // 鎵撳紑寮�閿佸脊妗�
+                that.show5 = true;
+                // 璋冪敤寮�閿佹帴鍙�
+                _context4.next = 16;
+                return that.$u.api.openLock({
+                  code: code
+                });
+              case 16:
+                res = _context4.sent;
+                if (res.code === 200) {
+                  that.disable = false;
+                  that.show6 = false;
+                  that.show5 = true;
+                  // 寰幆娆℃暟
+                  num = 1; // 寰幆鏌ョ湅瑙i攣缁撴灉
+                  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 18:
+              case "end":
+                return _context4.stop();
+            }
+          }
+        }, _callee4);
+      }))();
+    },
     jumpX: function jumpX() {
       uni.navigateTo({
         url: '/pages/leaseNotice/leaseNotice'
@@ -309,7 +523,7 @@
     },
     jumpMap: function jumpMap() {
       uni.navigateTo({
-        url: '/pages/maps/maps'
+        url: "/pages/maps/maps?type=".concat(this.type)
       });
     },
     // 璁′环瑙勫垯
@@ -319,12 +533,12 @@
       });
     },
     getSite: function getSite() {
-      var _this2 = this;
+      var _this4 = this;
       this.$u.api.rentSiteList().then(function (res) {
         if (res.code === 200) {
-          _this2.markers = [];
+          _this4.markers = [];
           res.data.forEach(function (item, index) {
-            _this2.markers.push({
+            _this4.markers.push({
               id: index,
               width: 40,
               height: 40,
@@ -335,30 +549,31 @@
               addr: item.addr
             });
           });
+          _this4.clickcontrol();
         }
       });
     },
     // 缁撶畻
     settlement1: function settlement1() {
-      var _this3 = this;
+      var _this5 = this;
       if (this.isDisabled) {
         this.isDisabled = false;
         this.$u.api.goodsOrderSettlement({}).then(function (res) {
           if (res.code === 200) {
-            _this3.show3 = false;
-            _this3.show6 = false;
-            _this3.show7 = false;
+            _this5.show3 = false;
+            _this5.show6 = false;
+            _this5.show7 = false;
             uni.showToast({
               title: '缁撶畻鐢宠鎻愪氦鎴愬姛锛岃鑰愬績绛夊緟閫�娆撅紒',
-              icon: 'success',
+              icon: 'none',
               duration: 2000
             });
             // this.refresh()
           }
         }).finally(function () {
-          _this3.refresh();
-          _this3.show3 = false;
-          _this3.isDisabled = true;
+          _this5.refresh();
+          _this5.show3 = false;
+          _this5.isDisabled = true;
         });
       }
     },
@@ -388,41 +603,47 @@
     },
     // 璺宠浆
     jump: function jump(item) {
-      var _this4 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        return _regenerator.default.wrap(function _callee2$(_context2) {
+      var _this6 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
+        return _regenerator.default.wrap(function _callee5$(_context5) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context5.prev = _context5.next) {
               case 0:
-                _context2.next = 2;
-                return _this4.refresh();
+                _context5.next = 2;
+                return _this6.refresh();
               case 2:
                 if (!(item.id === 3)) {
-                  _context2.next = 6;
+                  _context5.next = 6;
                   break;
                 }
                 uni.navigateTo({
                   url: '/pages/pricingRules/pricingRules'
                 });
-                _context2.next = 27;
+                _context5.next = 31;
                 break;
               case 6:
                 if (!(item.id === 4)) {
-                  _context2.next = 10;
+                  _context5.next = 10;
                   break;
                 }
                 uni.navigateTo({
                   url: '/pages/consumptionDetails/consumptionDetails'
                 });
-                _context2.next = 27;
+                _context5.next = 31;
                 break;
               case 10:
                 if (!(item.id === 2)) {
-                  _context2.next = 17;
+                  _context5.next = 19;
                   break;
                 }
-                if (!(_this4.info.rideStatus === 1)) {
-                  _context2.next = 14;
+                if (_this6.userInfo.mobile) {
+                  _context5.next = 13;
+                  break;
+                }
+                return _context5.abrupt("return");
+              case 13:
+                if (!(_this6.info.rideStatus === 1)) {
+                  _context5.next = 16;
                   break;
                 }
                 uni.showToast({
@@ -430,11 +651,11 @@
                   icon: 'none',
                   duration: 2000
                 });
-                return _context2.abrupt("return");
-              case 14:
-                if (_this4.info.depositStatus === 1) {
-                  _this4.show3 = true;
-                } else if (_this4.info.depositStatus === 2) {
+                return _context5.abrupt("return");
+              case 16:
+                if (_this6.info.depositStatus === 1) {
+                  _this6.show3 = true;
+                } else if (_this6.info.depositStatus === 2) {
                   uni.showToast({
                     title: '缁撶畻鐢宠鎻愪氦鎴愬姛锛岃鑰愬績绛夊緟閫�娆撅紒',
                     icon: 'none',
@@ -447,15 +668,21 @@
                     duration: 2000
                   });
                 }
-                _context2.next = 27;
+                _context5.next = 31;
                 break;
-              case 17:
+              case 19:
                 if (!(item.id === 1)) {
-                  _context2.next = 27;
+                  _context5.next = 31;
                   break;
                 }
-                if (!(_this4.info.depositStatus === 1)) {
-                  _context2.next = 23;
+                if (_this6.userInfo.mobile) {
+                  _context5.next = 22;
+                  break;
+                }
+                return _context5.abrupt("return");
+              case 22:
+                if (!(_this6.info.depositStatus === 1)) {
+                  _context5.next = 27;
                   break;
                 }
                 uni.showToast({
@@ -463,10 +690,10 @@
                   icon: 'none',
                   duration: 2000
                 });
-                return _context2.abrupt("return");
-              case 23:
-                if (!(_this4.info.depositStatus === 2)) {
-                  _context2.next = 26;
+                return _context5.abrupt("return");
+              case 27:
+                if (!(_this6.info.depositStatus === 2)) {
+                  _context5.next = 30;
                   break;
                 }
                 uni.showToast({
@@ -474,15 +701,15 @@
                   icon: 'none',
                   duration: 2000
                 });
-                return _context2.abrupt("return");
-              case 26:
-                _this4.show1 = true;
-              case 27:
+                return _context5.abrupt("return");
+              case 30:
+                _this6.show1 = true;
+              case 31:
               case "end":
-                return _context2.stop();
+                return _context5.stop();
             }
           }
-        }, _callee2);
+        }, _callee5);
       }))();
     },
     // 楠戣鏄庣粏
@@ -527,7 +754,6 @@
                 },
                 fail: function fail(err) {
                   that.disable = false;
-                  console.log(err);
                 }
               });
             }
@@ -571,25 +797,26 @@
     },
     // 鎵爜绉熻溅
     carRental: function carRental() {
-      var _this5 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
+      var _this7 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9() {
         var that;
-        return _regenerator.default.wrap(function _callee5$(_context5) {
+        return _regenerator.default.wrap(function _callee9$(_context9) {
           while (1) {
-            switch (_context5.prev = _context5.next) {
+            switch (_context9.prev = _context9.next) {
               case 0:
-                _context5.next = 2;
-                return _this5.refresh();
-              case 2:
-                if (!(_this5.info.depositStatus === 0)) {
-                  _context5.next = 7;
+                that = _this7; // 鍒锋柊棣栭〉淇℃伅
+                _context9.next = 3;
+                return _this7.refresh();
+              case 3:
+                if (!(_this7.info.depositStatus === 0)) {
+                  _context9.next = 8;
                   break;
                 }
-                _this5.show1 = true;
-                return _context5.abrupt("return");
-              case 7:
-                if (!(_this5.info.depositStatus === 2)) {
-                  _context5.next = 10;
+                _this7.show1 = true;
+                return _context9.abrupt("return");
+              case 8:
+                if (!(_this7.info.depositStatus === 2)) {
+                  _context9.next = 11;
                   break;
                 }
                 uni.showToast({
@@ -597,113 +824,149 @@
                   icon: 'none',
                   duration: 2000
                 });
-                return _context5.abrupt("return");
-              case 10:
-                that = _this5;
-                if (!that.disable) {
-                  that.disable = true;
-                  // 鎵爜瑙i攣楠戣
+                return _context9.abrupt("return");
+              case 11:
+                // 鑷杞�
+                if (_this7.type === 1) {
+                  if (!that.disable) {
+                    that.disable = true;
+                    // 鎵爜瑙i攣楠戣
+                    uni.scanCode({
+                      success: function () {
+                        var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(result) {
+                          var text, res, num, timer;
+                          return _regenerator.default.wrap(function _callee7$(_context7) {
+                            while (1) {
+                              switch (_context7.prev = _context7.next) {
+                                case 0:
+                                  text = decodeURIComponent(result.path);
+                                  text = text.substring(text.lastIndexOf('?') + 7, text.length);
+                                  // 鎵撳紑寮�閿佸脊妗�
+                                  that.show5 = true;
+                                  // 璋冪敤寮�閿佹帴鍙�
+                                  _context7.next = 5;
+                                  return that.$u.api.openLock({
+                                    code: text
+                                  });
+                                case 5:
+                                  res = _context7.sent;
+                                  if (res.code === 200) {
+                                    that.disable = false;
+                                    that.show6 = false;
+                                    that.show5 = true;
+                                    // 寰幆娆℃暟
+                                    num = 1; // 寰幆鏌ョ湅瑙i攣缁撴灉
+                                    timer = setInterval( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
+                                      var res1;
+                                      return _regenerator.default.wrap(function _callee6$(_context6) {
+                                        while (1) {
+                                          switch (_context6.prev = _context6.next) {
+                                            case 0:
+                                              num += 1;
+                                              _context6.next = 3;
+                                              return that.$u.api.refreshLock({
+                                                id: res.data.id
+                                              });
+                                            case 3:
+                                              res1 = _context6.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 _context6.stop();
+                                          }
+                                        }
+                                      }, _callee6);
+                                    })), 1000);
+                                  } else {
+                                    that.show5 = false;
+                                    that.disable = false;
+                                  }
+                                case 7:
+                                case "end":
+                                  return _context7.stop();
+                              }
+                            }
+                          }, _callee7);
+                        }));
+                        function success(_x) {
+                          return _success.apply(this, arguments);
+                        }
+                        return success;
+                      }(),
+                      fail: function fail() {
+                        that.disable = false;
+                      }
+                    });
+                  }
+                } else {
                   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) {
+                      var _success2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8(result) {
+                        var res;
+                        return _regenerator.default.wrap(function _callee8$(_context8) {
                           while (1) {
-                            switch (_context4.prev = _context4.next) {
+                            switch (_context8.prev = _context8.next) {
                               case 0:
-                                // 鎵撳紑寮�閿佸脊妗�
-                                that.show5 = true;
-                                // 璋冪敤寮�閿佹帴鍙�
-                                _context4.next = 3;
-                                return that.$u.api.openLock({
+                                _context8.next = 2;
+                                return that.$u.api.getBikeChargingRule({
                                   code: result.result
                                 });
-                              case 3:
-                                res = _context4.sent;
+                              case 2:
+                                res = _context8.sent;
                                 if (res.code === 200) {
-                                  that.disable = false;
-                                  that.show6 = false;
-                                  that.show5 = true;
-                                  // 寰幆娆℃暟
-                                  num = 1; // 寰幆鏌ョ湅瑙i攣缁撴灉
-                                  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;
+                                  that.$refs.d_tram.info = res.data;
+                                  that.$refs.d_tram.d_show1 = true;
                                 }
-                              case 5:
+                              case 4:
                               case "end":
-                                return _context4.stop();
+                                return _context8.stop();
                             }
                           }
-                        }, _callee4);
+                        }, _callee8);
                       }));
-                      function success(_x) {
-                        return _success.apply(this, arguments);
+                      function success(_x2) {
+                        return _success2.apply(this, arguments);
                       }
                       return success;
-                    }(),
-                    fail: function fail() {
-                      that.disable = false;
-                    }
+                    }()
                   });
                 }
               case 12:
               case "end":
-                return _context5.stop();
+                return _context9.stop();
             }
           }
-        }, _callee5);
+        }, _callee9);
       }))();
     },
     // 鑾峰彇缁忕含搴�
@@ -840,213 +1103,300 @@
     },
     // 鍒锋柊楠戣鐘舵��
     refreshStatus: function refreshStatus() {
-      var _this6 = this;
-      this.timer = setInterval( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
+      var _this8 = this;
+      this.timer = setInterval( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10() {
         var res;
-        return _regenerator.default.wrap(function _callee6$(_context6) {
+        return _regenerator.default.wrap(function _callee10$(_context10) {
           while (1) {
-            switch (_context6.prev = _context6.next) {
+            switch (_context10.prev = _context10.next) {
               case 0:
-                _context6.next = 2;
-                return _this6.$u.api.home();
+                _context10.next = 2;
+                return _this8.$u.api.home();
               case 2:
-                res = _context6.sent;
+                res = _context10.sent;
                 if (!(res.code === 200)) {
-                  _context6.next = 13;
+                  _context10.next = 13;
                   break;
                 }
-                _this6.info = res.data;
+                _this8.info = res.data;
                 // 楠戣涓�
                 if (!(res.data.rideStatus === 1)) {
-                  _context6.next = 7;
+                  _context10.next = 7;
                   break;
                 }
-                return _context6.abrupt("return");
+                return _context10.abrupt("return");
               case 7:
-                _this6.show2 = false;
+                _this8.show2 = false;
                 // 宸叉崲杞�
                 if (!(res.data.rideStatus === 2)) {
-                  _context6.next = 11;
+                  _context10.next = 11;
                   break;
                 }
-                _this6.show6 = true;
-                return _context6.abrupt("return");
+                _this8.show6 = true;
+                return _context10.abrupt("return");
               case 11:
                 if (res.data.rideStatus === -1) {
-                  _this6.show6 = false;
+                  _this8.show6 = false;
                 }
-                clearInterval(_this6.timer);
+                clearInterval(_this8.timer);
               case 13:
               case "end":
-                return _context6.stop();
+                return _context10.stop();
             }
           }
-        }, _callee6);
+        }, _callee10);
       })), 10000);
     },
     // 鑾峰彇棣栭〉淇℃伅
     getHomeInfo: function getHomeInfo() {
-      var _this7 = this;
-      this.$u.api.home().then(function (res) {
-        if (res.code === 200) {
-          _this7.info = res.data;
-          // 鏄惁寮瑰嚭骞垮憡鍥�
-          if (res.data.adList.length > 0) {
-            _this7.show = true;
-          }
-          // 瑙i攣涓�
-          if (res.data.rideStatus === 0) {
-            _this7.show5 = true;
-            // 寰幆娆℃暟
-            var num = 1;
-            // 寰幆鏌ョ湅瑙i攣缁撴灉
-            var timer = setInterval( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
-              var res1;
-              return _regenerator.default.wrap(function _callee7$(_context7) {
-                while (1) {
-                  switch (_context7.prev = _context7.next) {
-                    case 0:
-                      num += 1;
-                      _context7.next = 3;
-                      return _this7.$u.api.refreshLock({
-                        id: res.data.memberRidesResponse.rideId
-                      });
-                    case 3:
-                      res1 = _context7.sent;
-                      // 寮�閿佹垚鍔�
-                      if (res1.data.status === 1) {
-                        clearInterval(timer);
-                        _this7.show5 = false;
-                        setTimeout(function () {
-                          _this7.show2 = true;
-                        }, 500);
-                      }
-                      // 寮�閿佸け璐�
-                      if (res1.data.status === 3) {
-                        clearInterval(timer);
-                        _this7.show5 = false;
-                        uni.showToast({
-                          title: '寮�閿佸け璐�',
-                          icon: 'error',
-                          duration: 2000
-                        });
-                      }
-                      // 寮�閿佽秴鏃�
-                      if (num === 180) {
-                        clearInterval(timer);
-                        _this7.show5 = false;
-                        uni.showToast({
-                          title: '寮�閿佽秴鏃�',
-                          icon: 'error',
-                          duration: 2000
-                        });
-                      }
-                    case 7:
-                    case "end":
-                      return _context7.stop();
+      var _this9 = this;
+      var that = this;
+      this.$u.api.home().then( /*#__PURE__*/function () {
+        var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee12(res) {
+          var num, timer, arr;
+          return _regenerator.default.wrap(function _callee12$(_context12) {
+            while (1) {
+              switch (_context12.prev = _context12.next) {
+                case 0:
+                  if (!(res.code === 200)) {
+                    _context12.next = 13;
+                    break;
                   }
-                }
-              }, _callee7);
-            })), 1000);
-          }
-          // 楠戣涓�
-          if (res.data.rideStatus === 1) {
-            _this7.show2 = true;
-            _this7.refreshStatus();
-          }
-          if (res.data.rideStatus === 5) {
-            _this7.show5 = true;
-          }
-          if (res.data.rideStatus === 2) {
-            _this7.show6 = true;
-            _this7.refreshStatus();
-          }
-          // 鏄惁钀ヤ笟
-          if (res.data.isBusiness === 0) {
-            _this7.title = '鏆傚仠钀ヤ笟鎻愰啋';
-            _this7.content = res.data.unBusinessTips;
-            _this7.show4 = true;
-            return;
-          }
-          // 鏄惁鍋滄鏈嶅姟
-          if (res.data.isStopServe === 1) {
-            _this7.title = '鏆傚仠鏈嶅姟鎻愰啋';
-            _this7.content = res.data.stopServeTips;
-            _this7.show4 = true;
-          }
-        }
-      });
+                  _this9.info = res.data;
+                  // 鏄惁寮瑰嚭骞垮憡鍥�
+                  if (res.data.adList.length > 0 && !res.data.memberRidesResponse) {
+                    _this9.show = true;
+                  }
+                  // 鑷杞�
+                  if (res.data.memberRidesResponse && res.data.memberRidesResponse.ridesType === 0) {
+                    _this9.type = 1;
+                    // 瑙i攣涓�
+                    if (res.data.rideStatus === 0) {
+                      _this9.show5 = true;
+                      // 寰幆娆℃暟
+                      num = 1; // 寰幆鏌ョ湅瑙i攣缁撴灉
+                      timer = setInterval( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11() {
+                        var res1;
+                        return _regenerator.default.wrap(function _callee11$(_context11) {
+                          while (1) {
+                            switch (_context11.prev = _context11.next) {
+                              case 0:
+                                num += 1;
+                                _context11.next = 3;
+                                return _this9.$u.api.refreshLock({
+                                  id: res.data.memberRidesResponse.rideId
+                                });
+                              case 3:
+                                res1 = _context11.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
+                                  });
+                                }
+                                // 寮�閿佽秴鏃�
+                                if (num === 180) {
+                                  clearInterval(timer);
+                                  _this9.show5 = false;
+                                  uni.showToast({
+                                    title: '寮�閿佽秴鏃�',
+                                    icon: 'error',
+                                    duration: 2000
+                                  });
+                                }
+                              case 7:
+                              case "end":
+                                return _context11.stop();
+                            }
+                          }
+                        }, _callee11);
+                      })), 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;
+                      _this9.refreshStatus();
+                    }
+                  } else if (res.data.memberRidesResponse && res.data.memberRidesResponse.ridesType === 1) {
+                    _this9.type = 2;
+                    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)) {
+                    _context12.next = 9;
+                    break;
+                  }
+                  _this9.title = '鏆傚仠钀ヤ笟鎻愰啋';
+                  _this9.content = res.data.unBusinessTips;
+                  _this9.show4 = true;
+                  return _context12.abrupt("return");
+                case 9:
+                  // 鏄惁鍋滄鏈嶅姟
+                  if (res.data.isStopServe === 1) {
+                    _this9.title = '鏆傚仠鏈嶅姟鎻愰啋';
+                    _this9.content = res.data.stopServeTips;
+                    _this9.show4 = true;
+                  }
+                  _this9.tcList = res.data.discountList;
+                  arr = JSON.parse(res.data.eleBusinessArea);
+                  _this9.eleBusinessArea[0].points = arr.map(function (item) {
+                    return {
+                      latitude: item.lat,
+                      longitude: item.lng
+                    };
+                  });
+                case 13:
+                case "end":
+                  return _context12.stop();
+              }
+            }
+          }, _callee12);
+        }));
+        return function (_x3) {
+          return _ref4.apply(this, arguments);
+        };
+      }());
     },
     // 鍒锋柊棣栭〉淇℃伅
     refresh: function refresh() {
-      var _this8 = this;
+      var _this10 = this;
       this.$u.api.home().then(function (res) {
+        uni.stopPullDownRefresh();
         if (res.code === 200) {
-          _this8.info = res.data;
-          // 瑙i攣涓�
-          if (res.data.rideStatus === 0) {
-            _this8.show5 = true;
-            // 寰幆娆℃暟
-            var num = 1;
-            // 寰幆鏌ョ湅瑙i攣缁撴灉
-            var 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 _this8.$u.api.refreshLock({
-                        id: res.data.memberRidesResponse.rideId
-                      });
-                    case 3:
-                      res1 = _context8.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
+          _this10.info = res.data;
+          // 鏈煡鍒伴獞琛岃鍗�
+          if (!res.data.memberRidesResponse && _this10.onPullDownRefresh) {
+            _this10.show1 = false;
+            _this10.show2 = false;
+            _this10.show3 = false;
+            _this10.show4 = false;
+            _this10.show5 = false;
+            _this10.show6 = false;
+            _this10.show7 = false;
+            that.$refs.d_tram.d_show = false;
+            that.$refs.d_tram.d_show1 = false;
+            that.$refs.d_tram.d_show2 = false;
+            that.$refs.d_tram.d_show3 = false;
+            that.$refs.d_tram.d_show4 = false;
+            that.$refs.d_tram.d_show5 = false;
+            that.$refs.d_tram.d_show6 = false;
+            that.$refs.d_tram.d_show7 = false;
+            that.$refs.d_tram.d_show8 = false;
+            that.$refs.d_tram.d_show9 = false;
+            _this10.onPullDownRefresh = false;
+            return;
+          }
+          // 鑷杞�
+          if (res.data.memberRidesResponse.ridesType === 0) {
+            // 瑙i攣涓�
+            if (res.data.rideStatus === 0) {
+              _this10.show5 = true;
+              // 寰幆娆℃暟
+              var num = 1;
+              // 寰幆鏌ョ湅瑙i攣缁撴灉
+              var timer = setInterval( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee13() {
+                var res1;
+                return _regenerator.default.wrap(function _callee13$(_context13) {
+                  while (1) {
+                    switch (_context13.prev = _context13.next) {
+                      case 0:
+                        num += 1;
+                        _context13.next = 3;
+                        return _this10.$u.api.refreshLock({
+                          id: res.data.memberRidesResponse.rideId
                         });
-                      }
-                      // 寮�閿佽秴鏃�
-                      if (num === 180) {
-                        clearInterval(timer);
-                        _this8.show5 = false;
-                        uni.showToast({
-                          title: '寮�閿佽秴鏃�',
-                          icon: 'error',
-                          duration: 2000
-                        });
-                      }
-                    case 7:
-                    case "end":
-                      return _context8.stop();
+                      case 3:
+                        res1 = _context13.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 _context13.stop();
+                    }
                   }
-                }
-              }, _callee8);
-            })), 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;
+                }, _callee13);
+              })), 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;
+            }
+          } else if (res.data.memberRidesResponse.ridesType === 1) {
+            _this10.type = 2;
+            _this10.$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) {
+              _this10.$refs.d_tram.d_show3 = true;
+            }
+            // 涓存椂閿佽溅
+            if (res.data.rideStatus === 4) {
+              _this10.$refs.d_tram.d_show4 = true;
+            }
           }
         }
       });

--
Gitblit v1.9.3