我的贷款页面修改

src/components/common/PicketAcced.vue

@@ -56,7 +56,7 @@
           </svg>
         </van-col>
       </van-row>
-      <van-row v-if="item.status === 1" type="flex" class="bottom" style="margin-top: 4px" @click="toTrial()">
+      <van-row v-if="item.status === 2" type="flex" class="bottom" @click="toTrial()">
         <van-col span="24" class="lablel"><span>计算器</span>
           <svg class="iconl" aria-hidden="true">
             <use xlink:href="#icon-a-xiayiye24x24px"></use>
@@ -100,7 +100,7 @@ export default class PicketAcced extends Vue {
 
 .card {
   border-radius: 2%;
-  height: 32vh;
+  height: 27vh;
   margin: 3% 3% 3% 3%;
   background: #ffffff;
 }

src/views/DepositInterestTrial/CountResult.vue

@@ -65,6 +65,7 @@
 import {Component, Prop, Vue} from "vue-property-decorator";
 import router from "@/router";
 import VueRouter, { Route, RouteConfig } from "vue-router";
+import {RouteMeta} from "vue-router/types/router";
 Vue.use(VueRouter);
 @Component({
   name: "CountResult",
@@ -83,49 +84,56 @@ export default class CountResult extends Vue{
   titleName="试算结果";
   titleflag=true;
   mounted() {
-    this.result = this.$route.params.result;
-    this.loanAmt = this.$route.params.loanAmt;
-    this.resultPlus = (parseInt(this.result) + parseInt(this.loanAmt)).toString();
-    this.loanRate = this.$route.params.loanRate;
-    this.loanTime = this.$route.params.loanTime;
-    this.repayType = this.$route.params.repayType;
-    //this.planMonthRepay = this.$route.params.planMonthRepay;
-    //this.loanType = this.$route.params.loanType;
+    if(this.$route.params.routeName=="aaa"){
+      this.result = this.$route.params.result;
+      this.loanAmt = this.$route.params.loanAmt;
+      this.resultPlus = (parseInt(this.result) + parseInt(this.loanAmt)).toString();
+      this.loanRate = this.$route.params.loanRate;
+      this.loanTime = this.$route.params.loanTime;
+      this.repayType = this.$route.params.repayType;
+    }else{
+      this.result = window.localStorage.getItem("result");
+      this.loanAmt= window.localStorage.getItem("loanAmt");
+      this.resultPlus=window.localStorage.getItem("resultPlus");
+      this.loanRate=window.localStorage.getItem("loanRate");
+      this.loanTime=window.localStorage.getItem("loanTime");
+      this.repayType=window.localStorage.getItem("repayType");
+    }
     if(this.repayType=="利随本清"){
       this.flag=false;
     }
-    console.log("@@@@@@@@@@@@@@"+this.$route.redirectedFrom);
   }
   //router.beforeEach((to,from,next) => {});
   //beforeRouteLeave(to:any,from,next){}
-  created() {
-    /*this.result = window.localStorage.getItem("result");
-    this.loanAmt= window.localStorage.getItem("loanAmt");
-    this.resultPlus=window.localStorage.getItem("resultPlus");
-    this.loanRate=window.localStorage.getItem("loanRate");
-    this.loanTime=window.localStorage.getItem("loanTime");
-    this.repayType=window.localStorage.getItem("repayType");*/
-    let getStoreData = this.$store.getters["CountResultStore/getResultData"];
-    console.log("获取到getStoreData的数据");
-    console.log(getStoreData);
-  }
+  // mounted() {
+  //   this.result = window.localStorage.getItem("result");
+  //   //this.result = "1100";
+  //   this.loanAmt= window.localStorage.getItem("loanAmt");
+  //   this.resultPlus=window.localStorage.getItem("resultPlus");
+  //   this.loanRate=window.localStorage.getItem("loanRate");
+  //   this.loanTime=window.localStorage.getItem("loanTime");
+  //   this.repayType=window.localStorage.getItem("repayType");
+  //   let getStoreData = this.$store.getters["CountResultStore/getResultData"];
+  //   console.log("获取到getStoreData的数据");
+  //   console.log(getStoreData);
+  // }
   returnCount() {
     this.$router.back();
   }
   toSeeRepayPlan() {
-   /* window.localStorage.setItem("result",this.result);
+    window.localStorage.setItem("result",this.result);
     window.localStorage.setItem("loanAmt",this.loanAmt);
     window.localStorage.setItem("resultPlus",this.resultPlus);
     window.localStorage.setItem("loanRate",this.loanRate);
     window.localStorage.setItem("loanTime",this.loanTime);
-    window.localStorage.setItem("repayType",this.repayType);*/
-    this.resultData.result = this.result;
-    this.resultData.loanAmt = this.loanAmt;
-    this.resultData.resultPlus = this.resultPlus;
-    this.resultData.loanRate = this.loanRate;
-    this.resultData.loanTime = this.loanTime;
-    this.resultData.repayType = this.repayType;
-    this.$store.commit("CountResultStore/setResultData",this.resultData);
+    window.localStorage.setItem("repayType",this.repayType);
+    // this.resultData.result = this.result;
+    // this.resultData.loanAmt = this.loanAmt;
+    // this.resultData.resultPlus = this.resultPlus;
+    // this.resultData.loanRate = this.loanRate;
+    // this.resultData.loanTime = this.loanTime;
+    // this.resultData.repayType = this.repayType;
+    //this.$store.commit("CountResultStore/setResultData",this.resultData);
     this.$router.push({
       name: "RepayPlan",
     });

src/views/DepositInterestTrial/DepositInterestTrial.vue

@@ -179,6 +179,7 @@ export default class DepositInterestTrial extends Vue{
     this.$router.push({
       name: "CountResult",
       params: {
+        routeName: "aaa",
         loanAmt: this.test2.loanAmt,
         loanTime: this.test2.loanTime,
         planMonthRepay: this.test2.planMonthRepay,

src/views/workbench/AccommodDetails.vue

@@ -14,7 +14,7 @@
     </div>
     <div>
       <van-tabs>
-        <van-tab title="借据详情">
+        <van-tab title="申请详情">
           <div class="layout">
             <van-row type="flex" class="CoolName">
               <van-col span="24" class="coollayout">个人信息</van-col>
@@ -37,19 +37,22 @@
               <van-row type="flex" class="layoutName">
                 <van-col span="24">
                   <van-cell-group>
-                    <van-field label="电话" :value="phone" readonly input-align="right" />
+                    <van-field label="手机号码" :value="phone" readonly input-align="right" />
                   </van-cell-group>
                 </van-col>
               </van-row>
             </div>
             <van-row type="flex" class="CoolName">
-              <van-col span="24" class="coollayout">借据信息</van-col>
+              <van-col span="24" class="coollayout">借款信息</van-col>
             </van-row>
             <div class="layoutbody">
               <van-row type="flex" class="layoutName">
                 <van-col span="24">
+<!--                  <van-cell-group>-->
+<!--                    <van-field label="贷款账号" :value="varieties" readonly input-align="right" />-->
+<!--                  </van-cell-group>-->
                   <van-cell-group>
-                    <van-field label="贷款账号" :value="varieties" readonly input-align="right" />
+                    <van-field label="贷款品种" :value="loanType" readonly input-align="right" />
                   </van-cell-group>
                 </van-col>
               </van-row>
@@ -60,46 +63,74 @@
                   </van-cell-group>
                 </van-col>
               </van-row>
+<!--              <van-row type="flex" class="layoutName">-->
+<!--                <van-col span="24">-->
+<!--                  <van-cell-group>-->
+<!--                    <van-field label="借款到期日" :value="borrow" readonly input-align="right" />-->
+<!--                  </van-cell-group>-->
+<!--                </van-col>-->
+<!--              </van-row>-->
               <van-row type="flex" class="layoutName">
                 <van-col span="24">
                   <van-cell-group>
-                    <van-field label="借款到期日" :value="borrow" readonly input-align="right" />
+                    <van-field label="借款用途" :value="purposes" readonly input-align="right" />
                   </van-cell-group>
                 </van-col>
               </van-row>
               <van-row type="flex" class="layoutName">
                 <van-col span="24">
                   <van-cell-group>
-                    <van-field label="借款用途" :value="purposes" readonly input-align="right" />
+                    <van-field label="业务办理地区" :value="businessArea" readonly input-align="right" />
                   </van-cell-group>
                 </van-col>
               </van-row>
+<!--              <van-row type="flex" class="layoutName">-->
+<!--                <van-col span="24">-->
+<!--                  <van-cell-group>-->
+<!--                    <van-field label="担保方式" :value="area" readonly input-align="right" />-->
+<!--                  </van-cell-group>-->
+<!--                </van-col>-->
+<!--              </van-row>-->
+<!--              <van-row type="flex" class="layoutName">-->
+<!--                <van-col span="24">-->
+<!--                  <van-cell-group>-->
+<!--                    <van-field label="还款方式" :value="intentions" readonly input-align="right" />-->
+<!--                  </van-cell-group>-->
+<!--                </van-col>-->
+<!--              </van-row>-->
+<!--              <van-row type="flex" class="layoutName">-->
+<!--                <van-col span="24">-->
+<!--                  <van-cell-group>-->
+<!--                    <van-field label="借款利率" :value="customer" readonly input-align="right" />-->
+<!--                  </van-cell-group>-->
+<!--                </van-col>-->
+<!--              </van-row>-->
               <van-row type="flex" class="layoutName">
                 <van-col span="24">
                   <van-cell-group>
-                    <van-field label="担保方式" :value="area" readonly input-align="right" />
+                    <van-field label="意向机构" :value="intentionOrg" readonly input-align="right" />
                   </van-cell-group>
                 </van-col>
               </van-row>
               <van-row type="flex" class="layoutName">
                 <van-col span="24">
                   <van-cell-group>
-                    <van-field label="还款方式" :value="intentions" readonly input-align="right" />
+                    <van-field label="客户经理" :value="manager" readonly input-align="right" />
                   </van-cell-group>
                 </van-col>
               </van-row>
               <van-row type="flex" class="layoutName">
                 <van-col span="24">
                   <van-cell-group>
-                    <van-field label="借款利率" :value="customer" readonly input-align="right" />
+                    <van-field label="客户经理联系方式" label-width="120" :value="managerPhone" readonly input-align="right" />
                   </van-cell-group>
                 </van-col>
               </van-row>
             </div>
           </div>
         </van-tab>
-        <van-tab title="业务进度" v-if="status === statusl">
-
+<!--        <van-tab title="业务进度" v-if="status === statusl">-->
+          <van-tab title="业务进度" v-if="true">
           <van-steps direction="vertical" :active="0">
             <van-step>
               <van-row type="flex" class="layoutStep" gutter="10">
@@ -155,6 +186,11 @@ import { Component, Vue, Prop, Watch, Emit } from "vue-property-decorator";
   name: "AccommodDetails"
 })
 export default class AccommodDetails extends Vue {
+  managerPhone="12222222222"
+  manager="赵恒请"
+  intentionOrg="哈尔滨农信社松北区枝江大道分社"
+  businessArea="黑龙江省-哈尔滨市-松北区"
+  loanType="一般经营性贷款"
   tatleName = "我的贷款"
   //状态
   status = 2;

src/views/workbench/AccommodMain.vue

@@ -15,44 +15,46 @@
     <div>
       <scroller-view pullup="true" pulldown="true" v-calculate-height>
       <div class="card" v-for="(item, index) in productParam" :key="index">
-        <div @click="onClickDetails()">
-          <van-row>
+        <div>
+          <van-row @click="onClickDetails()">
             <van-col span="16">
               <van-col span="24" class="contractNo"><span>合同编号：</span>{{ item.contractNo }}</van-col>
               <van-col style="    width: 100%; margin-left: 8%; line-height: 2;">
-                <van-row gutter="20">
+                <van-row>
                   <van-col span="14" class="lable"><span>合同类型：</span></van-col>
-                  <van-col span="10" class="contractType">{{ item.contractType }}</van-col>
+                  <van-col span="10" class="contractType" style="font-size: 12px">{{ item.contractType }}</van-col>
                 </van-row>
 
-                <van-row gutter="20">
+                <van-row>
                   <van-col span="14" class="lable"><span>合同金额(元)：</span></van-col>
-                  <van-col span="10" class="contractAmount" style="color:rgb(255, 204, 0);">{{ item.contractAmount }}
+                  <van-col span="10" class="contractAmount" style="color:rgb(255, 204, 0); font-size: 12px">{{ item.contractAmount }}
                   </van-col>
                 </van-row>
 
-                <van-row gutter="20">
+                <van-row>
                   <van-col span="14" class="lable"><span>合同利率：</span></van-col>
-                  <van-col span="10" class="contractRate">{{ item.contractRate }}</van-col>
+                  <van-col span="10" class="contractRate" style="font-size: 12px">{{ item.contractRate }}</van-col>
                 </van-row>
-                <van-row gutter="20">
+                <van-row>
                   <van-col span="14" class="lable"><span>还款方式：</span></van-col>
-                  <van-col span="10" class="paymentMethod">{{ item.paymentMethod }}</van-col>
+                  <van-col span="10" class="paymentMethod" style="font-size: 12px">{{ item.paymentMethod }}</van-col>
                 </van-row>
 
               </van-col>
 
             </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>
+<!--              <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>
-          <div style="background-color: #00c6ff; text-align: center; color: #FFFFFF; margin-top: 4px"><span>查看借据</span></div>
+          <div style="background-color: #00c6ff; text-align: center; color: #FFFFFF; margin-top: 4px" v-if="item.status === 1" @click="toReceipt"><span>查看借据</span></div>
         </div>
         <!-- <van-row  type="flex" class="bottom" @click="onClickPicket()">
           <van-col span="24" class="lablel"><span>查看合同</span>
@@ -62,45 +64,46 @@
           </van-col>
         </van-row> -->
       </div>
-      <div class="card" v-for="(item, index) in productParam" :key="index">
-        <div @click="onClickDetails()">
-          <van-row>
+      <div class="card" v-for="(item, index) in productParamA" :key="index">
+        <div>
+          <van-row @click="onClickDetails()">
             <van-col span="16">
               <van-col span="24" class="contractNo"><span>产品意向申请：</span>{{ item.contractNo }}</van-col>
               <van-col style="    width: 100%; margin-left: 8%; line-height: 2;">
-                <van-row gutter="20">
+                <van-row>
                   <van-col span="14" class="lable"><span>产品名称：</span></van-col>
-                  <van-col span="10" class="contractType">{{ item.contractType }}</van-col>
+                  <van-col span="10" class="contractType" style="font-size: 12px">{{ item.productName }}</van-col>
                 </van-row>
 
-                <van-row gutter="20">
+                <van-row>
                   <van-col span="14" class="lable"><span>申请金额(元)：</span></van-col>
-                  <van-col span="10" class="contractAmount" style="color:rgb(255, 204, 0);">{{ item.contractAmount }}
+                  <van-col span="10" class="contractAmount" style="color:rgb(255, 204, 0); font-size: 12px">{{ item.applyAmount }}
                   </van-col>
                 </van-row>
 
-                <van-row gutter="20">
+                <van-row>
                   <van-col span="14" class="lable"><span>申请利率：</span></van-col>
-                  <van-col span="10" class="contractRate">{{ item.contractRate }}</van-col>
+                  <van-col span="10" class="contractRate" style="font-size: 12px">{{ item.applyRate }}</van-col>
                 </van-row>
-                <van-row gutter="20">
+                <van-row>
                   <van-col span="14" class="lable"><span>申请日期：</span></van-col>
-                  <van-col span="10" class="paymentMethod">{{ item.paymentMethod }}</van-col>
+                  <van-col span="10" class="paymentMethod" style="font-size: 12px">{{ item.applyDate }}</van-col>
                 </van-row>
 
               </van-col>
 
             </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>
+<!--              <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')"/>
             </van-col>
           </van-row>
-          <div style="background-color: #00c6ff; text-align: center; color: #FFFFFF; margin-top: 4px"><span>查看进度</span></div>
+          <div style="background-color: #00c6ff; text-align: center; color: #FFFFFF; margin-top: 4px" @click="toProgress"><span>查看进度</span></div>
         </div>
         <!-- <van-row  type="flex" class="bottom" @click="onClickPicket()">
           <van-col span="24" class="lablel"><span>查看合同</span>
@@ -132,7 +135,7 @@ export default class AccommodMain extends Vue {
     contractAmount: "30,000.00",
     contractRate: "4.13%",
     paymentMethod: "等额本金",
-    status: 2
+    status: 1
   },
   {
     contractNo: "117647289092",
@@ -142,18 +145,24 @@ export default class AccommodMain extends Vue {
     paymentMethod: "等额本金",
     status: 2
   },
-  {
-    contractNo: "117647289092",
-    contractType: "一般借款合同",
-    contractAmount: "30,000.00",
-    contractRate: "1.13%",
-    paymentMethod: "等额本金",
-    status: 1
-  }]
-
+  ];
+  productParamA = [
+    {
+      productName: "小微企业抵押'一证通'贷款",
+      applyAmount: "30,000.00",
+      applyRate: "1.13%",
+      applyDate: "2022-08-23",
+      status: 3
+    }
+  ];
 
   //点击还款计划事件
   onClickDetails() {
+    this.$router.push({
+      name: "AccommodDetails"
+    })
+  }
+  toReceipt() {
     this.$router.push({
       name: "Accommodation"
     })
@@ -164,6 +173,11 @@ export default class AccommodMain extends Vue {
       name: "Accommodation"
     })
   }
+  toProgress() {
+    this.$router.push({
+      name: ""
+    })
+  }
 }