Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/views/activityManage/makerActvityApply2.vue

@@ -156,9 +156,12 @@
 
 .MAputIn{   //提交对话框样式
   .el-dialog__title{
-    font-size: 24px;
-    display: flex;
-    color:rgb(246, 247, 246);
+        color:#fff;
+        display: flex;
+        justify-content: center;
+        font-size: 18px;
+        position: relative;
+        top: -2px;
   }
   .deleteContent{
     width: 100%;
@@ -167,15 +170,15 @@
     color: #000;
   }
   .addDialogLogo{
-    width: 60px;
-    height: 30px;
-    border-radius: 5px;
-    line-height: 30px;
-    background: #f2f2f2;
-    position: absolute;
-    left: 10px;
-    top: 10px;
-    text-align: center;
+        width: 60px;
+        height: 30px;
+        border-radius: 5px;
+        display: flex;
+        justify-content: center;
+        line-height: 30px;
+        background: #f2f2f2;
+        position: absolute;
+        left: 20px; top: 15px; 
   }
  
   

src/views/projectApply/projectApplicationDetails.vue

@@ -596,21 +596,24 @@
    color: #000;
  }
  .addDialogLogo{
-   width: 60px;
-   height: 30px;
-   line-height: 30px;
-   background: #f2f2f2;
-   position: absolute;
-   left: 10px;
-   top: 10px;
-   text-align: center;
+        width: 60px;
+        height: 30px;
+        border-radius: 5px;
+        display: flex;
+        justify-content: center;
+        line-height: 30px;
+        background: #f2f2f2;
+        position: absolute;
+        left: 20px; top: 15px; 
  }
 
  .el-dialog__title{
-   font-size: 22px;
-   color:rgb(246, 247, 246);
-   display: flex;
-   justify-content: center;
+        color:#fff;
+        display: flex;
+        justify-content: center;
+        font-size: 18px;
+        position: relative;
+        top: -2px;
  }
  .addDialogMid{
    box-sizing: border-box;

src/views/projectSettlement/projectSettlement.vue

@@ -284,7 +284,7 @@
           this.ajax    
             .get(this.$store.state.api+'/SelectSettlement',param)
               .then(res=>{
-                // console.log(res.data);
+                console.log(res.data);
                 let data=res.data;
                 let a=this.options;
                 this.tableData=data[0];