Bladeren bron

style: 调整destination delivery页面样式

zhouyuhao 6 maanden geleden
bovenliggende
commit
5bacddba38

+ 10 - 7
src/styles/elementui.scss

@@ -697,10 +697,12 @@ div .scoreDialog2 .el-dialog__body {
 }
 
 div .el-textarea__inner:hover {
-  box-shadow: 0 0 0 1px var(--color-theme);
+  box-shadow: 0 0 0 1px var(--color-theme) inset;
+  outline: none;
 }
 div .el-textarea__inner:focus {
-  box-shadow: 0 0 0 1px var(--color-theme);
+  box-shadow: 0 0 0 1px var(--color-theme) inset;
+  outline: none;
 }
 div .el-result__title {
   margin-top: 16px;
@@ -827,7 +829,8 @@ div .carousel .el-carousel__button {
 div .carousel .el-carousel__indicator.is-active button {
   background-color: var(--color-theme);
 }
-div .carousel .el-carousel__item--card, .el-carousel__item.is-animating {
+div .carousel .el-carousel__item--card,
+.el-carousel__item.is-animating {
   display: flex;
   align-items: center;
   justify-content: center;
@@ -836,7 +839,7 @@ div .carousel .el-carousel__item--card, .el-carousel__item.is-animating {
 div .carousel .el-carousel__arrow {
   opacity: 1;
   background-color: var(--color-carousel-card-bg);
-  box-shadow: 2px 2px 12px 0px rgba(0, 0, 0, 0.10);
+  box-shadow: 2px 2px 12px 0px rgba(0, 0, 0, 0.1);
 }
 div .carousel .el-carousel__arrow--left {
   left: 0;
@@ -856,7 +859,7 @@ div .carousel .el-carousel__arrow:hover {
   }
 }
 div .prompt-dialog {
-  min-height: 800px ;
+  min-height: 800px;
 }
 div .prompt-dialog-inner .el-dialog__header {
   padding: 0;
@@ -865,5 +868,5 @@ div .prompt-dialog-inner .el-dialog__header {
 div .prompt-dialog-inner .el-dialog__body {
   max-height: 720px;
   overflow-y: scroll;
-  line-height: 21px; 
-}
+  line-height: 21px;
+}

+ 18 - 13
src/views/DestinationDelivery/src/components/ModifyBooking/src/ModifyBooking.vue

@@ -50,9 +50,13 @@ const radioVModel = ref(1)
           <div class="delivery-address-header">
             <div class="label">*Delivery Address</div>
             <div class="operator">
-              <el-button type="default" size="small" class="el-button--pain-theme">
-                <span class="font_family icon-icon_edit_b1" style="margin-right: 4px"></span>
-                <span>Edit</span>
+              <el-button class="el-button--text" style="height: 32px">
+                <span class="font_family icon-icon_add_b" style="margin-right: 4px"></span>
+                <span>Add New Address</span>
+              </el-button>
+              <el-button class="el-button--text" style="height: 32px">
+                <span class="font_family icon-icon_tipsfilled_b" style="margin-right: 4px"></span>
+                <span>Manage Address</span>
               </el-button>
             </div>
           </div>
@@ -106,13 +110,8 @@ const radioVModel = ref(1)
             ></el-input>
           </div>
           <div class="modification-reason">
-            <div class="label">*Modification Reason</div>
-            <el-input
-              class="input-textarea"
-              type="textarea"
-              v-model="inputVModel"
-              placeholder=""
-            ></el-input>
+            <div class="label" style="margin-bottom: 4px">*Modification Reason</div>
+            <el-input class="input-textarea" type="textarea" v-model="inputVModel"></el-input>
           </div>
         </div>
       </div>
@@ -186,14 +185,17 @@ const radioVModel = ref(1)
       display: flex;
       justify-content: space-between;
       align-items: center;
-
+      margin-bottom: 4px;
       & > .operator {
         display: flex;
         align-items: center;
-        .el-button--pain-theme {
+        & > .el-button--text {
           height: 32px;
           font-size: 14px;
           font-weight: 400;
+          span {
+            color: var(--color-theme);
+          }
         }
       }
     }
@@ -231,6 +233,9 @@ const radioVModel = ref(1)
       flex-direction: column;
       width: 240px;
       margin-right: 16px;
+      & > .label {
+        margin-bottom: 4px;
+      }
     }
     .special-requirements {
       margin: 16px 0;
@@ -243,7 +248,7 @@ const radioVModel = ref(1)
       }
     }
     .tag-list {
-      margin-top: 6px;
+      margin-top: 8px;
       margin-bottom: 8px;
       .tag-item {
         display: inline-block;

+ 1 - 1
src/views/DestinationDelivery/src/components/TableView/src/components/BookingDetailDialog.vue

@@ -43,7 +43,7 @@ defineExpose({
     class="booking-detail-dialog"
     v-model="visible"
     :close-on-click-modal="false"
-    width="800px"
+    width="1000px"
     top="10vh"
   >
     <DetailStep :stepList="stepList" />

+ 4 - 4
src/views/DestinationDelivery/src/components/TableView/src/components/ShipmentInforTable.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { type VxeGridInstance, type VxeGridProps } from 'vxe-table'
-// import { autoWidth } from '@/utils/table'
+import { autoWidth } from '@/utils/table'
 import { useRowClickStyle } from '@/hooks/rowClickStyle'
 import { formatTimezone, formatNumber } from '@/utils/tools'
 
@@ -56,9 +56,9 @@ watch(
     if (containers && containers.container_column) {
       tableData.value.columns = handleColumns(containers.container_column)
       tableData.value.data = containers.container_data
-      // nextTick(() => {
-      //   tableRef.value && autoWidth(tableData.value, tableRef.value)
-      // })
+      nextTick(() => {
+        tableRef.value && autoWidth(tableData.value, tableRef.value)
+      })
     }
   },
   {