Merge branch 'dev' into 'test'

修复盲票销售订单显示bug

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

src/views/order/userTicket/index.vue

@@ -201,7 +201,7 @@ export default {
             this.total = res.total;
             this.list = res.rows;
             this.list.forEach((item) => {
-              item.boxType = JSON.parse(item.boxType).desc;
+              item.boxType = item.boxType && JSON.parse(item.boxType).desc;
             });
           }
         })