杂项

pages.json

@@ -301,6 +301,14 @@
 			{
 				"navigationBarTitleText" : "换电记录"
 			}
+		},
+		{
+			"path" : "pages/moreInfo/moreInfo",
+			"style" : 
+			{
+				"navigationBarTitleText" : "",
+				"navigationStyle": "custom"
+			}
 		}
 		
 		

pages/carFunctionSet/unbind.vue

@@ -48,10 +48,16 @@
   </template>
   
   <script>
+  const common = require('@/common/common.js');
+  	import {
+		msg
+	} from '../../utils/util.js';
   import Confirm from '@/component/comPopup/Confirm'
   import ZxInput from '../loginRegister/components/ZxInput.vue'
   import { QINIU_URL } from '@/common/constant'
-  
+  var request = require('../../common/request');
+  const http = require('@/common/http.js');
+  const config = require('@/common/config.js');
   const ICONS = {
     carImg: `${QINIU_URL}Fr7v719WrP6TmCfGtvJd-nAHhiCj`
   }
@@ -63,11 +69,15 @@
     },
     data() {
       return {
+        car_sn: '',
         icons: ICONS,
         showConfirm: false,
         passwd: ''
       }
     },
+    onLoad() {
+			this.car_sn = uni.getStorageSync('car_info').car_sn
+		},
     methods: {
       unbindTap() {
         if (!this.passwd) {
@@ -75,8 +85,23 @@
         }
         this.showConfirm = true
       },
-      unbindSubmit() {
+      async unbindSubmit() {
         console.log('解除绑定', this.passwd)
+        let { data } = await request.postApi(config.API_FLK_CAR_UNBIND_CAR, {
+          car_sn: this.car_sn,
+          passwd: this.passwd
+        })
+        if (data.code == 200) {
+          //返回首页
+          common.simpleToast('解绑成功！')
+          setTimeout(()=> {
+            uni.switchTab({
+              url: `/pages/index/index`,
+            });
+          }, 900)
+        }else{
+          common.simpleToast(data.msg)
+        }
       }
     }
   }

pages/carList/carList.vue

@@ -14,10 +14,19 @@
 			<view @click="navCarDetail" class="btn btn-left">{{ $t('租赁设备') }}</view>
 			<view class="btn btn-right">{{ $t('绑定设备') }}</view>
 		</view>
+		<Confirm
+        v-model="showConfirm"
+        :dialog-info="{
+          text: $t('是否确定'),
+          showCancelButton: true
+        }"
+        @confirm="unbindSubmit"
+      />
 	</view>
 </template>
 
 <script>
+ import Confirm from '@/component/comPopup/Confirm'
 	var config = require('../../common/config.js');
 	var app = getApp();
 	var config = require('../../common/config.js');
@@ -25,11 +34,16 @@
 	var http = require('../../common/http.js');
 	var storage = require('../../common/storage.js');
 	export default {
+		components: {
+			Confirm,
+		},
 		data() {
 			return {
+				showConfirm: false,
 				carList:[],
 				car_sn:"",
-				car_info:{}
+				car_info:{},
+				clickItemData:{}
 			};
 		}
 		/**
@@ -48,8 +62,23 @@
 			},
 			clickItem(item){
 				if(item.car_sn == this.car_info.car_sn) return
-				uni.setStorageSync('car_info',item)
-				this.car_info = item
+				this.clickItemData = item
+				// console.log(item);
+				this.showConfirm = true
+				// uni.setStorageSync('car_info',item)
+				// this.car_info = item
+			},
+			unbindSubmit(){
+				console.log('unbindSubmit');
+				
+				uni.setStorageSync('car_info',this.clickItemData)
+				this.car_info = this.clickItemData
+				common.simpleToast('选择成功！')
+				setTimeout(()=> {
+					uni.switchTab({
+						url: `/pages/index/index`,
+					});
+				}, 900)
 			},
 			loadUserCarList(){
 				this.car_info = uni.getStorageSync('car_info') || {};

pages/index/index.vue

@@ -16,7 +16,7 @@
 				</view>
 				<view class="renew-btn">去续费</view>
 			</view> -->
-			<view class="car-img-view">
+			<view class="car-img-view"  @tap="toMoreInfoPage">
 				<view class="quantity-view flex-row">
 					<text class="quantity flex-row">88 <text style="font-size: 28rpx;font-weight: 500;">%</text></text>
 					<u-line-progress style="width: 100rpx;" active-color="#2ADA62" height="10" :show-percent="false" :percent="70"></u-line-progress>
@@ -28,7 +28,7 @@
 				<img src="https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX" style="width: 100%;height: 526rpx;" alt="">
 				<view class="flex-row align-center update-time-view" >
 					<text style="margin-right: 10rpx;">{{$t("车辆已关机")}} </text>
-					<text style="margin-right: 10rpx;">{{$t("更新于")}} {{car_info.heart_time}}11-25 23:05 </text>
+					<text style="margin-right: 10rpx;">{{$t("更新于")}} {{car_info.heart_time|| ''}}11-25 23:05 </text>
 					<img src="https://qiniu.bms16.com/FsL6XWGoIhfsVB7jRg6EGFVsuaTZ" style="width: 24rpx;height: 32rpx;" alt="">
 				</view>
 			</view>
@@ -207,7 +207,11 @@ import {
 					device_type: "ZXCar"
 				};
 			},
-			
+			toMoreInfoPage(){
+				uni.navigateTo({
+					url: '/pages/moreInfo/moreInfo',
+				});
+			},
 			navTravelingTrack(){
 				uni.navigateTo({
 					url: '/pages/travelingTrack/travelingTrack?longitude=' + this.longitude +'&latitude=' + this.latitude,

pages/message/deviceInfo.vue

@@ -1,12 +1,15 @@
 <template>
     <view class="zx-container deviceInfo-container">
+        <!-- <map style="width: 100%; height: 500px;" :latitude="latitude"
+			:longitude="longitude" :markers="markers" show-location>
+		</map> -->
         <view v-for="(item, index) in msgList" :key="index" class="list-item">
-            <view class="time">{{ item.time }}</view>
+            <view class="time">{{ item.ctime }}</view>
             <view class="msg-wrap">
                 <view class="map"></view>
                 <view class="msg-text">
                     <view class="title">{{ item.title }}</view>
-                    <view class="dtl-txt">{{ item.msg }}</view>
+                    <view class="dtl-txt">{{ item.overview }}</view>
                 </view>
             </view>
         </view>
@@ -16,13 +19,29 @@
 <script>
 const config = require('@/common/config.js');
 const http = require('@/common/http.js');
+var common = require('../../common/common.js');
 export default {
     data() {
         return {
+            // latitude: 23.090994,
+			// longitude: 113.314004,
+            // markers: [{
+            //     id: 1345,
+            //     latitude: 23.090994,
+            //     longitude: 113.314004,
+            //     iconPath: 'https://qiniu.bms16.com/Fim2CWvIaWVoqPwQsJbNn-fcS-Ku',
+            //     width: 30,
+            //     height: 30,
+            //     customCallout: {
+            //         anchorY: -45, // Y轴偏移量
+            //         anchorX: -100, // X轴偏移量
+            //         display: 'ALWAYS', // 'BYCLICK':点击显示; 'ALWAYS':常显
+            //     },
+            // }], // 标记点
             msgList: [
-                { time: '今天 13:14', title: '车辆推动报警', msg: '车辆正在被人推送，请及时查看' },
-                { time: '今天 13:14', title: '车辆推动报警', msg: '车辆正在被人推送，请及时查看' },
-                { time: '今天 13:14', title: '车辆推动报警', msg: '车辆正在被人推送，请及时查看' },
+                // { time: '今天 13:14', title: '车辆推动报警', overview: '车辆正在被人推送，请及时查看' },
+                // { time: '今天 13:14', title: '车辆推动报警', overview: '车辆正在被人推送，请及时查看' },
+                // { time: '今天 13:14', title: '车辆推动报警', overview: '车辆正在被人推送，请及时查看' },
             ]
         }
     },
@@ -33,7 +52,10 @@ export default {
         queryList(car_id) {
             http.postApi(config.API_MESSAGE_LIST, { car_id, msg_type: 'DEVICE' }, res => {
                 if (res.succeed) {
-                    console.log(111, res.body)
+                    this.msgList = res.body.data.list
+                    this.msgList.map(item => {
+                        item.ctime = common.formatTime(item.ctime)
+                    })
                 }
             })
         }

pages/message/index.vue

@@ -1,27 +1,28 @@
 <template>
     <view class="message-page">
-        <view class="device-msg-wrap base-wrap" @tap="toDeviceMsgPage">
+        <view class="device-msg-wrap base-wrap" v-for="(item, index) in deviceList" :key="index"  @tap="toDeviceMsgPage(item)">
             <view class="row">
                 <view class="title">
                     <view>{{ $t('设备消息') }}</view>
-                    <view class="bage">{{ deviceInfo.unread }}</view>
+                    <view class="bage">{{ item.unread }}</view>
                 </view>
-                <view class="time">{{deviceInfo.message_date}}</view>
+                <view class="time">{{item.message_date}}</view>
             </view>
             <view class="device-info">
-                <image class="img" :src="deviceInfo.image" />
+                <image class="img" :src="item.image" />
                 <view class="info">
-                    <view class="name">{{ deviceInfo.car_name }}</view>
-                    <view class="status">{{deviceInfo.message_overview}}</view>
+                    <view class="name">{{ item.car_name }}</view>
+                    <view class="status">{{item.message_overview}}</view>
                 </view>
             </view>
         </view>
+        
         <view class="sys-msg-wrap base-wrap">
             <view class="title">{{ $t('系统消息') }}</view>
             <view class="msg-item" v-for="(item, index) in sysMsgList" :key="index">
                 <view class="msg">
                     {{ item.title }}
-                    <view v-if="item.title" class="btn">绑定设备</view>
+                    <view v-if="item.type === 1" class="btn">绑定设备</view>
                 </view>
                 <view class="time">{{ item.ctime }}</view>
                 <view class="dtl">{{ item.overview }}</view>
@@ -39,6 +40,7 @@ export default {
         return {
             value: 10,
             sysMsgList: [],
+            deviceList: [],
             deviceInfo: {}
         }
     },
@@ -49,16 +51,16 @@ export default {
         // })
     },
     methods: {
-        toDeviceMsgPage() {
-            const { car_id } = this.deviceInfo
+        toDeviceMsgPage(itemData) {
+            const { car_id } = itemData
             uni.navigateTo({ url: `/pages/message/deviceInfo?car_id=${car_id}` })
         },
         queryDeviceMsg() {
             http.postApi(config.API_DEVICE_MSG, {}, res => {
                 if (res.succeed) {
-                    console.log(111, res.body)
-                    this.setData({
-                        deviceInfo: res.body.data[0]
+                    this.deviceList = res.body.data
+                    this.deviceList.map(item => {
+                        item.message_date = common.formatTime(item.message_date)
                     })
                 }
             })
@@ -66,10 +68,10 @@ export default {
         querySysMsgList() {
             http.postApi(config.API_MESSAGE_LIST, { msg_type: 'PLAT' }, res => {
                 if (res.succeed) {
-                    this.setData({
-                        sysMsgList: res.body.data.list
+                    this.sysMsgList= res.body.data.list
+                    this.sysMsgList.map(item => {
+                        item.ctime = common.formatTime(item.ctime)
                     })
-                    console.log(111, res.body)
                 }
             })
         }

pages/moreInfo/moreInfo.vue

@@ -0,0 +1,119 @@
+<template>
+	<view class="container-view">
+		<div :style="'padding-top:'+sumHeight+'px;height:0'"></div>
+		<img src="https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX" style="width: 100%;height: 526rpx;" alt="">
+		<view class="btnWrap">
+			<view class="btnClass" @tap="toDashboard">
+				<view class="margin_r">
+					<img src="https://qiniu.bms16.com/Fjx1qYpRoVX6dqg1sGqn1Lzn6Bpc" style="width: 80rpx;height: 80rpx;"
+						alt="">
+				</view>
+				<view class="text">
+					仪表盘
+				</view>
+				<img src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" style="width: 28rpx;height: 28rpx;"
+					alt="">
+			</view>
+			<view class="btnClass" @tap="toDeviceInfo">
+				<view class="margin_r">
+					<img src="https://qiniu.bms16.com/FpRgmuTWpd-QyPbl_yuavOM7NtVb" style="width: 80rpx;height: 80rpx;"
+						alt="">
+				</view>
+				<view class="text">
+					设备信息
+				</view>
+				<img src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" style="width: 28rpx;height: 28rpx;"
+					alt="">
+			</view>
+		</view>
+		<view class="imgWrpa" @tap="toBack">
+			<img src="https://qiniu.bms16.com/FpfRLdpO1VjkzytUI72T36V1_j9n" style="width: 112rpx;height: 112rpx;"
+				alt="">
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				statusBarHeight: 0,
+				navabarHeight: 0,
+				sumHeight:0
+			}
+		},
+		onLoad(){
+			const clientRect = uni.getMenuButtonBoundingClientRect()
+			const sysinfo = uni.getSystemInfoSync()
+			let GAP = 8
+			// #ifdef MP-ALIPAY
+			GAP = 0
+			// #endif
+			const navabarHeight = (clientRect.bottom - sysinfo.statusBarHeight) + (clientRect.top - sysinfo.statusBarHeight) + GAP
+			this.navabarHeight = navabarHeight
+			this.statusBarHeight = sysinfo.statusBarHeight
+			this.sumHeight = this.statusBarHeight+this.navabarHeight 
+		},
+		methods: {
+			toDashboard() {
+				uni.navigateTo({
+					url: '/pages/dashboard/dashboard'
+				})
+			},
+			toDeviceInfo() {
+				uni.navigateTo({
+					url: '/pages/deviceInfo/deviceInfo'
+				})
+			},
+			toBack(){
+				uni.navigateTo({
+					url: '/pages/index/index'
+				})
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container-view {
+		height: 100vh;
+		background-image: url('https://qiniu.bms16.com/Fj2y3PaoJrfoS5XOk9YACac7TNQQ');
+
+		.btnWrap {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+		}
+
+		.btnClass {
+			padding: 0 48rpx;
+			display: flex;
+			align-items: center;
+			width: 686rpx;
+			height: 176rpx;
+			background: #FFFFFF;
+			border-radius: 40rpx;
+			margin-bottom: 28rpx;
+			font-weight: 600;
+			font-size: 40rpx;
+			color: #060809;
+			font-style: normal;
+
+			.margin_r {
+				margin-right: 24rpx;
+			}
+
+			.text {
+				flex: 1;
+			}
+		}
+
+		.imgWrpa {
+			display: flex;
+			justify-content: center;
+			margin-top: 36rpx;
+		}
+	}
+</style>

pages/my/set.vue

@@ -10,11 +10,12 @@
         >
           <view class="title">{{ item.title }}</view>
           <view :class="['text-right', item.hideArrow && 'hide-arrow']">
-			  <input class="inp" @blur="inpfn" v-if="item.textProp == 'nickname'" v-model="userInfo[item.textProp]" type="text" />
-			  <block v-else>
-				  {{ userInfo[item.textProp] || '' }}
-			  </block>
-            
+            <view v-if="item.textProp == 'registrationTime'"> {{ formatTimestamp(userInfo.ctime) }}</view>
+            <input class="inp" @blur="inpfn" v-if="item.textProp == 'nickname'" v-model="userInfo[item.textProp]" type="text" />
+            <!-- <view v-if="item.textProp == 'registrationTime'"" class="title">{{ userInfo[item.textProp] }}1</view> -->
+            <block v-else>
+              {{ userInfo[item.textProp] || '' }}
+            </block>
           </view>
         </view>
       </view>
@@ -49,6 +50,10 @@
       user_token && this.loadUserInfo()
     },
     methods: {
+      formatTimestamp(timestamp) {
+        const date = new Date(timestamp * 1000);
+        return date.toLocaleDateString('zh-CN'); // 本地化格式（如：2021/5/3）
+      },
 		 inpfn(e){
 			console.log(e.detail.value)
 			this.editUserInfoFn()