From b6ed7cc0ce37b366a388a36dda6085ce0887a99b Mon Sep 17 00:00:00 2001
From: Paidax <paidax.422@qq.com>
Date: Mon, 16 Dec 2024 14:42:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E4=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/v/nutz/sys/models/Sys_club_user.java   |  5 ++++
 .../static/components/club/clubRegistInfo.vue |  7 +++---
 .../resources/views/mobile/club/inClub.html   | 20 ++++++++++++----
 .../views/platform/sys/club/applyIn/sqrt.html | 22 +++++++++++++++---
 .../platform/sys/club/regist/clubConfirm.html |  4 ++--
 .../sys/club/regist/clubRegistApply.html      | 23 ++++++++++---------
 6 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/src/main/java/io/v/nutz/sys/models/Sys_club_user.java b/src/main/java/io/v/nutz/sys/models/Sys_club_user.java
index d3b877b..47565c4 100644
--- a/src/main/java/io/v/nutz/sys/models/Sys_club_user.java
+++ b/src/main/java/io/v/nutz/sys/models/Sys_club_user.java
@@ -151,6 +151,11 @@ public class Sys_club_user extends BaseModel {
     @ColDefine(type = ColType.VARCHAR, width = 12)
     private String QQNumber;
 
+    @Column
+    @Comment("微信号")
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    private String weChatNumber;
+
     @Column
     @Comment("备注")
     @ColDefine(type = ColType.VARCHAR, width = 100)
diff --git a/src/main/resources/static/components/club/clubRegistInfo.vue b/src/main/resources/static/components/club/clubRegistInfo.vue
index 8bad0be..78ec378 100644
--- a/src/main/resources/static/components/club/clubRegistInfo.vue
+++ b/src/main/resources/static/components/club/clubRegistInfo.vue
@@ -37,7 +37,8 @@
           {{ viewData.foundTime }}
         </el-descriptions-item>
         <el-descriptions-item label="会费标准">
-          {{viewData.dues_standard}}
+<!--          {{viewData.dues_standard}}-->
+          {{ '30元/人' }}
         </el-descriptions-item>
         <el-descriptions-item label="状态">
           {{viewData.stateName}}
@@ -74,12 +75,12 @@
                        :files="JSON.parse(viewData.rulesFile)"
                        :view="true"></file-upload>
         </el-descriptions-item>
-        <el-descriptions-item span="2">
+<!--        <el-descriptions-item span="2">
           <template slot="label">经费来源及管理办法</template>
           <file-upload v-if="viewData.manageFile && viewData.manageFile.length > 0"
                        :files="JSON.parse(viewData.manageFile)"
                        :view="true"></file-upload>
-        </el-descriptions-item>
+        </el-descriptions-item>-->
         <el-descriptions-item span="2">
           <template slot="label">年度活动计划</template>
           <file-upload v-if="viewData.yearPlanFile && viewData.yearPlanFile.length > 0"
diff --git a/src/main/resources/views/mobile/club/inClub.html b/src/main/resources/views/mobile/club/inClub.html
index 80b15f1..68e6b63 100644
--- a/src/main/resources/views/mobile/club/inClub.html
+++ b/src/main/resources/views/mobile/club/inClub.html
@@ -293,11 +293,10 @@ layout("/mobile/platform.html"){
                                label="工作部门" :rules="[{ required: true }]"></van-field>
                     <van-field v-model="formData.mobile" name="mobile" required
                                label="电话" placeholder="请填写电话" :rules="[{ required: true }]"></van-field>
-                    <van-field v-model="formData.QQNumber" name="QQNumber" required type="digit"
-                               label="QQ" placeholder="请填写QQ" :rules="[{ required: true }]"></van-field>
+                    <van-field v-model="formData.weChatNumber" name="weChatNumber" required
+                               label="微信号" placeholder="请填写微信号" :rules="[{ required: true }]"></van-field>
                     <van-field v-model="formData.hobby" name="hobby" required
                                placeholder="请填写爱好" label="爱好" :rules="[{ required: true }]"></van-field>
-
                     <van-field class="more_text" v-model="formData.sickness" name="sickness" required @click="sicknessVisible = true"
                                placeholder="请选择是否患有运动限制类疾病"
                                label="是否患有运动限制类疾病"
@@ -313,8 +312,9 @@ layout("/mobile/platform.html"){
                 <div class="van-card-body">
                     <van-field v-model="formData.familyUserName" name="familyUserName" required
                                placeholder="请填写紧急联系人姓名" label="姓名" :rules="[{ required: true }]"></van-field>
-                    <van-field v-model="formData.familyRelation" name="familyRelation" required
-                               placeholder="请填写紧急联系人关系" label="与申请者关系" :rules="[{ required: true }]"></van-field>
+                    <van-field v-model="formData.familyRelation" name="familyRelation" required readonly
+                               @click="familyRelationVisible = true" placeholder="请选择紧急联系人关系"
+                               label="与申请者关系" :rules="[{ required: true }]"></van-field>
                     <van-field v-model="formData.familyMobile" name="familyMobile" required type="tel"
                                placeholder="请填写紧急联系人电话" label="联系电话" :rules="[{ required: true }]"></van-field>
                 </div>
@@ -354,6 +354,15 @@ layout("/mobile/platform.html"){
 
     </van-popup>
 
+    <!-- 与申请者关系 -->
+    <van-popup position="bottom" round v-model="familyRelationVisible">
+        <van-picker
+                title="请选择紧急联系人关系" show-toolbar
+                :columns="['夫妻', '父亲', '母亲', '兄弟姐妹']"
+                @confirm="(value, index) => {formData.familyRelation = value; familyRelationVisible = false}"
+                @cancel="formData.familyRelation = ''; familyRelationVisible = false">
+        </van-picker>
+    </van-popup>
     <van-popup position="bottom" round v-model="sicknessVisible">
         <van-picker
                 title="是否患有运动限制类疾病" show-toolbar
@@ -423,6 +432,7 @@ layout("/mobile/platform.html"){
                 provideServicesVisible: false,
                 playRoleVisible: false,
                 selfSkillVisible: false,
+                familyRelationVisible: false
             }
         },
         methods: {
diff --git a/src/main/resources/views/platform/sys/club/applyIn/sqrt.html b/src/main/resources/views/platform/sys/club/applyIn/sqrt.html
index ddfbc4c..b63fd9c 100644
--- a/src/main/resources/views/platform/sys/club/applyIn/sqrt.html
+++ b/src/main/resources/views/platform/sys/club/applyIn/sqrt.html
@@ -498,7 +498,7 @@ layout("/layouts/platform.html"){
                                         <el-input v-model="formData.mobile" placeholder="请填写电话" maxlength="20"></el-input>
                                     </el-form-item>
                                 </td>
-                                <th>
+                                <!--<th>
                                     <span style="color: red">*</span>
                                     QQ
                                 </th>
@@ -506,6 +506,15 @@ layout("/layouts/platform.html"){
                                     <el-form-item prop="QQNumber">
                                         <el-input v-model="formData.QQNumber" placeholder="请填写QQ" maxlength="12"></el-input>
                                     </el-form-item>
+                                </td>-->
+                                <th>
+                                    <span style="color: red">*</span>
+                                    微信号
+                                </th>
+                                <td>
+                                    <el-form-item prop="weChatNumber">
+                                        <el-input v-model="formData.weChatNumber" placeholder="请填写微信号" maxlength="12"></el-input>
+                                    </el-form-item>
                                 </td>
                             </tr>
                             <tr>
@@ -550,7 +559,13 @@ layout("/layouts/platform.html"){
                                 </th>
                                 <td>
                                     <el-form-item prop="familyRelation">
-                                        <el-input v-model="formData.familyRelation" placeholder="请填写紧急联系人关系" maxlength="20"></el-input>
+                                        <!--<el-input v-model="formData.familyRelation" placeholder="请填写紧急联系人关系" maxlength="20"></el-input>-->
+                                        <el-select v-model="formData.familyRelation" placeholder="请选择与申请人关系" clearable>
+                                            <el-option label="夫妻" value="夫妻"></el-option>
+                                            <el-option label="父亲" value="父亲"></el-option>
+                                            <el-option label="母亲" value="母亲"></el-option>
+                                            <el-option label="兄弟姐妹" value="兄弟姐妹"></el-option>
+                                        </el-select>
                                     </el-form-item>
                                 </td>
                                 <th>
@@ -660,7 +675,8 @@ layout("/layouts/platform.html"){
                     hobby: [{required: true, message: '必填', trigger: ['blur', 'change']}],
                     unitName: [{required: true, message: '必填', trigger: ['blur', 'change']}],
                     mobile: [{required: true, message: '必填', trigger: ['blur', 'change']}],
-                    QQNumber: [{required: true, message: '必填', trigger: ['blur', 'change']}],
+                    // QQNumber: [{required: true, message: '必填', trigger: ['blur', 'change']}],
+                    weChatNumber: [{required: true, message: '必填', trigger: ['blur', 'change']}],
                     sickness: [{required: true, message: '必填', trigger: ['blur', 'change']}],
                     familyUserName: [{required: true, message: '必填', trigger: ['blur', 'change']}],
                     familyRelation: [{required: true, message: '必填', trigger: ['blur', 'change']}],
diff --git a/src/main/resources/views/platform/sys/club/regist/clubConfirm.html b/src/main/resources/views/platform/sys/club/regist/clubConfirm.html
index 93e6c79..ba40ec8 100644
--- a/src/main/resources/views/platform/sys/club/regist/clubConfirm.html
+++ b/src/main/resources/views/platform/sys/club/regist/clubConfirm.html
@@ -122,12 +122,12 @@ layout("/layouts/platform.html"){
                                     </file-upload>
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="12">
+                            <!--<el-col :span="12">
                                 <el-form-item label="经费来源及管理办法" prop="manageFile">
                                     <file-upload :files.sync="formData.manageFile" :max="5" :type="['doc','docx']">
                                     </file-upload>
                                 </el-form-item>
-                            </el-col>
+                            </el-col>-->
                             <el-col :span="12">
                                 <el-form-item label="年度活动计划" prop="yearPlanFile">
                                     <file-upload :files.sync="formData.yearPlanFile" :max="5" :type="['doc','docx']">
diff --git a/src/main/resources/views/platform/sys/club/regist/clubRegistApply.html b/src/main/resources/views/platform/sys/club/regist/clubRegistApply.html
index 294d39e..ebf1d48 100644
--- a/src/main/resources/views/platform/sys/club/regist/clubRegistApply.html
+++ b/src/main/resources/views/platform/sys/club/regist/clubRegistApply.html
@@ -141,7 +141,7 @@ layout("/layouts/platform.html"){
                                     </file-upload>
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="12">
+                            <!--<el-col :span="12">
                                 <el-form-item label="管理办法" prop="manageFile">
                                     <file-upload :files.sync="formData.manageFile" :max="5" :type="['doc','docx']">
                                         <template #el-upload__tip>
@@ -149,7 +149,7 @@ layout("/layouts/platform.html"){
                                         </template>
                                     </file-upload>
                                 </el-form-item>
-                            </el-col>
+                            </el-col>-->
                             <el-col :span="12">
                                 <el-form-item label="年度活动计划" prop="yearPlanFile">
                                     <file-upload :files.sync="formData.yearPlanFile" :max="5" :type="['doc','docx']">
@@ -159,16 +159,17 @@ layout("/layouts/platform.html"){
                                     </file-upload>
                                 </el-form-item>
                             </el-col>
+
+                            <el-col :span="12">
+                                <el-form-item label="其他附件" prop="files">
+                                    <file-upload :files.sync="formData.files" :max="5" :type="['doc','docx','xls','xlsx','pdf','ppt']">
+                                        <template #el-upload__tip>
+                                            <div class="el-upload__tip" slot="tip">其他补充附件，如有请上传</div>
+                                        </template>
+                                    </file-upload>
+                                </el-form-item>
+                            </el-col>
                         </el-row>
-
-                        <el-form-item label="其他附件" prop="files" >
-                            <file-upload :files.sync="formData.files" :max="5" :type="['doc','docx','xls','xlsx','pdf','ppt']">
-                                <template #el-upload__tip>
-                                    <div class="el-upload__tip" slot="tip">其他补充附件，如有请上传</div>
-                                </template>
-                            </file-upload>
-                        </el-form-item>
-
                     </el-form>
                 </div>