Merge branch 'dev' into 'test'

盲票查看列表类型修改

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

src/views/business/ticket/detail.vue

@@ -144,7 +144,7 @@ export default {
             })
             this.info = {
               ...data,
-              type: JSON.parse(data.type).value,
+              type: JSON.parse(data.type),
               picUrl: picUrl,
               channelTitle: data.channelList.map(item => item.name).join('，')
             };