roose 4 anos atrás
pai
commit
d7901249af
3 arquivos alterados com 124 adições e 80 exclusões
  1. 2 1
      app.json
  2. 16 9
      pages/visitandinfo/visitandinfo.wxml
  3. 106 70
      pages/visitandinfo/visitandinfo.wxss

+ 2 - 1
app.json

@@ -1,11 +1,12 @@
 {
   "pages": [
+    "pages/visitandinfo/visitandinfo",
     "pages/index/index",
     "pages/updatepassword/updatepassword",
  
     "pages/notice/notice",
     "pages/login/login",
-    "pages/visitandinfo/visitandinfo",
+  
     "pages/card/card",
     "pages/paiming/paiming",
     "pages/personInfo/personInfo",

+ 16 - 9
pages/visitandinfo/visitandinfo.wxml

@@ -1,4 +1,7 @@
 	<wxs module="time" src="../../utils/time.wxs"></wxs>
+	<wxs module="subqian" src="../../utils/subqian.wxs"></wxs>
+	<wxs module="subhou" src="../../utils/subhou.wxs"></wxs>
+
 	<view>
 		<view id='tabs'>
 			<view class='tabs-box'>
@@ -20,25 +23,29 @@
 					</van-tabs>
 					<view>共<text class="number">{{listData.length}}</text>条采集数据</view>
 					<view class="tr">
-						<view class="th">
+						<view class="th td22">
 							<checkbox bindtap="selectall" />
 						</view>
 						<view class="th">姓名</view>
-						<view class="th">保存时间</view>
+						<view class="th " style="  margin-left: 100rpx;">保存时间</view>
 						<view class="th">状态</view>
 					</view>
 					<checkbox-group bindchange="checkboxChange">
 						<view class="tr" wx:for="{{listData}}" wx:key="" bindtap="cellClick" data-infos='{{item}}'>
-							<view class="td">
+							<view class="td td22">
 								<checkbox value="{{item.id}}" checked="{{item.checked}}" />
 							</view>
-							<view class="td" value="{{item.text}}">{{item.name}}</view>
+							<view class="td idcard" value="{{item.text}}">
+								<view>{{item.name}}</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" value="{{item.text}}">{{time.formatDate(item.time)}}</view>
-							<view class="td" wx:if="{{item.status == '1'}}" style="color: #67C23A">填全未审</view>
-							<view class="td" wx:if="{{item.status == '0'}}" style="color: #F56C6C">未完成</view>
-							<view class="td" wx:if="{{item.status == '2'}}" style="color: #909399">审核中</view>
-							<view class="td" wx:if="{{item.status == '3'}}" style="color: #409EFF">审核完成</view>
-							<view class="td" wx:if="{{item.status == '4'}}" style="color: #E6A23C">审核失败</view>
+							<view class="td status"   wx:if="{{item.status == '1'}}" style="color: #67C23A">填全未审</view>
+							<view class="td status" wx:if="{{item.status == '0'}}" style="color: #F56C6C">未完成</view>
+							<view class="td status" wx:if="{{item.status == '2'}}" style="color: #909399">审核中</view>
+							<view class="td status" wx:if="{{item.status == '3'}}" style="color: #409EFF">审核完成</view>
+							<view class="td status" wx:if="{{item.status == '4'}}" style="color: #E6A23C">审核失败</view>
 						</view>
 					</checkbox-group>
 				</view>

+ 106 - 70
pages/visitandinfo/visitandinfo.wxss

@@ -2,99 +2,135 @@
   width: 94%;
 }
 
-#tabs{
+#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;
-    height: 80rpx;
-    line-height: 80rpx;
-    text-align: center
+
+.tabs-box {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 80rpx;
+  line-height: 80rpx;
+  text-align: center
 }
+
 .tabs-item.selected {
-    color: #2892ff;
-    background: #F5F7FA;
+  color: #2892ff;
+  background: #F5F7FA;
 }
+
 .tabs-item {
-    width: 50%;
-    color:#666;
-   
+  width: 50%;
+  color: #666;
+
 }
-.table{
+
+.table {
   background-color: #fff;
-  border:1px solid #dadada;
-  width:1200rpx;
-  margin-left:0rpx;
-  }
+  border: 1px solid #dadada;
+  width: 1200rpx;
+  margin-left: 0rpx;
+  color: #606266;
   
-  .tr{
-  background-color: #dadada;
-  white-space: nowrap;
-  width:100%;
+}
+
+.tr {
+  background-color: #fff;
+  /* white-space: nowrap; */
+  width: 100%;
   display: flex;
-  text-align: center;
-  justify-content: center;
-  }
-  
-  .th{
+  font-size: 30rpx;
+  /* 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: 30rpx;
+}
 
-  }
-  
-  .td{
+
+.td {
   background-color: #fff;
+  /* text-align: center;
+  justify-content: center; */
+  width: 80%;
+  border-bottom: 1px solid #dadada;
+  padding: 10rpx 0;
+}
+
+.status {
+  width: 50%;
+}
+
+
+
+.table0 {
+  height: 200px;
+
+}
+
+.tr0 {
+  display: flex;
+  width: 100%;
+  justify-content: space-between;
+
+}
+
+.td0 {
+  width: 20%;
+  justify-content: center;
   text-align: center;
+  font-size: 26rpx;
+}
+
+.bg-w0 {
+  /* background: snow; */
+  border-radius: 20rpx;
+  height: 130rpx;
+}
+
+.bg-g0 {
+  background: #E6F3F9;
+}
+
+.th0 {
+  width: 20%;
   justify-content: center;
-  width: 100%;
-  border-bottom: 1px solid #dadada;
-  
-  }
+  display: flex;
+  height: 3rem;
+  align-items: center;
+  font-size: 26rpx;
+}
 
+.number {
+  color: #2087F7;
+}
 
+checkbox .wx-checkbox-input {
+  width: 30rpx;
+  height: 30rpx;
+}
 
-  .table0{
-    height: 200px;
-   
-  }
-  .tr0 {
-    display: flex;
-    width: 100%;
-    justify-content: space-between;
-  
-  }
-  .td0 {
-      width:20%;
-      justify-content: center;
-      text-align: center;
-      font-size: 26rpx;
-  }
- 
-  .bg-w0{
-    /* background: snow; */
-    border-radius: 20rpx;
-    height: 130rpx;
-  }
-  .bg-g0{
-    background: #E6F3F9;
-  }
-  .th0 {
-    width: 20%;
-    justify-content: center;
-    display: flex;
-    height: 3rem;
-    align-items: center;
-    font-size: 26rpx;
-  }
-  .number {
-    color: #2087F7;
-  }
+.td22 {
+  width: 30%;
+}
+
+.idcard {
+ display: flex;
+ flex-wrap: wrap; 
+ width: 100%;
+}
+
+.oldzi {
+  color: #84CD5F;
+}