Merge branch 'dev' into 'test'

修复订单详情快递公司显示

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

src/views/order/channel/detail.vue

@@ -79,7 +79,7 @@
           >
           <div class="info-item-content-one" v-if="status.value === 2">
             <div class="title">快递公司：</div>
-            <div class="txt">{{ delivery.companyName || "--" }}</div>
+            <div class="txt">{{ (delivery && delivery.companyName) || "--" }}</div>
           </div>
           <div class="info-item-content-one" v-if="status.value === 2">
             <div class="title">快递单号：</div>