Merge branch 'ren' into develop

src/pages/contractCreate/contract-create-list.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime : 2019-12-26 13:30:22
+ * @LastEditTime : 2019-12-26 17:27:43
  * @LastEditors  : Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -85,16 +85,17 @@ export default {
   watch: {
     'num': {
       handler (newVal, oldVal) {
+        this.$refs.scroll.scrollToTop()
         this.$refs.scroll.update(false)
         if (newVal === 2) {
           if (!this.approvedFlag) {
             this.contractList()
           }
-          this.$refs.scroll.scrollToTop()
+          //  this.$refs.scroll.scrollToTop()
           this.showLists = this.approvedLists
         } else if (newVal === 1) {
           this.showLists = this.submitLists
-          this.$refs.scroll.scrollToTop()
+          // this.$refs.scroll.scrollToTop()
         }
       },
     },

src/pages/contractCreate/create-enclosure-info.vue

@@ -76,7 +76,7 @@
         <!--待上传图片列表-->
         <div
           v-for="(item, index) in upload_list"
-          v-if="item.check_id==list.check_id"
+          v-if="item.check_id === checkId"
           :key="index"
           class="card-upload"
         >
@@ -87,14 +87,14 @@
         </div>
         <!--从服务器上下载的图片-->
         <div v-for="(pic, index) in dowload_list" :key="index">
-          <div v-if="pic.check_id==list.check_id" :key="index" class="card-upload">
+          <div v-if="pic.check_id==checkId" :key="index" class="card-upload">
             <img :src="pic.url" @click="showBigPicture(pic.url)" >
             <div class="close" @click="delete_pic(pic.attachment_id)">
               <img src="@/assets/userBind/deleteIcon.png" >
             </div>
           </div>
         </div>
-        <div class="card-upload plus" @click="ocrShow(list.description,list.check_id)">
+        <div class="card-upload plus" @click="ocrShow('','')">
           <img src="@/assets/userBind/camera.png" class="upload-btn" >
         </div>
       </div>

src/pages/contractInquire/repay-plans.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-31 09:49:57
- * @LastEditTime : 2019-12-24 18:34:37
+ * @LastEditTime : 2019-12-26 16:47:18
  * @LastEditors  : Please set LastEditors
  * @Description: 还款
  * @FilePath:
@@ -368,13 +368,13 @@ export default {
         // flex: 9;
         display: flex;
         flex-direction: column;
-        justify-content: space-evenly;
         font-family: PingFangSC-Regular;
         font-size: 13px;
         color: #4B4A4B;
-        //padding-top: 20px;
-        margin-left: 40px;
-        margin-top: -16px;
+        margin-left: 20px;
+        div:nth-of-type(2) {
+          margin-top: 12px;
+        }
         span:nth-of-type(2) {
           margin-left: 8px;
         }

src/pages/contractSigning/contract-repay-plan.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-30 19:29:24
- * @LastEditTime : 2019-12-24 18:38:21
+ * @LastEditTime : 2019-12-26 16:47:28
  * @LastEditors  : Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -404,13 +404,13 @@ export default {
         // flex: 9;
         display: flex;
         flex-direction: column;
-        justify-content: space-evenly;
         font-family: PingFangSC-Regular;
         font-size: 13px;
         color: #4B4A4B;
-        //padding-top: 20px;
-        margin-left: 40px;
-        margin-top: -16px;
+        margin-left: 20px;
+        div:nth-of-type(2) {
+          margin-top: 12px;
+        }
         span:nth-of-type(2) {
           margin-left: 8px;
         }

src/pages/distributorSign/contract-list.vue

@@ -76,7 +76,7 @@ export default {
   watch: {
     'num': {
       handler (newVal, oldVal) {
-        this.$refs.scroll.update(false)
+        // this.$refs.scroll.update(false)
         this.$refs.scroll.scrollToTop()
         if (newVal === 2) {
           if (!this.approvedFlag) {

src/pages/distributorSign/financ-details.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-30 19:29:24
- * @LastEditTime : 2019-12-24 18:39:52
+ * @LastEditTime : 2019-12-26 16:47:36
  * @LastEditors  : Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -368,13 +368,13 @@ export default {
         // flex: 9;
         display: flex;
         flex-direction: column;
-        justify-content: space-evenly;
         font-family: PingFangSC-Regular;
         font-size: 13px;
         color: #4B4A4B;
-        //padding-top: 20px;
-        margin-left: 40px;
-        margin-top: -16px;
+        margin-left: 20px;
+        div:nth-of-type(2) {
+          margin-top: 12px;
+        }
         span:nth-of-type(2) {
           margin-left: 8px;
         }

src/pages/financingTrial/trial-repay-plan.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-30 19:29:24
- * @LastEditTime : 2019-12-24 18:41:37
+ * @LastEditTime : 2019-12-26 16:47:07
  * @LastEditors  : Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -386,13 +386,13 @@ export default {
         // flex: 9;
         display: flex;
         flex-direction: column;
-        justify-content: space-evenly;
         font-family: PingFangSC-Regular;
         font-size: 13px;
         color: #4B4A4B;
-        //padding-top: 20px;
-        margin-left: 40px;
-        margin-top: -16px;
+        margin-left: 20px;
+        div:nth-of-type(2) {
+          margin-top: 12px;
+        }
         span:nth-of-type(2) {
           margin-left: 8px;
         }

src/pages/messageCenter/message-list.vue

@@ -4,11 +4,7 @@
       <div slot="center" class="top-word">消息通知</div>
     </h-header>
     <!-- <h-content class="content"> -->
-      <div v-if="list.length===0">
-        <div class="display">
-          <img src="@/assets/messageCenter/noMsg.png" alt="">
-        </div>
-      </div>
+
     <scroll
       v-if="list.length !== 0"
       ref="scroll" :updateData="[list]" :pullUp="true" class="has-footer"
@@ -59,6 +55,11 @@
       </section>
       <!-- </h-content> -->
     </scroll>
+    <div v-if="list.length===0">
+      <div class="display">
+        <img src="@/assets/messageCenter/noMsg.png" alt="">
+      </div>
+    </div>
   </h-view>
 </template>
 <script>

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

@@ -47,7 +47,11 @@
       </list-item>
 </div>
       </scroll>
-
+      <div v-if="productList.length===0">
+      <div class="display">
+        <img src="@/assets/messageCenter/noMsg.png" alt="">
+      </div>
+      </div>
   </h-view>
 </template>
 
@@ -208,6 +212,15 @@ export default {
 
 <style lang="less" rel="stylesheet">
 #my-collect {
+  .display {
+    position: fixed;
+    top: 0;
+    img {
+      width: 100%;
+      height: 100%;
+     // margin-top: -70px;
+    }
+  }
   .search {
       background-color: #fff;
       padding: 8px 12px;

src/pages/productQuery/product-list.vue

 <!--
    * @Description: 产品展示列表
  * @Author: y/>e: 2019-10-16 14:39:07
- * @LastEditors: Please set LastEditors
+ * @LastEditors  : Please set LastEditors
  -->
 <template>
   <h-view id="prolist" class="public-style" title="产品查询">
@@ -47,6 +47,11 @@
         </list-item>
       </div>
     </scroll>
+    <div v-if="lists.length===0">
+      <div class="display">
+        <img src="@/assets/messageCenter/noMsg.png" alt="">
+      </div>
+    </div>
   </h-view>
 </template>
 <script>
@@ -206,6 +211,15 @@ export default {
 </script>
 <style lang='less'>
 #prolist {
+  .display {
+    position: fixed;
+    top: 0;
+    img {
+      width: 100%;
+      height: 100%;
+     // margin-top: -70px;
+    }
+  }
     .search {
       background-color: #fff;
       padding: 8px 12px;