提交

ruoyi-ui/src/settings.js

@@ -1,7 +1,7 @@
 module.exports = {
 	urls: `https://qszx.qs163.cn`,
   // 114.99.127.243:2004
-	// urls:`http://192.168.101.245:8055`,
+	// urls:`http://192.168.101.168:8055`,
   // 192.168.101.168:8089
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light

ruoyi-ui/src/views/huiyi/conference/index.vue

@@ -213,7 +213,7 @@
                              :value="dict.value"
                            ></el-option>
                 </el-select>
-                <p style="margin: 0;color:red;">参与人员搜索</p>
+                <p style="margin: 0;color:red;">参会人员搜索</p>
               </el-col>
               <el-col :span="4" style="padding-left: 10px;">
                 <el-select clearable @change="bafef"  style="width: 100%;  margin-right: 10px;" v-model="lseig.isMember" placeholder="是否常委">

ruoyi-ui/src/views/login.vue

@@ -49,7 +49,7 @@
           <img :src="codeUrl" @click="getCode" class="login-code-img"/>
         </div>
       </el-form-item>
-      <el-checkbox v-if='iskj == 1'  v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
+      <el-checkbox v-if='iskj == 1'  v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码 </el-checkbox>
 
       <el-form-item  prop="username" v-if='iskj == 2' class="lisevf">
         <el-input v-model="loginForm.username"  placeholder="联系方式" type="number" >
@@ -102,6 +102,9 @@
       <!-- v-if='xgmemberMe' -->
 
       <!-- <el-checkbox v-model="xgmemberMe"  @change=" xgmes " style="margin:0px 0px 25px 25px;">修改密码</el-checkbox> -->
+       <!-- <el-form-item> -->
+
+       <!-- </el-form-item> -->
       <el-form-item style="width:100%;margin-bottom: 0;" v-if='iskj == 1' >
         <el-button
           :loading="loading"
@@ -147,6 +150,7 @@
           * 使用快捷登录，请先绑定第三方账号
         </p> -->
       </el-form-item>
+      <p style="color: red;font-size: 13px;margin: 0; margin-bottom: 5px;font-weight: 700;">严禁通过潜山市智慧政协平台传输国家秘密、工作秘密</p>
 
 
 
@@ -583,7 +587,7 @@ export default {
     margin-left: 2px;
   }
   .el-button--primary{
-    margin-bottom: 20px;
+    margin-bottom: 15px;
     // background-color: #A6A1EB !important;
 
   }

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

@@ -411,14 +411,6 @@ export default {
         name: [
           { required: true, message: "委员姓名不能为空", trigger: "blur" }
         ],
-        card: [
-          { required: true, message: "委员身份证号不能为空", trigger: "blur" },
-          {
-            pattern: /(^\d{8}(0\d|10|11|12)([0-2]\d|30|31)\d{3}$)|(^\d{6}(18|19|20)\d{2}(0\d|10|11|12)([0-2]\d|30|31)\d{3}(\d|X|x)$)/,
-            message: "请输入正确的身份证号",
-            trigger: "blur"
-          }
-        ],
         phonenumber: [
           { required: true, message: "不能为空", trigger: "blur" },
           {