Merge branch 'ren' into develop

src/pages/distributorSign/contract-details.vue

@@ -2,7 +2,7 @@
  * @Description: 合同详情
  * @Author: your name
  * @Date: 2019-09-25 15:38:21
- * @LastEditTime: 2019-11-15 15:41:08
+ * @LastEditTime: 2019-11-15 17:38:34
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -24,7 +24,7 @@
       <Personal v-if="!bp_flag" :baseInfo="baseInfo"/>
 
       <div class="equipment-list">担保人信息<span v-if="guarantorInfo.length === 0">(无)</span></div>
-      <list-item v-if="guarantorInfo.length && guarantorInfo[0].bp_class === 'NP'" :item-height="76">
+      <list-item v-if="guarantorInfo.length" :item-height="76">
         <item v-for="(item,index) in guarantorInfo" :key="index">
           <div slot="name">
             <span class="name-box">{{ index+1 }}</span>
@@ -35,12 +35,12 @@
             <img src="@/assets/intoApproval/introduce.png" >
             <span :title="item.bp_name">{{ item.bp_name }}</span>
             <br >
-            <span>{{ item.id_card_no }}</span>
+            <span>{{ item.bp_class==='NP'? item.id_card_no: item.organization_code }}</span>
           </div>
         </item>
       </list-item>
 
-      <list-item v-if="guarantorInfo.length && guarantorInfo[0].bp_class === 'ORG'" :item-height="76">
+      <!-- <list-item v-if="guarantorInfo.length && guarantorInfo[0].bp_class === 'ORG'" :item-height="76">
         <item v-for="(item,index) in guarantorInfo" :key="index">
           <div slot="name">
             <span class="name-box">{{ index+1 }}</span>
@@ -54,7 +54,7 @@
             <span>{{ item.organization_code }}</span>
           </div>
         </item>
-      </list-item>
+      </list-item> -->
 
       <!-- 联系人 -->
       <div class="bottom-call-wrap">
@@ -328,7 +328,7 @@ export default {
    // 执行同意的逻辑(查询对应的身份证正面图片->人脸识别->确认签约)
    async confirmContractSign (faceImg, status) {
      let idCardImgUrl = await this.idCardImgUrlGet()
-     if(idCardImgUrl){
+     if (idCardImgUrl) {
        this.faceIdentify(faceImg, idCardImgUrl, status)
      }
    },
@@ -345,7 +345,7 @@ export default {
      if (res.result === 'S' && res.info) {
        let cardUrl = process.env.filePath + 'attachment_id=' + res.info.attachment_id + '&access_token=' + window.localStorage.access_token
        return cardUrl
-     } else if(res.result === 'S' && !res.info){
+     } else if (res.result === 'S' && !res.info) {
        hlsPopup.showLongCenter('未找到身份证照片')
        return null
      } else {