seimin 1 year ago
parent
commit
8a01047f36

+ 13 - 6
components/bigScreen/bigScreen.vue

@@ -308,12 +308,19 @@
308
                               post("/workerOrder/receiveOrders", {ids: res.data.toString()}).then((res) => {
308
                               post("/workerOrder/receiveOrders", {ids: res.data.toString()}).then((res) => {
309
                                 uni.hideLoading();
309
                                 uni.hideLoading();
310
                                 if (res.status == 200) {
310
                                 if (res.status == 200) {
311
-                                  uni.showToast({
312
-                                    title: "操作成功",
313
-                                    success() {
314
-                                      uni.redirectTo({
315
-                                        url: "../receiptpage/receiptpage",
316
-                                      });
311
+                                  uni.showModal({
312
+                                    title: "提示",
313
+                                    content: `本次接单包括${res.names.join('、')},${res.data.length}个工单已接单完成`,
314
+                                    showCancel: false,
315
+                                    success: function(res) {
316
+                                      if (res.confirm) {
317
+                                        console.log("用户点击确定");
318
+                                        uni.redirectTo({
319
+                                          url: "../receiptpage/receiptpage",
320
+                                        });
321
+                                      } else if (res.cancel) {
322
+                                        console.log("用户点击取消");
323
+                                      }
317
                                     },
324
                                     },
318
                                   });
325
                                   });
319
                                 } else {
326
                                 } else {

+ 13 - 6
pages/quickOrderAcceptanceWx/quickOrderAcceptanceWx.vue

@@ -71,12 +71,19 @@
71
                   post("/workerOrder/receiveOrders", {ids: res.data.toString()}).then((res) => {
71
                   post("/workerOrder/receiveOrders", {ids: res.data.toString()}).then((res) => {
72
                     uni.hideLoading();
72
                     uni.hideLoading();
73
                     if (res.status == 200) {
73
                     if (res.status == 200) {
74
-                      uni.showToast({
75
-                        title: "操作成功",
76
-                        success() {
77
-                          uni.navigateTo({
78
-                            url: "../receiptpage/receiptpage",
79
-                          });
74
+                      uni.showModal({
75
+                        title: "提示",
76
+                        content: `本次接单包括${res.names.join('、')},${res.data.length}个工单已接单完成`,
77
+                        showCancel: false,
78
+                        success: function(res) {
79
+                          if (res.confirm) {
80
+                            console.log("用户点击确定");
81
+                            uni.navigateTo({
82
+                              url: "../receiptpage/receiptpage",
83
+                            });
84
+                          } else if (res.cancel) {
85
+                            console.log("用户点击取消");
86
+                          }
80
                         },
87
                         },
81
                       });
88
                       });
82
                     } else {
89
                     } else {