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

config/index.js

@@ -5,8 +5,8 @@ export default {
 	  // dev: 'http://192.168.3.253:7001',	
 	  // dev:"http://192.168.3.5:7001",
       // pro: 'https://api.xazhyc.com',
-	  pro: 'http://1.15.92.205:7001',	
-	  // pro: 'http://192.168.3.5:7001',
+	  // pro: 'http://1.15.92.205:7001',	
+	  pro: 'http://192.168.3.5:7001',
     },
 	appID: '10007',
 	appKey: '82a8bf439373e311',

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "六院联创",
+    "name" : "鼎丰安全助手",
     "appid" : "__UNI__73F6024",
     "description" : "",
     "versionName" : "1.0.0",

pages/index/detail/detail.vue

@@ -128,6 +128,10 @@
 							<view class="time">
 								预期结束时间：{{item.dangerDeadLine}}
 							</view>
+							<view class="supervise">
+								<span class="supervise-item">督办部门：{{item.superviseGroupName}}</span>
+								<span class="supervise-item">督办人员：{{item.superviseAccountName}}</span>
+							</view>					
 							<view class="bottom">
 								<view class="user">
 									<image class="avatar" src="/static/index/user.png" mode="widthFix"></image>
@@ -399,6 +403,15 @@
 								font-size: 28rpx;									
 								color:rgba(241, 57, 57, 0.8);
 							}
+								
+							.supervise{
+								font-size: 24rpx;
+								color: rgba(0, 0, 0, 1);
+								padding: 10rpx 0;
+								.supervise-item{
+									padding-right: 10rpx;
+								}
+							}
 							.bottom{
 								display: flex;
 								justify-content: space-between;

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

@@ -172,10 +172,13 @@ import {cancelCheckTask,completeCheckTask} from '@/api/aqpt/task.js'
 					let href=`${this.$h5}/danger/views/create.html`;
 					let name= '登记隐患'
 					completeCheckTask(recordId).then(()=>{
-						uni.redirectTo({
+						uni.reLaunch({
 							url:`/pages/webview/webview?href=${href}&name=${name}`
 						})
 					}).catch(()=>{
+						uni.reLaunch({
+							url:`/pages/webview/webview?href=${href}&name=${name}`
+						})
 						uni.showToast({
 							icon:"none",
 							title:"操作失败"
@@ -198,10 +201,10 @@ import {cancelCheckTask,completeCheckTask} from '@/api/aqpt/task.js'
 			submitDanger(recordId){
 				let href=`${this.$h5}/danger/views/create.html`;
 				let name= '登记隐患'	
-				completeCheckTask(recordId)								
-				uni.redirectTo({
+				uni.reLaunch({
 					url:`/pages/webview/webview?href=${href}&name=${name}`
-				})
+				})	
+				completeCheckTask(recordId)								
 			},
 			hover(state){
 				this.showMore=state===1

pages/index/handle/task/task.vue

@@ -180,10 +180,13 @@
 			},
 			completeTask(recordId){
 				completeCheckTask(recordId).then(()=>{				
-					uni.switchTab({
+					uni.reLaunch({
 						url:'/pages/index/index'
 					})
 				}).catch(()=>{
+					uni.reLaunch({
+						url:`/pages/webview/webview?href=${href}&name=${name}`
+					})
 					uni.showToast({
 						icon:"none",
 						title:"操作失败"
@@ -193,10 +196,10 @@
 			submitDanger(recordId){
 				let href=`${this.$h5}/danger/views/create.html`;
 				let name= '登记隐患'	
-				completeCheckTask(recordId)								
-				uni.redirectTo({
+				uni.reLaunch({
 					url:`/pages/webview/webview?href=${href}&name=${name}`
 				})
+				completeCheckTask(recordId)							
 			},
 			hover(state){
 				this.showMore=state===1