修改pop探访记录

app.json

@@ -1,9 +1,8 @@
 {
   "pages": [
     "pages/index/index",
-    "pages/collectInfo/collectInfo",
-  
     "pages/visitandinfo/visitandinfo",
+    "pages/collectInfo/collectInfo",
     "pages/finishInfo/finishInfo",
     "pages/idCard/idCard",
     "pages/paiming/paiming",
@@ -57,7 +56,8 @@
     "van-grid": "/miniprogram_npm/vant-weapp/grid/index",
     "van-grid-item": "/miniprogram_npm/vant-weapp/grid-item/index",
     "van-notice-bar": "/miniprogram_npm/vant-weapp/notice-bar/index",
-    "van-uploader": "/miniprogram_npm/vant-weapp/uploader/index"
+    "van-uploader": "/miniprogram_npm/vant-weapp/uploader/index",
+    "van-tag": "/miniprogram_npm/vant-weapp/tag/index"
   },
   "tabBar": {
     "color": "#a9b7b7",

pages/love/love.wxml

@@ -40,13 +40,13 @@
 		</radio-group>
 		<view class="title">卫生环境</view>
 		<radio-group name="hygiene">
-			<radio color='#009FE9' value='安全'>良好</radio>
+			<radio color='#009FE9' value='良好'>良好</radio>
 			<radio color='#009FE9' value='一般'>一般</radio>
 			<radio color='#009FE9' value='较差'>较差</radio>
 		</radio-group>
 		<view class="title">居中环境</view>
 		<radio-group name="live">
-			<radio color='#009FE9' value='安全'>良好</radio>
+			<radio color='#009FE9' value='良好'>良好</radio>
 			<radio color='#009FE9' value='一般'>一般</radio>
 			<radio color='#009FE9' value='较差'>较差</radio>
 		</radio-group>

pages/visitandinfo/visitandinfo.js

@@ -405,5 +405,10 @@ Page({
         break;
     }
     this.visitInfo();
+  },
+  onHide(){
+    this.setData({
+      show :false
+    })
   }
 })

pages/visitandinfo/visitandinfo.wxml

@@ -2,6 +2,9 @@
 	<wxs module="subqian" src="../../utils/subqian.wxs"></wxs>
 	<wxs module="subhou" src="../../utils/subhou.wxs"></wxs>
 	<wxs module="urls" src="../../utils/photoUrl.wxs"></wxs>
+	<wxs module="oldMind" src="../../utils/oldmind.wxs"></wxs>
+	<wxs module="oldHealth" src="../../utils/oldhealth.wxs"></wxs>
+	<wxs module="oldSecurity" src="../../utils/oldsecurity.wxs"></wxs>
 	<view>
 		<view id='tabs'>
 			<view class='tabs-box'>
@@ -80,7 +83,15 @@
 					</view> -->
 					<van-overlay show="{{ show }}" bind:click="onClickHide">
 						<view class="wrapper">
-							<view class="block">
+							<scroll-view scroll-y="true" class="block">
+								<view class="flex-box">
+									<view>
+										探访时间
+									</view>
+									<view style=" margin-left: 20rpx;">
+										{{time.formatDate(infos.visitTime)}}
+									</view>
+								</view>
 								<view>
 									探访位置
 								</view>
@@ -96,11 +107,39 @@
 								</view>
 								<view class="pop-oldtitle">{{infos.oldInfo}}<text class="oldzi">（{{infos.oldIdNumber}}）</text></view>
 								<view>
-									探访情况
+									1、探访情况
 								</view>
 								<view class="tanfang">
-									{{infos.visitMessage}}
+									<view class="flex-box" style=" margin: 10rpx 0;">
+										<view>
+											<view>健康情况：<van-tag plain size='large' type="{{oldHealth.url(infos.health)}}">{{infos.health}}</van-tag>
+											</view>
+										</view>
+										<view>
+											<view class="box-end">精神状态：<van-tag plain size='large' type="{{oldMind.url(infos.mind)}}">{{infos.mind}}</van-tag>
+											</view>
+										</view>
+									</view>
+									<view class="flex-box" style=" margin: 10rpx 0;">
+										<view>
+											<view>安全情况：<van-tag plain size='large' type="{{oldSecurity.url(infos.security)}}">{{infos.security}}</van-tag>
+											</view>
+										</view>
+										<view>
+											<view class="box-end">卫生环境：<van-tag plain size='large' type="{{oldMind.url(infos.hygiene)}}">{{infos.hygiene}}</van-tag>
+											</view>
+										</view>
+									</view>
+									<view>居住环境：<van-tag size='large' plain type="{{oldMind.url(infos.live)}}">{{infos.live}}</van-tag>
+									</view>
 								</view>
+								<view>
+									2、老人需求说明
+								</view>
+								<view class="wai-box"> {{infos.demand}}</view>
+								<view> 3、探访备注说明</view>
+								<view class="wai-box">{{infos.visitMessage}}</view>
+								<view> 4、现场喊含面部照片</view>
 								<view class="pop-boxs">
 									<view wx:for='{{photos}}'>
 										<view class="tanfang">
@@ -109,8 +148,7 @@
 										<image src="{{urls.url(item)}}" style="width: 200rpx; height: 200rpx;margin-top: 4%" />
 									</view>
 								</view>
-
-							</view>
+							</scroll-view>
 						</view>
 					</van-overlay>
 				</view>

pages/visitandinfo/visitandinfo.wxss

@@ -150,6 +150,9 @@ checkbox .wx-checkbox-input {
   padding: 40rpx 20rpx;
   background-color: #fff;
   font-size: 26rpx;
+  /* position: absolute;
+  bottom: 0;
+  left: 0; */
 }
 
 .flex-box {
@@ -168,7 +171,7 @@ checkbox .wx-checkbox-input {
 }
 
 .wai-box {
-  margin: 50rpx 0;
+  margin: 10rpx 0;
 }
 
 .tanfang {
@@ -198,3 +201,7 @@ checkbox .wx-checkbox-input {
 .pop-boxs >view:last-child {
   margin-left: 40rpx;
 }
+
+.box-end {
+  margin-left: 200rpx;
+}