Merge branch 'dev' into 'test'

Dev

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

src/views/business/ticket/index.vue

@@ -418,7 +418,7 @@ export default {
     getDetail(row) {
       this.$router.push({ name: "TicketDetail", query: { id: row.boxId } });
     },
-    
+
     // 编辑信息
     setDetail(row) {
       this.$router.push({ name: "TicketEdit", query: { id: row.boxId } });
@@ -427,7 +427,6 @@ export default {
     handleDetail() {},
 
     handleImport() {
-      console.log("handleImport ====================");
       this.importShow = true;
     },
 
@@ -474,7 +473,7 @@ export default {
       if (boxIds.length == 0) {
         this.$alert("请选择你要导出的盲票组！", "提示", { type: "warning" });
       } else {
-        this.$confirm("是否确认导出所选盲票数据项?", "警告", {
+        this.$confirm("是否确认导出所选盲票数据项?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",

src/views/order/channel/index.vue

@@ -341,8 +341,6 @@ export default {
       } else { //val为空时，还原数组
         this.siteList = this.siteCopyList;
       }
-      console.log("this.siteList == "+JSON.stringify(this.siteList))
-      console.log("this.siteCopyList == "+JSON.stringify(this.siteCopyList))
     },
 
     //搜索
@@ -434,7 +432,7 @@ export default {
 
     // 导出订单
     handleOrderExport() {
-      this.$confirm("是否确认导出订单?", "警告", {
+      this.$confirm("是否确认导出订单?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",

src/views/order/deliver/index.vue

@@ -347,7 +347,7 @@ export default {
 
     // 导出订单
     handleExportDraw() {
-      this.$confirm("是否确认导出订单?", "警告", {
+      this.$confirm("是否确认导出订单?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",

src/views/order/exchange/index.vue

@@ -182,7 +182,7 @@ export default {
 
     // 导出订单
     handleExportDraw() {
-      this.$confirm("是否确认导出订单?", "警告", {
+      this.$confirm("是否确认导出订单?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",

src/views/order/userTicket/index.vue

@@ -273,7 +273,7 @@ export default {
 
     // 导出订单
     handleExportDraw() {
-      this.$confirm("是否确认导出订单?", "警告", {
+      this.$confirm("是否确认导出订单?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -301,4 +301,4 @@ export default {
 ::v-deep .el-tabs--border-card > .el-tabs__content {
   padding: 0;
 }
-</style>
+</style>