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

FrontCode2/sunshine_levy/src/views/index.vue

@@ -62,15 +62,18 @@
         <div class="projectCenterBox">
           <div>
             <img src="@/assets/img/project_area.png" />
-            <span>项目所在区域：{{ item.area }}</span>
+            <span>项目所在区域：</span>
+            <div>{{ item.area }}</div>
           </div>
           <div>
             <img src="@/assets/img/project_dep.png" />
-            <span>征收部门：{{ item.zsbm }}</span>
+            <span>征收部门：</span>
+            <div>{{ item.zsbm }}</div>
           </div>
           <div>
             <img src="@/assets/img/project_year.png" />
-            <span>所属年份：{{ item.year }}</span>
+            <span>所属年份：</span>
+            <div>{{ item.year }}</div>
           </div>
           <div>
             <img src="@/assets/img/project_no.png" />
@@ -293,9 +296,9 @@ export default {
         appKey: "es4b8zmz+2001833218+dehllx",
         onSuccess: data => {
           console.log("首页数据", data);
+          this.loading = false;
           window.sessionStorage.setItem("homeData", JSON.stringify(data));
           if (data.data.success) {
-            this.loading = false;
             this.data = data.data.data;
             // 埋点
             this.setZwUserAplus(this.data.idCard, this.data.userName);
@@ -325,6 +328,7 @@ export default {
           }
         },
         onFail: err => {
+          this.loading = false;
           this.$notify({
             title: "错误",
             message: "请求失败",
@@ -476,7 +480,6 @@ export default {
     margin: 15px 0 15px 0;
     border-radius: 0 22px 22px 0;
     background: rgba(6, 63, 142, 0.66);
-    font-family: PingFangSC-Semibold, PingFang SC;
     font-size: 16px;
     font-weight: 600;
     color: #ffffff;
@@ -485,16 +488,11 @@ export default {
     display: flex;
     margin: 5px 0;
     .van-image {
-      width: 22px;
       height: 21px;
       padding-right: 10px;
       padding-left: 31px;
     }
     span {
-      font-family: PingFangSC-Medium, PingFang SC;
-      font-weight: 500;
-      line-height: 20px;
-      height: 20px;
       color: #fff;
     }
   }
@@ -601,20 +599,20 @@ export default {
       display: flex;
       align-items: center;
       padding-top: 15px;
-      width: 100%;
       img {
-        width: 15px;
         height: 15px;
         padding: 0 10px;
       }
       span {
-        font-family: PingFangSC-Regular, PingFang SC;
-        font-size: 14px;
         font-weight: 400;
-        color: #2c2b2b;
+        color: #b3b5b9;
         white-space: nowrap;
+      }
+      div {
         overflow: hidden;
         text-overflow: ellipsis;
+        white-space: nowrap;
+        color: #363a44;
       }
     }
   }
@@ -647,10 +645,12 @@ export default {
       padding-left: 12px;
       span {
         white-space: nowrap;
+        color: #b3b5b9;
       }
       > span:nth-child(2) {
         overflow: hidden;
         text-overflow: ellipsis;
+        color: #363a44;
       }
     }
     > div:nth-child(2) {
@@ -686,10 +686,12 @@ export default {
       padding-left: 12px;
       span {
         white-space: nowrap;
+        color: #b3b5b9;
       }
       > span:nth-child(2) {
         overflow: hidden;
         text-overflow: ellipsis;
+        color: #363a44;
       }
     }
     > div:nth-child(n + 2) {

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

@@ -110,6 +110,8 @@ export default {
 .el-button {
   height: 48px;
   border-radius: 4px;
+  font-size: 18px;
+  color: #ffffff;
 }
 .content {
   text-align: center;

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

@@ -131,6 +131,8 @@ export default {
 .el-button {
   height: 48px;
   border-radius: 4px;
+  font-size: 18px;
+  color: #ffffff;
 }
 .content {
   text-align: center;

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

@@ -60,7 +60,9 @@
       </div>
     </el-card>
     <div class="bottom">
-      <el-button type="primary" @click="pageJump()">查看评估报告</el-button>
+      <el-button type="primary" :loading="isLoading" @click="pageJump()"
+        >查看评估报告</el-button
+      >
     </div>
   </div>
 </template>
@@ -70,6 +72,7 @@ export default {
   data() {
     return {
       loading: true,
+      isLoading: true,
       info: {
         houseAddress: "宁波市档案管理和数据中心百丈东路口",
         valuationMethodText: "价值录入",
@@ -110,13 +113,13 @@ export default {
         appKey: "es4b8zmz+2001833218+dehllx",
         onSuccess: data => {
           console.log("分户评估", data);
+          this.isLoading = false;
+          this.loading = false;
           window.sessionStorage.setItem("evaluateData", JSON.stringify(data));
           if (data.data.success) {
-            this.loading = false;
             const { data: res } = data.data;
             this.info = res;
           } else {
-            this.loading = false;
             let code = [6001, 6501];
             if (code.indexOf(result.data.bizCode) != "-1") {
               this.$message({
@@ -141,7 +144,14 @@ export default {
           }
         },
         onFail: err => {
-          console.log("请求失败", err);
+          this.loading = false;
+          this.isLoading = false;
+          this.$notify({
+            title: "错误",
+            message: "请求失败",
+            type: "info",
+            duration: 3000
+          });
         }
       });
     },
@@ -215,6 +225,7 @@ export default {
       height: 48px;
       font-size: 18px;
       border-radius: 4px;
+      color: #ffffff;
     }
   }
 }