shish 1 год назад
Родитель
Сommit
937ea96e4a
2 измененных файлов с 25 добавлено и 169 удалено
  1. 12 36
      hdApp/src/admin/home/workbench.vue
  2. 13 133
      hdApp/src/pagesPurchase/order.vue

+ 12 - 36
hdApp/src/admin/home/workbench.vue

@@ -911,43 +911,14 @@ export default {
     display: flex;
     flex-direction: row;
   }
-  .justify-start {
-      display: flex;
-      justify-content: flex-start;
-    }
-  .justify-center {
-      display: flex;
-      justify-content: center;
-  }
-    
   .justify-end {
       display: flex;
       justify-content: flex-end;
   }
-  .justify-evenly {
-      display: flex;
-      justify-content: space-evenly;
-  }
-  .justify-around {
-      display: flex;
-      justify-content: space-around;
-  }
   .justify-between {
       display: flex;
       justify-content: space-between;
   }
-  .align-start {
-      display: flex;
-      align-items: flex-start;
-  }
-  .align-center {
-      display: flex;
-      align-items: center;
-  }
-  .align-end {
-      display: flex;
-      align-items: flex-end;
-  }
 
   .ghs_list_area {
     width: 750upx;
@@ -1033,11 +1004,6 @@ export default {
           width: 247upx;
           height: 29upx;
           margin: 26upx 0 0 30upx;
-          .icon_2 {
-            width: 22upx;
-            height: 26upx;
-            margin-top: 2upx;
-          }
           .waite_clear_order {
             width: 214upx;
             height: 29upx;
@@ -1049,7 +1015,7 @@ export default {
             white-space: nowrap;
             line-height: 29upx;
           }
-                  }
+        }
         }
         .button_4 {
         height: 80upx;
@@ -1174,7 +1140,7 @@ export default {
           }
           
           .supplier-name {
-            font-size: 34upx;
+            font-size: 32upx;
             color: #333;
             flex: 1;
             font-weight: 500;
@@ -1202,6 +1168,16 @@ export default {
         display: flex;
         justify-content: space-between;
         gap: 20upx;
+        
+        .admin-button-com {
+          flex: 1;
+          margin: 0;
+          padding: 20upx 0;
+          height: auto;
+          line-height: normal;
+          font-size: 34upx;
+          font-weight: bold;
+        }
       }
     }
   }

+ 13 - 133
hdApp/src/pagesPurchase/order.vue

@@ -357,87 +357,20 @@ export default {
     display: flex;
     flex-direction: row;
   }
-  .justify-start {
-      display: flex;
-      justify-content: flex-start;
-    }
-  .justify-center {
-      display: flex;
-      justify-content: center;
-  }
-    
   .justify-end {
       display: flex;
       justify-content: flex-end;
   }
-  .justify-evenly {
-      display: flex;
-      justify-content: space-evenly;
-  }
-  .justify-around {
-      display: flex;
-      justify-content: space-around;
-  }
   .justify-between {
       display: flex;
       justify-content: space-between;
   }
-  .align-start {
-      display: flex;
-      align-items: flex-start;
-  }
-  .align-center {
-      display: flex;
-      align-items: center;
-  }
-  .align-end {
-      display: flex;
-      align-items: flex-end;
-  }
 
   .ghs_list_area {
     width: 750upx;
     background-color: #ece5e5;
     margin-bottom:40upx;
-    .group_1 {
-      box-shadow: 0px 1px 0px 0px rgba(221, 221, 221, 1);
-      background-color: rgba(255, 255, 255, 1);
-      width: 750upx;
-      height: 128upx;
-      margin-top: 2upx;
-      .image_1 {
-        width: 727upx;
-        height: 20upx;
-        margin: 11upx 0 0 12upx;
-      }
-      .block_4 {
-        width: 714upx;
-        height: 64upx;
-        margin: 21upx 0 12upx 24upx;
-        .icon_1 {
-          width: 20upx;
-          height: 34upx;
-          margin-top: 16upx;
-        }
-        .text_1 {
-          width: 107upx;
-          height: 34upx;
-          overflow-wrap: break-word;
-          color: rgba(4, 4, 4, 1);
-          font-size: 36upx;
-          font-family: PingFangSC-Semibold;
-          text-align: left;
-          white-space: nowrap;
-          line-height: 24upx;
-          margin: 15upx 0 0 278upx;
-        }
-        .applet-top-bar_1 {
-          width: 174upx;
-          height: 64upx;
-          margin-left: 135upx;
-        }
-      }
-    }
+
     .ghs_box {
       background-color: rgba(255, 255, 255, 1);
       position: relative;
@@ -511,44 +444,7 @@ export default {
           padding-left:15upx;
           padding-right:15upx;
         }
-        .tag_3 {
-          background-color: rgba(255, 255, 255, 1);
-          border-radius: 8px;
-          height: 60upx;
-          border: 1px solid rgba(221, 221, 221, 1);
-          margin-left: 12upx;
-          width: 140upx;
-          .text_11 {
-            width: 101upx;
-            height: 25upx;
-            overflow-wrap: break-word;
-            color: rgba(51, 51, 51, 1);
-            font-size: 26upx;
-            text-align: left;
-            white-space: nowrap;
-            line-height: 25upx;
-            margin: 17upx 0 0 20upx;
-          }
-        }
-        .tag_4 {
-          background-color: rgba(255, 255, 255, 1);
-          border-radius: 8px;
-          height: 60upx;
-          border: 1px solid rgba(221, 221, 221, 1);
-          margin-left: 12upx;
-          width: 192upx;
-          .text_12 {
-            width: 153upx;
-            height: 25upx;
-            overflow-wrap: break-word;
-            color: rgba(51, 51, 51, 1);
-            font-size: 26upx;
-            text-align: left;
-            white-space: nowrap;
-            line-height: 25upx;
-            margin: 17upx 0 0 18upx;
-          }
-        }
+
       }
       .box_6 {
         background-color: rgb(248, 242, 242);
@@ -558,11 +454,6 @@ export default {
           width: 247upx;
           height: 29upx;
           margin: 26upx 0 0 30upx;
-          .icon_2 {
-            width: 22upx;
-            height: 26upx;
-            margin-top: 2upx;
-          }
           .waite_clear_order {
             width: 214upx;
             height: 29upx;
@@ -575,27 +466,6 @@ export default {
             line-height: 29upx;
           }
         }
-        .image-text_9 {
-          width: 134upx;
-          height: 27upx;
-          margin: 26upx 29upx 0 310upx;
-          .text-group_4 {
-            width: 111upx;
-            height: 27upx;
-            overflow-wrap: break-word;
-            color: rgba(255, 40, 66, 1);
-            font-size: 30upx;
-            font-weight:bold;
-            text-align: left;
-            white-space: nowrap;
-            line-height: 27upx;
-          }
-          .icon_3 {
-            width: 14upx;
-            height: 24upx;
-            margin-top: 2upx;
-          }
-        }
       }
       .button_4 {
         height: 80upx;
@@ -723,7 +593,7 @@ export default {
           }
           
           .supplier-name {
-            font-size: 34upx;
+            font-size: 32upx;
             color: #333;
             flex: 1;
             font-weight: 500;
@@ -751,6 +621,16 @@ export default {
         display: flex;
         justify-content: space-between;
         gap: 20upx;
+        
+        .admin-button-com {
+          flex: 1;
+          margin: 0;
+          padding: 20upx 0;
+          height: auto;
+          line-height: normal;
+          font-size: 34upx;
+          font-weight: bold;
+        }
       }
     }
   }