From fb0ac1856f523fc131c8dbe10c8fb917423b3756 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Thu, 2 Nov 2023 16:16:26 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B5=8B=E8=AF=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../signin/index-detail/index-detail.vue      | 25 ++++++++++----
 .../user-qrcode-saveinfo.vue                  | 34 ++++++++++++-------
 2 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/pages/plugins/signin/index-detail/index-detail.vue b/pages/plugins/signin/index-detail/index-detail.vue
index c8db4a63..2ec60c4f 100644
--- a/pages/plugins/signin/index-detail/index-detail.vue
+++ b/pages/plugins/signin/index-detail/index-detail.vue
@@ -385,14 +385,25 @@
                                 switch (res.data.data.status) {
                                     // 组队成功
                                     case 0:
-                                        // 设置签到码id
-                                        var temp_params = this.params;
-                                        temp_params['id'] = res.data.data.qrcode_id;
-                                        this.setData({
-                                            params: temp_params,
+                                        var self = this;
+                                        var data = res.data;
+                                        // 现金支付
+                                        uni.showModal({
+                                            content: res.data.msg,
+                                            showCancel: false,
+                                            success(res) {
+                                                if (res.confirm) {
+                                                    // 设置签到码id
+                                                    var temp_params = self.params;
+                                                    temp_params['id'] = data.data.qrcode_id;
+                                                    self.setData({
+                                                        params: temp_params,
+                                                    });
+                                                    // 重新拉取数据
+                                                    self.get_data();
+                                                }
+                                            },
                                         });
-                                        // 重新拉取数据
-                                        this.get_data();
                                         break;
                                     // 需要填写联系人信息
                                     case 1:
diff --git a/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.vue b/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.vue
index a4b4df59..45e234b5 100644
--- a/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.vue
+++ b/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.vue
@@ -169,18 +169,28 @@
                         success: (res) => {
                             uni.hideLoading();
                             if (res.data.code == 0) {
-                                app.globalData.showToast(res.data.msg, 'success');
-                                var is_temp = (this.params || null) != null && (this.params.is_team || 0) == 1;
-                                setTimeout(function () {
-                                    // 是否签到也组队
-                                    if (is_temp) {
-                                        uni.redirectTo({
-                                            url: '/pages/plugins/signin/index-detail/index-detail?id=' + res.data.data,
-                                        });
-                                    } else {
-                                        uni.navigateBack();
-                                    }
-                                }, 2000);
+                                var self = this;
+                                var data = res.data;
+                                // 现金支付
+                                uni.showModal({
+                                    content: res.data.msg,
+                                    showCancel: false,
+                                    success(res) {
+                                        if (res.confirm) {
+                                            var is_temp = (self.params || null) != null && (self.params.is_team || 0) == 1;
+                                            setTimeout(function () {
+                                                // 是否签到也组队
+                                                if (is_temp) {
+                                                    uni.redirectTo({
+                                                        url: '/pages/plugins/signin/index-detail/index-detail?id=' + data.data,
+                                                    });
+                                                } else {
+                                                    uni.navigateBack();
+                                                }
+                                            }, 2000);
+                                        }
+                                    },
+                                });
                             } else {
                                 this.setData({
                                     form_submit_loading: false,