页面初始化

assets/img/tabbarImg/item1a.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" width="72" height="72" style="" filter="none">
+    
+    <g>
+    <path d="M12 24h-6.667v-10.667h6.667v10.667zM20 24h-6.667v-16h6.667v16zM28 24h-6.667v-21.333h6.667v21.333zM29.333 29.333h-25.333v-2.667h25.333v2.667z" fill="rgba(22,119,255,1)"></path>
+    </g>
+  </svg>

assets/img/tabbarImg/item1b.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" width="72" height="72" style="" filter="none">
+    
+    <g>
+    <path d="M12 24h-6.667v-10.667h6.667v10.667zM20 24h-6.667v-16h6.667v16zM28 24h-6.667v-21.333h6.667v21.333zM29.333 29.333h-25.333v-2.667h25.333v2.667z" fill="rgba(153,153,153,1)"></path>
+    </g>
+  </svg>

assets/img/tabbarImg/item2a.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" width="72" height="72" style="" filter="none">
+    
+    <g>
+    <path d="M4 4h10.667v10.667h-10.667v-10.667zM4 17.333h10.667v10.667h-10.667v-10.667zM17.333 4h10.667v10.667h-10.667v-10.667zM17.333 17.333h10.667v10.667h-10.667v-10.667z" fill="rgba(22,119,255,1)"></path>
+    </g>
+  </svg>

assets/img/tabbarImg/item2b.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" width="72" height="72" style="" filter="none">
+    
+    <g>
+    <path d="M4 4h10.667v10.667h-10.667v-10.667zM4 17.333h10.667v10.667h-10.667v-10.667zM17.333 4h10.667v10.667h-10.667v-10.667zM17.333 17.333h10.667v10.667h-10.667v-10.667z" fill="rgba(153,153,153,1)"></path>
+    </g>
+  </svg>

assets/img/tabbarImg/item3a.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" width="72" height="72" style="" filter="none">
+    
+    <g>
+    <path d="M16.552 6.667h11.448c0.736 0 1.333 0.597 1.333 1.333v0 18.667c0 0.736-0.597 1.333-1.333 1.333v0h-24c-0.736 0-1.333-0.597-1.333-1.333v0-21.333c0-0.736 0.597-1.333 1.333-1.333v0h9.885l2.667 2.667zM16 17.333c1.841 0 3.333-1.492 3.333-3.333s-1.492-3.333-3.333-3.333v0c-1.841 0-3.333 1.492-3.333 3.333s1.492 3.333 3.333 3.333v0zM10.667 24h10.667c0-2.946-2.388-5.333-5.333-5.333s-5.333 2.388-5.333 5.333v0z" fill="rgba(22,119,255,1)"></path>
+    </g>
+  </svg>

assets/img/tabbarImg/item3b.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" width="72" height="72" style="" filter="none">
+    
+    <g>
+    <path d="M16.552 6.667h11.448c0.736 0 1.333 0.597 1.333 1.333v0 18.667c0 0.736-0.597 1.333-1.333 1.333v0h-24c-0.736 0-1.333-0.597-1.333-1.333v0-21.333c0-0.736 0.597-1.333 1.333-1.333v0h9.885l2.667 2.667zM16 17.333c1.841 0 3.333-1.492 3.333-3.333s-1.492-3.333-3.333-3.333v0c-1.841 0-3.333 1.492-3.333 3.333s1.492 3.333 3.333 3.333v0zM10.667 24h10.667c0-2.946-2.388-5.333-5.333-5.333s-5.333 2.388-5.333 5.333v0z" fill="rgba(153,153,153,1)"></path>
+    </g>
+  </svg>

assets/img/tabbarImg/item4a.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" width="72" height="72" style="" filter="none">
+    
+    <g>
+    <path d="M26.667 29.333h-21.333v-2.667c0-3.682 2.985-6.667 6.667-6.667v0h8c3.682 0 6.667 2.985 6.667 6.667v0 2.667zM16 17.333c-4.418 0-8-3.582-8-8s3.582-8 8-8v0c4.418 0 8 3.582 8 8s-3.582 8-8 8v0z" fill="rgba(22,119,255,1)"></path>
+    </g>
+  </svg>

assets/img/tabbarImg/item4b.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" width="72" height="72" style="" filter="none">
+    
+    <g>
+    <path d="M26.667 29.333h-21.333v-2.667c0-3.682 2.985-6.667 6.667-6.667v0h8c3.682 0 6.667 2.985 6.667 6.667v0 2.667zM16 17.333c-4.418 0-8-3.582-8-8s3.582-8 8-8v0c4.418 0 8 3.582 8 8s-3.582 8-8 8v0z" fill="rgba(153,153,153,1)"></path>
+    </g>
+  </svg>

components/JPcontent.vue

@@ -0,0 +1,45 @@
+<template>
+	<view class="content"  >
+		<view v-if="status==0" style="display: flex;justify-content: center;margin: 40px 0;" >
+			
+			<view class="uni-toast" style="display: flex;font-size: 60rpx;    color: rgb(192, 196, 204);" >
+				<i class="uni-icon_toast uni-loading"
+			style="
+			    width: 80rpx;
+			    height: 80rpx;
+				
+			"
+			></i><p class="uni-toast__content">  </p>加载中...</view>
+		</view>
+		<view v-if="status==1">
+			<u-divider :isnone="true"  nonetext="无记录"
+				border-color="#fff"></u-divider>
+		</view>
+		<view v-if="status==2">
+			<slot ></slot>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+
+	export default {
+		name:"content",
+		props:{
+			status: {
+				type: Number,
+				default: 0
+			},
+		},
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style>
+
+</style>

components/Tabbar.vue

@@ -7,12 +7,16 @@
 </template>
 
 <script>
-	var img1=require('@/assets/img/tabbarImg/home-wifi-fill.svg')
-	var img2=require('@/assets/img/tabbarImg/home-wifi-fill2.svg')
-	var img3=require('@/assets/img/tabbarImg/chat-1-fill.svg')
-	var img4=require('@/assets/img/tabbarImg/chat-1-fill2.svg')
-	var img5=require('@/assets/img/tabbarImg/chat-smile-2-fill.svg')
-	var img6=require('@/assets/img/tabbarImg/chat-smile-2-fill2.svg')
+	var img1=require('@/assets/img/tabbarImg/item1a.svg')
+	var img2=require('@/assets/img/tabbarImg/item1b.svg')
+	var img3=require('@/assets/img/tabbarImg/item2a.svg') 
+	var img4=require('@/assets/img/tabbarImg/item2b.svg')
+	var img5=require('@/assets/img/tabbarImg/item3a.svg')
+	var img6=require('@/assets/img/tabbarImg/item3b.svg')
+	var img7=require('@/assets/img/tabbarImg/item4a.svg')
+	var img8=require('@/assets/img/tabbarImg/item4b.svg')
+	
+	
 	export default {
 		name: "Tabbar",
 		props: {
@@ -25,23 +29,30 @@
 				myCurrent: this.current,
 				tabbarList: [{
 
-						iconPath: img1,
-						selectedIconPath: img2,
+						iconPath: img2,
+						selectedIconPath: img1,
 						text: '主页 ',
 						pagePath2: "/pages/businessHall/index/index",
 					},
-					 
+					 {
+					 	iconPath: img4,
+					 	selectedIconPath: img3,
+					 	text: '应用',
+					 	pagePath2: "/pages/businessHall/message/message",
+					 	
+					 },
 					{
-						iconPath: img3,
-						selectedIconPath: img4,
-						text: '消息',
+						iconPath: img6,
+						selectedIconPath: img5,
+						text: '用户',
 						pagePath2: "/pages/businessHall/message/message",
 						
 					},
 					
 					{
-						iconPath: img5,
-						selectedIconPath: img6,
+						iconPath: img8,
+						selectedIconPath: img7,
+
 						text: '我的',
 						pagePath2: "/pages/businessHall/mine/mine",
 					}

components/bobo-router/index.js

@@ -31,10 +31,10 @@ uniCrazyRouter['on' + 'Error']((to, from) => {
 	
 })
 
-import Router from './bobo-router'
+//import Router from './bobo-router'
 import carhelp from '@/apis/utils/mixin.js'
 
-Vue.use(Router)
+//Vue.use(Router)
 
 // 路由配置 页面中全部使用this.$Router来操作路由，以实现路由的全局管理
 const router = new Router()

main.js

@@ -16,11 +16,11 @@ if (IS_ALI) {
 import mixin from './apis/utils/mixin.js'
  
 Vue.prototype.carhelp = mixin
- window.wx = {}
+ window.wx = {}
  import Vconsole from 'vconsole'
 //import uView from "uview-ui";
 import uView from '@/uni_modules/uview-ui'
-import router from '@/components/bobo-router'
+// import router from '@/components/bobo-router'
 
 Vue.use(uView);
 
@@ -43,13 +43,7 @@ Vue.mixin({
 		if(process.car.NODE_ENV=='dev'||process.car.NODE_ENV=='test'){
 			  ProjectName+='('+process.car.NODE_ENV+')';				 
 		}
-		// if(this.carhelp.getUnionPhone()){
-		// 	if (currentDomain === 'yjwg.hbjp.com.cn') {
-		// 	  // ProjectName="壹家物管服务大厅"
-			  
-		// 	}
-		// 	 ProjectName="壹家物管运管大厅"
-		// }
+		
 		uni.setNavigationBarTitle({
 		   		title:ProjectName
 		}) 
@@ -60,35 +54,7 @@ Vue.mixin({
 
 	},
 	methods: {
-		replaceLastTwoWords(str) {
-		
-		  
-		
-		
-		    return str;  
-		
-		},
-		 replaceLastTwoWords2(str) {  
-		
-		  
-		
-		    if (str.length >= 2 && str.indexOf('总表') !=-1) {  
-		
-		
-		        return str.replace('总表', '总电源');  
-		
-		    }  
-			if (str.length >= 2 && str.indexOf('电表') !=-1) {  
-					
-					
-			  return str.replace('电表', '电源');  
-					
-			}  
-		
-		
-		    return str;  
-		
-		},
+	
 		jpAmount(amount){
 			if(amount){
 				return amount.toFixed(2)

package.json

@@ -2,10 +2,10 @@
 	"dependencies": {
 		"compression-webpack-plugin": "^8.0.1",
 		"echarts": "^5.3.2",
-		"hls.js": "^0.14.11",
+
 		"npm": "^10.4.0",
 		"qrcodejs2": "0.0.2",
-		"uview-ui": "^1.8.4",
+
 		"vconsole": "^3.4.0",
 		"vue-cli": "^2.9.6",
 		"vue-cropper": "^0.5.6",
@@ -19,7 +19,7 @@
 		"babel-eslint": "^10.0.3",
 		"eslint": "^5.16.0",
 		"eslint-plugin-vue": "^5.0.0",
-		"node-sass": "^9.0.0",
+		"sass": "^1.85",
 		"sass-loader": "^11.0.1",
 		"uni-crazy-router": "0.0.31",
 		"vue-template-compiler": "^2.6.10"
@@ -64,4 +64,4 @@
 			}
 		}
 	}
-}
+}

pages.json

@@ -1,569 +1,40 @@
-{
-
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		{
-			"path": "pages/login/login",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/statistics/statistics",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		},
-		// {
-		// 	"path": "pages/workOrderManagement/workOrderManagement",
-		// 	"style": {
-		// 		"navigationBarTitleText": "",
-		// 		"enablePullDownRefresh": false
-		// 	}
-		// },
-		{
-			"path": "pages/mine/mine",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/abnormal/abnormalDeviceRanking",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/abnormal/abnormalAlarmRecord",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/abnormal/abnormalAlarmDetails",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/equipmentDataMonitoring/dataMonitoring-list",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/equipmentDataMonitoring/dataMonitoring-map",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/equipmentDataMonitoring/equipmentElectricity",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/equipmentDataMonitoring/electronicMonitoring",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/equipmentDataMonitoring/3PhaseCurrentDetails",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/equipmentDataMonitoring/electricityStatistics",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		},
-		
-		{
-			"path": "pages/equipmentDataMonitoring/electricityDetails",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/equipmentDataMonitoring/billingRules",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/mine/setting",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/mine/contactService",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/mine/cancelAccount",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/mine/changePassword",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/mine/changePhone",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/mine/findBackPassword",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		},
-		// {
-		// 	"path": "pages/workOrderManagement/workOrderMap",
-		// 	"style": {
-		// 		"navigationBarTitleText": "",
-		// 		"enablePullDownRefresh": false
-		// 	}
-		// },
-		// {
-		// 	"path": "pages/workOrderManagement/workOrderStatistics",
-		// 	"style": {
-		// 		"navigationBarTitleText": "",
-		// 		"enablePullDownRefresh": false
-		// 	}
-		// }
-
-      //   ,
-      
-        
-      //   {
-      //   	"path" : "pages/workOrderManagement/faultReport",
-      //   	"style" : 
-      //   	{
-        		
-      //   		"enablePullDownRefresh" : false
-      //   	}
-      //   },
-      //   {
-      //   	"path" : "pages/workOrderManagement/workOrderDetails",
-      //   	"style" : 
-      //   	{
-        		
-      //   		"enablePullDownRefresh" : false
-      //   	}
-      //   },
-        {
-        	"path" : "pages/mine/personInfos",
-        	"style" : 
-        	{
-        		
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/mine/filialeList",
-        	"style" : 
-        	{
-        		
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/mine/equipmentList",
-        	"style" : 
-        	{
-        		
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/mine/feedbackRecord",
-        	"style" : 
-        	{
-        		
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/mine/feedback",
-        	"style" : 
-        	{
-        		
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/mine/message",
-        	"style" : 
-        	{
-        		
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/equipmentDataMonitoring/chartYoY",
-        	"style" : 
-        	{
-        		
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/equipmentDataMonitoring/chartMoM",
-        	"style" : 
-        	{
-        		
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/mine/myApps",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/equipmentInformation/equipmentInformation",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/equipmentInformation/equipmentDetails",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/equipmentInformation/equipmentConditionMonitoring",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/equipmentDataMonitoring/electricityConsumptionDetail",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/tenantList/switchDetail",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/tenantList/electricityInformation",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/tenantList/tenantList",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-		{
-			"path" : "pages/tenantList/electricityInformation",
-			"style" : 
-			{
-				"navigationBarTitleText" : "",
-				"enablePullDownRefresh" : false
-			}
-		},
-        {
-        	"path" : "pages/tenantList/remoteControl",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/tenantList/operationLog",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/deductionRecord/deductionRecord",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/deductionRecord/deductionDetails",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/deductionRecord/billingRules",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/tenantList/contractList",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : ""
-        	}
-        },
-        {
-        	"path" : "pages/timing/timing",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-       
-        {
-        	"path" : "pages/timing/autoOff",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/tenantList/rechargeRecord",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : ""
-        	}
-        },
-        {
-        	"path" : "pages/tenantList/rechargeDetails",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : ""
-        	}
-        },
-        {
-        	"path" : "pages/tenantList/remindList",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : ""
-        	}
-        },
-        {
-        	"path" : "pages/managementList/managementList",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/managementList/authorizedQRCode",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/managementList/applyAuthorisation",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/managementList/applicantsList",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/platformRevenueStatistics/platformRevenueStatistics",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/platformRevenueStatistics/saveUtilityIncome",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/platformRevenueStatistics/electricityConsumptionAnalysis",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/abnormal/abnormalContrastDetails",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : ""
-        	}
-        },
-        {
-        	"path" : "pages/proxy/proxyList",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : ""
-        	}
-        },
-        {
-        	"path" : "pages/proxy/proxyInfo",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : ""
-        	}
-        },
-        {
-        	"path" : "pages/equipmentDataMonitoring/equipmentElectricityWater",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : ""
-        	}
-        },
-        {
-        	"path" : "pages/equipmentDataMonitoring/electronicMonitoringWater",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : ""
-        	}
-        },
-        {
-        	"path" : "pages/equipmentDataMonitoring/chartMoMwater",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : ""
-        	}
-        },
-        {
-        	"path" : "pages/equipmentDataMonitoring/chartYoYwater",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : ""
-        	}
-        },
-        {
-        	"path" : "pages/equipmentDataMonitoring/electricityStatisticsWater",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : ""
-        	}
-        },
-        {
-        	"path" : "pages/equipmentDataMonitoring/electricityDetailsWater",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : ""
-        	}
-        },
-        {
-        	"path" : "pages/platformRevenueStatistics/daypartingStatisticsWater",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : ""
-        	}
-        },
-        {
-        	"path" : "pages/tenantList/billReminder",
-        	"style" : {}
-        },
-        {
-        	"path" : "pages/tenantList/billPush",
-        	"style" : {}
-        },
-        {
-        	"path" : "pages/index/index",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : ""
-        	}
-        },
-        {
-        	"path" : "pages/index/homePage",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : ""
-        	}
-        }
-      
-       
-    ],
-
-
-	
-
-
-	"globalStyle": {
-		"navigationStyle": "custom", // 隐藏系统导航栏
-		"navigationBarTitleText": "e家能源",
-		"enablePullDownRefresh": false
-	},
-	"uniIdRouter": {}
+{
+
+	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+
+		{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
+
+
+		{
+			"path": "pages/index/homePage",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		}
+
+
+	],
+
+
+
+
+
+	"globalStyle": {
+		"navigationStyle": "custom", // 隐藏系统导航栏
+		"navigationBarTitleText": "e家能源",
+		"enablePullDownRefresh": false
+	},
+	"uniIdRouter": {}
 }

pages/index/homePage.vue

@@ -1,14 +1,73 @@
 <template>
 	<view>
+		<u-navbar v-show="false"
+		 title="首页" title-color="#101010"></u-navbar>
+		 
+		<view class="navbar" @click="goBack()">
+			智泊e家 运管端
+
+		</view>
+		<view class="tabs-box">
+			
+		</view>
+		<view class="main">
+			<view class="statistics">
+				<view class="title">
+					<view class="icon">
+						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
+					</view>
+					<view class="text">
+						设备监控度
+					</view>
+					<view class="check-all" @click="toEquipmentElectricity">
+						查看全部<u-icon name="arrow-right" size="24" color="#838383"></u-icon>
+					</view>
+				</view>
+				
+				<view class="content"  >
+					<jpContent :status="jpContentMap.body1">
+						123
+					</jpContent>
+				</view>
+			</view>
+			
+			<view class="statistics">
+				<view class="title">
+					<view class="icon">
+						<image class="img" src="@/assets/img/circleCopy1@1x.png" mode=""></image>
+					</view>
+					<view class="text">
+						在用场站
+					</view>
+				
+				</view>
+				
+				<view class="content"  >
+					<jpContent :status="jpContentMap.body1">
+						123
+					</jpContent>
+				</view>
+			</view>
+			
+		</view>
+		<tabbar :current="0"></tabbar>
 		
 	</view>
 </template>
 
 <script>
+	import Tabbar from '@/components/Tabbar.vue'
+	import jpContent from '@/components/JPcontent.vue'
+	
 	export default {
+		components: {
+			Tabbar,jpContent
+		},
 		data() {
 			return {
-				
+				jpContentMap:{
+					body1:2
+				}
 			}
 		},
 		methods: {
@@ -17,6 +76,107 @@
 	}
 </script>
 
-<style>
-
+<style scoped lang="scss">
+	// 导航栏
+	.navbar {
+		
+		
+		background-color: rgba(22, 119, 255, 1);
+		color: #fff;
+		line-height: 88rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 0 32rpx;
+		color: rgba(255, 255, 255, 1);
+		font-size: 36rpx;
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		z-index: 999999;
+		    font-weight: bold;
+		
+	}
+	.main {
+		border-radius: 16px 16px 0px 0px;
+		background: linear-gradient(180deg, rgba(242, 244, 246, 1) 61%, rgba(255, 255, 255, 0) 100%);
+		margin-top: -24rpx;
+		padding: 32rpx 32rpx 32rpx 20rpx;
+		.statistics {
+			border-radius: 8px;
+			background-color: rgba(255, 255, 255, 1);
+			box-shadow: 0px 1px 6px 0px rgba(0, 59, 142, 0.05);
+			margin-bottom: 24rpx;
+			padding: 40rpx;
+		
+			.title {
+				display: flex;
+				align-items: center;
+				margin-bottom: 16rpx;
+		
+				.img {
+					width: 36rpx;
+					height: 36rpx;
+					vertical-align: middle;
+					border-radius: 999px;
+		
+				}
+		
+				.change {
+					display: flex;
+					align-items: center;
+		
+					.change-img {
+						width: 32rpx;
+						height: 32rpx;
+						vertical-align: middle;
+					}
+		
+					text {
+		
+						margin-left: 8rpx;
+					}
+				}
+		
+		
+				.text {
+					color: rgba(16, 16, 16, 1);
+					font-size: 36rpx;
+					margin-left: 16rpx;
+					font-weight: bold;
+				}
+		
+				.change {
+					margin-left: 16rpx;
+					font-size: 24rpx;
+					color: #838383;
+		
+				}
+		
+				.check-all {
+					margin-left: auto;
+					color: rgba(131, 131, 131, 1);
+					font-size: 24rpx;
+				}
+			}
+		}
+	}
+	.tabs-box {
+		padding: 32rpx 0;
+		margin-top: 66rpx;
+		padding-right: 32rpx;
+		background-color: rgba(22, 119, 255, 1);
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	
+		.tabs {
+			width: 97%;
+		}
+		.more{
+			padding-right: 12rpx;
+		}
+	
+	}
 </style>