Merge branch 'dev' into 'test'

修改经销商盲票订单预付票售价字段

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

src/views/order/channel/index.vue

@@ -150,7 +150,7 @@
             </el-table-column>
             <el-table-column v-else label="预付票售价(元/包)" min-width="100">
               <template slot-scope="{ row }">
-                <div>{{ $numberFormat(row.pkgPrePrice) }}</div>
+                <div>{{ $numberFormat(row.pkgSalePrice) }}</div>
               </template>
             </el-table-column>
             <el-table-column label="数量" prop="orderNum" min-width="85">