1022版本更新

app.json

@@ -1,14 +1,13 @@
 {
   "pages": [
     "pages/index/index",
+    "pages/visitandinfo/visitandinfo",
     "pages/aboutUs/aboutUs",
-   
     "pages/visitList/visitList",
     "pages/bindOld/bindOld",
     "pages/visitListInfo/visitListInfo",
     "pages/visitFind/visitFind",
     "pages/love/love",
-    "pages/visitandinfo/visitandinfo",
     "pages/collectInfo/collectInfo",
     "pages/finishInfo/finishInfo",
     "pages/idCard/idCard",
@@ -20,7 +19,6 @@
     "pages/card/card",
     "pages/personInfo/personInfo",
     "pages/userBook/userBook",
-    
     "pages/adviceSubmit/adviceSubmit",
     "pages/workDailyInfo/workDailyInfo"
   ],

pages/adviceSubmit/adviceSubmit.wxml

@@ -1,8 +1,7 @@
+<view style="margin-left:25rpx;font-size:30rpx;font-weight:600">反馈内容：</view>
 <view class="conts">
 	<textarea value="{{value}}" class="areas" placeholder='请留下您的宝贵意见和建议...' minlength="{{min}}" maxlength="{{max}}" bindinput="inputs">
         <text class="currentWordNumber">{{currentWordNumber}}/{{max}}</text>
-        <!-- <text class="hint">{{texts}}{{num}}{{textss}}</text> -->
     </textarea>
 </view>
-<image class="submit" src="../../images/submit.png" bindtap="submit"></image>
-<!-- <view bindtap="submit" class="submit">提交</view> -->
+<image class="submit" src="../../images/submit.png" bindtap="submit"></image>

pages/collectInfo/collectInfo.js

@@ -307,6 +307,8 @@ Page({
       oldCardNull: false,
       oldCardWrong: false,
       oldCard60: false,
+      oldCard100: false,
+      oldCard150: false,
       oldPhoneNull: false,
       oldisMarryName: false,
       oldisMarryPhone: false,
@@ -945,7 +947,7 @@ Page({
       [idNumber]: e.detail.value
     })
     this.formCheckCard();
-    if (!this.data.oldCardNull && !this.data.oldCard60 && !this.data.oldCardWrong) {
+    if (!this.data.oldCardNull && !this.data.oldCard60 && !this.data.oldCardWrong && !this.data.oldCard150) {
       this.SubmitOldmanInfo({
         id: this.data.nameArr[this.data.activeIndex]._id,
         idNumber: e.detail.value
@@ -3986,6 +3988,8 @@ Page({
       oldCardNull: false,
       oldCardWrong: false,
       oldCard60: false,
+      oldCard100: false,
+      oldCard1500: false,
     })
     // 身份证号
     let idNumber = this.data.oldInfo[this.data.activeIndex].idNumber
@@ -4022,6 +4026,24 @@ Page({
             oldCard60: false
           })
         }
+        if (age > 100 && age < 150) {
+          this.setData({
+            oldCard100: true
+          })
+        } else {
+          this.setData({
+            oldCard100: false
+          })
+        }
+        if (age >= 150) {
+          this.setData({
+            oldCard150: true
+          })
+        } else {
+          this.setData({
+            oldCard150: false
+          })
+        }
       }
     }
   },

pages/collectInfo/collectInfo.wxml

@@ -96,6 +96,8 @@
 				<view wx:if="{{oldCardNull}}" class="required">老人身份证号不能为空哦！</view>
 				<view wx:if="{{oldCardWrong}}" class="required">老人身份证号格式不对哦！</view>
 				<view wx:if="{{oldCard60}}" class="required">不可采集低于60岁老人的信息哦</view>
+				<view wx:if="{{oldCard100}}" class="required1">提示:该老人年龄大于100岁</view>
+				<view wx:if="{{oldCard150}}" class="required">信息有误，请再次核实身份证信息</view>
 				<view class="block"><text class="red">*</text>联系电话<input placeholder="请填写" placeholder-style='font-size:25rpx;color: #bbbbbb;' bindblur="tab1Change5" value="{{oldInfo[activeIndex].phone}}" /></view>
 				<view wx:if="{{oldPhoneNull}}" class="required">老人联系电话不能为空哦！</view>
 				<view wx:if="{{oldPhoneNull1}}" class="required">老人联系电话格式不对哦！</view>
@@ -150,7 +152,7 @@
 							<textarea style="width:450rpx;height:auto" disabled="true" wx:else>{{oldInfo[activeIndex].chooseAdressArr1}}</textarea>
 						</view>
 					</picker> -->
-					<view class="picker1">
+					<view class="picker1 {{oldInfo[activeIndex].isSameWithAddress[0].checked ? 'huiColor' : ''}}">
 						<view wx:if="{{oldInfo[activeIndex].chooseAdressArr1.length==0}}" class="place_text" bindtap="showAdressShow1">点我选择现居地址</view>
 						<view style="width:450rpx;height:100rpx" wx:else bindtap="showAdressShow1">{{oldInfo[activeIndex].chooseAdressArr1}}</view>
 						<van-icon name="arrow-down" style="position:absolute;right:20rpx;top:10rpx;color:#bbbbbb" />
@@ -181,7 +183,7 @@
 							</picker-view>
 						</view>
 					</view>
-					<input disabled="{{nowAdress}}" bindblur="tab1Change7" placeholder="请填写补充现居地址" placeholder-style='font-size:25rpx;color: #bbbbbb;' value="{{oldInfo[activeIndex].addressExt}}" />
+					<input class="{{oldInfo[activeIndex].isSameWithAddress[0].checked ? 'huiColor' : ''}} " disabled="{{nowAdress}}" bindblur="tab1Change7" placeholder="请填写补充现居地址" placeholder-style='font-size:25rpx;color: #bbbbbb;' value="{{oldInfo[activeIndex].addressExt}}" />
 				</view>
 				<view class="block">
 					<view class="name"><text class="red">*</text>婚姻及配偶情况</view>

pages/collectInfo/collectInfo.wxss

@@ -340,7 +340,7 @@ input {
 
 }
 .huiColor {
-  background-color: #F5F7FA !important;
+  background-color: #eeeeef !important;
 }
 .block {
   margin-top: 30rpx;
@@ -361,7 +361,12 @@ radio-group label {
   margin-top: 10rpx;
   font-size: 25rpx;
 }
-
+.required1 {
+  color: green;
+  margin-left: 20rpx;
+  margin-top: 10rpx;
+  font-size: 25rpx;
+}
 .otherinput {
   height: 50rpx;
   margin-top: 10rpx;

pages/finishInfo/finishInfo.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText":"完善信息",
+  "navigationBarTitleText":"完善资料",
   "usingComponents": {}
 }

pages/idCardDetail/idCardDetail.wxml

@@ -1,7 +1,7 @@
 <wxs module="urls" src="../../utils/photoUrl.wxs"></wxs>
 <wxs module="times" src="../../utils/time.wxs"></wxs>
 <view class="home">
-	<image class="bg-photo" src="/images/shenfenka.jpg"></image>
+	<image class="bg-photo" src="/images/shenfenka.png"></image>
 	<!-- style="width:750rpx;height:1334rpx" -->
 	<image class="photo" src="{{urls.url(info.headPicPath)}}" wx:if='{{info.headPicPath}}'></image>
 	<view class="userName">

pages/idCardDetail/idCardDetail.wxss

@@ -1,10 +1,11 @@
 .photo {
-  width: 180rpx;
-  height: 180rpx;
+  width: 220rpx;
+  height: 240rpx;
   position: absolute;
-  top:33%;
-  left: 300rpx;
-  border-radius: 20rpx;
+  top: 8%;
+  left: 265rpx;
+  border-radius: 10rpx;
+  border: 1rpx dotted #2b82f5;
 }
 
 .home {
@@ -15,25 +16,30 @@
 }
 
 .home .bg-photo {
-  width: 100%;
-  height: 100%;
+  width: 750rpx;
+  height: 100vh;
+  display: flex;
 }
 
 .userName {
   position: absolute;
-  top: 52%;
+  top: 33%;
   /* left: 310rpx; */
   text-align: center;
   width: 100%;
+  font-size: 35rpx;
+  font-weight: 900;
+  color: #000;
 }
 
 .userInfo {
   position: absolute;
-  top: 61%;
+  top: 45%;
   left: 156rpx;
-  font-size: 26rpx;
+  font-size: 28rpx;
   width: 460rpx;
-   text-align: justify;
+  text-align: justify;
+  line-height: 50rpx;
 }
 
 .xunfangtitle {
@@ -54,12 +60,17 @@
   width: 100%;
   text-align: center;
   color: white;
+  font-size: 30rpx;
+  font-weight: 600;
 }
-.title1{
+
+.title1 {
   color: #0a0204;
-  width: 130rpx;
+  width: 140rpx;
+  font-weight: 600;
 }
-.title2{
+
+.title2 {
   color: #666666;
   width: 300rpx;
 }

pages/userBook/userBook.wxml

@@ -103,7 +103,7 @@
 	<view class="hd">②可查看到我的全部巡访记录。点击每条记录都可查看老人的巡访详情。</view>
 	<view style="display:flex;margin-top: 20rpx;margin-bottom: 20rpx;">
 		<image src="../../images/user_1.png" class="img7"></image>
-		<image src="../../images/user_3.png" class="img8"></image>
+		<image src="../../images/user_8.png" class="img8"></image>
 	</view>
 	<view class="block">
 		<view class="num">

pages/userBook/userBook.wxss

@@ -104,7 +104,7 @@
 
 .img8 {
   width: 300rpx;
-  height: 390rpx;
+  height: 420rpx;
   margin-left: 25rpx;
   margin-top: 20rpx;
   margin-bottom: 20rpx;

pages/visitandinfo/visitandinfo.js

@@ -8,7 +8,8 @@ Page({
     isAllTrue: false, // 控制全选和反选的按钮
     listData: [],
     batchIds: '', //选中的ids，
-    active: 0,
+    active0: 0,
+    active1: 0,
     show: false,
     infos: {},
     photos: [],
@@ -16,6 +17,7 @@ Page({
     scrollHeight1: '',
     list: [], //巡访的数据哈
     number: null,
+    isShowTrue: false
   },
   onTabsItemTap: function (event) {
     let index = event.currentTarget.dataset.index;
@@ -234,7 +236,7 @@ Page({
   },
 
   oldInfo(p) {
-    console.log("老人锕");
+    console.log('我查数据了')
     wx.showLoading({
       title: '加载中',
       mask: true
@@ -247,12 +249,21 @@ Page({
         appletsId: wx.getStorageSync('openId')
       },
       success: (res) => {
-        console.log(res, "0000");
+        console.log(res.data.data, "00111111100");
         if (res.data.code == 0) {
           wx.hideLoading();
           this.setData({
             listData: res.data.data
           })
+          if (res.data.data.length == 0) {
+            this.setData({
+              isShowTrue: 'none'
+            })
+          } else {
+            this.setData({
+              isShowTrue: 'block'
+            })
+          }
         }
       }
     })
@@ -283,41 +294,15 @@ Page({
     })
   },
   computeScrollViewHeight() {
-    let query = wx.createSelectorQuery().in(this)
-    console.log(query, "111111111111111");
-    query.select('.zizi').boundingClientRect()
-    query.select('.delete-box').boundingClientRect()
-    query.exec(res => {
-      console.log(res, "000000000000000000000");
-      let searchHeight = res[0].height
-      let titleHeight = res[1].height
-      let windowHeight = wx.getSystemInfoSync().windowHeight
-      // 54
-      let scrollHeight = windowHeight - searchHeight - titleHeight - 30 - 10 - 50 - 84
-      this.setData({
-        scrollHeight: scrollHeight
-      })
+    this.setData({
+      scrollHeight: wx.getSystemInfoSync().windowHeight * 2 - 103 - wx.getSystemInfoSync().screenHeight + wx.getSystemInfoSync().statusBarHeight
     })
   },
   computeScrollViewHeight1() {
-    let that = this
-    let query = wx.createSelectorQuery().in(this)
-    query.select('.zizi').boundingClientRect()
-    query.exec(res => {
-      console.log(res);
-
-      let searchHeight = res[0].height
-      let windowHeight = wx.getSystemInfoSync().windowHeight
-      let scrollHeight = windowHeight - searchHeight - 30 - 5 - 50
-      this.setData({
-        scrollHeight1: scrollHeight
-      })
+    this.setData({
+      scrollHeight1: wx.getSystemInfoSync().windowHeight * 2 - wx.getSystemInfoSync().screenHeight + wx.getSystemInfoSync().statusBarHeight
     })
   },
-
-  onLoad() {
-
-  },
   onShow() {
     console.log('onshow')
     console.log(wx.getStorageSync('user'), "打印");

pages/visitandinfo/visitandinfo.wxml

@@ -1,171 +1,74 @@
-	<wxs module="time" src="../../utils/time.wxs"></wxs>
-	<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>
-	<!-- oldUrgency -->
-	<wxs module="oldUrgency" src="../../utils/oldUrgency.wxs"></wxs>
-	<!-- wx:if='{{isTrue}}' -->
-	<view>
-		<view id='tabs'>
-			<view class='tabs-box'>
-				<block wx:for="{{['采集记录','巡访记录']}}" wx:key="index">
-					<view class="tabs-item {{currentTabIndex == index ? 'selected' : '' }}" bindtap='onTabsItemTap' data-index='{{index}}'>
-						{{item}}
-					</view>
-				</block>
+<wxs module="time" src="../../utils/time.wxs"></wxs>
+<van-tabs color='#3c99fa' active="{{ active0 }}" bind:change="onChange" class='tabs'>
+	<van-tab title="采集记录">
+		<van-tabs class='tabs1' active="{{ active1 }}" bind:change="tabsChange" color='rgba(0,0,0,0)'>
+			<van-tab title="全部"></van-tab>
+			<van-tab title="填全未审"></van-tab>
+			<van-tab title="未完成"></van-tab>
+			<van-tab title="审核中"></van-tab>
+			<van-tab title="审核完成"></van-tab>
+			<van-tab title="审核失败"></van-tab>
+		</van-tabs>
+		<view style="width:700rpx;display:flex;margin-left:25rpx;display:{{isShowTrue}}">
+			<view class="top">
+				<checkbox style="float:left;margin-top:-5rpx;margin-left:35rpx" checked="{{isAllTrue}}" bindtap="selectall" />
+				<view style="float:left;margin-left:15rpx">全选/反选</view>
+				<view style="float:right">共<text class="number"> {{listData.length}} </text>条记录</view>
 			</view>
-			<view class='ordert-detail'>
-				<view hidden='{{currentTabIndex != 0}}'>
-					<van-tabs active="{{ active }}" bind:change="tabsChange" color='#2087F7'>
-						<van-tab title="全部"></van-tab>
-						<van-tab title="填全未审"></van-tab>
-						<van-tab title="未完成"></van-tab>
-						<van-tab title="审核中"></van-tab>
-						<van-tab title="审核完成"></van-tab>
-						<van-tab title="审核失败"></van-tab>
-					</van-tabs>
-					<view class="zizi">共<text class="number"> {{listData.length}} </text>条采集记录（点击可修改信息）</view>
-					<image src="../../images/nodata1.png" class='nodata' wx:if="{{listData.length==0}}"></image>
-					<scroll-view class="center" scroll-y="true" style='height: {{scrollHeight + "px"}}'>
-						<view class="tr" style=" border-bottom: 1px solid #dadada;width:670rpx;font-size:30rpx" wx:if="{{listData.length!=0}}">
-							<view class="td " style="border-bottom: unset; width:78rpx;">
-								<checkbox checked="{{isAllTrue}}" bindtap="selectall" />
-							</view>
-							<view style="border-bottom: unset;width:290rpx;text-align:left">姓名</view>
-							<view style="border-bottom: unset;width:180rpx;text-align:left">保存时间</view>
-							<view style="border-bottom: unset;width:120rpx;">状态</view>
-						</view>
-						<checkbox-group bindchange="checkboxChange">
-							<view class="tr" wx:for="{{listData}}" wx:key="">
-								<view class="td td22">
-									<checkbox disabled="{{item.status == '3'}}" value="{{item._id}}" checked="{{item.checked}}" />
-								</view>
-								<view class="td idcard" value="{{item.text}}" bindtap="cellClick" data-infos='{{item}}'>
-									<view style="text-align:center">{{item.name}}</view>
-									<view wx:if='{{item.idNumber}}' class="oldzi">{{item.idNumber}}</view>
-									<!-- <view wx:if='{{item.idNumber}}' class="oldzi">({{subqian.subqian(item.idNumber)}}</view> -->
-									<!-- <view wx:if='{{item.idNumber}}' class="oldzi">{{subhou.subhou(item.idNumber)}})</view> -->
-								</view>
-								<view class="td" bindtap="cellClick" data-infos='{{item}}' value="{{item.text}}">{{time.formatDate(item.time)}}</view>
-								<view class="td status" bindtap="cellClick" data-infos='{{item}}' wx:if="{{item.status == '1'}}" style="color: #67C23A">填全未审</view>
-								<view class="td status" bindtap="cellClick" data-infos='{{item}}' wx:if="{{item.status == '0'}}" style="color: #F56C6C">未完成</view>
-								<view class="td status" bindtap="cellClick" data-infos='{{item}}' wx:if="{{item.status == '2'}}" style="color: #909399">审核中</view>
-								<view class="td status" bindtap="cellClick" data-infos='{{item}}' wx:if="{{item.status == '3'}}" style="color: #409EFF">审核完成</view>
-								<view class="td status" bindtap="cellClick" data-infos='{{item}}' wx:if="{{item.status == '4'}}" style="color: #E6A23C">审核失败</view>
-							</view>
-						</checkbox-group>
-					</scroll-view>
-				</view>
-				<view hidden='{{currentTabIndex != 1}}'>
-					<view class="zizi">共<text class="number"> {{list.length}} </text>条巡访记录</view>
-					<scroll-view class="table0" scroll-y="true" style='height: {{scrollHeight1 + "px"}}'>
-						<view class="tr0 bg-w0" style="padding:0">
-							<view class="th0" style="width: 70%;">老人姓名</view>
-							<view class="th0" style="width: 30%;">巡访时间</view>
-						</view>
-						<block wx:for="{{list}}" wx:key="unique">
-							<view class="tr0" data-infos="{{item}}" bindtap="visitJilu">
-								<view class="td0"><text>{{item.oldInfo}}</text><text wx:if='{{item.oldIdNumber}}' class="oldzi">({{item.oldIdNumber}})</text></view>
-								<view class="td0 td11" style="padding: 0rpx 10rpx;"><text> {{time.formatDate(item.visitTime)}}</text></view>
-							</view>
-						</block>
-					</scroll-view>
-					<!-- <view class="table0">
-						<view class="tr0 bg-w0" style="padding:0">
-							<view class="th0">老人姓名</view>
-							<view class="th0">巡访时间</view>
-						</view>
-						<block wx:for="{{list}}" wx:key="unique">
-							<view class="tr0" bindtap="bindtap" data-infos="{{item}}" bindtap="visitJilu">
-								<view class="td0"><text>{{item.oldInfo}}<text class="oldzi">({{item.oldIdNumber}})</text></text></view>
-								<view class="td0 td11"><text> {{time.formatDate(item.visitTime)}}</text></view>
+		</view>
+		<scroll-view enable-back-to-top='true' id="scroll" scroll-y="true" style='height: {{scrollHeight + "px"}};width:700rpx;margin-left:25rpx;font-size:28rpx'>
+			<checkbox-group bindchange="checkboxChange">
+				<view wx:for="{{listData}}" class="checkbox_border">
+					<view style="width:670rpx;margin-left:15rpx;height:60rpx;margin-top:20rpx;border-bottom:1px solid #f4f4f4">
+						<checkbox style="float:left;margin-left:20rpx" disabled="{{item.status == '3'}}" value="{{item._id}}" checked="{{item.checked}}" />
+						<view style="width:580rpx;height:60rpx;float:right" value="{{item.text}}" bindtap="cellClick" data-infos='{{item}}'>
+							<view style="float:left;color:#333333;margin-left:10rpx">{{item.name}}</view>
+							<view style="float:left;color:#70c546;margin-left:10rpx" wx:if='{{item.idNumber}}'>({{item.idNumber}})</view>
+							<view style="float:right;margin-right:10rpx">
+								<van-icon name="arrow" color="#b5b5b5" />
 							</view>
-						</block>
-					</view> -->
-					<!-- <van-overlay show="{{ show }}" bind:click="onClickHide">
-						<view class="wrapper">
-							<scroll-view scroll-y="true" class="block">
-								<view style="margin-bottom:25rpx">
-									<view style="font-size:30rpx;">
-										巡访时间:
-									</view>
-									<view>
-										{{time.formatDate(infos.visitTime)}}
-									</view>
-								</view>
-								<view style="font-size:30rpx;">
-									巡访位置:
-								</view>
-								<view class="wai-box" style="margin-bottom:25rpx">
-									<view>{{infos.visitLocation}}</view>
-									<view class="flex-box">
-										<view>经度:<text>{{infos.lng}}</text></view>
-										<view>纬度:<text>{{infos.lat}}</text></view>
-									</view>
-								</view>
-								<view style="font-size:30rpx;">
-									老人姓名:
-								</view>
-								<view class="pop-oldtitle">{{infos.oldInfo}}<text class="oldzi">（{{infos.oldIdNumber}}）</text></view>
-								<view style="font-size:30rpx;">
-									1.巡访情况
-								</view>
-								<view class="tanfang">
-									<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 class="flex-box" style=" margin: 10rpx 0;">
-										<view>
-											<view>居住环境：<van-tag plain size='large' type="{{oldMind.url(infos.live)}}">{{infos.live}}</van-tag>
-											</view>
-										</view>
-										<view>
-											<view class="box-end">需求紧急程度：<van-tag plain size='large' type="{{oldUrgency.url(infos.urgency)}}">{{infos.urgency}}</van-tag>
-											</view>
-										</view>
-									</view>
-								</view>
-						 </view>
-						<view style="font-size:30rpx;">
-							2.老人需求说明
 						</view>
-						<view class="wai-box" style="margin-bottom:25rpx"> {{infos.demand}}</view>
-						<view style="font-size:30rpx;"> 3.巡访备注说明</view>
-						<view class="wai-box" style="margin-bottom:25rpx">{{infos.visitMessage}}</view>
-						<view style="font-size:30rpx;"> 4.现场含面部照片</view>
-						<view class="pop-boxs">
-							<view wx:for='{{photos}}'>
-								<view class="tanfang">
-									照片{{index+1}}
-								</view>
-								<image src="{{urls.url(item)}}" style="width: 200rpx; height: 200rpx;margin-top: 4%" />
-							</view>
+					</view>
+					<view style="height:60rpx;margin-top:20rpx;font-size:26rpx;width:100%">
+						<view style="float:left;display:flex;color:#999999;margin-left:20rpx">状态：
+							<view wx:if="{{item.status == '1'}}" style="color: #67C23A;font-size:30rpx;font-weight:600;">填全未审</view>
+							<view wx:if="{{item.status == '0'}}" style="color: #F56C6C;font-size:30rpx;font-weight:600;">未完成</view>
+							<view wx:if="{{item.status == '2'}}" style="color: #909399;font-size:30rpx;font-weight:600;">审核中</view>
+							<view wx:if="{{item.status == '3'}}" style="color: #409EFF;font-size:30rpx;font-weight:600;">审核完成</view>
+							<view wx:if="{{item.status == '4'}}" style="color: #E6A23C;font-size:30rpx;font-weight:600;">审核失败</view>
 						</view>
-						</scroll-view>
+						<view style="float:right;color:#999999;margin-right:20rpx" bindtap="cellClick" data-infos='{{item}}' value="{{item.text}}">{{time.formatDate(item.time)}}</view>
+						<view style="float:right;color:#999999;">采集时间：</view>
+					</view>
 				</view>
-				</van-overlay> -->
+			</checkbox-group>
+		</scroll-view>
+		<image wx:if='{{listData.length==0}}' style="width:220rpx;height:169rpx;position:absolute;top:400rpx;left:265rpx" src="../../images/nodata1.png"></image>
+		<view wx:if='{{listData.length==0}}' style="position:absolute;top:580rpx;left:320rpx;font-size:28rpx;color:#bcdbfd">暂无数据</view>
+		<view class="deletebj" bindtap="delete" wx:if='{{listData.length!=0}}'>
+			<view class="delete">
+				<van-icon name="delete" color="#fd4133" size="35rpx;margin-right:10rpx" /><text>删除</text></view>
+		</view>
+
+	</van-tab>
+	<van-tab title="巡访记录">
+		<view class="top1">共<text class="number"> {{list.length}} </text>条巡访记录</view>
+		<scroll-view scroll-y="true" id="scroll1" style='height: {{scrollHeight1 + "px"}};width:700rpx;margin-left:25rpx;margin-top:20rpx;font-size:28rpx'>
+			<view wx:for="{{list}}" class="checkbox_border">
+				<view data-infos="{{item}}" bindtap="visitJilu">
+					<view style="width:670rpx;margin-left:15rpx;height:60rpx;margin-top:20rpx;border-bottom:1px solid #f4f4f4">
+						<view style="float:left;color:#333333;margin-left:10rpx">{{item.oldInfo}}</view>
+						<view style="float:left;color:#70c546;margin-left:10rpx">({{item.oldIdNumber}})</view>
+						<view style="float:right;margin-right:10rpx" value="{{item.text}}" bindtap="cellClick" data-infos='{{item}}'>
+							<van-icon name="arrow" color="#b5b5b5" />
+						</view>
+					</view>
+					<view style="height:60rpx;margin-top:20rpx;font-size:26rpx;width:100%">
+						<view style="float:left;color:#999999;margin-left:25rpx">巡访时间：</view>
+						<view style="float:left;color:#999999;margin-right:20rpx">{{time.formatDate(item.visitTime)}}</view>
+					</view>
 				</view>
-				<view wx:if='{{currentTabIndex != 1}}' hidden="{{!listData.length}}" class="delete-box" bindtap="deletes">删除</view>
 			</view>
-		</view>
-	</view>
+		</scroll-view>
+	</van-tab>
+</van-tabs>

pages/visitandinfo/visitandinfo.wxss

@@ -1,116 +1,15 @@
-.home {
-  width: 94%;
+.tabs .van-tab--active .van-ellipsis {
+  color: #000;
+  font-weight: 600;
 }
 
-#tabs {
-  width: 90%;
-  padding: 0 20px;
-  margin: 20rpx 0 20rpx 0;
-  /* position: absolute; */
-  /* z-index: 99999999; */
-}
-
-.tabs-box {
-  display: flex;
-  align-items: center;
-  justify-content: center;
+.top {
+  width: 100%;
   height: 80rpx;
+  /* border: 1px solid red; */
   line-height: 80rpx;
-  text-align: center;
-  border-top: 1px solid #d3d7e0;
-}
-.tabs-item.selected {
-  color: #2892ff;
-  background-color: white;
-  border: none;
-  font-size: 35rpx;
-  font-weight: 800;
-}
-.tabs-item {
-  width: 50%;
-  color: #666;
-  background: #F5F7FA;
-  font-size: 27rpx;
-  border: 1px solid #d3d7e0;
-}
-.table {
-  background-color: #fff;
-  border: 1px solid #dadada;
-  width: 1200rpx;
-  margin-left: 0rpx;
-  color: #606266;
-
-}
-
-.tr {
-  background-color: #fff;
-  /* white-space: nowrap; */
-  width: 100%;
-  display: flex;
-  font-size: 29rpx;
-  /* text-align: center;
-  justify-content: center; */
-
-}
-
-.th {
-  background-color: white;
-  text-align: center;
-  justify-content: center;
-  width: 100%;
-  border-bottom: 1px solid #dadada;
-  font-size: 28rpx;
-}
-.td {
-  background-color: #fff;
-  width: 80%;
-  border-bottom: 1px solid #dadada;
-  padding: 10rpx 0;
-  font-size: 27rpx;
-}
-
-.status {
-  width: 50%;
-}
-
-
-
-.table0 {
-
   font-size: 28rpx;
-}
-
-.tr0 {
-  display: flex;
-  width: 100%;
-  justify-content: center;
-  border-bottom: 1px solid #dadada;
-  padding: 20rpx 0rpx;
-  font-size: 27rpx;
-}
-.td0 {
-  text-align: center;
-  width: 70%;
-}
-.td11 {
-  width: 30%;
-}
-
-.bg-w0 {
-  border-bottom: 1rpx solid #dadada;
-}
-
-.bg-g0 {
-  background: #E6F3F9;
-}
-
-.th0 {
-  width: 20%;
-  justify-content: center;
-  display: flex;
-  height: 3rem;
-  align-items: center;
-
+  /* display: flex; */
 }
 
 .number {
@@ -118,111 +17,81 @@
   font-weight: 800;
   margin-left: 5rpx;
   margin-right: 5rpx;
-  font-size:32rpx;
-}
-checkbox .wx-checkbox-input {
-  width: 30rpx;
-  height: 30rpx;
+  font-size: 32rpx;
 }
 
-.td22 {
-  width: 30%;
-}
+.tabs1 .van-tabs {
+  margin-top: 30rpx;
 
-.idcard {
-  display: flex;
-  flex-wrap: wrap;
-  width: 100%;
-  text-align: center;
 }
 
-.oldzi {
-  color: #84CD5F;
+.tabs1 .van-tabs van-sticky .van-hairline--top-bottom:after {
+  border-top: none;
+  border-bottom: none;
 }
 
-.zizi {
-  font-size: 30rpx;
-  margin: 15rpx 0;
-}
+.tabs1 .van-tabs .van-tab {
+  box-sizing: none;
 
-.wrapper {
-  display: flex;
-  /* align-items: center;
-  justify-content: center; */
-  align-items: flex-end;
-  height: 100%;
-  font-size: 28rpx;
 }
 
-.block {
-  width: 100%;
-  height: 70%;
-  padding: 40rpx 20rpx;
-  background-color: #fff;
-  font-size: 26rpx;
-  /* position: absolute;
-  bottom: 0;
-  left: 0; */
-}
-
-.flex-box {
-  display: flex;
+.tabs1 .van-tab .van-ellipsis {
+  background-color: #f8f8f8;
+  color: #000;
+  border-radius: 30rpx;
+  line-height: 50rpx;
+  font-size: 28rpx;
 }
 
-.pop-oldtitle {
-  background-color: #F0F9EB;
-  color: #84CD5F;
-  width: 60%;
-  box-sizing: border-box;
-  padding: 8rpx 0 8rpx 10rpx;
-  text-align: center;
-  font-size: 26rpx;
-  margin: 30rpx 0;
+.tabs1 .van-tab--active .van-ellipsis {
+  background: -webkit-linear-gradient(left, #2088f7, #77bdfe);
+  color: #fff;
+  border-radius: 40rpx;
+  line-height: 50rpx;
+  font-weight: 500;
+  font-size: 28rpx;
 }
 
-.wai-box {
-  margin: 10rpx 0;
+checkbox .wx-checkbox-input {
+  width: 35rpx;
+  height: 35rpx;
 }
 
-.tanfang {
-  margin: 30rpx 0;
+.checkbox_border {
+  border: 1px solid #e4f0fe;
+  margin-top: 10rpx;
+  border-radius: 10rpx;
+  /* height: 200rpx; */
 }
 
-.delete-box {
-   margin-top: 10rpx;
-    background-color: #F56C6C;
-    width: 100%;
-    text-align: center;
-    color:white;
-    padding: 10rpx 0;
-    border-radius: 10rpx;
-}
-.scroll {
-  flex: 1;
-  overflow: scroll;
+.deletebj {
+  width: 750rpx;
+  height: 100rpx;
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, .2);
+  margin-top: 10rpx;
 }
 
-.center {
-  text-align: center;
-  height: 100%;
-}
-.pop-boxs {
+.delete {
+  width: 600rpx;
+  /* text-align: center; */
+  margin-left: 75rpx;
+  border: 1px solid #fd4133;
+  color: #fd4133;
+  border-radius: 10rpx;
+  height: 60rpx;
+  line-height: 60rpx;
+  font-size: 28rpx;
+  float: left;
+  margin-top: 15rpx;
   display: flex;
-}
-.pop-boxs >view:last-child {
-  margin-left: 40rpx;
+  align-content: center;
+  justify-content: center;
 }
 
-.box-end {
-  margin-left: 200rpx;
-}
-.ordert-detail{
-  margin-top:20rpx;
-}
-.nodata{
-  width: 220rpx;
-  height: 169rpx;
-  position: fixed;
-  top: 500rpx;
-  left: 265rpx;
+.top1 {
+  width: 750rpx;
+  text-align: center;
+  margin-top: 20rpx;
+  color: #333333;
+  font-size: 28rpx;
 }

pages/workDailyInfo/workDailyInfo.json

@@ -1,3 +1,4 @@
 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationBarTitleText": "巡访详情"
 }

project.config.json

@@ -22,7 +22,7 @@
 			"disablePlugins": [],
 			"outputPath": ""
 		},
-		"useCompilerModule": false,
+		"useCompilerModule": true,
 		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",