add

src/components/LemonUI/components/index.vue

@@ -972,8 +972,10 @@ export default {
       // this.CacheMessageLoaded.remove(id);
       return true;
     },
-    topPopConversations(conversation) {  //置顶
-      this.removeConversations(conversation.conversationId);
+    topPopConversations(conversation,isNotDel) {  //置顶
+      if(!isNotDel){
+          this.removeConversations(conversation.conversationId);
+      }
       this.conversations.unshift(conversation);
     },
     /**
@@ -1029,8 +1031,8 @@ export default {
     findContact(contactId) {
       return this.getContacts().find(({ id }) => id == contactId);
     },
-    findConversations(conversationId) {
-      return this.getConversations().find(({ id }) => id == conversationId);
+    findConversations(currentContactId) {
+       return this.conversations.find(item =>  item.conversationId == currentContactId) || {};
     },
     /**
      * 返回所有联系人

src/views/qw/qwChat/qq.vue

@@ -588,18 +588,21 @@ export default {
 
     //发送消息
     handleSend(message, next, file) {
-      console.log(JSON.stringify(message));
+      const IMUI = this.$refs.IMUI;
       var params={};
+      console.log("qxj message:"+JSON.stringify(message));
       if(message.type=="text"){  //text   image   voice   video
           params={"conversationId":message.toContactId,"deviceId":this.qwUser.deviceId,"userId":this.qwUser.userId,"content":message.content};
           sendTextMsg(params).then(response => {
               if(response.code==200){
-                  var conversation=IMUI.findConversationIndexById(message.toContactId);
-                  IMUI.topPopConversations(conversation);
+                  var conversation=IMUI.findConversations(message.toContactId);
                   next();
+                  console.log("qxj conversation:"+JSON.stringify(conversation));
+                  IMUI.topPopConversations(conversation,true);
               }
           });
       }
+
       // setTimeout(() => {
       //   next();
       // }, 1000);

src/views/store/components/productOrder.vue

@@ -15,14 +15,14 @@
         <span  style="margin-left: 20px" class="color-danger">订单状态：
            <el-tag prop="status" v-for="(item, index) in statusOptions"    v-if="order.status==item.dictValue">{{item.dictLabel}}</el-tag>
         </span>
-       
+
         <div class="operate-button-container" >
           <el-button size="mini" @click="handleCertificates()"  v-hasPermi="['store:storeOrder:uploadCredentials']" >上传凭证</el-button>
           <el-button size="mini" @click="handleEditAddress()" v-if="order.status==0||order.status==1"  v-hasPermi="['store:storeOrder:editAddress']" >修改收货地址</el-button>
           <el-button size="mini" @click="handleBindCustomer()"  v-hasPermi="['store:storeOrder:bindCustomer']" >关联客户</el-button>
           <el-button size="mini" @click="editOrder()"  v-hasPermi="['store:storeOrder:edit']" >修改订单</el-button>
           <!-- <el-button size="mini" @click="handleEditUser()"  v-hasPermi="['users:user:edit']" >修改会员修改</el-button> -->
-          <el-button size="mini" v-if="order.customerId!=null&&order.customerId>0"  @click="handleCustomer()"    >查看客户详情</el-button>         
+          <el-button size="mini" v-if="order.customerId!=null&&order.customerId>0"  @click="handleCustomer()"    >查看客户详情</el-button>
         </div>
         <div class="operate-button-container"  v-hasPermi="['store:storeOrder:express']"  >
           <el-button size="mini" @click="showExpress()" >查看物流</el-button>
@@ -48,7 +48,7 @@
             </el-descriptions-item>
             <!-- <el-descriptions-item label="进线时间"  >
                 <span v-if="user!=null">
-                  {{user.registerDate}} 
+                  {{user.registerDate}}
                 </span>
             </el-descriptions-item>
             <el-descriptions-item label="推线编码"  >
@@ -56,7 +56,7 @@
                   {{user.registerCode}}
                 </span>
             </el-descriptions-item> -->
-             
+
             <el-descriptions-item label="收货人"  >
                 <span v-if="order!=null ">
                   {{order.realName }}
@@ -127,7 +127,7 @@
                   {{customerInfo.registerDate }}
                 </span>
             </el-descriptions-item>
-        
+
       </el-descriptions>
       <div style="margin: 20px 0px"  v-if="order!=null">
         <span class="font-small">
@@ -283,7 +283,7 @@
             <el-select filterable style="width: 200px" v-model="editForm.scheduleId" placeholder="请选择档期" clearable size="small" >
               <el-option
                       v-for="item in scheduleOptions"
-                      :key="item.id"  
+                      :key="item.id"
                       :label="item.name"
                       :value="item.id"
                     />
@@ -300,7 +300,7 @@
     <el-dialog :title="editUser.title" :visible.sync="editUser.open" width="600px" append-to-body>
       <el-form ref="editUserForm" :model="editUserForm" :rules="editUserRules" label-width="100px">
          <el-form-item label="进线时间" prop="registerDate">
-          <el-date-picker clearable size="small"  
+          <el-date-picker clearable size="small"
             v-model="editUserForm.registerDate"
             type="date"
             value-format="yyyy-MM-dd"
@@ -400,7 +400,7 @@
               <el-button type="primary" @click="searchCustomer">查看</el-button>
             </el-col>
           </el-row>
-          
+
         </el-form-item>
         <el-form-item label="客户选择"  prop="customerIds">
           <el-table   @selection-change="handleSelectionChange"
@@ -454,13 +454,14 @@ import {updateUser,getUser } from "@/api/users/user";
 import { getTcmScheduleList } from "@/api/company/tcmScheduleReport";
 import {getCustomerListBySearch } from "@/api/crm/customer";
 import ImageUpload from '@/components/ImageUpload'
+import Material from '@/components/Material'
 import {bindCustomer,getExpress, listStoreOrder, getStoreOrder, delStoreOrder, addStoreOrder, updateStoreOrder, exportStoreOrder,uploadCredentials } from "@/api/store/storeOrder";
 import {getAllList} from "@/api/store/city";
 import customerDetails from '../../crm/components/customerDetails.vue';
 export default {
   name: "order",
-  components: {customerDetails, 
-    ImageUpload },
+  components: {customerDetails,
+    ImageUpload,Material },
   data() {
     return {
       scheduleOptions:[],
@@ -513,7 +514,7 @@ export default {
       },
       editAddressForm:{
         districtId:null,
-        
+
       },
       editAddressRules:{
 
@@ -594,7 +595,7 @@ export default {
       }
       var data={mobile:this.bindCustomerForm.mobile};
       getCustomerListBySearch(data).then(response => {
-          this.customers=response.data;        
+          this.customers=response.data;
       });
     },
     handleBindCustomer() {
@@ -639,7 +640,7 @@ export default {
           if(this.express!=null&&this.express.Traces!=null){
               this.traces=this.express.Traces
           }
-          
+
       });
 
     },
@@ -658,8 +659,8 @@ export default {
       })
       console.log(item)
       this.editAddressForm.city=item.name;
- 
-        
+
+
     },
     provinceChange(val){
       this.city=this.citys.filter(item => item.parentId===val )
@@ -693,7 +694,7 @@ export default {
         var city=this.citys.find((item)=>{
           return item.name==address[1]&&item.level==1;
         })
-        
+
         if(city!=null){
           this.editAddressForm.cityId=city.cityId;
           this.district=this.citys.filter(item => item.parentId===city.cityId&&item.level==2 )
@@ -704,7 +705,7 @@ export default {
         if(district!=null){
           this.editAddressForm.districtId=district.cityId;
         }
-        
+
         this.editAddress.open = true;
     },
     /** 提交按钮 */
@@ -756,7 +757,7 @@ export default {
               this.getOrder(this.order.id);
             }
           });
-       
+
         }
       });
     },
@@ -768,7 +769,7 @@ export default {
           this.editForm.orderType=this.order.orderType.toString();
         }
         this.editForm.scheduleId=this.order.scheduleId;
-        
+
     },
     getOrder(orderId){
         this.orderId=orderId;
@@ -777,7 +778,7 @@ export default {
             this.order = response.order;
             if(response.order.certificates != null){
               this.certificates = response.order.certificates;
-            }  
+            }
             this.user = response.user;
             this.logs = response.logs;
             this.items = response.items;