Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

src/views/sunVillage_info/familyMember/familyMemberDetail.vue

@@ -95,7 +95,7 @@
         />
         <van-field name="radio" label="是否贫困户" input-align="right" autocomplete="off">
           <template #input>
-            <van-radio-group v-model="circulation.sfpkh" direction="horizontal">
+            <van-radio-group v-model="circulation.isPoor" direction="horizontal">
               <van-radio name="1">是</van-radio>
               <van-radio name="0">否</van-radio>
             </van-radio-group>
@@ -103,7 +103,7 @@
         </van-field>
         <van-field name="radio" label="是否五保户" input-align="right" autocomplete="off">
           <template #input>
-            <van-radio-group v-model="circulation.sfwbh" direction="horizontal">
+            <van-radio-group v-model="circulation.isFiveInsured" direction="horizontal">
               <van-radio name="1">是</van-radio>
               <van-radio name="0">否</van-radio>
             </van-radio-group>

src/views/user/signature/signatureList.vue

@@ -20,11 +20,11 @@
           <div class="item" @click="goDetail(item.id)">
             <div class="info">
               <div class="title">
-                <i class="icon_box" v-if="item.firstSigning==null"></i>
-                <i class="icon_box1" v-if="item.firstSigning!=null"></i>
-                <p class="news_title" :style="{'color': item.firstSigning!=null?'#2bc30c':'#eb1616'}">{{item.contractCode}}</p>
-                <p class="tips_mark" :style="{'color': item.firstSigning!=null?'#79bc29':'#f8a83d','background': item.firstSigning!=null?'#e8ffcd':'#ffedcd'}">{{item.signingMode}}</p>
-                <p class="tips_mark2" :style="{'background': item.firstSigning!=null?'#2bc30c':'#eb1616'}">{{item.signingStatus}}</p>
+                <i class="icon_box" v-if="item.secondSigning==null"></i>
+                <i class="icon_box1" v-if="item.secondSigning!=null"></i>
+                <p class="news_title" :style="{'color': item.secondSigning!=null?'#2bc30c':'#eb1616'}">{{item.contractCode}}</p>
+                <p class="tips_mark" :style="{'color': item.secondSigning!=null?'#79bc29':'#f8a83d','background': item.secondSigning!=null?'#e8ffcd':'#ffedcd'}">{{item.signingMode}}</p>
+                <p class="tips_mark2" :style="{'background': item.secondSigning!=null?'#2bc30c':'#eb1616'}">{{item.signingStatus}}</p>
               </div>
               <div class="time">
                 <p>{{item.contractName}}</p>
@@ -35,7 +35,7 @@
           <template #right>
             <div class="operation">
               <!-- delete 删除 edit编辑 view查看 list榜单 -->
-              <div class="opera_btn" style="margin-right: 10px;" v-if="item.signingMode == '线上' && item.firstIsSign =='否' " @click="openPopup(item.id)">
+              <div class="opera_btn" style="margin-right: 10px;" v-if="item.signingMode == '线上' && item.secondIsSign =='否' " @click="openPopup(item.id)">
                 <img src="../../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="35">
                 <p>签名</p>
               </div>