From e2dbf9af005b408ff208e3e8887eb17ce18740da Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Thu, 9 Mar 2023 04:35:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/service/service-property.vue | 19 +++++++++----
 pages.json                              |  9 ++++++
 pages/machine/chargeMachines.vue        | 38 +++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 6 deletions(-)
 create mode 100644 pages/machine/chargeMachines.vue

diff --git a/components/service/service-property.vue b/components/service/service-property.vue
index c80ebdd..32ca5d2 100644
--- a/components/service/service-property.vue
+++ b/components/service/service-property.vue
@@ -124,12 +124,7 @@
 						name: "投票问卷",
 						src: this.imgUrl + "/h5/images/serve/my2.png",
 						href: "/pages/questionAnswer/questionAnswer"
-					}, {
-						name: "返省上报",
-						src: this.imgUrl + "/h5/images/serve/my3.png",
-						href: "/pages/reportInfoBack/reportInfoBack",
-						needLogin: 'N'
-					},
+					}, 
 					{
 						name: '空置房申请',
 						src: this.imgUrl + '/h5/images/serve/my9.png',
@@ -155,6 +150,18 @@
 						src: this.imgUrl + '/h5/images/serve/order4.png',
 						href: '/pages/itemRelease/itemRelease'
 					},
+					{
+						name: '智能充电',
+						src: this.imgUrl + '/h5/images/serve/my3.png',
+						href: '/pages/machine/chargeMachines'
+					},
+					
+					// {
+					// 	name: "返省上报",
+					// 	src: this.imgUrl + "/h5/images/serve/my3.png",
+					// 	href: "/pages/reportInfoBack/reportInfoBack",
+					// 	needLogin: 'N'
+					// },
 					
 					// {
 					// 	name: '设备',
diff --git a/pages.json b/pages.json
index a47b3a3..0c8a521 100755
--- a/pages.json
+++ b/pages.json
@@ -757,6 +757,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/machine/chargeMachines",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "智能充电",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"tabBar": {
 		"color": "#272636",
diff --git a/pages/machine/chargeMachines.vue b/pages/machine/chargeMachines.vue
new file mode 100644
index 0000000..1377eba
--- /dev/null
+++ b/pages/machine/chargeMachines.vue
@@ -0,0 +1,38 @@
+<template>
+	<view>
+		<view>
+			<image :src="topImg" class="heard-location-icon"></image>
+		</view>
+		<view class="cu-list grid" :class="'col-2'">
+			<view class="cu-item" @click="showOpenDoor(item);"
+			v-for="(item,index) in machines" :key="index">
+				<view :class="['cuIcon-command','text-red']"></view>
+				<text>{{item.machineName}}</text>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				topImg:this.imgUrl+'/h5/images/chargeMachine.png'
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+	.heard-location-icon{
+	  width: 100%;
+	  height: 300rpx;
+	}
+	text {
+		text-align: center;
+	}
+</style>