shish 7 months ago
parent
commit
0a3a307612
2 changed files with 132 additions and 123 deletions
  1. 66 61
      ghsApp/src/admin/delivery/allDelivery.vue
  2. 66 62
      hdApp/src/admin/delivery/allDelivery.vue

+ 66 - 61
ghsApp/src/admin/delivery/allDelivery.vue

@@ -74,18 +74,17 @@
     </view>
 
     <!-- 平台运力 -->
-    <view class="platform-delivery-list">
-      <!-- 列表头部 -->
-      <view class="list-header">
-        <view class="header-left">
-          <text class="header-icon">🚚</text>
-          <text class="header-title">运力</text>
-        </view>
-        <button class="load-btn" :class="{ loading: isLoadingDelivery }" :disabled="isLoadingDelivery" @click="handleLoadDelivery">
-          {{ isLoadingDelivery ? '刷新中...' : '刷新运力' }}
-        </button>
+    <view class="list-header">
+      <view class="header-left">
+        <text class="header-icon">🚚</text>
+        <text class="header-title">运力</text>
       </view>
-      
+      <button class="load-btn" :class="{ loading: isLoadingDelivery }" :disabled="isLoadingDelivery" @click="handleLoadDelivery">
+        {{ isLoadingDelivery ? '加载中...' : '加载运力' }}
+      </button>
+    </view>
+
+    <view class="platform-delivery-list">
       <!-- 跑腿列表 -->
       <!-- 遍历deliveryList -->
       <view class="delivery-item" v-for="(item, index) in deliveryList" :key="index" :class="{ active: selectedDelivery === item.name, disabled: !item.isAble }" @click="selectDelivery(item)">
@@ -666,68 +665,74 @@ export default {
   }
 }
 
-/* 平台运力与快递列表 */
-.platform-delivery-list {
-  margin: 0 20upx 20upx;
-  background-color: white;
-  border-radius: 12upx;
+/* 列表头部 - 固定不滚动 */
+.list-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 20upx;
+  background-color: #f0f7ff;
+  margin: 0 20upx;
+  margin-bottom: 0;
   border: 1upx solid #f0f0f0;
-  flex: 1.5;
-  overflow-y: auto;
-  overflow-x: hidden;
+  border-radius: 12upx 12upx 0 0;
+  flex-shrink: 0;
 
-  .list-header {
+  .header-left {
     display: flex;
     align-items: center;
-    justify-content: space-between;
-    padding: 20upx;
-    background-color: #f0f7ff;
-    border-bottom: 1upx solid #e0e0e0;
-
-    .header-left {
-      display: flex;
-      align-items: center;
-    }
+  }
 
-    .header-icon {
-      font-size: 32upx;
-      margin-right: 16upx;
-    }
+  .header-icon {
+    font-size: 32upx;
+    margin-right: 16upx;
+  }
 
-    .header-title {
-      font-size: 28upx;
-      font-weight: bold;
-      color: #3385FF;
-    }
+  .header-title {
+    font-size: 28upx;
+    font-weight: bold;
+    color: #3385FF;
+  }
 
-    .load-btn {
-      padding: 8upx 20upx;
-      font-size: 28upx;
-      color: #3385FF;
-      background-color: white;
-      border: 1upx solid #3385FF;
-      border-radius: 20upx;
-      line-height: 1.5;
-      height: auto;
-      margin: 0;
-      transition: all 0.3s;
+  .load-btn {
+    padding: 8upx 20upx;
+    font-size: 28upx;
+    color: #3385FF;
+    background-color: white;
+    border: 1upx solid #3385FF;
+    border-radius: 20upx;
+    line-height: 1.5;
+    height: auto;
+    margin: 0;
+    transition: all 0.3s;
 
-      &:active {
-        background-color: #3385FF;
-        color: white;
-      }
+    &:active {
+      background-color: #3385FF;
+      color: white;
+    }
 
-      &.loading {
-        opacity: 0.7;
-        pointer-events: none;
-      }
+    &.loading {
+      opacity: 0.7;
+      pointer-events: none;
+    }
 
-      &:disabled {
-        opacity: 0.7;
-        cursor: not-allowed;
-      }
+    &:disabled {
+      opacity: 0.7;
+      cursor: not-allowed;
     }
   }
+}
+
+/* 平台运力与快递列表 */
+.platform-delivery-list {
+  margin: 0 20upx 20upx;
+  background-color: white;
+  border-radius: 0 0 12upx 12upx;
+  border: 1upx solid #f0f0f0;
+  border-top: none;
+  flex: 1.5;
+  overflow-y: auto;
+  overflow-x: hidden;
 
   .no-delivery-list {
     padding: 50upx 40upx;

+ 66 - 62
hdApp/src/admin/delivery/allDelivery.vue

@@ -74,18 +74,17 @@
     </view>
 
     <!-- 平台运力 -->
-    <view class="platform-delivery-list">
-      <!-- 列表头部 -->
-      <view class="list-header">
-        <view class="header-left">
-          <text class="header-icon">🚚</text>
-          <text class="header-title">平台运力</text>
-        </view>
-        <button class="load-btn" :class="{ loading: isLoadingDelivery }" :disabled="isLoadingDelivery" @click="handleLoadDelivery">
-          {{ isLoadingDelivery ? '加载中...' : '加载运力' }}
-        </button>
+    <view class="list-header">
+      <view class="header-left">
+        <text class="header-icon">🚚</text>
+        <text class="header-title">运力</text>
       </view>
-      
+      <button class="load-btn" :class="{ loading: isLoadingDelivery }" :disabled="isLoadingDelivery" @click="handleLoadDelivery">
+        {{ isLoadingDelivery ? '加载中...' : '加载运力' }}
+      </button>
+    </view>
+
+    <view class="platform-delivery-list">
       <!-- 跑腿列表 -->
       <!-- 遍历deliveryList -->
       <view class="delivery-item" v-for="(item, index) in deliveryList" :key="index" :class="{ active: selectedDelivery === item.name, disabled: !item.isAble }" @click="selectDelivery(item)">
@@ -119,7 +118,6 @@
         </view>
         <view class="sub-text">
           <text>实际价格以支付金额为准</text>
-          <text class="detail-btn"> 明细<text class="arrow-down">⌄</text></text>
         </view>
       </view>
       <button class="submit-btn" @click="submitOrder">立即下单</button>
@@ -656,68 +654,74 @@ export default {
   }
 }
 
-/* 平台运力与快递列表 */
-.platform-delivery-list {
-  margin: 0 20upx 20upx;
-  background-color: white;
-  border-radius: 12upx;
+/* 列表头部 - 固定不滚动 */
+.list-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 20upx;
+  background-color: #f0f7ff;
+  margin: 0 20upx;
+  margin-bottom: 0;
   border: 1upx solid #f0f0f0;
-  flex: 1.5;
-  overflow-y: auto;
-  overflow-x: hidden;
+  border-radius: 12upx 12upx 0 0;
+  flex-shrink: 0;
 
-  .list-header {
+  .header-left {
     display: flex;
     align-items: center;
-    justify-content: space-between;
-    padding: 20upx;
-    background-color: #f0f7ff;
-    border-bottom: 1upx solid #e0e0e0;
-
-    .header-left {
-      display: flex;
-      align-items: center;
-    }
+  }
 
-    .header-icon {
-      font-size: 32upx;
-      margin-right: 16upx;
-    }
+  .header-icon {
+    font-size: 32upx;
+    margin-right: 16upx;
+  }
 
-    .header-title {
-      font-size: 28upx;
-      font-weight: bold;
-      color: #3385FF;
-    }
+  .header-title {
+    font-size: 28upx;
+    font-weight: bold;
+    color: #3385FF;
+  }
 
-    .load-btn {
-      padding: 8upx 20upx;
-      font-size: 28upx;
-      color: #3385FF;
-      background-color: white;
-      border: 1upx solid #3385FF;
-      border-radius: 20upx;
-      line-height: 1.5;
-      height: auto;
-      margin: 0;
-      transition: all 0.3s;
+  .load-btn {
+    padding: 8upx 20upx;
+    font-size: 28upx;
+    color: #3385FF;
+    background-color: white;
+    border: 1upx solid #3385FF;
+    border-radius: 20upx;
+    line-height: 1.5;
+    height: auto;
+    margin: 0;
+    transition: all 0.3s;
 
-      &:active {
-        background-color: #3385FF;
-        color: white;
-      }
+    &:active {
+      background-color: #3385FF;
+      color: white;
+    }
 
-      &.loading {
-        opacity: 0.7;
-        pointer-events: none;
-      }
+    &.loading {
+      opacity: 0.7;
+      pointer-events: none;
+    }
 
-      &:disabled {
-        opacity: 0.7;
-        cursor: not-allowed;
-      }
+    &:disabled {
+      opacity: 0.7;
+      cursor: not-allowed;
     }
   }
+}
+
+/* 平台运力与快递列表 */
+.platform-delivery-list {
+  margin: 0 20upx 20upx;
+  background-color: white;
+  border-radius: 0 0 12upx 12upx;
+  border: 1upx solid #f0f0f0;
+  border-top: none;
+  flex: 1.5;
+  overflow-y: auto;
+  overflow-x: hidden;
 
   .no-delivery-list {
     padding: 50upx 40upx;