From 38131ff398c78d59f431baeaac8197a2fa3f2d60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A6=86=E9=92=B1=E8=90=BD=E5=B0=BD=E6=A7=BF=E8=8A=B1?=
 =?UTF-8?q?=E7=A8=80?= <2675540038@qq.com>
Date: Mon, 20 May 2024 18:09:34 +0800
Subject: [PATCH] 1

---
 src/pages/activity/activity_index.vue |   4 +-
 src/pages/user/user_edit.vue          | 385 ++++++++++++++------------
 src/pages/user/user_index.vue         |   4 +-
 src/pages/user/user_info.vue          |   8 +-
 4 files changed, 217 insertions(+), 184 deletions(-)

diff --git a/src/pages/activity/activity_index.vue b/src/pages/activity/activity_index.vue
index 97125c1..5323452 100644
--- a/src/pages/activity/activity_index.vue
+++ b/src/pages/activity/activity_index.vue
@@ -3,7 +3,7 @@
     <div class="form-step-container">
       <t-button @click="add">新增</t-button>
       <t-tabs v-model="tabIndex" @change="tabIndexChange">
-        <t-tab-panel value="1" label="线下活动" :destroyOnHide="false"></t-tab-panel>
+        <t-tab-panel value="1" label="协会活动" :destroyOnHide="false"></t-tab-panel>
         <t-tab-panel value="2" label="调查问卷" :destroyOnHide="false"></t-tab-panel>
         <t-tab-panel value="3" label="公益捐赠" :destroyOnHide="false"></t-tab-panel>
         <t-tab-panel value="4" label="学习培训" :destroyOnHide="false"></t-tab-panel>
@@ -45,7 +45,7 @@
         </template>
         <template #activity_type="{ row }">
           <div style="text-align: center;">
-            <span v-if="row.activity_type==1">线下活动</span>
+            <span v-if="row.activity_type==1">协会活动</span>
             <span v-if="row.activity_type==2">调查问卷</span>
             <span v-if="row.activity_type==3">公益捐赠</span>
             <span v-if="row.activity_type==4">学习培训</span>
diff --git a/src/pages/user/user_edit.vue b/src/pages/user/user_edit.vue
index 2f57f9a..fe7627f 100644
--- a/src/pages/user/user_edit.vue
+++ b/src/pages/user/user_edit.vue
@@ -7,7 +7,7 @@
           layout="inline"
           labelAlign="top"
         >
-          <t-form-item label="手机号" name="phone">
+          <t-form-item label="手机号" name="phone" :requiredMark="true">
             <t-input v-model="formData.phone" placeholder="请输入手机号"></t-input>
           </t-form-item>
           <t-form-item label="密码" name="password">
@@ -31,8 +31,8 @@
           labelAlign="top"
           layout="inline"
         >
-          <t-form-item label="真实姓名" name="nikename">
-            <t-input v-model="formData.nikename" placeholder="请输入真实姓名"></t-input>
+          <t-form-item label="会员姓名" name="nikename" :requiredMark="true">
+            <t-input v-model="formData.nikename" placeholder="请输入会员姓名"></t-input>
           </t-form-item>
 
           <t-form-item label="性别" name="gender">
@@ -86,9 +86,9 @@
           <t-form-item label="其他联系人" name="other_contacts">
             <t-input v-model="formData.other_contacts" placeholder="请输入其他联系人"></t-input>
           </t-form-item>
-<!--          <t-form-item label="意向协会职务" name="position">-->
-<!--            <t-input v-model="formData.position" placeholder="请输入意向协会职务"></t-input>-->
-<!--          </t-form-item>-->
+          <!--          <t-form-item label="意向协会职务" name="position">-->
+          <!--            <t-input v-model="formData.position" placeholder="请输入意向协会职务"></t-input>-->
+          <!--          </t-form-item>-->
           <t-form-item label="自我介绍" name="introduction">
             <t-textarea placeholder="请输入自我介绍" :autosize="{ minRows: 3, maxRows: 5 }"
                         v-model="formData.introduction"/>
@@ -151,7 +151,7 @@
           <t-form-item label="统一社会信用代码" name="unified_code">
             <t-input v-model="formData.unified_code" placeholder="请输入统一社会信用代码"></t-input>
           </t-form-item>
-          <t-form-item label="企业名称" name="enterprise_name">
+          <t-form-item label="企业名称" name="enterprise_name" :requiredMark="true">
             <t-input v-model="formData.enterprise_name" placeholder="请输入企业名称"></t-input>
           </t-form-item>
           <t-form-item label="企业性质" name="enterprise_nature">
@@ -254,6 +254,7 @@
 import {UserIcon, LockOnIcon} from 'tdesign-icons-vue';
 import {CheckCircleIcon} from 'tdesign-icons-vue';
 import store from '@/store'
+
 export default {
   components: {
     CheckCircleIcon,
@@ -299,11 +300,11 @@ export default {
         employee: '',
         previous_revenue: '',
         previous_tax: '',
-        position_id:null,
+        position_id: null,
         previous_profit: '',
         previous_donation: '',
-        enterprise_location:'',
-        industry_id:null,
+        enterprise_location: '',
+        industry_id: null,
         qitaqiyerenzhiqingkuang: '',
         enterprise_Introduction: '',
         introdiction: '',
@@ -317,13 +318,13 @@ export default {
         tuanweifuzerenxinxi: '',
         documents_file: '',
         documents_file_show: [],
-        introduction:'',
-        enterprise_name:'',
+        introduction: '',
+        enterprise_name: '',
       },
       id: 0,
       info: '',
-      plan_list:[],
-      industry_list:[]
+      plan_list: [],
+      industry_list: []
     };
   },
   mounted() {
@@ -349,27 +350,27 @@ export default {
 
       return {url: res.data.fullurl};
     },
-    getIndustry(){
+    getIndustry() {
       this.$request
         .post("/industry")
-        .then( (res) => {
+        .then((res) => {
           console.log(res);
-          if(res.code==1){
-            this.industry_list=res.data;
+          if (res.code == 1) {
+            this.industry_list = res.data;
           }
         })
         .catch((e) => {
           console.log(e);
         });
     },
-    getPlan(){
+    getPlan() {
       this.$request
         .post("/position")
-        .then( (res) => {
-            console.log(res);
-            if(res.code==1){
-              this.plan_list=res.data;
-            }
+        .then((res) => {
+          console.log(res);
+          if (res.code == 1) {
+            this.plan_list = res.data;
+          }
         })
         .catch((e) => {
           console.log(e);
@@ -377,178 +378,210 @@ export default {
     },
     getInfo() {
       this.$request
-        .post("/member/find",{member_id:this.id})
-        .then( (res) => {
+        .post("/member/find", {member_id: this.id})
+        .then((res) => {
           console.log(res);
-          this.info=res.data;
-          this.formData.phone=res.data.phone;
-          this.formData.position_id=res.data.position_id;
-          this.formData.industry_id=res.data.industry_id;
-          this.formData.password=res.data.password;
-            this.formData.nikename=res.data.nikename;
-            this.formData.gender=res.data.gender;
-            this.formData.birth_time=res.data.birth_time;
-            this.formData.nation=res.data.nation;
-            this.formData.political=res.data.political;
-            this.formData.jiguan=res.data.jiguan;
-            this.formData.institution=res.data.institution;
-            this.formData.education=res.data.education;
-            this.formData.academic_degree=res.data.academic_degree;
-            this.formData.card_number=res.data.card_number;
-            this.formData.work_unit=res.data.work_unit;
-            this.formData.unit_position=res.data.unit_position;
-            this.formData.wx_number=res.data.wx_number;
-            this.formData.mailbox=res.data.mailbox;
-            this.formData.fixed_telephone=res.data.fixed_telephone;
-            this.formData.achievement_award=res.data.achievement_award;
-            this.formData.other_contacts=res.data.other_contacts;
-            this.formData.other_social_positions=res.data.other_social_positions;
-            this.formData.position=res.data.position;
-            this.formData.cardf_image_show=[{url: store.state.user.apiUrl+res.data.cardf_image}];
-            this.formData.cardz_image_show=[{url: store.state.user.apiUrl+res.data.cardz_image}];
-            this.formData.photo_image_show=[{url:store.state.user.apiUrl+ res.data.photo_image}];
-            this.formData.cardf_image=res.data.cardf_image;
-            this.formData.cardz_image=res.data.cardz_image;
-            this.formData.photo_image=res.data.photo_image;
-            this.formData.business_license_image_show=[{url:store.state.user.apiUrl+res.data.business_license_image}];
-            this.formData.business_license_image=res.data.business_license_image;
-            this.formData.unified_code=res.data.unified_code;
-            this.formData.enterprise_nature=res.data.enterprise_nature;
-            this.formData.enterprise_website=res.data.enterprise_website;
-            this.formData.if_list=res.data.if_list;
-            this.formData.employee=res.data.employee;
-            this.formData.previous_revenue=res.data.previous_revenue;
-            this.formData.previous_tax=res.data.previous_tax;
-            this.formData.previous_profit=res.data.previous_profit;
-            this.formData.previous_donation=res.data.previous_donation;
-            this.formData.qitaqiyerenzhiqingkuang=res.data.qitaqiyerenzhiqingkuang;
-            this.formData.enterprise_Introduction=res.data.enterprise_Introduction;
-            this.formData.introdiction=res.data.introdiction;
-            this.formData.enterprise_honor=res.data.enterprise_honor;
-            this.formData.if_organization=res.data.if_organization;
-            this.formData.nature=res.data.nature;
-            this.formData.jiantuan_time=res.data.jiantuan_time;
-            this.formData.jiantuan_number=res.data.jiantuan_number;
-            this.formData.youth_number=res.data.youth_number;
-            this.formData.superior_nature=res.data.superior_nature;
-            this.formData.tuanweifuzerenxinxi=res.data.tuanweifuzerenxinxi;
-            this.formData.documents_file=res.data.documents_file;
-            this.formData.enterprise_location=res.data.enterprise_location;
-            this.formData.documents_file_show= [{url:store.state.user.apiUrl+ res.data.documents_file}];
-            this.formData.introduction=res.data.introduction;
-          this.formData.enterprise_name=res.data.enterprise_name;
+          this.info = res.data;
+          this.formData.phone = res.data.phone;
+          this.formData.position_id = res.data.position_id;
+          this.formData.industry_id = res.data.industry_id;
+          this.formData.password = res.data.password;
+          this.formData.nikename = res.data.nikename;
+          this.formData.gender = res.data.gender;
+          this.formData.birth_time = res.data.birth_time;
+          this.formData.nation = res.data.nation;
+          this.formData.political = res.data.political;
+          this.formData.jiguan = res.data.jiguan;
+          this.formData.institution = res.data.institution;
+          this.formData.education = res.data.education;
+          this.formData.academic_degree = res.data.academic_degree;
+          this.formData.card_number = res.data.card_number;
+          this.formData.work_unit = res.data.work_unit;
+          this.formData.unit_position = res.data.unit_position;
+          this.formData.wx_number = res.data.wx_number;
+          this.formData.mailbox = res.data.mailbox;
+          this.formData.fixed_telephone = res.data.fixed_telephone;
+          this.formData.achievement_award = res.data.achievement_award;
+          this.formData.other_contacts = res.data.other_contacts;
+          this.formData.other_social_positions = res.data.other_social_positions;
+          this.formData.position = res.data.position;
+          if(res.data.cardf_image==''){
+            this.formData.cardf_image_show = [];
+          }else{
+            this.formData.cardf_image_show = [{url: store.state.user.apiUrl + res.data.cardf_image}];
+          }
+          if( res.data.cardz_image==''){
+            this.formData.cardz_image_show = [];
+          }else{
+            this.formData.cardz_image_show = [{url: store.state.user.apiUrl + res.data.cardz_image}];
+          }
+          if( res.data.photo_image==''){
+            this.formData.photo_image_show = [];
+          }else{
+            this.formData.photo_image_show = [{url: store.state.user.apiUrl + res.data.photo_image}];
+          }
+
+          this.formData.cardf_image = res.data.cardf_image;
+          this.formData.cardz_image = res.data.cardz_image;
+          this.formData.photo_image = res.data.photo_image;
+          if(res.data.business_license_image==''){
+            this.formData.business_license_image_show = [];
+          }else{
+            this.formData.business_license_image_show = [{url: store.state.user.apiUrl + res.data.business_license_image}];
+          }
+          this.formData.business_license_image = res.data.business_license_image;
+          this.formData.unified_code = res.data.unified_code;
+          this.formData.enterprise_nature = res.data.enterprise_nature;
+          this.formData.enterprise_website = res.data.enterprise_website;
+          this.formData.if_list = res.data.if_list;
+          this.formData.employee = res.data.employee;
+          this.formData.previous_revenue = res.data.previous_revenue;
+          this.formData.previous_tax = res.data.previous_tax;
+          this.formData.previous_profit = res.data.previous_profit;
+          this.formData.previous_donation = res.data.previous_donation;
+          this.formData.qitaqiyerenzhiqingkuang = res.data.qitaqiyerenzhiqingkuang;
+          this.formData.enterprise_Introduction = res.data.enterprise_Introduction;
+          this.formData.introdiction = res.data.introdiction;
+          this.formData.enterprise_honor = res.data.enterprise_honor;
+          this.formData.if_organization = res.data.if_organization;
+          this.formData.nature = res.data.nature;
+          this.formData.jiantuan_time = res.data.jiantuan_time;
+          this.formData.jiantuan_number = res.data.jiantuan_number;
+          this.formData.youth_number = res.data.youth_number;
+          this.formData.superior_nature = res.data.superior_nature;
+          this.formData.tuanweifuzerenxinxi = res.data.tuanweifuzerenxinxi;
+          this.formData.documents_file = res.data.documents_file;
+          this.formData.enterprise_location = res.data.enterprise_location;
+          this.formData.documents_file_show = [{url: store.state.user.apiUrl + res.data.documents_file}];
+          this.formData.introduction = res.data.introduction;
+          this.formData.enterprise_name = res.data.enterprise_name;
         })
         .catch((e) => {
           console.log(e);
         });
     },
     submit() {
-      if (this.formData.business_license_image == '') {
-        this.$message.error('请上传营业执照！');
+      // if (this.formData.business_license_image == '') {
+      //   this.$message.error('请上传营业执照！');
+      //   return;
+      // }
+      if (this.formData.phone == '') {
+        this.$message.error('请填写手机号！');
         return;
       }
-      if (this.formData.unified_code == '') {
-        this.$message.error('请输入统一社会信用代码！');
+      if (this.formData.nikename == '') {
+        this.$message.error('请填写会员姓名！');
         return;
       }
-      if (this.formData.enterprise_nature == '') {
-        this.$message.error('请输入企业性质！');
+      // if (this.formData.unified_code == '') {
+      //   this.$message.error('请输入统一社会信用代码！');
+      //   return;
+      // }
+      if (this.formData.enterprise_name == '') {
+        this.$message.error('请填写企业名称！');
         return;
       }
-      if (this.formData.enterprise_website == '') {
-        this.$message.error('请输入企业网址！');
-        return;
-      }
-      if (this.formData.if_list == null) {
-        this.$message.error('请选择是否上市！');
-        return;
-      }
-      if (this.formData.employee == '') {
-        this.$message.error('请输入员工人数！');
-        return;
-      }
-      if (this.formData.enterprise_location == '') {
-        this.$message.error('请输入企业注册地！');
-        return;
-      }
-      if (this.formData.previous_revenue == '') {
-        this.$message.error('请输入上年度营业额！');
-        return;
-      }
-      if (this.formData.previous_tax == '') {
-        this.$message.error('请输入上年度纳税额！');
-        return;
-      }
-      if (this.formData.education == '') {
-        this.$message.error('请输入学历！');
-        return;
-      }
-      if (this.formData.previous_profit == '') {
-        this.$message.error('请输入上年度净利润！');
-        return;
-      }
-      if (this.formData.previous_donation == '') {
-        this.$message.error('请输入上年度公益性捐赠支出！');
-        return;
-      }
-      if (this.formData.qitaqiyerenzhiqingkuang == '') {
-        this.$message.error('请输入其他企业任职情况！');
-        return;
-      }
-      if (this.formData.enterprise_Introduction == '') {
-        this.$message.error('请输入企业介绍！');
-        return;
-      }
-      if (this.formData.introdiction == '') {
-        this.$message.error('请输入业务介绍！');
-        return;
-      }
-      if (this.formData.enterprise_honor == '') {
-        this.$message.error('请输入企业所获荣誉以及专利！');
-        return;
-      }
-      if (this.formData.if_organization == null) {
-        this.$message.error('是否建立团组织！');
-        return;
-      }
-      if(this.formData.if_organization==0){
-        if (this.formData.nature == '') {
-          this.$message.error('请输主团组织性质！');
-          return;
-        }
-        if (this.formData.jiantuan_time == '') {
-          this.$message.error('请输入建团时间！');
-          return;
-        }
-        if (this.formData.jiantuan_number == '') {
-          this.$message.error('请输入建团人数！');
-          return;
-        }
-        if (this.formData.youth_number == '') {
-          this.$message.error('请输入青年人数！');
-          return;
-        }
-        if (this.formData.superior_nature == '') {
-          this.$message.error('请输入上级团组织！');
-          return;
-        }
-        if (this.formData.tuanweifuzerenxinxi == '') {
-          this.$message.error('请输入团委负责人信息！');
-          return;
-        }
-        if (this.formData.documents_file == '') {
-          this.$message.error('请上传批复文件！');
-          return;
-        }
+      if(this.formData.photo_image==''){
+          this.formData.photo_image = '/uploads/20240517/8b2da599cd1e90fcfbb56bdf0f4f4181.webp';
       }
+      // if (this.formData.enterprise_nature == '') {
+      //   this.$message.error('请输入企业性质！');
+      //   return;
+      // }
+      // if (this.formData.enterprise_website == '') {
+      //   this.$message.error('请输入企业网址！');
+      //   return;
+      // }
+      // if (this.formData.if_list == null) {
+      //   this.$message.error('请选择是否上市！');
+      //   return;
+      // }
+      // if (this.formData.employee == '') {
+      //   this.$message.error('请输入员工人数！');
+      //   return;
+      // }
+      // if (this.formData.enterprise_location == '') {
+      //   this.$message.error('请输入企业注册地！');
+      //   return;
+      // }
+      // if (this.formData.previous_revenue == '') {
+      //   this.$message.error('请输入上年度营业额！');
+      //   return;
+      // }
+      // if (this.formData.previous_tax == '') {
+      //   this.$message.error('请输入上年度纳税额！');
+      //   return;
+      // }
+      // if (this.formData.education == '') {
+      //   this.$message.error('请输入学历！');
+      //   return;
+      // }
+      // if (this.formData.previous_profit == '') {
+      //   this.$message.error('请输入上年度净利润！');
+      //   return;
+      // }
+      // if (this.formData.previous_donation == '') {
+      //   this.$message.error('请输入上年度公益性捐赠支出！');
+      //   return;
+      // }
+      // if (this.formData.qitaqiyerenzhiqingkuang == '') {
+      //   this.$message.error('请输入其他企业任职情况！');
+      //   return;
+      // }
+      // if (this.formData.enterprise_Introduction == '') {
+      //   this.$message.error('请输入企业介绍！');
+      //   return;
+      // }
+      // if (this.formData.introdiction == '') {
+      //   this.$message.error('请输入业务介绍！');
+      //   return;
+      // }
+      // if (this.formData.enterprise_honor == '') {
+      //   this.$message.error('请输入企业所获荣誉以及专利！');
+      //   return;
+      // }
+      // if (this.formData.if_organization == null) {
+      //   this.$message.error('是否建立团组织！');
+      //   return;
+      // }
+      // if (this.formData.if_organization == 0) {
+      //   if (this.formData.nature == '') {
+      //     this.$message.error('请输主团组织性质！');
+      //     return;
+      //   }
+      //   if (this.formData.jiantuan_time == '') {
+      //     this.$message.error('请输入建团时间！');
+      //     return;
+      //   }
+      //   if (this.formData.jiantuan_number == '') {
+      //     this.$message.error('请输入建团人数！');
+      //     return;
+      //   }
+      //   if (this.formData.youth_number == '') {
+      //     this.$message.error('请输入青年人数！');
+      //     return;
+      //   }
+      //   if (this.formData.superior_nature == '') {
+      //     this.$message.error('请输入上级团组织！');
+      //     return;
+      //   }
+      //   if (this.formData.tuanweifuzerenxinxi == '') {
+      //     this.$message.error('请输入团委负责人信息！');
+      //     return;
+      //   }
+      //   if (this.formData.documents_file == '') {
+      //     this.$message.error('请上传批复文件！');
+      //     return;
+      //   }
+      // }
       this.formData.member_id = this.id;
       this.$request
         .post("/member/update", this.formData)
         .then((res) => {
           console.log(res);
-          if (res.code==1){
+          if (res.code == 1) {
             this.$message.success(res.msg);
-          }else{
+          } else {
             this.$message.error(res.msg);
           }
           this.getInfo();
diff --git a/src/pages/user/user_index.vue b/src/pages/user/user_index.vue
index 68e3e5a..fb2d933 100644
--- a/src/pages/user/user_index.vue
+++ b/src/pages/user/user_index.vue
@@ -12,12 +12,12 @@
           <t-col :span="5">
             <t-row :gutter="[16, 24]">
               <t-col :flex="2">
-                <t-form-item label="姓名" name="nikename">
+                <t-form-item label="会员姓名" name="nikename">
                   <t-input
                     v-model="formData.nikename"
                     class="form-item-content"
                     type="search"
-                    placeholder="请输入姓名"
+                    placeholder="请输入会员姓名"
                     :style="{ minWidth: '134px' }"
                   />
                 </t-form-item>
diff --git a/src/pages/user/user_info.vue b/src/pages/user/user_info.vue
index 4dab05f..ceadfd8 100644
--- a/src/pages/user/user_info.vue
+++ b/src/pages/user/user_info.vue
@@ -90,10 +90,10 @@
           </div>
         </t-descriptions-item>
         <t-descriptions-item label="企业注册地" :content="info.enterprise_location"></t-descriptions-item>
-        <t-descriptions-item label="上年度营业额" :content="info.previous_revenue+'万'"></t-descriptions-item>
-        <t-descriptions-item label="上年度纳税额" :content="info.previous_tax+'万'"></t-descriptions-item>
-        <t-descriptions-item label="上年度净利润" :content="info.previous_profit+'万'"></t-descriptions-item>
-        <t-descriptions-item label="上年度公益性捐赠支出" :content="info.previous_donation+'万'"></t-descriptions-item>
+        <t-descriptions-item label="上年度营业额" :content="!info.previous_revenue?'':info.previous_revenue+'万'"></t-descriptions-item>
+        <t-descriptions-item label="上年度纳税额" :content="!info.previous_tax?'':info.previous_tax+'万'"></t-descriptions-item>
+        <t-descriptions-item label="上年度净利润" :content="!info.previous_profit?'':info.previous_profit+'万'"></t-descriptions-item>
+        <t-descriptions-item label="上年度公益性捐赠支出" :content="!info.previous_donation?'':info.previous_donation+'万'"></t-descriptions-item>
         <t-descriptions-item label="企业介绍" :content="info.enterprise_Introduction"></t-descriptions-item>
         <t-descriptions-item label="业务介绍" :content="info.introdiction"></t-descriptions-item>
         <t-descriptions-item label="企业所获荣誉以及专利" :content="info.enterorise_honor"></t-descriptions-item>