From 61b44c2e5fae3065a448deb47c741aa5595349ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com>
Date: Fri, 5 Dec 2025 10:01:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=95=86=E6=88=B7=E8=BF=9B?=
 =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/customerService/addMer/index.css | 15 +++++-
 packages/customerService/addMer/index.vue | 56 ++++++++++++++++-------
 2 files changed, 53 insertions(+), 18 deletions(-)

diff --git a/packages/customerService/addMer/index.css b/packages/customerService/addMer/index.css
index ac834248..364a5dab 100644
--- a/packages/customerService/addMer/index.css
+++ b/packages/customerService/addMer/index.css
@@ -218,12 +218,13 @@ page {
 .submit-section {
   margin-top: 40rpx;
   margin-bottom: 20rpx;
+  display: flex;
 }
 
-.submit-btn {
+.submit-btn,
+.submit-btn1 {
   width: 100%;
   height: 80rpx;
-  background-color: #007aff;
   color: #fff;
   font-size: 28rpx;
   border-radius: 8rpx;
@@ -232,6 +233,16 @@ page {
   box-shadow: 0 4rpx 12rpx rgba(0, 122, 255, 0.3);
 }
 
+.submit-btn {
+  background-color: #007aff;
+  margin-left: 5rpx;
+}
+
+.submit-btn1 {
+  background-color: #ff4016;
+  margin-right: 5rpx;
+}
+
 .submit-btn:active {
   background-color: #0051d5;
   transform: scale(0.98);
diff --git a/packages/customerService/addMer/index.vue b/packages/customerService/addMer/index.vue
index 6a0ffed7..62f65966 100644
--- a/packages/customerService/addMer/index.vue
+++ b/packages/customerService/addMer/index.vue
@@ -173,6 +173,7 @@
 
             <!-- 提交按钮 -->
             <view class="form-section submit-section">
+                <button type="button" class="submit-btn1" @click="ecQuery">结果查询</button>
                 <button type="submit" class="submit-btn" @click="submitForm">提交申请</button>
             </view>
         </form>
@@ -635,6 +636,40 @@ export default {
             return true;
         },
 
+        ecQuery() {
+            const storeValue = uni.getStorageSync('storeValue');
+            if (!storeValue || !storeValue.ec_apply_id) {
+                uni.showToast({
+                    title: '请先提交申请',
+                    icon: 'none'
+                });
+                return;
+            }
+            const params = {
+                contractId: storeValue.contractId
+            }
+            request(apiArr.queryMerchant, "POST", params).then(res => {
+                if (res.respData.contractStatus === 'REVIEW_ING') {
+                    uni.showToast({
+                        title: '审核通过',
+                        icon: 'success'
+                    });
+                    uni.setStorageSync('storeValue', { merInnerNo: res.respData.merInnerNo });
+                    uni.setStorageSync('storeValue', { merCupNo: res.respData.merCupNo });
+                } else if (res.respData.contractStatus === 'WAIT_FOR_CONTACT') {
+                    uni.showToast({
+                        title: '审核驳回',
+                        icon: 'none'
+                    });
+                } else if (res.respData.contractStatus === 'MANUAL_AUDIT') {
+                    uni.showToast({
+                        title: '审核中',
+                        icon: 'none'
+                    });
+                }
+            })
+        },
+
         // 表单提交逻辑
         submitForm() {
             // 验证表单
@@ -691,22 +726,11 @@ export default {
             // 调用addMer接口提交数据
             request(apiArr.addMer, "POST", submitData).then(res => {
                 uni.hideLoading();
-
-                if (res && res.cmdRetCode === 'SUCCESS') {
-                    uni.showToast({
-                        title: '提交成功',
-                        icon: 'success'
-                    });
-
-                    setTimeout(() => {
-                        uni.navigateBack();
-                    }, 1500);
-                } else {
-                    uni.showToast({
-                        title: res?.retMsg || '提交失败',
-                        icon: 'none'
-                    });
-                }
+                uni.showToast({
+                    title: '提交成功',
+                    icon: 'success'
+                });
+                uni.setStorageSync('storeValue', { contractId: res.respData.contractId });
             }).catch(error => {
                 uni.hideLoading();
                 console.error('提交失败:', error);