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

src/App.vue

@@ -41,6 +41,7 @@ export default class App extends Vue {
   margin: 0;
   padding: 0;
   overflow: hidden;
+  background: #fefefe;
   .main-view {
     width: 100%;
     height: 100%;

src/components/common/LittleCard.vue

@@ -8,7 +8,10 @@
 -->
 <template>
   <!-- <div> -->
-  <div class="d-tattle">
+  <div class="d-tattle"  >
+    <!-- <scroller-view v-calculate-height  :height="10000" >  -->
+      <div style="overflow-y: scroll; height:45vh;">
+          <div style="    padding-bottom: 150px;">
               <div class="litterParam"  v-for="(item, index) in litterParam" :key="index" >
       <van-row class="vanrow" @click="litterParamClick(item)">
         <van-col span="20" class="priductName">
@@ -23,9 +26,20 @@
             <use xlink:href="#icon-a-xiayiye24x24px"></use>
           </svg>
         </van-col>
+      </van-row>
+    </div>
+     <van-row type="flex">   
+      <van-col span="24">
+        <van-button  native-type="button"
+      style="  width: 92%;     height: 36px;  margin:20px 4%; background-color: #3672F1;border-radius: 5px; border-color: #3672F1"
+       type="primary" block @click="exit">退出</van-button>
+      </van-col>
     </van-row>
           </div>
       </div>
+    <!-- </scroller-view> -->
+
+  </div>
 </template>
 
 <script lang="ts">
@@ -43,6 +57,19 @@ export default class LittleCard extends Vue {
   litterParamClick(item:any){
     this.$emit("litterParamClick",item);
   }
+
+  // created(){
+  //    document.addEventListener('touchmove', event => {    event.preventDefault()  }, { passive: false })
+  // }
+
+
+  // activated(){
+  //   document.addEventListener('touchmove', event => {    event.preventDefault()  }, { passive: false })
+  // }
+
+  exit(){
+    this.$router.replace("login");
+  }
 }
 </script>
 <style scoped lang="scss">
@@ -82,4 +109,9 @@ export default class LittleCard extends Vue {
   width: 20px;
   height: 20px;
 }
+
+::v-deep .scroller{
+    padding-bottom: 70px
+;
+}
 </style>

src/components/common/Picket.vue

@@ -75,7 +75,7 @@ export default class Picket extends Vue {
 }
 .card { 
   height: 200px;
-        width: 98%;
+        width: 95%;
     margin: 1% auto;
     background: inherit;
     background-color: rgba(255, 255, 255, 1);

src/components/common/ProductCard.vue

@@ -14,7 +14,7 @@
   <div class="roolsolt">
 
 
-    <div class="rool" style="  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); border-radius: 10px; padding-bottom:20px">
+    <div class="rool" style="  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); border-radius: 0px 0px 12px 12px; padding-bottom:20px">
       <van-row type="flex">
         <van-col span="24" class="title">最高贷款额度</van-col>
       </van-row>
@@ -61,8 +61,8 @@
     width: 100%;
     height: 100%;
     border-radius: 8px;
-    margin: 15px  auto;
-    box-shadow: 0 y-shadow 10px 10px rgba(0, 0, 0, .2);
+    padding: 20px 10px;
+     box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
     ">
         <van-collapse-item title="产品介绍" name="1">农村信用社向符合条件的客户发放的用于满足个人消费、生产经营流动资金等需求的一项贷款业务。</van-collapse-item>
         <van-collapse-item title="产品特点" name="2">一次核定，三年有效，随用随贷，循环使用。</van-collapse-item>
@@ -94,7 +94,15 @@ export default class ProductCard extends Vue {
       path: "/Recognition",
     })
   }
+
+
 }
+
+
+
+
+
+
 </script>
 <style scoped lang="scss">
 .div {}

src/components/common/ProductDetail.vue

@@ -62,5 +62,7 @@ export default class ProductDetail extends Vue {
     font-size: 16px;
     color: rgb(255, 255, 255);
     border-width: 0px;
+        padding-left: 10px;
+
 }
 </style>

src/components/common/Tool.vue

@@ -11,7 +11,7 @@
     <van-row class="titleNo">
       <van-col span="24" class="title">{{ title }}</van-col>
     </van-row>
-    <van-row class="imgNo">
+    <van-row class="imgNo" style="    padding-top: 20px;">
       <van-col span="6" class="imglocal" @click="pushTrial">
         <svg class="icon" aria-hidden="true">
           <use xlink:href="#icon-a-jifenshangcheng32x32px"></use>
@@ -78,7 +78,7 @@ export default class Tool extends Vue {
 
 .title {
 
-    margin: 1% auto 1% 0;
+    margin: 4% auto 1% 0;
     font-size: 18px;
     color: #fff;
     border-width: 0;

src/views/DepositInterestTrial/DepositInterestTrial.vue

@@ -55,7 +55,7 @@
             <van-col span="24">
 
 <!--              <van-field  is-link readonly :value="timeTypeValue" label="定期类型" input-align="right" placeholder="请选择定期类型"  @click="showTimeTypes = true"/>-->
-              <van-field  is-link readonly :value="test.timeType" label="存款类型" input-align="right" placeholder="请选择定期类型"  @click="showTimeTypes = true"/>
+              <van-field  is-link readonly :value="test.timeType" label="存款类型" input-align="right" placeholder="请选择存款类型"  @click="showTimeTypes = true"/>
 
                     <van-popup v-model="showTimeTypes" round position="bottom">
                 <van-picker

src/views/MyView/MyPage.vue

@@ -7,21 +7,22 @@
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
+
   <div class="d-page d-flex flex-column" style=" background-color: #ebedf0">
     <div class="rarl">
-      <person-bar :title="tatleName" :param="param" :login="true" style="width:100%;height: calc(35vh);">
+      <person-bar :title="tatleName" :param="param" :login="true" style="width:100%;    height: calc(100vh - 62vh);">
       </person-bar>
     </div>
     <div style="margin-top: 160px; position: absolute; width: 100%">
       <van-row span="24">
-        <van-col span="8" style="text-align: center; color: #FFFFFF; font-weight: 600">2456</van-col>
-        <van-col span="8" style="text-align: center; color: #FFFFFF; font-weight: 600">12</van-col>
-        <van-col span="8" style="text-align: center; color: #FFFFFF; font-weight: 600">10</van-col>
+        <van-col span="8" style="text-align: center;     color: #435983; font-weight: 600">2456</van-col>
+        <van-col span="8" style="text-align: center;     color: #435983; font-weight: 600">12</van-col>
+        <van-col span="8" style="text-align: center;     color: #435983; font-weight: 600">10</van-col>
       </van-row>
       <van-row span="24">
-        <van-col span="8" style="text-align: center; color: #FFFFFF">我的积分</van-col>
-        <van-col span="8" style="text-align: center; color: #FFFFFF">卡券</van-col>
-        <van-col span="8" style="text-align: center; color: #FFFFFF">特权</van-col>
+        <van-col span="8" style="text-align: center;     color: #435983;">我的积分</van-col>
+        <van-col span="8" style="text-align: center;     color: #435983;">卡券</van-col>
+        <van-col span="8" style="text-align: center;     color: #435983;">特权</van-col>
       </van-row>
     </div>
     <div>
@@ -33,6 +34,8 @@
     </div>
   </div>
 
+
+
 </template>
 <script lang="ts">
 import { Component, Vue } from "vue-property-decorator";
@@ -124,7 +127,7 @@ export default class MyPage extends Vue {
   left: 3%;
   right: 3%;
   width: 90%;
-  height: 20%;
+  height: 140px;
   margin: 2% auto;
   border-radius: 15px;
   display: flex;
@@ -147,7 +150,7 @@ export default class MyPage extends Vue {
 
 .prudect {
   background: white;
-  height: 100-35vh;
+  height: 100%;
 
 }
 </style>

src/views/ProductDetail/ProductDetails.vue

@@ -53,7 +53,7 @@ export default class ProductDetails extends Vue {
     width: 90%;
     height: 30%;
     /* margin: 2% auto; */
-    border-radius: 15px;
+    border-radius: 12px 12px 0px 0px ;
     /* display: flex; */
     font-weight: 400;
     font-style: normal;

src/views/authentication/LoginView.vue

@@ -30,17 +30,16 @@
         
         <div class="logindiv" style="margin-top: 20%">
           <span class="sopan">账号</span>
-          <van-field @input="noChange"  v-model="loginNo"  :border="true" placeholder="请输入手机号或身份证号"
+          <van-field @input="noChange"  v-model="loginNo"  :border="false" clearable placeholder="请输入手机号或身份证号"
              />
 
              <!-- :rules="[{ validator: verifyPhone, message: '请输入正确的手机号码' }]" -->
-        </div>
-        <van-divider :style="{ margin: 0 }"></van-divider>
         
-        <!-- <div class="logindiv"> -->
+        </div>
 
           <span class="sopan">密码</span>
-        <van-field v-model="password" :type="passwordType" center clearable placeholder="请填写密码">
+
+        <van-field v-model="password" :type="passwordType" :border="false" center clearable placeholder="请填写密码">
           <template slot="right-icon">
             <span class="solts" @click="switchPasswordType">
               <van-icon name="closed-eye" v-if="passwordType === 'password'" />
@@ -50,6 +49,11 @@
         </van-field>
         <!-- <van-divider :style="{ margin: 0 }"></van-divider> -->
 
+        <!-- <div class="logindiv"> -->
+
+        
+        <!-- <van-divider :style="{ margin: 0 }"></van-divider> -->
+
         <!-- <van-divider /> -->
         <!-- </div> -->
         <!-- <div class="d-flex ">
@@ -67,15 +71,15 @@
         </template> -->
         <div v-show = "showCode"  class="authCode">
           <span class="sopan">短信验证码</span>
-          <van-row class="">
+          <van-row style="padding: 10px 6%;">
             <van-col span="16">
-              <van-field v-model="sms" center clearable placeholder="请输入短信验证码">
+              <van-field  style=" border-bottom: 0px solid #f5f5f5;   padding: 0 0%;"   v-model="sms" center clearable placeholder="请输入短信验证码">
 
               </van-field>
             </van-col>
-            <van-col span="8"><a style="  color:#3672F1; display:inline-block;font-size:12px;line-height:44px; margin-left: 25%;" @click="getPhonePost()">{{ getCmstotal }}</a></van-col>
+            <van-col span="8" style="height:24px; border-bottom: 1px solid #f5f5f5;" ><a style="  color:#3672F1; display:inline-block;font-size:12px;line-height:24px; margin-left: 25%;" @click="getPhonePost()">{{ getCmstotal }}</a></van-col>
           </van-row>
-              <van-divider :style="{ margin: 0 }"></van-divider>
+              
         </div>
 
         <div style="margin: 16px;">
@@ -306,6 +310,26 @@ export default class LoginView extends Vue {
   margin-left: 6%;
 }
 
+
+ ::v-deep  .van-field__value {
+    overflow: visible;
+    border-bottom: 1px solid #f5f5f5;
+}
+::v-deep .van-cell {
+    position: relative;
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: flex;
+    box-sizing: border-box;
+    width: 100%;
+    padding: 10px 6%;
+    overflow: hidden;
+    color: #323233;
+    font-size: 14px;
+    line-height: 24px;
+    background-color: #fff;
+ 
+}
 // .login{
 //   margin-top: 20%;
 // }

src/views/login/ForgetPassView.vue

@@ -49,7 +49,7 @@
           />
 
         </div>
-        <van-divider :style="{ margin: 0 }"></van-divider>
+        <!-- <van-divider :style="{ margin: 0 }"></van-divider> -->
 
 
         <div class="logindiv">
@@ -72,7 +72,7 @@
           </van-field>
           <!-- <van-divider /> -->
         </div>
-        <van-divider :style="{ margin: 0 }"></van-divider>
+        <!-- <van-divider :style="{ margin: 0 }"></van-divider> -->
         <div class="logindiv">
           <span class="sopan">确认密码</span>
           <van-field
@@ -93,27 +93,19 @@
           </van-field>
           <!-- <van-divider /> -->
         </div>
-        <van-divider :style="{ margin: 0 }"></van-divider>
+        <!-- <van-divider :style="{ margin: 0 }"></van-divider> -->
         <div>
          <span class="sopan">短信验证码</span>
-
-          <van-row>
+          <van-row style="padding: 10px 6%;">
             <van-col span="16">
-              <van-field
-                v-model="sms"
-                center
-                clearable
-                placeholder="请输入短信验证码"
-              >
-                <!-- <van-divider /> -->
+              <van-field  style=" border-bottom: 0px solid #f5f5f5;   padding: 0 0%;"   v-model="sms" center clearable placeholder="请输入短信验证码">
+
               </van-field>
             </van-col>
-            <van-col span="8"
-              ><a href="#" style="  color:#3672F1; display:inline-block;font-size:12px;line-height:44px; margin-left: 25%;" @click="getPhonePost()">获取验证码</a></van-col
-            >
+            <van-col span="8" style="height:24px; border-bottom: 1px solid #f5f5f5;" ><a style="  color:#3672F1; display:inline-block;font-size:12px;line-height:24px; margin-left: 25%;" @click="getPhonePost()">{{ getCmstotal }}</a></van-col>
           </van-row>
         </div>
-        <van-divider :style="{ margin: 0 }"></van-divider>
+        <!-- <van-divider :style="{ margin: 0 }"></van-divider> -->
         <div style="margin: 16px">
           <van-button square block type="info" native-type="submit" style="background-color: #3672F1;border-radius: 5px;"
             >确定</van-button
@@ -139,7 +131,7 @@ export default class ForgetPassView extends Vue {
   password = "password";
   passwordType="password"
   passwordTypeNext="password"
-  getCmstotal = "获取短信验证码";
+  getCmstotal = "获取验证码";
   tatleName = "密码重置";
   loginNo: string = ""; //登录账号
   newpassword: string = ""; //密码
@@ -184,7 +176,7 @@ export default class ForgetPassView extends Vue {
       this.getCmstotal = this.time + "s重发验证码";
       if (this.time < 0) {
         clearInterval(this.time);
-        this.getCmstotal = "获取短信验证码";
+        this.getCmstotal = "获取验证码";
       }
     }, 1000);
   }
@@ -251,6 +243,26 @@ export default class ForgetPassView extends Vue {
   margin-left: 6%;
 }
 
+ ::v-deep  .van-field__value {
+    overflow: visible;
+    border-bottom: 1px solid #f5f5f5;
+}
+::v-deep .van-cell {
+    position: relative;
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: flex;
+    box-sizing: border-box;
+    width: 100%;
+    padding: 10px 6%;
+    overflow: hidden;
+    color: #323233;
+    font-size: 14px;
+    line-height: 24px;
+    background-color: #fff;
+ 
+}
+
 // .login{
 //   margin-top: 20%;
 // }

src/views/login/Register.vue

@@ -35,7 +35,7 @@
           <span class="sopan" style="padding: 10% 0%;">账号</span>
           <van-field @input="noChange" v-model="phone"   :border="true" placeholder="请输入手机号码/身份证号码"
               />
-              <van-divider :style="{ margin: 0 }"></van-divider>
+              <!-- <van-divider :style="{ margin: 0 }"></van-divider> -->
               <!-- error-message="请输入手机号码或身份证号码" -->
         <!-- :rules="[{ validator: verifyPhone, message: '请输入正确的手机号码/身份证号码' }]" -->
         </div>
@@ -51,23 +51,23 @@
         </div> -->
 
 
-        <div class="logindiv" v-show = "showCode" ><span class="sopan">短信验证码</span>
-          <van-row>
+        <div class="logindiv" v-show = "showCode" >
+          <span class="sopan">短信验证码</span>
+        
+          <van-row style="padding: 10px 6%;">
             <van-col span="16">
-              <van-field v-model="sms" center clearable placeholder="请输入短信验证码">
-                <!-- <van-divider /> -->
+              <van-field  style=" border-bottom: 0px solid #f5f5f5;   padding: 0 0%;"   v-model="sms" center clearable placeholder="请输入短信验证码">
+
               </van-field>
             </van-col>
-            <van-col span="8"><span style="  color:#3672F1; display:inline-block;font-size:12px;line-height:44px; margin-left: 25%;"
-                   @click="getPhonePost()">{{ getCmstotal }}</span></van-col>
-
+            <van-col span="8" style="height:24px; border-bottom: 1px solid #f5f5f5;" ><a style="  color:#3672F1; display:inline-block;font-size:12px;line-height:24px; margin-left: 25%;" @click="getPhonePost()">{{ getCmstotal }}</a></van-col>
           </van-row>
-          <van-divider :style="{ margin: 0 }"></van-divider>
+          <!-- <van-divider :style="{ margin: 0 }"></van-divider> -->
         </div>
 
         <div class="logindiv">
           <span class="sopan">设置密码</span>
-          <van-field v-model="password" :type="passwordType" center clearable placeholder="请填写新密码">
+          <van-field v-model="password" :type="passwordType" center clearable placeholder="请填写密码">
             <!-- <van-divider /> -->
             <template slot="right-icon">
               <span class="solts" @click="switchPasswordType">
@@ -76,11 +76,11 @@
               </span>
             </template>
           </van-field>
-          <van-divider :style="{ margin: 0 }"></van-divider>
+          <!-- <van-divider :style="{ margin: 0 }"></van-divider> -->
         </div>
         <div class="logindiv">
           <span class="sopan">确认密码</span>
-          <van-field v-model="restpassword" :type="passwordTypeNext" center clearable placeholder="请确认新密码">
+          <van-field v-model="restpassword" :type="passwordTypeNext" center clearable placeholder="请确认密码">
             <template slot="right-icon">
               <span class="solts" @click="switchPasswordTypeNext">
                 <van-icon name="closed-eye" v-if="passwordTypeNext === 'password'" />
@@ -88,7 +88,7 @@
               </span>
             </template>
           </van-field>
-          <van-divider :style="{ margin: 0 }"></van-divider>
+          <!-- <van-divider :style="{ margin: 0 }"></van-divider> -->
         </div>
 
 
@@ -127,7 +127,7 @@ export default class ForgetPassView extends Vue {
   phone: string = "" //电话
   password: string = ""//密码
   restpassword: string = ""//确认密码
-  getCmstotal = "获取短信验证码";
+  getCmstotal = "获取验证码";
   sms: string = ""//短信
   // radio: boolean = false
   timer: any = "";//定时器
@@ -269,6 +269,25 @@ export default class ForgetPassView extends Vue {
 
   margin-top: 5px;
   margin-left: 6%;
+}
+ ::v-deep  .van-field__value {
+    overflow: visible;
+    border-bottom: 1px solid #f5f5f5;
+}
+::v-deep .van-cell {
+    position: relative;
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: flex;
+    box-sizing: border-box;
+    width: 100%;
+    padding: 10px 6%;
+    overflow: hidden;
+    color: #323233;
+    font-size: 14px;
+    line-height: 24px;
+    background-color: #fff;
+ 
 }
 
 // .login{

src/views/main/Main.vue

@@ -10,7 +10,7 @@
 <template>
   <div id="allItem" class="d-page d-flex flex-column" style="background-color: linear-gradient(to bottom, #0B54E0 50px , #ffffff); padding-bottom:100px; width: 100%; overflow-x: hidden;overflow-y: auto; flex-direction: column; display: flex">
     <div class="rarle">
-      <tools-bar :title="tatleName" style="width: 100%; height: calc(16vh)">
+      <tools-bar :title="tatleName" style="width: 100%; height: calc(23vh)">
       </tools-bar>
     </div>
     <div class="roolsolt">
@@ -25,7 +25,7 @@
 
           border-radius: 10px;
           position: absolute;
-          top: 14vh;
+          top: 22vh;
           left: 5%;
         "
       >
@@ -55,7 +55,7 @@
     </div>
     <div  style=" box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 12px 0px;" >
       <div class="prudect" style="background-color: #ffffff;">
-        <van-row type="flex" justify="space-between" align="center">
+        <van-row type="flex" justify="space-between" align="center" style=" margin-bottom: 20px;   padding-top: 20px;">
           <van-cell
         style="font-size: 12px;"
           :value="outcsinfo.place"
@@ -192,6 +192,7 @@
               >
                 <van-row type="flex" class="applicationName">
                   <van-col span="24">{{ item.name }}</van-col>
+                  
                 </van-row>
                 <van-row type="flex" class="applicationfale">
                   <van-col span="10">
@@ -267,7 +268,8 @@
                   </van-col>
                 </van-row>
               </div>
-            <div style="margin-top: 4%">
+            <div style="margin-top: 4%;     position: sticky;   bottom: -1px;
+">
               <van-row type="flex">
                 <van-col span="12">
                   <van-button square block type="default" @click="resetData">重置</van-button>
@@ -336,7 +338,7 @@ Vue.use(Tabs);
 })
 export default class Main extends Vue {
   tatleName = "线上金融服务平台";
-  notice = "在代码阅读过程中人们说脏话的频率是衡量代码质量的唯一标准。";
+  notice = "您的“小微企业抵押贷款”当前处于财务部审批中。";
   vanvcol11 = "vandilote";
   vanvcol12 = "vandilote";
   vanvcol13 = "vandilote";
@@ -376,8 +378,11 @@ export default class Main extends Vue {
     		// console.log(event,'返回格式数组')
     		this.showAddress=false
 			let st=''
-			event.forEach((item:any)=>{
+			event.forEach((item:any,index:any)=>{
+        console.log(item   +  index);
+				if(index != 0){
           st=st + item.name
+        }
 			})
 			this.outcsinfo.place=st
 		};
@@ -868,5 +873,18 @@ export default class Main extends Vue {
 }
 
 
+::v-deep .van-cell__value {
+    position: relative;
+    overflow: hidden;
+    color: #1890ff;
+    text-align: right;
+    vertical-align: middle;
+    word-wrap: break-word;
+    flex: 3;
+}
+
+
+
+
 
 </style>

src/views/workbench/AccommodDetails.vue

@@ -2,7 +2,7 @@
  * @Author: jiangzaicheng jiangzaicheng_jzc@163.com
  * @Date: 2022-07-07 16:13:13
  * @LastEditors: jiangzaicheng jiangzaicheng_jzc@163.com
- * @LastEditTime: 2022-08-18 14:19:37
+ * @LastEditTime: 2022-10-09 17:07:04
  * @FilePath: \mcep-h5\src\components\common\Bottom.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -12,7 +12,9 @@
     <div class="rarle">
       <tatle-bar :tatle="tatleName"></tatle-bar>
     </div>
+    <scroller-view height="calc(100vh - 50px)">
     <div>
+    
       <van-tabs color="#3672F1">
         <van-tab title="申请详情">
           <div class="layout">
@@ -171,18 +173,17 @@
 <!--            </van-step>-->
 <!--          </van-steps>-->
             <scroller-view v-calculate-height pullup="true" pulldown="true">
-              <van-steps  class="step" direction="vertical" :active="active"  style="padding-top:5%;" >
+              <van-steps  class="step" direction="vertical" :active="active"  style="margin: 10px;" >
 
                 <van-step v-for="(item,index) in bussList" :key = "index" style="padding-bottom:20%;" >
                   <van-row  >
                     <van-col span="5"> <span>{{item.name}}</span></van-col>
-                    <van-col span="8"> <span>{{item.jobs}}</span></van-col>
-                    <van-col span="11"> <span>{{item.time}}</span></van-col>
+                    <van-col span="19" style="text-align:right;color: #999999; font-size: 14px;"> <span>{{item.time}}</span></van-col>
                   </van-row>
 
-                  <van-row  >
+                  <!-- <van-row  >
                     <van-col span="5"> <span>{{item.falg}}</span></van-col>
-                  </van-row>
+                  </van-row> -->
 
                 </van-step>
               </van-steps>
@@ -190,6 +191,7 @@
         </van-tab>
       </van-tabs>
     </div>
+  </scroller-view>
   </div>
 </template>
 
@@ -239,45 +241,45 @@ export default class AccommodDetails extends Vue {
   }
   bussList:any =[
       {
-      name :"赵飞",
+          name :"意向申请",
           jobs : "客户经理",
           time : "2021/02/20 11:14:12",
           falg:"同意"
 
       },
         {
-      name :"李星琳",
+          name :"业务受理",
           jobs : "支行审批岗",
           time : "2021/02/20 11:14:12",
           falg:"同意"
 
       },
         {
-      name :"孙先辉",
+          name :"业务调查",
           jobs : "支行行长",
           time : "2021/02/20 11:14:12",
           falg:"同意"
 
       },
         {
-      name :"童菲可",
+          name :"授信审批",
           jobs : "某某审批岗",
-      time : "2021/02/20 11:14:12",
+          time : "",
           falg:""
 
       },
         {
-      name :"孙晴",
+          name :"合同签署",
           jobs : "某某审批岗",
-      time : "2021/02/20 11:14:12",
+          time : "",
           falg:""
 
 
       },
         {
-      name :"赵可欣",
+          name :"合同审批",
           jobs : "某某最终审批岗",
-      time : "2021/02/20 11:14:12",
+          time : "",
           falg:""
 
 
@@ -313,4 +315,10 @@ export default class AccommodDetails extends Vue {
   font-size: 13px;
   color: #333333;
 }
+.step{
+  height: 100%;
+  width: 90%;
+  background-color:#ffffff;
+
+}
 </style>

src/views/workbench/AccommodMain.vue

@@ -27,7 +27,8 @@
 
                   <van-row>
                     <van-col span="14" class="lable"><span>合同金额(元)：</span></van-col>
-                  <van-col span="10" class="contractAmount" style="color:rgb(255, 204, 0); font-size: 12px">{{ item.contractAmount }}
+                    <van-col span="10" class="contractAmount" style="color:rgb(255, 204, 0); font-size: 12px">{{
+                    item.contractAmount }}
                     </van-col>
                   </van-row>
 
@@ -44,14 +45,14 @@
 
               </van-col>
               <van-col span="8">
-<!--              <svg class="icon" aria-hidden="true" v-if="item.status === 1">-->
-<!--                <use xlink:href="#icon-yiqianding"></use>-->
-<!--              </svg>-->
-<!--              <svg class="icon" aria-hidden="true" v-if="item.status === 2">-->
-<!--                <use xlink:href="#icon-weiqianding"></use>-->
-<!--              </svg>-->
-              <img class="icon" v-if="item.status === 1" :src="require('@/assets/images/yiwancheng.png')"/>
-              <img class="icon" v-if="item.status === 2" :src="require('@/assets/images/shoulizhong.png')"/>
+                <!--              <svg class="icon" aria-hidden="true" v-if="item.status === 1">-->
+                <!--                <use xlink:href="#icon-yiqianding"></use>-->
+                <!--              </svg>-->
+                <!--              <svg class="icon" aria-hidden="true" v-if="item.status === 2">-->
+                <!--                <use xlink:href="#icon-weiqianding"></use>-->
+                <!--              </svg>-->
+                <img class="icon" v-if="item.status === 1" :src="require('@/assets/images/yiwancheng.png')" />
+                <img class="icon" v-if="item.status === 2" :src="require('@/assets/images/shoulizhong.png')" />
               </van-col>
             </van-row>
 
@@ -60,7 +61,16 @@
 
               <van-col span="24" class="lablel">
                 <span>查看借据</span>
-               <img :src="require('@/assets/images/xiayiye.png')" style="width: 30px"/>
+                <img :src="require('@/assets/images/xiayiye.png')" style="width: 30px" />
+
+              </van-col>
+            </van-row>
+
+            <van-row class="bottom"  v-if="item.status === 2" @click="toProgress">
+
+              <van-col span="24" class="lablel">
+                <span>查看进度</span>
+                <img :src="require('@/assets/images/xiayiye.png')" style="width: 30px" />
 
               </van-col>
             </van-row>
@@ -88,7 +98,8 @@
 
                   <van-row>
                     <van-col span="14" class="lable"><span>申请金额(元)：</span></van-col>
-                  <van-col span="10" class="contractAmount" style="color:rgb(255, 204, 0); font-size: 12px">{{ item.applyAmount }}
+                    <van-col span="10" class="contractAmount" style="color:rgb(255, 204, 0); font-size: 12px">{{
+                    item.applyAmount }}
                     </van-col>
                   </van-row>
 
@@ -105,14 +116,14 @@
 
               </van-col>
               <van-col span="8">
-<!--              <svg class="icon" aria-hidden="true" v-if="item.status === 1">-->
-<!--                <use xlink:href="#icon-yiqianding"></use>-->
-<!--              </svg>-->
-<!--              <svg class="icon" aria-hidden="true" v-if="item.status === 2">-->
-<!--                <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')"/>
+                <!--              <svg class="icon" aria-hidden="true" v-if="item.status === 1">-->
+                <!--                <use xlink:href="#icon-yiqianding"></use>-->
+                <!--              </svg>-->
+                <!--              <svg class="icon" aria-hidden="true" v-if="item.status === 2">-->
+                <!--                <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>
 
@@ -120,7 +131,7 @@
 
               <van-col span="24" class="lablel">
                 <span>查看进度</span>
-               <img :src="require('@/assets/images/xiayiye.png')" style="width: 30px"/>
+                <img :src="require('@/assets/images/xiayiye.png')" style="width: 30px" />
 
               </van-col>
             </van-row>
@@ -188,11 +199,11 @@ export default class AccommodMain extends Vue {
 
   //点击还款计划事件
   onClickDetails(item: any) {
-    if(item.status==2||item.status==3){
+    if (item.status == 2 || item.status == 3) {
       this.$router.push({
         name: "AccommodDetails",
       });
-    }else if(item.status==1){
+    } else if (item.status == 1) {
       this.$router.push({
         name: "ContractDetail",
       });
@@ -244,6 +255,7 @@ export default class AccommodMain extends Vue {
   background: #ffffff;
   border: none;
 }
+
 .cardA {
   border-radius: 2%;
   //height: 28vh;
@@ -296,6 +308,7 @@ export default class AccommodMain extends Vue {
   font-weight: 400;
   font-style: normal;
 }
+
 .lablel {
   text-align: center;
   font-size: 12px;
@@ -305,11 +318,9 @@ export default class AccommodMain extends Vue {
   font-style: normal;
   height: 30px;
 }
-::v-deep .scroller{
+
+::v-deep .scroller {
   padding-bottom: 2px;
   padding-top: 1%;
 }
-
-
-
 </style>

src/views/workbench/BillDetails.vue

@@ -3,6 +3,7 @@
     <div class="rarle">
       <tatle-bar :tatle="tatleName"></tatle-bar>
     </div>
+    <scroller-view  height="calc(100vh - 50px)">
     <div class="layout">
       <van-row type="flex" class="CoolName">
         <van-col span="24" class="coollayout">个人信息</van-col>
@@ -42,9 +43,9 @@
           </van-col>
         </van-row>
         <van-row type="flex" class="layoutName">
-          <van-col span="24">
+          <van-col span="24" style="color: red">
             <van-cell-group>
-              <van-field label="借款金额" :value="loanAmt" readonly input-align="right" />
+              <van-field label="借款金额" :value="loanAmt" readonly input-align="right"/>
             </van-cell-group>
           </van-col>
         </van-row>
@@ -92,6 +93,7 @@
         </van-row>
       </div>
     </div>
+  </scroller-view>
   </div>
 </template>
 

src/views/workbench/ContractDetail.vue

@@ -3,6 +3,7 @@
     <div class="rarle">
       <tatle-bar :tatle="tatleName"></tatle-bar>
     </div>
+    <scroller-view height="calc(100vh - 50px)">
     <div class="layout">
       <van-row type="flex" class="CoolName">
         <van-col span="24" class="coollayout">个人信息</van-col>
@@ -92,6 +93,7 @@
         </van-row>
       </div>
     </div>
+    </scroller-view>
   </div>
 </template>
 

src/views/workbench/businessProgress.vue

@@ -13,18 +13,18 @@
       <tatle-bar :tatle="tatleName"></tatle-bar>
     </div>
 
-    <van-steps  class="step" direction="vertical" :active="active"  style="padding-top:5%;" >
+    <van-steps  class="step" direction="vertical" :active="active"  style=" margin: 10px;" >
 
         <van-step v-for="(item,index) in bussList" :key = "index" style="padding-bottom:20%;" >
             <van-row  >
                 <van-col span="5"> <span>{{item.name}}</span></van-col>
-                 <van-col span="8"> <span>{{item.jobs}}</span></van-col>
-                  <van-col span="11"> <span>{{item.time}}</span></van-col>
+              
+                  <van-col span="19" style="text-align:right;color: #999999; font-size: 14px;"> <span>{{item.time}}</span></van-col>
             </van-row>
 
-            <van-row  >
+            <!-- <van-row  >
                 <van-col span="5"> <span>{{item.falg}}</span></van-col>
-            </van-row>
+            </van-row> -->
 
         </van-step>
     </van-steps>
@@ -46,49 +46,49 @@ Vue.use(Steps);
   name: "businessProgress"
 })
 export default class businessProgress extends Vue {
-  tatleName = "业务进度"
+  tatleName = "申请审批进度"
 
   bussList:any =[
       {
-          name :"赵飞",
+          name :"意向申请",
           jobs : "客户经理",
           time : "2021/02/20 11:14:12",
           falg:"同意"
 
       },
         {
-          name :"李星琳",
+          name :"业务受理",
           jobs : "支行审批岗",
           time : "2021/02/20 11:14:12",
           falg:"同意"
 
       },
         {
-          name :"孙先辉",
+          name :"业务调查",
           jobs : "支行行长",
           time : "2021/02/20 11:14:12",
           falg:"同意"
 
       },
         {
-          name :"童菲可",
+          name :"授信审批",
           jobs : "某某审批岗",
-          time : "2021/02/20 11:14:12",
+          time : "",
           falg:""
 
       },
         {
-          name :"孙晴",
+          name :"合同签署",
           jobs : "某某审批岗",
-          time : "2021/02/20 11:14:12",
+          time : "",
           falg:""
 
 
       },
         {
-          name :"赵可欣",
+          name :"合同审批",
           jobs : "某某最终审批岗",
-          time : "2021/02/20 11:14:12",
+          time : "",
           falg:""
 
 
@@ -112,7 +112,7 @@ export default class businessProgress extends Vue {
 }
 .step{
   height: 100%;
-  width: 100%;
+  width: 90%;
   background-color:#ffffff;
 
 }