0831修改

pages/collectInfo/collectInfo.wxml

@@ -77,7 +77,7 @@
 	<view class="right">
 		<view class="name_box">
 			<view class="name_smallName">
-				<view class="{{currentActiveIndex==index?'unsinglename':'singlename'}}" wx:for="{{nameArr}}" wx:key="{{item}}">
+				<view class="{{activeIndex==index?'unsinglename':'singlename'}}" wx:for="{{nameArr}}" wx:key="{{item}}">
 					<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;" />
 				</view>
@@ -93,26 +93,26 @@
 					<!-- <image src="../../images/mz/upload.png" style="width:40rpx;height:40rpx;margin-top:5rpx;margin-left:20rpx"></image>-->
 					<text>可拍身份证照片上传基本信息</text>
 				</view>
-				<view class="block"><text class="red">*</text>姓名<input bindblur="tab1Change1" placeholder="请填写老人姓名" value="{{oldInfo[currentActiveIndex].name}}" /></view>
+				<view class="block"><text class="red">*</text>姓名<input bindblur="tab1Change1" placeholder="请填写老人姓名" value="{{oldInfo[activeIndex].name}}" /></view>
 				<view wx:if="{{oldName}}" class="required">老人姓名不能为空哦！</view>
 				<view class="block">
 					<view class="name"><text class="red">*</text>性别</view>
 					<radio-group bindchange="tab1Change2">
-						<label wx:for="{{oldInfo[currentActiveIndex].oldSex}}" wx:key="{{item.name}}">
+						<label wx:for="{{oldInfo[activeIndex].oldSex}}" wx:key="{{item.name}}">
 							<radio value="{{item.name}}" checked="{{item.checked}}" color="#fff" />{{item.name}}
 						</label>
 					</radio-group>
 				</view>
 				<view class="name"><text class="red">*</text>民族</view>
-				<picker bindchange="tab1Change3" value="{{oldInfo[currentActiveIndex].nation}}" range="{{mzArr}}">
+				<picker bindchange="tab1Change3" value="{{oldInfo[activeIndex].nation}}" range="{{mzArr}}">
 					<view class="picker">
-						{{oldInfo[currentActiveIndex].nation}}
+						{{oldInfo[activeIndex].nation}}
 					</view>
 				</picker>
-				<view class="block"><text class="red">*</text>身份证号<input bindblur="tab1Change4" placeholder="请填写老人身份证号" value="{{oldInfo[currentActiveIndex].idNumber}}" /></view>
+				<view class="block"><text class="red">*</text>身份证号<input bindblur="tab1Change4" placeholder="请填写老人身份证号" value="{{oldInfo[activeIndex].idNumber}}" /></view>
 				<view wx:if="{{oldCard}}" class="required">老人身份证号不能为空哦！</view>
 				<view wx:if="{{oldCard1}}" class="required">老人身份证号格式不对哦！</view>
-				<view class="block"><text class="red">*</text>联系电话<input bindblur="tab1Change5" placeholder="请填写联系电话" value="{{oldInfo[currentActiveIndex].phone}}" /></view>
+				<view class="block"><text class="red">*</text>联系电话<input bindblur="tab1Change5" placeholder="请填写联系电话" value="{{oldInfo[activeIndex].phone}}" /></view>
 				<view wx:if="{{oldPhone}}" class="required">老人联系电话不能为空哦！</view>
 				<view wx:if="{{oldPhone1}}" class="required">老人联系电话格式不对哦！</view>
 				<view class="block"><text class="red">*</text>户籍地址
@@ -127,74 +127,76 @@
 				<view class="block">
 					<view class="name"><text class="red">*</text>婚姻及配偶情况</view>
 					<radio-group bindchange="tab1Change8">
-						<label wx:for="{{oldInfo[currentActiveIndex].oldMarry}}" wx:key="{{item.name}}">
+						<label wx:for="{{oldInfo[activeIndex].oldMarry}}" wx:key="{{item.name}}">
 							<radio value="{{item.name}}" checked="{{item.checked}}" color="#fff" />{{item.name}}
 						</label>
 					</radio-group>
 				</view>
-				<view wx:if="{{oldInfo[currentActiveIndex].oldMarry[1].checked}}" class="block"><text class="red">*</text>配偶姓名<input bindblur="tab1Change8_1" placeholder="请填写配偶姓名" value="{{oldInfo[currentActiveIndex].partnerName}}" /></view>
+				<view wx:if="{{oldInfo[activeIndex].oldMarry[1].checked}}" class="block"><text class="red">*</text>配偶姓名<input bindblur="tab1Change8_1" placeholder="请填写配偶姓名" value="{{oldInfo[activeIndex].partnerName}}" /></view>
 				<view wx:if="{{oldisMarryName}}" class="required">配偶姓名不能为空哦！</view>
-				<view wx:if="{{oldInfo[currentActiveIndex].oldMarry[1].checked}}" class="block"><text class="red">*</text>配偶身份证号<input bindblur="tab1Change8_2" placeholder="请填写配偶联系电话" value="{{oldInfo[currentActiveIndex].partnerIdNumber}}" /></view>
+				<view wx:if="{{oldInfo[activeIndex].oldMarry[1].checked}}" class="block"><text class="red">*</text>配偶身份证号<input bindblur="tab1Change8_2" placeholder="请填写配偶联系电话" value="{{oldInfo[activeIndex].partnerIdNumber}}" /></view>
 				<view wx:if="{{oldisMarryPhone}}" class="required">配偶身份证号不能为空哦！</view>
 				<view wx:if="{{oldisMarryPhoneGs}}" class="required">配偶身份证号格式不对哦！</view>
 				<view class="block">
 					<view class="name"><text class="red">*</text>健康状况</view>
 					<checkbox-group bindchange="tab1Change9">
-						<label wx:for="{{oldInfo[currentActiveIndex].healthAyy}}" wx:key="{{item.name}}">
+						<label wx:for="{{oldInfo[activeIndex].healthAyy}}" wx:key="{{item.name}}">
 							<checkbox value="{{item.name}}" color="#fff" disabled="{{item.disabled}}" checked="{{item.checked}}" />{{item.name}}
 						</label>
 					</checkbox-group>
 				</view>
 				<view wx:if="{{oldHealth1}}" class="required">老人健康状况不能为空哦！</view>
-				<view class="block" wx:if="{{oldHealth2}}">
+				<view class="block" wx:if="{{oldInfo[activeIndex].healthAyy[1].checked}}">
 					<view class="name"><text class="red">*</text>残疾类别</view>
 					<checkbox-group bindchange="tab1Change10">
-						<label wx:for="{{disabilityAyy}}" wx:key="{{item}}">
-							<checkbox value="{{item}}" color="#fff" />{{item}}
+						<label wx:for="{{oldInfo[activeIndex].disabilityAyy}}" wx:key="{{item.name}}">
+							<checkbox value="{{item.name}}" checked="{{item.checked}}" color="#fff" />{{item.name}}
 						</label>
 					</checkbox-group>
 				</view>
 				<view wx:if="{{oldDisableType}}" class="required">老人残疾类别不能为空哦！</view>
-				<view wx:if="{{oldHealth2}}">
+				<view wx:if="{{oldInfo[activeIndex].healthAyy[1].checked}}">
 					<view class="name"><text class="red">*</text>残疾人等级</view>
-					<picker bindchange="tab1Change11" value="{{disableLeval[levalIndex]}}" range="{{disableLeval}}">
+					<picker bindchange="tab1Change11" value="{{oldInfo[activeIndex].disabilityLevel}}" range="{{disableLeval}}">
 						<view class="picker">
-							{{disableLeval[levalIndex]}}
+							{{oldInfo[activeIndex].disabilityLevel}}
 						</view>
 					</picker>
 				</view>
-				<view class="block" wx:if="{{isSick}}">
+				<view class="block" wx:if="{{oldInfo[activeIndex].healthAyy[2].checked}}">
 					<view class="name"><text class="red">*</text>重特大疾病类别</view>
 					<checkbox-group bindchange="tab1Change10_1">
-						<label wx:for="{{sickType}}" wx:key="{{item}}">
-							<checkbox value="{{item}}" color="#fff" />{{item}}
+						<label wx:for="{{oldInfo[activeIndex].sickType}}" wx:key="{{item.name}}">
+							<checkbox value="{{item.name}}" checked="{{item.checked}}" color="#fff" />{{item.name}}
 						</label>
 					</checkbox-group>
 				</view>
 				<view wx:if="{{issickTypeNull}}" class="required">重特大疾病类别类别不能为空哦！</view>
 				<view class="name"><text class="red">*</text>老年人能力情况</view>
-				<picker bindchange="tab1Change12" value="{{this.data.oldInfo[this.data.currentActiveIndex].ableStatus[ableIndex]}}" range="{{ableStatus}}">
+				<picker bindchange="tab1Change12" value="{{oldInfo[activeIndex].ability}}" range="{{ableStatus}}">
 					<view class="picker">
-						{{this.data.oldInfo[this.data.currentActiveIndex].ableStatu[ableIndex]}}
+						{{oldInfo[activeIndex].ability}}
 					</view>
 				</picker>
 				<view class="name"><text class="red">*</text>生活经济情况</view>
-				<picker bindchange="tab1Change13" value="{{moneyStatus[moneyIndex]}}" range="{{moneyStatus}}">
+				<picker bindchange="tab1Change13" value="{{oldInfo[activeIndex].livingCondition}}" range="{{moneyStatus}}">
 					<view class="picker">
-						{{moneyStatus[moneyIndex]}}
+						{{oldInfo[activeIndex].livingCondition}}
 					</view>
 				</picker>
 				<view class="block">
 					<view class="name"><text class="red">*</text>收入来源</view>
 					<checkbox-group bindchange="tab1Change14">
-						<label wx:for="{{moneyFromAyy}}" wx:key="{{item}}">
-							<checkbox value="{{item}}" color="#fff" />{{item}}
+						<label wx:for="{{oldInfo[activeIndex].moneyFromAyy}}" wx:key="{{item.name}}">
+							<checkbox value="{{item.name}}" checked="{{item.checked}}" color="#fff" />{{item.name}}
 						</label>
 					</checkbox-group>
 				</view>
 				<view wx:if="{{moneyFromOther}}" class="required">收入来源不能为空哦！</view>
-				<input wx:if="{{moneyOtherQt}}" placeholder="请填写其它收入来源" bindblur="tab1Change14_1" name="name" class="otherinput" />
+				<input wx:if="{{oldInfo[activeIndex].moneyFromAyy[4].checked}}" placeholder="请填写其它收入来源" bindblur="tab1Change14_1" name="name" class="otherinput" />
 				<view wx:if="{{moneyOtherQtnull}}" class="required">其它收入来源不能为空哦！</view>
+
+				
 				<view class="name"><text class="red">*</text>本人上年度可支配收入</view>
 				<picker bindchange="tab1Change15" value="{{payMoney[payIndex]}}" range="{{payMoney}}">
 					<view class="picker">