Explorar o código

工单巡检,版面重构

dylan %!s(int64=2) %!d(string=hai) anos
pai
achega
98d05ca39a

+ 9 - 9
pages.json

@@ -744,27 +744,27 @@
 		"backgroundColor": "#F7F7F7"
 	},
 	"tabBar": {
-		"color": "#A6ABB5",
-		"selectedColor": "#0BB9C8",
+		"color": "#2B323C",
+		"selectedColor": "#075BD7",
 		"borderStyle": "white",
 		"backgroundColor": "#FFFFFF",
 		"list": [{
 				"pagePath": "pages/home/home",
-				"iconPath": "static/images/tabbar/home.png",
-				"selectedIconPath": "static/images/tabbar/home_selected.png",
+				"iconPath": "static/images/tabbar/icon_tab_shouye_def@2x.png",
+				"selectedIconPath": "static/images/tabbar/icon_tab_shouye_sel@2x.png",
 				"text": "首页"
 			},
 {
 				"pagePath": "pages/manage/manage",
-				"iconPath": "static/images/tabbar/home.png",
-				"selectedIconPath": "static/images/tabbar/home_selected.png",
+				"iconPath": "static/images/tabbar/icon_tab_fuwu_def@2x.png",
+				"selectedIconPath": "static/images/tabbar/icon_tab_fuwu_sel@2x.png",
 				"text": "服务"
 			},
 			{
 				"pagePath": "pages/user/center",
-				"iconPath": "static/images/tabbar/user.png",
-				"selectedIconPath": "static/images/tabbar/user_selected.png",
-				"text": "用户中心"
+				"iconPath": "static/images/tabbar/icon_tab_wode_def@2x.png",
+				"selectedIconPath": "static/images/tabbar/icon_tab_wode_sel@2x.png",
+				"text": "我的"
 			}
 		]
 	}

+ 183 - 47
pages/home/home.vue

@@ -8,7 +8,7 @@
 -->
 <template>
 	<view class="container">
-		<uni-nav-bar :fixed="true" backgroundColor="#f7f7f7" statusBar="false" height="75px">
+		<!-- 		<uni-nav-bar :fixed="true" backgroundColor="#f7f7f7" statusBar="false" height="75px">
 			<block slot="left">
 				<view class="view-flex-block-center">
 					<image src="/static/images/logo_start.png"
@@ -37,31 +37,95 @@
 					</uni-badge>
 				</view>
 			</block>
-		</uni-nav-bar>
-		<uni-card title="快捷操作" :is-shadow="false">
+		</uni-nav-bar> -->
+		<!-- 		<uni-card title="快捷操作" :is-shadow="false">
 			<view class="view-flex-inline">
-				<!-- 					<uni-icons class="input-uni-icon" type="phone" size="18" color="coral" /> -->
 				<text class="text-under-line" style="color: coral;font-size: 1rem;"
 					@click="toShortcutCreateOrder">发起工单</text>
 				<text class="text-under-line" style="color: coral;font-size: 1rem;margin-left: 40px;"
 					@click="toShortcutInspectionPlan">创建巡检保养计划</text>
 			</view>
-		</uni-card>
+		</uni-card> -->
+		<!-- 	<uni-group> -->
+		<swiper circular :indicator-dots="false" :autoplay="true" :interval="2000" :duration="500">
+			<swiper-item v-for="item in ads" :key="item.id" style="height: 200px;line-height: 300rpx;">
+				<image :src="toOss(item.url)" style="width: 100%;width: 100%;" mode="widthFix"></image>
+			</swiper-item>
+		</swiper>
+		<!-- </uni-group> -->
+
+		<uni-list>
+			<uni-list-item title="待办工单" showArrow :thumb="todoOrderImg" thumb-size="base" style="height: 80px;"  clickable
+							@click="toDo()">
+				<template v-slot:footer>
+					<view class="point" style="margin-right: 5px;">
+						<view class="dot">
+							{{todoOrderCount}}
+						</view>
+					</view>
+				</template>
+			</uni-list-item>
+			<uni-list-item title="待审批工单" showArrow :thumb="closeApproveOrderImg" thumb-size="base"
+				style="height: 80px;" clickable @click="toOrderCloseApprove()" >
+				<template v-slot:footer>
+					<view class="point" style="margin-right: 5px;">
+						<view class="dot">
+							{{closeApproveOrderCount}}
+						</view>
+					</view>
+				</template>
+			</uni-list-item>
+			<uni-list-item title="待巡检任务" showArrow :thumb="todoInspectionImg" thumb-size="base" style="height: 80px;" clickable
+							@click="toInspection()">
+				<template v-slot:footer>
+					<view class="point" style="margin-right: 5px;">
+						<view class="dot">
+							{{inspectionTodoNoticeCount}}
+						</view>
+					</view>
+				</template>
+			</uni-list-item>
+			<uni-list-item title="待审批巡检任务" showArrow :thumb="closeApproveInspectionImg" thumb-size="base"
+				style="height: 80px;" clickable @click="toInspectionCloseApprove()">
+				<template v-slot:footer>
+					<view class="point" style="margin-right: 5px;">
+						<view class="dot">
+							{{inspectionCloseApproveCount}}
+						</view>
+					</view>
+				</template>
+			</uni-list-item>
+		</uni-list>
 		<uni-group>
-			<swiper style="height: 100px;" circular :indicator-dots="false" :autoplay="true" :interval="2000"
-				:duration="500">
-				<swiper-item style="height: 200px;line-height: 300rpx;">
-					<image src="/static/images/order-ad.png" style="height: 100%;" mode="heightFix"></image>
-				</swiper-item>
-				<swiper-item style="height: 200px;line-height: 300rpx;">
-					<image src="/static/images/order-ad.png" style="height: 100%;" mode="heightFix"></image>
-				</swiper-item>
-				<swiper-item style="height: 200px;line-height: 300rpx;">
-					<image src="/static/images/order-ad.png" style="height: 100%;" mode="heightFix"></image>
-				</swiper-item>
-			</swiper>
+			<uni-row>
+				<uni-col :span="12">
+					<view style="padding-left: 20px;padding-right: 20px;">
+						<button type="primary" style="font-size: 0.8rem;background-color: rgb(31,121,253);" @click="toShortcutCreateOrder">
+							<view class="view-flex-inline-center">
+								<uni-icons type="plusempty" size="18" color="white" />
+								<span style="margin-left: 5px;">新建工单</span>
+							</view>
+						</button>
+					</view>
+				</uni-col>
+				<uni-col :span="12">
+					<view class="view-flex-inline-center" style="padding-left: 20px;padding-right: 20px;">
+						<button type="primary" style="font-size: 0.8rem;background-color: rgb(86,93,253);" @click="toShortcutInspectionPlan">
+							<view class="view-flex-inline-center">
+								<uni-icons type="plusempty" size="18" color="white" />
+								<span style="margin-left: 5px;">巡检保养计划</span>
+							</view>
+						</button>
+					</view>
+				</uni-col>
+			</uni-row>
 		</uni-group>
-		<uni-card title="待办工单" :thumbnail="checkLogo" :is-shadow="false">
+
+		<uni-group>
+
+		</uni-group>
+
+		<!-- 		<uni-card title="待办工单" :thumbnail="checkLogo" :is-shadow="false">
 			<uni-section title="新工单" type="circle">
 				<view v-if="unconfirmOrderCount>0">
 					<uni-list>
@@ -178,8 +242,8 @@
 					</view>
 				</view>
 			</uni-section>
-		</uni-card>
-		<uni-card title="巡检保养任务" :thumbnail="checkLogo" :is-shadow="false">
+		</uni-card> -->
+		<!-- 		<uni-card title="巡检保养任务" :thumbnail="checkLogo" :is-shadow="false">
 			<uni-section title="待巡检提醒" type="circle">
 				<view v-if="inspectionTodoNoticeCount>0">
 					<uni-list>
@@ -188,7 +252,7 @@
 							<template v-slot:body>
 								<view class="list-item-block">
 									<view class="line">
-										<!-- 	<uni-icons type="personadd" size="18" color="lightblue" /> -->
+										
 										<view class="text" style="width: 90%;color: gray;">
 											巡检标题: <span
 												style="margin-left: 5px;color: cornflowerblue;">{{item.inspectionTitle}}</span>
@@ -226,19 +290,6 @@
 												周期设置: <span style="margin-left: 5px;color: cornflowerblue;">按月</span>
 											</view>
 										</view>
-										<!-- 										<view class="line">
-											<view class="text" style="width: 90%;color: gray;">
-												巡检开始时间: <span
-													style="margin-left: 5px;color: cornflowerblue;">{{item.inspectionStartTime}}</span>
-											</view>
-										</view>
-										<view class="line">
-											<uni-icons type="help" size="18" color="lightblue" />
-											<view class="text text-ellipsis" style="width: 90%;color: gray;">
-												巡检结束时间: <span
-													style="margin-left: 5px;color: cornflowerblue;">{{item.inspectionEndTime}}</span>
-											</view>
-										</view> -->
 									</view>
 								</view>
 							</template>
@@ -291,7 +342,28 @@
 					</view>
 				</view>
 			</uni-section>
-		</uni-card>
+		</uni-card> -->
+		<view class="goods-carts" style="background-color: #f7f7f7;">
+			<uni-row>
+				<uni-col :span="4">
+					<view class="view-flex-inline-center" style="height: 70px;">
+						<image src="/static/images/user/touxiang@2x.png"
+							style="width: 60rpx;height: 60rpx;border-radius: 50%;" mode="widthFix">
+						</image>
+					</view>
+				</uni-col>
+				<uni-col :span="16">
+					<uni-list style="background-color: #f7f7f7;" :border="false">
+						<uni-list-item v-if="isLogin" :border="false" style="background-color: #f7f7f7;" showArrow
+							:title="userName" :note="userNote" :clickable="true" @click="onUserInfoClick()" />
+						<uni-list-item v-else :border="false" style="background-color: #f7f7f7;" showArrow title="登录/注册"
+							note="快速登录 注册体验更多功能" :clickable="true" @click="onLoginClick()" />
+					</uni-list>
+				</uni-col>
+				<uni-col :span="4">
+				</uni-col>
+			</uni-row>
+		</view>
 	</view>
 </template>
 
@@ -336,18 +408,21 @@
 				noticeValue: 0,
 				unconfirmOrderCount: 0,
 				unconfirmOrderList: [],
-				todoOrderCount: 0,
+				todoOrderCount: 1,
 				todoOrderList: [],
 				costsApproveOrderCount: 0,
 				costsApproveOrderList: [],
 				closeApproveOrderCount: 0,
 				closeApproveOrderList: [],
-				orderLogo: "/static/images/logo_pc.png",
-				checkLogo: "/static/images/home/inspection.png",
+				todoOrderImg: "/static/images/home/icon_sy_dbgd@2x.png",
+				closeApproveOrderImg: "/static/images/home/ico_sy_dspgd@2x.png",
+				todoInspectionImg: "/static/images/home/icon_sy_xjbyrw@2x.png",
+				closeApproveInspectionImg: "/static/images/home/icon_sy_dsprw@2x.png",
 				inspectionTodoNoticeCount: 0,
 				inspectionTodoNoticeList: [],
 				inspectionCloseApproveCount: 0,
 				inspectionCloseApproveList: [],
+				ads: [],
 			};
 		},
 		computed: {},
@@ -397,7 +472,9 @@
 				this.getTodoCloseOrderList();
 				this.getTodoInspectionList();
 				this.getInspectionCloseApproveList();
+
 			}
+			this.getAds();
 		},
 		onUnload() {
 			//this.timer = false;
@@ -449,7 +526,9 @@
 				this.getTodoCloseOrderList();
 				this.getTodoInspectionList();
 				this.getInspectionCloseApproveList();
+
 			}
+			this.getAds();
 		},
 		onHide() {
 			//this.timer = false;
@@ -484,11 +563,15 @@
 					url: url
 				})
 			},
-			toDo(item) {
-				var url = '/pages/check-order/orderprocessreport?orderId=' + item.id + '&skipPage=1';
+			toDo() {
 				uni.navigateTo({
-					url: url
+					url: '/pages/check-order/check-order-manage'
 				})
+				
+				// var url = '/pages/check-order/orderprocessreport?orderId=' + item.id + '&skipPage=1';
+				// uni.navigateTo({
+				// 	url: url
+				// })
 			},
 			toOrderProcess(item) {
 				var url = '/pages/check-order/orderprocessreport?skipPage=1&costsApprove=2&orderType=' + item.orderType +
@@ -504,12 +587,12 @@
 					url: url
 				})
 			},
-			toOrderCloseApprove(item) {
-				console.log("toOrderCloseApprove")
-				var url = '/pages/check-order/order-close-approve?orderType=' + item.orderType + '&orderId=' + item.id;
-				uni.navigateTo({
-					url: url
-				})
+			toOrderCloseApprove() {
+				// console.log("toOrderCloseApprove")
+				// var url = '/pages/check-order/order-close-approve?orderType=' + item.orderType + '&orderId=' + item.id;
+				// uni.navigateTo({
+				// 	url: url
+				// })
 			},
 			toShortcutCreateOrder() {
 				if (this.isLogin) {
@@ -560,6 +643,24 @@
 				//this.getTodoCostsApproveOrderList();
 				this.getTodoCloseOrderList();
 			},
+			getAds() {
+				let that = this;
+				let postData = {};
+				http.request({
+					url: '/galaxy-business/ads/manage/show/list',
+					method: 'GET',
+					data: postData,
+				}).then(res => {
+					console.log(JSON.stringify(res))
+					// that.unconfirmOrderCount = 0;
+					if (res.data != null) {
+						that.ads = res.data.length;
+						that.ads = res.data;
+					}
+				}).catch(err => {
+					console.log(JOSN.stringify(err))
+				})
+			},
 			getTodoOrderConfirmList() {
 				let that = this;
 				let postData = {};
@@ -904,4 +1005,39 @@
 			}
 		}
 	}
+
+	.point {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		// margin: 15rpx 0;
+	}
+
+	.dot {
+		//margin-left: -22rpx;
+		background-color: #19be6b;
+		box-shadow: 0 0 5rpx 5rpx #71d5a1;
+		color: white;
+		width: 40rpx;
+		height: 40rpx;
+		// padding: 5rpx;
+		font-size: 28rpx;
+		text-align: center;
+		border-radius: 40rpx;
+	}
+
+	.goods-carts {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		position: fixed;
+		left: 0;
+		right: 0;
+		/* #ifdef H5 */
+		left: var(--window-left);
+		right: var(--window-right);
+		/* #endif */
+		bottom: var(--window-bottom);
+	}
 </style>

BIN=BIN
static/images/home/ico_sy_dspgd@2x.png


BIN=BIN
static/images/home/icon_gengduo@2x.png


BIN=BIN
static/images/home/icon_sy_dbgd@2x.png


BIN=BIN
static/images/home/icon_sy_dsprw@2x.png


BIN=BIN
static/images/home/icon_sy_ls@2x.png


BIN=BIN
static/images/home/icon_sy_xjbyrw@2x.png


BIN=BIN
static/images/home/icon_sys@2x.png


BIN=BIN
static/images/home/icon_xinzeng@2x.png


BIN=BIN
static/images/tabbar/icon_tab_fuwu_def@2x.png


BIN=BIN
static/images/tabbar/icon_tab_fuwu_sel@2x.png


BIN=BIN
static/images/tabbar/icon_tab_shouye_def@2x.png


BIN=BIN
static/images/tabbar/icon_tab_shouye_sel@2x.png


BIN=BIN
static/images/tabbar/icon_tab_wode_def@2x.png


BIN=BIN
static/images/tabbar/icon_tab_wode_sel@2x.png


BIN=BIN
static/images/user/touxiang@2x.png