Merge branch 'dev' into 'test'

调整

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

src/views/business/ticket/components/GoodsAdd.vue

@@ -169,6 +169,7 @@ export default {
         "&",
         {
           title: this.goodsTitle,
+          exchangeShow: 2,
           status: "on",
           minValue: this.queryParams.minValue ? accMul(this.queryParams.minValue, 100) : this.queryParams.minValue,
           maxValue: this.queryParams.maxValue ? accMul(this.queryParams.maxValue, 100) : this.queryParams.maxValue,

src/views/business/ticket/create.vue

@@ -132,7 +132,7 @@
               <el-radio :label="2">指定渠道</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="渠道" prop="channelIdList" v-if="form.saleChannelType == 2">
+          <el-form-item label="渠道" prop="channelIdList" v-if="form.type == 'offline' && form.saleChannelType == 2">
             <el-select
               v-model="form.channelIdList"
               placeholder="请选择渠道"