IM功能

buyer/public/config.js

@@ -7,10 +7,6 @@ var BASE = {
     buyer: "https://buyer-api.pickmall.cn",
     seller: "https://store-api.pickmall.cn",
     manager: "https://admin-api.pickmall.cn"
-      // common: "http://192.168.0.105:8890",
-      // buyer: "http://192.168.0.105:8888",
-      // seller: "http://192.168.0.105:8889",
-      // manager: "http://192.168.0.105:8887"
   },
   API_PROD: {
     common: "https://common-api.pickmall.cn",

buyer/src/pages/GoodsDetail.vue

@@ -92,6 +92,17 @@ export default {
         "&skuId=" +
         this.goodsMsg.data.id
       );
+      // window.open(
+      //   'http://192.168.0.139:8000/' +
+      //   "?token=" +
+      //   accessToken +
+      //   "&id=" +
+      //   this.goodsMsg.data.storeId +
+      //   "&goodsId=" +
+      //   this.goodsMsg.data.goodsId +
+      //   "&skuId=" +
+      //   this.goodsMsg.data.id
+      // );
     },
     // 获取im信息
     async getIMDetailMethods () {

im/.env

@@ -3,5 +3,8 @@ VUE_APP_PREVIEW=false
 VUE_APP_API_BASE_URL=https://im-api.pickmall.cn
 VUE_APP_WEB_SOCKET_URL=wss://im-api.pickmall.cn/lili/webSocket
 VUE_APP_COMMON=https://common-api.pickmall.cn
+VUE_APP_BUYER=https://buyer-api.pickmall.cn
+VUE_APP_SELLER=https://seller-api.pickmall.cn
 VUE_APP_WEBSITE_NAME="LiLi IM"
-VUE_APP_PC_ORDER_URL=https://store-b2b2c.pickmall.cn
+VUE_APP_PC_URL=https://pc-b2b2c.pickmall.cn/
+VUE_APP_PC_STORE=https://store-b2b2c.pickmall.cn/

im/.env.development

@@ -1,7 +1,10 @@
 NODE_ENV=development
-VUE_APP_PREVIEW=true
+VUE_APP_PREVIEW=false
-VUE_APP_API_BASE_URL=http://192.168.0.113:8885
+VUE_APP_API_BASE_URL=https://im-api.pickmall.cn
-VUE_APP_WEB_SOCKET_URL=ws://192.168.0.113:8885/lili/webSocket
+VUE_APP_WEB_SOCKET_URL=wss://im-api.pickmall.cn/lili/webSocket
-VUE_APP_COMMON=http://192.168.0.113:8890
+VUE_APP_COMMON=https://common-api.pickmall.cn
-VUE_APP_PC_URL="http://192.168.0.113:10001"
+VUE_APP_BUYER=https://buyer-api.pickmall.cn
+VUE_APP_SELLER=https://seller-api.pickmall.cn
 VUE_APP_WEBSITE_NAME="LiLi IM"
+VUE_APP_PC_URL=https://pc-b2b2c.pickmall.cn/
+VUE_APP_PC_STORE=https://store-b2b2c.pickmall.cn/

im/src/api/user.js

@@ -1,30 +1,47 @@
 import { get } from "@/utils/request";
+import config from "@/config/config";
 
 // 获取用户相关设置信息
 export const ServeGetUserSetting = () => {
-  return get("/im/user");
+  return get(`${config.BASE_BUYER}/buyer/passport/member`);
 };
 
 // 获取店铺相关设置信息
 export const ServeGetStoreSetting = () => {
-  return get("/im/user/store");
+  return get(`${config.BASE_SELLER}/store/member/user`);
 };
 
 // 获取用户相关设置信息
 export const ServeGetUserDetail = (memberId) => {
-  return get(`/im/user/${memberId}`);
+  return get(`${config.BASE_SELLER}/store/passport/member/${memberId}`);
 };
 
 // 获取店铺相关设置信息
 export const ServeGetStoreDetail = (storeId) => {
-  return get(`/im/user/store/${storeId}`);
+  return get(`${config.BASE_BUYER}/buyer/store/store/store/${storeId}`);
 };
 
-// 获取店铺相关设置信息
+// 获取用户历史足迹
 export const ServeGetFootPrint = (params) => {
-  return get(`/im/user/history`,params);
+  return get(`${config.BASE_BUYER}/buyer/member/footprint`,params);
 };
-// 获取订单列表信息
+
+// 商家获取用户历史足迹
+export const ServeStoreGetFootPrint = (params) => {
+  return get(`${config.BASE_SELLER}/store/member/footprint`,params);
+};
+
+// 获取用户订单列表信息
 export const ServeGetOrderPrint = (params) => {
-  return get(`/im/orders/orders`,params);
+  return get(`${config.BASE_BUYER}/buyer/order/order`,params);
+};
+
+// 商家获取用户订单列表信息
+export const ServeStoreGetOrderPrint = (params) => {
+  return get(`${config.BASE_SELLER}/store/order/order`,params);
+};
+
+// 获取商品信息
+export const ServeGetGoodsDetail = (data) => {
+  return get(`${config.BASE_BUYER}/buyer/goods/goods/sku/${data.goodsId}/${data.skuId}`);
 };

im/src/components/chat/messaege/TextMessage.vue

@@ -1,12 +1,9 @@
 <template>
-  <div
+  <div class="text-message" :class="{
-    class="text-message"
-    :class="{
     left: float == 'left',
     right: float == 'right',
     'max-width': !fullWidth,
-    }"
+  }">
-  >
     <div v-if="arrow" class="arrow"></div>
     <pre v-html="html" />
   </div>

im/src/components/chat/panel/OtherLink.vue

@@ -1,7 +1,7 @@
 <template>
   <el-tabs v-model="activeName" @tab-click="handleClick" type="card" :stretch=true>
     <el-tab-pane :label="toUser.storeFlag ? '正在咨询' : '他的足迹'" name="history">
-      <div style="margin-left: 12px;" v-if="toUser.storeFlag">
+      <div style="margin-left: 12px;">
         <GoodsLink :goodsDetail="goodsDetail" v-if="toUser.userId === goodsDetail.storeId"
           @sendMessage="submitSendMessage" />
         <FootPrint :list="footPrintList" @loadMore="loadMoreFootPrint()" :orderList="orderPrintList"
@@ -18,8 +18,7 @@
 
 <script>
 import { Tabs, TabPane } from 'element-ui'
-import { ServeGetStoreDetail, ServeGetUserDetail, ServeGetFootPrint, ServeGetOrderPrint } from '@/api/user'
+import { ServeGetStoreDetail, ServeGetUserDetail, ServeGetFootPrint, ServeGetOrderPrint, ServeGetGoodsDetail, ServeStoreGetFootPrint,ServeStoreGetOrderPrint } from '@/api/user'
-import { ServeGetGoodsDetail } from '@/api/goods'
 import StoreDetail from "@/components/chat/panel/template/storeDetail.vue";
 import FootPrint from "@/components/chat/panel/template/footPrint.vue";
 import GoodsLink from "@/components/chat/panel/template/goodsLink.vue";
@@ -53,6 +52,23 @@ export default {
       index_name: (state) => state.dialogue.index_name,
     }),
   },
+  watch:{
+    toUser(){
+      localStorage.setItem('storeFlag', this.toUser.storeFlag)
+      this.footPrintList = []
+      this.orderPrintList = []
+      if (this.toUser.storeFlag) {
+        this.getStoreDetail()
+      } 
+      // else {
+      //   this.getMemberDetail()
+      // }
+      this.getFootPrint()
+      if (this.goodsParams && this.toUser.storeFlag == true) {
+        this.getGoodsDetail()
+      }
+    }
+  },
   data () {
     return {
       activeName: 'history',
@@ -70,13 +86,15 @@ export default {
     }
   },
   mounted () {
+    localStorage.setItem('storeFlag', this.toUser.storeFlag)
     if (this.toUser.storeFlag) {
       this.getStoreDetail()
-    } else {
-      this.getMemberDetail()
     } 
+    // else {
+    //   this.getMemberDetail()
+    // }
     this.getFootPrint()
-    if (this.goodsParams) {
+    if (this.goodsParams && this.toUser.storeFlag == true) {
       this.getGoodsDetail()
     }
   },
@@ -94,28 +112,26 @@ export default {
       this.getFootPrint()
     },
     handleClick () { },
-    getMemberDetail () {
+    // getMemberDetail () {
-      ServeGetUserDetail(this.toUser.userId).then(res => {
+    //   ServeGetUserDetail(this.toUser.userId).then(res => {
-        if (res.success) {
+    //     if (res.success) {
-          this.memberInfo = res.result
+    //       this.memberInfo = res.result
-        }
+    //     }
-      })
+    //   })
-    },
+    // },
     getGoodsDetail () {
+      if(this.toUser.storeFlag){
         ServeGetGoodsDetail(this.goodsParams).then(res => {
           if (res.success) {
             this.goodsDetail = res.result.data
           }
         })
+      }
     },
     getFootPrint() {
       if (this.toUser.storeFlag) {
         this.footPrintParams.memberId = this.id
         this.footPrintParams.storeId = this.toUser.userId
-      } else {
-        this.footPrintParams.memberId = this.toUser.userId
-        this.footPrintParams.storeId = this.id
-      }
         ServeGetFootPrint(this.footPrintParams).then(res => {
           res.result.records.forEach((item, index) => {
             if (localStorage.getItem(item.goodsId)) {
@@ -129,6 +145,7 @@ export default {
           });
           this.footPrintList.push(...res.result.records)
         })
+
         // 订单列表
         ServeGetOrderPrint(this.footPrintParams).then((res) => {
           if (res.code == 200) {
@@ -138,9 +155,35 @@ export default {
                 btnHide: 1
               })
             })
-          // this.orderPrintList.push(...res.result.records)
           }
         })
+      } else {
+        this.footPrintParams.memberId = this.toUser.userId
+        this.footPrintParams.storeId = this.id
+        ServeStoreGetFootPrint(this.footPrintParams).then(res => {
+          res.result.records.forEach((item, index) => {
+            if (localStorage.getItem(item.goodsId)) {
+              item.btnHide = 0
+            } else {
+              item.btnHide = 1
+            }
+            if (item.goodsId === this.goodsParams.goodsId) {
+              res.result.records.splice(index, 1)
+            }
+          });
+          this.footPrintList.push(...res.result.records)
+        })
+        ServeStoreGetOrderPrint(this.footPrintParams).then((res) => {
+          if (res.code == 200) {
+            res.result.records.forEach((item) => {
+              this.orderPrintList.push({
+                ...item,
+                btnHide: 1
+              })
+            })
+          }
+        })
+      }
     },
 
     // 发送消息回调事件

im/src/components/chat/panel/TalkPanel.vue

@@ -59,16 +59,17 @@
                     {{ unixToDate(item.createTime, "MM月dd日 hh:mm") }}
                   </span>
                   <!-- 文本消息 -->
-                  <div v-if="item.messageType == 'MESSAGE'" class="text-message" :class="{
+                  <div v-if="item.messageType == 'MESSAGE'" style="background-color: #d0e9ff;color: black;"
+                    class="text-message" :class="{
                       left: item.float == 'left',
                       right: item.float == 'right',
                     }">
                     <div class="arrow"></div>
-
+                    <pre v-if="!emojistwo.includes(item.text)" v-html="item.text" />
-                    <pre v-html="item.text" />
+                    <pre v-if="emojistwo.includes(item.text)" v-html="textReplaceEmoji(item.text)" />
                   </div>
 
-                  <div v-if="item.messageType == 'GOODS' && item.text != null" class="text-message" :class="{
+                  <div v-if="item.messageType == 'GOODS' && item.text != null" class="goodsStyle " :class="{
                     left: item.float == 'left',
                     right: item.float == 'right',
                   }">
@@ -76,31 +77,45 @@
                       <div>
                         <img :src="item.text.thumbnail" class="image" />
                       </div>
-                      <div style="margin-left: 13px">
-                        <a> {{ item.text.goodsName }} </a>
                       <div>
-                          <span style="color: red;">￥{{ item.text.price }}</span>
+                        <div class="goods_name">
+                          <el-tooltip class="item" effect="dark" :content="item.text.goodsName" placement="top-start">
+                            <a> {{ item.text.goodsName }} </a>
+                          </el-tooltip>
+                        </div>
+                        <div class="price">
+                          <span>￥{{ item.text.price }}</span>
                         </div>
                       </div>
                     </div>
                   </div>
-                  <div v-if="item.messageType == 'ORDER' && item.text != null" class="text-message" :class="{
+                  <div v-if="item.messageType == 'ORDER' && item.text != null" class="oderStyle" :class="{
                     left: item.float == 'left',
                     right: item.float == 'right',
                   }">
+                    <div class="oedersn">
+                      <el-tooltip class="item" effect="dark" :content="item.text.sn" placement="top-start">
                         <a> 订单号:{{ item.text.sn }} </a>
+                      </el-tooltip>
+                    </div>
                     <div class="baseTwo">
                       <img :src="item.text.groupImages" style="height: 100px;width: 100px;margin-top: 10px;" />
                       <span class="orderGoodsName" @click="linkToOrders(item.text.sn)">{{ item.text.groupName }}</span>
                       <span class="orderGoodsTime">{{ item.text.paymentTime }}</span>
+                      <span class="orderFlowPrice">
+                        订单金额：￥{{ item.text.flowPrice }}
+                      </span>
+                      <span class="order_status"
+                        :style="{ 'color': item.text.orderStatus == 'CANCELLED' || item.text.orderStatus == 'UNPAID' || item.text.orderStatus == ' TAKE' ? '#5a606b' : '#f23030' }">{{
+                          item.text.orderStatus == 'CANCELLED' ? '已取消' : item.text.orderStatus == 'UNPAID' ? '未付款' :
+                            item.text.orderStatus ==
+                              'PAID' ? '已付款' : item.text.orderStatus == 'UNDELIVERED' ? '待发货' : item.text.orderStatus ==
+                                'DELIVERED'
+                                ? '已发货' : item.text.orderStatus == ' COMPLETED' ? '已完成' : item.text.orderStatus == ' TAKE' ?
+                                  '待校验' : ''
+                        }}</span>
                     </div>
                   </div>
-                  <!-- 图片消息 -->
-                  <!-- <image-message
-                    v-else-if="item.messageType == 2 && item.file.file_type == 1"
-                    :src="item.file.file_url"
-                    @contextmenu.native="onCopy(idx, item, $event)"
-                  /> -->
                 </div>
               </main>
             </div>
@@ -161,7 +176,7 @@
 </template>
 <script>
 import { textReplaceLink } from "@/utils/functions";
-import { textReplaceEmoji } from "@/utils/emojis";
+import { textReplaceEmoji, emojistwo } from "@/utils/emojis";
 import OtherLink from "@/components/chat/panel/OtherLink.vue";
 import { mapState, mapGetters } from "vuex";
 import TalkSearchRecord from "@/components/chat/TalkSearchRecord";
@@ -218,6 +233,7 @@ export default {
     return {
       // 记录加载相关参数
       textReplaceEmoji,
+      emojistwo,
       textReplaceLink,
       loadRecord: {
         status: 0,
@@ -277,6 +293,7 @@ export default {
         mode: 0,
       };
       this.loadChatRecords();
+      
     },
   },
   mounted () {
@@ -372,7 +389,6 @@ export default {
 
     // 回车键发送消息回调事件
     submitSendMessage (content) {
-      console.log("发送", content);
       const record = {
         operation_type: "MESSAGE",
         to: this.params.receiver_id,
@@ -381,6 +397,9 @@ export default {
         context: content,
         talk_id: this.params.talkId,
       };
+      // if (record.messageType == 'MESSAGE"') {
+      //   record.text = this.textReplaceEmoji(record.content)
+      // }
       SocketInstance.emit("event_talk", record);
 
       this.$store.commit("UPDATE_TALK_ITEM", {
@@ -400,8 +419,6 @@ export default {
         text: content,
         float: "right",
       };
-
-      console.log("insterChat", insterChat);
       // console.log("插入对话记录",'')
       // 插入对话记录
       this.$store.commit("PUSH_DIALOGUE", insterChat);
@@ -457,7 +474,6 @@ export default {
 
     // 加载用户聊天详情信息
     loadChatRecords () {
-      console.log(this.records.length, 'this.records.length ')
       if (this.loadRecord.pageNumber === 0 || this.params.clickFlag) {
         this.loadRecord.pageNumber = 1
         this.params.clickFlag = false
@@ -486,6 +502,9 @@ export default {
           if (item.messageType == 'GOODS') {
             item.text = JSON.parse(item.text)
           }
+          // if (item.messageType == 'MESSAGE"') {
+          //   item.text = this.textReplaceEmoji(item.text)
+          // }
           if (item.messageType == 'ORDER') {
             item.text = JSON.parse(item.text)
           }
@@ -496,7 +515,8 @@ export default {
           ? (this.loadRecord.status = 1)
           : (this.loadRecord.status = 2);
         this.$nextTick(() => {
-          if (data.record_id == 0 || !data.record_id) {
+          // if (data.record_id == 0 || !data.record_id) {
+          if (data.record_id == 0 || data.pageNumber == 1) {
             el.scrollTop = el.scrollHeight
           } else {
             el.scrollTop = el.scrollHeight - scrollHeight
@@ -820,6 +840,67 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+.order_status {
+  height: 30px;
+  width: 60px;
+  background: #ffeded;
+  margin-right: 20px;
+  text-align: center;
+  line-height: 25px;
+  margin-left: 15px;
+  border-radius: 10px;
+}
+
+.oderStyle {
+  border: 1px solid #f2f2f2;
+  width: 330px;
+  border-radius: 4px;
+
+  .oedersn {
+    margin: 10px 0 10px 5px;
+    width: 300px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+.goodsStyle {
+  border: 1px solid #f2f2f2;
+  width: 300px;
+  height: 120px;
+  display: flex;
+  border-radius: 4px;
+
+  .goods_name {
+    color: black;
+    width: 150px;
+    font-size: 15px;
+    color: #333333;
+    margin-top: 30px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .image {
+    height: 70px;
+    margin-top: 3px;
+    width: 70px;
+    background-size: cover;
+    margin: 20px;
+  }
+
+  .price {
+    color: #999;
+    margin-top: 20px;
+  }
+
+  .base {
+    display: flex;
+  }
+}
+
 .orderSn {
   overflow: hidden;
   text-overflow: ellipsis;
@@ -830,7 +911,7 @@ export default {
   width: 200px;
   overflow: hidden;
   text-overflow: ellipsis;
-  white-space: nowrap;
+  // white-space: nowrap;
   position: absolute;
   margin-top: 10px;
   margin-left: 10px;
@@ -838,9 +919,14 @@ export default {
 
 .orderGoodsTime {
   margin-left: 10px;
-  color: red;
+  color: #999;
   position: absolute;
-  margin-top: 35px;
+  margin-top: 70px;
+}
+
+.orderFlowPrice {
+  color: #999;
+  margin-bottom: 20px;
 }
 
 .main-box {
@@ -904,26 +990,26 @@ export default {
 }
 
 
-.base {
+// .base {
-  margin-top: 5px;
+//   margin-top: 5px;
-  height: 120px;
+//   height: 120px;
-  display: flex;
+//   display: flex;
 
-  div {
+//   div {
-    width: 100px;
+//     width: 100px;
-    overflow: hidden;
+//     // overflow: hidden;
-    text-overflow: ellipsis;
+//     // text-overflow: ellipsis;
-    margin-top: 8px;
+//     margin-top: 8px;
-    white-space: nowrap;
+//     // white-space: nowrap;
-  }
+//   }
 
-  .image {
+//   .image {
-    height: 100px;
+//     height: 100px;
-    margin-top: 3px;
+//     margin-top: 3px;
-    width: 100px
+//     width: 100px
-  }
+//   }
 
-}
+// }
 
 .talk-bubble {
   position: absolute;
@@ -1101,7 +1187,7 @@ export default {
 }
 
 @bg-left-color: #f5f5f5;
-@bg-right-color: #1ebafc;
+@bg-right-color: #ffffff;
 
 .text-message {
   position: relative;

im/src/components/chat/panel/template/footPrint.vue

@@ -7,37 +7,60 @@
             <dd v-for="item in list" v-infinite-scroll="loadMore">
               <div class="base">
                 <div>
-                  <img :src="item.thumbnail" class="image" />
+                  <img style="width: 60px; height: 60px;margin-left: 40px;box-sizing: border-box;" :src="item.thumbnail"
+                    class="image" />
                 </div>
-                <div style="margin-left: 13px">
+                <div class="recent_views">
+                  <el-tooltip class="item" effect="dark" :content="item.goodsName" placement="top-start">
                     <a class="goods_name" @click="linkToGoods(item.goodsId, item.id)">{{ item.goodsName }}</a>
-                  <div style="margin-top: 8px;">
+                  </el-tooltip>
+
+                  <div style="display: flex;">
+                    <div style="margin-top: 20px;">
                       <span style="color: red;">￥{{ item.price }}</span>
-                  </div>
+                      <div class="goods_store_button">
-                  <div>
+                        <el-button type="danger" v-if="item.btnHide == 1 && toUser.storeFlag" size="mini"
-                    <el-button class="store-button" type="danger" v-if="item.btnHide == 1" size="mini"
                           @click="submitSendGoodsMessage(item)" plain>发送</el-button>
                       </div>
                     </div>
                   </div>
+                </div>
+
+              </div>
+              <div class="Underline"></div>
             </dd>
+
           </dl>
         </el-tab-pane>
         <el-tab-pane label="订单列表" name="orders">
           <dl>
             <dd v-for="(item, index) in orderList" v-infinite-scroll="loadMore" :key="index">
-              <div style="margin-bottom: 20px;">
+              <div class="orderlist">
-                <span class="orderSn">订单号：{{ item.sn }}</span>
+                <div class="order_top">
-                <img :src="item.groupImages" alt=""
+                  <span class="order_sn">订单号:{{ item.sn }}</span>
-                  style="height: 100px; width: 100px;margin-top: 10px; vertical-align: middle; ">
-                <span class="orderGoodsName" @click="linkToOrders(item.sn)"> {{ item.groupName }}</span>
-                <span style="margin-left: 10px; color: red;">{{ item.paymentTime }}</span>
-                <div class="orderBtn">
-                  <el-button type="danger" class="store-button" v-if="item.btnHide == 1" size="mini"
-                    @click="submitSendOrderMessage(item, index)" plain>发送</el-button>
                 </div>
+                <div class="order_section">
+                  <img :src="item.groupImages" alt="">
+                  <el-tooltip class="item" effect="dark" :content="item.groupName" placement="top-start">
+                    <span class="orderGoodsName" @click="linkToOrders(item.sn)"> {{ item.groupName }}</span>
+                  </el-tooltip>
+                  <div class="orderBtn">
+                    <el-button type="danger" class="store-button" v-if="item.btnHide == 1 && toUser.storeFlag"
+                      size="mini" @click="submitSendOrderMessage(item, index)" plain>发送</el-button>
+                  </div>
+                </div>
+                <div class="order_footer">
+                  <span> 订单金额： <span style="color: red;">￥{{ item.orderItems[0].goodsPrice }}</span></span>
+                  <span class="order_status" v-if="item.orderStatus"
+                    :style="{ 'color': item.orderStatus == 'CANCELLED' || item.orderStatus == 'UNPAID' || item.orderStatus == 'TAKE' ? '#5a606b' : '#f23030' }">{{
+  item.orderStatus == 'CANCELLED' ? '已取消' : item.orderStatus == 'UNPAID' ? '未付款' : item.orderStatus ==
+    'PAID' ? '已付款' : item.orderStatus == 'UNDELIVERED' ? '待发货' : item.orderStatus == 'DELIVERED'
+      ? '已发货' : item.orderStatus == 'COMPLETED' ? '已完成' : item.orderStatus == 'TAKE' ? '待校验' : ''
+                    }}</span>
                 </div>
 
+              </div>
+              <div class="Underline"></div>
             </dd>
           </dl>
         </el-tab-pane>
@@ -64,7 +87,6 @@ export default {
     ...mapGetters(["talkItems"]),
     ...mapState({
       id: (state) => state.user.id,
-
       toUser: (state) => state.user.toUser,
     }),
   },
@@ -109,11 +131,14 @@ export default {
     },
     // 发送订单列表
     submitSendOrderMessage(item, index) {
+      console.log(item, 'item');
       const context = {
         sn: item.sn,
         groupImages: item.groupImages,
         paymentTime: item.paymentTime,
         groupName: item.groupName,
+        flowPrice: item.flowPrice,
+        orderStatus: item.orderStatus
       }
       const record = {
         operation_type: "MESSAGE",
@@ -139,10 +164,11 @@ export default {
     orderList: {
       type: Array,
       default: []
-    }
+    },
   },
   mounted() {
-    console.log(this.orderList, 'orderList');
+    //  state.user.toUser
+    console.log(this.orderList, '  this.$store.state.user.toUser  this.$store.state.user.toUser  this.$store.state.user.toUser');
     this.btnHide = localStorage.getItem('btnHide')
   }
 }
@@ -150,6 +176,94 @@ export default {
 </script>
 
 <style scoped lang="less">
+.order_status {
+  height: 25px;
+  width: 60px;
+  background: #ffeded;
+  margin-right: 20px;
+  text-align: center;
+  line-height: 25px;
+}
+
+.Underline {
+  border: 1px solid silver;
+  width: 90%;
+  margin: 0 auto;
+}
+
+.recent_views {
+  margin-left: 13px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  width: 260px;
+}
+
+.box {
+  width: 400px;
+
+  .top {
+    text-align: center;
+  }
+
+  .left {
+    float: left;
+    width: 60px;
+  }
+
+  .right {
+    float: right;
+    width: 60px;
+  }
+
+  .bottom {
+    clear: both;
+    text-align: center;
+  }
+
+  .item {
+    margin: 4px;
+  }
+
+  .left .el-tooltip__popper,
+  .right .el-tooltip__popper {
+    padding: 8px 10px;
+  }
+}
+
+.Underline {
+  // border: 5px solid red;
+}
+
+.orderlist {
+  margin-bottom: 10px;
+  background: #fff;
+  color: #5a606b;
+}
+
+.order_top {
+  border-bottom: 1px solid #f2f2f2;
+
+  .order_sn {}
+}
+
+.order_section {
+  border-bottom: 1px solid #f2f2f2;
+  height: 100px;
+
+  img {
+    width: 80px;
+    height: 80px;
+    margin-top: 20px;
+  }
+}
+
+.order_footer {
+  border-bottom: 1px solid #f2f2f2;
+  display: flex;
+  justify-content: space-between;
+}
+
 .orderGoodsName {
   width: 200px;
   overflow: hidden;
@@ -158,6 +272,7 @@ export default {
   position: absolute;
   margin-left: 10px;
   margin-top: 10px;
+  font-weight: 500;
 }
 
 .orderSn {
@@ -171,18 +286,13 @@ export default {
   justify-content: flex-end;
   margin-right: 15px;
   position: relative;
-  bottom: 30px;
+  bottom: 55px;
 }
 
 .goods_name {
-  text-overflow: -o-ellipsis-lastline;
   overflow: hidden;
   text-overflow: ellipsis;
-  display: -webkit-box;
+  white-space: nowrap
-  -webkit-line-clamp: 2;
-  line-clamp: 2;
-  -webkit-box-orient: vertical;
-
 }
 
 /deep/ .el-tabs__item.is-top:last-child {
@@ -215,9 +325,17 @@ export default {
   margin-top: 10px;
 }
 
+.goods_store_button {
+  display: inline;
+  background-color: white;
+  border-color: #F56C6C;
+  position: absolute;
+  left: 70%;
+}
+
 .base {
   margin-top: 5px;
-  height: 120px;
+  height: 80px;
   display: flex;
 
   .price {

im/src/components/chat/panel/template/goodsLink.vue

@@ -11,7 +11,7 @@
           <span style="color: red;">￥{{ goodsDetail.price }}</span>
         </div>
         <div v-if="hide">
-          <el-button class="store-button" type="danger" v-if="!sendFlag && btnHide == 1" size="mini"
+          <el-button class="store-button" type="danger" v-if="btnHide == 1 && toUser.storeFlag" size="mini"
             @click="submitSendMessage()" plain>发送</el-button>
         </div>
       </div>
@@ -27,7 +27,6 @@ import SocketInstance from "@/im-server/socket-instance";
 export default {
   data () {
     return {
-      sendFlag: false,
       btnHide: undefined,
       hide: true
     }
@@ -169,7 +168,7 @@ export default {
   .image {
     height: 100px;
     margin-top: 3px;
-    width: 100px
+    width: 100px;
   }
 
 }

im/src/components/chat/panel/template/storeDetail.vue

@@ -6,11 +6,11 @@
       </div>
       <div style="margin-left: 13px">
         <div class="div-zoom">
-          {{ storeInfo.storeName }}
+          <span class="title_left_name"> 店铺名称：</span> <span class="title_right_name">{{ storeInfo.storeName }}</span>
-          <el-tag type="danger" v-if="storeInfo.selfOperated" size="mini">自营</el-tag>
+          <el-tag style="margin-left: 10px;" type="danger" v-if="storeInfo.selfOperated" size="mini">自营</el-tag>
         </div>
         <div>
-          联系方式: {{ storeInfo.memberName }}
+          <span class="title_left_name"> 联系方式:</span> <span class="title_right_name">{{ storeInfo.memberName }}</span>
         </div>
         <div>
           <el-button class="store-button" type="danger" @click="linkToStore(storeInfo.id)" size="mini"
@@ -19,22 +19,32 @@
       </div>
     </div>
     <hr class="separate" />
-    <div class="separate">店铺评分: <span>{{ storeInfo.serviceScore }}</span></div>
+
-    <div class="separate">服务评分: <span>{{ storeInfo.descriptionScore }}</span></div>
+    <div class="separate">店铺评分: <el-rate v-model="storeInfo.serviceScore" disabled show-score text-color="#ff9900"
-    <div class="separate">物流评分: <span>{{ storeInfo.deliveryScore }}</span></div>
+        score-template="{value}">
+      </el-rate></div>
+    <div class="separate">服务评分: <el-rate v-model="storeInfo.descriptionScore" disabled show-score text-color="#ff9900"
+        score-template="{value}">
+      </el-rate></div>
+    <div class="separate">物流评分: <el-rate v-model="storeInfo.deliveryScore" disabled show-score text-color="#ff9900"
+        score-template="{value}">
+      </el-rate></div>
   </div>
 </template>
 
 <script>
-import { Tag, button } from 'element-ui'
+import { Tag, button, rate } from 'element-ui'
 export default {
   data () {
     return {
+      value: null,
+      colors: ['#99A9BF', '#F7BA2A', '#FF9900']
     }
   },
   components: {
     "el-tag": Tag,
     "el-button": button,
+    "el-rate": rate
   },
   methods: {
   },
@@ -49,6 +59,16 @@ export default {
 </script>
 
 <style scoped lang="less">
+.title_left_name {
+  font-size: 12px;
+  color: #a1a6af;
+}
+
+.title_right_name {
+  font-size: 12px;
+  color: #343036;
+}
+
 .store-button {
   background-color: white;
   border-color: #F56C6C;
@@ -73,5 +93,9 @@ export default {
 
 .separate {
   margin-top: 8px;
+  // display: inline;
+  display: flex;
+  font-size: 12px;
+  color: #a1a6af;
 }
 </style>

im/src/components/editor/MeEditor.vue

@@ -59,73 +59,40 @@
           <!--          </p>-->
         </ul>
 
-        <el-popover
+        <el-popover ref="popoverEmoticon" placement="top-start" trigger="click" width="300"
-          ref="popoverEmoticon"
+          popper-class="no-padding el-popover-em">
-          placement="top-start"
-          trigger="click"
-          width="300"
-          popper-class="no-padding el-popover-em"
-        >
           <MeEditorEmoticon ref="editorEmoticon" @selected="selecteEmoticon" />
         </el-popover>
 
-        <form
+        <form enctype="multipart/form-data" style="display: none" ref="fileFrom">
-          enctype="multipart/form-data"
+          <input type="file" ref="restFile" accept="image/*" @change="uploadImageChange" />
-          style="display: none"
-          ref="fileFrom"
-        >
-          <input
-            type="file"
-            ref="restFile"
-            accept="image/*"
-            @change="uploadImageChange"
-          />
           <input type="file" ref="restFile2" @change="uploadFileChange" />
         </form>
       </el-header>
       <el-main class="no-padding textarea">
-        <textarea
+        <textarea ref="textarea" v-paste="pasteImage" v-drag="dragPasteImage" v-model.trim="editorText" rows="6"
-          ref="textarea"
+          placeholder="你想要的聊点什么呢 ..." @keydown="keydownEvent($event)" @input="inputEvent($event)" />
-          v-paste="pasteImage"
-          v-drag="dragPasteImage"
-          v-model.trim="editorText"
-          rows="6"
-          placeholder="你想要的聊点什么呢 ..."
-          @keydown="keydownEvent($event)"
-          @input="inputEvent($event)"
-        />
       </el-main>
     </el-container>
 
     <!-- 图片查看器 -->
-    <MeEditorImageView
+    <MeEditorImageView ref="imageViewer" v-model="imageViewer.isShow" :file="imageViewer.file"
-      ref="imageViewer"
+      @confirm="confirmUploadImage" />
-      v-model="imageViewer.isShow"
-      :file="imageViewer.file"
-      @confirm="confirmUploadImage"
-    />
 
     <MeEditorRecorder v-if="recorder" @close="recorder = false" />
 
     <!-- 代码块编辑器 -->
-    <TalkCodeBlock
+    <TalkCodeBlock v-if="codeBlock.isShow" :edit-mode="codeBlock.editMode" @close="codeBlock.isShow = false"
-      v-if="codeBlock.isShow"
+      @confirm="confirmCodeBlock" />
-      :edit-mode="codeBlock.editMode"
-      @close="codeBlock.isShow = false"
-      @confirm="confirmCodeBlock"
-    />
 
     <!-- 文件上传管理器 -->
     <MeEditorFileManage ref="filesManager" v-model="filesManager.isShow" />
 
-    <MeEditorVote
+    <MeEditorVote v-if="vote.isShow" @close="
-      v-if="vote.isShow"
-      @close="
       () => {
         this.vote.isShow = false;
       }
-      "
+    " />
-    />
   </div>
 </template>
 

im/src/components/layout/WelcomeModule.vue

@@ -2,7 +2,6 @@
   <div class="welcome-box">
     <div class="famous-box">
       <img src="~@/assets/image/chat.png" width="300" />
-     
     </div>
   </div>
 </template>

im/src/config/config.js

@@ -3,6 +3,8 @@ export default {
   BASE_API_URL: process.env.VUE_APP_API_BASE_URL || "",
   BASE_WS_URL: process.env.VUE_APP_WEB_SOCKET_URL || "",
   BASE_COMMON: process.env.VUE_APP_COMMON || "",
-  PC_URL: process.env.VUE_APP_PC_URL || "",
+  BASE_BUYER: process.env.VUE_APP_BUYER || "",
-  STORE_URL:process.env.VUE_APP_PC_ORDER_URL || "http://192.168.0.139:10002",
+  BASE_SELLER: process.env.VUE_APP_SELLER || "",
+  PC_URL: process.env.VUE_APP_PC_URL || "https://pc-b2b2c.pickmall.cn",
+  PC_STORE: process.env.VUE_APP_PC_STORE || 'https://store-b2b2c.pickmall.cn',
 };

im/src/im-server/event/talk.js

@@ -100,6 +100,9 @@ class Talk extends Base {
       case 'GOODS':
         text = "[商品链接]";
         break;
+      case 'ORDERS':
+        text = "[订单链接]";
+        break;
     }
 
     return text;

im/src/main.js

@@ -25,17 +25,27 @@ Vue.component('face', face)
 Vue.component('face-null', faceNull)
 
 Vue.prototype.linkToGoods = function (goodsId, skuId) {  // 跳转买家端商品
-  console.log(`${config.PC_URL}/goodsDetail?skuId=${skuId}&goodsId=${goodsId}`)
+  if (localStorage.getItem('storeFlag') == 'false') {
+    window.open(`${config.PC_STORE}goods-operation-edit?id=${goodsId}`, '_blank')
+  } else {
     window.open(`${config.PC_URL}/goodsDetail?skuId=${skuId}&goodsId=${goodsId}`, '_blank')
+  }
 };
-Vue.prototype.linkToStore = function (storeId) {  // 跳转买家端商品
+Vue.prototype.linkToStore = function (storeId) {  // 跳转商家端商品
   console.log(`${config.PC_URL}/Merchant?id=${storeId}`)
   window.open(`${config.PC_URL}/Merchant?id=${storeId}`, '_blank')
 };
 // 订单跳转商家订单页面
-Vue.prototype.linkToOrders = function (sn) {  // 跳转买家端订单
+Vue.prototype.linkToOrders = function (sn) {
-  window.open(`${config.STORE_URL}/order-detail?sn=${sn}`, '_blank')
+  if (localStorage.getItem('storeFlag') == 'false') {
+    // 商家
+    window.open(`${config.PC_STORE}order-detail?sn=${sn}`, '_blank')
+  } else {
+    // 用户
+    window.open(`${config.PC_URL}/OrderDetail?sn=${sn}`, '_blank')
+  }
 };
+
 const Instance = new Vue({
   router,
   store,

im/src/plugins/ws-socket.js

@@ -65,7 +65,6 @@ class WsSocket {
    */
   on (event, callBack) {
     // 对应 socket-instance.js
-    console.log("事件绑定", event, callBack);
     this.onCallBacks[event] = callBack;
     return this;
   }

im/src/store/modules/talk.js

@@ -21,7 +21,6 @@ const Talk = {
   getters: {
     // 过滤所有置顶对话列表
     topItems: (state) => {
-      console.log(state.items, 'state.items');
       return state.items.filter((item) => item.is_top == 1);
     },
     talkItems: (state) => {
@@ -40,7 +39,6 @@ const Talk = {
   mutations: {
     // 设置对话列表
     SET_TALK_ITEMS (state, resource) {
-      console.log("设置对话列表", resource.items);
       Vue.set(state, 'items', resource.items)
     },
 

im/src/utils/emojis.js

@@ -121,14 +121,12 @@ const symbol = [
 ];
 
 const emojisKeys = Object.keys(emojis);
-
 export const emojiList = {
   symbol,
   emojis
 }
 
 const regEmoji = emojisKeys.map((value) => '|\\' + value).join('').replace('|', '')
-
 /**
 * 替换表情文字
 * 
@@ -142,3 +140,4 @@ export function textReplaceEmoji(content) {
     return emojis[$1];
   });
 }
+export const emojistwo = Object.keys(emojis)

im/src/utils/talk.js

@@ -31,7 +31,6 @@ export function findTalk(index_name) {
  * @param {Object} params
  */
 export function formatTalkItem (params) {
-  console.log(params);
   let options = {
     id: "",
     disable: false,

im/src/views/layout/MainLayout.vue

@@ -108,7 +108,7 @@ export default {
 <style lang="less" >
 .main-layout {
   position: fixed;
-  width: 75%;
+  width: 80%;
   height: 80%;
   top: 0;
   right: 0;
@@ -120,7 +120,7 @@ export default {
   border-radius: 5px;
 
   &.full-mode {
-    width: 70%;
+    width: 1200px;
     height: 85%;
     border-radius: 0;
   }

im/src/views/message/index.vue

@@ -424,7 +424,6 @@ export default {
 
       this.$nextTick(() => {
         if (id == this.index_name.split("_")[1]) {
-          console.log("已读");
           this.$store.commit("UPDATE_TALK_ITEM", {
             userId: id,
             index_name: "MESSAGE_" + this.index_name.split("_")[1],