ssfg vor 4 Jahren
Ursprung
Commit
d251d9a303

+ 12 - 4
pages/collectInfo/collectInfo.wxml

@@ -53,7 +53,7 @@
 			<view class="name_smallName">
 				<view class="{{activeIndex==index?'unsinglename':'singlename'}}" wx:for="{{nameArr}}" wx:key="name">
 					<view style="line-height:50rpx" data-item="{{item}}" data-index="{{index}}" bindtap="switchNameTab">{{item.name}}</view>
-					<van-icon bindtap="deleteName" data-item="{{item}}" data-index="{{index}}" name="close" style="margin-left:25rpx;" />
+					<van-icon bindtap="deleteName" data-item="{{item}}" data-index="{{index}}" name="close" style="margin-left:25rpx;" wx:if='{{item.status!=3}}' />
 				</view>
 			</view>
 			<view class="addname_box">
@@ -63,15 +63,23 @@
 		<view class="form_box">
 			<!-- 第一个tab老人信息 -->
 			<view wx:if="{{currentIndex==0}}">
-				<view wx:if="{{oldInfo[activeIndex].status == '4'}}" class="scans" bindtap="goShibai">
+				<!-- <view wx:if="{{oldInfo[activeIndex].status == '4'}}" class="scans" bindtap="goShibai">
 					<text>审核失败,点击查看驳回理由</text>
 				</view>
 				<van-popup show="{{ shiBaiShow }}" position="top" custom-style="height: 30%;" bind:close="shiBaiClose">
 					<view class="liyou">驳回理由:</view>
 					<view wx:if="{{oldInfo[activeIndex].remark}}">{{oldInfo[activeIndex].remark}}</view>
 					<view wx:else>暂无驳回理由</view>
+				</van-popup> -->
+				<view class="scans" wx:if="{{oldInfo[activeIndex].status == '4'}}" bindtap="goShibai">
+					<text>审核失败,点击查看驳回理由</text>
+				</view>
+				<van-popup show="{{ shiBaiShow }}" position="top" custom-style="line-height:60rpx;display:flex;flex-wrap:wrap" bind:close="shiBaiClose">
+					<view class="liyou">驳回理由:</view>
+					<view wx:if="{{oldInfo[activeIndex].remark}}" style="margin-left: 30rpx;padding-bottom:50rpx">{{oldInfo[activeIndex].remark}}</view>
+					<view wx:else style="margin-left: 30rpx;padding-bottom:50rpx">暂无驳回理由</view>
 				</van-popup>
-				<view class="scan" bindtap="goOcr" >
+				<view class="scan" bindtap="goOcr">
 					<van-icon name="photograph" color="#2087f7" size="30rpx" style="margin-left:20rpx" />
 					<text>可拍身份证照片上传基本信息</text>
 				</view>
@@ -92,7 +100,7 @@
 						<van-icon name="arrow-down" style="position:absolute;right:20rpx;top:10rpx;color:#bbbbbb" />
 					</view>
 				</picker>
-				<view class="block"><text class="red">*</text>身份证号<input  placeholder="请填写" placeholder-style='font-size:25rpx;color: #bbbbbb;' class="{{oldInfo[activeIndex].status == '3' ? 'huiColor' : ''}}" bindblur="tab1Change4" disabled="{{oldInfo[activeIndex].status == '3'}}" value="{{oldInfo[activeIndex].idNumber}}" /></view>
+				<view class="block"><text class="red">*</text>身份证号<input placeholder="请填写" placeholder-style='font-size:25rpx;color: #bbbbbb;' class="{{oldInfo[activeIndex].status == '3' ? 'huiColor' : ''}}" bindblur="tab1Change4" disabled="{{oldInfo[activeIndex].status == '3'}}" value="{{oldInfo[activeIndex].idNumber}}" /></view>
 				<view wx:if="{{oldCardNull}}" class="required">老人身份证号不能为空哦!</view>
 				<view wx:if="{{oldCardWrong}}" class="required">老人身份证号格式不对哦!</view>
 				<view wx:if="{{oldCard60}}" class="required">不可采集低于60岁老人的信息哦</view>

+ 4 - 2
pages/collectInfo/collectInfo.wxss

@@ -133,14 +133,15 @@ page {
   color: red;
   display: flex;
   align-items: center;
-  border: 1px solid #c0c4cc;
+  border: 1px solid red;
   justify-content: center;
   box-shadow: 0px 0px 10px 0px rgba(153, 153, 153, 0.15);
 }
 
 .liyou {
   font-size: 28rpx;
-  font-weight: 900;
+  margin-left: 30rpx;
+  /* font-weight: 900; */
 }
 
 .scan text {
@@ -148,6 +149,7 @@ page {
   line-height: 50rpx;
   padding-bottom: 10rpx;
   letter-spacing: 2rpx;
+  
 }
 
 .block1 {

+ 9 - 5
pages/visitandinfo/visitandinfo.wxss

@@ -55,13 +55,16 @@
 /* checkbox .wx-checkbox-input {
   width: 35rpx;
   height: 35rpx;
-}
+}*/
 
 .checkbox_border {
-  border: 1px solid #e4f0fe;
   margin-top: 10rpx;
-  border-radius: 10rpx;
-} */
+  background: #FFFFFF;
+  border: 1px solid #E4F0FE;
+  box-shadow: 0px 3px 20px 0px rgba(32, 123, 242, 0.08);
+  border-radius: 10px;
+}
+
 checkbox .wx-checkbox-input {
   width: 35rpx;
   height: 35rpx;
@@ -69,8 +72,9 @@ checkbox .wx-checkbox-input {
 
 checkbox .wx-checkbox-input.wx-checkbox-input-checked {
   background-color: #2087f7;
-  color: #fff!important;
+  color: #fff !important;
 }
+
 .deletebj {
   width: 750rpx;
   height: 100rpx;

+ 2 - 2
utils/photoUrl.wxs

@@ -1,6 +1,6 @@
 var url = function (val) {
-  //  return  'https://info.windd.cn/collection' + val
-   return  'https://info.windd.cn/test' + val
+   return  'https://info.windd.cn/collection' + val
+  //  return  'https://info.windd.cn/test' + val
   // return 'http://10.16.4.7:7001' + val
 }
 module.exports = {

+ 2 - 5
utils/util.js

@@ -1,9 +1,6 @@
 const globalData = {
-  // publicUrl: 'http://info.windd.cn:8080/test',//测试
-  //  publicUrl: 'https://info.windd.cn/collection',//公众号
-  publicUrl: 'https://info.windd.cn/test',//正式
-  //publicUrl: 'http://10.16.4.12:7001',
-  //publicUrl: 'http://10.16.4.8:7001',
+   publicUrl: 'https://info.windd.cn/collection',//公众号
+  // publicUrl: 'https://info.windd.cn/test',//测试
   // publicUrl:'http://10.16.4.7:7001'//立秋
 };
 module.exports = {