修改bug

修改bug

src/utils/baseUrl.js

@@ -1,15 +1,15 @@
 const URL = {
   //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: 'https://flzxw.bjzxtw.org.cn',//正式环境-域名
+  baseUrl: 'https://flzxw.bjzxtw.org.cn',//正式环境-域名
   //baseUrl: 'http://192.168.1.201:9501',//刘佳伟本地环境
   //baseUrl:'http://192.168.1.115:9501',//冯蕊的本地环境
   //baseUrl: 'http://192.168.1.127:9501',//刘剑的本地环境
   //WebsocketUrl: 'ws://192.168.1.201:9506',//刘佳伟websocket地址
   //WebsocketUrl: 'ws://192.168.1.127:9506'//刘剑websocket地址
   //WebsocketUrl: 'ws://183.131.25.186:9506',//测试环境websocket地址
-  WebsocketUrl: 'ws://116.131.8.26:9506'//pre环境websocket地址
+  //WebsocketUrl: 'ws://116.131.8.26:9506'//pre环境websocket地址
   //WebsocketUrl: 'ws://103.105.201.2:9506'//正式环境websocket地址
 }
 

src/views/chat/hall.vue

@@ -1351,6 +1351,7 @@ export default {
     },
     //1.3获取聊天记录
     getchatrecords(user_id){
+      //此处增加一个show_id 用于后端判断如何积累未读消息 注意，选择group的方法在下面
       this.$store.dispatch('chat/getChatRecords',{friend_id:user_id}).then(res=> {
         console.log(res)
         this.chatrecords = res.data.data;

src/views/role/components/userDefault.vue

@@ -118,7 +118,7 @@
           <el-form-item label="手机号：" :label-width="formLabelWidth" prop="mobile" class="custom-align-right">
             <el-input v-model="form.mobile" autocomplete="off" placeholder="请输入手机号.."></el-input>
           </el-form-item>
-          <el-form-item label="有效期：" :label-width="formLabelWidth" prop="timeList" class="custom-align-right">
+          <el-form-item label="有效期：" :label-width="formLabelWidth" prop="timeList" class="custom-align-right" v-if="form.long_time==false">
             <el-date-picker
               v-model="timeList"
               type="daterange"
@@ -130,6 +130,19 @@
             </el-date-picker>
             <el-checkbox v-model="form.long_time" :true-label="1" :false-label="0" class="longTimeCheckbox">无限期</el-checkbox>
           </el-form-item>
+          <div class="timeBox" v-else>
+            <div class="timeTitle"><span>*</span>有效期1：</div>
+            <el-date-picker
+              v-model="timeList"
+              type="daterange"
+              :disabled="form.long_time === 1"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :picker-options="pickerOptions">
+            </el-date-picker>
+            <el-checkbox v-model="form.long_time" :true-label="1" :false-label="0" class="longTimeCheckbox">无限期</el-checkbox>
+          </div>
           <el-form-item label="籍贯：" :label-width="formLabelWidth" prop="" class="custom-align-right">
             <CityCascader v-model="form.native_place_arr_id" @update-city-id="update_native_place_arr_id"></CityCascader>
           </el-form-item>
@@ -264,8 +277,8 @@ export default {
         birthday:"",//出生年月
         gender:"1",//性别
         mobile:"",//手机号
-        native_place_arr_id:"",//籍贯
-        address_arr_id:"",//详细地址
+        native_place_arr_id:[],//籍贯
+        address_arr_id:[],//详细地址
         address:"",//详细地址
         from_time:"",//有效期开始时间
         to_time:"",//有效期结束时间
@@ -274,6 +287,7 @@ export default {
         email:"",//电子邮箱
         other:[],//相关资料
         remark:"",//提示词
+        zip_code:"",//邮编
       },
       timeList:[],//时间段
       otherList:[],//相关资料列表
@@ -676,6 +690,26 @@ export default {
   .longTimeCheckbox {
     margin-left: 10px;
   }
+  .timeBox {
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    margin-bottom: 22px;
+    .timeTitle {
+      width: 110px;
+      text-align: right;
+      font-size: 14px;
+      color: #606266;
+      font-weight: bold;
+      height: 36px;
+      line-height: 36px;
+      margin-right: 10px;
+      span {
+        color: red;
+        margin-right: 5px;
+      }
+    }
+  }
   //执行v-deep穿透scope选择器 start------------------------------------------------------------>*/
   ::v-deep .custom-form-item > .el-form-item__label {
     line-height: 140px !important;

src/views/role/components/userInvestigate.vue

@@ -285,9 +285,9 @@ export default {
         birthday:"",//出生年月
         gender:"1",//性别
         mobile:"",//手机号
-        native_place_arr_id:"",//籍贯
+        native_place_arr_id:[],//籍贯
         city_arr_id:"",//工作区域
-        address_arr_id:"",//详细地址
+        address_arr_id:[],//详细地址
         address:"",//详细地址门牌号
         from_time:"",//有效期开始时间
         to_time:"",//有效期结束时间
@@ -296,6 +296,7 @@ export default {
         email:"",//电子邮箱
         other:[],//相关资料
         remark:"",//提示词
+        zip_code:"",//邮编
       },
       timeList:[],//时间段
       otherList:[],//相关资料列表

src/views/role/creatUser.vue

@@ -51,7 +51,7 @@ export default {
         { label: '调研员', value: '4' },
         { label: '个人会员', value: '1' },
         { label: '企业会员', value: '3' },
-        { label: '政务会员', value: '2' }
+        // { label: '政务会员', value: '2' }
       ]
     };
   },