Merge branch 'rongxin_dev' of http://218.59.175.43:3000/zhangzl/nsgk_mobile into rongxin_dev

src/views/notice/attestationDetail.vue

@@ -28,9 +28,7 @@
       <div class="block_tt"><i></i>转出方信息</div>
 <!--      <van-divider :style="{ borderColor: '#0CBEA6', padding: '0 16px' }"></van-divider>-->
       <van-cell title="转出方" :value="attestationDetail.outName" />
-      <van-cell title="转出行为批准机构名称" :value="attestationDetail.pzjg" />
-      <van-cell title="法定代表人（转出方）" :value="attestationDetail.legalPerson" />
-      <van-cell title="注册号（身份证）" :value="attestationDetail.idCardNum" />
+      <van-cell title="法定代表人" :value="attestationDetail.legalPerson" />
     </div>
 
     <div class="block_box orbg">
@@ -38,9 +36,7 @@
 <!--      <van-divider :style="{ borderColor: '#FD683F', padding: '0 16px' }">受让方信息</van-divider>-->
       <van-cell title="受让方" :value="attestationDetail.inName" />
       <van-cell title="单位性质" :value="attestationDetail.companyNature" />
-      <van-cell title="法定代表人（受让方）" :value="attestationDetail.realname" />
-      <van-cell title="注册资本" :value="attestationDetail.companyCapital" />
-      <van-cell title="注册号（身份证）" :value="attestationDetail.companyLicense" />
+      <van-cell title="法定代表人" :value="attestationDetail.realname" />
     </div>
 
     <p class="btm_p">农村产权交易鉴证书</p>

src/views/project/projectDetail.vue

@@ -97,14 +97,14 @@
             <van-col span="24"><span>住址</span>{{ detail.address }}</van-col>
           </van-row>
           <van-row>
-            <van-col span="24"><span>经济类型</span>{{ detail.economicType }}</van-col>
+            <van-col span="24"><span>转出方类型</span>{{ detail.economicType }}</van-col>
           </van-row>
           <van-row>
             <van-col span="24"><span>统一社会信用代码</span>{{ detail.areaNum }}</van-col>
           </van-row>
           <van-row>
-            <van-col span="12"><span>法人/负责人</span>{{ detail.legalPerson }}</van-col>
-            <van-col span="12"><span>联系电话</span>{{ detail.phone }}</van-col>
+            <van-col span="12"><span>项目联系人</span>{{ detail.linkPerson }}</van-col>
+            <van-col span="12"><span>联系电话</span>{{ detail.linkPhone }}</van-col>
           </van-row>
           <van-row>
             <van-col span="12"><span>项目类型</span>{{ detail.projectNumber }}</van-col>

src/views/register/userRegister.vue

@@ -39,7 +39,7 @@
             <van-uploader :after-read="afterReadSFZ" :before-delete="deleteFileSFZ" v-model="fileListSFZ" multiple :max-count="1" />
           </template>
         </van-field>
-        <p style="color: red;padding: 2vw 3vw;">*身份证照片、本人和身份证的合影</p>
+        <p style="color: red;padding: 2vw 3vw;">*身份证照片</p>
       </div>
 
 <!--      <van-divider>银行信息</van-divider>-->