Merge remote-tracking branch 'origin/developerB' into developerB

src/main/resources/static/css/supplier-center/order/logistics-detail.css

@@ -32,9 +32,10 @@
     .record-button button {width: 90px;height: 36px;line-height: 36PX;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;text-align: center;color: #e15616;margin-left: 10px;cursor: pointer;}
     .logis{margin-top: 30px;}
     .delivery-logis-title{color: #22272e;font-size: 16px;padding: 15px 20px;}
-    .logistics-info{background: #fff;padding: 15px 20px;color: #627386;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+    .logistics-info{color: #627386;margin-bottom: 8px}
     .logistics-info div{margin-right: 65px;display: inline-block;line-height: 24px}
     .logistics-record{display: inline-block;width: 100%;color: #333;font-size: 16px;margin: 10px 15px}
+    #InformationList{padding: 15px 22px;background: #fff;}
 }
 
 /*移动*/

src/main/resources/static/css/supplier-center/order/logistics.css

@@ -20,7 +20,7 @@
     .pro-information li div.product-img {width: 50%;text-align: left;}
     .product-img img {width: 70px;height: 70px;border: solid 1px #e2e7ef;}
     .product-img h3 {display: inline-block;width: 300px;margin-left: 10px;font-size: 16px;color: #22272e;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
-    .add-logistics{height: auto;background-color: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);margin-top: 20px;padding: 20px;color: #627386;}
+    .add-logistics{height: auto;background-color: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);margin-top: 10px;padding: 20px;color: #627386;}
     .company-number{display: flex;width: 100%;}
     .logist-right>div{margin-top: 5px;}
     .company-number>div{width: 49%;display: inline-block;margin: 2px 0;flex: 2;}

src/main/resources/templates/supplier-center/order/logistics-detail.html

@@ -21,14 +21,9 @@
             <span>&gt;</span>
             <span>查看物流</span>
         </div>
-<!--        <div v-else class="wrap_tittle mIcon" @click="opentittle">-->
-<!--            <i class="mIcon open"></i><span style="margin-left: 25px;">发货</span>-->
-<!--        </div>-->
         <div class="wrap clear">
             <!--左侧面包屑-->
-<!--            <div v-show="open">-->
                 <template th:replace="supplier-center/components/tableft"></template>
-<!--            </div>-->
             <div class="right">
                 <div class="userinfo">
                     <p class="info">
@@ -82,14 +77,16 @@
                     </div>
                      <div class="logis">
                             <div class="delivery-logis-title">物流信息</div>
-                            <div class="logistics-info" v-for="logis in listData.logisticsInformationList">
-                                <div class="logistics-time">物流时间：{{logis.updateDate}}</div>
-                                <div class="logistics-company">物流公司：{{logis.logisticsCompanyName}}</div>
-                                <div class="logistics-number">物流单号：{{logis.nu}}</div>
+                            <div id="InformationList" v-if="listData.logisticsInformationList.length>0">
+                                <div class="logistics-info" v-for="logis in listData.logisticsInformationList">
+                                    <div class="logistics-time">物流时间：{{logis.updateDate}}</div>
+                                    <div class="logistics-company">物流公司：{{logis.logisticsCompanyName}}</div>
+                                    <div class="logistics-number">物流单号：{{logis.nu}}</div>
+                                </div>
+                            </div>
+                            <div class="logistics-record" v-else>
+                              <p>暂无物流信息</p>
                             </div>
-<!--                            <div class="logistics-record" v-if="listData.logisticsInformationList.length==0">-->
-<!--                              <p>暂无物流信息</p>-->
-<!--                            </div>-->
                         </div>
                 </div>
             </div>