Merge branch 'master' of http://118.178.224.202:3000/ewide/zsxt_nbzs_h5

FrontCode2/sunshine_levy/src/App.vue

@@ -6,9 +6,12 @@
 
 <script>
 export default {
-  name: 'App',
+  name: "App"
 };
 </script>
-
+<style lang="less" scoped>
-<style>
+#app {
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-size: 14px;
+}
 </style>

FrontCode2/sunshine_levy/src/router/index.js

@@ -3,11 +3,12 @@ import Router from "vue-router";
 
 Vue.use(Router);
 
-export default new Router({
+const router = new Router({
   mode: "hash",
   routes: [{
       path: "/index",
       name: "index",
+      meta: { index: 1, title: "征收信息查询" },
       component: () =>
         import ("../views")
     },
@@ -21,6 +22,7 @@ export default new Router({
     {
       path: "/project-select",
       name: "projectSelect",
+      meta: { index: 2, title: "征收信息查询" },
       component: () =>
         import ("../views/project")
     },
@@ -28,6 +30,7 @@ export default new Router({
     {
       path: "/report/evalute",
       name: "evalute",
+      meta: { index: 3, title: "评估结果" },
       component: () =>
         import ("../views/report/evalute")
     },
@@ -35,6 +38,7 @@ export default new Router({
     {
       path: "/report/agreement",
       name: "reportAgreement",
+      meta: { index: 4, title: "协议结果" },
       component: () =>
         import ("../views/report/agreement")
     },
@@ -42,6 +46,7 @@ export default new Router({
     {
       path: "/showPdf",
       name: "showPdf",
+      meta: { index: 5, title: "协议详情" },
       component: () =>
         import ("../views/pdf/pdf")
     },
@@ -49,6 +54,7 @@ export default new Router({
     {
       path: "/evaluatePage",
       name: "evaluatePage",
+      meta: { index: 6, title: "评估报告" },
       component: () =>
         import ("../views/report/evaluatePage")
     },
@@ -56,6 +62,7 @@ export default new Router({
     {
       path: "/evaluateResultPdf",
       name: "evaluateResultPdf",
+      meta: { index: 7, title: "评估报告" },
       component: () =>
         import ("../views/pdf/evaluateResultPdf")
     },
@@ -63,8 +70,18 @@ export default new Router({
     {
       path: "/policyInfo",
       name: "policyInfo",
+      meta: { index: 8, title: "政策详情" },
       component: () =>
         import ("../views/policyInfo/policyInfo")
     }
   ]
 });
+
+router.beforeEach((to, from, next) => {
+  if (to.meta.title) {
+    document.title = to.meta.title;
+  }
+  next();
+});
+
+export default router;

FrontCode2/sunshine_levy/src/views/home.css

@@ -2,287 +2,295 @@
   border-radius: 6px;
   background: #f2fbfd;
 }
+
 .topBox {
   overflow: hidden;
-
   width: 100%;
   height: 225px;
-
   background: url(../assets/img/bg.png);
   background-size: 100% 225px;
 }
+
 .titleBox {
   display: flex;
   align-items: center;
   justify-content: center;
-
   width: 173px;
   height: 36px;
   margin: 15px 0 15px 0;
-
   border-radius: 0 22px 22px 0;
-  background: rgba(6, 63, 142, .66);
+  background: rgba(6, 63, 142, 0.66);
 }
+
+
+/* 第一行标题 */
+
 .font {
   font-family: PingFangSC-Semibold, PingFang SC;
   font-size: 16px;
   font-weight: 600;
   line-height: 22px;
-
   width: 167px;
   height: 22px;
   padding: 3px 7px 3px 7px;
-
   text-align: center;
   vertical-align: middle;
-
   color: #fff;
 }
+
 .baseInfo {
   display: flex;
 }
+
 .baseImg {
   width: 22px;
   height: 21px;
   padding-right: 10px;
   padding-left: 31px;
 }
+
 .baseFont {
   font-family: PingFangSC-Medium, PingFang SC;
-  font-size: 14px;
   font-weight: 500;
   line-height: 20px;
-
   height: 20px;
-
   color: #fff;
 }
+
 .centerMagin {
   margin-top: 10px;
   margin-right: 12px;
-  margin-left: 16px;
+  margin-left: 10px;
 }
+
 .gridBg {
   display: flex;
   overflow: hidden;
   align-items: center;
   justify-content: space-around;
-
   height: 120px;
-
   border-radius: 3px;
-  background: rgba(255, 255, 255, .28);
+  background: rgba(255, 255, 255, 0.28);
 }
+
 .gridImg {
   display: flex;
   align-items: center;
   flex-direction: column;
   justify-content: center;
-
   width: 90px;
   height: 80px;
   margin: 12px 6px;
   padding-top: 5px;
-
   border-radius: 10px;
 }
+
 .gridImgBg {
   width: 38px;
   height: 35px;
 }
+
 .bigImg {
   width: 100%;
   /* height: 91px; */
 }
+
 .project {
   display: flex;
   align-items: center;
   justify-content: space-between;
-
   width: 100%;
   height: 41px;
   padding-right: 0;
   padding-left: 0;
-
   background: url(../assets/img/project_bg.png);
   background-size: 100% 41px;
 }
+
 .projectIcon {
   display: flex;
   align-items: center;
   justify-content: center;
-
   width: 40px;
   height: 40px;
   margin-right: 10px;
-
   border-radius: 5px 0 0;
   background: #3284cd;
 }
+
+
+/* 项目名字 */
+
 .projectTitle {
-  font-family: PingFangSC-Semibold,
+  font-family: PingFangSC-Semibold, PingFang SC;
-  PingFang SC;
   font-size: 16px;
   font-weight: 600;
   line-height: 20px;
-
   height: 20px;
-
   vertical-align: middle;
-
   color: #fff;
 }
+
 .projectRight {
   display: flex;
   align-items: center;
-
   height: 27px;
-
+  opacity: 0.82;
-  opacity: .82;
   border-radius: 13px 0 0 17px;
   background: #24bca3;
 }
+
+
+/* 项目名字旁边小字 */
+
 .projectRightFont {
-  font-family: PingFangSC-Semibold,
+  font-family: PingFangSC-Semibold, PingFang SC;
-  PingFang SC;
   font-size: 12px;
   line-height: 14px;
-
   padding-right: 5px;
-
   color: #fff;
 }
+
 .projectRightIcon {
   width: 17px;
   height: 17px;
   margin-right: 3px;
   margin-left: 8px;
 }
+
 .projectCenter {
   /* height: 440px; */
   padding-bottom: 35px;
-
   background: #fff;
-  box-shadow: 0 2px 6px 1px rgba(212, 212, 212, .5);
+  box-shadow: 0 2px 6px 1px rgba(212, 212, 212, 0.5);
 }
+
 .projectCenterBox {
   padding: 8px 0;
 }
+
 .projectCenterInfo {
   display: flex;
   align-items: center;
-
   padding-top: 5px;
+  width: 100%;
 }
+
+
+/* 项目内容小图标 */
+
 .projectCenterImg {
   width: 15px;
   height: 15px;
-  padding: 0 13px;
+  padding: 0 10px;
 }
+
+
+/* 项目内容文字 */
+
 .projectCenterFont {
-  font-family: PingFangSC-Regular,
+  font-family: PingFangSC-Regular, PingFang SC;
-  PingFang SC;
+  font-size: 14px;
-  font-size: 12px;
   font-weight: 400;
   line-height: 12px;
-
   height: 12px;
-
   color: #2c2b2b;
 }
+
 .assess {
   display: flex;
   align-items: center;
   justify-content: space-between;
-
   width: 100%;
   height: 25px;
   padding-right: 0;
   padding-left: 0;
 }
+
 .assessIcon {
   width: 24px;
   height: 24px;
   margin-right: 10px;
-
   vertical-align: middle;
-
   background: #2468f2;
 }
+
+
+/* 分户，协议标题 */
+
 .assessTitle {
-  font-family: PingFangSC-Regular,
+  font-family: PingFangSC-Regular, PingFang SC;
-  PingFang SC;
+  font-size: 16px;
-  font-size: 14px;
   font-weight: 400;
   line-height: 20px;
-
   height: 20px;
-
   color: #2468f2;
 }
+
 .assessRightIcon {
   width: 24px;
   height: 24px;
-
   background: #2468f2;
 }
+
 .assessBox {
   display: flex;
   align-items: center;
   justify-content: space-between;
-
   padding-top: 10px;
   padding-bottom: 10px;
   padding-left: 12px;
 }
+
 .assessCenter1 {
   margin: 15px;
-
   border-left: 2px solid #24bca3;
 }
+
 .assessCenter2 {
   margin: 15px;
-
   border-left: 2px solid #ff5959;
 }
-.protocolTitle {
-  overflow: hidden;
 
+.protocolTitle {
+  /* overflow: hidden; */
   white-space: nowrap;
   text-overflow: ellipsis;
 }
+
+
+/* 政策的发布时间和区域 */
+
 .font11 {
-  font-family: PingFangSC-Regular,
+  font-family: PingFangSC-Regular, PingFang SC;
-  PingFang SC;
+  font-size: 12px;
-  font-size: 11px;
   font-weight: 400;
   line-height: 11px;
-
   height: 11px;
-
   color: #9da2a3;
 }
+
 .protocolBox {
   border-radius: 4px;
   background: #fff;
-  box-shadow: 0 2px 5px 0 rgba(168, 168, 168, .5);
+  box-shadow: 0 2px 5px 0 rgba(168, 168, 168, 0.5);
 }
-.font14 {
+
-  font-family: PingFangSC-Regular,
+
-  PingFang SC;
+/* .font14 {
+  font-family: PingFangSC-Regular, PingFang SC;
   font-size: 14px;
   font-weight: 400;
   line-height: 20px;
-
   height: 20px;
-
   color: #202020;
-}
+} */
+
 .protocolList {
   padding: 20px 21px 0 20px;
 }
+
 .protocolLine {
   padding-bottom: 10px;
-
+  border-bottom: 1px dashed rgba(168, 168, 168, 0.5);
-  border-bottom: 1px dashed rgba(168, 168, 168, .5);
 }

FrontCode2/sunshine_levy/src/views/index.vue

@@ -20,7 +20,7 @@
               class="baseImg"
             />
             <span class="baseFont">身份证号码：</span>
-            <span class="baseFont">{{ data.idCard }}</span>
+            <span class="baseFont">{{ setIdCard(data.idCard) }}</span>
           </div>
         </div>
         <!-- 三张背景图 -->
@@ -163,9 +163,7 @@
                     }}</span>
                   </div>
                   <div class="assessBox">
-                    <span class="projectCenterFont" style="width: 40%"
+                    <span class="projectCenterFont">被征收房屋地址：</span>
-                      >被征收房屋地址：</span
-                    >
                     <span class="projectCenterFont protocolTitle">
                       {{ assess.houseAddress }}
                     </span>
@@ -201,9 +199,7 @@
                     <span class="projectCenterFont">{{ protocol.xyNo }}</span>
                   </div>
                   <div class="assessBox">
-                    <span class="projectCenterFont" style="width: 40%"
+                    <span class="projectCenterFont">被征收房屋地址：</span>
-                      >被征收房屋地址：</span
-                    >
                     <span class="projectCenterFont protocolTitle">
                       {{ protocol.houseAddress }}
                     </span>
@@ -310,10 +306,40 @@ export default {
         idCard: "加载中...",
         userName: "加载中...",
         policiesRegulationsLists: {
-          totalCount: 0
+          totalCount: 0,
-        }
+          list: [
+            { title: "无数据", publicTime: "无数据", area: "无数据" },
+            { title: "无数据", publicTime: "无数据", area: "无数据" },
+            { title: "无数据", publicTime: "无数据", area: "无数据" }
+          ]
         },
-      ticket: "8a118a427bda7bed017c154e9225358c-ticket"
+        prjList: [
+          {
+            name: "无数据",
+            currentState: "无数据",
+            area: "无数据",
+            zsbm: "无数据",
+            year: "无数据",
+            zsjdh: "无数据",
+            fhpgList: [
+              {
+                assessmentNo: "无数据",
+                houseAddress: "无数据",
+                countValue: "无数据"
+              }
+            ],
+            bcxyList: [
+              {
+                xyNo: "无数据",
+                houseAddress: "无数据",
+                switchProductionWay: "无数据",
+                summationShouldCompensateMoney: "无数据"
+              }
+            ]
+          }
+        ]
+      },
+      ticket: "8a11884d7bda7a4c017c20a63f174601-ticket"
     };
   },
   created() {
@@ -356,6 +382,11 @@ export default {
         }
       });
     },
+    setIdCard(id) {
+      return id == "加载中..."
+        ? id
+        : id.substr(0, 6) + "XXXXXXXX" + id.substr(14, 4);
+    },
     // 跳转项目详情
     gotoProject(type) {
       this.$router.push({

FrontCode2/sunshine_levy/src/views/pdf/evaluateResultPdf.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="margin: 0 auto">
+  <div style="margin: 0 auto" class="container">
     <el-button
       type="primary"
       @click="testdownload4()"
@@ -24,6 +24,7 @@
 
 <script>
 // import pdf from "vue-pdf";
+import $ from "jquery";
 export default {
   components: {},
   data() {
@@ -38,7 +39,18 @@ export default {
   created() {
     this.onInit();
   },
-  mounted() {},
+  mounted() {
+    if (
+      650 >=
+      $(".container")
+        .css("height")
+        .substr(0, 5)
+    ) {
+      $(".bottomContent").addClass("absolute");
+    } else {
+      $(".absolute").removeClass("absolute");
+    }
+  },
   methods: {
     onInit() {
       const result = JSON.parse(JSON.stringify(this.$store.state.info));
@@ -83,6 +95,10 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+.el-button {
+  height: 48px;
+  border-radius: 4px;
+}
 .content {
   text-align: center;
   line-height: 200px;
@@ -103,9 +119,12 @@ export default {
   margin: 0 auto;
   padding: 0;
 }
-.bottomContent {
+.absolute {
   position: absolute;
-  bottom: 10px;
+  bottom: 0px;
+}
+.bottomContent {
+  margin-bottom: 10px;
   text-align: center;
   width: 100%;
   font-size: 10px;

FrontCode2/sunshine_levy/src/views/pdf/pdf.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="margin: 0 auto">
+  <div style="margin: 0 auto" class="container">
     <el-button
       type="primary"
       @click="testdownload4()"
@@ -25,6 +25,7 @@
 <script>
 // import pdf from "vue-pdf";
 import { mgop } from "@aligov/jssdk-mgop";
+import $ from "jquery";
 export default {
   components: {},
   data() {
@@ -39,7 +40,18 @@ export default {
   created() {
     this.onInit();
   },
-  mounted() {},
+  mounted() {
+    if (
+      650 >=
+      $(".container")
+        .css("height")
+        .substr(0, 5)
+    ) {
+      $(".bottomContent").addClass("absolute");
+    } else {
+      $(".absolute").removeClass("absolute");
+    }
+  },
   methods: {
     onInit() {
       mgop({
@@ -100,6 +112,10 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+.el-button {
+  height: 48px;
+  border-radius: 4px;
+}
 .content {
   text-align: center;
   line-height: 200px;
@@ -120,9 +136,12 @@ export default {
   margin: 0 auto;
   padding: 0;
 }
-.bottomContent {
+.absolute {
   position: absolute;
-  bottom: 10px;
+  bottom: 0px;
+}
+.bottomContent {
+  margin-bottom: 10px;
   text-align: center;
   width: 100%;
   font-size: 10px;

FrontCode2/sunshine_levy/src/views/project/index.vue

@@ -17,7 +17,7 @@
             <div>
               <span class="proCenterFont">身份证号：</span>
               <span class="proCenterFont" style="color:#626262;">{{
-                info.idCard
+                setIdCard(info.idCard)
               }}</span>
             </div>
           </div>
@@ -68,6 +68,7 @@
 
 <script>
 import "./project.css";
+import $ from "jquery";
 export default {
   data() {
     return {
@@ -85,7 +86,9 @@ export default {
             area: "无数据",
             currentState: "无数据",
             zsbm: "无数据",
-            year: "无数据"
+            year: "无数据",
+            name: "无数据",
+            createRecordTime: "无数据"
           }
         ]
       }
@@ -94,6 +97,19 @@ export default {
   created() {
     this.onInit();
   },
+  mounted() {
+    if (
+      650 >=
+      $(".container")
+        .css("height")
+        .substr(0, 5)
+    ) {
+      $(".bottomContent").addClass("absolute");
+      $(".bottomContent").css("marginBottom", "0");
+    } else {
+      $(".absolute").removeClass("absolute");
+    }
+  },
   methods: {
     // 获取数据
     onInit() {
@@ -106,6 +122,11 @@ export default {
         JSON.stringify(this.$store.state.homeData.data.data)
       );
     },
+    setIdCard(id) {
+      return id == "无数据"
+        ? id
+        : id.substr(0, 6) + "XXXXXXXX" + id.substr(14, 4);
+    },
     // 页面跳转
     gotoDetail(id) {
       if (window.sessionStorage.getItem("type") == "pg") {
@@ -131,6 +152,10 @@ export default {
 </script>
 <style lang="less" scoped>
 .container {
+  .absolute {
+    position: absolute;
+    bottom: 10px;
+  }
   .bottomContent {
     margin-bottom: 10px;
     text-align: center;

FrontCode2/sunshine_levy/src/views/project/project.css

@@ -1,79 +1,75 @@
 .proTopBoxpg {
-  position: absolute;
+  /* position: absolute; */
-
   display: flex;
   justify-content: space-around;
-
   width: 94%;
   height: 220px;
   margin: 10px;
-
   background: url(../../assets/img/zspg.png);
   background-repeat: no-repeat;
   background-size: 100% 90px;
 }
-.proTopBoxxy {
-  position: absolute;
 
+.proTopBoxxy {
+  /* position: absolute; */
   display: flex;
   justify-content: space-around;
-
   width: 94%;
   height: 220px;
   margin: 10px;
-
   background: url(../../assets/img/zsxy.png);
   background-repeat: no-repeat;
   background-size: 100% 90px;
 }
+
 .proCenterBox {
   overflow: hidden;
-
   width: 95%;
   margin-top: 78px;
-
   border-radius: 6px;
   background: rgba(248, 253, 255, 1);
   box-shadow: 1px 1px 3px rgb(202, 201, 201);
 }
+
 .proList {
-  position: absolute;
+  /* position: absolute; */
-  top: 230px;
+  /* top: 230px; */
   bottom: 0;
-
   overflow-y: scroll;
-
   width: 100%;
 }
+
 .proCenterInfo {
   display: flex;
-
   padding-top: 20px;
 }
+
 .proCenterImg {
   width: 45px;
   height: 45px;
   padding-right: 10px;
   padding-left: 15px;
 }
+
+
+/* 协议签订阶段 */
+
 .proCenterFont {
-  font-family: PingFangSC-Regular,
+  font-family: PingFangSC-Regular, PingFang SC;
-  PingFang SC;
   font-size: 14px;
   font-weight: 500;
   line-height: 25px;
-
   height: 25px;
-
   color: #09a4fa;
 }
+
 .proCenterFlex {
   display: flex;
   align-items: center;
   flex-direction: column;
-
   padding-top: 15px;
 }
+
 .proCenterFlexImg {
   width: 20px;
   height: 12px;
@@ -81,71 +77,76 @@
   padding-right: 10px;
   padding-left: 15px;
 }
+
 .proCenterFlexFont {
-  font-family: PingFangSC-Regular,
+  font-family: PingFangSC-Regular, PingFang SC;
-  PingFang SC;
   font-size: 12px;
   font-weight: 400;
   line-height: 25px;
-
   height: 25px;
-
   color: #9da2a3;
 }
+
 .shadow {
   -webkit-box-shadow: rgb(189, 189, 189) 0 0 3px;
   -moz-box-shadow: rgb(189, 189, 189) 0 0 3px;
   box-shadow: rgb(189, 189, 189) 0 0 3px;
 }
+
 .proListBox {
   height: 127px;
   margin: 15px 20px;
-
   border-radius: 3px;
   background-color: #fff;
 }
+
+
+/* 项目名字 */
+
 .proAreaBox {
   display: flex;
   align-items: center;
   justify-content: space-between;
-
   padding: 10px;
+  font-size: 16px;
 }
+
+
+/* 项目地区 */
+
 .proArea {
   font-family: PingFangSC-Regular;
-  font-size: 16px;
+  font-size: 14px;
   font-weight: 500;
   line-height: 25px;
-
   height: 25px;
   padding: 3px 17px;
-
   color: #fff;
   border-radius: 4px;
   background: #09a4fa;
 }
+
 .proTitleBox {
-  font-family: PingFangSC-Regular,
+  font-family: PingFangSC-Regular, PingFang SC;
-  PingFang SC;
   font-size: 15px;
   font-weight: 600;
   line-height: 20px;
-
   overflow: hidden;
-
   height: 20px;
   margin-left: 10px;
   padding-left: 7px;
-
   white-space: nowrap;
   text-overflow: ellipsis;
-
   color: #252525;
   border-left: 3px solid #09a4fa;
 }
+
+
+/* 底部日期 */
+
 .proDateBox {
   display: flex;
   flex-direction: row-reverse;
-
   padding-right: 10px;
+  font-size: 12px;
 }

FrontCode2/sunshine_levy/src/views/report/agreement.vue

@@ -10,7 +10,7 @@
       v-for="(item, index) in info.prjList.bcxyList"
       class="content"
     >
-      <el-card body-style="padding:0 10px 0">
+      <el-card body-style="padding:0 4px 0">
         <div>
           <img alt src="@/assets/img/bianhao.png" />
           协议编号：
@@ -55,30 +55,45 @@
 </template>
 <script>
 import { SetProjectId } from "@/common/util/tools";
+import $ from "jquery";
 export default {
   data() {
     return {
       info: {
         userName: "无数据",
-        prjList: [
+        prjList: {
-          {
           bcxyList: [
             {
               houseAddress: "无数据",
               summationShouldCompensateMoney: "无数据",
-                date: "无数据"
+              date: "无数据",
+              xyNo: "无数据",
+              switchProductionWay: "无数据",
+              countValue: "无数据",
+              signTime: "无数据"
             }
           ],
           fhpgList: [{ countValue: "无数据", assessmentNo: "无数据" }]
         }
-        ]
       },
-      prjListLength: ""
+      prjListLength: "0"
     };
   },
   created() {
     this.onInit();
   },
+  mounted() {
+    if (
+      650 >=
+      $(".container")
+        .css("height")
+        .substr(0, 5)
+    ) {
+      $(".bottomContent").addClass("absolute");
+    } else {
+      $(".absolute").removeClass("absolute");
+    }
+  },
   methods: {
     onInit() {
       if (!window.sessionStorage.getItem("projectId")) {
@@ -104,11 +119,11 @@ export default {
 
 <style lang="less" scoped>
 .container {
-  font-size: 12px;
+  font-size: 14px;
-  position: relative;
   .image {
     margin-top: 20px;
     text-align: center;
+    // height: 500px;
     img {
       width: 95%;
     }
@@ -122,14 +137,13 @@ export default {
   .el-card {
     margin: 0 10px 10px;
     .el-card__body {
-      padding: 0 10px;
       > div {
         margin: 14px 0;
         display: flex;
         align-items: center;
         height: 20px;
         b {
-          font-size: 14px;
+          font-size: 16px;
         }
         img {
           margin-right: 6px;
@@ -167,6 +181,10 @@ export default {
       }
     }
   }
+  .absolute {
+    position: absolute;
+    bottom: 0px;
+  }
   .bottomContent {
     margin-bottom: 10px;
     text-align: center;

FrontCode2/sunshine_levy/src/views/report/evaluatePage.vue

@@ -65,26 +65,42 @@
 </template>
 <script>
 import { mgop } from "@aligov/jssdk-mgop";
+import $ from "jquery";
 export default {
   data() {
     return {
       info: {
         houseAddress: "地址",
         valuationMethodText: "价值录入",
+        assessmentNo: "无数据",
         number: "0001",
-        housingAssessmentValue: "168612元",
+        housingAssessmentValue: "",
-        countValue: "168612元",
+        countValue: "",
-        attachedAssessedValue: "168612元",
+        attachedAssessedValue: "",
-        decorateAssessedValue: "16861元",
+        decorateAssessedValue: "",
         exceedLandMoney: "报告录入",
         atticAssessedValue: "报告录入",
-        remark: "Remark"
+        remark: "Remark",
+        isExistPdf: true
       }
     };
   },
   created() {
     this.getData();
   },
+  mounted() {
+    if (
+      650 >=
+      $(".container")
+        .css("height")
+        .substr(0, 5)
+    ) {
+      $(".bottomContent").addClass("absolute");
+      $(".bottomContent").css("marginBottom", "0");
+    } else {
+      $(".absolute").removeClass("absolute");
+    }
+  },
   methods: {
     // 获取数据
     getData() {
@@ -106,8 +122,12 @@ export default {
         onSuccess: data => {
           this.$store.dispatch("GET_DATA", data);
           console.log("分户评估", data);
+          if (data.data.success) {
             const { data: res } = data.data;
             this.info = res;
+          } else {
+            return;
+          }
         },
         onFail: err => {
           console.log("请求失败", err);
@@ -136,7 +156,8 @@ export default {
   font-size: 14px;
   .top {
     background-color: #eff2fa;
-    padding: 10px 7%;
+    padding: 10px 26px 10px 16px;
+    // height: 500px;
     .evaluateNumber {
       > span {
         color: #3da4fc;
@@ -178,9 +199,17 @@ export default {
     display: flex;
     justify-content: center;
     margin-bottom: 20px;
+    .el-button {
+      height: 48px;
+      font-size: 18px;
+      border-radius: 4px;
+    }
+  }
+  .absolute {
+    position: absolute;
+    bottom: 10px;
   }
   .bottomContent {
-    // position: absolute;
     margin-bottom: 10px;
     text-align: center;
     width: 100%;

FrontCode2/sunshine_levy/src/views/report/evalute.vue

@@ -15,7 +15,7 @@
       @click="pageJump(item.id, item.type)"
     >
       <div v-if="item.type === '1'">
-        <el-card body-style="padding:10px">
+        <el-card body-style="padding:4px">
           <div class="absolute">
             <span>住宅</span>
           </div>
@@ -114,29 +114,43 @@
 </template>
 <script>
 import { SetProjectId } from "@/common/util/tools";
+import $ from "jquery";
 export default {
   data() {
     return {
       info: {
         userName: "无数据",
-        prjList: [
+        prjList: {
-          {
           fhpgList: [
             {
               assessmentNo: "无数据",
               houseAddress: "无数据",
-                countValue: "无数据"
+              countValue: "无数据",
+              type: "2",
+              createUserName: "无数据",
+              createTime: "无数据"
             }
           ]
         }
-        ]
       },
-      prjListLength: ""
+      prjListLength: "0"
     };
   },
   created() {
     this.onInit();
   },
+  mounted() {
+    if (
+      650 >=
+      $(".container")
+        .css("height")
+        .substr(0, 5)
+    ) {
+      $(".bottomContent").addClass("absoluteInfo");
+    } else {
+      $(".absoluteInfo").removeClass("absoluteInfo");
+    }
+  },
   methods: {
     // 获取数据
     onInit() {
@@ -170,11 +184,11 @@ export default {
 
 <style lang="less" scoped>
 .container {
-  font-size: 12px;
+  font-size: 14px;
-  position: relative;
   .image {
     margin-top: 20px;
     text-align: center;
+    // height: 500px;
     img {
       width: 90%;
     }
@@ -187,11 +201,9 @@ export default {
   }
   .title {
     margin: 10px 10px;
-    font-size: 14px;
     height: 20px;
     display: flex;
     align-items: center;
-
     img {
       margin-right: 7px;
       height: 100%;
@@ -201,9 +213,9 @@ export default {
     margin: 0 10px 10px;
     position: relative;
     .el-card__body {
-      padding: 0 10px;
       > div {
         margin: 14px 0;
+        // line-height: 20px;
         display: flex;
         align-items: center;
         img {
@@ -232,8 +244,6 @@ export default {
         margin: 0;
         img {
           width: 100%;
-        }
-        img {
           height: 2px;
         }
       }
@@ -251,11 +261,16 @@ export default {
           }
           span {
             padding-right: 10px;
+            font-size: 12px;
           }
         }
       }
     }
   }
+  .absoluteInfo {
+    position: absolute;
+    bottom: 0px;
+  }
   .bottomContent {
     margin-top: 20px;
     margin-bottom: 10px;