From cfc4c5210de662897d301fe1a4e4fb20e05edacd Mon Sep 17 00:00:00 2001
From: "@jyuhsin" <729757837@qq.com>
Date: Thu, 18 Sep 2025 16:06:27 +0800
Subject: [PATCH] commit

---
 .../h5Controller/H5ContributionMineController.java  |  1 +
 .../staffbenefit/contribution/common/applyForm.js   | 13 ++++++++++---
 .../staffbenefit/contribution/list/index.html       |  8 ++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/h5Controller/H5ContributionMineController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/h5Controller/H5ContributionMineController.java
index c9dedcba..f9c8303b 100644
--- a/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/h5Controller/H5ContributionMineController.java
+++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/contribution/h5Controller/H5ContributionMineController.java
@@ -58,6 +58,7 @@ public class H5ContributionMineController {
 		Sql sql = Sqls.create("""
 				SELECT
 					ca.*,
+					ca.id as applyId,
 					cp.contributionName AS projectName,
 					cp.contributionTypeCode,
 					cp.contributionStartTime,
diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/contribution/common/applyForm.js b/src/main/resources/views/platform/zhghh5/staffbenefit/contribution/common/applyForm.js
index 5550a31e..6d84a780 100644
--- a/src/main/resources/views/platform/zhghh5/staffbenefit/contribution/common/applyForm.js
+++ b/src/main/resources/views/platform/zhghh5/staffbenefit/contribution/common/applyForm.js
@@ -22,8 +22,14 @@ const applyForm = {
                         <van-field label="捐助方式" required :rules="[{ required: true }]" name="payMode" >
                             <template #input>
                                 <van-radio-group v-model="formData.payMode" direction="horizontal">
-                                    <van-radio name="WeChat"><van-icon size="18" name="wechat-pay" />微信</van-radio>
-                                    <van-radio name="Alipay"><van-icon size="18" name="alipay" />支付宝</van-radio>
+                                    <van-radio name="WeChat">
+                                        <van-icon size="18" name="wechat-pay"></van-icon>
+                                        微信
+                                    </van-radio>
+                                    <van-radio name="Alipay">
+                                        <van-icon size="18" name="alipay"></van-icon>
+                                        支付宝
+                                    </van-radio>
                                 </van-radio-group>
                             </template>
                         </van-field>
@@ -61,7 +67,7 @@ const applyForm = {
     methods: {
         onOpen(row) {
             this.row = row
-            if(row && row.id) {
+            if(row && row.applyId) {
                 this.formData = clone(row)
             } else {
                 this.init()
@@ -103,6 +109,7 @@ const applyForm = {
     style: /*language=CSS*/ `
         ::v-deep .van-radio__label {
             display: flex;
+            align-items: center;
         }
     `
 }
diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/contribution/list/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/contribution/list/index.html
index 7056433a..01c300bc 100644
--- a/src/main/resources/views/platform/zhghh5/staffbenefit/contribution/list/index.html
+++ b/src/main/resources/views/platform/zhghh5/staffbenefit/contribution/list/index.html
@@ -93,8 +93,12 @@ layout("/layouts/platform_h5.html"){
                 this.doSearch()
             },
             onApply(row) {
-                delete row.contributionFiles
-                this.$refs.applyFormRef.onOpen(row)
+                if(row.contributionMode === 1) {
+                    location.href = row.contributionUrl
+                } else {
+                    delete row.contributionFiles
+                    this.$refs.applyFormRef.onOpen(row)
+                }
             },
             onTypeView(row) {
                 this.$refs.typeInfoRef.onOpen(row)