查看备注优化

src/app/my/approval-result-list/approval-result-list.component.html

@@ -14,7 +14,7 @@
       <div class="right">
       <div class="right">
         <div>
         <div>
           <span style="font-size: 18px;color: #000;font-weight: 700;">{{recordsItem.approveStepName}}</span>
           <span style="font-size: 18px;color: #000;font-weight: 700;">{{recordsItem.approveStepName}}</span>
-          <span (click)="lookRemark(recordsItem.rejectNote)"> <i class="iconfont icon-ziliao" style="position: relative;top: 1px;" ></i> 查看备注</span>
+          <span *ngIf="recordsItem.rejectNote" (click)="lookRemark(recordsItem.rejectNote)"> <i class="iconfont icon-ziliao" style="position: relative;top: 1px;" ></i> 查看备注</span>
         </div>
         </div>
         <div style="font-size: 16px;">
         <div style="font-size: 16px;">
           <span>
           <span>
@@ -35,8 +35,12 @@
   <div class="editContainer" *ngIf="isShow">
   <div class="editContainer" *ngIf="isShow">
     <div>
     <div>
       <div>备注</div>
       <div>备注</div>
-      <textarea type="text" id="remark" class="form-control" [(ngModel)]="this.remark" disabled></textarea>
+      <textarea type="text" id="remark" cols="10" rows="5" class="form-control" [(ngModel)]="this.remark" disabled style="margin-top: 10px;"></textarea>
     </div>
     </div>
+    <div (click)="this.isShow = false;" style="margin-top: 20px;text-align: center;">
+      关闭
+    </div>
+    
   </div>
   </div>
 <div class="footer" (click)="jumpToDetail()">
 <div class="footer" (click)="jumpToDetail()">
   查看资料
   查看资料

src/app/my/approval-result-list/approval-result-list.component.ts

@@ -70,7 +70,10 @@ export class ApprovalResultListComponent implements OnInit {
   }
   }
 
 
   lookRemark(remark){
   lookRemark(remark){
-    this.isShow = true;
-    this.remark = remark;
+    if(remark){
+      this.isShow = true;
+      this.remark = remark;
+    }
+    
   }
   }
 }
 }

src/index.html

@@ -18,7 +18,7 @@
   <link rel="stylesheet" href="./assets/LCalendar/LCalendar.css">
   <link rel="stylesheet" href="./assets/LCalendar/LCalendar.css">
   <link rel="stylesheet" href="./assets/laydate/theme/default/laydate.css">
   <link rel="stylesheet" href="./assets/laydate/theme/default/laydate.css">
   <style>
   <style>
-    .footer{
+    .index_footer{
       min-width: 320px;
       min-width: 320px;
       max-width: 640px;
       max-width: 640px;
       margin: 0 auto;
       margin: 0 auto;
@@ -29,10 +29,11 @@
       left: 0;
       left: 0;
       right: 0;
       right: 0;
       text-align: center;
       text-align: center;
+      z-index: 100;
     }
     }
-    .footer img{
-      width: 36%;
-      margin-top: 20px;
+    .index_footer img{
+      width: 38%;
+      margin: 20px auto 15px auto;
     }
     }
   </style>
   </style>
 </head>
 </head>
@@ -51,13 +52,14 @@
       <img style="width:100%;margin-bottom: 15px;" src="assets/images/loading_bg.png">
       <img style="width:100%;margin-bottom: 15px;" src="assets/images/loading_bg.png">
       <!-- <div style="margin-top: 45%;">欢迎回家，先喝碗鸡汤</div> -->
       <!-- <div style="margin-top: 45%;">欢迎回家，先喝碗鸡汤</div> -->
     </div>
     </div>
-    <div id="content" style="letter-spacing: 3px;font-size: 20px;text-align: center;padding: 0 15px;position: absolute;top: 45%;color: #fff;left: 0;right: 0;margin: 0 auto;">
+    <div id="content" style="letter-spacing: 3px;font-size: 20px;text-align: center;padding: 0 15px;position: absolute;bottom: 40%;color: #fff;left: 0;right: 0;margin: 0 auto;">
 
 
     </div>
     </div>
-    <div class="footer">
+    <div class="index_footer">
       <img src="assets/images/login_logo.png" alt="logo">
       <img src="assets/images/login_logo.png" alt="logo">
-      <div style="letter-spacing: 4px;">
-        海纳百川 赢家后盾
+      <div class="loadingContent" >
+        <span style="letter-spacing: 2px;">海纳百川 &nbsp</span>
+        <span style="letter-spacing: 2px;">赢家后</span>盾
       </div>
       </div>
     </div>
     </div>
   </div>
   </div>
@@ -100,13 +102,13 @@
       }
       }
     }
     }
     //页面刷新的时候不出现
     //页面刷新的时候不出现
-    // if (window.name == "") {
-    //   window.name = "isReload"; // 在首次进入页面时我们可以给window.name设置一个固定值
+    if (window.name == "") {
+      window.name = "isReload"; // 在首次进入页面时我们可以给window.name设置一个固定值
       initialize();
       initialize();
-    // } else if (window.name == "isReload") {
-    //   let loading = document.getElementById("adv");
-    //   loading.style.display = 'none';
-    // }
+    } else if (window.name == "isReload") {
+      let loading = document.getElementById("adv");
+      loading.style.display = 'none';
+    }
 
 
     //用于去除alert的url
     //用于去除alert的url
     window.alert = function (name) {
     window.alert = function (name) {

src/styles.scss

@@ -92,6 +92,9 @@ input::placeholder {
   font-size:14px;
   font-size:14px;
   font-family: '微软雅黑';
   font-family: '微软雅黑';
   position: relative;
   position: relative;
+  width: 40%;
+  text-align: center;
+  margin: 0 auto;
 }
 }
 .loadingContent:before {
 .loadingContent:before {
   content: " ";
   content: " ";
@@ -172,7 +175,7 @@ footer.fixed{
   height: 56px;
   height: 56px;
   line-height: 56px;
   line-height: 56px;
   border-radius: 0;
   border-radius: 0;
-  z-index: 1;
+  z-index: 0;
 }
 }
 .page_mark{
 .page_mark{
   width: 40px;
   width: 40px;