From f4bdb30cca36174bda0b0027cd4bb293ce248b61 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Tue, 15 Nov 2022 14:15:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=A0=E5=85=A5=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E5=B7=A5=E9=9E=A5=E5=91=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/config.js                             |  1 +
 main.js                                    |  2 +
 pages.json                                 |  9 +++
 pages/index/index.vue                      | 89 ++++++++++++++++------
 pages/inspection/inspectionTodayReport.vue | 22 ++++++
 5 files changed, 98 insertions(+), 25 deletions(-)
 create mode 100644 pages/inspection/inspectionTodayReport.vue

diff --git a/conf/config.js b/conf/config.js
index f0ea582..8fa5655 100644
--- a/conf/config.js
+++ b/conf/config.js
@@ -43,5 +43,6 @@ export default{
 	appPayKey:appPayKey,
 	commonBaseUrl: commonBaseUrl,
 	QQMapKey: QQMapKey,
+	imgUrl:commonBaseUrl,
 	systemName:systemName
 }
\ No newline at end of file
diff --git a/main.js b/main.js
index fe2c35e..bdaee0f 100644
--- a/main.js
+++ b/main.js
@@ -1,5 +1,6 @@
 import Vue from 'vue'
 import App from './App'
+import conf from './conf/config.js';
 import Java110Context from './lib/java110/Java110Context.js'
 import context from './lib/java110/context.js'
 import url from './constant/url.js'
@@ -25,6 +26,7 @@ Vue.prototype.url = url;
 Vue.prototype.factory = factory;
 Vue.prototype.util = util;
 Vue.prototype.date = date;
+Vue.prototype.imgUrl = conf.imgUrl;
 
 App.mpType = 'app'
 
diff --git a/pages.json b/pages.json
index dc9c6a1..3c6f304 100644
--- a/pages.json
+++ b/pages.json
@@ -542,6 +542,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/inspection/inspectionTodayReport",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 91c055b..82520a1 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="content">
 		<view class="margin-bottom-xs">
-			<uni-notice-bar :showIcon="true" :scrollable="true" :single="true" :speed="30"
-				:text="welcomeTitle"></uni-notice-bar>
+			<uni-notice-bar :showIcon="true" :scrollable="true" :single="true" :speed="30" :text="welcomeTitle">
+			</uni-notice-bar>
 		</view>
-		<scroll-view  class="scroll-restaurants-list" scroll-y="true" style="height:100%">
+		<scroll-view class="scroll-restaurants-list" scroll-y="true" style="height:100%">
 			<swiper class="categoryList padding-top-xs bg-white" indicator-dots="true"
 				indicator-color="rgba(228,228,228,1)" indicator-active-color="#FECA49">
 				<block v-for="(item, index) in categoryList" :key="index">
@@ -35,13 +35,13 @@
 			<view class="cu-bar bg-white solid-bottom margin-top">
 				<view class="action">
 					<view class="bock-icon "></view>
-					<text class="margin-left-xs">小区文化</text>
+					<text class="margin-left-xs">小区活动</text>
 				</view>
 				<view class="action" @tap="_moreActivity()">
 					<text class="lg text-gray cuIcon-more"></text>
 				</view>
 			</view>
-			<view class="noticesList">
+			<view class="noticesList" v-if="activitys && activitys.length>0">
 				<block v-for="(item,index) in activitys" :key="index" wx:key="index">
 
 					<view class="noticesList-list" @tap="_toDetail(item)">
@@ -60,6 +60,10 @@
 						</view>
 					</view>
 				</block>
+			</view>
+			<view class="active_empty" v-else>
+				<image :src="noImg" />
+				<text class="text">暂无活动哦~</text>
 			</view>
 		</scroll-view>
 	</view>
@@ -79,13 +83,17 @@
 	import {
 		getCommunity,
 		getCurrentCommunity
-	} from '../../api/community/community.js'
-	
-	import mapping from '../../constant/mapping.js'
-	
-	import {isNull} from '../../lib/java110/utils/StringUtil.js'
-	
-	import {getUserInfo} from '../../lib/java110/api/Java110SessionApi.js'
+	} from '../../api/community/community.js'
+
+	import mapping from '../../constant/mapping.js'
+
+	import {
+		isNull
+	} from '../../lib/java110/utils/StringUtil.js'
+
+	import {
+		getUserInfo
+	} from '../../lib/java110/api/Java110SessionApi.js'
 	import url from '../../constant/url.js';
 	import conf from '@/conf/config.js'
 	export default {
@@ -95,9 +103,16 @@
 				currentCommunityId: '',
 				currentCommunityName: '',
 				categoryList: [],
-				swiperList: [],
+				swiperList: [{
+						url: this.imgUrl + '/h5/images/serve/banner1.jpg'
+					},
+					{
+						url: this.imgUrl + '/h5/images/serve/banner2.jpg'
+					}
+				],
+				noImg:this.imgUrl+'/h5/images/serve/empty.png',
 				activitys: [],
-				welcomeTitle:''
+				welcomeTitle: ''
 			}
 		},
 		components: {
@@ -106,9 +121,9 @@
 		onLoad() {
 			this.welcomeTitle = conf.systemName + '欢迎您'
 			uni.setNavigationBarTitle({
-				title:conf.systemName
-			})
-			this.java110Context.onLoad();
+				title: conf.systemName
+			})
+			this.java110Context.onLoad();
 		},
 		onShow() {
 			let _that = this;
@@ -144,7 +159,9 @@
 					.then(function(res) {
 						if (res.statusCode == 200) {
 							let _advertPhotos = res.data;
-							_that.swiperList = _advertPhotos;
+							if (_advertPhotos && _advertPhotos.length > 0) {
+								_that.swiperList = _advertPhotos;
+							}
 							_that._loadActivitys();
 							return;
 						}
@@ -233,21 +250,21 @@
 				_that.currentCommunityName = currentCommunity.name;
 				_that._loadAd();
 			},
-			
-			_advertJump: function(ad){
+
+			_advertJump: function(ad) {
 				console.log(ad);
-				if(ad.advertType == 3 || !ad.pageUrl){
+				if (ad.advertType == 3 || !ad.pageUrl) {
 					return;
 				}
-				if(ad.advertType == 2){
+				if (ad.advertType == 2) {
 					// 站外
 					let url = encodeURIComponent(ad.pageUrl)
 					uni.navigateTo({
-						url:'/pages/hcWebView/hcWebView?url='+url
+						url: '/pages/hcWebView/hcWebView?url=' + url
 					})
 					return;
 				}
-				if(ad.advertType == 1){
+				if (ad.advertType == 1) {
 					// 站内
 					uni.navigateTo({
 						url: ad.pageUrl
@@ -259,8 +276,9 @@
 	}
 </script>
 
-<style>
+<style lang="scss">
 	@import "./index.css";
+
 
 	.swiper-height-index {
 		height: 240upx;
@@ -347,5 +365,26 @@
 
 	.tec-height {
 		height: 120upx;
+	}
+	
+	.active_empty {
+		background: #fff;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		padding: 100rpx 0;
+		border-radius: 10px;
+	
+		image {
+			width: 50%;
+			height: 200upx;
+		}
+	
+		.text {
+			font-size: 28rpx;
+			color: #333;
+			margin-top: 20rpx;
+		}
 	}
 </style>
diff --git a/pages/inspection/inspectionTodayReport.vue b/pages/inspection/inspectionTodayReport.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pages/inspection/inspectionTodayReport.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>