From 4fabfe4dbd2eb28d07a4350597d314958cc1c281 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 09 十月 2025 11:16:43 +0800
Subject: [PATCH] 优化
---
bicycle/pages/index/index.vue | 911 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 658 insertions(+), 253 deletions(-)
diff --git a/bicycle/pages/index/index.vue b/bicycle/pages/index/index.vue
index 87faa72..031da43 100644
--- a/bicycle/pages/index/index.vue
+++ b/bicycle/pages/index/index.vue
@@ -13,10 +13,17 @@
</view>
<view class="index_box">
<view class="index_box_map">
- <map class="map" scale="15" :show-location="true" :markers="markers" :latitude="latitude" :longitude="longitude" />
+ <map
+ id="mapId"
+ class="map"
+ scale="15"
+ :show-location="true"
+ :polygons="eleBusinessArea"
+ :markers="markers"
+ :latitude="latitude"
+ :longitude="longitude" />
<view class="index_box_map_type">
- <view class="index_box_map_type_row active">鑷杞�</view>
- <view class="index_box_map_type_row">鐢靛姩杞�</view>
+ <view :class="type === item.id ? 'index_box_map_type_row active' : 'index_box_map_type_row'" v-for="(item, index) in types" :key="index" @click="clickType(item.id)">{{item.name}}</view>
</view>
<view class="index_box_icon" @click="jumpMap">
<image src="@/static/icon/ic_fullscreen@2x.png" mode="widthFix"></image>
@@ -31,7 +38,7 @@
</image>
</view>
<view class="index_box_function">
- <view class="cXYC" v-for="(item, index) in functionList" :key="index" @click.stop="jump(item)">
+ <view class="cXYC" :style="{ marginTop: item.id === 5 ? '30rpx' : '' }" v-for="(item, index) in functionList" :key="index" @click.stop="jump(item)">
<button open-type="getPhoneNumber" @getphonenumber="getPhone" v-if="!userInfo.mobile"></button>
<image class="img80" :src="item.icon" mode="widthFix"></image>
<text class="f26 c3 mt10">{{item.name}}</text>
@@ -43,18 +50,22 @@
<text @click="jumpTC">鏇村浼樻儬 ></text>
</view>
<scroll-view scroll-x class="scrollView">
- <view class="index_box_vip_row" v-for="(item, index) in 3" :key="index">
+ <view class="index_box_vip_row" v-for="(item, index) in tcList" :key="index">
<view class="vip1">
- <text>鐢靛崟杞﹀勾鍗�</text>
- <text>365</text>
+ <view class="vip1_left">
+ {{item.name || ''}}
+ </view>
+ <view class="vip1_right">
+ {{item.price || ''}}
+ </view>
</view>
<view class="vip2">
- <text>365澶╃晠楠戯紝浜彈楠戣溅涔愯叮</text>
- <u>楼699</u>
+ <text>{{item.descs || ''}}</text>
+ <u>楼{{item.linePrice || ''}}</u>
</view>
<view class="vip3">
- <view class="vip3_info">浣庤嚦1鍏�/澶�</view>
- <view class="vip3_button">璐拱</view>
+ <view class="vip3_info">浣庤嚦{{item.dayPrice}}鍏�/澶�</view>
+ <view class="vip3_button" @click="purchase(item.id)">璐拱</view>
</view>
</view>
</scroll-view>
@@ -65,11 +76,18 @@
<view class="index_box_video" v-if="info.leaseVideoUrl">
<video class="img100b" :src="info.leaseVideoUrl" enable-danmu danmu-btn controls></video>
</view>
- <view style="width: 100%; height: calc(env(safe-area-inset-bottom) + 600rpx);" v-if="show5"></view>
- <view style="width: 100%; height: calc(env(safe-area-inset-bottom) + 660rpx);" v-if="show6"></view>
- <view style="width: 100%; height: calc(env(safe-area-inset-bottom) + 660rpx);" v-else-if="show2"></view>
- <view style="width: 100%; height: calc(env(safe-area-inset-bottom) + 580rpx);" v-else-if="show1"></view>
- <view style="width: 100%; height: calc(env(safe-area-inset-bottom) + 500rpx);" v-else-if="show3"></view>
+ <template v-if="info.memberRidesResponse && info.memberRidesResponse.ridesType === 0">
+ <view style="width: 100%; height: calc(env(safe-area-inset-bottom) + 600rpx);" v-if="show5"></view>
+ <view style="width: 100%; height: calc(env(safe-area-inset-bottom) + 660rpx);" v-else-if="show6"></view>
+ <view style="width: 100%; height: calc(env(safe-area-inset-bottom) + 660rpx);" v-else-if="show2"></view>
+ <view style="width: 100%; height: calc(env(safe-area-inset-bottom) + 580rpx);" v-else-if="show1"></view>
+ <view style="width: 100%; height: calc(env(safe-area-inset-bottom) + 500rpx);" v-else-if="show3"></view>
+ <view class="index_zw1" v-else></view>
+ </template>
+ <template v-else-if="info.memberRidesResponse && info.memberRidesResponse.ridesType === 1">
+ <view style="width: 100%; height: calc(env(safe-area-inset-bottom) + 660rpx);" v-if="$refs.d_tram.d_show3 || $refs.d_tram.d_show4"></view>
+ <view class="index_zw1" v-else></view>
+ </template>
<view class="index_zw1" v-else></view>
</view>
</view>
@@ -81,13 +99,12 @@
</view>
<image src="@/static/images/ic_safe@2x.png" mode="widthFix"></image>
</view>
- <button class="index_scancode_bottom" open-type="getPhoneNumber" @getphonenumber="getPhone"
- v-if="!userInfo.mobile">鎵爜绉熻溅</button>
+ <button class="index_scancode_bottom" open-type="getPhoneNumber" @getphonenumber="getPhone" v-if="!userInfo.mobile">鎵爜绉熻溅</button>
<view class="index_scancode_bottom" @click="carRental" v-else>鎵爜绉熻溅</view>
<view class="index_scancode_zw"></view>
</view>
<!-- 鑷杞�-缂寸撼鎶奸噾 -->
- <u-popup :show="show1" :closeOnClickOverlay="false" mode="bottom" bgColor="#fff" :round="10"
+ <u-popup :show="show1" :closeOnClickOverlay="true" mode="bottom" bgColor="#fff" :round="10"
@close="show1 = false">
<view class="deposit">
<view class="deposit_text">
@@ -109,7 +126,7 @@
</view>
</u-popup>
<!-- 鑷杞�-寮�閿� -->
- <u-popup :show="show5" :closeOnClickOverlay="false" mode="bottom" bgColor="#fff" :round="10"
+ <u-popup :show="show5" :overlay="false" :closeOnClickOverlay="true" mode="bottom" bgColor="#fff" :round="10"
@close="show5 = false">
<view class="loading">
<view class="loading_box">
@@ -126,7 +143,7 @@
</view>
</u-popup>
<!-- 鑷杞�-楠戣涓� -->
- <u-popup :show="show2" :overlay="false" overlayOpacity="0" :closeOnClickOverlay="false" mode="bottom" bgColor="#fff" :round="10"
+ <u-popup :show="show2" overlayOpacity="0" :closeOnClickOverlay="true" mode="bottom" bgColor="#fff" :round="10"
@close="show2 = false">
<view class="ride">
<view class="ride_head">
@@ -142,6 +159,12 @@
<text>楠戣鏄庣粏</text>
<image src="@/static/icon/ar_detail@2x.png" mode="widthFix"></image>
</view>
+ </view>
+ <!-- 鏈夊椁愭樉绀� -->
+ <view class="info_des_tc" v-if="info && info.memberRidesResponse && info.memberRidesResponse.discountMember">
+ <u-icon name="info-circle" color="#FF5A31" size="18"></u-icon>
+ <text v-if="info.memberRidesResponse.discountMember.limitType === 0">鎮ㄦ湁楠戣濂楅锛屾湰娆¤绋嬪厤璐归獞琛�</text>
+ <text v-if="info.memberRidesResponse.discountMember.limitType === 1">鎮ㄥ凡璐拱楠戣濂楅锛屾湰娆¤绋嬪厤璐归獞琛寋{convertMinutesToHours(info.memberRidesResponse.discountMember.surplusTime)}}~</text>
</view>
<view class="ride_content" v-if="info.memberRidesResponse">
<view class="ride_content_a">
@@ -165,7 +188,7 @@
</view>
</u-popup>
<!-- 鑷杞�-宸茶繕杞� -->
- <u-popup :show="show6" :overlay="false" overlayOpacity="0" :closeOnClickOverlay="false" mode="bottom" bgColor="#fff" :round="10"
+ <u-popup :show="show6" overlayOpacity="0" :closeOnClickOverlay="true" mode="bottom" bgColor="#fff" :round="10"
@close="show6 = false">
<view class="ride">
<view class="ride_head">
@@ -181,6 +204,12 @@
<text>楠戣鏄庣粏</text>
<image src="@/static/icon/ar_detail@2x.png" mode="widthFix"></image>
</view>
+ </view>
+ <!-- 鏈夊椁愭樉绀� -->
+ <view class="info_des_tc" v-if="info && info.memberRidesResponse && info.memberRidesResponse.discountMember">
+ <u-icon name="info-circle" color="#FF5A31" size="18"></u-icon>
+ <text v-if="info.memberRidesResponse.discountMember.limitType === 0">鎮ㄦ湁楠戣濂楅锛屾湰娆¤绋嬪厤璐归獞琛�</text>
+ <text v-if="info.memberRidesResponse.discountMember.limitType === 1">鎮ㄥ凡璐拱楠戣濂楅锛屾湰娆¤绋嬪厤璐归獞琛寋{convertMinutesToHours(info.memberRidesResponse.discountMember.surplusTime)}}~</text>
</view>
<view class="ride_content" v-if="info.memberRidesResponse">
<view class="ride_content_a">
@@ -202,7 +231,7 @@
</view>
</u-popup>
<!-- 鑷杞�-纭缁撶畻 -->
- <u-popup :show="show3" :overlay="false" :closeOnClickOverlay="false" mode="bottom" bgColor="#fff" :round="10" @close="show3 = false">
+ <u-popup :show="show3" :closeOnClickOverlay="true" mode="bottom" bgColor="#fff" :round="10" @close="show3 = false">
<template>
<view class="deposit1">
<view class="deposit_text">
@@ -222,7 +251,7 @@
<!-- 鑷杞�-纭缁撶畻寮规 -->
<u-modal :show="show7" title="鎻愮ず" content='纭缁撶畻鍚楋紵' :showCancelButton="true" cancelText="鍙栨秷" @confirm="settlement1" @cancel="show7 = false"></u-modal>
<!-- 骞垮憡 -->
- <u-popup :show="show" mode="center" :closeOnClickOverlay="false" overlayStyle="z-index: 10075;" bgColor="transparent" :round="10" @close="show = false">
+ <u-popup :show="show" mode="center" :overlayStyle="{ zIndex: '99999' }" :closeOnClickOverlay="true" zIndex="99999" bgColor="transparent" :round="10" @close="show = false">
<view class="popupbox">
<view class="advertisement">
<image :src="info.adList[0].imgfullurl" mode="widthFix"></image>
@@ -231,6 +260,8 @@
</image>
</view>
</u-popup>
+ <!-- 鐢佃溅 -->
+ <tram ref="d_tram" @unlockDoor="refresh('tram')" />
</view>
</template>
@@ -238,7 +269,7 @@
import {
mapState
} from 'vuex'
-
+ import tram from '@/components/tram/tram.vue'
export default {
data() {
return {
@@ -284,98 +315,325 @@
name: '娑堣垂鏄庣粏',
icon: require('@/static/images/home_ic_mingxi@2x.png')
},
+ {
+ id: 5,
+ name: '杩愯惀涓績',
+ icon: require('@/static/icon/home_ic_mingxi.png')
+ },
],
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 },
computed: {
...mapState(['navHeight', 'statusbarHeight', 'userInfo'])
},
async onLoad(options) {
+ var that = this;
+
if (JSON.stringify(this.userInfo) == '{}') {
await this.$onLaunched;
}
await this.getAddress()
- await this.getHomeInfo()
+ // await this.getHomeInfo()
await this.getSite()
- // if (decodeURIComponent(options.scene) !== 'undefined') {
- // console.log(decodeURIComponent(options.scene))
- // this.carRentalCopy(decodeURIComponent(options.scene))
- // }
+
+ this.$u.api.home()
+ .then(async res => {
+ if (res.code === 200) {
+ let code = decodeURIComponent(options.scene)
+ // 鏄惁寮瑰嚭骞垮憡鍥�
+ if (res.data.adList.length > 0 && !res.data.memberRidesResponse) {
+ this.show = true
+ }
+ if (res.data.memberRidesResponse && res.data.memberRidesResponse.ridesType === 0 && code !== 'undefined' && res.data.rideStatus !== 2) {
+ let typeName = ''
+ if (code.substring(0, code.indexOf('-')) === 'ebike') {
+ typeName = '鐢靛姩杞�'
+ } else {
+ typeName = '鑷杞�'
+ }
+ uni.showToast({
+ title: `褰撳墠瀛樺湪鏈粨绠楄嚜琛岃溅璁㈠崟锛岃鍏堢粨绠楄鍗曞悗鍐嶆壂鐮佺${typeName}`,
+ icon: 'none'
+ })
+ } else if (res.data.memberRidesResponse && res.data.memberRidesResponse.ridesType === 1 && code !== 'undefined') {
+ let typeName = ''
+ if (code.substring(0, code.indexOf('-')) === 'ebike') {
+ typeName = '鐢靛姩杞�'
+ } else {
+ typeName = '鑷杞�'
+ }
+ uni.showToast({
+ title: `褰撳墠瀛樺湪鏈粨绠楃數鍔ㄨ溅璁㈠崟锛岃鍏堢粨绠楄鍗曞悗鍐嶆壂鐮佺${typeName}`,
+ icon: 'none'
+ })
+ }
+ // 鑷杞�
+ if (res.data.memberRidesResponse && res.data.memberRidesResponse.ridesType === 0) {
+ // 瑙ｉ攣涓�
+ if (res.data.rideStatus === 0) {
+ this.show5 = true
+ // 寰幆娆℃暟
+ var num = 1
+ // 寰幆鏌ョ湅瑙ｉ攣缁撴灉
+ let timer = setInterval(async () => {
+ num += 1
+ let res1 = await this.$u.api.refreshLock({
+ id: res.data.memberRidesResponse.rideId
+ })
+ // 寮�閿佹垚鍔�
+ if (res1.data.status === 1) {
+ clearInterval(timer)
+ this.show5 = false
+ setTimeout(() => {
+ 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 });
+ }
+ }, 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 = {
+ ...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') {
+ let 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) {
+ this.title = '鏆傚仠钀ヤ笟鎻愰啋'
+ this.content = res.data.unBusinessTips
+ this.show4 = true
+ return
+ }
+ // 鏄惁鍋滄鏈嶅姟
+ if (res.data.isStopServe === 1) {
+ this.title = '鏆傚仠鏈嶅姟鎻愰啋'
+ this.content = res.data.stopServeTips
+ this.show4 = true
+ }
+ this.tcList = res.data.discountList
+ let arr = JSON.parse(res.data.eleBusinessArea)
+ this.eleBusinessArea[0].points = arr.map(item => {
+ return {
+ latitude: item.lat,
+ longitude: item.lng
+ }
+ })
+ }
+ })
+ uni.$on('update', data => {
+ this.carRental()
+ })
+ },
+ onPullDownRefresh() {
+ this.onPullDownRefresh = true
+ this.refresh()
+ },
+ onShow() {
+ this.refresh()
},
onPageScroll(e) {
this.top = e.scrollTop
},
methods: {
+ // 鍒嗛挓杞崲
+ convertMinutesToHours(minutes) {
+ const hours = Math.floor(minutes / 60); // 璁＄畻灏忔椂鏁�
+ const remainingMinutes = minutes % 60; // 璁＄畻鍓╀綑鐨勫垎閽熸暟
+ if (hours > 0 && remainingMinutes > 0) {
+ return `${hours}灏忔椂${remainingMinutes}鍒嗛挓`;
+ } else if (hours == 0) {
+ return `${remainingMinutes}鍒嗛挓`;
+ } else if (remainingMinutes == 0) {
+ return `${hours}灏忔椂`;
+ }
+ },
+ clickcontrol() {
+ let mapObjs = uni.createMapContext('mapId', this)
+ mapObjs.moveToLocation({
+ complete: res => {
+ console.log('绉诲姩瀹屾垚:', res)
+ }
+ })
+ },
+ async getEleBikeList() {
+ let res = await this.$u.api.eleBikeList({})
+ if (res.code === 200) {
+ this.markers = []
+ res.data.forEach((item, index) => {
+ this.markers.push({
+ id: index,
+ width: 40,
+ height: 40,
+ latitude: item.latitude,
+ longitude: item.longitude,
+ title: item.name,
+ iconPath: '/static/icon/ic_bike@2x.png'
+ })
+ })
+ this.clickcontrol()
+ }
+ },
+ clickType(id) {
+ this.type = id
+ if (id === 1) {
+ this.getSite()
+ } else {
+ this.getEleBikeList()
+ }
+ },
+ purchase(id) {
+ uni.navigateTo({
+ url: `/pages/packageDetails/packageDetails?id=${id}`
+ });
+ },
jumpTC() {
uni.navigateTo({
url: '/pages/setMenu/setMenu'
});
},
// 寰俊鎵撳紑灏忕▼搴忓紑閿佹柟娉�
- async carRentalCopy(code) {
- await this.refresh()
- // 鍒ゆ柇鏈夋病鏈変氦鎶奸噾
- if (this.info.depositStatus === 0) {
- this.show1 = true
- return;
- } else if (this.info.depositStatus === 2) {
- uni.showToast({ title: '缁撶畻鐢宠鎻愪氦鎴愬姛锛岃鑰愬績绛夊緟閫�娆撅紒', icon: 'none', duration: 2000 });
- return;
- }
+ async carRentalCopy(code, type) {
var that = this;
- if (!that.disable) {
- that.disable = true
- // 鎵撳紑寮�閿佸脊妗�
- that.show5 = true
- // 璋冪敤寮�閿佹帴鍙�
- let res = await that.$u.api.openLock({
- code: code
- })
- if (res.code === 200) {
- that.disable = false
- that.show6 = false
- that.show5 = true
- // 寰幆娆℃暟
- var num = 1
- // 寰幆鏌ョ湅瑙ｉ攣缁撴灉
- let timer = setInterval(async () => {
- num += 1
- let res1 = await that.$u.api.refreshLock({
- id: res.data.id
- })
- // 寮�閿佹垚鍔�
- if (res1.data.status === 1) {
- that.refresh()
- clearInterval(timer)
- that.show5 = false
- setTimeout(() => {
- 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 });
- }
- }, 1000)
+ let ddd = await this.$u.api.home()
+ if (ddd.code === 200) {
+ this.info = ddd.data
+ // 鍒ゆ柇鏈夋病鏈変氦鎶奸噾
+ if (this.info.depositStatus === 0) {
+ this.show1 = true
+ return;
+ } else if (this.info.depositStatus === 2) {
+ uni.showToast({ title: '缁撶畻鐢宠鎻愪氦鎴愬姛锛岃鑰愬績绛夊緟閫�娆撅紒', icon: 'none', duration: 2000 });
+ return;
+ }
+ // 鑷杞�
+ if (type === 1) {
+ if (!that.disable) {
+ that.disable = true
+ // 鎵撳紑寮�閿佸脊妗�
+ that.show5 = true
+ // 璋冪敤寮�閿佹帴鍙�
+ let res = await that.$u.api.openLock({
+ code: code
+ })
+ if (res.code === 200) {
+ that.disable = false
+ that.show6 = false
+ that.show5 = true
+ // 寰幆娆℃暟
+ var num = 1
+ // 寰幆鏌ョ湅瑙ｉ攣缁撴灉
+ let timer = setInterval(async () => {
+ num += 1
+ let res1 = await that.$u.api.refreshLock({
+ id: res.data.id
+ })
+ // 寮�閿佹垚鍔�
+ if (res1.data.status === 1) {
+ that.refresh()
+ clearInterval(timer)
+ that.show5 = false
+ setTimeout(() => {
+ 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 });
+ }
+ }, 1000)
+ } else {
+ that.show5 = false
+ that.disable = false
+ }
+ }
} else {
- that.show5 = false
- that.disable = false
+ let res = await that.$u.api.getBikeChargingRule({ code: code })
+ if (res.code === 200) {
+ that.$refs.d_tram.info = res.data
+ that.$refs.d_tram.d_show1 = true
+ }
}
}
},
@@ -386,7 +644,7 @@
},
jumpMap() {
uni.navigateTo({
- url: '/pages/maps/maps'
+ url: `/pages/maps/maps?type=${this.type}`
});
},
// 璁′环瑙勫垯
@@ -412,6 +670,7 @@
addr: item.addr
})
})
+ this.clickcontrol()
}
})
},
@@ -464,7 +723,17 @@
} else if (item.id === 4) {
uni.navigateTo({
url: '/pages/consumptionDetails/consumptionDetails'
- });
+ });
+ } else if (item.id === 5) {
+ if (!this.userInfo.sysuser) {
+ uni.navigateTo({
+ url: '/pages/operationLogin/operationLogin'
+ });
+ } else {
+ uni.navigateTo({
+ url: '/pages/operationsCenter/operationsCenter'
+ });
+ }
} else if (item.id === 2) {
if (!this.userInfo.mobile) return
if (this.info.rideStatus === 1) {
@@ -523,19 +792,16 @@
that.show1 = false
that.info.depositStatus = 1
that.carRental()
- that.refresh()
uni.showToast({ title: '鍏呭�兼垚鍔�', icon: 'success', duration: 2000 });
}
},
fail(err) {
that.disable = false
- console.log(err)
}
})
}
}).catch((err) => {
that.disable = false
- console.log(err)
})
}
} else {
@@ -577,74 +843,80 @@
},
// 鎵爜绉熻溅
async carRental() {
- await this.refresh()
- // 鍒ゆ柇鏈夋病鏈変氦鎶奸噾
- if (this.info.depositStatus === 0) {
- this.show1 = true
- return;
- } else if (this.info.depositStatus === 2) {
- uni.showToast({ title: '缁撶畻鐢宠鎻愪氦鎴愬姛锛岃鑰愬績绛夊緟閫�娆撅紒', icon: 'none', duration: 2000 });
- return;
- }
var that = this;
- if (!that.disable) {
- that.disable = true
- // 鎵爜瑙ｉ攣楠戣
+
+ let res = await this.$u.api.home()
+ if (res.code === 200) {
+ this.info = res.data
+
+ // 鍒ゆ柇鏈夋病鏈変氦鎶奸噾
+ if (this.info.depositStatus === 0) {
+ this.show1 = true
+ return;
+ } else if (this.info.depositStatus === 2) {
+ uni.showToast({ title: '缁撶畻鐢宠鎻愪氦鎴愬姛锛岃鑰愬績绛夊緟閫�娆撅紒', icon: 'none', duration: 2000 });
+ return;
+ }
+
+ // 鎵爜鑾峰彇杞﹁締淇℃伅
uni.scanCode({
success: async function(result) {
- let text = decodeURIComponent(result.path)
- text = text.substring(text.lastIndexOf('?') + 7, text.length)
- // 鎵撳紑寮�閿佸脊妗�
- that.show5 = true
- // 璋冪敤寮�閿佹帴鍙�
- let res = await that.$u.api.openLock({
- code: text
- })
- if (res.code === 200) {
- that.disable = false
- that.show6 = false
+ let code = decodeURIComponent(result.path).split('=')[1]
+ let res = await that.$u.api.getBikeChargingRule({ code })
+ // 鑷杞�
+ if (res.code === 200 && res.data.ridesType === 0) {
+ that.disable = true
that.show5 = true
- // 寰幆娆℃暟
- var num = 1
- // 寰幆鏌ョ湅瑙ｉ攣缁撴灉
- let timer = setInterval(async () => {
- num += 1
- let res1 = await that.$u.api.refreshLock({
- id: res.data.id
- })
- // 寮�閿佹垚鍔�
- if (res1.data.status === 1) {
- that.refresh()
- clearInterval(timer)
- that.show5 = false
- setTimeout(() => {
- 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 });
- }
- }, 1000)
- } else {
- that.show5 = false
- that.disable = false
+ // 璋冪敤寮�閿佹帴鍙�
+ let bicycle = await that.$u.api.openLock({ code })
+ if (bicycle.code === 200) {
+ that.disable = false
+ that.show6 = false
+ that.show5 = true
+
+ // 寰幆娆℃暟
+ var num = 1
+ // 寰幆鏌ョ湅瑙ｉ攣缁撴灉
+ let timer = setInterval(async () => {
+ num += 1
+ let res1 = await that.$u.api.refreshLock({ id: bicycle.data.id })
+ // 寮�閿佹垚鍔�
+ if (res1.data.status === 1) {
+ that.refresh()
+ clearInterval(timer)
+ that.show5 = false
+ setTimeout(() => {
+ 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 });
+ }
+ }, 1000)
+ } else {
+ that.show5 = false
+ that.disable = false
+ }
+ } else if (res.code === 200 && res.data.ridesType === 1) {
+ that.$refs.d_tram.info = res.data
+ that.$refs.d_tram.d_show1 = true
}
},
fail() {
that.disable = false
}
- });
+ })
}
},
// 鑾峰彇缁忕含搴�
@@ -773,60 +1045,106 @@
}
}, 10000)
},
+ // 鍒锋柊鐢佃溅淇℃伅
+ refreshTram() {
+ this.timerdian = setInterval(() => {
+ this.$u.api.home()
+ .then(res => {
+ if (res.code === 200) {
+ this.info = res.data
+ // 鏈煡鍒伴獞琛岃鍗�
+ if (!res.data.memberRidesResponse) {
+ this.$refs.d_tram.d_show = false
+ this.$refs.d_tram.d_show1 = false
+ this.$refs.d_tram.d_show2 = false
+ this.$refs.d_tram.d_show3 = false
+ this.$refs.d_tram.d_show4 = false
+ this.$refs.d_tram.d_show5 = false
+ this.$refs.d_tram.d_show6 = false
+ this.$refs.d_tram.d_show7 = false
+ this.$refs.d_tram.d_show8 = false
+ this.$refs.d_tram.d_show9 = false
+ clearInterval(this.timerdian)
+ this.timerdian = null
+ }
+ }
+ })
+ }, 30000)
+ },
// 鑾峰彇棣栭〉淇℃伅
getHomeInfo() {
+ var that = this
this.$u.api.home()
- .then(res => {
+ .then(async res => {
if (res.code === 200) {
this.info = res.data
+ console.log('鏄惁寮瑰嚭骞垮憡鍥�', res.data.adList.length > 0 && !res.data.memberRidesResponse)
// 鏄惁寮瑰嚭骞垮憡鍥�
- if (res.data.adList.length > 0) {
+ if (res.data.adList.length > 0 && !res.data.memberRidesResponse) {
this.show = true
}
- // 瑙ｉ攣涓�
- if (res.data.rideStatus === 0) {
- this.show5 = true
- // 寰幆娆℃暟
- var num = 1
- // 寰幆鏌ョ湅瑙ｉ攣缁撴灉
- let timer = setInterval(async () => {
- num += 1
- let res1 = await this.$u.api.refreshLock({
- id: res.data.memberRidesResponse.rideId
- })
- // 寮�閿佹垚鍔�
- if (res1.data.status === 1) {
- clearInterval(timer)
- this.show5 = false
- setTimeout(() => {
- 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 });
- }
- }, 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()
+ // 鑷杞�
+ if (res.data.memberRidesResponse && res.data.memberRidesResponse.ridesType === 0) {
+ // 瑙ｉ攣涓�
+ if (res.data.rideStatus === 0) {
+ this.show5 = true
+ // 寰幆娆℃暟
+ var num = 1
+ // 寰幆鏌ョ湅瑙ｉ攣缁撴灉
+ let timer = setInterval(async () => {
+ num += 1
+ let res1 = await this.$u.api.refreshLock({
+ id: res.data.memberRidesResponse.rideId
+ })
+ // 寮�閿佹垚鍔�
+ if (res1.data.status === 1) {
+ clearInterval(timer)
+ this.show5 = false
+ setTimeout(() => {
+ 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 });
+ }
+ }, 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 = {
+ ...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) {
@@ -841,57 +1159,110 @@
this.content = res.data.stopServeTips
this.show4 = true
}
+ this.tcList = res.data.discountList
+ let arr = JSON.parse(res.data.eleBusinessArea)
+ this.eleBusinessArea[0].points = arr.map(item => {
+ return {
+ latitude: item.lat,
+ longitude: item.lng
+ }
+ })
}
})
},
// 鍒锋柊棣栭〉淇℃伅
- refresh() {
+ refresh(type) {
this.$u.api.home()
.then(res => {
+ uni.stopPullDownRefresh()
if (res.code === 200) {
this.info = res.data
- // 瑙ｉ攣涓�
- if (res.data.rideStatus === 0) {
- this.show5 = true
- // 寰幆娆℃暟
- var num = 1
- // 寰幆鏌ョ湅瑙ｉ攣缁撴灉
- let timer = setInterval(async () => {
- num += 1
- let res1 = await this.$u.api.refreshLock({
- id: res.data.memberRidesResponse.rideId
- })
- // 寮�閿佹垚鍔�
- if (res1.data.status === 1) {
- clearInterval(timer)
- this.show5 = false
- setTimeout(() => {
- 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 });
- }
- }, 1000)
+ if (type === 'tram') {
+ this.refreshTram()
}
- if (res.data.rideStatus === 1) {
- this.show2 = true
- this.refreshStatus()
+ // 鏈煡鍒伴獞琛岃鍗�
+ if (!res.data.memberRidesResponse && this.onPullDownRefresh) {
+ this.show1 = false
+ this.show2 = false
+ this.show3 = false
+ this.show4 = false
+ this.show5 = false
+ this.show6 = false
+ this.show7 = false
+
+ this.$refs.d_tram.d_show = false
+ this.$refs.d_tram.d_show1 = false
+ this.$refs.d_tram.d_show2 = false
+ this.$refs.d_tram.d_show3 = false
+ this.$refs.d_tram.d_show4 = false
+ this.$refs.d_tram.d_show5 = false
+ this.$refs.d_tram.d_show6 = false
+ this.$refs.d_tram.d_show7 = false
+ this.$refs.d_tram.d_show8 = false
+ this.$refs.d_tram.d_show9 = false
+ this.onPullDownRefresh = false
+ return
}
- if (res.data.rideStatus === 5) {
- this.show5 = true
- }
- if (res.data.rideStatus === 2) {
- this.show6 = true
+ // 鑷杞�
+ if (res.data.memberRidesResponse.ridesType === 0) {
+ // 瑙ｉ攣涓�
+ if (res.data.rideStatus === 0) {
+ this.show5 = true
+ // 寰幆娆℃暟
+ var num = 1
+ // 寰幆鏌ョ湅瑙ｉ攣缁撴灉
+ let timer = setInterval(async () => {
+ num += 1
+ let res1 = await this.$u.api.refreshLock({
+ id: res.data.memberRidesResponse.rideId
+ })
+ // 寮�閿佹垚鍔�
+ if (res1.data.status === 1) {
+ clearInterval(timer)
+ this.show5 = false
+ setTimeout(() => {
+ 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 });
+ }
+ }, 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
+ }
+ } else if (res.data.memberRidesResponse.ridesType === 1) {
+ this.$refs.d_tram.info = {
+ ...res.data.memberRidesResponse.discountMember,
+ ...res.data.memberRidesResponse,
+ deposit: res.data.deposit,
+ goodsOrderId: res.data.goodsOrderId
+ }
+ // 楠戣涓�
+ if (res.data.rideStatus === 1) {
+ this.$refs.d_tram.d_show3 = true
+ }
+ // 涓存椂閿佽溅
+ if (res.data.rideStatus === 4) {
+ this.$refs.d_tram.d_show4 = true
+ }
}
}
})
@@ -1068,12 +1439,14 @@
display: flex;
align-items: center;
justify-content: space-between;
+ flex-wrap: wrap;
position: relative;
top: -24rpx;
text {
font-weight: 400;
}
.cXYC {
+ width: 23%;
position: relative;
button {
width: 100%;
@@ -1092,7 +1465,7 @@
width: 100%;
padding: 24rpx 30rpx;
box-sizing: border-box;
- background: linear-gradient(#FFFFFF 0%, #FCEADC 100%);
+ background: linear-gradient(#FCEADC 0%, #FFFFFF 100%);
border-radius: 20rpx;
.index_box_vip_head {
width: 100%;
@@ -1134,22 +1507,29 @@
display: flex;
align-items: center;
justify-content: space-between;
- text {
- &:nth-child(1) {
- font-weight: 500;
- font-size: 32rpx;
- color: #303030;
- }
- &:nth-child(2) {
+ .vip1_left {
+ flex: 1;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #303030;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+ .vip1_right {
+ flex-shrink: 0;
+ margin-left: 30rpx;
+ font-weight: 400;
+ font-size: 40rpx;
+ color: #FF5A31;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ &:before {
+ content: '锟�';
font-weight: 400;
- font-size: 40rpx;
+ font-size: 26rpx;
color: #FF5A31;
- &:before {
- content: '锟�';
- font-weight: 400;
- font-size: 26rpx;
- color: #FF5A31;
- }
}
}
}
@@ -1161,14 +1541,20 @@
margin-top: 10rpx;
margin-bottom: 16rpx;
text {
+ flex: 1;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
font-weight: 400;
font-size: 26rpx;
color: #777777;
}
u {
+ flex-shrink: 0;
font-weight: 400;
font-size: 24rpx;
color: #999999;
+ text-decoration: line-through;
}
}
.vip3 {
@@ -1638,6 +2024,25 @@
}
}
}
+
+ .info_des_tc {
+ width: 100%;
+ height: 60rpx;
+ line-height: 60rpx;
+ background: #F4EFEA;
+ border-radius: 16rpx;
+ margin: 20rpx 0;
+ display: flex;
+ align-items: center;
+ padding: 0 20rpx;
+ box-sizing: border-box;
+ text {
+ font-weight: 400;
+ font-size: 26rpx;
+ color: #FF5A31;
+ margin-left: 10rpx;
+ }
+ }
.ride_content {
width: 100%;
--
Gitblit v1.9.3