0.0.31

完成分享名片和分享群聊

src/utils/baseUrl.js

@@ -1,11 +1,10 @@
 const URL = {
-  testUrl: 'http://192.168.1.201:9501',//刘佳伟的电脑
-  liuUrl: 'http://192.168.1.127:9501',//刘剑的电脑
-  baseUrl: 'http://183.131.25.186:9501',//测试服务器
-  servUrl: 'https://admin.bjzxtw.org.cn/zxtapi',//服务端
-  //WebsocketUrl: 'ws://192.168.1.201:9506',//老刘websocket地址
-  //WebsocketUrl: 'ws://183.131.25.186:9506'//测试服务器websocket地址
-  WebsocketUrl: 'ws://192.168.1.127:9506'//刘剑的电脑
+  //baseUrl: 'https://admin.bjzxtw.org.cn/zxtapi',//正式环境
+  //baseUrl: 'http://183.131.25.186:9501',//测试环境
+  //baseUrl: 'http://192.168.1.201:9501',//刘佳伟本地环境
+  baseUrl: 'http://192.168.1.127:9501',//刘剑的本地环境
+  //WebsocketUrl: 'ws://192.168.1.201:9506',//刘佳伟websocket地址
+  WebsocketUrl: 'ws://192.168.1.127:9506'//刘剑websocket地址
 }
 
-export default URL;
+export default URL;

src/utils/request.js

@@ -7,10 +7,7 @@ import URL from '@/utils/baseUrl';
 // create an axios instance
 const service = axios.create({
   //千万不能在这里使用绝对地址，这会导致webpack的devserve不生效
-  //baseURL: URL.testUrl, //刘佳伟的电脑
-  baseURL: URL.liuUrl, //刘剑的电脑
-  //baseURL: URL.baseUrl, //测试服务器
-  //baseURL: URL.servUrl, //正式服务器
+  baseURL: URL.baseUrl,
   //baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
   //withCredentials: true, // send cookies when cross-domain requests
   timeout: 50000 // request timeout

src/views/chat/contacts.vue

@@ -61,10 +61,8 @@
               <div class="searchFriendLineContent">通过账号添加</div>
             </div> -->
             <div class="searchFriendButton">
-              <el-button type="primary" v-if="searchFriendList.isfriend==0||searchFriendList.isfriend==null" @click="openAddWindow(searchFriendList.id)">添加到通讯录</el-button>
-              <el-button type="danger" v-else @click="deleteFriend(searchFriendList.id)">删除好友
-
-              </el-button>
+              <el-button type="primary" v-if="searchFriendList.showBtn==false" @click="openAddWindow(searchFriendList.id)">添加到通讯录</el-button>
+              <el-button type="danger" v-if="searchFriendList.showBtn==true" @click="deleteFriend(searchFriendList)">删除好友</el-button>
             </div>
             <!-- <div class="searchFriendButton">
               <div class="searchFriendButtonItem">
@@ -193,7 +191,7 @@
               <div>删除好友</div>
             </div> -->
             <el-button type="primary" icon="el-icon-s-promotion" @click="sendMessage(friendInfo)">发送消息</el-button>
-            <el-button type="danger" icon="el-icon-delete" @click="deleteFriend">删除好友</el-button>
+            <el-button type="danger" icon="el-icon-delete" @click="deleteFriend(friendInfo.friend_id)">删除好友</el-button>
           </div>
         </div>
       </div>
@@ -308,7 +306,7 @@ export default {
       //5.发送好友申请 start------------------------------------------------------------>
       addform:{
         //好友id
-        id:"",
+        friend_id:"",
         //好友申请
         remark:"",
       },
@@ -385,14 +383,15 @@ export default {
           if(res.data.length>0){
             this.searchWindowStatus = true;
             this.searchFriendList = res.data[0];
+            //搜出来以后查询两人是否为好友
+            this.searchIsFriend(this.searchFriendList)
+
           }else{
             this.$message.error('没有找到该联系人!')
           }
         }else{
           this.$message.error('搜索关键字不能为空!')
         }
-      }).catch(() => {
-        this.$message.error('网络错误!')
       })
     },
     //1.好友列表 end------------------------------------------------------------>
@@ -415,21 +414,27 @@ export default {
         if(res.code==200){
           this.$message.success('成功添加好友!')
           this.friendWindowStatus = false;
+          //重新加载用户列表
+          this.getUserFriendList();
+          //清空右侧
+          this.friendInfo = {};
+          this.pagestatus = 1;
         }
       })
     },
     //2.3 删除好友
     deleteFriend(id){
       if(id){
-        this.editFriendId = id;
+        this.editFriendId = String(id);
       }
+      console.log(id)
       this.$confirm('此操作将永久删除该联系人, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         console.log(this.editFriendId);
-        this.$store.dispatch('chat/delFriend',{id:editFriendId}).then(res=> {
+        this.$store.dispatch('chat/delFriend',{friend_id:this.editFriendId}).then(res=> {
           this.$message.success('删除成功!')
           //关闭用户详情显示
           this.pagestatus = 1;
@@ -463,11 +468,25 @@ export default {
     //2.5 发送好友申请
     addMyFriend(){
       console.log(this.addform);
-      this.$store.dispatch('chat/applyFriend',this.addform).then(res=> {
-        if(res.code==200){
-          this.$message.success('成功添加好友!')
-          this.friendWindowStatus = false;
+      this.$store.dispatch('chat/addFriend',this.addform).then(res=> {
+        this.$message.success(res.data)
+        this.addFriendWindowStatus = false;
+      })
+    },
+    //2.6 查询是否是好友
+    searchIsFriend(item){
+      let data = {
+        friend_id:item.isfriend
+      }
+      console.log(data);
+      this.$store.dispatch('chat/isFriend',data).then(res=>{
+        console.log(res);
+        if(res.code==0&&res.message=="不是好友"){
+          this.searchFriendList.showBtn = false;
+        }else{
+          this.searchFriendList.showBtn = true;
         }
+        this.$forceUpdate();
       })
     },
     //2.获得好友申请列表 end------------------------------------------------------------>
@@ -484,7 +503,8 @@ export default {
       this.editWindowStatus = true;
     },
     openAddWindow(id){
-      this.addform.id = id;
+      console.log(id);
+      this.addform.friend_id = String(id);
       this.addFriendWindowStatus = true;
     },
     //发送消息
@@ -493,7 +513,7 @@ export default {
       //带着friend_id跳转到hall页面
       this.$router.push({
         path:'/hall',
-        query:{friend_id:friendInfo.user_id}
+        query:{friend_id:friendInfo.friend_id}
       }); 
     },
     //3.操作弹出框 end------------------------------------------------------------>
@@ -504,6 +524,9 @@ export default {
     this.getUserFriendList();
     //2.获取好友申请列表
     this.getFriendApplyList();
+
+    //打印当前用户id
+    console.log("当前的用户id为：" + this.$store.state.user.userid);
   },
   beforeDestroy() {
     

src/views/complaint/complaintList.vue

@@ -176,7 +176,7 @@
             </template>
           </el-form-item>
           <el-form-item label="详细说明：" :label-width="formLabelWidth" prop="" class="custom-align-right">
-            <el-input type="textarea" v-model="form.describe" class="custom-textarea" disabled placeholder="请输入详细说明"></el-input>
+            <el-input type="textarea" v-model="form.describe" rows="8" class="custom-textarea" disabled placeholder="请输入详细说明"></el-input>
           </el-form-item>
           <el-form-item label="判决书：" :label-width="formLabelWidth" prop="" class="custom-align-right">
             <div v-if="form.judgment" @click="downloadFile(form.judgment)" class="complaintListdownloadBtn">

src/views/menu/menulist.vue

@@ -65,7 +65,7 @@
           <el-form-item label="父级菜单名称" :label-width="formLabelWidth" prop="pid_arr" class="custom-align-right" v-if="radio === '2'">
             <el-cascader :key="parentKey" v-model="form.pid_arr" :props="{checkStrictly:true}" :options="pidArrData" clearable></el-cascader>
           </el-form-item>
-          <el-form-item label="默认图标" :label-width="formLabelWidth" prop="icon" class="custom-align-right">
+          <el-form-item label="默认图标" :label-width="formLabelWidth" prop="icon" class="custom-align-right" v-if="radio == '1'">
              <!--图片上传组件 start ------------------------------------------------------------>
               <div class="uploaderBox">
                 <div class="avatar-upload-container" @mouseenter="hovering = true" @mouseleave="hovering = false">
@@ -88,7 +88,7 @@
               </div>
               <!--图片上传组件 end ------------------------------------------------------------>
           </el-form-item>
-          <el-form-item label="选中时图标" :label-width="formLabelWidth" prop="selected_icon" class="custom-align-right">
+          <el-form-item label="选中时图标" :label-width="formLabelWidth" prop="selected_icon" class="custom-align-right" v-if="radio == '1'">
             <!--图片上传组件 start ------------------------------------------------------------>
             <div class="uploaderBox">
               <div class="avatar-upload-container" @mouseenter="hoveringTwo = true" @mouseleave="hoveringTwo = false">

src/views/news/creatNews.vue

@@ -123,7 +123,7 @@
               <el-input v-model="form.hits" autocomplete="off" placeholder="请输入浏览量"></el-input>
             </el-form-item>
             <el-form-item label="是否为原创：" prop="is_original" class="custom-align-right">
-              <el-radio-group v-model="form.is_original">
+              <el-radio-group v-model="form.is_original" @change="changeIsOriginal">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
               </el-radio-group>
@@ -143,6 +143,12 @@
                 <div class="disclaimerText">本文来源于网络转载，仅供学习交流使用，不构成商业目的。版权归作者所有，如涉及原作者所有，如涉及作品内容、版权和其他问题，请在30日内与本站联系，我们将在第一时间处理。</div>
               </div>
             </div>
+            <div v-if="form.is_original==1">
+              <el-form-item label="来源链接：" prop="linkurl" class="custom-align-right">
+                <el-input v-model="form.linkurl" autocomplete="off" placeholder="请输入来源链接" disabled="disabled"></el-input>
+              </el-form-item>
+            </div>
+
             <el-form-item label="资讯状态：" class="custom-align-right" style="width: 100%;">
               <el-select v-model="form.status" placeholder="请选择..">
                 <el-option label="已发布" :value="1"></el-option>
@@ -454,9 +460,11 @@ export default {
         }else{  
           this.form.islink = false;
         }
+
         //不是原创的时候显示来源
         if(res.data.is_original==1){
           this.form.is_original = 1;
+          this.form.linkurl = "本网";
         }else{
           this.form.is_original = 0;
           this.$nextTick(() => {
@@ -468,8 +476,6 @@ export default {
           this.form.linkurl = res.data.linkurl;
         }
         
-
-
         // 回显导航池
         this.form.cat_arr_id = Array.isArray(res.data.cat_arr_id) ? res.data.cat_arr_id : JSON.parse(res.data.cat_arr_id);
         this.parentKey += 1; // 触发级联选择器重新加载
@@ -546,6 +552,14 @@ export default {
         }
       })
     },
+    //1.4 修改是否原创
+    changeIsOriginal(){
+      if(this.form.is_original==1){
+        this.form.linkurl = "本网";
+      }else{
+        this.form.linkurl = "";
+      }
+    },
     //跳转操作 end ------------------------------------------------------------>
 
     //4.富文本编辑器 start ------------------------------------------------------------>