bug修复

component/allPrice/allPrice.css

@@ -6,5 +6,6 @@
 }
 
 .integer-part {
-	font-size: 40rpx;
+	font-size: 54rpx;
+	font-family: DIN, DIN;	
 }

component/googleMap/googleMap.vue

@@ -11,8 +11,6 @@
 <script module="mapModule" lang="renderjs">
 	var common = require("@/common/common.js");
 	var transform = require('../../common/transform.js');
-	var meMarker = []
-	var polylinePath = null
 	export default {
 		data() {
 			return {
@@ -37,6 +35,8 @@
 		},
 		methods: {
 			initAmap(lngLat, _, ownerInstance) {
+				console.log('进来啦')
+				console.log(lngLat)
 				lngLat = {
 					lat: lngLat.latitude,
 					lng: lngLat.longitude
@@ -60,9 +60,7 @@
 					lat: lngLat.latitude,
 					lng: lngLat.longitude
 				}
-				console.log("lngLat", lngLat)
 				lngLat = transform.wgs_gcj_encrypts(lngLat)
-				console.log("lngLat", lngLat)
 
 				this.map.panTo(new google.maps.LatLng(lngLat.latitude, lngLat.longitude))
 			},
@@ -288,7 +286,8 @@
 
 			};
 		},
-		mounted() {},
+		mounted() {
+		},
 		methods: {
 			onMarkertap(marker) {
 				this.$emit('changMarkertap', marker)

component/scanCabBtn/scanBtn.css

@@ -462,4 +462,8 @@
 	color: #fff;
 	text-align: center;
 	line-height: 80rpx;
+	position: fixed;
+	right: 0;
+	left: 0;
+	bottom: 60rpx;
 }

component/scanCabBtn/scanBtn.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="container-view">
+		<view style="height: 160rpx;"></view>
 		<view @tap="sacnBtn" class="refund-btn"><text>扫码换电</text></view>
 		<view v-if="isModelCenter" class="model_center">
 			<image class="pack_model" src="https://zxappfile.bms16.com/zx_client/buy_pack_model.png" />

manifest.json

@@ -2,8 +2,8 @@
     "name" : "FRANCO MORINI",
     "appid" : "__UNI__111A022",
     "description" : "",
-    "versionName" : "1.3.7",
-    "versionCode" : 137,
+    "versionName" : "1.3.8",
+    "versionCode" : 138,
     "transformPx" : false,
     "loadnativePlugins" : false,
     "sassImplementationName" : "node-sass",
@@ -23,12 +23,12 @@
         "modules" : {
             "Bluetooth" : {},
             "Geolocation" : {},
-            "Maps" : {},
             "Barcode" : {},
             "Camera" : {},
             "OAuth" : {},
             "Contacts" : {},
-            "iBeacon" : {}
+            "iBeacon" : {},
+            "Maps" : {}
         },
         "distribute" : {
             "android" : {
@@ -80,16 +80,18 @@
                 },
                 "maps" : {
                     "google" : {
-                        "APIKey_ios" : "AIzaSyAyfZx9Stm7rx5KbOGH5e1mgT-84EWvb7Q",
+                        "APIKey_ios" : "AIzaSyCaQ8pXdHqsgQmUbKNyGOTyyRMhN0cgoTI",
                         "APIKey_android" : "AIzaSyAyfZx9Stm7rx5KbOGH5e1mgT-84EWvb7Q"
                     }
                 },
-                "oauth" : {},
+                "oauth" : {
+                    "google" : {
+                        "clientid" : "994756703987-u1eq1bun35uifcp2sbh9mjc9bb59gu2v.apps.googleusercontent.com"
+                    }
+                },
                 "geolocation" : {
-                    "amap" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "appkey_ios" : "unknown",
-                        "appkey_android" : "255bc0dfb27a04f9c4aaacf0fd80cff8"
+                    "system" : {
+                        "__platform__" : [ "ios", "android" ]
                     }
                 },
                 "share" : {

mixin/index.js

@@ -28,6 +28,7 @@ export default {
   methods: {
 	  async locationMiXin(){
 		   this.myLocation = await this.$location()
+		   console.log(this.myLocation)
 	  },
 		tapOpenControl(e){
 			const _carOnline=uni.getStorageSync('car_info').online!=0 //在线

pages/activation/activation.vue

@@ -12,9 +12,12 @@
 				<view class="return-top  flex-row flex-between">
 					<view>车辆编号：{{car_sn}}</view>
 				</view>
-				<!-- <view class="return-top  flex-row flex-between">
-					<view>车辆品牌：{{car_sn}}</view>
-				</view> -->
+				<view class="return-top  flex-row flex-between">
+					<view>车辆品牌：{{carInfoData.brand_name}}</view>
+				</view>
+				<view class="return-top  flex-row flex-between">
+					<view>车辆颜色：{{carInfoData.color_name}}</view>
+				</view>
 				<view v-if="carInfoData.license_plate_number" class="return-top  flex-row flex-between">
 					<view>车牌号：{{carInfoData.license_plate_number}}</view>
 				</view>
@@ -25,11 +28,12 @@
 					<view>车型：{{carInfoData.model_name}}</view>
 				</view>
 				<view class="return-top  flex-row flex-between">
-					<view>续航：{{(carInfoData.endurance / 2).toFixed(2)}}km</view>
+					<view>续航：{{(carInfoData.endurance / 1000).toFixed(2)}}km</view>
 				</view>
 				<view class="return-top  flex-row flex-between">
-					<view>重量：{{(carInfoData.weight / 100).toFixed(2)}}kg</view>
+					<view>重量：{{(carInfoData.weight / 1000).toFixed(2)}}kg</view>
 				</view>
+				
 				<view class="return-top  flex-row ">
 					<view>照片：</view>
 					<view style="display: flex;align-items: center;" class="">
@@ -217,15 +221,15 @@
 			},
 			//还车
 			async submitReturn() {
-				let _image_list = this.shopList.flk_hire_return_car_img.map(item => {
+				this._image_list = this.shopList.flk_hire_return_car_img.map(item => {
 					return item.imgUrl
 				})
-				 _image_list = _image_list.filter(item=> {
+				 this._image_list = this._image_list.filter(item=> {
 					if(item){
 						return item
 					}
 				})
-				if (_image_list.length < this.shopList.flk_hire_return_car_img.length) return common.simpleToast('请上传车辆照片')
+				if (this._image_list.length < this.shopList.flk_hire_return_car_img.length) return common.simpleToast('请上传车辆照片')
 				if (this.totalPrice > 0) {
 					this.isShowToBuy = true
 				} else {

pages/my/my.vue

@@ -23,10 +23,10 @@
 		
 		
 		<view  class="common-tabs">
-			<view class="item" @click="routerLink({url:'/pages/dashboard/dashboard',isLogin:1})">
+			<!-- <view class="item" @click="routerLink({url:'/pages/dashboard/dashboard',isLogin:1})">
 				<image :src="QINIU_URL + 'Fp6G-Kzb-YUGkP2WR-kjTlIbbTj1'" class="icon" />
 				<view class="name">{{ $t('我的车辆') }}</view>
-			</view>
+			</view> -->
 			<view class="item" @click="routerLink({url:'/pages/userManagement/userManagement',isLogin:1})">
 				<image :src="QINIU_URL + 'FnxGW52BCkTkK9HxsTdVrghU7B4D'" class="icon" />
 				<view class="name">{{ $t('用车人') }}</view>
@@ -177,10 +177,15 @@ var request = require('@/common/request.js');
 				}
 			},
 			checkHandle_combo() {
+				
 				if(!this.car_info.sold_time){
 					this.$msg('您还未购买车辆，购买车辆才可享受换电套餐')
 					return
 				}
+				if(!this.car_info.battery_tag_info.tag_code){
+					this.$msg('当前没有可更换的电池，购买车辆绑定电池后才可享受换电套餐')
+					return
+				}
 				if(!this.car_info.car_sn){
 					this.$msg('您还未绑定车辆！')
 					return

pages/openCabinet/openCabinet.vue

@@ -6,15 +6,12 @@
 		<view class="explain-view">
 			<view class="explain-num-view flex-row">
 				<!-- <text><text class="explain-num">{{empty_door_id}} </text>号仓门已打开</text> -->
-				<text v-if="list.status == 1">仓门已打开</text>
-				<text v-if="list.status == 2">换电中</text>
+				<text>仓门已打开</text>
+				<!-- <text v-if="list.status == 2">换电中</text>
 				<text v-if="list.status == 3">换电成功</text>
-				<text v-if="list.status == 4">换电失败</text>
+				<text v-if="list.status == 4">换电失败</text> -->
 			</view>
-			<view v-if="list.status == 1" class="explain-text">请存入更换电池,取走满电电池,并关好仓门</view>
-			<view v-if="list.status == 2" class="explain-text">换电中</view>
-			<view v-if="list.status == 3" class="explain-text">换电成功</view>
-			<view v-if="list.status == 4" class="explain-text-grap">{{list.fail_reason}}</view>
+			<view class="explain-text">请存入更换电池,取走满电电池,并关好仓门</view>
 			<!-- <view class="explain-text">请 归还 / 取出 电池并关上仓门</view> -->
 			<!-- <view class="explain-text">请取出电池并关上仓门</view> -->
 			<!-- <view class="explain-text-grap">归还完成后电柜会自动打开可租仓门</view> -->
@@ -70,7 +67,7 @@
 			this.exchangeStatusFn()
 			this.time = setInterval(() => {
 				this.exchangeStatusFn()
-			}, 3000)
+			}, 1200)
 		},
 		/**
 		 * 生命周期函数--监听页面显示

pages/order/order.vue

@@ -85,16 +85,20 @@
 			<view class="card-bottom">
 				<view class="bottom-item">
 					<block v-if="selectOrderType == 1">
+						<view class="item-label-view flex-row">
+							<view class="item-label">订单编号</view>
+							<view class="item-value">{{ item.sub_sn }}</view>
+						</view>
 						<view class="item-label-view flex-row">
 							<view class="item-label">下单时间</view>
 							<view class="item-value">{{ tools.formatTime(item.ctime) }}</view>
 						</view>
-						<view v-if="item.hire_end_time" class="item-label-view flex-row">
+						<view v-if="item.hire_end_time && item.order_type != 3" class="item-label-view flex-row">
 							<view class="item-label">有效期至</view>
 							<view class="item-value">{{ tools.formatTime(item.hire_end_time) }}</view>
 						</view>
 
-						<view v-if="item.hire_duration_time" class="item-label-view flex-row">
+						<view v-if="item.hire_duration_time && item.order_type != 3" class="item-label-view flex-row">
 							<view class="item-label">有效时长</view>
 							<view class="item-value">
 								{{ item.hire_duration_time.day > 0 ? item.hire_duration_time.day : '' }}<text

pages/orderStatus/orderStatus.vue

@@ -1,4 +1,6 @@
 <template>
+	
+	
 	<view class="container-view">
 		<view class="time-info">
 			<navBar bgColor="transparent" left="0"></navBar>
@@ -30,8 +32,11 @@
 					<view class="money-item">
 						<view :class="orderInfo.order_status == 4?'red-status':''">
 							<block v-if="orderInfo.hire_duration_time">{{orderInfo.hire_duration_time}}</block>
+							<block v-else>{{Number(orderInfo.hire_cycle) * (orderInfo.hire_duration)}}</block>
 						</view>
-						<view>{{((orderInfo.order_status == 2&&orderInfo.hire_type==2) || orderInfo.order_status == 3)?'租期剩余':(orderInfo.order_status == 4 ? '逾期时长':'租借周期')}}·<text style="opacity: 0.4;">天</text></view>
+						
+						<view>{{((orderInfo.order_status == 2) || orderInfo.order_status == 3)?'租期剩余':(orderInfo.order_status == 4 ? '逾期时长':'租借周期')}}·<text style="opacity: 0.4;">{{leaseUnits(orderInfo.hire_duration_unit)}}</text></view>
+						
 						<!-- <view v-if="(orderInfo.order_status == 2&&orderInfo.hire_type==2) || orderInfo.order_status == 3">
 							租期剩余·天</view>
 						<view v-else-if="orderInfo.order_status == 4 " class="red-status">逾期时长·天</view>
@@ -57,6 +62,7 @@
 							:src="isExpanded?'https://qiniu.bms16.com/FvRah8ro91B_TUVEmInBq6n69W2f':'https://qiniu.bms16.com/FtbxPP0aXYG8hyJTEJfNTXa_Puuc'" />
 					</view>
 				</view>
+				
 				<view v-if="orderInfo.order_type == 3" class="flex-row flex-between">
 					<view class="money-item">
 						<view></view>
@@ -76,6 +82,7 @@
 				</view>
 
 				<view v-if="isExpanded" class="dashed-border"></view>
+				
 				<view v-if="isExpanded">
 					<view class="big-text">订单信息</view>
 					<view class="sn-content flex-row flex-between">
@@ -307,6 +314,9 @@
 	import {
 		getRemainingTime
 	} from '@/utils/util';
+	import {
+		MAX_LIMITS,LEASE_TYPE_ARR
+	} from '@/common/constant.js'
 	var appWhiteListFilter = require('../../common/appWhiteListFilter.js');
 	import allPrice from '@/component/allPrice/allPrice';
 	import ReturnCar from '@/component/returnCar/returnCar';
@@ -315,6 +325,7 @@
 	import dayjs from 'dayjs'
 	import duration from 'dayjs/plugin/duration'
 	dayjs.extend(duration);
+	
 	export default {
 		components: {
 			allPrice,
@@ -371,6 +382,14 @@
 		computed: {},
 
 		methods: {
+			leaseUnits(type){
+				const result = LEASE_TYPE_ARR.find(v => v.value == type);
+				return result ? result.unit : '';
+			},
+			leaseUnitsResult(type) {
+				const result = LEASE_TYPE_ARR.find(v => v.value == type);
+				return result ? result.label : '';
+			},
 			payReturn() {},
 			//逾期费用计算
 			async overdueMoneyFn(car_sn) {
@@ -508,19 +527,19 @@
 			hireDurationUnitsFn(time, type) {
 
 				if (type == 1) {
-					return Math.ceil(time / 60 / 60 / 24) + '天'
+					return Math.ceil(time / 60 / 60 / 24) 
 				} else if (type == 2) {
-					return Math.ceil(time / 60 / 60 / 24 / 30) + '月'
+					return Math.ceil(time / 60 / 60 / 24 / 30)
 				} else if (type == 3) {
-					return Math.ceil(time / 60 / 60 / 24 / 30 / 365) + '年'
+					return Math.ceil(time / 60 / 60 / 24 / 30 / 365) 
 				} else if (type == 4) {
-					return Math.ceil(time / 60 / 60) + '小时'
+					return Math.ceil(time / 60 / 60) 
 				} else if (type == 5) {
-					return Math.ceil(time / 60) + '分钟'
+					return Math.ceil(time / 60)
 				} else if (type == 6) {
-					return Math.ceil(time / 60 / 60 / 24 / 7) + '周'
+					return Math.ceil(time / 60 / 60 / 24 / 7)
 				} else if (type == 7) {
-					return Math.ceil(time / 60 / 60 / 24 / 30 / 3) + '季'
+					return Math.ceil(time / 60 / 60 / 24 / 30 / 3)
 				}
 			},
 
@@ -565,9 +584,11 @@
 						// 剩余租期判断
 						if (me.orderInfo.order_status == 1){
 							me.orderInfo.hire_duration_time=common.countToDay(me.orderInfo.hire_cycle*me.orderInfo.hire_duration,me.orderInfo.hire_duration_unit)
-							console.log(me.orderInfo.hire_duration_time,'me.orderInfo.hire_duration_time');
-						}else if((me.orderInfo.hire_type == 2 && me.orderInfo.order_status == 2) ||me.orderInfo.order_status == 3) {
+						;
+						}else if((me.orderInfo.order_status == 2) ||me.orderInfo.order_status == 3) {
+
 							me.orderInfo.hire_duration_time = common.timestampToDays(Math.ceil(me.orderInfo.hire_end_time - Math.floor(new Date()) /1000))
+							console.log(me.orderInfo.hire_duration_time,'me.orderInfo.hire_duration_time')
 						} else {
 							if (me.orderInfo.order_status == 4) {
 								me.overdueMoneyFn(me.orderInfo.car_sn)

pages/package/package.vue

@@ -10,7 +10,7 @@
 						<img class="left-img" src="https://qiniu.bms16.com/Fpf25Lkkrx05pvLw08mksVQKAQWf" />
 					</view>
 					<view class="left-second flex-row">
-						<view style="margin-right: 32rpx;">适用电池:<text>48v20Ah</text></view>
+						<view style="margin-right: 32rpx;">适用电池:<text>{{car_info.battery_tag_info.main_tag_name ? (car_info.battery_tag_info.main_tag_name) : ''}}{{car_info.battery_tag_info.child_tag_name ? '/' + car_info.battery_tag_info.child_tag_name : ''}}</text></view>
 						<!-- <view>押金:<text>$5.0</text></view> -->
 					</view>
 					<view class="left-third">

pages/service/components/carRentalList/carRentalList.vue

@@ -46,7 +46,7 @@
 
 				<scroll-view v-if="item.model_list.length>1" :scroll-into-view="'into'+into" scroll-x="true" enable-flex
 					class="scrollview-box" scroll-with-animation @scroll="onScroll">
-					<view @click.stop="$srcFn(`/pages/carDetail/carDetail?model_id=${items.model_id}&shop_type=${shopType}&hire_price=${item.model_list[0].hire_price}`)"
+					<view @click.stop="$srcFn(`/pages/carDetail/carDetail?model_id=${items.model_id}&shop_type=${shopType}&hire_price=${items.hire_price}`)"
 						v-for="(items,index) in item.model_list" :key="index"
 						:style="{ marginLeft: index > 0 ? '32rpx' : '0' }" class="form-item" :data-item="items">
 						<view class="second-view flex-row">
@@ -63,11 +63,11 @@
 								<view class="flex-row flex-between">
 									<view class="bottom-text">
 										{{ leaseUnitsResult }}<text
-											style="margin-left: 10rpx;">￥</text><text>{{(items.hire_price /100).toFixed(1)}}</text>
+											style="margin-left: 10rpx;">￥</text><text>{{(items.hire_price /100).toFixed(2)}}</text>
 									</view>
 									<view v-if="items.sell_price && isBuy" class="bottom-text">
 										购买<text
-											style="margin-left: 10rpx;">￥</text><text>{{(items.sell_price /100).toFixed(1)}}</text>
+											style="margin-left: 10rpx;">￥</text><text>{{(items.sell_price /100).toFixed(2)}}</text>
 									</view>
 								</view>
 							</view>

pages/service/service.vue

@@ -15,8 +15,10 @@
 		<!-- #endif -->
 
 		<!-- #ifdef APP -->
-		<googleMap keyId="1" width="100%" height='calc(50vh - 0rpx)' @changMarkertap="changMarkertap"
-			v-if="myLocation.latitude" :mapData='markers' :myLocations='myLocation'></googleMap>
+		<view style="width: 100%;height: calc(50vh - 0rpx);">
+			<googleMap keyId="1" width="100%" height='calc(50vh - 0rpx)' @changMarkertap="changMarkertap"
+				v-if="myLocation.latitude" :mapData='markers' :myLocations='myLocation'></googleMap>
+		</view>
 		<!-- #endif -->
 
 		<!-- 地图控件 -->