merge

src/views/sales/Offline.vue

@@ -68,7 +68,10 @@
           {{ record.channel == 'express' ?'快递':'自提' }}
         </div>
         <div slot="express" slot-scope="text, record">
-          {{ record.express.name || '-' }} <div>{{ record.express.express_no || '-' }}</div>
+          <div v-if="record.channel === 'express'">
+            {{ record.express.name || '-' }} <div>{{ record.express.express_no || '-' }}</div>
+          </div>
+          <div v-else>发货时间：{{ record.deliver_at }}</div>
         </div>
       </s-table>
     </a-card>