bug修改

component/carPlan/carPlan.vue

@@ -10,7 +10,7 @@
 					<allPrice :amount="((price || 0)/100)"/>
 					<view v-if="params.overdueData && params.overdueData.money" style="align-items: baseline;" class="flex-row">
 						<text>逾期金额：</text>
-						<allPrice  :amount="(params.overdueData.money || 0/100)"/>
+						<allPrice  :amount="(params.overdueData.money/100)"/>
 					</view>
 					
 					<view v-if="type!=100" class="car-model-price-view">
@@ -158,7 +158,6 @@
 		mounted() {
 			this.params.image =  this.params.model_images[0]
 			this.image = this.params.image ? this.params.image : this.params?.model_images[0] ? this.params.model_images[0] : "" 
-			this.type = this.selectType
 			this.tapSelectType({hire_duration_unit:this.selectType,hire_price:this.params.price*100})
 		},
 		// created: function () {

component/googleMap/googleMap.vue

@@ -136,12 +136,12 @@
 			},
 			AddMarker(item) {
 				let label = null
-				if (this.types == 2 && item.id != 50000) {
-					label = {
-						text: item.content,
-						className: "map-label-num",
-					}
-				}
+				// if (this.types == 2 && item.id != 50000) {
+				// 	label = {
+				// 		text: item.content,
+				// 		className: "map-label-num",
+				// 	}
+				// }
 				let _this = this
 				const marker = new google.maps.Marker({
 					id: item.id,
@@ -174,8 +174,6 @@
 			},
 
 			update(newValue, _, ownerInstance) {
-				console.log('过来了')
-				console.log(newValue)
 				if (newValue.zoom) this.zoom = newValue.zoom || 14
 				if (newValue.polylines && newValue.polylines.points && newValue.polylines.points.length > 0) this
 					.polylines = newValue.polylines
@@ -189,8 +187,8 @@
 			loadMarkertap(marker, item) {
 				let markerId = marker.data.id
 				if (markerId == 50000) return
-				if (this.types == 1) this.shopMarkerFn(marker, item)
-				if (this.types == 2) this.nearCabinetMarkerFn(marker, item)
+				if (this.types == 1 || this.types == 2) this.shopMarkerFn(marker, item)
+				// if (this.types == 2) this.nearCabinetMarkerFn(marker, item)
 				// if(this.type == 3) this.shopMarkerFn(marker)
 				this.$ownerInstance.callMethod('onMarkertap', marker.data)
 			},
@@ -292,7 +290,7 @@
 		mounted() {
 		},
 		methods: {
-			onMarkertap(marker) {
+			onMarkertap(marker,type) {
 				this.$emit('changMarkertap', marker)
 			},
 			bindTapMap() {

component/smartCalendar/index.vue

@@ -128,18 +128,8 @@
 			mounted() {
 				this.bindTime()
 				this.time = this.isNextDay?common.getToDay(1):common.getToDay()
-				//#ifdef MP-ALIPAY
 				let _startH = this.startH< 10&&this.startH!== '00' ? '0' + this.startH : this.startH
 				const _startM = this.startM< 10&&this.startM!== '00' ? '0' + this.startM : this.startM
-				//#endif
-				//#ifdef MP-WEIXIN
-				let _startH = this.startH< 10&&this.startH!== '00' ? '0' + this.startH : this.startH
-				const _startM = this.startM< 10&&this.startM!== '00' ? '0' + this.startM : this.startM
-				//#endif
-				// #ifdef APP
-				let _startH = this.startH< 10&&this.startH!== '00' ? '0' + this.startH : this.startH
-				const _startM = this.startM< 10&&this.startM!== '00' ? '0' + this.startM : this.startM
-				// #endif
 				this.startDate = this.time+'T'+_startH+':'+_startM
 				const DATE = new Date()
 				this.curMonth = `${DATE.getFullYear()}年${DATE.getMonth()+1}月`
@@ -230,14 +220,8 @@
 
 				onChange(e) {
 					this.time = e.fulldate
-					//#ifdef MP-ALIPAY
 					const _startH = this.startH< 10&&this.startH!== '00' ? '0' + this.startH : this.startH
 					const _startM = this.startM< 10&&this.startM!== '00' ? '0' + this.startM : this.startM
-					//#endif
-					//#ifdef MP-WEIXIN
-					const _startH = this.startH< 10&&this.startH!== '00' ? '0' + this.startH : this.startH
-					const _startM = this.startM< 10&&this.startM!== '00' ? '0' + this.startM : this.startM
-					//#endif
 					this.startDate = this.time+'T'+_startH+':'+_startM
 					this.startDay = common.formatDate(this.time)+' '+_startH+':'+_startM
 					this.endDate = common.loadAugmentTime(this.duration_unit,this.startDate,this.startN+1)

locale/en.json

@@ -302,7 +302,7 @@
 	"一些样式及点击事件不支持": "Some styles and click events are not supported",
 	"气泡内容": "Bubble content",
 	"已驻车": "Parked",
-	"分钟": "Minutes",
+	"分钟": "M",
 	"更新于": "Updated",
 	"闪灯鸣笛": "Horn Boost",
 	"使用": "Use",
@@ -859,5 +859,7 @@
 	"购买时间":"Buy Time",
 	"￥": "$",
 	"当前电池存在未知型号，请联系门店处理！":"The current battery is of an unknown model. Please contact the store for assistance!",
-	"正在加载数据":"Loading"
+	"正在加载数据":"Loading",
+	"小时1":"Hour",
+	"分钟1":"Minute"
 }

locale/zh.json

@@ -859,5 +859,7 @@
 	"购买时间":"购买时间",
 	"￥": "￥",
 	"当前电池存在未知型号，请联系门店处理！":"当前电池存在未知型号，请联系门店处理！",
-	"正在加载数据":"正在加载数据"
+	"正在加载数据":"正在加载数据",
+	"小时1":"小时",
+	"分钟1":"分钟"
 }

mixin/index.js

@@ -24,7 +24,6 @@ export default {
 	 this.locationMiXin()
   },
    mounted(){
-	   console.log(this.isConnectBlueth,'isConnectBlueth');
 	   this.car_detail=uni.getStorageSync('car_info')
   	  this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight || 0
   },

pages/common/wxs/tools.sjs

@@ -1,3 +1,5 @@
+
+import i18n from '@/locale/index.js'
 var numToArray = function(num) {
 	var arr = [];
 	for (var i = 0; i < num; i++) {
@@ -21,9 +23,9 @@ var minuteToHour = function(minute) {
 	var remainMinute = minute - hour * 60
 	var minutehour = ""
 	if (hour != 0) {
-		minutehour = remainMinute != 0 ? (hour + "小时" + remainMinute + "分钟") : (hour + "小时")
+		minutehour = remainMinute != 0 ? (hour + i18n.t("小时") + remainMinute + i18n.t("分钟")) : (hour + i18n.t("小时"))
 	} else {
-		minutehour = remainMinute != 0 ? (remainMinute + "分钟") : (hour + "小时")
+		minutehour = remainMinute != 0 ? (remainMinute + "分钟") : (hour + i18n.t("小时"))
 	}
 	return minutehour
 	//return remainMinute !=0 ? (hour+"小时"+remainMinute+"分钟"):(hour+"小时")
@@ -68,7 +70,7 @@ var formatTimeDate = function(datetime) {
 	var hour = date.getHours()
 	var minute = date.getMinutes()
 	var second = date.getSeconds()
-	return formatNumber(month) + '月' + formatNumber(day) + '日 ' + formatNumber(hour) + ':' + formatNumber(minute);
+	return formatNumber(month) + i18n.t('月') + formatNumber(day) + i18n.t('日') + formatNumber(hour) + ':' + formatNumber(minute);
 }
 
 // 时间戳格式化 返回x-x x:x
@@ -143,7 +145,7 @@ var formatToday = function() {
 	var wday = date.getDay()
 	var weekday = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
 
-	return [formatNumber(month) + '月' + formatNumber(day) + '日', weekday[wday]];
+	return [formatNumber(month) + i18n.t('月') + formatNumber(day) + i18n.t('日'), weekday[wday]];
 }
 
 //格式化时间 12:00

pages/orderStatus/orderStatus.css

@@ -43,7 +43,7 @@
 
 .money-item > view:nth-of-type(1) {
 	color: #2A3A5A;
-	font-size: 52rpx;
+	font-size: 42rpx;
 	font-weight: bold;
 }
 
@@ -59,7 +59,7 @@
 	font-size: 28rpx;
 }
 
-.red-status {
+.time-money .money-item .red-status {
 	color: #F95151;
 }
 

pages/orderStatus/orderStatus.vue

@@ -36,11 +36,11 @@
 				<view v-if="orderInfo.order_type != 3" class="flex-row flex-between">
 					<view class="money-item">
 						<view :class="orderInfo.order_status == 4?'red-status':''">
-							<block v-if="orderInfo.hire_duration_time&&orderInfo.hire_duration_time>0">{{orderInfo.hire_duration_time}}</block>
+							<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.order_status == 3)?$t('租期剩余'):(orderInfo.order_status == 4 ? $t('逾期时长'):$t('租借周期'))}}·<text style="opacity: 0.4;">{{leaseUnits(orderInfo.hire_duration_unit)}}</text></view>
+						<view class="red-status">{{((orderInfo.order_status == 2) || orderInfo.order_status == 3)?$t('租期剩余'):(orderInfo.order_status == 4 ? $t('逾期时长'):$t('租借周期'))}}·<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">
 							{{ $t('租期剩余') }}·{{ $t('天') }}</view>
@@ -56,8 +56,8 @@
 
 					<view v-if="orderInfo.order_status == 4&&orderInfo.overdue_money!=0" class="money-item">
 						<view style="color:#F95151" class="red-status">
-							{{(orderInfo.money / 100).toFixed(2)}}
-							<!-- {{(orderInfo.overdue_money / 100).toFixed(2)}} -->
+							<!--{{(orderInfo.money / 100).toFixed(2)}} -->
+							{{(overdueData.money / 100).toFixed(2)}}
 						</view>
 						<view style="color:#F95151">{{ $t('逾期金额') }}·$</view>
 					</view>
@@ -375,8 +375,8 @@
 		},
 		data() {
 			return {
+				selectType:0,
 				overdueData: {},
-				select_type: '',
 				car_detail: {},
 				showCarPlan: false,
 				return_imgs: {},
@@ -458,6 +458,7 @@
 				})
 				if (data.code == 200) {
 					this.overdueData = data.data
+					console.log(this.overdueData)
 				} else {
 					common.simpleToast(data.msg)
 				}
@@ -490,6 +491,7 @@
 			},
 
 			changeSelectType(select_type, price) {
+				console.log('哈哈哈哈')
 				this.setData({
 					selectType: select_type,
 					price: (price / 100).toFixed(2)
@@ -669,7 +671,7 @@
 								// 	new Date()) / 1000 - me.orderInfo.hire_end_time))
 								me.orderInfo.hire_duration_time = common.formatTimeDifference(me.orderInfo
 									.hire_end_time * 1000)
-
+								console.log(me.orderInfo.hire_duration_time)
 							} else {
 								me.orderInfo.hire_duration_time = common.timestampToDays(Math.ceil(me.orderInfo
 									.hire_begin_time - me.orderInfo.hire_end_time))
@@ -819,6 +821,8 @@
 
 			bindRenew() {
 				this.params.overdueData = this.overdueData
+				this.selectType = this.orderInfo.hire_duration_unit
+				console.log(this.selectType)
 				this.showCarPlan = true
 				// this.isReturnHome = false
 				// let isRenew = true

pages/purchaseOrder/purchaseOrder.vue

@@ -322,7 +322,7 @@
 				uni.hideLoading();
 				if (data.code == 200) {
 					if (!data.data.need_pay) {
-						common.simpleToast(this.$t(this.$t('支付成功')));
+						common.simpleToast(this.$t('支付成功'));
 						this.order_sn = data.data.order_sn;
 						this.sub_sn = data.data.sub_sn;
 						this.setData({

pages/service/components/cabinetList/cabinetList.css

@@ -4,6 +4,10 @@
 	padding: 32rpx;
 	margin-bottom: 20rpx;
 }
+.cabinet-list-main.active {
+	border: 4rpx solid #0A59F7;
+	background: linear-gradient(180deg, #EEFDFF 0%, rgba(255, 255, 255, 0) 100%), #FFFFFF;
+}
 .cabinet-name{
 	font-weight: 600;
 	font-size: 36rpx;

pages/service/components/cabinetList/cabinetList.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="">
-		<view class="cabinet-list-main" v-if="item.dev_id" @tap="navDeatil(item)"  v-for="(item, index) in near_cabinet_list" :key="index">
+		<view :class='{"active" : activeMarkersId == item.dev_id}' class="cabinet-list-main" v-if="item.dev_id" @tap="navDeatil(item)"  v-for="(item, index) in near_cabinet_list" :key="index">
 			<view class="flex-row flex-between">
 				<view class="cabinet-name">{{item.cabinet_name}}</view>
 				<view class="cabinet-distance">{{item.distance}}m</view>
@@ -24,6 +24,10 @@
 			near_cabinet_list:{
 				type:Array,
 				defult:[]
+			},
+			activeMarkersId: {
+				type: Number,
+				defult: 0
 			}
 		},
 		data() {

pages/service/service.vue

@@ -72,7 +72,7 @@
 			</view>
 			<CarRentalList :isBuy='isBuy' :shopType='shopType' :activeMarkersId='activeMarkersId' v-if="selectType === 'store'" :near_store_list="nearCabinetList" />
 			
-			<CabinetList v-if="selectType === 'cabinet'" :near_cabinet_list="nearCabinetList" />
+			<CabinetList :activeMarkersId='activeMarkersId' v-if="selectType === 'cabinet'" :near_cabinet_list="nearCabinetList" />
 		</view>
 		<leaseType :isBuy='isBuy' :shopType='shopType' :showLeaseType="showLeaseType" :selectType="selectType" :modelTypeList="modelTypeList"
 			@closeSelectType="closeSelectType" @checkCabinetType="checkCabinetType" />
@@ -158,12 +158,22 @@
 				let index = 0
 				for (var i = 0; i < this.nearCabinetList.length; i++) {
 					var item = this.nearCabinetList[i];
-					if (item.id == e.id) {
-						index = i
-						break
+					if(this.type == 1){
+						if (item.id == e.id) {
+							index = i
+							break
+						}
+					}
+					if(this.type == 2){
+						if (item.dev_id == e.id) {
+							index = i
+							break
+						}
 					}
+					
 				}
 				this.nearCabinetList.unshift(this.nearCabinetList.splice(index, 1)[0])
+				this.$forceUpdate()
 			},
 			locationFn() {
 				let _this = this
@@ -270,6 +280,9 @@
 					// nearCabinetList = data.data.cabinetList || [];
 					for (let i = 0; i < data.data.cabinetList.length; i++) {
 						let item = data.data.cabinetList[i];
+						item.distance = common.formatDistance(common.getFlatternDistance(this.myLocation
+							.longitude, this
+							.myLocation.latitude, item.longitude, item.latitude))
 						if(this.cabinetType){
 							for (let i = 0; i < item.tag_code.length; i++) {
 								let items = item.tag_code[i];
@@ -288,12 +301,12 @@
 						return {
 							width: 56,
 							height: 56,
-							id: Number(item.id),
+							id: Number(item.dev_id),
 							longitude: item.longitude,
 							latitude: item.latitude,
 							iconPath: CABINET_ICON_URLS,
 							iconPathActive: CABINET_ICON_URLS,
-							content: item.tag_code.length
+							content: '233'
 						}
 					})
 					this.getLocationPostion(this.myLocation, markers);