Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/h5/introContentss/index.vue

@@ -45,7 +45,7 @@
         <p class="m-content-title">四、 会员履行下列义务：</p>
         <p class="m-content-line">1、遵守本会章程和各项规定；</p>
         <p class="m-content-line">2、执行本会决议；</p>
-        <p class="m-content-line">3、按规定交纳会费;</p>
+        <p class="m-content-line">3、按规定交纳会费（副会长单位、常务理事、理事单位需要交纳会费，其他单位会员和个人会员不收会费）；</p>
         <p class="m-content-line">4、维护本会及其会员的合法权益；</p>
         <p class="m-content-line">5、向本会反映情况，提供有关资料；</p>
         <p class="m-content-line">6、参加本会组织的活动；</p>

ruoyi-ui/src/views/h5/member/index.vue

@@ -75,7 +75,7 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item v-if="form.unitType == 1" label="企业法人" prop="corporate">
+      <el-form-item v-if="form.unitType == 1" label="法人" prop="corporate">
         <el-radio-group v-model="form.corporate" class="m-radio-group">
           <el-radio
             class="m-radio"
@@ -306,7 +306,7 @@ export default {
           {required: true, message: '请填写单位基本信息', trigger: 'blur'},
         ],
         corporate: [
-          {required: true, message: '请选择企业法人', trigger: 'blur'},
+          {required: true, message: '请选择法人', trigger: 'blur'},
         ],
         unincorporatedOrganizations: [
           {required: true, message: '请选择非法人组织', trigger: 'blur'},

ruoyi-ui/src/views/h5/personalmember/index.vue

@@ -70,7 +70,7 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item v-if="form.unitType == 1" label="企业法人" prop="corporate">
+        <el-form-item v-if="form.unitType == 1" label="法人" prop="corporate">
           <el-radio-group v-model="form.corporate" class="m-radio-group">
             <el-radio
               class="m-radio"
@@ -293,7 +293,7 @@ export default {
       // 表单校验
       rules: {
         corporate: [
-          {required: true, message: '请选择企业法人', trigger: 'blur'},
+          {required: true, message: '请选择法人', trigger: 'blur'},
         ],
         unincorporatedOrganizations: [
           {required: true, message: '请选择非法人组织', trigger: 'blur'},

ruoyi-ui/src/views/system/member/index.vue

@@ -272,7 +272,7 @@
           <span>{{ scope.row.basicInformationOfTheUnit || '--' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="企业法人" align="center" prop="corporate">
+      <el-table-column label="法人" align="center" prop="corporate">
         <template slot-scope="scope">
           <dict-tag v-if="scope.row.corporate" :options="dict.type.corporate" :value="scope.row.corporate"/>
           <span v-else>--</span>
@@ -406,7 +406,7 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item v-if="form.unitType == 1" label="企业法人" prop="corporate">
+        <el-form-item v-if="form.unitType == 1" label="法人" prop="corporate">
           <el-radio-group v-model="form.corporate" class="m-radio-group">
             <el-radio
               class="m-radio"
@@ -662,7 +662,7 @@ export default {
           {required: true, message: '请填写单位基本信息', trigger: 'blur'},
         ],
         corporate: [
-          {required: true, message: '请选择企业法人', trigger: 'blur'},
+          {required: true, message: '请选择法人', trigger: 'blur'},
         ],
         unincorporatedOrganizations: [
           {required: true, message: '请选择非法人组织', trigger: 'blur'},

ruoyi-ui/src/views/system/personalmember/index.vue

@@ -221,7 +221,7 @@
           <span v-else>--</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="企业法人" prop="corporate">
+      <el-table-column align="center" label="法人" prop="corporate">
         <template slot-scope="scope">
           <dict-tag v-if="scope.row.corporate" :options="dict.type.corporate" :value="scope.row.corporate"/>
           <span v-else>--</span>
@@ -392,7 +392,7 @@
               </el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item v-if="form.unitType == 1 && form.unitType!=null" label="企业法人" prop="corporate">
+          <el-form-item v-if="form.unitType == 1 && form.unitType!=null" label="法人" prop="corporate">
             <el-radio-group v-model="form.corporate">
               <el-radio
                 v-for="dict in dict.type.corporate"
@@ -614,7 +614,7 @@ export default {
           {required: true, message: '请选择非法人组织', trigger: 'blur'},
         ],
         corporate: [
-          {required: true, message: '请选择企业法人', trigger: 'blur'},
+          {required: true, message: '请选择法人', trigger: 'blur'},
         ],
         name: [
           {required: true, message: '请输入姓名', trigger: 'blur'},//证件号码校验