Merge branch 'master' of http://git.cc-lotus.info/roose/mzxiaochengxu

pages/idCardDetail/idCardDetail.wxml

@@ -1,6 +1,6 @@
 <wxs module="urls" src="../../utils/photoUrl.wxs"></wxs>
 <view class="home">
-	<image class="bg-photo" src="/images/shenfenka.jpg" ></image>
+	<image class="bg-photo" src="/images/shenfenka.jpg"></image>
 	<!-- style="width:750rpx;height:1334rpx" -->
 	<image class="photo" src="{{urls.url(info.headPicPath)}}"></image>
 
@@ -9,14 +9,22 @@
 		<view>{{info.userName}}</view>
 	</view>
 	<view class="userInfo">
-		<view>身份证号：{{info.idCardNumber}}</view>
-		<view>认证时间：2020年09月15日</view>
 		<view style="display: flex;">
-			<view style=" width: 152rpx;">认证地点：</view>
-			<view style="">{{info.dept1.name}}{{info.dept2.name}}{{info.dept3.name}}{{info.dept4.name}}{{info.dept15.name}}</view>
+			<view style=" width: 130rpx;">身份证号：</view>
+			<view style="width: 310rpx;">{{info.idCardNumber}}</view>
+		</view>
+		<view style="display: flex;">
+			<view style=" width: 130rpx;">认证时间：</view>
+			<view style="width: 310rpx;">2020年09月15日</view>
+		</view>
+		<view style="display: flex;">
+			<view style=" width: 130rpx;">认证地点：</view>
+			<view style="width: 310rpx;">{{info.dept1.name}}{{info.dept2.name}}{{info.dept3.name}}{{info.dept4.name}}{{info.dept15.name}}</view>
+		</view>
+		<view style="display: flex;">
+			<view style=" width: 130rpx;">联系方式：</view>
+			<view style="width: 310rpx;">{{info.phone}}</view>
 		</view>
-
-		<view>联系方式：{{info.phone}}</view>
 	</view>
 	<image class="zhang" src="/images/zhang.png"></image>
 	<view class="time"> {{time}}</view>

pages/idCardDetail/idCardDetail.wxss

@@ -29,9 +29,10 @@
 .userInfo {
   position: absolute;
   top: 61%;
-  left: 180rpx;
+  left: 156rpx;
   font-size: 26rpx;
-  width: 400rpx;
+  width: 460rpx;
+   text-align: justify;
 }
 
 .xunfangtitle {

pages/visitandinfo/visitandinfo.wxml

@@ -24,15 +24,15 @@
 						<van-tab title="审核完成"></van-tab>
 						<van-tab title="审核失败"></van-tab>
 					</van-tabs>
-					<view class="zizi">共<text class="number">{{listData.length}}</text>条采集数据</view>
+					<view class="zizi">共<text class="number">{{listData.length}}</text>条采集记录</view>
 					<scroll-view class="center" scroll-y="true" style='height: {{scrollHeight + "px"}}'>
 						<view class="tr" style=" border-bottom: 1px solid #dadada; padding-bottom: 15rpx;">
 							<view class="td " style="border-bottom: unset; width: 38%; ">
 								<checkbox checked="{{isAllTrue}}" bindtap="selectall" />
 							</view>
 							<view class="td" style="border-bottom: unset;">姓名</view>
-							<view class="td " style="border-bottom: unset;  margin-left: 100rpx;">保存时间</view>
-							<view class="td" style="border-bottom: unset;">状态</view>
+							<view class="td " style="border-bottom: unset;  margin-left: 170rpx;">保存时间</view>
+							<view class="td" style="border-bottom: unset;margin-left: 30rpx; ">状态</view>
 						</view>
 						<checkbox-group bindchange="checkboxChange">
 							<view class="tr" wx:for="{{listData}}" wx:key="">
@@ -56,11 +56,11 @@
 					</scroll-view>
 				</view>
 				<view hidden='{{currentTabIndex != 1}}'>
-					<view class="zizi">共<text class="number">{{list.length}}</text>条探访数据</view>
+					<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">老人姓名</view>
-							<view class="th0">探访时间</view>
+							<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" bindtap="bindtap" data-infos="{{item}}" bindtap="visitJilu">

pages/visitandinfo/visitandinfo.wxss

@@ -85,10 +85,17 @@
 .tr0 {
   display: flex;
   width: 100%;
-  justify-content: space-between;
+  justify-content: center;
   border-bottom: 1px solid #dadada;
   padding: 20rpx 0rpx;
 }
+.td0 {
+  text-align: center;
+  width: 70%;
+}
+.td11 {
+  width: 30%;
+}
 
 .bg-w0 {
   border-bottom: 1rpx solid #dadada;