Merge branch 'master' of http://zyys.donghuajinyun.com/gitlib/jiangzaicheng/mcep-h5

src/App.vue

 <template>
   <div id="app">
-    <transition :name="animateName">
+<!--    <transition :name="animateName">-->
       <keep-alive>
         <router-view class="router-container" v-if="$route.meta.keepAlive"> </router-view>
       </keep-alive>
-    </transition>
+<!--    </transition>-->
 <!--    <transition :name="animateName">-->
       <router-view class="router-container" v-if="!$route.meta.keepAlive"> </router-view>
 <!--    </transition>-->

src/components/general/ScrollerView.vue

@@ -179,7 +179,7 @@ export default class ScrollerView extends Vue {
   initHeight() {
     const el: any = this.$el;
     if (this.height) {
-      el.style.height = this.height + "px";
+      el.style.height = this.height + "vh";
     }
   }
 }

src/views/workbench/AccommodMain.vue

@@ -12,9 +12,9 @@
     <div class="rarle">
       <tatle-bar :tatle="tatleName"></tatle-bar>
     </div>
-    <div >
-      <scroller-view pullup="true" pulldown="true" v-calculate-height >
-      <div class="card" v-for="(item, index) in productParam" :key="index">
+    <div style="height: calc(100vh - 200vh);">
+      <scroller-view :pullup="true" :pulldown="true" :height="100">
+      <div class="cardA" v-for="(item, index) in productParam" :key="index">
         <div>
           <van-row @click="onClickDetails(item)">
             <van-col span="16">
@@ -54,10 +54,10 @@
               <img class="icon" v-if="item.status === 2" :src="require('@/assets/images/shoulizhong.png')"/>
             </van-col>
           </van-row>
-    
+
 
             <van-row class="bottom" v-if="item.status === 1" @click="toReceipt">
-            
+
             <van-col span="24" class="lablel">
                <span>查看借据</span>
                <img :src="require('@/assets/images/xiayiye.png')" style="width: 30px"/>
@@ -112,18 +112,19 @@
 <!--                <use xlink:href="#icon-weiqianding"></use>-->
 <!--              </svg>-->
               <img class="icon" v-if="item.status === 3" :src="require('@/assets/images/shenqingzhong.png')"/>
+              <img class="icon" v-if="item.status === 2" :src="require('@/assets/images/shoulizhong.png')"/>
             </van-col>
           </van-row>
-          
+
           <van-row class="bottom" @click="toProgress">
-            
+
             <van-col span="24" class="lablel">
                <span>查看进度</span>
                <img :src="require('@/assets/images/xiayiye.png')" style="width: 30px"/>
 
             </van-col>
           </van-row>
-          
+
 
 
         </div>
@@ -169,6 +170,13 @@ export default class AccommodMain extends Vue {
   },
   ];
   productParamA = [
+    {
+      productName: "小微企业抵押'一证通'贷款",
+      applyAmount: "30,000.00",
+      applyRate: "1.13%",
+      applyDate: "2022-08-23",
+      status: 2
+    },
     {
       productName: "小微企业抵押'一证通'贷款",
       applyAmount: "30,000.00",
@@ -229,6 +237,14 @@ export default class AccommodMain extends Vue {
 }
 
 .card {
+  border-radius: 2%;
+  //height: 28vh;
+  height: 210px;
+  margin: 3% 3% 3% 3%;
+  background: #ffffff;
+  border: none;
+}
+.cardA {
   border-radius: 2%;
   //height: 28vh;
   height: 190px;