Signed-off-by: zhaobao <528046418@qq.com>

api/aqpt/riskPointApi.js

@@ -7,7 +7,7 @@ export function getRiskPointByList(data) {
   return request({
     url: '/riskPoint',
     method: 'GET',
-    params: data
+    data
   })
 }
 
@@ -93,6 +93,28 @@ export function getRiskPointCounterByLevel(data) {
   return request({
     url: '/riskPoint/statis/getCounterByLevel',
     method: 'GET',
-    params: data
+   data
+  })
+}
+/**
+ * 管控单元统计
+ * @returns
+ */
+export function riskPointMyCountByLevel(data) {
+  return request({
+    url: '/riskPoint/statis/myCounterByLevel',
+    method: 'GET',
+    data
   })
 }
+/**
+ * 管控单元列表查询
+ * @returns
+ */
+export function getMyActiveRiskPointByList(data) {
+  return request({
+    url: '/riskPoint/my/active',
+    method: 'GET',
+    data
+  })
+}

config/index.js

@@ -1,6 +1,6 @@
 export default {
     base: {
-      dev: 'http://1.15.92.205:7001',		
+      dev: 'http://47.113.222.56:7001',		
 	  // pro: http://36.137.171.123:700,//合阳医院
       // pro: 'https://api.xazhyc.com',//合阳医院
 	  // pro: 'http://1.15.92.205:7001',	

pages/index/handle/task/hazardRecord/hazardRecord.vue

@@ -219,7 +219,7 @@ import {cancelCheckTask,completeCheckTask} from '@/api/aqpt/task.js'
 		padding: 20rpx;
 		min-height: 100vh;
 		box-sizing: border-box;
-		margin-bottom: 100rpx;
+		padding-bottom: 120rpx;
 		.page-head{
 			text-align: right;
 			padding-bottom: 10rpx;

pages/index/index.vue

@@ -2,23 +2,23 @@
 	<view class="index-page ">
 		<view class="header custom_status_bar">
 			<view class="status_bar">
-				 <div class="name">工作台</div>
-				 <div class="actions">
-					 <div class="message" @click="linkToMessage">
+				 <view class="name">工作台</view>
+				 <view class="actions">
+					 <view class="message" @click="linkToMessage">
 						 <image v-if="user.userAvatar" class="icon" src="/static/index/message.png" mode="widthFix"></image>
-					 </div>
-					 <div class="scan" @click="scanQrcode">
+					 </view>
+					 <view class="scan" @click="scanQrcode">
 						 <image class="icon" src="/static/index/scanner.png" mode="widthFix"></image>
 						 <text class="icon-name">扫一扫</text>
-					</div>
-				 </div>
+					</view>
+				 </view>
 			</view>		
 			<view class="user-info">
-				<div class="company">
+				<view class="company">
 					<text class="company-name">{{user.ocName}}</text>
 					<image class="icon" src="/static/index/company.png" mode="widthFix"></image>
-				</div>
-				<div class="user">
+				</view>
+				<view class="user">
 					<view class="avatar-box">
 						<image v-if="user.userAvatar" class="avatar" :src="user.userAvatar" mode="widthFix" @error="userAvatar=defaultAvatar"></image>
 						<image v-else class="avatar" :src="defaultAvatar" mode="widthFix"></image>
@@ -32,70 +32,85 @@
 							<span v-if="user.positionName">【{{user.positionName}}】</span>
 						</view>
 					</view>
-				</div>
+				</view>
 			</view>
 		</view>
 		<view class="container">
 			<view class="cont">
-				<div class="container-wrap">
-					<div class="notice">
-						<div class="notice-name">
+				<view class="container-wrap">
+					<view class="notice">
+						<view class="notice-name">
 							<image class="icon" src="/static/index/notice.png" mode="widthFix"></image>
 							<text>最近动态</text>
-						</div>
-						<div class="notice-cont" v-if="showNotice">
+						</view>
+						<view class="notice-cont" v-if="showNotice">
 							<uni-notice-bar
 								scrollable :text="notice" 
 								background-color="#fff0"
 								:speed="50"
 								ref="uni-notice-bar"							
 								color="#333" />
-						</div>
-					</div>
+						</view>
+					</view>
 					<view class="tab">
-						<div class="tab-item" @click="linkTo('task','待办任务')">
+						<view class="tab-item" @click="linkTo('task','待办任务')">
 							<image class="icon" src="/static/index/tab1.png" mode="widthFix"></image>
 							<view class="tab-name">待办任务</view>
 							<view class="number">{{taskTotal>99?'99+':taskTotal}}</view>
-						</div>
-						<div class="tab-item" @click="linkTo('alert','预警事件')">
+						</view>
+						<view class="tab-item" @click="linkTo('alert','预警事件')">
 							<image class="icon" src="/static/index/tab_alert.png" mode="widthFix"></image>
 							<view class="tab-name">预警提醒</view>
 							<view class="number">{{alertTotal>99?'99+':alertTotal}}</view>
-						</div>
-						<div class="tab-item" @click="linkTo('warn','告警事件')">
+						</view>
+						<view class="tab-item" @click="linkTo('warn','告警事件')">
 							<image class="icon" src="/static/index/tab2.png" mode="widthFix"></image>
 							<view class="tab-name">告警事件  </view>
 							<view class="number">{{warnTotal>99?'99+':warnTotal}}</view>
-						</div>
-						<div class="tab-item" @click="linkTo('danger','待处理隐患')">
+						</view>
+						<view class="tab-item" @click="linkTo('danger','待处理隐患')">
 							<image class="icon" src="/static/index/tab3.png" mode="widthFix"></image>
 							<view class="tab-name">待处理隐患</view>
 							<view class="number">{{dangerTotal>99?'99+':dangerTotal}}</view>
-						</div>
+						</view>
+					</view>
+					<view class="tabs-nav">
+						<view class="tabs-nav-item" @click="changeTabNav(1)" :class="tabsnavIdx===1?'active':''">待办事项</view>
+						<view class="tabs-nav-item" @click="changeTabNav(2)" :class="tabsnavIdx===2?'active':''">管控单元</view>							
 					</view>
-					<view class="tab-cont">
-						<div class="part" v-if="taskList.length>0">
-							<div class="head">
+					<view class="tab-cont" v-if="tabsnavIdx===1">
+						<view class="part" v-if="taskList.length>0">
+							<view class="head">
 								<text class="head-name">待办任务</text>
 								<view class="more" @click="linkTo('task','待办任务')">更多</view>
-							</div>
-							<div class="part-cont">
-								<div class="item" v-for="(item,taskIdx) in taskList" :key="item.taskId" @click="handle('task',item)">
-									<div class="index">{{taskIdx+1}}</div>										
-									<div class="title">
-										<div class="name">{{item.taskTitle}}</div>
+							</view>
+							<view class="part-cont">
+								<view class="item" v-for="(item,taskIdx) in taskList" :key="item.taskId" @click="handle('task',item)">
+									<view class="index">{{taskIdx+1}}</view>										
+									<view class="title">
+										<view class="name">{{item.taskTitle}}</view>
 										<view class="state">{{taskStatus(item.status)}}</view>
-									</div>
-									<div class="tags">
+									</view>
+									<view class="tags">
 										<text class="tag">{{taskPriority(item.taskPriority)}}</text>
 										<text class="tag">{{item.taskCatTitle}}</text>
 										<text class="tag">{{taskType(item.taskTypeId)}}</text>
-									</div>
-									<view class="time">
-										预期结束时间：{{item.expectedEndTime}}
 									</view>
-									<div class="bottom">
+<!-- 									<view class="countdowntime"  v-if="item.expectedEndTime">
+										<text class="name">预期结束时间：</text>
+										<uni-countdown :timestamp="getcountdownTime(item.expectedEndTime)" :font-size="12"  color="#FFFFFF" background-color="#007AFF" /> 										
+									</view> -->
+									<template v-if="item.expectedEndTime">
+										<view class="countdowntime"  v-if="getcountdownTime(item.expectedEndTime)">
+											<text class="name">预期结束时间：</text>
+											<uni-countdown :timestamp="getcountdownTime(item.expectedEndTime)" :font-size="12"  color="#FFFFFF" background-color="#007AFF" /> 										
+										</view>	
+										<view class="time" v-else>
+											预期结束时间：{{item.expectedEndTime}}
+											【逾期】
+										</view>																			
+									</template>
+									<view class="bottom">
 										<view class="user">
 											<image class="avatar" src="/static/index/user.png" mode="widthFix"></image>
 											处理人：{{item.handleAccountName}}
@@ -103,29 +118,26 @@
 										<view class="hand-time">
 											{{item.launchTime}}
 										</view>																
-									</div>
-								</div>
-							</div>
-						</div>
-						<div class="part" v-if="warnList.length>0">
-							<div class="head">
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="part" v-if="warnList.length>0">
+							<view class="head">
 								<text class="head-name">告警事件</text>
 								<view class="more" @click="linkTo('warn','告警事件')">更多</view>
-							</div>
-							<div class="part-cont">
-								<div class="item" v-for="(item,warnIdx) in warnList" :key="item.warnId" @click="handle('warn',item)">
-									<div class="index">{{warnIdx+1}}</div>											
-									<div class="title">
-										<div class="name">{{item.warnTitle}}</div>
+							</view>
+							<view class="part-cont">
+								<view class="item" v-for="(item,warnIdx) in warnList" :key="item.warnId" @click="handle('warn',item)">
+									<view class="index">{{warnIdx+1}}</view>											
+									<view class="title">
+										<view class="name">{{item.warnTitle}}</view>
 										<view class="state">{{alertStatus(item.status)}}</view>
-									</div>
-									<div class="tags">
+									</view>
+									<view class="tags">
 										<text class="tag">{{warningLevelFilter(item.warnLevel)}}</text>
-									</div>
-<!-- 									<view class="time">
-										发生时间：{{item.warnTime}}
-									</view> -->
-									<div class="bottom">
+									</view>
+									<view class="bottom">
 										<view class="user">
 											<image class="avatar" src="/static/index/user.png" mode="widthFix"></image>
 											处理人：{{item.handleAccountName}}
@@ -133,32 +145,29 @@
 										<view class="hand-time">
 											{{item.warnTime}}
 										</view>																
-									</div>
-<!-- 									<view class="desc" style="padding-top: 5px;">
-										{{item.warnDesc}}
-									</view> -->
-								</div>
-							</div>
-						</div>
-						<div class="part" v-if="alertList.length>0">
-							<div class="head">
+									</view>
+								</view>
+							</view>
+						</view>
+<!-- 						<view class="part" v-if="alertList.length>0">
+							<view class="head">
 								<text class="head-name">预警事件</text>
 								<view class="more" @click="linkTo('alert','预警事件')">更多</view>
-							</div>
-							<div class="part-cont">
-								<div class="item" v-for="(item,alertIdx) in alertList" :key="item.alertId">
-									<div class="index">{{alertIdx+1}}</div>				
-									<div class="title">
-										<div class="name">{{item.alertTitle}}</div>
+							</view>
+							<view class="part-cont">
+								<view class="item" v-for="(item,alertIdx) in alertList" :key="item.alertId">
+									<view class="index">{{alertIdx+1}}</view>				
+									<view class="title">
+										<view class="name">{{item.alertTitle}}</view>
 										<view class="state">{{alertStatus(item.status)}}</view>
-									</div>
-									<div class="tags">
+									</view>
+									<view class="tags">
 										<text class="tag">{{alertLevel(item.alertLevel)}}</text>
-									</div>
+									</view>
 									<view class="time">
 										发生时间：{{item.alertTime}}
 									</view>
-									<div class="bottom" v-if="item.handleAccountName">
+									<view class="bottom" v-if="item.handleAccountName">
 										<view class="user">
 											<image class="avatar" src="/static/index/user.png" mode="widthFix"></image>
 											处理人：{{item.handleAccountName}}
@@ -166,30 +175,37 @@
 										<view class="hand-time">
 											{{item.handleTime}}
 										</view>																
-									</div>
-								</div>
-							</div>
-						</div>
-						<div class="part" v-if="dangerList.length>0">
-							<div class="head">
+									</view>
+								</view>
+							</view>
+						</view> -->
+						<view class="part" v-if="dangerList.length>0">
+							<view class="head">
 								<text class="head-name">待处理隐患</text>
 								<view class="more" @click="linkTo('danger','待处理隐患')">更多</view>
-							</div>
-							<div class="part-cont">
-								<div class="item" v-for="(item,dangerIdx) in dangerList" :key="item.dangerId" @click="handle('danger',item)">
-									<div class="index">{{dangerIdx+1}}</div>
-									<div class="title">
-										<div class="name">{{item.dangerTitle}}</div>
+							</view>
+							<view class="part-cont">
+								<view class="item" v-for="(item,dangerIdx) in dangerList" :key="item.dangerId" @click="handle('danger',item)">
+									<view class="index">{{dangerIdx+1}}</view>
+									<view class="title">
+										<view class="name">{{item.dangerTitle}}</view>
 										<view class="state">{{dangerStatus(item.status)}}</view>
-									</div>
-									<div class="tags">
+									</view>
+									<view class="tags">
 										<text class="tag">{{dangerLevel(item.dangerLevel)}}</text>
 										<text class="tag">{{item.dangerCatTitle}}</text>
-									</div>
-									<view class="time">
-										预期结束时间：{{item.dangerDeadLine}}
 									</view>
-									<div class="bottom">
+									<template v-if="item.dangerDeadLine">
+										<view class="countdowntime"  v-if="getcountdownTime(item.dangerDeadLine)">
+											<text class="name">预期结束时间：</text>
+											<uni-countdown :timestamp="getcountdownTime(item.dangerDeadLine)" :font-size="12"  color="#FFFFFF" background-color="#007AFF" /> 										
+										</view>	
+										<view class="time" v-else>
+											预期结束时间：{{item.dangerDeadLine}}
+											【逾期】
+										</view>																			
+									</template>
+									<view class="bottom">
 										<view class="user">
 											<image class="avatar" src="/static/index/user.png" mode="widthFix"></image>
 											处理人：{{item.curAccountName}}
@@ -197,12 +213,73 @@
 										<view class="hand-time">
 											{{item.submitTime}}
 										</view>																
-									</div>
-								</div>
-							</div>
-						</div>
-					</view>										
-				</div>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>	
+					<view class="tab-cont" v-if="tabsnavIdx===2">
+						 <view class="statis-tabs">
+						 	<view class="statis-tab-item lv1">
+								<view class="number">{{myActiveRiskStatis.l1}}</view>									
+								<view class="name">1级风险点</view>
+								<view class="tag">
+									<view class="line"></view>
+									<view class="dot"></view>
+									<view class="dot"></view>
+								</view>						 		
+						 	</view>
+							<view class="statis-tab-item lv2">
+								<view class="number">{{myActiveRiskStatis.l2}}</view>									
+								<view class="name">2级风险点</view>
+								<view class="tag">
+									<view class="line"></view>
+									<view class="dot"></view>
+									<view class="dot"></view>
+								</view>						 		
+							</view>
+							<view class="statis-tab-item lv3">
+								<view class="number">{{myActiveRiskStatis.l3}}</view>									
+								<view class="name">3级风险点</view>
+								<view class="tag">
+									<view class="line"></view>
+									<view class="dot"></view>
+									<view class="dot"></view>
+								</view>						 		
+							</view>
+							<view class="statis-tab-item lv4">
+								<view class="number">{{myActiveRiskStatis.l4}}</view>									
+								<view class="name">4级风险点</view>
+								<view class="tag">
+									<view class="line"></view>
+									<view class="dot"></view>
+									<view class="dot"></view>
+								</view>						 		
+							</view>
+						 </view>
+						<view class="part">
+							<view class="part-cont">
+								<view class="item flex" v-for="(item,riskIdx) in myActiveRiskList" :key="'risk-'+riskIdx" @click="showRiskDetail(item)">									
+									<view class="item-icon">
+										<view class="index">{{riskIdx+1}}</view>
+										<image :src="item.riskPointIcon" class="item-icon-pic"></image>
+									</view>
+									<view class="item-info">
+										<view class="title">
+											<view class="name">{{item.riskPointTitle}}</view>
+											<view class="state">{{item.riskPointTypeTitle}}</view>
+										</view>
+										<view class="">{{item.groupName}}</view>
+										<view class="tags">
+											<text class="tag risk" :class="'l'+item.riskPointLevel">{{riskLevelFilter(item.riskPointLevel)}}</text>
+											<text class="tag">{{item.riskPointCatTitle}}</text>
+										</view>								
+									</view>
+								</view>
+							</view>							
+						</view>
+					</view>
+				</view>
 			</view>
 		</view>
 	</view>
@@ -215,6 +292,7 @@
 	import { getTaskByPage,getMyWaitingTaskTop } from '@/api/aqpt/taskApi.js';
 	import { getMyWarningWaitingTop } from '@/api/aqpt/warning.js';	
 	import { handleCheckTask } from '@/api/aqpt/checkTaskApi'
+	import {riskPointMyCountByLevel,getMyActiveRiskPointByList} from '@/api/aqpt/riskPointApi'
 	import{
 		taskStatus,taskPriority,taskType,
 		alertLevel,alertStatus,
@@ -227,6 +305,7 @@
 				defaultAvatar:"/static/components/avatar.png",
 				showNotice:false,
 				notice:"",
+				tabsnavIdx:1,
 				user:{
 					groupName: "",
 					ocName: "",
@@ -246,7 +325,14 @@
 				alertTotal:0,
 				dangerTotal:0,
 				taskTotal:0,
-				warnTotal:0
+				warnTotal:0,
+				myActiveRiskStatis:{
+					l1:0,
+					l2:0,
+					l3:0,
+					l4:0
+				},
+				myActiveRiskList:[]
 			}
 		},
 		// created() {
@@ -267,6 +353,10 @@
 			  const enums = { 1: 'Ⅰ级', 2: 'Ⅱ级', 3: 'Ⅲ级', 4: 'Ⅳ级' }
 			  return enums[val]
 			},
+			riskLevelFilter(val) {
+			  const enums = { 1: '重大', 2: '普通', 3: '一般', 4: '较小' }
+			  return enums[val]
+			},
 			scanQrcode(){
 				uni.scanCode({
 					onlyFromCamera: true,
@@ -310,11 +400,15 @@
 						this.$refs['uni-notice-bar'].initSize()
 					})
 				})
+				this.getMyWaitingTask();
+				this.getMyActiveRiskPoint()													
+			},
+			getMyWaitingTask(){
 				let params={
 					page: 1,
 					limit: 5,
 					status: 0,
-					handleAccountId: user.userId							
+					handleAccountId: this.user.userId							
 				}
 				getMyWarningWaitingTop(5).then((res)=>{
 					this.warnList=res.data
@@ -327,20 +421,32 @@
 				getDangerByPage({
 					page: 1,
 					limit: 5,
-					curAccountId: user.userId
+					curAccountId: this.user.userId
 				}).then((res)=>{
 					this.dangerList=res.data
 					this.dangerTotal=res.total
 				})
-				// getTaskByPage(params).then((res)=>{
-				// 	this.taskList=res.data
-				// 	this.taskTotal=res.total
-				// })	
 				getMyWaitingTaskTop(5).then((res)=>{
 					this.taskList=res.data
 					this.taskTotal=res.total
 				})				
 			},
+			getMyActiveRiskPoint(){
+				riskPointMyCountByLevel().then((res)=>{
+					this.myActiveRiskStatis=res.data
+				})
+				getMyActiveRiskPointByList().then((res)=>{
+					this.myActiveRiskList=res.data
+				})					
+			},
+			changeTabNav(tabsnavIdx){
+				this.tabsnavIdx=tabsnavIdx;
+				if(tabsnavIdx===1){
+					this.getMyWaitingTask();
+				}else{
+					this.getMyActiveRiskPoint()		
+				}
+			},
 			linkTo(type,name){
 				uni.navigateTo({
 					url:`/pages/index/detail/detail?type=${type}&name=${name}`
@@ -359,6 +465,12 @@
 					url
 				})				
 			},
+			showRiskDetail(item){				
+				let baseUrl=this.$h5
+				uni.navigateTo({
+					url:`/pages/webview/webview?href=${baseUrl}/riskPoint/views/detail.html?id=${item.riskPointId}&ocId=${item.riskPointId}&code=${item.riskPointId}&name=${item.riskPointTitle}`
+				})
+			},			
 			handTask(item){
 				handleCheckTask(item.taskId).then((res)=>{
 					const { checklistId, checklistTypeId } = res.data //recordId-taskId
@@ -377,6 +489,14 @@
 					}	
 	
 				})
+			},
+			getcountdownTime(time){
+				if(!time) return 0
+				if(parseInt(new Date(time).getTime() / 1000, 10)-parseInt(new Date().getTime() / 1000, 10)>0){
+					return parseInt(new Date(time).getTime() / 1000, 10)
+				}else{
+					return false
+				}
 			}
 		}
 	}
@@ -560,6 +680,32 @@
 						}
 					}
 				}
+				.tabs-nav{
+					display: flex;
+					border-radius: 16rpx 16rpx 0 0;
+					overflow: hidden;
+					position: relative;
+					.tabs-nav-item{
+						width: 50%;
+						text-align: center;
+						background-color: #fff;
+						padding: 16rpx 0;
+						transition: 0.3s;
+						&.active{
+							background-color:  #808EFF;
+							color: #fff;
+						}
+					}
+					&::after{
+						width: 1px;
+						height: 100%;
+						background-color: #7AB2FF;
+						content: "";
+						position: absolute;	
+						left: 50%;
+						top:0;
+					}
+				}
 				.tab-cont{				
 					.part{
 						.head{
@@ -621,13 +767,38 @@
 											color: rgba(234, 130, 89, 1);
 											background: rgba(251, 241, 237, 1);
 										}
+										&.risk{
+											color: #fff;
+											&.l1{
+												background-color: #FF3F3E;
+											}
+											&.l2{
+											   background-color: #FF7800;
+											}
+											&.l3{
+												background-color: #FFCC00;
+											}
+											&.l4{
+												background-color: #3095FD;
+											}										
+										}
 									}
 								}
 								.time{
-																	padding-top: 20rpx;
+									padding-top: 20rpx;
 									font-size: 28rpx;									
 									color:rgba(241, 57, 57, 0.8);
 								}
+								.countdowntime{
+									display: flex;
+									align-items: center;
+									padding-top: 20rpx;
+									padding-left: 20rpx;
+									.name{
+										padding-right: 10rpx;
+										font-size: 28rpx;
+									}
+								}
 								.bottom{
 									display: flex;
 									justify-content: space-between;
@@ -652,6 +823,100 @@
 						}
 					}
 				}
+				.statis-tabs{
+					display: flex;
+					justify-content: center;
+					align-items: center;	
+					.statis-tab-item{
+						width: 25%;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						flex-direction: column;
+						padding: 20rpx 0;
+						.number{
+							font-size: 36rpx;
+							font-weight: bold;
+						}
+						.name{
+							padding: 16rpx 0;
+							font-size: 28rpx;
+						}
+						.tag{
+							display: flex;
+							.line{
+								width: 60rpx;
+								height: 10rpx;
+								border-radius: 10px;
+								background-color: #0FC587;							
+							}
+							.dot{
+								width: 10rpx;
+								height: 10rpx;
+								border-radius: 50%;
+								background-color: #0FC587;
+								margin-left: 3px;							
+							}
+						}
+						&.lv1{
+							.tag{
+								.line,.dot{background-color: #FF3F3E;}
+							}
+						}
+						&.lv2{
+							.tag{
+								.line,.dot{background-color: #FF7800;}
+							}
+						}
+						&.lv3{
+							.tag{
+								.line,.dot{background-color: #FFCC00;}
+							}
+						}
+						&.lv4{
+							.tag{
+								.line,.dot{background-color: #3095FD;}
+							}
+						}
+					}									
+				}
+				.part{
+					.part-cont{
+						.item{
+							&.flex{
+								display: flex;	
+								padding-left: 20rpx;
+								.item-icon{
+									width: 100rpx;
+									height: 100rpx;
+									background-color: #ccc;
+									border-radius: 10rpx;
+									position: relative;
+									.item-icon-pic{
+										display: block;
+										width: 100rpx;
+										height: 100rpx;
+										border-radius: 10rpx;
+										box-sizing: border-box;
+										border: 1rpx solid #eaeaea;
+									}
+									.index{
+										position: absolute;
+										left: -10rpx;
+										top: -10rpx;
+										background-color: #808EFF;
+										color: #fff;
+										z-index: 999;
+									}								
+								}	
+								.item-info{
+									flex: 1;
+									padding-left: 20rpx;
+								}										
+							}
+						}
+					}					
+				}
 			}
 		}
 	}

unpackage/dist/dev/mp-weixin/app.json

@@ -15,7 +15,10 @@
     "pages/index/handle/task/checkList/form/form",
     "pages/index/handle/alert/alert",
     "pages/index/handle/warning/warning",
-    "pages/index/handle/task/checkList/form/transferCheckTask"
+    "pages/index/handle/task/checkList/form/transferCheckTask",
+    "pages/index/handle/task/hazardRecord/hazardRecord",
+    "pages/index/handle/task/hazardRecord/form",
+    "pages/index/handle/danger/index/submit"
   ],
   "subPackages": [],
   "window": {

unpackage/dist/dev/mp-weixin/common/main.js

@@ -14,14 +14,16 @@ var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/inte
 var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
 __webpack_require__(/*! uni-pages */ 26);
 var _App = _interopRequireDefault(__webpack_require__(/*! ./App */ 27));
+var _index = _interopRequireDefault(__webpack_require__(/*! @/config/index.js */ 33));
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
-__webpack_require__(/*! ./uni.promisify.adaptor */ 33);
+__webpack_require__(/*! ./uni.promisify.adaptor */ 34);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 _vue.default.config.productionTip = false;
 _App.default.mpType = 'app';
+_vue.default.prototype.$h5 = _index.default.minih5;
 var app = new _vue.default(_objectSpread({}, _App.default));
 createApp(app).$mount();
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/wx.js */ 1)["default"], __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["createApp"]))

unpackage/dist/dev/mp-weixin/pages/applicationCenter/applicationCenter.wxml

@@ -1 +1 @@
-<view class="app-page data-v-41633d92"><view class="handle-wrap data-v-41633d92"><view class="title data-v-41633d92">常用操作</view><view class="tabs data-v-41633d92"><block wx:for="{{quickList}}" wx:for-item="item" wx:for-index="quickIdx" wx:key="quickIdx"><view data-event-opts="{{[['tap',[['linkTo',['$0'],[[['quickList','',quickIdx]]]]]]]}}" class="tab-item data-v-41633d92" bindtap="__e"><view class="icon-box _div data-v-41633d92"><image class="icon data-v-41633d92" src="{{item.miniLogo}}" mode="widthFix"></image></view><view class="name data-v-41633d92">{{item.miniTitle}}</view></view></block></view></view><block wx:for="{{items}}" wx:for-item="appList" wx:for-index="appIdx" wx:key="appIdx"><view class="app-category data-v-41633d92"><view class="title data-v-41633d92">{{appList.miniCatTitle}}</view><view class="applist data-v-41633d92"><block wx:for="{{appList.miniList}}" wx:for-item="app" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['linkTo',['$0'],[[['items','',appIdx],['miniList','',index]]]]]]]}}" class="app data-v-41633d92" bindtap="__e"><image class="icon data-v-41633d92" src="{{app.miniLogo}}"></image><view class="info data-v-41633d92"><view class="app-title data-v-41633d92">{{app.miniTitle}}</view><block wx:if="{{app.miniDesc}}"><view class="tag data-v-41633d92">{{app.miniDesc}}</view></block></view></view></block></view></view></block></view>
+<view class="app-page data-v-41633d92"><view class="handle-wrap data-v-41633d92"><view class="title data-v-41633d92">快捷操作</view><view class="tabs data-v-41633d92"><block wx:for="{{quickList}}" wx:for-item="item" wx:for-index="quickIdx" wx:key="quickIdx"><view data-event-opts="{{[['tap',[['linkTo',['$0'],[[['quickList','',quickIdx]]]]]]]}}" class="tab-item data-v-41633d92" bindtap="__e"><view class="icon-box _div data-v-41633d92"><image class="icon data-v-41633d92" src="{{item.miniLogo}}" mode="widthFix"></image></view><view class="name data-v-41633d92">{{item.miniTitle}}</view></view></block></view></view><block wx:for="{{items}}" wx:for-item="appList" wx:for-index="appIdx" wx:key="appIdx"><view class="app-category data-v-41633d92"><view class="title data-v-41633d92">{{appList.miniCatTitle}}</view><view class="applist data-v-41633d92"><block wx:for="{{appList.miniList}}" wx:for-item="app" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['linkTo',['$0'],[[['items','',appIdx],['miniList','',index]]]]]]]}}" class="app data-v-41633d92" bindtap="__e"><image class="icon data-v-41633d92" src="{{app.miniLogo}}"></image><view class="info data-v-41633d92"><view class="app-title data-v-41633d92">{{app.miniTitle}}</view><block wx:if="{{app.miniDesc}}"><view class="tag data-v-41633d92">{{app.miniDesc}}</view></block></view></view></block></view></view></block></view>

unpackage/dist/dev/mp-weixin/pages/history/history.js

@@ -225,10 +225,10 @@ var _default = {
         _this2.total = res.total;
       });
     },
-    showDetail: function showDetail() {
-      var baseUrl = "http://h5.xazhyc.com";
+    showDetail: function showDetail(item) {
+      var baseUrl = this.$h5;
       uni.navigateTo({
-        url: "/pages/webview/webview?href=".concat(baseUrl, "/art/views/detail.html&artId=473700&name=\u901A\u8BAF\u5F55")
+        url: "/pages/webview/webview?href=".concat(baseUrl, "/art/views/detail.html&artId=").concat(item.artId, "&name=").concat(item.artCatTitle)
       });
     }
   },

unpackage/dist/dev/mp-weixin/pages/index/detail/detail.js

@@ -364,6 +364,10 @@ var _enum = __webpack_require__(/*! @/libs/enum.js */ 63);
 //
 //
 //
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -474,8 +478,10 @@ var _default = {
     handle: function handle(type, item) {
       var url = "";
       if (type === 'danger') {
-        if (item.curAccountId !== this.user.userId) return;
-        url = "/pages/index/handle/danger/index/index?type=".concat(type, "&id=").concat(item.dangerId);
+        uni.navigateTo({
+          url: "/pages/webview/webview?href=".concat(this.$h5, "/danger/views/detail.html&dangerId=").concat(item.dangerId, "&name=\u9690\u60A3\u5904\u7406")
+        });
+        return;
       }
       if (type === 'task') {
         this.handTask(item);
@@ -498,13 +504,22 @@ var _default = {
         var _res$data = res.data,
           checklistId = _res$data.checklistId,
           checklistTypeId = _res$data.checklistTypeId; //recordId-taskId
-        // if (checklistTypeId === 1) {// HazardRecordView											  
-        // } else if (checklistTypeId === 2) {// PointRecordView											  
-        // } else if (checklistTypeId === 3) {// ScoreRecordView											  
-        // }
-        uni.navigateTo({
-          url: "/pages/index/handle/task/task?rid=".concat(item.taskId, "&cid=").concat(checklistId)
-        });
+        if (checklistTypeId === 1) {
+          // HazardRecordView
+          uni.navigateTo({
+            url: "/pages/index/handle/task/hazardRecord/hazardRecord?rid=".concat(item.taskId, "&cid=").concat(checklistId, "&title=").concat(item.taskTitle)
+          });
+        } else if (checklistTypeId === 2) {
+          // PointRecordView
+          uni.navigateTo({
+            url: "/pages/index/handle/task/task?rid=".concat(item.taskId, "&cid=").concat(checklistId, "&title=").concat(item.taskTitle)
+          });
+        } else if (checklistTypeId === 3) {
+          // ScoreRecordView	
+          uni.navigateTo({
+            url: "/pages/index/handle/task/task?rid=".concat(item.taskId, "&cid=").concat(checklistId, "&title=").concat(item.taskTitle)
+          });
+        }
       });
     },
     onPullDownRefresh: function onPullDownRefresh() {

unpackage/dist/dev/mp-weixin/pages/index/detail/detail.wxss

@@ -109,6 +109,14 @@
   font-size: 28rpx;
   color: rgba(241, 57, 57, 0.8);
 }
+.index-detail-page .container .tab-cont .part .part-cont .item .supervise.data-v-ce12fd2e {
+  font-size: 24rpx;
+  color: black;
+  padding: 10rpx 0;
+}
+.index-detail-page .container .tab-cont .part .part-cont .item .supervise .supervise-item.data-v-ce12fd2e {
+  padding-right: 10rpx;
+}
 .index-detail-page .container .tab-cont .part .part-cont .item .bottom.data-v-ce12fd2e {
   display: flex;
   justify-content: space-between;

unpackage/dist/dev/mp-weixin/pages/index/handle/danger/index/index.js

@@ -101,31 +101,31 @@ var components
 try {
   components = {
     uniCollapse: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse/uni-collapse */ "uni_modules/uni-collapse/components/uni-collapse/uni-collapse").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue */ 252))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse/uni-collapse */ "uni_modules/uni-collapse/components/uni-collapse/uni-collapse").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue */ 280))
     },
     uniCollapseItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item */ "uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue */ 259))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item */ "uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue */ 287))
     },
     uniListItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list-item/uni-list-item */ "uni_modules/uni-list/components/uni-list-item/uni-list-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue */ 214))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list-item/uni-list-item */ "uni_modules/uni-list/components/uni-list-item/uni-list-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue */ 242))
     },
     uniSection: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-section/components/uni-section/uni-section */ "uni_modules/uni-section/components/uni-section/uni-section").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-section/components/uni-section/uni-section.vue */ 266))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-section/components/uni-section/uni-section */ "uni_modules/uni-section/components/uni-section/uni-section").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-section/components/uni-section/uni-section.vue */ 294))
     },
     uniForms: function () {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 273))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 301))
     },
     uniFormsItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 286))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 314))
     },
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 185))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 213))
     },
     uniDataSelect: function () {
-      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 293))
+      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 321))
     },
     uniFilePicker: function () {
-      return Promise.all(/*! import() | uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue */ 305))
+      return Promise.all(/*! import() | uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue */ 333))
     },
   }
 } catch (e) {
@@ -200,12 +200,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 44));
-var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 46));
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 45));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 47));
 var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
 var _dangerApi = __webpack_require__(/*! @/api/aqpt/dangerApi.js */ 59);
 var _wfApi = __webpack_require__(/*! @/api/system/wfApi.js */ 139);
-var _user = __webpack_require__(/*! @/api/system/user.js */ 42);
+var _user = __webpack_require__(/*! @/api/system/user.js */ 43);
 var _groupApi = __webpack_require__(/*! @/api/system/groupApi.js */ 140);
 var _dangerApi2 = __webpack_require__(/*! @/api/system/dangerApi.js */ 141);
 var _upload = __webpack_require__(/*! @/api/system/upload.js */ 82);

unpackage/dist/dev/mp-weixin/pages/index/handle/danger/index/submit.json

@@ -0,0 +1,13 @@
+{
+  "navigationBarTitleText": "登记隐患",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
+    "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
+    "uni-data-select": "/uni_modules/uni-data-select/components/uni-data-select/uni-data-select",
+    "uni-datetime-picker": "/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker",
+    "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
+    "uni-file-picker": "/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker"
+  }
+}

unpackage/dist/dev/mp-weixin/pages/index/handle/danger/index/submit.wxss

@@ -0,0 +1,90 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.danger-form.data-v-491c2f60 {
+  padding: 20rpx 20rpx 160rpx 20rpx;
+  margin-bottom: 120rpx;
+}
+.danger-form .attach-wrap.data-v-491c2f60 {
+  display: flex;
+  flex-wrap: wrap;
+}
+.danger-form .attach-wrap .attach.data-v-491c2f60 {
+  display: block;
+  width: 100rpx;
+  height: 100rpx;
+  margin: 10rpx;
+  border: 1px solid #ccc;
+}
+.danger-form .form-container.data-v-491c2f60 {
+  padding: 10rpx;
+  margin-top: 20rpx;
+}
+.danger-form .submit_bt.data-v-491c2f60 {
+  width: 600rpx;
+  height: 72rpx;
+  line-height: 72rpx;
+  box-sizing: border-box;
+  border-radius: 16rpx;
+  margin-top: 50rpx;
+  background-color: #3384FF;
+  font-size: 32rpx;
+  color: #fff;
+}
+.danger-form .button-container.data-v-491c2f60 {
+  width: 750rpx;
+  height: 88rpx;
+  line-height: 88rpx;
+  color: #4D73FF;
+  text-align: center;
+  font-size: 32rpx;
+  padding-bottom: 68rpx;
+  background-color: #fff;
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  z-index: 2;
+  box-shadow: 0px 0px 12px 0px #0000000A;
+  border-radius: 8px 8px 0px 0px;
+}
+.danger-form.data-v-491c2f60  .uni-forms-item .uni-forms-item__content .uni-data-checkbox-wrap {
+  height: 100%;
+  display: flex;
+  align-items: center;
+}
+.danger-form.data-v-491c2f60  .uni-forms-item .uni-forms-item__content .uni-data-checkbox-wrap .action {
+  padding: 22rpx 32rpx;
+  background-color: #fff;
+  border-radius: 2px;
+  margin-right: 20rpx;
+  font-size: 28rpx;
+  line-height: 1;
+}
+.danger-form.data-v-491c2f60  .uni-forms-item .uni-forms-item__content .uni-data-checkbox-wrap .action.active {
+  background: rgba(77, 115, 255, 0.16);
+  color: #4D73FF;
+}
+

unpackage/dist/dev/mp-weixin/pages/index/handle/task/checkList/form/form.js

@@ -101,22 +101,22 @@ var components
 try {
   components = {
     uniSection: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-section/components/uni-section/uni-section */ "uni_modules/uni-section/components/uni-section/uni-section").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-section/components/uni-section/uni-section.vue */ 266))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-section/components/uni-section/uni-section */ "uni_modules/uni-section/components/uni-section/uni-section").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-section/components/uni-section/uni-section.vue */ 294))
     },
     uniForms: function () {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 273))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 301))
     },
     uniFormsItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 286))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 314))
     },
     uniDataCheckbox: function () {
-      return Promise.all(/*! import() | uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue */ 314))
+      return Promise.all(/*! import() | uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue */ 342))
     },
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 185))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 213))
     },
     uniFilePicker: function () {
-      return Promise.all(/*! import() | uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue */ 305))
+      return Promise.all(/*! import() | uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue */ 333))
     },
   }
 } catch (e) {
@@ -180,10 +180,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 44));
-var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 46));
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 45));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 47));
 var _upload = __webpack_require__(/*! @/api/system/upload.js */ 82);
 var _checklistPoint = __webpack_require__(/*! @/api/aqpt/checklistPoint.js */ 150);
+var _task = __webpack_require__(/*! @/api/aqpt/task.js */ 151);
 //
 //
 //
@@ -252,7 +253,7 @@ var _default = {
           if (itemList[i].children) {
             itemList[i].children.map(function (child) {
               child.recordList.map(function (pointitem) {
-                points.push(point);
+                points.push(pointitem);
               });
             });
           } else {
@@ -280,7 +281,7 @@ var _default = {
     onSubmit: function onSubmit() {
       var _this2 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var point, attachList, i, filePath, fileresq;
+        var point, attachList, i, filePath, fileresq, idx;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -341,19 +342,12 @@ var _default = {
                   });
                 });
               case 18:
-                // uni.showToast({
-                // 	icon:'none',
-                // 	title:"提交成功！",
-                // 	duration:1000,					
-                // 	complete() {
-                // 		uni.redirectTo({
-                // 			url:`/pages/app_views/checkList/index/index?type=form&id=${point.checklistId}&recordId=${point.recordId}`
-                // 		})
-                // 	}
-                // })
-                // this.goOnNext();	
+                idx = _this2.itemList.findIndex(function (item) {
+                  return item.pointId === point.pointId;
+                });
+                _this2.itemList[idx].checkResult = _this2.formData.checkResult;
                 _this2.batchHandle();
-              case 19:
+              case 21:
               case "end":
                 return _context.stop();
             }
@@ -365,16 +359,41 @@ var _default = {
     batchHandle: function batchHandle() {
       var point = uni.getStorageSync('point');
       if (this.handles.length < 1) {
-        uni.showToast({
-          icon: 'none',
-          title: "处理完毕",
-          duration: 1000,
-          complete: function complete() {
-            uni.redirectTo({
-              url: "/pages/app_views/checkList/index/index?type=form&id=".concat(point.checklistId, "&recordId=").concat(point.recordId)
-            });
-          }
+        var key = this.itemList.find(function (item) {
+          return item.checkResult === -1;
         });
+        if (!key) {
+          (0, _task.completeCheckTask)(point.recordId).then(function () {
+            uni.showToast({
+              icon: 'none',
+              title: "处理完毕",
+              duration: 1000,
+              complete: function complete() {
+                uni.redirectTo({
+                  url: "/pages/index/detail/detail?type=task&name=\u5F85\u529E\u4EFB\u52A1"
+                });
+              }
+            });
+          }).catch(function () {
+            uni.showToast({
+              icon: "none",
+              title: "操作失败"
+            });
+          });
+        } else {
+          var cid = point.checklistId;
+          var rid = point.recordId;
+          uni.showToast({
+            icon: 'none',
+            title: "处理完毕",
+            duration: 1000,
+            complete: function complete() {
+              uni.redirectTo({
+                url: "/pages/index/handle/task/hazardRecord/hazardRecord?rid=".concat(rid, "&cid=").concat(cid, "&title=").concat(measure.hazardTitle)
+              });
+            }
+          });
+        }
         return;
       }
       var nextPoint = this.handles[0];
@@ -387,39 +406,6 @@ var _default = {
       uni.setStorageSync('point', nextPoint);
       this.point = nextPoint;
     },
-    // 批量处理未处理的【按顺序走到最后一个】
-    goOnNext: function goOnNext() {
-      var point = uni.getStorageSync('point');
-      var pointIdex = this.itemList.findIndex(function (item) {
-        return point.pointId === item.pointId;
-      });
-      var handles = this.itemList.slice(pointIdex + 1);
-      var nextPointIdx = handles.findIndex(function (item) {
-        return !item.checkResult;
-      });
-      nextPointIdx = nextPointIdx + pointIdex;
-      if (handles.length < 1 || nextPointIdx < 0) {
-        uni.showToast({
-          icon: 'none',
-          title: "处理完毕",
-          duration: 1000,
-          complete: function complete() {
-            uni.redirectTo({
-              url: "/pages/app_views/checkList/index/index?type=form&id=".concat(point.checklistId, "&recordId=").concat(point.recordId)
-            });
-          }
-        });
-        return;
-      }
-      this.formData = {
-        checkResult: 1,
-        remark: "",
-        attachList: []
-      };
-      var nextPoint = this.itemList[nextPointIdx + 1];
-      uni.setStorageSync('point', nextPoint); //防止测试刷新数据丢失
-      this.point = nextPoint;
-    },
     uploadSuccess: function uploadSuccess(e) {
       var attachList = JSON.parse(JSON.stringify(this.formData.attachList));
       attachList.push(e.tempFiles[0]);

unpackage/dist/dev/mp-weixin/pages/index/handle/task/checkList/form/transferCheckTask.js

@@ -101,19 +101,19 @@ var components
 try {
   components = {
     uniSection: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-section/components/uni-section/uni-section */ "uni_modules/uni-section/components/uni-section/uni-section").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-section/components/uni-section/uni-section.vue */ 266))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-section/components/uni-section/uni-section */ "uni_modules/uni-section/components/uni-section/uni-section").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-section/components/uni-section/uni-section.vue */ 294))
     },
     uniForms: function () {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 273))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 301))
     },
     uniFormsItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 286))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 314))
     },
     uniDataSelect: function () {
-      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 293))
+      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 321))
     },
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 185))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 213))
     },
   }
 } catch (e) {
@@ -177,11 +177,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 44));
-var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 46));
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 45));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 47));
 var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
 var _task = __webpack_require__(/*! @/api/aqpt/task.js */ 151);
-var _user = __webpack_require__(/*! @/api/system/user.js */ 42);
+var _user = __webpack_require__(/*! @/api/system/user.js */ 43);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var _default = {

unpackage/dist/dev/mp-weixin/pages/index/handle/task/hazardRecord/form.json

@@ -0,0 +1,12 @@
+{
+  "navigationBarTitleText": "处理检查",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
+    "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
+    "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
+    "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox",
+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
+    "uni-file-picker": "/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker"
+  }
+}

unpackage/dist/dev/mp-weixin/pages/index/handle/task/hazardRecord/form.wxss

@@ -0,0 +1,50 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.wrap.data-v-38565eb2 {
+  padding: 20rpx;
+  padding-bottom: 200rpx;
+}
+.wrap .submit-BT.data-v-38565eb2 {
+  width: 750rpx;
+  color: #4D73FF;
+  text-align: center;
+  font-size: 32rpx;
+  padding-bottom: 68rpx;
+  background-color: #fff;
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  z-index: 99;
+  box-shadow: 0px 0px 12px 0px #0000000A;
+  border-radius: 8px 8px 0px 0px;
+}
+.wrap.data-v-38565eb2  .uni-forms-item .uni-forms-item__content .uni-data-checkbox-wrap {
+  height: 100%;
+  display: flex;
+  align-items: center;
+}
+

unpackage/dist/dev/mp-weixin/pages/index/handle/task/hazardRecord/hazardRecord.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "处理任务",
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/pages/index/handle/task/hazardRecord/hazardRecord.wxss

@@ -0,0 +1,171 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.page.data-v-249f2734 {
+  background-color: #F5F6F8;
+  padding: 20rpx;
+  min-height: 100vh;
+  box-sizing: border-box;
+  padding-bottom: 120rpx;
+}
+.page .page-head.data-v-249f2734 {
+  text-align: right;
+  padding-bottom: 10rpx;
+}
+.page .page-head .handle.data-v-249f2734 {
+  display: inline-block;
+  background-color: #3384FF;
+  color: #fff;
+  padding: 10rpx 15rpx;
+  box-sizing: border-box;
+  border-right: 1rpx solid #eaeaea;
+  font-size: 30rpx;
+  text-align: center;
+}
+.page .page-head .handle.data-v-249f2734:nth-child(4) {
+  border: 0;
+}
+.wrap.data-v-249f2734 {
+  padding: 20rpx;
+  background-color: #fff;
+}
+.wrap .checklist .title.data-v-249f2734 {
+  color: #222222;
+  font-size: 32rpx;
+  height: 98rpx;
+  line-height: 98rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  border-bottom: 1px dashed #E8E8E8;
+}
+.wrap .checklist .more.data-v-249f2734 {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPBAMAAADJ+Ih5AAAAHlBMVEXX2d3X2d3////r7O7c3uH6+vvh4+b19vf19fbh4uWMQW21AAAAAXRSTlPfVooXIwAAAC5JREFUCNdjYBQEAwYGQQgQwM9wNjZ2BDMklNQhIiJBIVA1kxKhDDG4LgIMuO0An5UJ21TrLr8AAAAASUVORK5CYII=);
+  background-size: 30rpx 30rpx;
+  padding-left: 40rpx;
+  background-position: center left;
+  background-repeat: no-repeat;
+}
+.wrap .checklist .item-cont.data-v-249f2734 {
+  padding-left: 20rpx;
+  border-bottom: 1px dashed #E8E8E8;
+}
+.wrap .checklist .item-cont .checklistItem .itemTitle.data-v-249f2734 {
+  color: #222222;
+  font-size: 32rpx;
+  height: 98rpx;
+  line-height: 98rpx;
+}
+.wrap .checklist .item-cont .point-cont.data-v-249f2734 {
+  padding-left: 30rpx;
+}
+.wrap .checklist .item-cont .point-cont .point.data-v-249f2734 {
+  display: flex;
+  color: #666;
+  font-size: 28rpx;
+}
+.wrap .checklist .item-cont .point-cont .point .pointContent.data-v-249f2734 {
+  flex: 1;
+}
+.wrap .checklist .item-cont .point-cont .point .status .text.data-v-249f2734 {
+  color: #3384FF;
+  font-weight: 800;
+}
+.wrap .handle-container.data-v-249f2734 {
+  position: fixed;
+  width: 100%;
+  left: 0;
+  bottom: 0;
+  background-color: #fff;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-top: 1rpx solid #eaeaea;
+  padding: 15rpx 0;
+}
+.wrap .handle-container .handle.data-v-249f2734 {
+  display: inline-block;
+  color: #222;
+  padding: 15rpx 20rpx;
+  box-sizing: border-box;
+  border: 1rpx solid #eaeaea;
+  font-size: 26rpx;
+  text-align: center;
+  border-radius: 50rpx;
+  margin: 0 10rpx;
+}
+.wrap .handle-container .handle.danger.data-v-249f2734 {
+  background-color: #FA5B41;
+  color: #fff;
+}
+.wrap .handle-container .handle.submit.data-v-249f2734 {
+  background-color: #3384FF;
+  color: #fff;
+  padding: 18rpx 38rpx;
+}
+.wrap .handle-container .more.data-v-249f2734 {
+  position: relative;
+  padding: 15rpx 20rpx;
+}
+.wrap .handle-container .more .list.data-v-249f2734 {
+  position: absolute;
+  bottom: 100rpx;
+  right: 0;
+  box-shadow: 0px 2px 12px 0px #0000001F;
+  padding: 0 20rpx;
+  background-color: #fff;
+}
+.wrap .handle-container .more .list .hand-item-box.data-v-249f2734 {
+  position: relative;
+}
+.wrap .handle-container .more .list .hand-item-box.show.data-v-249f2734 {
+  display: block;
+}
+.wrap .handle-container .more .list .hand-item-box.data-v-249f2734::after {
+  width: 0;
+  height: 0;
+  content: "";
+  display: block;
+  border-width: 26rpx 26rpx 0 0;
+  border-color: #fff transparent;
+  border-style: solid;
+  position: absolute;
+  bottom: -20rpx;
+  right: -20rpx;
+}
+.wrap .handle-container .more .list .hand-item-box .handle-item.data-v-249f2734 {
+  width: 180rpx;
+  height: 50rpx;
+  font-size: 26rpx;
+  line-height: 50rpx;
+  background-color: #fff;
+  text-align: center;
+  border-bottom: 1px solid #ccc;
+  padding: 10rpx 0;
+}
+.wrap .handle-container .more .list .hand-item-box .handle-item.data-v-249f2734:last-child {
+  border: 0;
+}
+

unpackage/dist/dev/mp-weixin/pages/index/handle/task/task.js

@@ -225,6 +225,14 @@ var _task = __webpack_require__(/*! @/api/aqpt/task.js */ 151);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -233,6 +241,8 @@ var _default = {
         children: 'children',
         label: 'itemTitle'
       },
+      danger_bt_state: false,
+      submit_bt_state: false,
       accountInfo: {},
       divider: false,
       edit: true,
@@ -242,7 +252,8 @@ var _default = {
       handleVisiable: false,
       type: undefined,
       status: undefined,
-      taskTitle: ""
+      taskTitle: "",
+      showMore: false
     };
   },
   onLoad: function onLoad(_ref) {
@@ -260,9 +271,32 @@ var _default = {
     getchecklistRecord: function getchecklistRecord(checklistId, recordId) {
       var _this = this;
       (0, _checklistPoint.getchecklistRecord)(checklistId, recordId).then(function (res) {
+        if (!res.data.itemList) return;
         _this.itemList = res.data.itemList;
         _this.status = res.data.status;
         _this.handleVisiable = (res.data.status === 0 || res.data.status === 1) && res.data.accountId === _this.accountInfo.userId;
+        var items = [];
+        for (var i = 0; i < itemList.length; i++) {
+          if (itemList[i].children) {
+            itemList[i].children.map(function (child) {
+              child.recordList.map(function (pointitem) {
+                items.push(point);
+              });
+            });
+          } else {
+            itemList[i].recordList.map(function (pointitem) {
+              items.push(pointitem);
+            });
+          }
+        }
+        var index = items.findIndex(function (item) {
+          return item.checkResult === -1;
+        });
+        var _index = items.findIndex(function (item) {
+          return item.checkResult === 0;
+        });
+        _this.submit_bt_state = _index < 0;
+        _this.danger_bt_state = index > -1 ? true : false;
       });
     },
     check: function check(point) {
@@ -276,6 +310,7 @@ var _default = {
       var _this2 = this;
       var recordId = this.recordId;
       var checklistId = this.checklistId;
+      var self = this;
       if (type === 1) {
         (0, _checklistPoint.checklistBatchUpdate)(recordId, 1).then(function () {
           _this2.getchecklistRecord(checklistId, recordId);
@@ -288,16 +323,21 @@ var _default = {
       }
       if (type === 3) {
         //完成
-        (0, _task.completeCheckTask)(recordId).then(function () {
-          uni.switchTab({
-            url: '/pages/index/index'
-          });
-        }).catch(function () {
-          uni.showToast({
-            icon: "none",
-            title: "操作失败"
+        if (this.danger_bt_state) {
+          uni.showModal({
+            title: '提示',
+            content: '本次检查有未通过项，是否需要登记隐患？',
+            success: function success(res) {
+              if (res.confirm) {
+                self.submitDanger(recordId);
+              } else if (res.cancel) {
+                self.completeTask(recordId);
+              }
+            }
           });
-        });
+        } else {
+          this.completeTask(recordId);
+        }
       }
       if (type === 4) {
         //放弃
@@ -319,6 +359,35 @@ var _default = {
           url: "/pages/index/handle/task/checkList/form/transferCheckTask?tid=".concat(recordId, "&title=").concat(taskTitle)
         });
       }
+      if (type === "danger") {
+        this.submitDanger(recordId);
+      }
+    },
+    completeTask: function completeTask(recordId) {
+      (0, _task.completeCheckTask)(recordId).then(function () {
+        uni.reLaunch({
+          url: '/pages/index/index'
+        });
+      }).catch(function () {
+        uni.reLaunch({
+          url: "/pages/webview/webview?href=".concat(href, "&name=").concat(name)
+        });
+        uni.showToast({
+          icon: "none",
+          title: "操作失败"
+        });
+      });
+    },
+    submitDanger: function submitDanger(recordId) {
+      var href = "".concat(this.$h5, "/danger/views/create.html");
+      var name = '登记隐患';
+      uni.reLaunch({
+        url: "/pages/webview/webview?href=".concat(href, "&name=").concat(name)
+      });
+      (0, _task.completeCheckTask)(recordId);
+    },
+    hover: function hover(state) {
+      this.showMore = state === 1;
     }
   }
 };

unpackage/dist/dev/mp-weixin/pages/index/handle/task/task.wxss

@@ -91,6 +91,10 @@
 .wrap .checklist .item-cont .point-cont .point .pointContent.data-v-4f4a597e {
   flex: 1;
 }
+.wrap .checklist .item-cont .point-cont .point .status .text.data-v-4f4a597e {
+  color: #3384FF;
+  font-weight: 800;
+}
 .wrap .handle-container.data-v-4f4a597e {
   position: fixed;
   width: 100%;
@@ -101,19 +105,72 @@
   justify-content: center;
   align-items: center;
   border-top: 1rpx solid #eaeaea;
+  padding: 15rpx 0;
 }
 .wrap .handle-container .handle.data-v-4f4a597e {
-  display: block;
+  display: inline-block;
+  color: #222;
+  padding: 15rpx 20rpx;
+  box-sizing: border-box;
+  border: 1rpx solid #eaeaea;
+  font-size: 26rpx;
+  text-align: center;
+  border-radius: 50rpx;
+  margin: 0 10rpx;
+}
+.wrap .handle-container .handle.danger.data-v-4f4a597e {
+  background-color: #FA5B41;
+  color: #fff;
+}
+.wrap .handle-container .handle.submit.data-v-4f4a597e {
   background-color: #3384FF;
   color: #fff;
-  padding: 15rpx 0;
-  width: 20%;
-  box-sizing: border-box;
-  border-right: 1rpx solid #eaeaea;
+}
+.wrap .handle-container .more.data-v-4f4a597e {
+  position: relative;
+  padding: 15rpx 20rpx;
+}
+.wrap .handle-container .more .text:hover + .list > .hand-item-box.data-v-4f4a597e {
+  display: block;
+}
+.wrap .handle-container .more .list.data-v-4f4a597e {
+  position: absolute;
+  bottom: 100rpx;
+  right: 0;
+  box-shadow: 0px 2px 12px 0px #0000001F;
+  padding: 0 20rpx;
+  background-color: #fff;
+}
+.wrap .handle-container .more .list .hand-item-box.data-v-4f4a597e {
+  position: relative;
+  display: none;
+}
+.wrap .handle-container .more .list .hand-item-box.show.data-v-4f4a597e {
+  display: block;
+}
+.wrap .handle-container .more .list .hand-item-box.data-v-4f4a597e::after {
+  width: 0;
+  height: 0;
+  content: "";
+  display: block;
+  border-width: 26rpx 26rpx 0 0;
+  border-color: #fff transparent;
+  border-style: solid;
+  position: absolute;
+  bottom: -20rpx;
+  right: -20rpx;
+}
+.wrap .handle-container .more .list .hand-item-box .handle-item.data-v-4f4a597e {
+  width: 180rpx;
+  height: 50rpx;
   font-size: 26rpx;
+  line-height: 50rpx;
+  background-color: #fff;
   text-align: center;
+  border-bottom: 1px solid #ccc;
+  padding: 10rpx 0;
 }
-.wrap .handle-container .handle.data-v-4f4a597e:last-child {
+.wrap .handle-container .more .list .hand-item-box .handle-item.data-v-4f4a597e:last-child {
   border: 0;
 }
 

unpackage/dist/dev/mp-weixin/pages/index/handle/warning/warning.js

@@ -101,19 +101,19 @@ var components
 try {
   components = {
     uniForms: function () {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 273))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 301))
     },
     uniFormsItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 286))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 314))
     },
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 185))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 213))
     },
     uniDataSelect: function () {
-      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 293))
+      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 321))
     },
     uniFilePicker: function () {
-      return Promise.all(/*! import() | uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue */ 305))
+      return Promise.all(/*! import() | uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue */ 333))
     },
   }
 } catch (e) {
@@ -177,11 +177,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 44));
-var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 46));
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 45));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 47));
 var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
 var _upload = __webpack_require__(/*! @/api/system/upload.js */ 82);
-var _user = __webpack_require__(/*! @/api/system/user.js */ 42);
+var _user = __webpack_require__(/*! @/api/system/user.js */ 43);
 var _warningApi = __webpack_require__(/*! @/api/aqpt/warningApi */ 174);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniNoticeBar: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar */ "uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue */ 192))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar */ "uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue */ 220))
     },
   }
 } catch (e) {
@@ -619,13 +619,22 @@ var _default = {
         var _res$data = res.data,
           checklistId = _res$data.checklistId,
           checklistTypeId = _res$data.checklistTypeId; //recordId-taskId
-        // if (checklistTypeId === 1) {// HazardRecordView											  
-        // } else if (checklistTypeId === 2) {// PointRecordView											  
-        // } else if (checklistTypeId === 3) {// ScoreRecordView											  
-        // }					
-        uni.navigateTo({
-          url: "/pages/index/handle/task/task?rid=".concat(item.taskId, "&cid=").concat(checklistId, "&title=").concat(item.taskTitle)
-        });
+        if (checklistTypeId === 1) {
+          // HazardRecordView	
+          uni.navigateTo({
+            url: "/pages/index/handle/task/hazardRecord/hazardRecord?rid=".concat(item.taskId, "&cid=").concat(checklistId, "&title=").concat(item.taskTitle)
+          });
+        } else if (checklistTypeId === 2) {
+          // PointRecordView
+          uni.navigateTo({
+            url: "/pages/index/handle/task/task?rid=".concat(item.taskId, "&cid=").concat(checklistId, "&title=").concat(item.taskTitle)
+          });
+        } else if (checklistTypeId === 3) {
+          // ScoreRecordView	
+          uni.navigateTo({
+            url: "/pages/index/handle/task/task?rid=".concat(item.taskId, "&cid=").concat(checklistId, "&title=").concat(item.taskTitle)
+          });
+        }
       });
     }
   }

unpackage/dist/dev/mp-weixin/pages/login/index.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pages/login/index"],{
 
-/***/ 34:
+/***/ 35:
 /*!***********************************************************************************!*\
   !*** E:/work/Project_newGit/UniappShell/main.js?{"page":"pages%2Flogin%2Findex"} ***!
   \***********************************************************************************/
@@ -13,7 +13,7 @@
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 __webpack_require__(/*! uni-pages */ 26);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
-var _index = _interopRequireDefault(__webpack_require__(/*! ./pages/login/index.vue */ 35));
+var _index = _interopRequireDefault(__webpack_require__(/*! ./pages/login/index.vue */ 36));
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 createPage(_index.default);
@@ -21,7 +21,7 @@ createPage(_index.default);
 
 /***/ }),
 
-/***/ 35:
+/***/ 36:
 /*!****************************************************************!*\
   !*** E:/work/Project_newGit/UniappShell/pages/login/index.vue ***!
   \****************************************************************/
@@ -30,8 +30,8 @@ createPage(_index.default);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _index_vue_vue_type_template_id_4586967a_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=4586967a&scoped=true& */ 36);
-/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 38);
+/* harmony import */ var _index_vue_vue_type_template_id_4586967a_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./index.vue?vue&type=template&id=4586967a&scoped=true& */ 37);
+/* harmony import */ var _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./index.vue?vue&type=script&lang=js& */ 39);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _index_vue_vue_type_style_index_0_id_4586967a_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./index.vue?vue&type=style&index=0&id=4586967a&lang=scss&scoped=true& */ 49);
 /* harmony import */ var _software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
@@ -62,7 +62,7 @@ component.options.__file = "pages/login/index.vue"
 
 /***/ }),
 
-/***/ 36:
+/***/ 37:
 /*!***********************************************************************************************************!*\
   !*** E:/work/Project_newGit/UniappShell/pages/login/index.vue?vue&type=template&id=4586967a&scoped=true& ***!
   \***********************************************************************************************************/
@@ -71,7 +71,7 @@ component.options.__file = "pages/login/index.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_4586967a_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=4586967a&scoped=true& */ 37);
+/* harmony import */ var _software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_4586967a_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=template&id=4586967a&scoped=true& */ 38);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_4586967a_scoped_true___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_template_id_4586967a_scoped_true___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -84,7 +84,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 37:
+/***/ 38:
 /*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/work/Project_newGit/UniappShell/pages/login/index.vue?vue&type=template&id=4586967a&scoped=true& ***!
   \***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 185))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 213))
     },
   }
 } catch (e) {
@@ -134,7 +134,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 38:
+/***/ 39:
 /*!*****************************************************************************************!*\
   !*** E:/work/Project_newGit/UniappShell/pages/login/index.vue?vue&type=script&lang=js& ***!
   \*****************************************************************************************/
@@ -143,14 +143,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _software_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 39);
+/* harmony import */ var _software_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./index.vue?vue&type=script&lang=js& */ 40);
 /* harmony import */ var _software_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_software_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _software_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _software_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_software_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_index_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 39:
+/***/ 40:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/work/Project_newGit/UniappShell/pages/login/index.vue?vue&type=script&lang=js& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -165,8 +165,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _index = _interopRequireDefault(__webpack_require__(/*! @/store/index.js */ 40));
-var _user = __webpack_require__(/*! @/api/system/user.js */ 42);
+var _index = _interopRequireDefault(__webpack_require__(/*! @/store/index.js */ 41));
+var _user = __webpack_require__(/*! @/api/system/user.js */ 43);
 var _auth = __webpack_require__(/*! @/libs/auth.js */ 48);
 //
 //
@@ -289,5 +289,5 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ })
 
-},[[34,"common/runtime","common/vendor"]]]);
+},[[35,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/login/index.js.map

unpackage/dist/dev/mp-weixin/pages/message/message.js

@@ -101,16 +101,16 @@ var components
 try {
   components = {
     uniIcons: function () {
-      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 199))
+      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 227))
     },
     uniSwipeAction: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action */ "uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue */ 228))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action */ "uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.vue */ 256))
     },
     uniSwipeActionItem: function () {
-      return Promise.all(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue */ 233))
+      return Promise.all(/*! import() | uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue */ 261))
     },
     uniListChat: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list-chat/uni-list-chat */ "uni_modules/uni-list/components/uni-list-chat/uni-list-chat").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue */ 245))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list-chat/uni-list-chat */ "uni_modules/uni-list/components/uni-list-chat/uni-list-chat").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.vue */ 273))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/myCenter/myCenter.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniIcons: function () {
-      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 199))
+      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 227))
     },
   }
 } catch (e) {
@@ -171,7 +171,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
-var _user = __webpack_require__(/*! @/api/system/user.js */ 42);
+var _user = __webpack_require__(/*! @/api/system/user.js */ 43);
 var _app = __webpack_require__(/*! @/api/system/app.js */ 72);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -221,7 +221,7 @@ var _default = {
       });
     },
     linkToContacts: function linkToContacts() {
-      var baseUrl = "http://h5.xazhyc.com";
+      var baseUrl = this.$h5;
       uni.navigateTo({
         url: "/pages/webview/webview?href=".concat(baseUrl, "/profile/views/addressBook.html&name=\u901A\u8BAF\u5F55")
       });
@@ -253,7 +253,7 @@ var _default = {
       });
     },
     downloadApk: function downloadApk() {
-      var apkUrl = "http://h5.xazhyc.com/app.apk";
+      var apkUrl = "".concat(this.$h5, "/app.apk");
       uni.showModal({
         title: "发现新版本",
         content: "是否下载新版本",
@@ -279,7 +279,7 @@ var _default = {
     },
     updateApp: function updateApp() {
       var _this2 = this;
-      var apkUrl = "http://h5.xazhyc.com/app.apk";
+      var apkUrl = "".concat(this.$h5, "/app.apk");
       this.downloadVisable = true;
       var downloadTask = uni.downloadFile({
         url: apkUrl,

unpackage/dist/dev/mp-weixin/pages/myCenter/personalData/personalData.js

@@ -101,16 +101,16 @@ var components
 try {
   components = {
     uniList: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list/uni-list */ "uni_modules/uni-list/components/uni-list/uni-list").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list/uni-list.vue */ 207))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list/uni-list */ "uni_modules/uni-list/components/uni-list/uni-list").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list/uni-list.vue */ 235))
     },
     uniListItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list-item/uni-list-item */ "uni_modules/uni-list/components/uni-list-item/uni-list-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue */ 214))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list-item/uni-list-item */ "uni_modules/uni-list/components/uni-list-item/uni-list-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue */ 242))
     },
     uniPopup: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-popup/components/uni-popup/uni-popup */ "uni_modules/uni-popup/components/uni-popup/uni-popup").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 221))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-popup/components/uni-popup/uni-popup */ "uni_modules/uni-popup/components/uni-popup/uni-popup").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 249))
     },
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 185))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 213))
     },
   }
 } catch (e) {
@@ -174,7 +174,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _libs = __webpack_require__(/*! @/libs */ 81);
-var _user = __webpack_require__(/*! @/api/system/user.js */ 42);
+var _user = __webpack_require__(/*! @/api/system/user.js */ 43);
 var _upload = __webpack_require__(/*! @/api/system/upload.js */ 82);
 //
 //

unpackage/dist/dev/mp-weixin/pages/myCenter/updatePassword/updatePassword.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 185))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 213))
     },
   }
 } catch (e) {
@@ -164,7 +164,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _user = __webpack_require__(/*! @/api/system/user.js */ 42);
+var _user = __webpack_require__(/*! @/api/system/user.js */ 43);
 //
 //
 //

unpackage/dist/dev/mp-weixin/pages/webview/webview.js

@@ -157,11 +157,10 @@ var _default = {
     init: function init(options) {
       var t = new Date().getTime();
       if (options.type === 'scan') {
-        var href = "http://h5.xazhyc.com/scanApp/#/pages/index/index";
+        var href = "".concat(this.$h5, "/scanApp/#/pages/index/index");
         var qrcode = uni.getStorageSync('qrcode');
         qrcode = qrcode.split('?')[1];
         this.webViewSrc = "".concat(href, "?token=").concat((0, _auth.getToken)(), "&").concat(qrcode, "&v=").concat(t);
-        console.log("".concat(href, "?token=").concat((0, _auth.getToken)(), "&").concat(qrcode, "&v=").concat(t));
         uni.setNavigationBarTitle({
           title: "扫码操作"
         });

unpackage/dist/dev/mp-weixin/project.config.json

@@ -14,7 +14,7 @@
   "compileType": "miniprogram",
   "libVersion": "",
   "appid": "touristappid",
-  "projectname": "六院联创",
+  "projectname": "鼎丰安全助手",
   "condition": {
     "search": {
       "current": -1,

unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.wxml

@@ -0,0 +1 @@
+<view data-event-opts="{{[['tap',[['choiceDate',['$0'],['weeks']]]],['mouseenter',[['handleMousemove',['$0'],['weeks']]]]]}}" class="{{['uni-calendar-item__weeks-box',(weeks.disable)?'uni-calendar-item--disable':'',(weeks.beforeMultiple)?'uni-calendar-item--before-checked-x':'',(weeks.multiple)?'uni-calendar-item--multiple':'',(weeks.afterMultiple)?'uni-calendar-item--after-checked-x':'']}}" bindtap="__e" bindmouseenter="__e"><view class="{{['uni-calendar-item__weeks-box-item',(calendar.fullDate===weeks.fullDate&&(calendar.userChecked||!checkHover))?'uni-calendar-item--checked':'',(checkHover)?'uni-calendar-item--checked-range-text':'',(weeks.beforeMultiple)?'uni-calendar-item--before-checked':'',(weeks.multiple)?'uni-calendar-item--multiple':'',(weeks.afterMultiple)?'uni-calendar-item--after-checked':'',(weeks.disable)?'uni-calendar-item--disable':'']}}"><block wx:if="{{selected&&weeks.extraInfo}}"><text class="uni-calendar-item__weeks-box-circle"></text></block><text class="uni-calendar-item__weeks-box-text uni-calendar-item__weeks-box-text-disable uni-calendar-item--checked-text">{{weeks.date}}</text></view><view class="{{[(weeks.isDay)?'uni-calendar-item--isDay':'']}}"></view></view>

unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.wxss

@@ -0,0 +1,119 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.uni-calendar-item__weeks-box {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  margin: 1px 0;
+  position: relative;
+}
+.uni-calendar-item__weeks-box-text {
+  font-size: 14px;
+  font-weight: bold;
+  color: #001833;
+}
+.uni-calendar-item__weeks-lunar-text {
+  font-size: 12px;
+  color: #333;
+}
+.uni-calendar-item__weeks-box-item {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  width: 40px;
+  height: 40px;
+}
+.uni-calendar-item__weeks-box-circle {
+  position: absolute;
+  top: 5px;
+  right: 5px;
+  width: 8px;
+  height: 8px;
+  border-radius: 8px;
+  background-color: #dd524d;
+}
+.uni-calendar-item__weeks-box .uni-calendar-item--disable {
+  cursor: default;
+}
+.uni-calendar-item--disable .uni-calendar-item__weeks-box-text-disable {
+  color: #D1D1D1;
+}
+.uni-calendar-item--isDay {
+  position: absolute;
+  top: 10px;
+  right: 17%;
+  background-color: #dd524d;
+  width: 6px;
+  height: 6px;
+  border-radius: 50%;
+}
+.uni-calendar-item--extra {
+  color: #dd524d;
+  opacity: 0.8;
+}
+.uni-calendar-item__weeks-box .uni-calendar-item--checked {
+  background-color: #007aff;
+  border-radius: 50%;
+  box-sizing: border-box;
+  border: 3px solid #fff;
+}
+.uni-calendar-item--checked .uni-calendar-item--checked-text {
+  color: #fff;
+}
+.uni-calendar-item--multiple .uni-calendar-item--checked-range-text {
+  color: #333;
+}
+.uni-calendar-item--multiple {
+  background-color: #F6F7FC;
+}
+.uni-calendar-item--multiple .uni-calendar-item--before-checked,
+.uni-calendar-item--multiple .uni-calendar-item--after-checked {
+  background-color: #007aff;
+  border-radius: 50%;
+  box-sizing: border-box;
+  border: 3px solid #F6F7FC;
+}
+.uni-calendar-item--before-checked .uni-calendar-item--checked-text,
+.uni-calendar-item--after-checked .uni-calendar-item--checked-text {
+  color: #fff;
+}
+.uni-calendar-item--before-checked-x {
+  border-top-left-radius: 50px;
+  border-bottom-left-radius: 50px;
+  box-sizing: border-box;
+  background-color: #F6F7FC;
+}
+.uni-calendar-item--after-checked-x {
+  border-top-right-radius: 50px;
+  border-bottom-right-radius: 50px;
+  background-color: #F6F7FC;
+}
+

unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.json

@@ -0,0 +1,8 @@
+{
+  "component": true,
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
+    "calendar-item": "/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item",
+    "time-picker": "/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker"
+  }
+}

unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.wxss

@@ -0,0 +1,261 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.uni-calendar {
+  display: flex;
+  flex-direction: column;
+}
+.uni-calendar__mask {
+  position: fixed;
+  bottom: 0;
+  top: 0;
+  left: 0;
+  right: 0;
+  background-color: rgba(0, 0, 0, 0.4);
+  transition-property: opacity;
+  transition-duration: 0.3s;
+  opacity: 0;
+  z-index: 99;
+}
+.uni-calendar--mask-show {
+  opacity: 1;
+}
+.uni-calendar--fixed {
+  position: fixed;
+  bottom: calc(0px);
+  left: 0;
+  right: 0;
+  transition-property: -webkit-transform;
+  transition-property: transform;
+  transition-property: transform, -webkit-transform;
+  transition-duration: 0.3s;
+  -webkit-transform: translateY(460px);
+          transform: translateY(460px);
+  z-index: 99;
+}
+.uni-calendar--ani-show {
+  -webkit-transform: translateY(0);
+          transform: translateY(0);
+}
+.uni-calendar__content {
+  background-color: #fff;
+}
+.uni-calendar__content-mobile {
+  border-top-left-radius: 10px;
+  border-top-right-radius: 10px;
+  box-shadow: 0px 0px 5px 3px rgba(0, 0, 0, 0.1);
+}
+.uni-calendar__header {
+  position: relative;
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  height: 50px;
+}
+.uni-calendar__header-mobile {
+  padding: 10px;
+  padding-bottom: 0;
+}
+.uni-calendar--fixed-top {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  border-top-color: rgba(0, 0, 0, 0.4);
+  border-top-style: solid;
+  border-top-width: 1px;
+}
+.uni-calendar--fixed-width {
+  width: 50px;
+}
+.uni-calendar__backtoday {
+  position: absolute;
+  right: 0;
+  top: 25rpx;
+  padding: 0 5px;
+  padding-left: 10px;
+  height: 25px;
+  line-height: 25px;
+  font-size: 12px;
+  border-top-left-radius: 25px;
+  border-bottom-left-radius: 25px;
+  color: #fff;
+  background-color: #f1f1f1;
+}
+.uni-calendar__header-text {
+  text-align: center;
+  width: 100px;
+  font-size: 15px;
+  color: #666;
+}
+.uni-calendar__button-text {
+  text-align: center;
+  width: 100px;
+  font-size: 14px;
+  color: #007aff;
+  letter-spacing: 3px;
+}
+.uni-calendar__header-btn-box {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  width: 50px;
+  height: 50px;
+}
+.uni-calendar__header-btn {
+  width: 9px;
+  height: 9px;
+  border-left-color: #808080;
+  border-left-style: solid;
+  border-left-width: 1px;
+  border-top-color: #555555;
+  border-top-style: solid;
+  border-top-width: 1px;
+}
+.uni-calendar--left {
+  -webkit-transform: rotate(-45deg);
+          transform: rotate(-45deg);
+}
+.uni-calendar--right {
+  -webkit-transform: rotate(135deg);
+          transform: rotate(135deg);
+}
+.uni-calendar__weeks {
+  position: relative;
+  display: flex;
+  flex-direction: row;
+}
+.uni-calendar__weeks-item {
+  flex: 1;
+}
+.uni-calendar__weeks-day {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  height: 40px;
+  border-bottom-color: #F5F5F5;
+  border-bottom-style: solid;
+  border-bottom-width: 1px;
+}
+.uni-calendar__weeks-day-text {
+  font-size: 12px;
+  color: #B2B2B2;
+}
+.uni-calendar__box {
+  position: relative;
+  padding-bottom: 7px;
+}
+.uni-calendar__box-bg {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.uni-calendar__box-bg-text {
+  font-size: 200px;
+  font-weight: bold;
+  color: #999;
+  opacity: 0.1;
+  text-align: center;
+  line-height: 1;
+}
+.uni-date-changed {
+  padding: 0 10px;
+  text-align: center;
+  color: #333;
+  border-top-color: #DCDCDC;
+  border-top-style: solid;
+  border-top-width: 1px;
+  flex: 1;
+}
+.uni-date-btn--ok {
+  padding: 20px 15px;
+}
+.uni-date-changed--time-start {
+  display: flex;
+  align-items: center;
+}
+.uni-date-changed--time-end {
+  display: flex;
+  align-items: center;
+}
+.uni-date-changed--time-date {
+  color: #999;
+  line-height: 50px;
+  margin-right: 5px;
+}
+.time-picker-style {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.mr-10 {
+  margin-right: 10px;
+}
+.dialog-close {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  padding: 0 25px;
+  margin-top: 10px;
+}
+.dialog-close-plus {
+  width: 16px;
+  height: 2px;
+  background-color: #737987;
+  border-radius: 2px;
+  -webkit-transform: rotate(45deg);
+          transform: rotate(45deg);
+}
+.dialog-close-rotate {
+  position: absolute;
+  -webkit-transform: rotate(-45deg);
+          transform: rotate(-45deg);
+}
+.uni-datetime-picker--btn {
+  border-radius: 100px;
+  height: 40px;
+  line-height: 40px;
+  background-color: #007aff;
+  color: #fff;
+  font-size: 16px;
+  letter-spacing: 2px;
+}
+.uni-datetime-picker--btn:active {
+  opacity: 0.7;
+}
+

unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}