From f650319d7175f764cd5286c383a72d6e6d2e8a87 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 18 七月 2025 14:53:18 +0800
Subject: [PATCH] 调接口

---
 small-program/unpackage/dist/dev/mp-weixin/pages/freight/freight.wxss |   17 -----------------
 1 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/small-program/unpackage/dist/dev/mp-weixin/pages/freight/freight.wxss b/small-program/unpackage/dist/dev/mp-weixin/pages/freight/freight.wxss
index afc8bfb..9c7a363 100644
--- a/small-program/unpackage/dist/dev/mp-weixin/pages/freight/freight.wxss
+++ b/small-program/unpackage/dist/dev/mp-weixin/pages/freight/freight.wxss
@@ -184,15 +184,12 @@
   border-radius: 4rpx;
   margin-right: 20rpx;
 }
-<<<<<<< HEAD
 .index .list .list-item .list-item-label .list-item-label-info.data-v-2fc0a58e {
   font-weight: 400;
   font-size: 26rpx;
   color: #999999;
   margin-left: 26rpx;
 }
-=======
->>>>>>> bbd9c436f23f5fdbe712c4a22d90b457066bdf38
 .index .list .list-item .list-item-zk.data-v-2fc0a58e {
   width: 100%;
   display: flex;
@@ -225,12 +222,8 @@
 }
 .index .list .list-item .list-item-row .address .address-item.data-v-2fc0a58e {
   width: 100%;
-<<<<<<< HEAD
   padding: 30rpx 0;
   box-sizing: border-box;
-=======
-  height: 100rpx;
->>>>>>> bbd9c436f23f5fdbe712c4a22d90b457066bdf38
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -400,10 +393,7 @@
   border-radius: 8rpx;
   margin-right: 20rpx;
   border: 2rpx solid #EEEEEE;
-<<<<<<< HEAD
   position: relative;
-=======
->>>>>>> bbd9c436f23f5fdbe712c4a22d90b457066bdf38
 }
 .index .list .list-item .list-item-row .list-item-row-upload .upload-item.data-v-2fc0a58e:last-child {
   margin: 0 !important;
@@ -417,7 +407,6 @@
   color: #666666;
   margin-top: 16rpx;
 }
-<<<<<<< HEAD
 .index .list .list-item .list-item-row .list-item-row-upload .upload-item .upload-item-dele.data-v-2fc0a58e {
   position: absolute;
   top: -20rpx;
@@ -426,8 +415,6 @@
   height: 40rpx;
   z-index: 9;
 }
-=======
->>>>>>> bbd9c436f23f5fdbe712c4a22d90b457066bdf38
 .index .list .list-item .list-item-row .list-item-row-val.data-v-2fc0a58e {
   width: 100%;
   padding: 30rpx 0;
@@ -440,11 +427,7 @@
   flex-shrink: 0;
   font-weight: 400;
   font-size: 30rpx;
-<<<<<<< HEAD
   color: #999999;
-=======
-  color: #111111;
->>>>>>> bbd9c436f23f5fdbe712c4a22d90b457066bdf38
 }
 .index .list .list-item .list-item-row .list-item-row-val input.data-v-2fc0a58e {
   width: 100%;

--
Gitblit v1.9.3