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

FrontCode2/sunshine_levy/src/App.vue

@@ -23,7 +23,10 @@ export default {
     };
     document.body.ontouchend = function(e) {
       this.endValue = e.changedTouches[0].pageY;
-      if (this.endValue - this.startValue > 0) {
+      if (
+        this.endValue - this.startValue > 50 &&
+        e.changedTouches[0].pageY === e.changedTouches[0].clientY
+      ) {
         window.location.reload();
       }
     };
@@ -38,6 +41,7 @@ export default {
   padding-bottom: 48px;
   position: relative;
   box-sizing: border-box;
+  background: #f6f7f8;
   .bottomContent {
     position: absolute;
     bottom: 10px;
@@ -46,6 +50,7 @@ export default {
     font-size: 10px;
     p {
       margin: 0;
+      line-height: 14px;
     }
     b {
       color: #5d8cbc;

FrontCode2/sunshine_levy/src/elementui/index.js

@@ -1,6 +1,14 @@
 import Vue from "vue";
 
-import { Form, FormItem, Button, Card, Loading, Message } from "element-ui";
+import {
+  Form,
+  FormItem,
+  Button,
+  Card,
+  Loading,
+  Message,
+  Notification
+} from "element-ui";
 
 Vue.use(Form);
 Vue.use(FormItem);
@@ -8,4 +16,5 @@ Vue.use(Button);
 Vue.use(Card);
 Vue.use(Loading);
 
-Vue.component(Message);
+Vue.component(Message);
+Vue.component(Notification);

FrontCode2/sunshine_levy/src/views/home.css

@@ -1,6 +1,7 @@
 .page {
   border-radius: 6px;
-  background: #f2fbfd;
+  /* background: #f2fbfd; */
+  background: #f6f7f8;
 }
 
 .topBox {

FrontCode2/sunshine_levy/src/views/index.vue

@@ -4,6 +4,7 @@
     v-loading="loading"
     element-loading-text="拼命加载中"
     element-loading-spinner="el-icon-loading"
+    element-loading-background=" rgba(118,118,118)"
   >
     <div class="topBox">
       <div class="titleBox">
@@ -161,7 +162,7 @@
       >
         <!-- 非最后一行有边框 -->
         <div
-          style="border-bottom: 1px dashed #C9C7C7"
+          style="border-bottom: 1px dashed #E8E9EC"
           v-if="i != data.policiesRegulationsLists.list.length - 1"
         >
           <div>{{ item.title }}</div>
@@ -324,7 +325,12 @@ export default {
           }
         },
         onFail: err => {
-          console.log("用户无数据，不展示");
+          this.$notify({
+            title: "错误",
+            message: "请求失败",
+            duration: 3000,
+            type: "error"
+          });
         }
       });
     },
@@ -337,7 +343,6 @@ export default {
     gotoProject(type) {
       $(".bottomContent").removeClass("display");
       $("#app").removeClass("padding");
-
       this.$router.push({
         name: "projectSelect",
         params: {
@@ -447,7 +452,7 @@ export default {
 <style lang="less" scoped>
 .page {
   border-radius: 6px;
-  background: #f2fbfd;
+  background: #f6f7f8;
   padding-bottom: 20px;
   > div:nth-child(n + 2) {
     margin-top: 10px;

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

@@ -175,17 +175,15 @@ export default {
     }
     > div {
       margin: 20px 0;
-      height: 20px;
       display: flex;
       justify-content: space-between;
       align-items: flex-start;
+      line-height: 20px;
       > div {
         display: flex;
         align-items: center;
-        height: 100%;
-        width: 50%;
         img {
-          height: 100%;
+          height: 20px;
           margin-right: 10px;
         }
         span {

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

@@ -234,6 +234,7 @@ export default {
         margin: 14px 0;
         display: flex;
         align-items: center;
+        line-height: 20px;
         img {
           margin-right: 6px;
           width: 20px;