Merge branch 'dev_v2' of https://gogs.zfire.top/zfire-front/supply-front into dev_v2

src/views/supply/pickup/components/design/preview.vue

@@ -39,6 +39,10 @@ export default {
     getNewDetailPrintDisString: {
       type: Function,
       default: null
+    },
+    getNewDetailPrintDisString: {
+      type: Function,
+      default: null
     }
   },
 
@@ -122,6 +126,7 @@ export default {
     },
     myConfirm(err) {
       this.$confirm(err || '系统提示:单被商家取消预约，请刷新页面，重新选择打印', '提示', {
+
         confirmButtonText: '确定',
         showCancelButton: false,
         type: 'warning',