Merge branch 'ren' into develop

src/pages/contractInquire/contract-records.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-31 09:49:57
- * @LastEditTime: 2019-12-05 14:53:37
+ * @LastEditTime: 2019-12-17 11:25:28
  * @LastEditors: Please set LastEditors
  * @Description: 合同查询--记录
  * @FilePath:
@@ -522,6 +522,7 @@ export default {
       padding-left: 12px;
       border-radius: 4px;
       height: 36px;
+      line-height: 36px;
       width: 100%;
       font-family: PingFangSC-Regular;
       font-size: 14px;
@@ -766,6 +767,20 @@ export default {
         .scrollContent {
           padding-top: 3.8rem;
         }
+        .search {
+        input {
+          background: url("../../assets/contractStart/search1.png") 320px
+            no-repeat;
+          background-size: 16px 16px;
+          background-color: rgba(239, 239, 239, 0.55);
+          padding: 8px 12px;
+          border-radius: 4px;
+          width: 100%;
+          font-family: PingFangSC-Regular;
+          font-size: 14px;
+          color: #888c8f;
+        }
+      }
       }
     }
   }

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-12-06 10:54:14
+ * @LastEditTime: 2019-12-17 11:23:24
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -405,7 +405,7 @@ export default {
         font-family: PingFangSC-Regular;
         font-size: 14px;
         color: #888C8F;
-        // line-height: 36px;
+        line-height: 36px;
         background: url("../../assets/contractStart/search1.png") 320px no-repeat;
         background-size: 16px 16px;
         background-color: rgba(239, 239, 239, 0.55);
@@ -531,6 +531,20 @@ export default {
         .scrollContent {
           padding-top: 4.2rem;
         }
+        .search {
+        input {
+          background: url("../../assets/contractStart/search1.png") 320px
+            no-repeat;
+          background-size: 16px 16px;
+          background-color: rgba(239, 239, 239, 0.55);
+          padding: 8px 12px;
+          border-radius: 4px;
+          width: 100%;
+          font-family: PingFangSC-Regular;
+          font-size: 14px;
+          color: #888c8f;
+        }
+      }
       }
     }
   }

src/pages/distributorSign/contract-list.vue

@@ -508,6 +508,20 @@ export default {
         .scrollContent {
           padding-top: 4.08rem;
         }
+        .search {
+        input {
+          background: url("../../assets/contractStart/search1.png") 320px
+            no-repeat;
+          background-size: 16px 16px;
+          background-color: rgba(239, 239, 239, 0.55);
+          padding: 8px 12px;
+          border-radius: 4px;
+          width: 100%;
+          font-family: PingFangSC-Regular;
+          font-size: 14px;
+          color: #888c8f;
+        }
+      }
       }
     }
   }

src/pages/financingTrial/financing-trial.vue

@@ -2,7 +2,7 @@
  * @Descrip 融资试算
  * @Author: your name
  * @Date: 2019-09-29 17:09:49
- * @LastEditTime: 2019-12-06 15:14:53
+ * @LastEditTime: 2019-12-17 11:21:41
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -308,7 +308,7 @@ export default {
         font-family: PingFangSC-Regular;
         font-size: 14px;
         color: #888C8F;
-        //line-height: 36px;
+        line-height: 36px;
       }
 
       input::placeholder {
@@ -435,6 +435,20 @@ export default {
         .scrollContent {
           padding-top: 2.72rem;
         }
+        .search {
+        input {
+          background: url("../../assets/contractStart/search1.png") 320px
+            no-repeat;
+          background-size: 16px 16px;
+          background-color: rgba(239, 239, 239, 0.55);
+          padding: 8px 12px;
+          border-radius: 4px;
+          width: 100%;
+          font-family: PingFangSC-Regular;
+          font-size: 14px;
+          color: #888c8f;
+        }
+      }
       }
     }
   }

src/pages/myProductCollection/my-product-list.Vue

@@ -226,7 +226,7 @@ export default {
         font-family: PingFangSC-Regular;
         font-size: 14px;
         color: #888C8F;
-        //line-height: 36px;
+        line-height: 36px;
       }
 
       input::placeholder {
@@ -341,6 +341,20 @@ export default {
         .scrollContent {
           padding-top: 3.1rem;
         }
+        .search {
+        input {
+          background: url("../../assets/contractStart/search1.png") 320px
+            no-repeat;
+          background-size: 16px 16px;
+          background-color: rgba(239, 239, 239, 0.55);
+          padding: 8px 12px;
+          border-radius: 4px;
+          width: 100%;
+          font-family: PingFangSC-Regular;
+          font-size: 14px;
+          color: #888c8f;
+        }
+      }
       }
     }
   }

src/pages/productQuery/product-list.vue

@@ -219,7 +219,7 @@ export default {
         font-family: PingFangSC-Regular;
         font-size: 14px;
         color: #21254c;
-        // line-height: 36px;
+        line-height: 36px;
         border-radius: 4px;
         background: url("../../assets/contractStart/search1.png") 320px no-repeat;
         background-size: 16px 16px;
@@ -339,6 +339,20 @@ export default {
         .scrollContent {
           padding-top: 2.72rem;
         }
+        .search {
+        input {
+          background: url("../../assets/contractStart/search1.png") 320px
+            no-repeat;
+          background-size: 16px 16px;
+          background-color: rgba(239, 239, 239, 0.55);
+          padding: 8px 12px;
+          border-radius: 4px;
+          width: 100%;
+          font-family: PingFangSC-Regular;
+          font-size: 14px;
+          color: #888c8f;
+        }
+      }
       }
     }
   }

src/pages/productQuery/query-home.vue

@@ -2,7 +2,7 @@
    * @Descrip: 查询首页
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-11-22 09:45:40
+ * @LastEditTime: 2019-12-17 11:27:19
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -231,7 +231,7 @@ export default {
         font-family: PingFangSC-Regular;
         font-size: 14px;
         color: #21254c;
-        // line-height: 36px;
+        line-height: 36px;
         border-radius: 4px;
         background: url("../../assets/contractStart/search1.png") 320px no-repeat;
         background-size: 16px 16px;
@@ -378,6 +378,20 @@ export default {
         .scrollContent {
           padding-top: 2.72rem;
         }
+        .search {
+        input {
+          background: url("../../assets/contractStart/search1.png") 320px
+            no-repeat;
+          background-size: 16px 16px;
+          background-color: rgba(239, 239, 239, 0.55);
+          padding: 8px 12px;
+          border-radius: 4px;
+          width: 100%;
+          font-family: PingFangSC-Regular;
+          font-size: 14px;
+          color: #888c8f;
+        }
+      }
       }
     }
   }

src/pages/userBindNew/org/enclosure.vue

@@ -2,7 +2,7 @@
  * @Description: 附件信息
  * @Author: your name
  * @Date: 2019-09-20 09:35:11
- * @LastEditTime: 2019-12-16 17:55:43
+ * @LastEditTime: 2019-12-17 14:24:15
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -15,7 +15,7 @@
     </h-header>
     <h-content>
       <div v-for="(list, index) in cddItemList" :key="index" class="card2">
-        <span>{{ list.description }}</span>
+        <span class="descript-color">{{ list.description }}</span>
         <div class="img-content">
           <!-- 房产 -->
           <div v-if="list.cdd_item==='HOUSE_CARD'">
@@ -136,7 +136,7 @@
             </list-item>
           </div>
           <!-- 不动产 -->
-          <!-- <div v-if="list.cdd_item==='REAL_EST_CERTIFICATE'">
+          <div v-if="list.cdd_item==='REAL_EST_CERTIFICATE'">
             <div v-if="!propertyImg" class="card-upload plus" @click="ocrShow(list.cdd_item, '')">
               <img src="@/assets/userBind/camera.png" class="upload-btn" >
             </div>
@@ -148,8 +148,8 @@
             <div v-if="propertyImg&&!isApproved" class="card-upload">
               <img :src="propertyImg" @click="ocrShow(list.cdd_item, '')">
             </div>
-          </div> -->
-          <!-- <div v-if="list.cdd_item==='REAL_EST_CERTIFICATE'">
+          </div>
+          <div v-if="list.cdd_item==='REAL_EST_CERTIFICATE'">
             <list-item :item-height="44" class="card-Info">
               <item>
                 <div slot="name">权利人</div>
@@ -228,7 +228,7 @@
                 <input slot="content" v-model="propertyInfo.right_others" placeholder="识别不动产权证自动填充" >
               </item>
             </list-item>
-          </div> -->
+          </div>
           <!-- 车辆 -->
           <div v-if="list.cdd_item==='CAR_CARD'">
             <div v-if="!carImg" class="card-upload plus" @click="ocrShow(list.cdd_item, '')">
@@ -326,7 +326,7 @@
               </div>
             </div>
             <!--从服务器上下载的图片-->
-            <div v-for="(pic, index) in dowload_list[0]" :key="index">
+            <div v-for="(pic, index) in dowload_list" :key="index">
               <div v-if="pic.check_id==list.check_id" :key="index" class="card-upload">
                 <img :src="pic.url" @click="showBigPicture(pic.url)" >
                 <div class="close" @click="delete_pic(pic.attachment_id)">
@@ -759,6 +759,7 @@ export default {
           })
           vm.cddItemList = res.lists.filter(item => { return item.cdd_item === 'HOUSE_CARD' || item.cdd_item === 'CAR_CARD' || item.cdd_item === 'ASSETS_CARD' || item.cdd_item === 'REAL_EST_CERTIFICATE' })
           // 查询图片
+          console.log('cddItemList.........', vm.cddItemList)
           vm.cddItemList.forEach((item, index) => {
             vm.load_picture(item.check_id, index, item.cdd_item)
           })
@@ -767,6 +768,7 @@ export default {
     },
 
     load_picture (check_id, index, cdd_item) {
+      console.log(check_id, cdd_item)
       let vm = this
       let url = process.env.basePath + 'attachment_list_query' + '&index' + index // 附件查询
       let param = {
@@ -776,6 +778,7 @@ export default {
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
+          console.log('load_picture....1111 ', res.lists)
           res.lists.forEach(item => {
             item['url'] = process.env.filePath + 'attachment_id=' + item.attachment_id + '&access_token=' + window.localStorage.access_token
           })
@@ -792,8 +795,13 @@ export default {
               }
               vm.carAttachmentId = res.lists[0].attachment_id
               break
+            case 'ASSETS_CARD':
+              console.log('ASSETS_CARD............', res.lists)
+              vm.dowload_list = [...res.lists]
+              break
             default:
-              vm.dowload_list.push(res.lists)
+              // vm.dowload_list.push(res.lists[0])
+              // console.log('dowload_list.............', vm.dowload_list)
           }
         } else {
           hlsPopup.showLongCenter(res.message)
@@ -802,6 +810,7 @@ export default {
     },
     // 图片上传入口
     imgUploadShow (description, check_id) {
+      console.log(description, check_id)
       let vm = this
       hlsPopup.showActionSheet({
         titleText: '请选择照片',
@@ -902,8 +911,9 @@ export default {
     },
     remove_upload_list (attachment_id, index) {
       let vm = this
-      vm.upload_list.remove(index)
-      vm.upload_list.sort()
+      vm.upload_list = vm.upload_list.filter(item => { return item.attachment_id !== attachment_id })
+      // vm.upload_list.remove(index)
+      // vm.upload_list.sort()
     },
     // 删除图片
     delete_pic (attachment_id) {
@@ -927,18 +937,11 @@ export default {
       })
     },
     remove_dowload_list (attachment_id) {
+      console.log('attachment_id', attachment_id)
       let vm = this
-      for (let i = 0; i < vm.dowload_list.length; i++) {
-        let list = vm.dowload_list[i]
-        for (let j = 0; j < list.length; j++) {
-          let li = list[j]
-          if (parseFloat(li.attachment_id) === parseFloat(attachment_id)) {
-            list.remove(j)
-            break
-          }
-        }
-      }
-      vm.dowload_list.sort()
+      vm.dowload_list = vm.dowload_list.filter(item => {
+        return item.attachment_id !== attachment_id
+      })
     },
     // 图片保存
     save_picture (list) {
@@ -1018,7 +1021,9 @@ export default {
         background-color: #fff;
         display: flex;
         flex-direction: column;
-
+        .descript-color {
+          color: #1D3FFF
+        }
         span {
           color: #656464;
           font-size: 13px;