Merge branch 'dev' into 'test'

已完成渠道订单显示序列号

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

src/views/order/channel/detail.vue

@@ -122,7 +122,7 @@
               <div>{{ $numberFormat(row.pkgSalePrice * row.orderNum) }}</div>
             </template>
           </el-table-column>
-          <el-table-column v-if="status.value === 2" label="附加信息">
+          <el-table-column v-if="status.value === 2 || status.value === 3" label="附加信息" min-width="150">
             <template slot-scope="{ row }">
               <div>序列号：
                  <div v-for="(item, index) in row.detailList" :key="index">