Browse Source

样式更改

sunChengjie 11 months ago
parent
commit
a21d39b03b
2 changed files with 14 additions and 12 deletions
  1. 13 11
      src/pages/components/Sented.vue
  2. 1 1
      src/pages/components/Waitsent.vue

+ 13 - 11
src/pages/components/Sented.vue

@@ -6,7 +6,7 @@
         </div>
         <ScrollRefresh height="calc(100vh - 99px)" ref="scrollRefresh" :request="request" :defaultLimit="6">
             <template v-slot="slotProps">
-                <div class="onther" v-for="(item, index) in  slotProps.list" :key="index">
+                <div class="onther" v-for="(item, index) in slotProps.list" :key="index">
                     <div class="onther-top">
                         <div style="font-size: 12px;">批次号:{{ item.dispatchBatchNo
                             }}
@@ -31,9 +31,9 @@
             <div class="batch-middel" v-for="(item, index) in popupList" :key="index">
                 <div class="batch-middel-text">
                     <div class="batch-middel-text-style" style="width: 100%; margin-left: -4px;margin-top: 0px;">【{{
-                item.expressCompany
-            }}】运单号:{{
-                    item.expressNo }}</div>
+                        item.expressCompany
+                    }}】运单号:{{
+                            item.expressNo }}</div>
                     <div class="batch-middel-text-style">收件人:{{ item.recipient }}</div>
                     <div class="batch-middel-text-style">部门:{{ item.departmentId }}</div>
                     <div class="batch-middel-text-style">楼层:{{ item.floor }}</div>
@@ -42,17 +42,17 @@
                     <div class="batch-middel-text-style">当前状态:
                         <span style="color: #1989fa;">
                             {{ item.signinStatus == 0 ? '待签收' : `${item.signinStatus == 1 ?
-                '已签收' : `${item.signinStatus == 2 ? '代收' : `${item.signinStatus == 3 ? '拒收' : '延迟'}`}`}` }}
+                                '已签收' : `${item.signinStatus == 2 ? '代收' : `${item.signinStatus == 3 ? '拒收' : '延迟'}`}`}` }}
                         </span>
                         <!-- <span style="color: #1989fa;">查看</span> -->
                     </div>
                     <div class="batch-middel-text-style">签收时间:{{ item.signatureTime == undefined ? '' :
-                item.signatureTime.date.year }}-{{ item.signatureTime == undefined ? '' :
-                item.signatureTime.date.month }}-{{ item.signatureTime == undefined ? '' :
-                item.signatureTime.date.day }} {{ item.signatureTime == undefined ? '' :
-                item.signatureTime.time.hour }}:{{ item.signatureTime == undefined ? '' :
-                item.signatureTime.time.minute }}:{{ item.signatureTime == undefined ? '' :
-                        item.signatureTime.time.second }}
+                        item.signatureTime.date.year }}-{{ item.signatureTime == undefined ? '' :
+                            item.signatureTime.date.month }}-{{ item.signatureTime == undefined ? '' :
+                            item.signatureTime.date.day }} {{ item.signatureTime == undefined ? '' :
+                            item.signatureTime.time.hour }}:{{ item.signatureTime == undefined ? '' :
+                            item.signatureTime.time.minute }}:{{ item.signatureTime == undefined ? '' :
+                            item.signatureTime.time.second }}
                     </div>
                 </div>
                 <div style="display: flex; padding-top: 5px;">
@@ -179,6 +179,7 @@ export default {
     background-color: #fff;
     margin: 10px;
     border-radius: 10px;
+    padding: 5px;
 
     &-top {
         display: flex;
@@ -207,6 +208,7 @@ export default {
     background-color: #f2f2f2;
     border-radius: 12px;
     padding: 10px 8px;
+    height: auto;
 
     &-text {
         display: flex;

+ 1 - 1
src/pages/components/Waitsent.vue

@@ -16,7 +16,7 @@
                     </div>
                     <!-- 各个运单 -->
                     <div class="batchss"
-                        :style="{ overflow: item.openCard ? 'auto' : 'hidden', height: item.openCard ? 'auto' : '140px', }">
+                        :style="{ overflow: item.openCard ? 'auto' : 'hidden', minMeight: item.openCard ? 'auto' : '140px', }">
                         <div class="batch-middel" v-for="(unfold, index) in item.list" :key="index">
                             <div class="batch-middel-text">
                                 <div class="batch-middel-text-style"