Merge branch 'dev' into 'test'

用户订单部分快递公司快递单号样式调整

See merge request quanshu/mp-ui-pc!168

src/views/order/deliver/detail.vue

@@ -88,19 +88,25 @@
           <div class="logistics-title">包裹{{ index + 1 }}</div>
           <div class="info">
             <div class="info-one">
-<!--============================================================================================改-->
               <div class="tit">配送方式：</div>
               <div class="txt">{{ item.companyName || item.deliveryFlowId ? "快递发货":"无需物流" }}</div>
-<!--              <div class="txt">{{ "快递发货" || "&#45;&#45;" }}</div>-->
             </div>
-            <div class="info-one">
+            <div class="info-one" v-if="item.companyName">
               <div class="tit">快递公司：</div>
               <div class="txt">{{ item.companyName || "--" }}</div>
             </div>
-            <div class="info-one">
+            <div class="info-one" v-else>
+              <div class="tit"></div>
+              <div class="txt"></div>
+            </div>
+            <div class="info-one" v-if="item.deliveryFlowId">
               <div class="tit">快递单号：</div>
               <div class="txt">{{ item.deliveryFlowId || "--" }}</div>
             </div>
+            <div class="info-one" v-else>
+              <div class="tit"></div>
+              <div class="txt"></div>
+            </div>
             <div class="info-one">
               <div class="tit">发货时间：</div>
               <div class="txt">{{ parseTime(item.deliveryTime) || "--" }}</div>