Răsfoiți Sursa

修改bug

修改bug
Sean 3 luni în urmă
părinte
comite
8874d21303

+ 4 - 4
src/utils/baseUrl.js

@@ -1,16 +1,16 @@
 const URL = {
 const URL = {
   //baseUrl: 'http://183.131.25.186:9501',//测试环境
   //baseUrl: 'http://183.131.25.186:9501',//测试环境
-  //baseUrl: 'http://116.131.8.26:9501',//pre环境
+  baseUrl: 'http://116.131.8.26:9501',//pre环境
   //baseUrl: 'http://103.105.201.2:9501',//正式环境-ip
   //baseUrl: 'http://103.105.201.2:9501',//正式环境-ip
-  baseUrl: 'https://flzxw.bjzxtw.org.cn:9501',//正式环境-域名
+  //baseUrl: 'https://flzxw.bjzxtw.org.cn',//正式环境-域名
   //baseUrl: 'http://192.168.1.201:9501',//刘佳伟本地环境
   //baseUrl: 'http://192.168.1.201:9501',//刘佳伟本地环境
   //baseUrl:'http://192.168.1.115:9501',//冯蕊的本地环境
   //baseUrl:'http://192.168.1.115:9501',//冯蕊的本地环境
   //baseUrl: 'http://192.168.1.127:9501',//刘剑的本地环境
   //baseUrl: 'http://192.168.1.127:9501',//刘剑的本地环境
   //WebsocketUrl: 'ws://192.168.1.201:9506',//刘佳伟websocket地址
   //WebsocketUrl: 'ws://192.168.1.201:9506',//刘佳伟websocket地址
   //WebsocketUrl: 'ws://192.168.1.127:9506'//刘剑websocket地址
   //WebsocketUrl: 'ws://192.168.1.127:9506'//刘剑websocket地址
   //WebsocketUrl: 'ws://183.131.25.186:9506',//测试环境websocket地址
   //WebsocketUrl: 'ws://183.131.25.186:9506',//测试环境websocket地址
-  //WebsocketUrl: 'ws://116.131.8.26:9506'//pre环境websocket地址
-  WebsocketUrl: 'ws://flzxw.bjzxtw.org.cn:9506'//正式环境websocket地址
+  WebsocketUrl: 'ws://116.131.8.26:9506'//pre环境websocket地址
+  //WebsocketUrl: 'ws://103.105.201.2:9506'//正式环境websocket地址
 }
 }
 
 
 export default URL;
 export default URL;

+ 2 - 2
src/views/chat/hall.vue

@@ -101,8 +101,8 @@
         <div :class="['UserNameBox', groupId ? 'ifNotice' : '']">
         <div :class="['UserNameBox', groupId ? 'ifNotice' : '']">
           <div class="userName">{{ messageTitle }}</div>
           <div class="userName">{{ messageTitle }}</div>
           <img src="@/assets/chat/fi_more.png" v-if="groupId!=''" @click="openGroupSystem" class="moreIcon">
           <img src="@/assets/chat/fi_more.png" v-if="groupId!=''" @click="openGroupSystem" class="moreIcon">
-          <div class="groupNotice" v-if="groupId!=''">{{groupProfile}}</div>
-          <div v-else>
+          <div class="groupNotice" v-if="groupId!=''&&groupProfile!=''">{{groupProfile}}</div>
+          <div v-if="groupId==''">
             <div class="shareCardIcon" @click="openShareCard">
             <div class="shareCardIcon" @click="openShareCard">
               <i class="el-icon-postcard"></i>
               <i class="el-icon-postcard"></i>
             </div>
             </div>

+ 7 - 5
src/views/role/components/userDefault.vue

@@ -69,7 +69,7 @@
           <el-form-item label="真实姓名:" :label-width="formLabelWidth" prop="real_name" class="custom-align-right">
           <el-form-item label="真实姓名:" :label-width="formLabelWidth" prop="real_name" class="custom-align-right">
             <el-input v-model="form.real_name" autocomplete="off" placeholder="请输入真实姓名.."></el-input>
             <el-input v-model="form.real_name" autocomplete="off" placeholder="请输入真实姓名.."></el-input>
           </el-form-item>
           </el-form-item>
-          <el-form-item label="照片:" :label-width="formLabelWidth" prop="photoUrl" :class="['custom-form-item']" class="custom-align-right">
+          <el-form-item label="照片:" :label-width="formLabelWidth" prop="avatar" :class="['custom-form-item']" class="custom-align-right">
             <div class="uploaderBox">
             <div class="uploaderBox">
               <!--图片上传组件 start ------------------------------------------------------------>
               <!--图片上传组件 start ------------------------------------------------------------>
               <div class="avatar-upload-container" @mouseenter="hovering = true" @mouseleave="hovering = false">
               <div class="avatar-upload-container" @mouseenter="hovering = true" @mouseleave="hovering = false">
@@ -94,6 +94,7 @@
                 <div v-if="hovering && photoUrl" class="delete-button" @click="handleDelete">
                 <div v-if="hovering && photoUrl" class="delete-button" @click="handleDelete">
                   <i class="el-icon-delete"></i>
                   <i class="el-icon-delete"></i>
                 </div>
                 </div>
+                <input type="hidden" v-model="form.avatar">
               </div>
               </div>
               <!--图片上传组件 end ------------------------------------------------------------>
               <!--图片上传组件 end ------------------------------------------------------------>
             </div>
             </div>
@@ -206,6 +207,7 @@ export default {
       }
       }
     }
     }
     const validateEmpty = (rule,value,callback) => {
     const validateEmpty = (rule,value,callback) => {
+      console.log(value)
       if (!value || value.trim() === "") {
       if (!value || value.trim() === "") {
         callback(new Error('该项不能为空!'));
         callback(new Error('该项不能为空!'));
       } else {
       } else {
@@ -304,7 +306,7 @@ export default {
         //9.手机号
         //9.手机号
         mobile: [{ required: true, trigger: 'blur', validator: validateEmpty }],
         mobile: [{ required: true, trigger: 'blur', validator: validateEmpty }],
         //10.照片
         //10.照片
-        photoUrl: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+        avatar: [{ required: true, trigger: 'blur', validator: validateEmpty }],
         //11.出生年月
         //11.出生年月
         birthday: [{ required: true, trigger: 'blur', validator: validateTime }],
         birthday: [{ required: true, trigger: 'blur', validator: validateTime }],
         //12.有效期
         //12.有效期
@@ -313,9 +315,9 @@ export default {
       //时间跨度
       //时间跨度
       pickerOptions: {
       pickerOptions: {
         selectableRange: '1900-01-01 to 2100-12-31', // 允许选择的日期范围
         selectableRange: '1900-01-01 to 2100-12-31', // 允许选择的日期范围
-        disabledDate(time) {
-          return time.getTime() < Date.now() - 86400000; // 禁用今天之前的日期
-        },
+        // disabledDate(time) {
+        //   return time.getTime() < Date.now() - 86400000; // 禁用今天之前的日期
+        // },
       },
       },
     };
     };
   },
   },

+ 3 - 3
src/views/role/components/userEnterprise.vue

@@ -288,9 +288,9 @@ export default {
       //时间跨度
       //时间跨度
       pickerOptions: {
       pickerOptions: {
         selectableRange: '1900-01-01 to 2100-12-31', // 允许选择的日期范围
         selectableRange: '1900-01-01 to 2100-12-31', // 允许选择的日期范围
-        disabledDate(time) {
-          return time.getTime() < Date.now() - 86400000; // 禁用今天之前的日期
-        },
+        // disabledDate(time) {
+        //   return time.getTime() < Date.now() - 86400000; // 禁用今天之前的日期
+        // },
       },
       },
     };
     };
   },
   },

+ 6 - 5
src/views/role/components/userInvestigate.vue

@@ -72,7 +72,7 @@
           <el-form-item label="真实姓名:" :label-width="formLabelWidth" prop="real_name" class="custom-align-right">
           <el-form-item label="真实姓名:" :label-width="formLabelWidth" prop="real_name" class="custom-align-right">
             <el-input v-model="form.real_name" autocomplete="off" placeholder="请输入真实姓名.."></el-input>
             <el-input v-model="form.real_name" autocomplete="off" placeholder="请输入真实姓名.."></el-input>
           </el-form-item>
           </el-form-item>
-          <el-form-item label="照片:" :label-width="formLabelWidth" prop="photoUrl" :class="['custom-form-item']" class="custom-align-right">
+          <el-form-item label="照片:" :label-width="formLabelWidth" prop="avatar" :class="['custom-form-item']" class="custom-align-right">
             <div class="uploaderBox">
             <div class="uploaderBox">
               <!--图片上传组件 start ------------------------------------------------------------>
               <!--图片上传组件 start ------------------------------------------------------------>
               <div class="avatar-upload-container" @mouseenter="hovering = true" @mouseleave="hovering = false">
               <div class="avatar-upload-container" @mouseenter="hovering = true" @mouseleave="hovering = false">
@@ -97,6 +97,7 @@
                 <div v-if="hovering && photoUrl" class="delete-button" @click="handleDelete">
                 <div v-if="hovering && photoUrl" class="delete-button" @click="handleDelete">
                   <i class="el-icon-delete"></i>
                   <i class="el-icon-delete"></i>
                 </div>
                 </div>
+                <input type="hidden" v-model="form.avatar">
               </div>
               </div>
               <!--图片上传组件 end ------------------------------------------------------------>
               <!--图片上传组件 end ------------------------------------------------------------>
             </div>
             </div>
@@ -332,7 +333,7 @@ export default {
         //10.工作区域
         //10.工作区域
         city_arr_id: [{ required: true, trigger: 'blur', validator: validateArray }],
         city_arr_id: [{ required: true, trigger: 'blur', validator: validateArray }],
         //11.照片
         //11.照片
-        photoUrl: [{ required: true, trigger: 'blur', validator: validateEmpty }],
+        avatar: [{ required: true, trigger: 'blur', validator: validateEmpty }],
         //12.出生年月
         //12.出生年月
         birthday: [{ required: true, trigger: 'blur', validator: validateEmpty }],
         birthday: [{ required: true, trigger: 'blur', validator: validateEmpty }],
         //13.有效期
         //13.有效期
@@ -341,9 +342,9 @@ export default {
       //时间跨度
       //时间跨度
       pickerOptions: {
       pickerOptions: {
         selectableRange: '1900-01-01 to 2100-12-31', // 允许选择的日期范围
         selectableRange: '1900-01-01 to 2100-12-31', // 允许选择的日期范围
-        disabledDate(time) {
-          return time.getTime() < Date.now() - 86400000; // 禁用今天之前的日期
-        },
+        // disabledDate(time) {
+        //   return time.getTime() < Date.now() - 86400000; // 禁用今天之前的日期
+        // },
       },
       },
     };
     };
   },
   },

+ 3 - 3
src/views/role/components/userPolitician.vue

@@ -284,9 +284,9 @@ export default {
       //时间跨度
       //时间跨度
       pickerOptions: {
       pickerOptions: {
         selectableRange: '1900-01-01 to 2100-12-31', // 允许选择的日期范围
         selectableRange: '1900-01-01 to 2100-12-31', // 允许选择的日期范围
-        disabledDate(time) {
-          return time.getTime() < Date.now() - 86400000; // 禁用今天之前的日期
-        },
+        // disabledDate(time) {
+        //   return time.getTime() < Date.now() - 86400000; // 禁用今天之前的日期
+        // },
       },
       },
     };
     };
   },
   },