Merge branch 'v20' of http://192.168.31.240:3000/MTP2.0_New/MTP20_WEB_GLOBAL into v20

src/packages/tss/views/order/delivery/components/offline/Index.vue

@@ -6,7 +6,7 @@
             <div class="g-product-list__box" v-for="(item, index) in dataList" :key="index">
                 <div class="g-product-list__titlebar">
                     <div class="left">
-                        <b>订单号：{{ item.tradeid }}</b>
+                        <b>订单号：{{ item.deliveryorderid }}</b>
                     </div>
                     <div class="right">
                         <b :class="!item.buyorsell ? 'g-price-up' : 'g-price-down'">

src/packages/tss/views/order/delivery/components/online/Index.vue

@@ -6,7 +6,7 @@
             <div class="g-product-list__box" v-for="(item, index) in dataList" :key="index">
                 <div class="g-product-list__titlebar">
                     <div class="left">
-                        <b>订单号：{{ item.tradeid }}</b>
+                        <b>订单号：{{ item.deliveryorderid }}</b>
                     </div>
                     <div class="right">
                         <b :class="!item.buyorsell ? 'g-price-up' : 'g-price-down'">