Merge branch 'sit'

src/views/dashboard/index.vue

@@ -1,15 +1,27 @@
 <template>
   <div class="dashboard-container">
     <!-- <div class="dashboard-editor-container"> -->
-      <!-- <div class="info-container clearfix">
+    <!-- <div class="info-container clearfix">
         <pan-thumb :image="avatar" :width="'130px'" :height="'130px'">
         </pan-thumb>
         
         <span class="welcome-title">欢迎登录采销平台</span>
       </div> -->
-      <!-- style="width: 60%; margin: -30px auto 0 auto" -->
-      <img :src="emptyGif" class="bg-img" />
-    <!-- </div> -->
+    <!-- style="width: 60%; margin: -30px auto 0 auto" -->
+    <img :src="emptyGif" class="bg-img" />
+    <div class="duihua">
+      <!-- <img src="@/assets/img/duihuakuang.png" /> -->
+      <img class="bg" src="@/assets/img/duihua.png" />
+      <div class="neirong">
+        <img src="@/assets/img/neirong.png" />
+      </div>
+
+      <!-- <div>
+        <p>开工了&nbsp;！</p>
+        <p>快干活&nbsp;！</p>
+      </div> -->
+    </div>
+    <div class="wudi">woody</div>
   </div>
 </template>
 
@@ -24,11 +36,11 @@ export default {
     };
   },
   // computed: {
-    // ...mapGetters([
-      // 'name',
-      // "avatar",
-      // 'roles'
-    // ]),
+  // ...mapGetters([
+  // 'name',
+  // "avatar",
+  // 'roles'
+  // ]),
   // },
   // mounted() {},
 };
@@ -39,16 +51,64 @@ export default {
   padding: 0 0 0 0;
   position: relative;
   width: 100%;
-  min-height: calc( 100vh - 53px);
-  display:block;
+  min-height: calc(100vh - 53px);
+  display: block;
   overflow: hidden;
-  .bg-img{
+  .bg-img {
     width: 100%;
     position: absolute;
-      display:block;
+    display: block;
     min-height: 100%;
     height: 100%;
   }
+  .duihua {
+    position: absolute;
+    top: 1%;
+    right: 12%;
+    z-index: 2;
+    width: 290px;
+    img.bg {
+      display: block;
+      width: 100%;
+    }
+    div.neirong {
+      display: block;
+      position: absolute;
+      top: 0;
+      left: 0;
+      height: 100%;
+      min-height: 100%;
+      width: 100%;
+      box-sizing: border-box;
+      text-align: center;
+      padding:60px 0 0 20px;
+      img {
+        display: inline-block;
+    //  width: 2;
+      }
+    }
+    // div {
+    //   position: absolute;
+    //   top: 0;
+    //   width: 100%;
+    //   padding: 23.5% 0 0 10%;
+    //   p {
+    //     text-align: center;
+    //     line-height: 50px;
+    //     font-size: 35px;
+    //     font-weight: bold;
+    //     letter-spacing: 1px;
+    //     color: #1f2d3d;
+    //   }
+    // }
+  }
+  .wudi {
+    position: absolute;
+    right: 0;
+    bottom: 0;
+    color: #fff;
+    z-index: 3;
+  }
   // background-color: #e3e3e3;
 }
 .emptyGif {
@@ -58,8 +118,8 @@ export default {
 }
 
 .dashboard-editor-container {
-   position: relative;
-  min-height:100%;
+  position: relative;
+  min-height: 100%;
   width: 100%;
   // display: flex;
   // padding: 0 6% 0 0;

src/views/sellOut/bargainList/detail.vue

@@ -384,7 +384,7 @@ export default {
         if (exam_info && exam_info.length > 0) {
           exam_info.forEach((e) => {
             console.log(e.status);
-            switch (e.status + "") {
+            switch (e.info_status + "") {
               case "0":
                 this.orderItem = JSON.parse(JSON.stringify(e));
                 break;

src/views/sellOut/bargainList/exam-form.vue

@@ -135,8 +135,8 @@ export default {
           console.log(this.sitem);
           const { status, remark } = this.sitem;
           this.ruleForm = {
-            state: status+"" || "1", // 通过or驳回
-            remark: remark || "",
+            state: status + "" || "1", // 通过or驳回
+            remark: remark + "" || "",
           };
         }
       });