From 73acb0bc0943f48be42af79b05660704cac204f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A8=8B?= <994041296@163.com>
Date: Tue, 10 Jan 2023 18:44:39 +0800
Subject: [PATCH 01/16] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/public/config.js                        |  32 +--
 buyer/src/pages/GoodsDetail.vue               |  19 +-
 im/.env                                       |   6 +-
 im/.env.development                           |  14 +-
 .../components/chat/messaege/TextMessage.vue  |  17 +-
 im/src/components/chat/panel/OtherLink.vue    |   2 +
 im/src/components/chat/panel/TalkPanel.vue    | 183 +++++++++++++-----
 .../chat/panel/template/footPrint.vue         | 169 +++++++++++++---
 .../chat/panel/template/storeDetail.vue       |  38 +++-
 im/src/config/config.js                       |   7 +-
 im/src/main.js                                |  20 +-
 manager/public/config.js                      |  56 +++---
 seller/public/config.js                       |   8 +-
 seller/src/views/home/home.vue                |   5 +-
 14 files changed, 415 insertions(+), 161 deletions(-)

diff --git a/buyer/public/config.js b/buyer/public/config.js
index 7a5ded3b..2272ff76 100644
--- a/buyer/public/config.js
+++ b/buyer/public/config.js
@@ -1,17 +1,17 @@
 var BASE = {
-    /**
-     * @description api请求基础路径
-     */
-    API_DEV: {
-      common: "http://192.168.0.113:8890",
-      buyer: "http://192.168.0.113:8898",
-      seller: "https://store-api.pickmall.cn",
-      manager: "https://admin-api.pickmall.cn"
-    },
-    API_PROD: {
-      common: "https://common-api.pickmall.cn",
-      buyer: "https://buyer-api.pickmall.cn",
-      seller: "https://store-api.pickmall.cn",
-      manager: "https://admin-api.pickmall.cn"
-    },
-  };
+  /**
+   * @description api请求基础路径
+   */
+  API_DEV: {
+    common: "https://common-api.pickmall.cn",
+    buyer: "https://buyer-api.pickmall.cn",
+    seller: "https://store-api.pickmall.cn",
+    manager: "https://admin-api.pickmall.cn"
+  },
+  API_PROD: {
+    common: "https://common-api.pickmall.cn",
+    buyer: "https://buyer-api.pickmall.cn",
+    seller: "https://store-api.pickmall.cn",
+    manager: "https://admin-api.pickmall.cn"
+  },
+};
diff --git a/buyer/src/pages/GoodsDetail.vue b/buyer/src/pages/GoodsDetail.vue
index 14fdb13c..736102a2 100644
--- a/buyer/src/pages/GoodsDetail.vue
+++ b/buyer/src/pages/GoodsDetail.vue
@@ -15,12 +15,12 @@
         <div class="store-collect">
           <span class="mr_10" v-if="goodsMsg.data">
             <router-link :to="'Merchant?id=' + goodsMsg.data.storeId">{{
-    goodsMsg.data.storeName
-}}</router-link>
+              goodsMsg.data.storeName
+            }}</router-link>
           </span>
           <span @click="collect">
             <Icon type="ios-heart" :color="storeCollected ? '#ed3f14' : '#666'" />
-            {{ storeCollected ? "已收藏店铺" : "收藏店铺" }}
+            {{ storeCollected? "已收藏店铺": "收藏店铺" }}
           </span>
           <span class="ml_10" @click="IMService()">联系客服</span>
         </div>
@@ -81,8 +81,19 @@ export default {
         this.$Message.error("请登录后再联系客服");
         return;
       }
+      // window.open(
+      //   this.IMLink +
+      //   "?token=" +
+      //   accessToken +
+      //   "&id=" +
+      //   this.goodsMsg.data.storeId +
+      //   "&goodsId=" +
+      //   this.goodsMsg.data.goodsId +
+      //   "&skuId=" +
+      //   this.goodsMsg.data.id
+      // );
       window.open(
-        this.IMLink +
+        'http://192.168.0.139:8000/' +
         "?token=" +
         accessToken +
         "&id=" +
diff --git a/im/.env b/im/.env
index 38ee6b50..b0a657c7 100644
--- a/im/.env
+++ b/im/.env
@@ -4,4 +4,8 @@ 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_WEBSITE_NAME="LiLi IM"
-VUE_APP_PC_ORDER_URL=https://store-b2b2c.pickmall.cn
+VUE_APP_PC_ORDER_URL=https://pc-b2b2c.pickmall.cn/
+VUE_APP_PC_STORE_ORDER_URL=https://store-b2b2c.pickmall.cn/
+VUE_APP_PC_STORE_ORDER=https://store-b2b2c.pickmall.cn/
+VUE_APP_PC_USER_ORDER=https://pc-b2b2c.pickmall.cn
+VUE_APP_PC_STORE_GOODS=https://store-b2b2c.pickmall.cn/
\ No newline at end of file
diff --git a/im/.env.development b/im/.env.development
index d6973c53..28921b97 100644
--- a/im/.env.development
+++ b/im/.env.development
@@ -1,7 +1,11 @@
 NODE_ENV=development
-VUE_APP_PREVIEW=true
-VUE_APP_API_BASE_URL=http://192.168.0.113:8885
-VUE_APP_WEB_SOCKET_URL=ws://192.168.0.113:8885/lili/webSocket
-VUE_APP_COMMON=http://192.168.0.113:8890
-VUE_APP_PC_URL="http://192.168.0.113:10001"
+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_WEBSITE_NAME="LiLi IM"
+VUE_APP_PC_ORDER_URL=https://pc-b2b2c.pickmall.cn/
+VUE_APP_PC_STORE_ORDER_URL=https://store-b2b2c.pickmall.cn/
+VUE_APP_PC_STORE_ORDER=https://store-b2b2c.pickmall.cn/
+VUE_APP_PC_USER_ORDER=https://pc-b2b2c.pickmall.cn
+VUE_APP_PC_STORE_GOODS=https://store-b2b2c.pickmall.cn/
\ No newline at end of file
diff --git a/im/src/components/chat/messaege/TextMessage.vue b/im/src/components/chat/messaege/TextMessage.vue
index 80008d26..e00377ae 100644
--- a/im/src/components/chat/messaege/TextMessage.vue
+++ b/im/src/components/chat/messaege/TextMessage.vue
@@ -1,12 +1,9 @@
 <template>
-  <div
-    class="text-message"
-    :class="{
-      left: float == 'left',
-      right: float == 'right',
-      'max-width': !fullWidth,
-    }"
-  >
+  <div 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>
@@ -35,12 +32,12 @@ export default {
       default: false,
     },
   },
-  data() {
+  data () {
     return {
       html: "",
     };
   },
-  created() {
+  created () {
     const text = textReplaceLink(
       this.content,
       this.float == "right" ? "#ffffff" : "rgb(9 149 208)"
diff --git a/im/src/components/chat/panel/OtherLink.vue b/im/src/components/chat/panel/OtherLink.vue
index d82a70c7..d5160d29 100644
--- a/im/src/components/chat/panel/OtherLink.vue
+++ b/im/src/components/chat/panel/OtherLink.vue
@@ -70,6 +70,8 @@ export default {
     }
   },
   mounted () {
+    localStorage.setItem('storeFlag', this.toUser.storeFlag)
+    console.log(this.toUser.storeFlag, 'this.toUser.storeFlag');
     if (this.toUser.storeFlag) {
       this.getStoreDetail()
     } else {
diff --git a/im/src/components/chat/panel/TalkPanel.vue b/im/src/components/chat/panel/TalkPanel.vue
index 10e04e35..d5f94735 100644
--- a/im/src/components/chat/panel/TalkPanel.vue
+++ b/im/src/components/chat/panel/TalkPanel.vue
@@ -35,9 +35,9 @@
 
             <!-- 其它对话消息 -->
             <div v-else class="message-box record-box" :class="{
-  'direction-rt': item.float == 'right',
-  'checkbox-border': multiSelect.isOpen === true,
-}">
+              'direction-rt': item.float == 'right',
+              'checkbox-border': multiSelect.isOpen === true,
+            }">
               <aside v-show="multiSelect.isOpen" class="checkbox-column">
                 <i class="el-icon-success" :class="{ selected: verifyMultiSelect(item.id) }"
                   @click="triggerMultiSelect(item.id)" />
@@ -59,48 +59,63 @@
                     {{ unixToDate(item.createTime, "MM月dd日 hh:mm") }}
                   </span>
                   <!-- 文本消息 -->
-                  <div v-if="item.messageType == 'MESSAGE'" class="text-message" :class="{
-  left: item.float == 'left',
-  right: item.float == 'right',
-}">
+                  <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-html="item.text" />
                   </div>
 
-                  <div v-if="item.messageType == 'GOODS' && item.text != null" class="text-message" :class="{
-  left: item.float == 'left',
-  right: item.float == 'right',
-}">
+                  <div v-if="item.messageType == 'GOODS' && item.text != null" class="goodsStyle " :class="{
+                    left: item.float == 'left',
+                    right: item.float == 'right',
+                  }">
                     <div class="base" @click="linkToGoods(item.text.goodsId, item.text.id)">
                       <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>
+                        <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="{
-  left: item.float == 'left',
-  right: item.float == 'right',
-}">
-                    <a> 订单号:{{ item.text.sn }} </a>
+                  <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>
@@ -149,10 +164,10 @@
     <!-- 消息管理器 -->
     <transition name="el-fade-in-linear">
       <TalkSearchRecord v-if="findChatRecord" :params="{
-  talk_type: params.talk_type,
-  receiver_id: params.receiver_id,
-  title: params.nickname,
-}" @close="findChatRecord = false" />
+        talk_type: params.talk_type,
+        receiver_id: params.receiver_id,
+        title: params.nickname,
+      }" @close="findChatRecord = false" />
     </transition>
 
     <!-- 链接信息 -->
@@ -820,6 +835,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 +906,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 +914,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 +985,26 @@ export default {
 }
 
 
-.base {
-  margin-top: 5px;
-  height: 120px;
-  display: flex;
+// .base {
+//   margin-top: 5px;
+//   height: 120px;
+//   display: flex;
 
-  div {
-    width: 100px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    margin-top: 8px;
-    white-space: nowrap;
-  }
+//   div {
+//     width: 100px;
+//     // overflow: hidden;
+//     // text-overflow: ellipsis;
+//     margin-top: 8px;
+//     // white-space: nowrap;
+//   }
 
-  .image {
-    height: 100px;
-    margin-top: 3px;
-    width: 100px
-  }
+//   .image {
+//     height: 100px;
+//     margin-top: 3px;
+//     width: 100px
+//   }
 
-}
+// }
 
 .talk-bubble {
   position: absolute;
@@ -1101,7 +1182,7 @@ export default {
 }
 
 @bg-left-color: #f5f5f5;
-@bg-right-color: #1ebafc;
+@bg-right-color: #ffffff;
 
 .text-message {
   position: relative;
diff --git a/im/src/components/chat/panel/template/footPrint.vue b/im/src/components/chat/panel/template/footPrint.vue
index 5bc8f98b..9d44c255 100644
--- a/im/src/components/chat/panel/template/footPrint.vue
+++ b/im/src/components/chat/panel/template/footPrint.vue
@@ -7,37 +7,58 @@
             <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;" :src="item.thumbnail" class="image" />
                 </div>
-                <div style="margin-left: 13px">
-                  <a class="goods_name" @click="linkToGoods(item.goodsId, item.id)">{{ item.goodsName }}</a>
-                  <div style="margin-top: 8px;">
-                    <span style="color: red;">￥{{ item.price }}</span>
-                  </div>
-                  <div>
-                    <el-button class="store-button" type="danger" v-if="item.btnHide == 1" size="mini"
-                      @click="submitSendGoodsMessage(item)" plain>发送</el-button>
+                <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>
+                  </el-tooltip>
+
+                  <div style="display: flex;">
+                    <div style="margin-top: 20px;">
+                      <span style="color: red;">￥{{ item.price }}</span>
+                    </div>
                   </div>
                 </div>
+                <div>
+                  <el-button class="goods_store_button" type="danger" v-if="item.btnHide == 1" size="mini"
+                    @click="submitSendGoodsMessage(item)" plain>发送</el-button>
+                </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;">
-                <span class="orderSn">订单号：{{ item.sn }}</span>
-                <img :src="item.groupImages" alt=""
-                  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 class="orderlist">
+                <div class="order_top">
+                  <span class="order_sn">订单号:{{ item.sn }}</span>
+                </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" 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"
+                    :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>
+              <div class="Underline"></div>
             </dd>
           </dl>
         </el-tab-pane>
@@ -109,11 +130,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",
@@ -150,6 +174,92 @@ 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;
+}
+
+.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 +268,7 @@ export default {
   position: absolute;
   margin-left: 10px;
   margin-top: 10px;
+  font-weight: 500;
 }
 
 .orderSn {
@@ -171,18 +282,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;
-  -webkit-line-clamp: 2;
-  line-clamp: 2;
-  -webkit-box-orient: vertical;
-
+  white-space: nowrap
 }
 
 /deep/ .el-tabs__item.is-top:last-child {
@@ -215,9 +321,18 @@ export default {
   margin-top: 10px;
 }
 
+.goods_store_button {
+  background-color: white;
+  border-color: #F56C6C;
+  margin-top: 10px;
+  position: relative;
+  right: 60%;
+  top: 45%;
+}
+
 .base {
   margin-top: 5px;
-  height: 120px;
+  height: 80px;
   display: flex;
 
   .price {
diff --git a/im/src/components/chat/panel/template/storeDetail.vue b/im/src/components/chat/panel/template/storeDetail.vue
index d1034fd7..91f1dd7e 100644
--- a/im/src/components/chat/panel/template/storeDetail.vue
+++ b/im/src/components/chat/panel/template/storeDetail.vue
@@ -6,11 +6,11 @@
       </div>
       <div style="margin-left: 13px">
         <div class="div-zoom">
-          {{ storeInfo.storeName }}
-          <el-tag type="danger" v-if="storeInfo.selfOperated" size="mini">自营</el-tag>
+          <span class="title_left_name"> 店铺名称：</span> <span class="title_right_name">{{ storeInfo.storeName }}</span>
+          <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">物流评分: <span>{{ storeInfo.deliveryScore }}</span></div>
+
+    <div class="separate">店铺评分: <el-rate v-model="storeInfo.serviceScore" disabled show-score text-color="#ff9900"
+        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>
\ No newline at end of file
diff --git a/im/src/config/config.js b/im/src/config/config.js
index a5dd35ba..02f792f3 100644
--- a/im/src/config/config.js
+++ b/im/src/config/config.js
@@ -3,6 +3,9 @@ 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 || "",
-  STORE_URL:process.env.VUE_APP_PC_ORDER_URL || "http://192.168.0.139:10002",
+  PC_URL: process.env.VUE_APP_PC_URL || "https://pc-b2b2c.pickmall.cn",
+  STORE_URL: process.env.VUE_APP_PC_ORDER_URL || "http://192.168.0.139:8000/",
+  PC_STORE_GOODS: process.env.VUE_APP_PC_STORE_ORDER_URL || '',
+  PC_STORE_ORDER: process.env.VUE_APP_PC_STORE_ORDER || '',
+  PC_USER_ORDER: process.env.VUE_APP_PC_USER_ORDER || '',
 };
diff --git a/im/src/main.js b/im/src/main.js
index 7ceab5ac..8fd9cef2 100644
--- a/im/src/main.js
+++ b/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}`)
-  window.open(`${config.PC_URL}/goodsDetail?skuId=${skuId}&goodsId=${goodsId}`, '_blank')
+  if (localStorage.getItem('storeFlag') == 'false') {
+    window.open(`${config.PC_STORE_GOODS}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) {  // 跳转买家端订单
-  window.open(`${config.STORE_URL}/order-detail?sn=${sn}`, '_blank')
+Vue.prototype.linkToOrders = function (sn) {
+  if (localStorage.getItem('storeFlag') == 'false') {
+    // 商家
+    window.open(`${config.PC_STORE_GOODS}order-detail?sn=${sn}`, '_blank')
+  } else {
+    // 用户
+    window.open(`${config.STORE_URL}/OrderDetail?sn=${sn}`, '_blank')
+  }
 };
+
 const Instance = new Vue({
   router,
   store,
diff --git a/manager/public/config.js b/manager/public/config.js
index 7ef1cf91..e674bf70 100644
--- a/manager/public/config.js
+++ b/manager/public/config.js
@@ -1,29 +1,29 @@
 var BASE = {
-    /**
-     * @description api请求基础路径
-     */
-    API_DEV: {
-      common: "http://192.168.0.113:8890",
-      buyer: "http://192.168.0.113:8888",
-      seller: "http://192.168.0.113:8889",
-      manager: "http://192.168.0.113:8887"
-    },
-    API_PROD: {
-      common: "https://common-api.pickmall.cn",
-      buyer: "https://buyer-api.pickmall.cn",
-      seller: "https://store-api.pickmall.cn",
-      manager: "https://admin-api.pickmall.cn"
-    },
-    /**
-     * @description // 跳转买家端地址 pc端
-     */
-    PC_URL: "https://pc-b2b2c.pickmall.cn",
-    /**
-     * @description  // 跳转买家端地址 wap端
-     */
-    WAP_URL: "https://m-b2b2c.pickmall.cn",
-    /**
-     *  @description api请求基础路径前缀
-     */
-    PREFIX: "/manager"
-  };
+  /**
+   * @description api请求基础路径
+   */
+  API_DEV: {
+    common: "http://192.168.0.113:8890",
+    buyer: "http://192.168.0.113:8888",
+    seller: "http://192.168.0.113:8889",
+    manager: "http://192.168.0.113:8887"
+  },
+  API_PROD: {
+    common: "https://common-api.pickmall.cn",
+    buyer: "https://buyer-api.pickmall.cn",
+    seller: "https://store-api.pickmall.cn",
+    manager: "https://admin-api.pickmall.cn"
+  },
+  /**
+   * @description // 跳转买家端地址 pc端
+   */
+  PC_URL: "https://pc-b2b2c.pickmall.cn",
+  /**
+   * @description  // 跳转买家端地址 wap端
+   */
+  WAP_URL: "https://m-b2b2c.pickmall.cn",
+  /**
+   *  @description api请求基础路径前缀
+   */
+  PREFIX: "/manager"
+};
diff --git a/seller/public/config.js b/seller/public/config.js
index 8e0e70ba..69441029 100644
--- a/seller/public/config.js
+++ b/seller/public/config.js
@@ -3,10 +3,10 @@ var BASE = {
    * @description api请求基础路径
    */
   API_DEV: {
-    common: "http://192.168.0.113:8890",
-    buyer: "http://192.168.0.113:8888",
-    seller: "http://192.168.0.113:8889",
-    manager: "http://192.168.0.113:8887"
+    common: "https://common-api.pickmall.cn",
+    buyer: "https://buyer-api.pickmall.cn",
+    seller: "https://store-api.pickmall.cn",
+    manager: "https://admin-api.pickmall.cn"
   },
   API_PROD: {
     common: "https://common-api.pickmall.cn",
diff --git a/seller/src/views/home/home.vue b/seller/src/views/home/home.vue
index 36f03b44..7d40de4b 100644
--- a/seller/src/views/home/home.vue
+++ b/seller/src/views/home/home.vue
@@ -258,7 +258,10 @@ export default {
         this.$Message.error("请登录后再联系客服");
         return;
       }
-      window.open(`${res.result}?token=` + accessToken);
+      // console.log(res.result, 'res.result');
+      // http://192.168.0.139:8000/
+      window.open(`http://192.168.0.139:8000/?token=` + accessToken);
+      // window.open(`${res.result}?token=` + accessToken);
     },
 
     // 获取im信息

From db33b34f18ac061ec1a52ba936316594d0ca3448 Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Wed, 11 Jan 2023 11:28:28 +0800
Subject: [PATCH 02/16] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E9=A2=86=E5=8F=96=E8=AF=A6=E6=83=85=E5=92=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96pc=E7=AB=AF=E8=B7=B3=E8=BD=AC=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E4=BC=98=E6=83=A0=E5=88=B8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/CouponCenter.vue              | 221 ++++++------
 buyer/src/pages/GoodsList.vue                 |  29 +-
 buyer/src/pages/home/userCenter/Coupons.vue   | 151 ++++----
 manager/src/api/promotion.js                  |  15 +
 manager/src/router/router.js                  |   6 +
 manager/src/utils/promotions.js               |  29 +-
 .../promotions/coupon/coupon-receive.vue      | 321 ++++++++++++++++++
 .../src/views/promotions/coupon/coupon.vue    |  50 ++-
 seller/src/api/promotion.js                   |  51 +--
 seller/src/router/router.js                   |   6 +
 seller/src/utils/promotions.js                |  29 +-
 .../views/promotion/coupon/coupon-receive.vue | 285 ++++++++++++++++
 seller/src/views/promotion/coupon/coupon.vue  |  22 +-
 13 files changed, 1004 insertions(+), 211 deletions(-)
 create mode 100644 manager/src/views/promotions/coupon/coupon-receive.vue
 create mode 100644 seller/src/views/promotion/coupon/coupon-receive.vue

diff --git a/buyer/src/pages/CouponCenter.vue b/buyer/src/pages/CouponCenter.vue
index e3f589f2..959e0329 100644
--- a/buyer/src/pages/CouponCenter.vue
+++ b/buyer/src/pages/CouponCenter.vue
@@ -5,25 +5,44 @@
       <div>
         <div class="coupon-title">
           <router-link to="/">
-            <img src="../assets/images/logo.png" width="120" alt="">
+            <img src="../assets/images/logo.png" width="120" alt="" />
           </router-link>
           <p>领券中心</p>
-          <Input search style="width:400px" @on-search='search' enter-button="搜索" placeholder="搜索优惠券" />
+          <Input
+            search
+            style="width: 400px"
+            @on-search="search"
+            enter-button="搜索"
+            placeholder="搜索优惠券"
+          />
         </div>
 
         <div class="fontsize_18 recommend">推荐好券</div>
 
-        <empty v-if="list.length===0" />
+        <empty v-if="list.length === 0" />
         <ul class="coupon-list" v-else>
           <li v-for="(item, index) in list" class="coupon-item" :key="index">
             <div class="c-left">
               <div>
-                <span v-if="item.couponType === 'PRICE'" class="fontsize_12 global_color">￥<span class="price">{{item.price | unitPrice}}</span></span>
-                <span v-if="item.couponType === 'DISCOUNT'" class="fontsize_12 global_color"><span class="price">{{item.couponDiscount}}</span>折</span>
-                <span class="describe">满{{item.consumeThreshold}}元可用</span>
+                <span
+                  v-if="item.couponType === 'PRICE'"
+                  class="fontsize_12 global_color"
+                  >￥<span class="price">{{
+                    item.price | unitPrice
+                  }}</span></span
+                >
+                <span
+                  v-if="item.couponType === 'DISCOUNT'"
+                  class="fontsize_12 global_color"
+                  ><span class="price">{{ item.couponDiscount }}</span
+                  >折</span
+                >
+                <span class="describe"
+                  >满{{ item.consumeThreshold }}元可用</span
+                >
               </div>
-              <p>使用范围：{{useScope(item.scopeType, item.storeName)}}</p>
-              <p>有效期：{{item.endTime}}</p>
+              <p>使用范围：{{ useScope(item.scopeType, item.storeName) }}</p>
+              <p>有效期：{{ item.endTime }}</p>
             </div>
             <b></b>
             <a class="c-right" @click="receive(item)">立即领取</a>
@@ -31,12 +50,15 @@
             <i class="circle-bottom"></i>
           </li>
         </ul>
-        <Page :total="total" @on-change="changePageNum"
+        <Page
+          :total="total"
+          @on-change="changePageNum"
           class="pageration"
           @on-page-size-change="changePageSize"
           :page-size="params.pageSize"
           show-total
-          show-sizer>
+          show-sizer
+        >
         </Page>
       </div>
     </div>
@@ -44,135 +66,136 @@
   </div>
 </template>
 <script>
-import {couponList, receiveCoupon} from '@/api/member.js'
+import { couponList, receiveCoupon } from "@/api/member.js";
 export default {
-  data () {
+  data() {
     return {
       list: [], // 优惠券列表
       total: 0, // 优惠券总数
-      params: { // 请求参数
-        getType: 'FREE',
+      params: {
+        // 请求参数
+        getType: "FREE",
         pageNumber: 1,
-        pageSize: 20
-      }
-    }
+        pageSize: 20,
+      },
+    };
   },
   methods: {
     // 搜索优惠券
-    search (item) {
-      this.params.couponName = item
-      this.params.pageNumber = 1
-      this.getList()
+    search(item) {
+      this.params.couponName = item;
+      this.params.pageNumber = 1;
+      this.getList();
     },
     // 获取优惠券列表
-    getList () {
-      this.$Spin.show()
-      couponList(this.params).then(res => {
-        this.$Spin.hide()
-        this.loading = false
-        if (res.success) {
-          this.list = res.result.records
-          this.total = res.result.total
-        }
-      }).catch(() => { this.$Spin.hide() })
+    getList() {
+      this.$Spin.show();
+      couponList(this.params)
+        .then((res) => {
+          this.$Spin.hide();
+          this.loading = false;
+          if (res.success) {
+            this.list = res.result.records;
+            this.total = res.result.total;
+          }
+        })
+        .catch(() => {
+          this.$Spin.hide();
+        });
     },
     // 分页 改变页码
-    changePageNum (val) {
+    changePageNum(val) {
       this.params.pageNumber = val;
-      this.getList()
+      this.getList();
     },
     // 分页 改变每页数
-    changePageSize (val) {
+    changePageSize(val) {
       this.params.pageNumber = 1;
       this.params.pageSize = val;
-      this.getList()
+      this.getList();
     },
     // 领取优惠券
-    receive (item) {
-      receiveCoupon(item.id).then(res => {
+    receive(item) {
+      receiveCoupon(item.id).then((res) => {
         if (res.success) {
+          console.log(item);
           this.$Modal.confirm({
-            title: '领取优惠券',
-            content: '<p>优惠券领取成功，可到我的优惠券页面查看</p>',
-            okText: '我的优惠券',
-            cancelText: '立即使用',
+            title: "领取优惠券",
+            content: "<p>优惠券领取成功，可到我的优惠券页面查看</p>",
+            okText: "我的优惠券",
+            cancelText: "立即使用",
             closable: true,
             onOk: () => {
-              this.$router.push('/home/Coupons')
+              this.$router.push("/home/Coupons");
             },
             onCancel: () => {
-              if (item.storeId !== '0') {
-                this.$router.push({path: '/merchant', query: {id: item.storeId}})
-              } else {
-                if (item.scopeType === 'PORTION_GOODS_CATEGORY') {
-                  this.$router.push({path: '/goodsList', query: {categoryId: item.scopeId}})
-                } else {
-                  this.$router.push({path: '/goodsList'})
-                }
-              }
-            }
+              this.$router.push({
+                path: "/goodsList",
+                query: { promotionsId: item.id, promotionType: "COUPON" },
+              });
+            },
           });
         }
-      })
+      });
     },
     // 优惠券可用范围
-    useScope (type, storeName) {
-      let shop = '平台';
-      let goods = '全部商品'
-      if (storeName !== 'platform') shop = storeName
+    useScope(type, storeName) {
+      let shop = "平台";
+      let goods = "全部商品";
+      if (storeName !== "platform") shop = storeName;
       switch (type) {
-        case 'ALL':
-          goods = '全部商品'
+        case "ALL":
+          goods = "全部商品";
           break;
-        case 'PORTION_GOODS':
-          goods = '部分商品'
+        case "PORTION_GOODS":
+          goods = "部分商品";
           break;
-        case 'PORTION_GOODS_CATEGORY':
-          goods = '部分分类商品'
+        case "PORTION_GOODS_CATEGORY":
+          goods = "部分分类商品";
           break;
       }
-      return `${shop}${goods}可用`
-    }
+      return `${shop}${goods}可用`;
+    },
   },
-  mounted () {
-    this.getList()
-  }
-}
+  mounted() {
+    this.getList();
+  },
+};
 </script>
 <style lang="scss" scoped>
-  @import '../assets/styles/coupon.scss';
-  .content{
-    width: 100%;
-    background-color: #fff;
+@import "../assets/styles/coupon.scss";
+.content {
+  width: 100%;
+  background-color: #fff;
 
-    > div {
-      margin: 10px auto;
-      width: 1200px;
-    }
+  > div {
+    margin: 10px auto;
+    width: 1200px;
   }
-  .coupon-title {
-    display: flex;
-    align-items: center;
+}
+.coupon-title {
+  display: flex;
+  align-items: center;
 
-    p{
-      font-size: 18px;
-      margin-right: 500px;
-    }
-    border-bottom: 2px solid $theme_color;
+  p {
+    font-size: 18px;
+    margin-right: 500px;
   }
-  .recommend {
-    margin: 20px auto;
-    font-weight: bold;
-    width: 200px;
-    text-align: center;
-  }
-  .coupon-item {
-    b{
-      background: url('../assets/images/small-circle.png') top left repeat-y;
-    }
-  }
-  .pageration {
-    text-align: right;
-    padding-bottom: 10px;
+  border-bottom: 2px solid $theme_color;
+}
+.recommend {
+  margin: 20px auto;
+  font-weight: bold;
+  width: 200px;
+  text-align: center;
+}
+.coupon-item {
+  b {
+    background: url("../assets/images/small-circle.png") top left repeat-y;
   }
+}
+.pageration {
+  text-align: right;
+  padding-bottom: 10px;
+}
 </style>
diff --git a/buyer/src/pages/GoodsList.vue b/buyer/src/pages/GoodsList.vue
index 94038860..0d454c22 100644
--- a/buyer/src/pages/GoodsList.vue
+++ b/buyer/src/pages/GoodsList.vue
@@ -82,20 +82,24 @@
               </div>
 
               <div class="goods-show-right">
-                <Tag class="goods-show-tag" color="red" v-if="item.content.selfOperated">
+                <Tag
+                  class="goods-show-tag"
+                  color="red"
+                  v-if="item.content.selfOperated"
+                >
                   自营
                 </Tag>
                 <Tag
-                  class="goods-show-tag" color="blue"
+                  class="goods-show-tag"
+                  color="blue"
                   v-if="item.content.goodsType == 'VIRTUAL_GOODS'"
                 >
                   虚拟
                 </Tag>
                 <Tag
-                  class="goods-show-tag" color="blue"
-                  v-else-if="
-                    item.content.goodsType == 'PHYSICAL_GOODS'
-                  "
+                  class="goods-show-tag"
+                  color="blue"
+                  v-else-if="item.content.goodsType == 'PHYSICAL_GOODS'"
                 >
                   实物
                 </Tag>
@@ -155,13 +159,21 @@ export default {
   watch: {
     $route() {
       const keyword = this.$route.query.keyword;
-      this.handleSearch(keyword);
+      if (keyword) {
+        this.handleSearch(keyword);
+      }
       if (this.$route.query.categoryId) {
         let cateId = this.$route.query.categoryId.split(",");
         Object.assign(this.params, this.$route.query);
         this.params.categoryId = cateId[cateId.length - 1];
-        this.getGoodsList();
       }
+      if (this.$route.query.promotionType) {
+        this.params.promotionType = this.$route.query.promotionType;
+      }
+      if (this.$route.query.promotionsId) {
+        this.params.promotionsId = this.$route.query.promotionsId;
+      }
+      this.getGoodsList();
     },
   },
   methods: {
@@ -301,7 +313,6 @@ export default {
   margin-top: 5px;
 }
 
-
 .goods-show-self {
   float: left;
   height: 16px;
diff --git a/buyer/src/pages/home/userCenter/Coupons.vue b/buyer/src/pages/home/userCenter/Coupons.vue
index b1b2ed0c..8da1314d 100644
--- a/buyer/src/pages/home/userCenter/Coupons.vue
+++ b/buyer/src/pages/home/userCenter/Coupons.vue
@@ -1,136 +1,155 @@
 <template>
   <div class="wrapper">
     <card _Title="优惠券列表" :_Tabs="statusNameList" @_Change="change" />
-    <empty v-if="list.length==0" />
+    <empty v-if="list.length == 0" />
     <ul class="coupon-list" v-else>
       <li v-for="(item, index) in list" class="coupon-item" :key="index">
         <div class="c-left">
           <div>
-            <span v-if="item.couponType === 'PRICE'" class="fontsize_12 global_color">￥<span class="price">{{item.price | unitPrice}}</span></span>
-            <span v-if="item.couponType === 'DISCOUNT'" class="fontsize_12 global_color"><span class="price">{{item.discount}}</span>折</span>
-            <span class="describe">满{{item.consumeThreshold}}元可用</span>
+            <span
+              v-if="item.couponType === 'PRICE'"
+              class="fontsize_12 global_color"
+              >￥<span class="price">{{ item.price | unitPrice }}</span></span
+            >
+            <span
+              v-if="item.couponType === 'DISCOUNT'"
+              class="fontsize_12 global_color"
+              ><span class="price">{{ item.discount }}</span
+              >折</span
+            >
+            <span class="describe">满{{ item.consumeThreshold }}元可用</span>
           </div>
-          <p>使用范围：{{useScope(item.scopeType, item.storeName)}}</p>
-          <p>有效期：{{item.endTime}}</p>
+          <p>使用范围：{{ useScope(item.scopeType, item.storeName) }}</p>
+          <p>有效期：{{ item.endTime }}</p>
         </div>
         <b></b>
-        <a class="c-right" :class="{'canot-use':params.memberCouponStatus !== 'NEW'}" @click="go(item)">立即使用</a>
+        <a
+          class="c-right"
+          :class="{ 'canot-use': params.memberCouponStatus !== 'NEW' }"
+          @click="go(item)"
+          >立即使用</a
+        >
         <i class="circle-top"></i>
         <i class="circle-bottom"></i>
       </li>
     </ul>
-    <Page :total="total" @on-change="changePageNum"
+    <Page
+      :total="total"
+      @on-change="changePageNum"
       class="pageration"
       @on-page-size-change="changePageSize"
       :page-size="params.pageSize"
       show-total
-      show-sizer>
+      show-sizer
+    >
     </Page>
     <Spin v-if="loading" fix></Spin>
   </div>
 </template>
 
 <script>
-import { memberCouponList } from '@/api/member.js';
+import { memberCouponList } from "@/api/member.js";
 export default {
-  name: 'Coupons',
-  data () {
+  name: "Coupons",
+  data() {
     return {
-      statusNameList: [ // 优惠券状态
-        '未使用',
-        '已使用',
-        '已过期'
+      statusNameList: [
+        // 优惠券状态
+        "未使用",
+        "已使用",
+        "已过期",
       ],
-      statusList: ['NEW', 'USED', 'EXPIRE'], // 优惠券状态
+      statusList: ["NEW", "USED", "EXPIRE"], // 优惠券状态
       loading: false, // 列表加载状态
-      params: { // 请求参数
+      params: {
+        // 请求参数
         pageNumber: 1,
         pageSize: 10,
-        memberCouponStatus: 'NEW'
+        memberCouponStatus: "NEW",
       },
       total: 0, // 优惠券总数
-      list: [] // 优惠券列表
+      list: [], // 优惠券列表
     };
   },
   methods: {
-    getList () { // 获取优惠券列表
-      this.loading = true
-      memberCouponList(this.params).then(res => {
-        this.loading = false
+    getList() {
+      // 获取优惠券列表
+      this.loading = true;
+      memberCouponList(this.params).then((res) => {
+        this.loading = false;
         if (res.success) {
-          this.list = res.result.records
-          this.total = res.result.total
+          this.list = res.result.records;
+          this.total = res.result.total;
         }
-      })
+      });
     },
     // 切换优惠券状态
-    change (index) {
-      this.params.memberCouponStatus = this.statusList[index]
+    change(index) {
+      this.params.memberCouponStatus = this.statusList[index];
       this.params.pageNumber = 1;
-      this.getList()
+      this.getList();
     },
-    go (item) { // 根据使用条件跳转商品列表页面
-      if (this.params.memberCouponStatus !== 'NEW') return;
+    go(item) {
+      // 根据使用条件跳转商品列表页面
+      if (this.params.memberCouponStatus !== "NEW") return;
 
-      if (item.storeId !== '0') {
-        this.$router.push({path: '/merchant', query: {id: item.storeId}})
-      } else {
-        if (item.scopeType === 'PORTION_GOODS_CATEGORY') {
-          this.$router.push({path: '/goodsList', query: {categoryId: item.scopeId}})
-        } else {
-          this.$router.push({path: '/goodsList'})
-        }
-      }
+      this.$router.push({
+        path: "/goodsList",
+        query: { promotionsId: item.couponId, promotionType: "COUPON" },
+      });
     },
 
-    changePageNum (val) { // 分页改变页码
+    changePageNum(val) {
+      // 分页改变页码
       this.params.pageNumber = val;
-      this.getList()
+      this.getList();
     },
 
-    changePageSize (val) { // 分页改变页数
+    changePageSize(val) {
+      // 分页改变页数
       this.params.pageNumber = 1;
       this.params.pageSize = val;
-      this.getList()
+      this.getList();
     },
 
-    useScope (type, storeName) { // 根据字段返回 优惠券适用范围
-      let shop = '平台';
-      let goods = '全部商品'
-      if (storeName !== 'platform') shop = storeName
+    useScope(type, storeName) {
+      // 根据字段返回 优惠券适用范围
+      let shop = "平台";
+      let goods = "全部商品";
+      if (storeName !== "platform") shop = storeName;
       switch (type) {
-        case 'ALL':
-          goods = '全部商品'
+        case "ALL":
+          goods = "全部商品";
           break;
-        case 'PORTION_GOODS':
-          goods = '部分商品'
+        case "PORTION_GOODS":
+          goods = "部分商品";
           break;
-        case 'PORTION_GOODS_CATEGORY':
-          goods = '部分分类商品'
+        case "PORTION_GOODS_CATEGORY":
+          goods = "部分分类商品";
           break;
       }
-      return `${shop}${goods}可用`
-    }
+      return `${shop}${goods}可用`;
+    },
   },
-  mounted () {
-    this.getList()
-  }
-}
+  mounted() {
+    this.getList();
+  },
+};
 </script>
 
 <style scoped lang="scss">
-@import '../../../assets/styles/coupon.scss';
-.coupon-item{
+@import "../../../assets/styles/coupon.scss";
+.coupon-item {
   height: 125px;
-  .c-left{
+  .c-left {
     padding: 16px;
   }
-  .c-right{
+  .c-right {
     padding: 20px 16px;
     width: 43px;
     font-size: 14px;
   }
-  .canot-use{
+  .canot-use {
     color: #999;
     background-color: #eee;
   }
diff --git a/manager/src/api/promotion.js b/manager/src/api/promotion.js
index 2628f5d9..880ae648 100644
--- a/manager/src/api/promotion.js
+++ b/manager/src/api/promotion.js
@@ -209,28 +209,34 @@ export const auditApplySeckill = params => {
 export const getFullDiscountList = params => {
   return getRequest(`/promotion/fullDiscount`, params);
 };
+
 // 满优惠列表
 export const getFullDiscountById = id => {
   return getRequest(`/promotion/fullDiscount/${id}`);
 };
+
 // 开启、关闭满额活动
 export const updateFullDiscount = (id, promotionStatus) => {
   return putRequest(`/promotion/fullDiscount/status/${id}`)
 }
+
 // 积分商品列表
 export const getPointsGoodsList = params => {
   return getRequest(`/promotion/pointsGoods`, params);
 };
+
 // 积分商品详情
 export const getPointsGoodsById = id => {
   return getRequest(`/promotion/pointsGoods/${id}`);
 };
+
 // 添加积分商品
 export const addPointsGoods = params => {
   return postRequest(`/promotion/pointsGoods`, params, {
     "Content-type": "application/json"
   });
 };
+
 // 修改积分商品
 export const updatePointsGoods = params => {
   return putRequest(`/promotion/pointsGoods`, params, {
@@ -250,19 +256,28 @@ export const deletePointsGoodsStatus = id => {
 export const getPointsGoodsCategoryList = params => {
   return getRequest(`/promotion/pointsGoodsCategory`, params);
 };
+
 // 积分商品分类详情
 export const getPointsGoodsCategoryById = id => {
   return getRequest(`/promotion/pointsGoodsCategory/${id}`);
 };
+
 // 添加积分商品分类
 export const addPointsGoodsCategory = params => {
   return postRequest(`/promotion/pointsGoodsCategory`, params);
 };
+
 // 更新积分商品分类
 export const updatePointsGoodsCategory = params => {
   return putRequest(`/promotion/pointsGoodsCategory`, params);
 };
+
 // 删除积分商品分类
 export const deletePointsGoodsCategoryById = id => {
   return deleteRequest(`/promotion/pointsGoodsCategory/${id}`);
 };
+
+// 获取优惠券领取记录
+export const getCouponReceiveList = (params) => {
+  return getRequest("/promotion/coupon/received", params);
+};
\ No newline at end of file
diff --git a/manager/src/router/router.js b/manager/src/router/router.js
index 530eaad7..fde61cd8 100644
--- a/manager/src/router/router.js
+++ b/manager/src/router/router.js
@@ -193,6 +193,12 @@ export const otherRouter = {
       name: "manager-coupon",
       component: () => import("@/views/promotions/coupon/coupon.vue")
     },
+    {
+      path: "promotions/coupon-receive",
+      title: "优惠券领取记录",
+      name: "coupon-receive",
+      component: () => import("@/views/promotions/coupon/coupon-receive.vue"),
+    },
     {
       path: "promotions/add-platform-coupon",
       title: "添加平台优惠券",
diff --git a/manager/src/utils/promotions.js b/manager/src/utils/promotions.js
index f6d52378..43d031e1 100644
--- a/manager/src/utils/promotions.js
+++ b/manager/src/utils/promotions.js
@@ -57,4 +57,31 @@ export function promotionsScopeTypeRender(h, params) {
   ]);
 }
 
-
+export function memberPromotionsStatusRender(h, status) {
+  let text = "未知",
+    color = "red";
+  if (status == "NEW") {
+    text = "已领取";
+    color = "geekblue";
+  } else if (status == "USED") {
+    text = "已使用";
+    color = "green";
+  } else if (status == "EXPIRE") {
+    text = "已过期";
+    color = "red";
+  } else if (status == "CLOSED") {
+    text = "已作废";
+    color = "red";
+  }
+  return h("div", [
+    h(
+      "Tag",
+      {
+        props: {
+          color: color,
+        },
+      },
+      text
+    ),
+  ]);
+}
diff --git a/manager/src/views/promotions/coupon/coupon-receive.vue b/manager/src/views/promotions/coupon/coupon-receive.vue
new file mode 100644
index 00000000..51888772
--- /dev/null
+++ b/manager/src/views/promotions/coupon/coupon-receive.vue
@@ -0,0 +1,321 @@
+<template>
+  <div class="search">
+    <Card>
+      <Button style="margin-bottom: 10px" @click="back()">返回</Button>
+      <Form
+        ref="searchForm"
+        :model="searchForm"
+        inline
+        :label-width="75"
+        class="search-form mb_10"
+      >
+        <Form-item label="优惠券名称" prop="couponName">
+          <Input
+            type="text"
+            v-model="searchForm.couponName"
+            placeholder="请输入优惠券名称"
+            clearable
+            style="width: 200px"
+          />
+        </Form-item>
+        <Form-item label="会员名称" prop="memberName">
+          <Input
+            type="text"
+            v-model="searchForm.memberName"
+            placeholder="请输入会员名称"
+            clearable
+            style="width: 200px"
+          />
+        </Form-item>
+        <Form-item label="获取方式" prop="getType">
+          <Select
+            v-model="searchForm.getType"
+            placeholder="请选择"
+            clearable
+            style="width: 200px"
+          >
+            <Option value="FREE">免费获取</Option>
+            <Option value="ACTIVITY">活动获取</Option>
+          </Select>
+        </Form-item>
+        <Form-item label="优惠券状态" prop="memberCouponStatus">
+          <Select
+            v-model="searchForm.memberCouponStatus"
+            placeholder="请选择"
+            clearable
+            style="width: 200px"
+          >
+            <Option value="NEW">已领取</Option>
+            <Option value="USED">已使用</Option>
+            <Option value="EXPIRE">已过期</Option>
+            <Option value="CLOSED">已作废</Option>
+          </Select>
+        </Form-item>
+        <Form-item label="活动时间">
+          <DatePicker
+            v-model="selectDate"
+            type="daterange"
+            clearable
+            placeholder="选择起始时间"
+            style="width: 200px"
+          ></DatePicker>
+        </Form-item>
+        <Button
+          @click="handleSearch"
+          type="primary"
+          icon="ios-search"
+          class="search-btn"
+          >搜索</Button
+        >
+      </Form>
+      <Table
+        v-if="refreshTable"
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        class="mt_10"
+        @on-selection-change="changeSelect"
+      >
+      </Table>
+      <Row type="flex" justify="end" class="mt_10">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+  </div>
+</template>
+<script>
+import { getCouponReceiveList } from "@/api/promotion";
+import {
+  memberPromotionsStatusRender,
+  promotionsScopeTypeRender,
+} from "@/utils/promotions";
+
+export default {
+  name: "coupon-recevie",
+  data() {
+    return {
+      loading: true, // 表单加载状态
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "create_time", // 默认排序字段
+        order: "desc", // 默认排序方式
+        getType: "", // 默认排序方式
+        couponId: this.$route.query.couponId, // 优惠券id
+      },
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        // 表头
+        {
+          title: "会员名称",
+          key: "memberName",
+          minWidth: 130,
+          fixed: "left",
+        },
+        {
+          title: "优惠券名称",
+          key: "couponName",
+          minWidth: 100,
+          tooltip: true,
+        },
+        {
+          title: "发布店铺",
+          key: "storeName",
+          minWidth: 100,
+          render: (h, params) => {
+            return h("div", (params.row.storeName === 'platform' && "平台") || params.row.storeName);
+          },
+        },
+        {
+          title: "面额/折扣",
+          key: "price",
+          width: 100,
+          render: (h, params) => {
+            if (params.row.price) {
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.price, "￥")
+              );
+            } else {
+              return h("div", params.row.discount + "折");
+            }
+          },
+        },
+
+        {
+          title: "使用门槛",
+          key: "consumeThreshold",
+          width: 130,
+        },
+        {
+          title: "获取方式",
+          width: 120,
+          key: "getType",
+          render: (h, params) => {
+            if (params.row.getType === "FREE") {
+              return h("Tag", { props: { color: "red" } }, "免费获取");
+            } else if (params.row.getType === "ACTIVITY") {
+              return h("Tag", { props: { color: "volcano" } }, "活动获取");
+            } else if (params.row.getType === "INSIDE") {
+              return h("Tag", { props: { color: "lime" } }, "内购");
+            } else {
+              return h("Tag", { props: { color: "purple" } }, "未知");
+            }
+          },
+        },
+        {
+          title: "会员优惠券状态",
+          width: 130,
+          key: "memberCouponStatus",
+          render: (h, params) => {
+            return memberPromotionsStatusRender(
+              h,
+              params.row.memberCouponStatus
+            );
+          },
+        },
+        {
+          title: "优惠券类型",
+          key: "couponType",
+          width: 120,
+          render: (h, params) => {
+            if (params.row.couponType === "DISCOUNT") {
+              return h("Tag", { props: { color: "orange" } }, "打折");
+            } else if (params.row.couponType === "PRICE") {
+              return h("Tag", { props: { color: "magenta" } }, "减免现金");
+            } else {
+              return h("Tag", { props: { color: "purple" } }, "未知");
+            }
+          },
+        },
+        {
+          title: "品类描述",
+          key: "scopeType",
+          width: 120,
+          render: (h, params) => {
+            return promotionsScopeTypeRender(h, params);
+          },
+        },
+        {
+          title: "有效时间",
+          width: 150,
+          render: (h, params) => {
+            if (
+              params?.row?.getType === "ACTIVITY" &&
+              params?.row?.rangeDayType === "DYNAMICTIME"
+            ) {
+              return h("div", "长期有效");
+            } else if (params?.row?.startTime && params?.row?.endTime) {
+              return h("div", {
+                domProps: {
+                  innerHTML:
+                    params.row.startTime + "<br/>" + params.row.endTime,
+                },
+              });
+            }
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+      refreshTable: true, // 修改选中状态后刷新表格
+      selectDate: [], //选中的信息
+    };
+  },
+  props: {
+    promotionStatus: {
+      type: String,
+      default: "",
+    },
+  },
+  watch: {
+    $route(e) {
+      // 监听路由，参数变化调取接口
+      this.searchForm.couponId = e.query.couponId;
+      if (this.couponId) {
+        this.getDataList();
+      } else {
+        this.$refs.form.resetFields();
+      }
+    },
+  },
+  methods: {
+    back() {
+      this.$store.commit("removeTag", "coupon-receive");
+      this.$router.go(-1);
+    },
+    check() {
+      // 选中的优惠券
+      this.$emit("selected", this.selectList);
+    },
+    // 初始化数据
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      // 改变页码
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+    },
+    changePageSize(v) {
+      // 改变页数
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      // 搜索
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    /**
+     * 选择优惠券
+     */
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+      if (this.getType === "ACTIVITY") this.check();
+    },
+    getDataList() {
+      // 获取数据
+      this.loading = true;
+      if (this.selectDate && this.selectDate[0] && this.selectDate[1]) {
+        this.searchForm.startTime = this.selectDate[0].getTime();
+        this.searchForm.endTime = this.selectDate[1].getTime();
+      } else {
+        this.searchForm.startTime = null;
+        this.searchForm.endTime = null;
+      }
+      getCouponReceiveList(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          console.log(res);
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
diff --git a/manager/src/views/promotions/coupon/coupon.vue b/manager/src/views/promotions/coupon/coupon.vue
index e8b4cf01..161fa475 100644
--- a/manager/src/views/promotions/coupon/coupon.vue
+++ b/manager/src/views/promotions/coupon/coupon.vue
@@ -17,6 +17,17 @@
             style="width: 200px"
           />
         </Form-item>
+        <Form-item label="获取方式" prop="getType">
+          <Select
+            v-model="searchForm.getType"
+            placeholder="请选择"
+            clearable
+            style="width: 200px"
+          >
+            <Option value="FREE">免费获取</Option>
+            <Option value="ACTIVITY">活动获取</Option>
+          </Select>
+        </Form-item>
         <Form-item label="活动状态" prop="promotionStatus">
           <Select
             v-model="searchForm.promotionStatus"
@@ -50,6 +61,7 @@
       <Row class="operation padding-row" v-if="getType !== 'ACTIVITY'">
         <Button @click="add" type="primary">添加优惠券</Button>
         <Button @click="delAll">批量关闭</Button>
+        <Button @click="receivePage()" type="info">优惠券领取记录</Button>
       </Row>
       <Table
         v-if="refreshTable"
@@ -97,6 +109,13 @@
             @click="remove(row)"
             >删除
           </Button>
+          <Button
+            style="margin: 5px"
+            type="info"
+            size="small"
+            @click="receivePage(row.id)"
+            >领取记录
+          </Button>
         </template>
       </Table>
       <Row type="flex" justify="end" class="mt_10">
@@ -150,12 +169,6 @@ export default {
           align: "center",
           fixed: "left",
         },
-        {
-          title: "活动名称",
-          key: "promotionName",
-          width: 180,
-          fixed: "left",
-        },
         {
           title: "优惠券名称",
           key: "couponName",
@@ -200,6 +213,24 @@ export default {
             return h("div", params.row.usedNum + "/" + params.row.receivedNum);
           },
         },
+        {
+          title: "获取方式",
+          width: 120,
+          key: "getType",
+          render: (h, params) => {
+            if (params.row.getType === "FREE") {
+              return h("Tag", { props: { color: "red" } }, "免费获取");
+            } else if (params.row.getType === "ACTIVITY") {
+              return h("Tag", { props: { color: "volcano" } }, "活动获取");
+            } else if (params.row.getType === "INSIDE") {
+              return h("Tag", { props: { color: "lime" } }, "内购");
+            } else if (params.row.getType === "IGAME") {
+              return h("Tag", { props: { color: "lime" } }, "游戏人生");
+            } else {
+              return h("Tag", { props: { color: "purple" } }, "未知");
+            }
+          },
+        },
         {
           title: "优惠券类型",
           key: "couponType",
@@ -324,6 +355,13 @@ export default {
       // 选中的优惠券
       this.$emit("selected", this.selectList);
     },
+    receivePage(id) {
+      if (id) {
+        this.$router.push({ name: "coupon-receive", query: { couponId: id } });
+      } else {
+        this.$router.push({ name: "coupon-receive" });
+      }
+    },
     // 初始化数据
     init() {
       this.getDataList();
diff --git a/seller/src/api/promotion.js b/seller/src/api/promotion.js
index ea304376..0c6c6976 100644
--- a/seller/src/api/promotion.js
+++ b/seller/src/api/promotion.js
@@ -4,47 +4,47 @@ import { getRequest, postRequest, postRequestWithNoForm, putRequest, deleteReque
 
 // 获取店铺直播间列表
 export const getLiveList = (params) => {
-  return getRequest('/broadcast/studio', params)
+    return getRequest('/broadcast/studio', params)
 }
 // 添加直播间
 export const addLive = (params) => {
-  return postRequest('/broadcast/studio', params)
+    return postRequest('/broadcast/studio', params)
 }
 
 // 获取直播间详情
 export const getLiveInfo = (studioId) => {
-  return getRequest(`/broadcast/studio/studioInfo/${studioId}`)
+    return getRequest(`/broadcast/studio/studioInfo/${studioId}`)
 }
 
 // 修改直播间
 export const editLive = (params) => {
-  return putRequest('/broadcast/studio/edit', params)
+    return putRequest('/broadcast/studio/edit', params)
 }
 
 // 获取店铺直播商品
 export const getLiveGoods = (params) => {
-  return getRequest('/broadcast/commodity', params)
+    return getRequest('/broadcast/commodity', params)
 }
 
 // 店铺直播间删除商品
 export const delLiveGoods = (goodsId) => {
-  return deleteRequest(`/broadcast/commodity/${goodsId}`)
+    return deleteRequest(`/broadcast/commodity/${goodsId}`)
 }
 
 // 直播间删除商品
-export const delRoomLiveGoods = (roomId,liveGoodsId) => {
-  return deleteRequest(`/broadcast/studio/deleteInRoom/${roomId}/${liveGoodsId}`)
+export const delRoomLiveGoods = (roomId, liveGoodsId) => {
+    return deleteRequest(`/broadcast/studio/deleteInRoom/${roomId}/${liveGoodsId}`)
 }
 
 // 添加店铺直播商品
 export const addLiveStoreGoods = (params) => {
-  return postRequestWithNoForm('/broadcast/commodity', params)
+    return postRequestWithNoForm('/broadcast/commodity', params)
 }
 
 // 店铺直播间添加
 export const addLiveGoods = (params) => {
 
-  return putRequest(`/broadcast/studio/push/${params.roomId}/${params.liveGoodsId}`, {goodsId: params.goodsId})
+    return putRequest(`/broadcast/studio/push/${params.roomId}/${params.liveGoodsId}`, { goodsId: params.goodsId })
 }
 
 // 获取拼团列表
@@ -53,11 +53,11 @@ export const getPintuanList = (params) => {
 }
 // 新建 拼团
 export const savePintuan = (params) => {
-    return postRequest('/promotion/pintuan', params,{'Content-type': 'application/json'})
+    return postRequest('/promotion/pintuan', params, { 'Content-type': 'application/json' })
 }
 // 编辑 拼团
 export const editPintuan = (params) => {
-    return putRequest('/promotion/pintuan', params,{'Content-type': 'application/json'})
+    return putRequest('/promotion/pintuan', params, { 'Content-type': 'application/json' })
 }
 // 手动开启拼团活动
 export const editPintuanStatus = (pintuanId, params) => {
@@ -76,17 +76,17 @@ export const getPintuanDetail = (id) => {
 
 // 获取拼团商品列表
 export const getPintuanGoodsList = (params) => {
-    return getRequest(`/promotion/pintuan/goods/${params.pintuanId}`,params)
+    return getRequest(`/promotion/pintuan/goods/${params.pintuanId}`, params)
 }
 
 // 新增优惠券
 export const saveShopCoupon = (params) => {
-    return postRequest('/promotion/coupon', params,{'Content-type': 'application/json'})
+    return postRequest('/promotion/coupon', params, { 'Content-type': 'application/json' })
 }
 
 // 修改优惠券
 export const editShopCoupon = (params) => {
-    return putRequest('/promotion/coupon', params,{'Content-type': 'application/json'})
+    return putRequest('/promotion/coupon', params, { 'Content-type': 'application/json' })
 }
 
 // 获取优惠券列表
@@ -95,7 +95,7 @@ export const getShopCouponList = (params) => {
 }
 
 //  更新优惠券状态
-export const updateCouponStatus = ( params) => {
+export const updateCouponStatus = (params) => {
     return putRequest(`/promotion/coupon/status`, params)
 }
 
@@ -123,17 +123,17 @@ export const deleteMemberReceiveCoupon = (ids, params) => {
 
 // 限时秒杀活动列表
 export const seckillList = (params) => {
-    return getRequest(`/promotion/seckill`,params)
+    return getRequest(`/promotion/seckill`, params)
 }
 
 // 限时秒杀活动商品
 export const seckillGoodsList = (params) => {
-    return getRequest(`/promotion/seckill/apply`,params)
+    return getRequest(`/promotion/seckill/apply`, params)
 }
 
 // 添加限时抢购 商品
 export const setSeckillGoods = (params) => {
-    return postRequest(`/promotion/seckill/apply/${params.seckillId}`,params.applyVos,{'Content-type': 'application/json'})
+    return postRequest(`/promotion/seckill/apply/${params.seckillId}`, params.applyVos, { 'Content-type': 'application/json' })
 }
 
 // 添加限时抢购 商品
@@ -148,20 +148,20 @@ export const seckillDetail = (seckillId) => {
 // 删除秒杀商品
 export const delSeckillGoods = params => {
     return deleteRequest(`/promotion/seckill/apply/${params.seckillId}/${params.id}`);
-  };
+};
 // 满减满赠活动列表
 export const getFullDiscountList = (params) => {
-    return getRequest(`/promotion/fullDiscount`,params)
+    return getRequest(`/promotion/fullDiscount`, params)
 }
 
 // 新增满减活动
 export const newFullDiscount = (params) => {
-    return postRequest(`/promotion/fullDiscount`,params,{'Content-type': 'application/json'})
+    return postRequest(`/promotion/fullDiscount`, params, { 'Content-type': 'application/json' })
 }
 
 // 编辑满减活动
 export const editFullDiscount = (params) => {
-    return putRequest(`/promotion/fullDiscount`,params,{'Content-type': 'application/json'})
+    return putRequest(`/promotion/fullDiscount`, params, { 'Content-type': 'application/json' })
 }
 
 // 通过id获取满减活动
@@ -177,3 +177,8 @@ export const delFullDiscount = (id) => {
 export const updateFullDiscount = (id, params) => {
     return putRequest(`/promotion/fullDiscount/status/${id}`, params)
 }
+
+// 获取优惠券领取记录
+export const getCouponReceiveList = (params) => {
+    return getRequest("/promotion/coupon/received", params);
+};
diff --git a/seller/src/router/router.js b/seller/src/router/router.js
index d4738ba5..61acc146 100644
--- a/seller/src/router/router.js
+++ b/seller/src/router/router.js
@@ -158,6 +158,12 @@ export const otherRouter = {
       name: "renovation",
       component: () => import("@/views/shop/renovation.vue")
     },
+    {
+      path: "promotions/coupon-receive",
+      title: "优惠券领取记录",
+      name: "coupon-receive",
+      component: () => import("@/views/promotion/coupon/coupon-receive.vue"),
+    },
     // {
     //   path: "/*",
     //   name: "error-404",
diff --git a/seller/src/utils/promotions.js b/seller/src/utils/promotions.js
index f6d52378..43d031e1 100644
--- a/seller/src/utils/promotions.js
+++ b/seller/src/utils/promotions.js
@@ -57,4 +57,31 @@ export function promotionsScopeTypeRender(h, params) {
   ]);
 }
 
-
+export function memberPromotionsStatusRender(h, status) {
+  let text = "未知",
+    color = "red";
+  if (status == "NEW") {
+    text = "已领取";
+    color = "geekblue";
+  } else if (status == "USED") {
+    text = "已使用";
+    color = "green";
+  } else if (status == "EXPIRE") {
+    text = "已过期";
+    color = "red";
+  } else if (status == "CLOSED") {
+    text = "已作废";
+    color = "red";
+  }
+  return h("div", [
+    h(
+      "Tag",
+      {
+        props: {
+          color: color,
+        },
+      },
+      text
+    ),
+  ]);
+}
diff --git a/seller/src/views/promotion/coupon/coupon-receive.vue b/seller/src/views/promotion/coupon/coupon-receive.vue
new file mode 100644
index 00000000..1575926c
--- /dev/null
+++ b/seller/src/views/promotion/coupon/coupon-receive.vue
@@ -0,0 +1,285 @@
+<template>
+  <div class="search">
+    <Card>
+      <Button style="margin-bottom: 10px" @click="back()">返回</Button>
+      <Form
+        ref="searchForm"
+        :model="searchForm"
+        inline
+        :label-width="75"
+        class="search-form mb_10"
+      >
+        <Form-item label="优惠券名称" prop="couponName">
+          <Input
+            type="text"
+            v-model="searchForm.couponName"
+            placeholder="请输入优惠券名称"
+            clearable
+            style="width: 200px"
+          />
+        </Form-item>
+        <Form-item label="会员名称" prop="memberName">
+          <Input
+            type="text"
+            v-model="searchForm.memberName"
+            placeholder="请输入会员名称"
+            clearable
+            style="width: 200px"
+          />
+        </Form-item>
+        <Form-item label="优惠券状态" prop="memberCouponStatus">
+          <Select
+            v-model="searchForm.memberCouponStatus"
+            placeholder="请选择"
+            clearable
+            style="width: 200px"
+          >
+            <Option value="NEW">已领取</Option>
+            <Option value="USED">已使用</Option>
+            <Option value="EXPIRE">已过期</Option>
+            <Option value="CLOSED">已作废</Option>
+          </Select>
+        </Form-item>
+        <Form-item label="活动时间">
+          <DatePicker
+            v-model="selectDate"
+            type="daterange"
+            clearable
+            placeholder="选择起始时间"
+            style="width: 200px"
+          ></DatePicker>
+        </Form-item>
+        <Button
+          @click="handleSearch"
+          type="primary"
+          icon="ios-search"
+          class="search-btn"
+          >搜索</Button
+        >
+      </Form>
+      <Table
+        v-if="refreshTable"
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        class="mt_10"
+        @on-selection-change="changeSelect"
+      >
+      </Table>
+      <Row type="flex" justify="end" class="mt_10">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
+  </div>
+</template>
+<script>
+import { getCouponReceiveList } from "@/api/promotion";
+import {
+  memberPromotionsStatusRender,
+  promotionsScopeTypeRender,
+} from "@/utils/promotions";
+
+export default {
+  name: "coupon-recevie",
+  data() {
+    return {
+      loading: true, // 表单加载状态
+      searchForm: {
+        // 搜索框初始化对象
+        pageNumber: 1, // 当前页数
+        pageSize: 10, // 页面大小
+        sort: "create_time", // 默认排序字段
+        order: "desc", // 默认排序方式
+        getType: "", // 默认排序方式
+        couponId: this.$route.query.couponId, // 优惠券id
+      },
+      selectList: [], // 多选数据
+      selectCount: 0, // 多选计数
+      columns: [
+        // 表头
+        {
+          title: "会员名称",
+          key: "memberName",
+          fixed: "left",
+        },
+        {
+          title: "优惠券名称",
+          key: "couponName",
+          minWidth: 100,
+          tooltip: true,
+        },
+        {
+          title: "面额/折扣",
+          key: "price",
+          width: 100,
+          render: (h, params) => {
+            if (params.row.price) {
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.price, "￥")
+              );
+            } else {
+              return h("div", params.row.discount + "折");
+            }
+          },
+        },
+
+        {
+          title: "使用门槛",
+          key: "consumeThreshold",
+          width: 130,
+        },
+        {
+          title: "会员优惠券状态",
+          width: 130,
+          key: "memberCouponStatus",
+          render: (h, params) => {
+            return memberPromotionsStatusRender(
+              h,
+              params.row.memberCouponStatus
+            );
+          },
+        },
+        {
+          title: "优惠券类型",
+          key: "couponType",
+          width: 120,
+          render: (h, params) => {
+            if (params.row.couponType === "DISCOUNT") {
+              return h("Tag", { props: { color: "orange" } }, "打折");
+            } else if (params.row.couponType === "PRICE") {
+              return h("Tag", { props: { color: "magenta" } }, "减免现金");
+            } else {
+              return h("Tag", { props: { color: "purple" } }, "未知");
+            }
+          },
+        },
+        {
+          title: "品类描述",
+          key: "scopeType",
+          width: 120,
+          render: (h, params) => {
+            return promotionsScopeTypeRender(h, params);
+          },
+        },
+        {
+          title: "有效时间",
+          width: 150,
+          render: (h, params) => {
+            if (
+              params?.row?.getType === "ACTIVITY" &&
+              params?.row?.rangeDayType === "DYNAMICTIME"
+            ) {
+              return h("div", "长期有效");
+            } else if (params?.row?.startTime && params?.row?.endTime) {
+              return h("div", {
+                domProps: {
+                  innerHTML:
+                    params.row.startTime + "<br/>" + params.row.endTime,
+                },
+              });
+            }
+          },
+        },
+      ],
+      data: [], // 表单数据
+      total: 0, // 表单数据总数
+      refreshTable: true, // 修改选中状态后刷新表格
+      selectDate: [], //选中的信息
+    };
+  },
+  props: {
+    promotionStatus: {
+      type: String,
+      default: "",
+    },
+  },
+  watch: {
+    $route(e) {
+      // 监听路由，参数变化调取接口
+      this.searchForm.couponId = e.query.couponId;
+      if (this.couponId) {
+        this.getDataList();
+      } else {
+        this.$refs.form.resetFields();
+      }
+    },
+  },
+  methods: {
+    back() {
+      this.$store.commit("removeTag", "coupon-receive");
+      this.$router.go(-1);
+    },
+    check() {
+      // 选中的优惠券
+      this.$emit("selected", this.selectList);
+    },
+    // 初始化数据
+    init() {
+      this.getDataList();
+    },
+    changePage(v) {
+      // 改变页码
+      this.searchForm.pageNumber = v;
+      this.getDataList();
+    },
+    changePageSize(v) {
+      // 改变页数
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = v;
+      this.getDataList();
+    },
+    handleSearch() {
+      // 搜索
+      this.searchForm.pageNumber = 1;
+      this.searchForm.pageSize = 10;
+      this.getDataList();
+    },
+    /**
+     * 选择优惠券
+     */
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+      if (this.getType === "ACTIVITY") this.check();
+    },
+    getDataList() {
+      // 获取数据
+      this.loading = true;
+      if (this.selectDate && this.selectDate[0] && this.selectDate[1]) {
+        this.searchForm.startTime = this.selectDate[0].getTime();
+        this.searchForm.endTime = this.selectDate[1].getTime();
+      } else {
+        this.searchForm.startTime = null;
+        this.searchForm.endTime = null;
+      }
+      getCouponReceiveList(this.searchForm).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          console.log(res);
+          this.data = res.result.records;
+          this.total = res.result.total;
+        }
+      });
+      this.total = this.data.length;
+      this.loading = false;
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
diff --git a/seller/src/views/promotion/coupon/coupon.vue b/seller/src/views/promotion/coupon/coupon.vue
index cbaddaec..39cf4ae2 100644
--- a/seller/src/views/promotion/coupon/coupon.vue
+++ b/seller/src/views/promotion/coupon/coupon.vue
@@ -53,6 +53,7 @@
       <Row class="operator padding-row">
         <Button @click="add" type="primary">添加</Button>
         <Button @click="delAll" class="ml_10">批量关闭</Button>
+        <Button @click="receivePage()" class="ml_10" type="info">优惠券领取记录</Button>
       </Row>
       <Table
         class="mt_10"
@@ -86,6 +87,13 @@
             @click="remove(row)"
             >关闭</Button
           >
+          <Button
+            style="margin: 5px"
+            type="info"
+            size="small"
+            @click="receivePage(row.id)"
+            >领取记录
+          </Button>
         </template>
       </Table>
       <Row type="flex" justify="end" class="mt_10">
@@ -136,11 +144,6 @@ export default {
           align: "center",
           fixed: "left",
         },
-        {
-          title: "活动名称",
-          key: "promotionName",
-          fixed: "left",
-        },
         {
           title: "优惠券名称",
           key: "couponName",
@@ -204,7 +207,7 @@ export default {
         },
         {
           title: "活动时间",
-
+          width: 150,
           render: (h, params) => {
             if (
               params?.row?.getType === "ACTIVITY" &&
@@ -246,6 +249,13 @@ export default {
     init() {
       this.getDataList();
     },
+    receivePage(id) {
+      if (id) {
+        this.$router.push({ name: "coupon-receive", query: { couponId: id } });
+      } else {
+        this.$router.push({ name: "coupon-receive" });
+      }
+    },
     add() {
       this.$router.push({ name: "add-coupon" });
     },

From 8ea3843d61424942cb126d0e2077fa179bf2ae55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A8=8B?= <994041296@163.com>
Date: Wed, 11 Jan 2023 18:24:18 +0800
Subject: [PATCH 03/16] =?UTF-8?q?=E8=B6=B3=E8=BF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im/src/components/chat/panel/OtherLink.vue    |   4 +-
 im/src/components/chat/panel/TalkPanel.vue    |   1 -
 .../chat/panel/template/footPrint.vue         |  31 ++--
 .../chat/panel/template/goodsLink.vue         |   4 +-
 im/src/components/editor/MeEditor.vue         | 144 +++++++-----------
 im/src/components/layout/WelcomeModule.vue    |   5 +-
 im/src/im-server/event/talk.js                |  25 +--
 im/src/plugins/ws-socket.js                   |   1 -
 im/src/store/modules/talk.js                  |   2 -
 im/src/utils/talk.js                          |  11 +-
 im/src/views/message/index.vue                |   9 +-
 11 files changed, 103 insertions(+), 134 deletions(-)

diff --git a/im/src/components/chat/panel/OtherLink.vue b/im/src/components/chat/panel/OtherLink.vue
index d5160d29..99dc4163 100644
--- a/im/src/components/chat/panel/OtherLink.vue
+++ b/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"
@@ -71,7 +71,6 @@ export default {
   },
   mounted () {
     localStorage.setItem('storeFlag', this.toUser.storeFlag)
-    console.log(this.toUser.storeFlag, 'this.toUser.storeFlag');
     if (this.toUser.storeFlag) {
       this.getStoreDetail()
     } else {
@@ -143,6 +142,7 @@ export default {
           // this.orderPrintList.push(...res.result.records)
         }
       })
+      console.log("this.orderPrintListthis.orderPrintList", this.orderPrintList);
     },
 
     // 发送消息回调事件
diff --git a/im/src/components/chat/panel/TalkPanel.vue b/im/src/components/chat/panel/TalkPanel.vue
index d5f94735..e5f5a787 100644
--- a/im/src/components/chat/panel/TalkPanel.vue
+++ b/im/src/components/chat/panel/TalkPanel.vue
@@ -472,7 +472,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
diff --git a/im/src/components/chat/panel/template/footPrint.vue b/im/src/components/chat/panel/template/footPrint.vue
index 9d44c255..fcfdf36e 100644
--- a/im/src/components/chat/panel/template/footPrint.vue
+++ b/im/src/components/chat/panel/template/footPrint.vue
@@ -7,7 +7,8 @@
             <dd v-for="item in list" v-infinite-scroll="loadMore">
               <div class="base">
                 <div>
-                  <img style="width: 60px; height: 60px;" :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 class="recent_views">
                   <el-tooltip class="item" effect="dark" :content="item.goodsName" placement="top-start">
@@ -17,13 +18,14 @@
                   <div style="display: flex;">
                     <div style="margin-top: 20px;">
                       <span style="color: red;">￥{{ item.price }}</span>
+                      <div class="goods_store_button">
+                        <el-button type="danger" v-if="item.btnHide == 1 && toUser.storeFlag" size="mini"
+                          @click="submitSendGoodsMessage(item)" plain>发送</el-button>
+                      </div>
                     </div>
                   </div>
                 </div>
-                <div>
-                  <el-button class="goods_store_button" type="danger" v-if="item.btnHide == 1" size="mini"
-                    @click="submitSendGoodsMessage(item)" plain>发送</el-button>
-                </div>
+
               </div>
               <div class="Underline"></div>
             </dd>
@@ -43,8 +45,8 @@
                     <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" size="mini"
-                      @click="submitSendOrderMessage(item, index)" plain>发送</el-button>
+                    <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">
@@ -85,7 +87,6 @@ export default {
     ...mapGetters(["talkItems"]),
     ...mapState({
       id: (state) => state.user.id,
-
       toUser: (state) => state.user.toUser,
     }),
   },
@@ -163,10 +164,11 @@ export default {
     orderList: {
       type: Array,
       default: []
-    }
+    },
   },
   mounted () {
-    console.log(this.orderList, 'orderList');
+    //  state.user.toUser
+    console.log(this.$store.state.user.toUser, '  this.$store.state.user.toUser  this.$store.state.user.toUser  this.$store.state.user.toUser');
     this.btnHide = localStorage.getItem('btnHide')
   }
 }
@@ -185,6 +187,8 @@ export default {
 
 .Underline {
   border: 1px solid silver;
+  width: 90%;
+  margin: 0 auto;
 }
 
 .recent_views {
@@ -322,12 +326,11 @@ export default {
 }
 
 .goods_store_button {
+  display: inline;
   background-color: white;
   border-color: #F56C6C;
-  margin-top: 10px;
-  position: relative;
-  right: 60%;
-  top: 45%;
+  position: absolute;
+  left: 70%;
 }
 
 .base {
diff --git a/im/src/components/chat/panel/template/goodsLink.vue b/im/src/components/chat/panel/template/goodsLink.vue
index 570f0c3f..c8424810 100644
--- a/im/src/components/chat/panel/template/goodsLink.vue
+++ b/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="sendFlag && btnHide == 1 && toUser.storeFlag" size="mini"
             @click="submitSendMessage()" plain>发送</el-button>
         </div>
       </div>
@@ -169,7 +169,7 @@ export default {
   .image {
     height: 100px;
     margin-top: 3px;
-    width: 100px
+    width: 100px;
   }
 
 }
diff --git a/im/src/components/editor/MeEditor.vue b/im/src/components/editor/MeEditor.vue
index cc0605c0..742163c3 100644
--- a/im/src/components/editor/MeEditor.vue
+++ b/im/src/components/editor/MeEditor.vue
@@ -33,99 +33,66 @@
             <p class="tip-title">发起投票</p>
           </li> -->
 
-<!--          <p class="text-tips no-select">-->
-<!--            <span>按Enter发送 / Shift+Enter 换行</span>-->
-<!--            <el-popover placement="top-end" width="600" trigger="click">-->
-<!--              <div class="editor-books">-->
-<!--                <div class="books-title">编辑说明:</div>-->
-<!--                <p>-->
-<!--                  1.-->
-<!--                  支持上传QQ及微信截图，在QQ或微信中截图后使用Ctrl+v上传图片。-->
-<!--                </p>-->
-<!--                <p>-->
-<!--                  2.-->
-<!--                  支持浏览器及Word文档中的图片复制上传、复制后使用Ctrl+v上传图片。-->
-<!--                </p>-->
-<!--                <p>3. 支持图片拖拽上传。</p>-->
-<!--                <p>4. 支持文件上传 ( 文件小于100M ) 。</p>-->
-<!--                <p>5. 按Enter发送 / Shift+Enter 换行。</p>-->
-<!--                <p>-->
-<!--                  6.-->
-<!--                  注意：当文件正在上传时，请勿关闭网页或离开当前对话框，否则将导致文件停止上传或上传失败。-->
-<!--                </p>-->
-<!--              </div>-->
-<!--              <i class="el-icon-info" slot="reference" />-->
-<!--            </el-popover>-->
-<!--          </p>-->
+          <!--          <p class="text-tips no-select">-->
+          <!--            <span>按Enter发送 / Shift+Enter 换行</span>-->
+          <!--            <el-popover placement="top-end" width="600" trigger="click">-->
+          <!--              <div class="editor-books">-->
+          <!--                <div class="books-title">编辑说明:</div>-->
+          <!--                <p>-->
+          <!--                  1.-->
+          <!--                  支持上传QQ及微信截图，在QQ或微信中截图后使用Ctrl+v上传图片。-->
+          <!--                </p>-->
+          <!--                <p>-->
+          <!--                  2.-->
+          <!--                  支持浏览器及Word文档中的图片复制上传、复制后使用Ctrl+v上传图片。-->
+          <!--                </p>-->
+          <!--                <p>3. 支持图片拖拽上传。</p>-->
+          <!--                <p>4. 支持文件上传 ( 文件小于100M ) 。</p>-->
+          <!--                <p>5. 按Enter发送 / Shift+Enter 换行。</p>-->
+          <!--                <p>-->
+          <!--                  6.-->
+          <!--                  注意：当文件正在上传时，请勿关闭网页或离开当前对话框，否则将导致文件停止上传或上传失败。-->
+          <!--                </p>-->
+          <!--              </div>-->
+          <!--              <i class="el-icon-info" slot="reference" />-->
+          <!--            </el-popover>-->
+          <!--          </p>-->
         </ul>
 
-        <el-popover
-          ref="popoverEmoticon"
-          placement="top-start"
-          trigger="click"
-          width="300"
-          popper-class="no-padding el-popover-em"
-        >
+        <el-popover ref="popoverEmoticon" placement="top-start" trigger="click" width="300"
+          popper-class="no-padding el-popover-em">
           <MeEditorEmoticon ref="editorEmoticon" @selected="selecteEmoticon" />
         </el-popover>
 
-        <form
-          enctype="multipart/form-data"
-          style="display: none"
-          ref="fileFrom"
-        >
-          <input
-            type="file"
-            ref="restFile"
-            accept="image/*"
-            @change="uploadImageChange"
-          />
+        <form enctype="multipart/form-data" 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
-          ref="textarea"
-          v-paste="pasteImage"
-          v-drag="dragPasteImage"
-          v-model.trim="editorText"
-          rows="6"
-          placeholder="你想要的聊点什么呢 ..."
-          @keydown="keydownEvent($event)"
-          @input="inputEvent($event)"
-        />
+        <textarea ref="textarea" v-paste="pasteImage" v-drag="dragPasteImage" v-model.trim="editorText" rows="6"
+          placeholder="你想要的聊点什么呢 ..." @keydown="keydownEvent($event)" @input="inputEvent($event)" />
       </el-main>
     </el-container>
 
     <!-- 图片查看器 -->
-    <MeEditorImageView
-      ref="imageViewer"
-      v-model="imageViewer.isShow"
-      :file="imageViewer.file"
-      @confirm="confirmUploadImage"
-    />
+    <MeEditorImageView ref="imageViewer" v-model="imageViewer.isShow" :file="imageViewer.file"
+      @confirm="confirmUploadImage" />
 
     <MeEditorRecorder v-if="recorder" @close="recorder = false" />
 
     <!-- 代码块编辑器 -->
-    <TalkCodeBlock
-      v-if="codeBlock.isShow"
-      :edit-mode="codeBlock.editMode"
-      @close="codeBlock.isShow = false"
-      @confirm="confirmCodeBlock"
-    />
+    <TalkCodeBlock v-if="codeBlock.isShow" :edit-mode="codeBlock.editMode" @close="codeBlock.isShow = false"
+      @confirm="confirmCodeBlock" />
 
     <!-- 文件上传管理器 -->
     <MeEditorFileManage ref="filesManager" v-model="filesManager.isShow" />
 
-    <MeEditorVote
-      v-if="vote.isShow"
-      @close="
-        () => {
-          this.vote.isShow = false;
-        }
-      "
-    />
+    <MeEditorVote v-if="vote.isShow" @close="
+  () => {
+    this.vote.isShow = false;
+  }
+    " />
   </div>
 </template>
 
@@ -156,20 +123,20 @@ export default {
     MeEditorVote,
   },
   computed: {
-    talkUser() {
+    talkUser () {
       return this.$store.state.dialogue.index_name;
     },
-    isGroupTalk() {
+    isGroupTalk () {
       return this.$store.state.dialogue.talk_type == 2;
     },
   },
   watch: {
-    talkUser(n_index_name) {
+    talkUser (n_index_name) {
       this.$refs.filesManager.clear();
       this.editorText = this.getDraftText(n_index_name);
     },
   },
-  data() {
+  data () {
     return {
       // 当前编辑的内容
       editorText: "",
@@ -205,13 +172,13 @@ export default {
   },
   methods: {
     // 读取对话编辑草稿信息 并赋值给当前富文本
-    getDraftText(index_name) {
+    getDraftText (index_name) {
       console.log("findTalk(index_name)", findTalk(index_name));
       return findTalk(index_name)?.draft_text || "";
     },
 
     //复制粘贴图片回调方法
-    pasteImage(e) {
+    pasteImage (e) {
       let files = getPasteImgs(e);
       if (files.length == 0) return;
 
@@ -219,19 +186,19 @@ export default {
     },
 
     //拖拽上传图片回调方法
-    dragPasteImage(e) {
+    dragPasteImage (e) {
       let files = getDragPasteImg(e);
       if (files.length == 0) return;
 
       this.openImageViewer(files[0]);
     },
 
-    inputEvent(e) {
+    inputEvent (e) {
       this.$emit("keyboard-event", e.target.value);
     },
 
     // 键盘按下监听事件
-    keydownEvent(e) {
+    keydownEvent (e) {
       if (e.keyCode == 13 && this.editorText == "") {
         e.preventDefault();
       }
@@ -256,13 +223,13 @@ export default {
     },
 
     // 选择图片文件后回调方法
-    uploadImageChange(e) {
+    uploadImageChange (e) {
       this.openImageViewer(e.target.files[0]);
       this.$refs.restFile.value = null;
     },
 
     // 选择文件回调事件
-    uploadFileChange(e) {
+    uploadFileChange (e) {
       let maxsize = 100 * 1024 * 1024;
       if (e.target.files.length == 0) {
         return false;
@@ -288,13 +255,13 @@ export default {
     },
 
     // 打开图片查看器
-    openImageViewer(file) {
+    openImageViewer (file) {
       this.imageViewer.isShow = true;
       this.imageViewer.file = file;
     },
 
     // 代码块编辑器确认完成回调事件
-    confirmCodeBlock(data) {
+    confirmCodeBlock (data) {
       const { talk_type, receiver_id } = this.$store.state.dialogue;
       ServeSendTalkCodeBlock({
         talk_type,
@@ -315,7 +282,7 @@ export default {
     },
 
     // 确认上传图片消息回调事件
-    confirmUploadImage() {
+    confirmUploadImage () {
       let fileData = new FormData();
       fileData.append("file", this.imageViewer.file);
 
@@ -340,7 +307,8 @@ export default {
     },
 
     // 选中表情包回调事件
-    selecteEmoticon(data) {
+    selecteEmoticon (data) {
+      console.log(data);
       if (data.type == 1) {
         let value = this.editorText;
         let el = this.$refs.textarea;
@@ -362,6 +330,8 @@ export default {
         }
       } else {
         const { talk_type, receiver_id } = this.$store.state.dialogue;
+        console.log(talk_type);
+        console.log(receiver_id);
         ServeSendEmoticon({
           talk_type,
           receiver_id,
diff --git a/im/src/components/layout/WelcomeModule.vue b/im/src/components/layout/WelcomeModule.vue
index 7d2fa6c0..cc9d3e79 100644
--- a/im/src/components/layout/WelcomeModule.vue
+++ b/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>
@@ -10,10 +9,10 @@
 <script>
 export default {
   components: {},
-  data() {
+  data () {
     return {}
   },
-  created() {},
+  created () { },
   methods: {},
 }
 </script>
diff --git a/im/src/im-server/event/talk.js b/im/src/im-server/event/talk.js
index ddc61385..52d487d9 100644
--- a/im/src/im-server/event/talk.js
+++ b/im/src/im-server/event/talk.js
@@ -46,9 +46,9 @@ class Talk extends Base {
     this.resource = resource;
 
     // 判断发送者消息是否在当前用户列表中 
-    if(this.sender_id && !vm.$store.state.talks.items.find(item=>{
+    if (this.sender_id && !vm.$store.state.talks.items.find(item => {
       return item.userId == this.sender_id
-    })){
+    })) {
       // 没有当前用户，未在当前列表 进行重新加载
       vm.loadUserSetting('update')
     }
@@ -58,7 +58,7 @@ class Talk extends Base {
    * 判断消息发送者是否来自于我
    * @returns
    */
-  isCurrSender() {
+  isCurrSender () {
     // console.log("sender_id", this.sender_id);
     return this.sender_id == this.getAccountId();
   }
@@ -68,7 +68,7 @@ class Talk extends Base {
    *
    * @return String
    */
-  getIndexName() {
+  getIndexName () {
     if (this.talk_type == 2) {
       return `${this.talk_type}_${this.receiver_id}`;
     }
@@ -83,7 +83,7 @@ class Talk extends Base {
    *
    * @returns
    */
-  getFloatType() {
+  getFloatType () {
     let userId = this.resource.userId;
 
     if (userId == 0) return "center";
@@ -94,18 +94,21 @@ class Talk extends Base {
   /**
    * 获取聊天列表左侧的对话信息
    */
-  getTalkText() {
+  getTalkText () {
     let text = this.resource.content || this.resource.text;
     switch (this.resource.msg_type) {
       case 'GOODS':
         text = "[商品链接]";
         break;
+      case 'ORDERS':
+        text = "[订单链接]";
+        break;
     }
 
     return text;
   }
 
-  handle() {
+  handle () {
     let store = this.getStoreInstance();
     // console.log("触发handle");
     // 判断当前是否在聊天页面
@@ -131,7 +134,7 @@ class Talk extends Base {
    * 显示消息提示
    * @returns
    */
-  showMessageNocice() {
+  showMessageNocice () {
     let avatar = this.resource.avatar;
     let nickname = this.resource.nickname;
     let talk_type = this.resource.talk_type;
@@ -167,7 +170,7 @@ class Talk extends Base {
   /**
    * 加载对接节点
    */
-  addTalkItem() {
+  addTalkItem () {
     let receiver_id = this.sender_id;
     let talk_type = this.talk_type;
 
@@ -188,7 +191,7 @@ class Talk extends Base {
   /**
    * 插入对话记录
    */
-  insertTalkRecord() {
+  insertTalkRecord () {
     let store = this.getStoreInstance();
     let record = this.resource;
     // console.log("插入谈话记录", record);
@@ -238,7 +241,7 @@ class Talk extends Base {
   /**
    * 更新对话列表记录
    */
-  updateTalkItem() {
+  updateTalkItem () {
     let store = this.getStoreInstance();
 
     store.commit("INCR_UNREAD_NUM");
diff --git a/im/src/plugins/ws-socket.js b/im/src/plugins/ws-socket.js
index 802d0b17..e7516700 100644
--- a/im/src/plugins/ws-socket.js
+++ b/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;
   }
diff --git a/im/src/store/modules/talk.js b/im/src/store/modules/talk.js
index 10882241..d52847d4 100644
--- a/im/src/store/modules/talk.js
+++ b/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)
     },
 
diff --git a/im/src/utils/talk.js b/im/src/utils/talk.js
index 2322882d..b8c12920 100644
--- a/im/src/utils/talk.js
+++ b/im/src/utils/talk.js
@@ -10,7 +10,7 @@ const KEY_INDEX_NAME = "send_message_index_name";
  *
  * @param {String} index_name
  */
-export function findTalkIndex(index_name) {
+export function findTalkIndex (index_name) {
   return store.state.talks.items.findIndex(
     (item) => item.index_name == index_name
   );
@@ -21,7 +21,7 @@ export function findTalkIndex(index_name) {
  *
  * @param {String} index_name
  */
-export function findTalk(index_name) {
+export function findTalk (index_name) {
   return store.state.talks.items.find((item) => item.index_name == index_name);
 }
 
@@ -30,8 +30,7 @@ export function findTalk(index_name) {
  *
  * @param {Object} params
  */
-export function formatTalkItem(params) {
-  console.log(params);
+export function formatTalkItem (params) {
   let options = {
     id: "",
     disable: false,
@@ -58,7 +57,7 @@ export function formatTalkItem(params) {
  * @param {Integer} talk_type 对话类型[1:私聊;2:群聊;]
  * @param {Integer} receiver_id 接收者ID
  */
-export function toTalk(talk_type, receiver_id) {
+export function toTalk (talk_type, receiver_id) {
   ServeCreateTalkList(receiver_id).then(({ code, data }) => {
     console.log("ServeCreateTalkList", data);
     if (code == 200) {
@@ -78,7 +77,7 @@ export function toTalk(talk_type, receiver_id) {
  *
  * @returns
  */
-export function getCacheIndexName() {
+export function getCacheIndexName () {
   let index_name = sessionStorage.getItem(KEY_INDEX_NAME);
   if (index_name) {
     sessionStorage.removeItem(KEY_INDEX_NAME);
diff --git a/im/src/views/message/index.vue b/im/src/views/message/index.vue
index f56f8eba..f5a869ca 100644
--- a/im/src/views/message/index.vue
+++ b/im/src/views/message/index.vue
@@ -80,8 +80,8 @@
                         <div class="card-name">
                           <p class="nickname">
                             {{
-    item.remark_name ? item.remark_name : item.name
-}}
+                              item.remark_name ? item.remark_name : item.name
+                            }}
                           </p>
                           <div v-show="item.unread" class="larkc-tag">
                             {{ item.unread }}条未读
@@ -112,8 +112,8 @@
                       </div>
                       <div class="content">
                         <template v-if="
-  index_name != item.index_name && item.draft_text
-">
+                          index_name != item.index_name && item.draft_text
+                        ">
                           <span class="draft-color">[草稿]</span>
                           <span>{{ item.draft_text }}</span>
                         </template>
@@ -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],

From 83f145767e46e285dd7dd7f1811ccb0639e09186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Thu, 12 Jan 2023 11:07:25 +0800
Subject: [PATCH 04/16] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9config=20AP?=
 =?UTF-8?q?I=5FDEV=E4=B8=BA=E7=BA=BF=E4=B8=8A=E6=8E=A9=E9=A5=B0=E7=AB=99?=
 =?UTF-8?q?=E7=82=B9api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/public/config.js |  8 ++++----
 seller/public/config.js  | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/manager/public/config.js b/manager/public/config.js
index 7ef1cf91..ada826fc 100644
--- a/manager/public/config.js
+++ b/manager/public/config.js
@@ -3,10 +3,10 @@ var BASE = {
      * @description api请求基础路径
      */
     API_DEV: {
-      common: "http://192.168.0.113:8890",
-      buyer: "http://192.168.0.113:8888",
-      seller: "http://192.168.0.113:8889",
-      manager: "http://192.168.0.113:8887"
+      common: "https://common-api.pickmall.cn",
+      buyer: "https://buyer-api.pickmall.cn",
+      seller: "https://store-api.pickmall.cn",
+      manager: "https://admin-api.pickmall.cn"
     },
     API_PROD: {
       common: "https://common-api.pickmall.cn",
diff --git a/seller/public/config.js b/seller/public/config.js
index 8e0e70ba..87161bcb 100644
--- a/seller/public/config.js
+++ b/seller/public/config.js
@@ -3,16 +3,16 @@ var BASE = {
    * @description api请求基础路径
    */
   API_DEV: {
-    common: "http://192.168.0.113:8890",
-    buyer: "http://192.168.0.113:8888",
-    seller: "http://192.168.0.113:8889",
-    manager: "http://192.168.0.113:8887"
+    common: "https://common-api.pickmall.cn",
+    buyer: "https://buyer-api.pickmall.cn",
+    seller: "https://store-api.pickmall.cn",
+    manager: "https://admin-api.pickmall.cn",
   },
   API_PROD: {
     common: "https://common-api.pickmall.cn",
     buyer: "https://buyer-api.pickmall.cn",
     seller: "https://store-api.pickmall.cn",
-    manager: "https://admin-api.pickmall.cn"
+    manager: "https://admin-api.pickmall.cn",
   },
   /**
    * @description // 跳转买家端地址 pc端
@@ -25,5 +25,5 @@ var BASE = {
   /**
    *  @description api请求基础路径前缀
    */
-  PREFIX: "/store"
+  PREFIX: "/store",
 };

From 7e33598b8e4d76b4d95da1b44c0df8543fc0197b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A8=8B?= <994041296@163.com>
Date: Thu, 12 Jan 2023 14:34:38 +0800
Subject: [PATCH 05/16] =?UTF-8?q?=E5=AE=BD=E5=BA=A6=EF=BC=8C=E8=A1=A8?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/GoodsDetail.vue               |  24 +-
 im/src/components/chat/panel/TalkPanel.vue    |   3 +
 .../chat/panel/template/footPrint.vue         |   8 +-
 im/src/utils/emojis.js                        | 238 +++++++++---------
 im/src/views/layout/MainLayout.vue            |  14 +-
 seller/src/views/home/home.vue                |   4 +-
 6 files changed, 147 insertions(+), 144 deletions(-)

diff --git a/buyer/src/pages/GoodsDetail.vue b/buyer/src/pages/GoodsDetail.vue
index 736102a2..929db852 100644
--- a/buyer/src/pages/GoodsDetail.vue
+++ b/buyer/src/pages/GoodsDetail.vue
@@ -81,19 +81,8 @@ export default {
         this.$Message.error("请登录后再联系客服");
         return;
       }
-      // window.open(
-      //   this.IMLink +
-      //   "?token=" +
-      //   accessToken +
-      //   "&id=" +
-      //   this.goodsMsg.data.storeId +
-      //   "&goodsId=" +
-      //   this.goodsMsg.data.goodsId +
-      //   "&skuId=" +
-      //   this.goodsMsg.data.id
-      // );
       window.open(
-        'http://192.168.0.139:8000/' +
+        this.IMLink +
         "?token=" +
         accessToken +
         "&id=" +
@@ -103,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 () {
diff --git a/im/src/components/chat/panel/TalkPanel.vue b/im/src/components/chat/panel/TalkPanel.vue
index e5f5a787..a85d6c0c 100644
--- a/im/src/components/chat/panel/TalkPanel.vue
+++ b/im/src/components/chat/panel/TalkPanel.vue
@@ -500,6 +500,9 @@ export default {
           if (item.messageType == 'GOODS') {
             item.text = JSON.parse(item.text)
           }
+          if (item.messageType == 'MESSAGE') {
+            item.text = textReplaceEmoji(item.text)
+          }
           if (item.messageType == 'ORDER') {
             item.text = JSON.parse(item.text)
           }
diff --git a/im/src/components/chat/panel/template/footPrint.vue b/im/src/components/chat/panel/template/footPrint.vue
index fcfdf36e..a725727e 100644
--- a/im/src/components/chat/panel/template/footPrint.vue
+++ b/im/src/components/chat/panel/template/footPrint.vue
@@ -51,11 +51,11 @@
                 </div>
                 <div class="order_footer">
                   <span> 订单金额： <span style="color: red;">￥{{ item.orderItems[0].goodsPrice }}</span></span>
-                  <span class="order_status"
-                    :style="{ 'color': item.orderStatus == 'CANCELLED' || item.orderStatus == 'UNPAID' || item.orderStatus == ' TAKE' ? '#5a606b' : '#f23030' }">{{
+                  <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' ? '待校验' : ''
+      ? '已发货' : item.orderStatus == 'COMPLETED' ? '已完成' : item.orderStatus == 'TAKE' ? '待校验' : ''
                     }}</span>
                 </div>
 
@@ -168,7 +168,7 @@ export default {
   },
   mounted () {
     //  state.user.toUser
-    console.log(this.$store.state.user.toUser, '  this.$store.state.user.toUser  this.$store.state.user.toUser  this.$store.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')
   }
 }
diff --git a/im/src/utils/emojis.js b/im/src/utils/emojis.js
index 030fda59..5a71fe7e 100644
--- a/im/src/utils/emojis.js
+++ b/im/src/utils/emojis.js
@@ -2,129 +2,129 @@
  * 动态表情
  */
 const emojis = {
-    "[微笑]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/0.gif'>",
-    "[撇嘴]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/1.gif'>",
-    "[色]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/2.gif'>",
-    "[发呆]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/3.gif'>",
-    "[得意]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/4.gif'>",
-    "[流泪]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/5.gif'>",
-    "[害羞]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/6.gif'>",
-    "[闭嘴]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/7.gif'>",
-    "[睡]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/8.gif'>",
-    "[大哭]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/9.gif'>",
-    "[尴尬]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/10.gif'>",
-    "[发怒]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/11.gif'>",
-    "[调皮]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/12.gif'>",
-    "[呲牙]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/13.gif'>",
-    "[惊讶]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/14.gif'>",
-    "[难过]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/15.gif'>",
-    "[酷]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/16.gif'>",
-    "[冷汗]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/17.gif'>",
-    "[抓狂]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/18.gif'>",
-    "[吐]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/19.gif'>",
-    "[偷笑]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/20.gif'>",
-    "[可爱]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/21.gif'>",
-    "[白眼]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/22.gif'>",
-    "[傲慢]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/23.gif'>",
-    "[饥饿]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/24.gif'>",
-    "[困]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/25.gif'>",
-    "[惊恐]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/26.gif'>",
-    "[流汗]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/27.gif'>",
-    "[憨笑]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/28.gif'>",
-    "[大兵]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/29.gif'>",
-    "[奋斗]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/30.gif'>",
-    "[咒骂]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/31.gif'>",
-    "[疑问]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/32.gif'>",
-    "[嘘]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/33.gif'>",
-    "[晕]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/34.gif'>",
-    "[折磨]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/35.gif'>",
-    "[衰]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/36.gif'>",
-    "[骷髅]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/37.gif'>",
-    "[敲打]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/38.gif'>",
-    "[再见]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/39.gif'>",
-    "[擦汗]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/40.gif'>",
-    "[抠鼻]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/41.gif'>",
-    "[鼓掌]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/42.gif'>",
-    "[糗大了]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/43.gif'>",
-    "[坏笑]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/44.gif'>",
-    "[左哼哼]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/45.gif'>",
-    "[右哼哼]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/46.gif'>",
-    "[哈欠]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/47.gif'>",
-    "[鄙视]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/48.gif'>",
-    "[委屈]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/49.gif'>",
-    "[快哭了]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/50.gif'>",
-    "[阴险]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/51.gif'>",
-    "[亲亲]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/52.gif'>",
-    "[吓]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/53.gif'>",
-    "[可怜]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/54.gif'>",
-    "[菜刀]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/55.gif'>",
-    "[西瓜]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/56.gif'>",
-    "[啤酒]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/57.gif'>",
-    "[篮球]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/58.gif'>",
-    "[乒乓]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/59.gif'>",
-    "[咖啡]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/60.gif'>",
-    "[饭]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/61.gif'>",
-    "[猪头]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/62.gif'>",
-    "[玫瑰]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/63.gif'>",
-    "[凋谢]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/64.gif'>",
-    "[示爱]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/65.gif'>",
-    "[爱心]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/66.gif'>",
-    "[心碎]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/67.gif'>",
-    "[蛋糕]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/68.gif'>",
-    "[闪电]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/69.gif'>",
-    "[炸弹]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/70.gif'>",
-    "[刀]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/71.gif'>",
-    "[足球]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/72.gif'>",
-    "[瓢虫]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/73.gif'>",
-    "[便便]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/74.gif'>",
-    "[月亮]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/75.gif'>",
-    "[太阳]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/76.gif'>",
-    "[礼物]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/77.gif'>",
-    "[拥抱]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/78.gif'>",
-    "[强]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/79.gif'>",
-    "[弱]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/80.gif'>",
-    "[握手]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/81.gif'>",
-    "[胜利]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/82.gif'>",
-    "[抱拳]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/83.gif'>",
-    "[勾引]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/84.gif'>",
-    "[拳头]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/85.gif'>",
-    "[差劲]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/86.gif'>",
-    "[爱你]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/87.gif'>",
-    "[NO]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/88.gif'>",
-    "[OK]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/89.gif'>",
-    "[爱情]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/90.gif'>",
-    "[飞吻]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/91.gif'>",
-    "[跳跳]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/92.gif'>",
-    "[发抖]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/93.gif'>",
-    "[怄火]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/94.gif'>",
-    "[转圈]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/95.gif'>",
-    "[磕头]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/96.gif'>",
-    "[回头]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/97.gif'>",
-    "[跳绳]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/98.gif'>",
-    "[挥手]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/99.gif'>",
-    "[激动]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/100.gif'>",
-    "[街舞]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/101.gif'>",
-    "[献吻]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/102.gif'>",
-    "[左太极]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/103.gif'>",
-    "[右太极]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/104.gif'>",
+  "[微笑]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/0.gif'>",
+  "[撇嘴]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/1.gif'>",
+  "[色]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/2.gif'>",
+  "[发呆]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/3.gif'>",
+  "[得意]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/4.gif'>",
+  "[流泪]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/5.gif'>",
+  "[害羞]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/6.gif'>",
+  "[闭嘴]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/7.gif'>",
+  "[睡]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/8.gif'>",
+  "[大哭]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/9.gif'>",
+  "[尴尬]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/10.gif'>",
+  "[发怒]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/11.gif'>",
+  "[调皮]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/12.gif'>",
+  "[呲牙]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/13.gif'>",
+  "[惊讶]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/14.gif'>",
+  "[难过]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/15.gif'>",
+  "[酷]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/16.gif'>",
+  "[冷汗]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/17.gif'>",
+  "[抓狂]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/18.gif'>",
+  "[吐]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/19.gif'>",
+  "[偷笑]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/20.gif'>",
+  "[可爱]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/21.gif'>",
+  "[白眼]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/22.gif'>",
+  "[傲慢]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/23.gif'>",
+  "[饥饿]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/24.gif'>",
+  "[困]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/25.gif'>",
+  "[惊恐]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/26.gif'>",
+  "[流汗]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/27.gif'>",
+  "[憨笑]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/28.gif'>",
+  "[大兵]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/29.gif'>",
+  "[奋斗]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/30.gif'>",
+  "[咒骂]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/31.gif'>",
+  "[疑问]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/32.gif'>",
+  "[嘘]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/33.gif'>",
+  "[晕]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/34.gif'>",
+  "[折磨]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/35.gif'>",
+  "[衰]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/36.gif'>",
+  "[骷髅]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/37.gif'>",
+  "[敲打]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/38.gif'>",
+  "[再见]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/39.gif'>",
+  "[擦汗]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/40.gif'>",
+  "[抠鼻]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/41.gif'>",
+  "[鼓掌]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/42.gif'>",
+  "[糗大了]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/43.gif'>",
+  "[坏笑]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/44.gif'>",
+  "[左哼哼]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/45.gif'>",
+  "[右哼哼]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/46.gif'>",
+  "[哈欠]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/47.gif'>",
+  "[鄙视]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/48.gif'>",
+  "[委屈]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/49.gif'>",
+  "[快哭了]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/50.gif'>",
+  "[阴险]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/51.gif'>",
+  "[亲亲]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/52.gif'>",
+  "[吓]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/53.gif'>",
+  "[可怜]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/54.gif'>",
+  "[菜刀]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/55.gif'>",
+  "[西瓜]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/56.gif'>",
+  "[啤酒]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/57.gif'>",
+  "[篮球]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/58.gif'>",
+  "[乒乓]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/59.gif'>",
+  "[咖啡]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/60.gif'>",
+  "[饭]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/61.gif'>",
+  "[猪头]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/62.gif'>",
+  "[玫瑰]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/63.gif'>",
+  "[凋谢]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/64.gif'>",
+  "[示爱]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/65.gif'>",
+  "[爱心]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/66.gif'>",
+  "[心碎]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/67.gif'>",
+  "[蛋糕]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/68.gif'>",
+  "[闪电]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/69.gif'>",
+  "[炸弹]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/70.gif'>",
+  "[刀]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/71.gif'>",
+  "[足球]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/72.gif'>",
+  "[瓢虫]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/73.gif'>",
+  "[便便]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/74.gif'>",
+  "[月亮]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/75.gif'>",
+  "[太阳]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/76.gif'>",
+  "[礼物]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/77.gif'>",
+  "[拥抱]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/78.gif'>",
+  "[强]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/79.gif'>",
+  "[弱]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/80.gif'>",
+  "[握手]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/81.gif'>",
+  "[胜利]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/82.gif'>",
+  "[抱拳]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/83.gif'>",
+  "[勾引]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/84.gif'>",
+  "[拳头]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/85.gif'>",
+  "[差劲]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/86.gif'>",
+  "[爱你]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/87.gif'>",
+  "[NO]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/88.gif'>",
+  "[OK]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/89.gif'>",
+  "[爱情]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/90.gif'>",
+  "[飞吻]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/91.gif'>",
+  "[跳跳]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/92.gif'>",
+  "[发抖]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/93.gif'>",
+  "[怄火]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/94.gif'>",
+  "[转圈]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/95.gif'>",
+  "[磕头]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/96.gif'>",
+  "[回头]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/97.gif'>",
+  "[跳绳]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/98.gif'>",
+  "[挥手]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/99.gif'>",
+  "[激动]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/100.gif'>",
+  "[街舞]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/101.gif'>",
+  "[献吻]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/102.gif'>",
+  "[左太极]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/103.gif'>",
+  "[右太极]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/104.gif'>",
 };
 
 /**
  * 符号表情
  */
 const symbol = [
-    "😠", "😩", "😲", "😞", "😵", "😰", "😒", "😍", "😤", "😜", "😝", "😋", "😘", "😚", "😷",
-    "😳", "😃", "😅", "😆", "😁", "😂", "😊", "☺", "😄", "😢",
-    "😭", "😨", "😣", "😡", "😌", "😖", "😔", "😱", "😪", "😏", "😓", "😥", "😫", "😉",
-    "✊", "✋", "✌", "👊", "👍", "☝", "👆", "👇", "👈", "👉",
-    "👋", "👏", "👌", "👎"
+  "😠", "😩", "😲", "😞", "😵", "😰", "😒", "😍", "😤", "😜", "😝", "😋", "😘", "😚", "😷",
+  "😳", "😃", "😅", "😆", "😁", "😂", "😊", "☺", "😄", "😢",
+  "😭", "😨", "😣", "😡", "😌", "😖", "😔", "😱", "😪", "😏", "😓", "😥", "😫", "😉",
+  "✊", "✋", "✌", "👊", "👍", "☝", "👆", "👇", "👈", "👉",
+  "👋", "👏", "👌", "👎"
 ];
 
 const emojisKeys = Object.keys(emojis);
 
 export const emojiList = {
-    symbol,
-    emojis
+  symbol,
+  emojis
 }
 
 const regEmoji = emojisKeys.map((value) => '|\\' + value).join('').replace('|', '')
@@ -134,11 +134,11 @@ const regEmoji = emojisKeys.map((value) => '|\\' + value).join('').replace('|',
  * 
  * @param {String} content 需要替换的字符串
  */
-export function textReplaceEmoji(content) {
-    if(!content){
-        return ""
-    }
-    return content.replace(new RegExp(`(${regEmoji})`, 'gi'), ($0, $1) => {
-        return emojis[$1];
-    });
+export function textReplaceEmoji (content) {
+  if (!content) {
+    return ""
+  }
+  return content.replace(new RegExp(`(${regEmoji})`, 'gi'), ($0, $1) => {
+    return emojis[$1];
+  });
 }
\ No newline at end of file
diff --git a/im/src/views/layout/MainLayout.vue b/im/src/views/layout/MainLayout.vue
index 0406c1a8..1cb9b102 100644
--- a/im/src/views/layout/MainLayout.vue
+++ b/im/src/views/layout/MainLayout.vue
@@ -72,17 +72,17 @@ export default {
     }),
   },
   watch: {
-    unreadNum(n, o) {
+    unreadNum (n, o) {
       if (n > 0 && n > o && this.notifyCueTone) {
         this.play();
       }
     },
   },
-  created() {
+  created () {
     this.setApplyNum();
   },
   methods: {
-    play() {
+    play () {
       document
         .querySelector("#audio")
         .play()
@@ -90,10 +90,10 @@ export default {
           console.error("消息提示音播放异常");
         });
     },
-    logout() {
+    logout () {
       this.$store.dispatch("ACT_USER_LOGOUT");
     },
-    setApplyNum() {
+    setApplyNum () {
       // TODO 暂且return
       return;
       ServeFindFriendApplyNum().then((res) => {
@@ -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;
   }
diff --git a/seller/src/views/home/home.vue b/seller/src/views/home/home.vue
index 7d40de4b..50a136d9 100644
--- a/seller/src/views/home/home.vue
+++ b/seller/src/views/home/home.vue
@@ -260,8 +260,8 @@ export default {
       }
       // console.log(res.result, 'res.result');
       // http://192.168.0.139:8000/
-      window.open(`http://192.168.0.139:8000/?token=` + accessToken);
-      // window.open(`${res.result}?token=` + accessToken);
+      // window.open(`http://192.168.0.139:8000/?token=` + accessToken);
+      window.open(`${res.result}?token=` + accessToken);
     },
 
     // 获取im信息

From bad9f9109cec14b1041fab7c91ed95ea49333a4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A8=8B?= <994041296@163.com>
Date: Thu, 12 Jan 2023 17:10:34 +0800
Subject: [PATCH 06/16] =?UTF-8?q?im=E5=BD=93=E5=89=8D=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im/src/components/chat/panel/TalkPanel.vue          | 2 +-
 im/src/components/chat/panel/template/goodsLink.vue | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/im/src/components/chat/panel/TalkPanel.vue b/im/src/components/chat/panel/TalkPanel.vue
index a85d6c0c..0a27aa92 100644
--- a/im/src/components/chat/panel/TalkPanel.vue
+++ b/im/src/components/chat/panel/TalkPanel.vue
@@ -500,7 +500,7 @@ export default {
           if (item.messageType == 'GOODS') {
             item.text = JSON.parse(item.text)
           }
-          if (item.messageType == 'MESSAGE') {
+          if (item.messageType == '"MESSAGE"') {
             item.text = textReplaceEmoji(item.text)
           }
           if (item.messageType == 'ORDER') {
diff --git a/im/src/components/chat/panel/template/goodsLink.vue b/im/src/components/chat/panel/template/goodsLink.vue
index c8424810..1e7f1dc3 100644
--- a/im/src/components/chat/panel/template/goodsLink.vue
+++ b/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 && toUser.storeFlag" 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
     }

From 5d16a7a80e13968b5e9155c0ad45765afccf0208 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A8=8B?= <994041296@163.com>
Date: Fri, 13 Jan 2023 10:53:39 +0800
Subject: [PATCH 07/16] =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E8=A1=A8=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/public/config.js                     |  4 +-
 im/src/components/chat/panel/TalkPanel.vue | 19 +++----
 im/src/components/editor/MeEditor.vue      |  9 ++--
 im/src/utils/emojis.js                     | 17 +++---
 im/src/utils/functions.js                  | 60 +++++++++++-----------
 5 files changed, 53 insertions(+), 56 deletions(-)

diff --git a/buyer/public/config.js b/buyer/public/config.js
index 2272ff76..201b6b4d 100644
--- a/buyer/public/config.js
+++ b/buyer/public/config.js
@@ -3,8 +3,8 @@ var BASE = {
    * @description api请求基础路径
    */
   API_DEV: {
-    common: "https://common-api.pickmall.cn",
-    buyer: "https://buyer-api.pickmall.cn",
+    common: "http://192.168.0.113:8890",
+    buyer: "http://192.168.0.113:8898",
     seller: "https://store-api.pickmall.cn",
     manager: "https://admin-api.pickmall.cn"
   },
diff --git a/im/src/components/chat/panel/TalkPanel.vue b/im/src/components/chat/panel/TalkPanel.vue
index 0a27aa92..f0adeb14 100644
--- a/im/src/components/chat/panel/TalkPanel.vue
+++ b/im/src/components/chat/panel/TalkPanel.vue
@@ -65,8 +65,8 @@
                       right: item.float == 'right',
                     }">
                     <div class="arrow"></div>
-
-                    <pre v-html="item.text" />
+                    <pre v-if="!emojistwo.includes(item.text)" 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="goodsStyle " :class="{
@@ -176,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";
@@ -233,6 +233,7 @@ export default {
     return {
       // 记录加载相关参数
       textReplaceEmoji,
+      emojistwo,
       textReplaceLink,
       loadRecord: {
         status: 0,
@@ -387,7 +388,6 @@ export default {
 
     // 回车键发送消息回调事件
     submitSendMessage (content) {
-      console.log("发送", content);
       const record = {
         operation_type: "MESSAGE",
         to: this.params.receiver_id,
@@ -396,6 +396,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", {
@@ -415,8 +418,6 @@ export default {
         text: content,
         float: "right",
       };
-
-      console.log("insterChat", insterChat);
       // console.log("插入对话记录",'')
       // 插入对话记录
       this.$store.commit("PUSH_DIALOGUE", insterChat);
@@ -500,9 +501,9 @@ export default {
           if (item.messageType == 'GOODS') {
             item.text = JSON.parse(item.text)
           }
-          if (item.messageType == '"MESSAGE"') {
-            item.text = textReplaceEmoji(item.text)
-          }
+          // if (item.messageType == 'MESSAGE"') {
+          //   item.text = this.textReplaceEmoji(item.text)
+          // }
           if (item.messageType == 'ORDER') {
             item.text = JSON.parse(item.text)
           }
diff --git a/im/src/components/editor/MeEditor.vue b/im/src/components/editor/MeEditor.vue
index 742163c3..345297ba 100644
--- a/im/src/components/editor/MeEditor.vue
+++ b/im/src/components/editor/MeEditor.vue
@@ -89,9 +89,9 @@
     <MeEditorFileManage ref="filesManager" v-model="filesManager.isShow" />
 
     <MeEditorVote v-if="vote.isShow" @close="
-  () => {
-    this.vote.isShow = false;
-  }
+      () => {
+        this.vote.isShow = false;
+      }
     " />
   </div>
 </template>
@@ -308,7 +308,6 @@ export default {
 
     // 选中表情包回调事件
     selecteEmoticon (data) {
-      console.log(data);
       if (data.type == 1) {
         let value = this.editorText;
         let el = this.$refs.textarea;
@@ -330,8 +329,6 @@ export default {
         }
       } else {
         const { talk_type, receiver_id } = this.$store.state.dialogue;
-        console.log(talk_type);
-        console.log(receiver_id);
         ServeSendEmoticon({
           talk_type,
           receiver_id,
diff --git a/im/src/utils/emojis.js b/im/src/utils/emojis.js
index 5a71fe7e..937f8529 100644
--- a/im/src/utils/emojis.js
+++ b/im/src/utils/emojis.js
@@ -110,8 +110,8 @@ const emojis = {
 };
 
 /**
- * 符号表情
- */
+* 符号表情
+*/
 const symbol = [
   "😠", "😩", "😲", "😞", "😵", "😰", "😒", "😍", "😤", "😜", "😝", "😋", "😘", "😚", "😷",
   "😳", "😃", "😅", "😆", "😁", "😂", "😊", "☺", "😄", "😢",
@@ -121,19 +121,17 @@ const symbol = [
 ];
 
 const emojisKeys = Object.keys(emojis);
-
 export const emojiList = {
   symbol,
   emojis
 }
 
 const regEmoji = emojisKeys.map((value) => '|\\' + value).join('').replace('|', '')
-
 /**
- * 替换表情文字
- * 
- * @param {String} content 需要替换的字符串
- */
+* 替换表情文字
+* 
+* @param {String} content 需要替换的字符串
+*/
 export function textReplaceEmoji (content) {
   if (!content) {
     return ""
@@ -141,4 +139,5 @@ export function textReplaceEmoji (content) {
   return content.replace(new RegExp(`(${regEmoji})`, 'gi'), ($0, $1) => {
     return emojis[$1];
   });
-}
\ No newline at end of file
+}
+export const emojistwo = Object.keys(emojis)
\ No newline at end of file
diff --git a/im/src/utils/functions.js b/im/src/utils/functions.js
index 9e39260e..a466d7a6 100644
--- a/im/src/utils/functions.js
+++ b/im/src/utils/functions.js
@@ -7,7 +7,7 @@ import config from "@/config/config";
  *
  * @param {Object} datetime
  */
-export function formatTime(datetime) {
+export function formatTime (datetime) {
   if (datetime == null) return "";
 
   datetime = datetime.replace(/-/g, "/");
@@ -60,7 +60,7 @@ export function formatTime(datetime) {
  *
  * @param {String} value 文件大小(字节)
  */
-export function formatSize(value) {
+export function formatSize (value) {
   if (null == value || value == "") {
     return "0";
   }
@@ -77,7 +77,7 @@ export function formatSize(value) {
  *
  * @param {String} fileName
  */
-export function getFileExt(fileName) {
+export function getFileExt (fileName) {
   let ext = fileName.split(".");
   ext = ext[ext.length - 1]; // 获取文件后缀名
   return ext;
@@ -88,7 +88,7 @@ export function getFileExt(fileName) {
  * @param {String} imgsrc
  * @param {String} name
  */
-export function downloadIamge(imgsrc, name) {
+export function downloadIamge (imgsrc, name) {
   //下载图片地址和图片名
   let image = new Image();
   // 解决跨域 Canvas 污染问题
@@ -114,7 +114,7 @@ export function downloadIamge(imgsrc, name) {
  *
  * @param {String} imgsrc 例如图片名： D8x5f13a53dbc4b9_350x345.png
  */
-export function getImageInfo(imgsrc) {
+export function getImageInfo (imgsrc) {
   let data = {
     width: 0,
     height: 0,
@@ -138,14 +138,14 @@ export function getImageInfo(imgsrc) {
  *
  * @param {Number} cr_id
  */
-export function download(cr_id) {
+export function download (cr_id) {
   let api = config.BASE_API_URL;
   let token = getToken();
   try {
     let link = document.createElement("a");
     link.href = `${api}/download/user-chat-file?cr_id=${cr_id}&token=${token}`;
     link.click();
-  } catch (e) {}
+  } catch (e) { }
 }
 
 /**
@@ -155,7 +155,7 @@ export function download(cr_id) {
  * @param {String} cFormat
  * @returns {String | null}
  */
-export function parseTime(time, cFormat) {
+export function parseTime (time, cFormat) {
   if (arguments.length === 0) {
     return null;
   }
@@ -205,7 +205,7 @@ export function parseTime(time, cFormat) {
  *
  * @param {String} str
  */
-export function trim(str, type = null) {
+export function trim (str, type = null) {
   if (type) {
     return str.replace(/(^\s*)|(\s*$)/g, "");
   } else if (type == "l") {
@@ -221,19 +221,19 @@ export function trim(str, type = null) {
  * @param {String} url
  * @returns {Object}
  */
-export function param2Obj(url) {
+export function param2Obj (url) {
   const search = url.split("?")[1];
 
   if (!search) return {};
 
   return JSON.parse(
     '{"' +
-      decodeURIComponent(search)
-        .replace(/"/g, '\\"')
-        .replace(/&/g, '","')
-        .replace(/=/g, '":"')
-        .replace(/\+/g, " ") +
-      '"}'
+    decodeURIComponent(search)
+      .replace(/"/g, '\\"')
+      .replace(/&/g, '","')
+      .replace(/=/g, '":"')
+      .replace(/\+/g, " ") +
+    '"}'
   );
 }
 
@@ -241,7 +241,7 @@ export function param2Obj(url) {
  * @param {Object} json
  * @returns {Array}
  */
-export function param(json) {
+export function param (json) {
   if (!json) return "";
   return cleanArray(
     Object.keys(json).map((key) => {
@@ -256,7 +256,7 @@ export function param(json) {
  * @param {Array} actual
  * @returns {Array}
  */
-export function cleanArray(actual) {
+export function cleanArray (actual) {
   const newArray = [];
   for (let i = 0; i < actual.length; i++) {
     if (actual[i]) {
@@ -271,7 +271,7 @@ export function cleanArray(actual) {
  * @param {HTMLElement} element
  * @param {String} className
  */
-export function toggleClass(element, className) {
+export function toggleClass (element, className) {
   if (!element || !className) {
     return;
   }
@@ -295,7 +295,7 @@ export function toggleClass(element, className) {
  * @param {String} cls
  * @returns {Boolean}
  */
-export function hasClass(ele, cls) {
+export function hasClass (ele, cls) {
   return !!ele.className.match(new RegExp("(\\s|^)" + cls + "(\\s|$)"));
 }
 
@@ -305,7 +305,7 @@ export function hasClass(ele, cls) {
  * @param {HTMLElement} elm
  * @param {String} cls
  */
-export function addClass(ele, cls) {
+export function addClass (ele, cls) {
   if (!hasClass(ele, cls)) ele.className += " " + cls;
 }
 
@@ -315,7 +315,7 @@ export function addClass(ele, cls) {
  * @param {HTMLElement} elm
  * @param {String} cls
  */
-export function removeClass(ele, cls) {
+export function removeClass (ele, cls) {
   if (hasClass(ele, cls)) {
     const reg = new RegExp("(\\s|^)" + cls + "(\\s|$)");
     ele.className = ele.className.replace(reg, " ");
@@ -328,7 +328,7 @@ export function removeClass(ele, cls) {
  * @param {String} src
  * @param {Number} width
  */
-export function imgZoom(src, width = 200) {
+export function imgZoom (src, width = 200) {
   const info = getImageInfo(src);
 
   if (info.width < width) {
@@ -350,7 +350,7 @@ export function imgZoom(src, width = 200) {
  * @export
  * @returns
  */
-export function getSelection() {
+export function getSelection () {
   return window.getSelection
     ? window.getSelection().toString()
     : document.selection.createRange().text;
@@ -386,7 +386,7 @@ export const copyTextToClipboard = (value, callback) => {
  *
  * @param {String} phone  手机号
  */
-export function hidePhone(phone) {
+export function hidePhone (phone) {
   return phone.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2");
 }
 
@@ -395,7 +395,7 @@ export function hidePhone(phone) {
  *
  * @param {Object} datetime
  */
-export function beautifyTime(datetime = "") {
+export function beautifyTime (datetime = "") {
   if (datetime == null) {
     return "";
   }
@@ -446,7 +446,7 @@ export function beautifyTime(datetime = "") {
   return `${minutes}分钟前`;
 }
 
-export function getSort(fn) {
+export function getSort (fn) {
   return function (a, b) {
     let ret = 0;
 
@@ -465,7 +465,7 @@ export function getSort(fn) {
  *
  * @param {*} arr
  */
-export function getMutipSort(arr) {
+export function getMutipSort (arr) {
   return function (a, b) {
     let tmp;
     let i = 0;
@@ -484,7 +484,7 @@ export function getMutipSort(arr) {
  * @param {String} text 文本
  * @param {String} color 超链接颜色
  */
-export function textReplaceLink(text, color = "#409eff") {
+export function textReplaceLink (text, color = "#409eff") {
   let exp =
     /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/gi;
   return text.replace(
@@ -501,7 +501,7 @@ export function textReplaceLink(text, color = "#409eff") {
  * @param {*} immediate
  * @returns
  */
-export function debounce(func, wait, immediate) {
+export function debounce (func, wait, immediate) {
   let timeout;
 
   return function () {

From c130597e953354c82dd36a046761773e1f000d9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A8=8B?= <994041296@163.com>
Date: Fri, 13 Jan 2023 18:16:14 +0800
Subject: [PATCH 08/16] =?UTF-8?q?im=E5=95=86=E5=AE=B6=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/public/config.js                     | 8 ++++++--
 im/src/components/chat/panel/OtherLink.vue | 2 +-
 seller/public/config.js                    | 5 +++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/buyer/public/config.js b/buyer/public/config.js
index 201b6b4d..bd1537fc 100644
--- a/buyer/public/config.js
+++ b/buyer/public/config.js
@@ -3,8 +3,12 @@ var BASE = {
    * @description api请求基础路径
    */
   API_DEV: {
-    common: "http://192.168.0.113:8890",
-    buyer: "http://192.168.0.113:8898",
+    // common: "http://192.168.0.113:8890",
+    // buyer: "http://192.168.0.113:8898",
+    // seller: "https://store-api.pickmall.cn",
+    // manager: "https://admin-api.pickmall.cn"
+    common: "https://common-api.pickmall.cn",
+    buyer: "https://buyer-api.pickmall.cn",
     seller: "https://store-api.pickmall.cn",
     manager: "https://admin-api.pickmall.cn"
   },
diff --git a/im/src/components/chat/panel/OtherLink.vue b/im/src/components/chat/panel/OtherLink.vue
index 99dc4163..fdcb2a56 100644
--- a/im/src/components/chat/panel/OtherLink.vue
+++ b/im/src/components/chat/panel/OtherLink.vue
@@ -77,7 +77,7 @@ export default {
       this.getMemberDetail()
     }
     this.getFootPrint()
-    if (this.goodsParams) {
+    if (this.goodsParams && this.toUser.storeFlag == true) {
       this.getGoodsDetail()
     }
   },
diff --git a/seller/public/config.js b/seller/public/config.js
index 69441029..0042124f 100644
--- a/seller/public/config.js
+++ b/seller/public/config.js
@@ -7,6 +7,11 @@ 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.113:8890",
+    // buyer: "http://192.168.0.113:8898",
+    // seller: "http://192.168.0.113:8889",
+    // manager: "https://admin-api.pickmall.cn"
   },
   API_PROD: {
     common: "https://common-api.pickmall.cn",

From c86d863f1d30ce9005ca08200153fd0a0e339f03 Mon Sep 17 00:00:00 2001
From: 15386982806 <jia15386982806>
Date: Wed, 18 Jan 2023 11:28:46 +0800
Subject: [PATCH 09/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../points-goods/points-goods-edit.vue        | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/manager/src/views/promotions/points-goods/points-goods-edit.vue b/manager/src/views/promotions/points-goods/points-goods-edit.vue
index f1c345b6..b8fd1c7c 100644
--- a/manager/src/views/promotions/points-goods/points-goods-edit.vue
+++ b/manager/src/views/promotions/points-goods/points-goods-edit.vue
@@ -33,11 +33,7 @@
               <Select
                 v-model="form.pointsGoodsCategoryId"
                 :label-in-value="true"
-                @on-change="
-                  (val) => {
-                    changeCategory(val, index);
-                  }
-                "
+                @on-change="changeCategory"
               >
                 <Option v-for="item in categoryList" :value="item.id" :key="item.id">{{
                   item.name
@@ -97,7 +93,10 @@ export default {
   name: "editPointsGoods",
   data() {
     return {
+      pointsGoodsCategoryId:'',
+      pointsGoodsCategoryName:'',
       form: {
+        
         /** 活动名称 */
         promotionName: "",
         /** 报名截止时间 */
@@ -110,6 +109,7 @@ export default {
         seckillRule: "",
         goodsSku: {},
         promotionStatus: "NEW",
+       
       },
       categoryList: [], // 分类列表
       id: this.$route.query.id, // 活动id
@@ -134,6 +134,12 @@ export default {
     }
   },
   methods: {
+    // 分类
+    changeCategory(v){
+      console.log(v);
+      this.pointsGoodsCategoryId=v.value
+      this.pointsGoodsCategoryName=v.label
+    },
     // 关闭当前页面
     closeCurrentPage() {
       this.$store.commit("removeTag", "edit-points-goods");
@@ -167,7 +173,12 @@ export default {
           this.form.startTime = start;
           this.form.endTime = end;
           this.submitLoading = true;
-          updatePointsGoods(this.form).then((res) => {
+          let params={
+            ...this.form,
+            pointsGoodsCategoryId: this.pointsGoodsCategoryId,
+            pointsGoodsCategoryName:this.pointsGoodsCategoryName
+          }
+          updatePointsGoods(params).then((res) => {
             this.submitLoading = false;
             if (res.success) {
               this.$Message.success("积分商品修改成功");

From 69caf86c7e2b6b6ac3bad0dbc0f6911558d0d22d Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Thu, 19 Jan 2023 17:25:07 +0800
Subject: [PATCH 10/16] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/public/static/instructions.xlsx  | Bin 0 -> 33228 bytes
 seller/public/static/logisticsType.xlsx | Bin 0 -> 15428 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 seller/public/static/instructions.xlsx
 create mode 100644 seller/public/static/logisticsType.xlsx

diff --git a/seller/public/static/instructions.xlsx b/seller/public/static/instructions.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..5cc6d8b21c336e8728706560ee5af6d89c30c356
GIT binary patch
literal 33228
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

literal 0
HcmV?d00001

diff --git a/seller/public/static/logisticsType.xlsx b/seller/public/static/logisticsType.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..12efde081dc573b463c396ef773d02bbb41d75bd
GIT binary patch
literal 15428
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
E2b;9;r2qf`

literal 0
HcmV?d00001


From 9df377677b5aa57a816d85d5c69eeb7241a9c52f Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Thu, 19 Jan 2023 17:26:31 +0800
Subject: [PATCH 11/16] =?UTF-8?q?=E5=BC=80=E5=90=AF=E9=9D=A2=E5=8D=95?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/src/views/shop/ship/logistics.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/seller/src/views/shop/ship/logistics.vue b/seller/src/views/shop/ship/logistics.vue
index 2807e417..d11b99b6 100644
--- a/seller/src/views/shop/ship/logistics.vue
+++ b/seller/src/views/shop/ship/logistics.vue
@@ -9,7 +9,7 @@
         ref="table"
       ></Table>
     </Card>
-    <Modal v-model="openModal" :title="openModalTitle" @on-ok="submit">
+    <Modal v-model="openModal" :title="openModalTitle" @on-ok="submit" @on-cancel="cancelModal">
       <h3 style="color: #ff3c2a; margin-bottom: 10px">是否需要电子面单</h3>
       <RadioGroup
         v-model="faceSheetForm.faceSheetFlag"
@@ -245,6 +245,10 @@ export default {
       });
       this.loading = false;
     },
+    cancelModal(){
+      this.faceSheetFlag = false;
+      this.faceSheetForm.faceSheetFlag = false;
+    },
     // 开启
     open(v) {
       this.row = v;
@@ -284,7 +288,7 @@ export default {
       var a = document.createElement("a"); //创建一个<a></a>标签
       //根据点击按钮来下载不同文件
       if (val === 'use') {
-        a.href = "static/open.xlsx"; // 给a标签的href属性值加上地址，注意，这里是绝对路径，不用加 点.
+        a.href = "static/instructions.xlsx"; // 给a标签的href属性值加上地址，注意，这里是绝对路径，不用加 点.
         a.download = "使用说明.xlsx"; //设置下载文件文件名，这里加上.xlsx指定文件类型，pdf文件就指定.fpd即可
       } else if (val === 'type') {
         a.href = "static/logisticsType.xlsx"; // 给a标签的href属性值加上地址，注意，这里是绝对路径，不用加 点.

From c6e1cc060a11303d6dbee793173b39d7dbc447d2 Mon Sep 17 00:00:00 2001
From: 15386982806 <jia15386982806>
Date: Tue, 31 Jan 2023 17:07:28 +0800
Subject: [PATCH 12/16] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/api/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manager/src/api/index.js b/manager/src/api/index.js
index 709bec3a..2c90493a 100644
--- a/manager/src/api/index.js
+++ b/manager/src/api/index.js
@@ -400,7 +400,7 @@ export const getChildRegion = (id) => {
 
 // 重置用户密码
 export const resetPassword = (params) => {
-  return postRequest(`/passport/user/resetPassword/${params}"`);
+  return postRequest(`/passport/user/resetPassword/${params}`);
 };
 
 // 初始化商品索引

From a97ed0c3f6d6bea95abfd776c3b8c44fe0132b77 Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Tue, 31 Jan 2023 17:42:36 +0800
Subject: [PATCH 13/16] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im/.env                                    |  9 +--
 im/.env.development                        |  9 +--
 im/src/api/user.js                         | 33 ++++++--
 im/src/components/chat/panel/OtherLink.vue | 91 ++++++++++++++--------
 im/src/components/chat/panel/TalkPanel.vue |  3 +-
 im/src/config/config.js                    |  6 +-
 im/src/main.js                             |  6 +-
 7 files changed, 98 insertions(+), 59 deletions(-)

diff --git a/im/.env b/im/.env
index b0a657c7..b65f6811 100644
--- a/im/.env
+++ b/im/.env
@@ -3,9 +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://pc-b2b2c.pickmall.cn/
-VUE_APP_PC_STORE_ORDER_URL=https://store-b2b2c.pickmall.cn/
-VUE_APP_PC_STORE_ORDER=https://store-b2b2c.pickmall.cn/
-VUE_APP_PC_USER_ORDER=https://pc-b2b2c.pickmall.cn
-VUE_APP_PC_STORE_GOODS=https://store-b2b2c.pickmall.cn/
\ No newline at end of file
+VUE_APP_PC_URL=https://pc-b2b2c.pickmall.cn/
+VUE_APP_PC_STORE=https://store-b2b2c.pickmall.cn/
\ No newline at end of file
diff --git a/im/.env.development b/im/.env.development
index 28921b97..1018d37c 100644
--- a/im/.env.development
+++ b/im/.env.development
@@ -3,9 +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://pc-b2b2c.pickmall.cn/
-VUE_APP_PC_STORE_ORDER_URL=https://store-b2b2c.pickmall.cn/
-VUE_APP_PC_STORE_ORDER=https://store-b2b2c.pickmall.cn/
-VUE_APP_PC_USER_ORDER=https://pc-b2b2c.pickmall.cn
-VUE_APP_PC_STORE_GOODS=https://store-b2b2c.pickmall.cn/
\ No newline at end of file
+VUE_APP_PC_URL=https://pc-b2b2c.pickmall.cn/
+VUE_APP_PC_STORE=https://store-b2b2c.pickmall.cn/
\ No newline at end of file
diff --git a/im/src/api/user.js b/im/src/api/user.js
index fb13624d..93f7b8f3 100644
--- a/im/src/api/user.js
+++ b/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}`);
 };
diff --git a/im/src/components/chat/panel/OtherLink.vue b/im/src/components/chat/panel/OtherLink.vue
index fdcb2a56..dae7bdae 100644
--- a/im/src/components/chat/panel/OtherLink.vue
+++ b/im/src/components/chat/panel/OtherLink.vue
@@ -18,8 +18,7 @@
 
 <script>
 import { Tabs, TabPane } from 'element-ui'
-import { ServeGetStoreDetail, ServeGetUserDetail, ServeGetFootPrint, ServeGetOrderPrint } from '@/api/user'
-import { ServeGetGoodsDetail } from '@/api/goods'
+import { ServeGetStoreDetail, ServeGetUserDetail, ServeGetFootPrint, ServeGetOrderPrint, ServeGetGoodsDetail, ServeStoreGetFootPrint,ServeStoreGetOrderPrint } from '@/api/user'
 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";
@@ -103,46 +102,70 @@ export default {
       })
     },
     getGoodsDetail () {
-      ServeGetGoodsDetail(this.goodsParams).then(res => {
-        if (res.success) {
-          this.goodsDetail = res.result.data
-        }
-      })
+      if(this.toUser.storeFlag){
+        ServeGetGoodsDetail(this.goodsParams).then(res => {
+          if (res.success) {
+            this.goodsDetail = res.result.data
+          }
+        })
+      }
     },
-    getFootPrint () {
+    getFootPrint() {
       if (this.toUser.storeFlag) {
         this.footPrintParams.memberId = this.id
         this.footPrintParams.storeId = this.toUser.userId
+        ServeGetFootPrint(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)
+        })
+
+        // 订单列表
+        ServeGetOrderPrint(this.footPrintParams).then((res) => {
+          if (res.code == 200) {
+            res.result.records.forEach((item) => {
+              this.orderPrintList.push({
+                ...item,
+                btnHide: 1
+              })
+            })
+          }
+        })
       } 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)) {
-            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)
-      })
-      // 订单列表
-      ServeGetOrderPrint(this.footPrintParams).then((res) => {
-        if (res.code == 200) {
-          res.result.records.forEach((item) => {
-            this.orderPrintList.push({
-              ...item,
-              btnHide: 1
+        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
+              })
             })
-          })
-          // this.orderPrintList.push(...res.result.records)
-        }
-      })
-      console.log("this.orderPrintListthis.orderPrintList", this.orderPrintList);
+          }
+        })
+      }
     },
 
     // 发送消息回调事件
diff --git a/im/src/components/chat/panel/TalkPanel.vue b/im/src/components/chat/panel/TalkPanel.vue
index f0adeb14..0570f58c 100644
--- a/im/src/components/chat/panel/TalkPanel.vue
+++ b/im/src/components/chat/panel/TalkPanel.vue
@@ -514,7 +514,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
diff --git a/im/src/config/config.js b/im/src/config/config.js
index 02f792f3..dfd145a8 100644
--- a/im/src/config/config.js
+++ b/im/src/config/config.js
@@ -3,9 +3,9 @@ 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 || "",
+  BASE_BUYER: process.env.VUE_APP_BUYER || "",
+  BASE_SELLER: process.env.VUE_APP_SELLER || "",
   PC_URL: process.env.VUE_APP_PC_URL || "https://pc-b2b2c.pickmall.cn",
-  STORE_URL: process.env.VUE_APP_PC_ORDER_URL || "http://192.168.0.139:8000/",
-  PC_STORE_GOODS: process.env.VUE_APP_PC_STORE_ORDER_URL || '',
-  PC_STORE_ORDER: process.env.VUE_APP_PC_STORE_ORDER || '',
+  PC_STORE: process.env.VUE_APP_PC_STORE || '',
   PC_USER_ORDER: process.env.VUE_APP_PC_USER_ORDER || '',
 };
diff --git a/im/src/main.js b/im/src/main.js
index 8fd9cef2..045a82fe 100644
--- a/im/src/main.js
+++ b/im/src/main.js
@@ -26,7 +26,7 @@ Vue.component('face-null', faceNull)
 
 Vue.prototype.linkToGoods = function (goodsId, skuId) {  // 跳转买家端商品
   if (localStorage.getItem('storeFlag') == 'false') {
-    window.open(`${config.PC_STORE_GOODS}goods-operation-edit?id=${goodsId}`, '_blank')
+    window.open(`${config.PC_STORE}goods-operation-edit?id=${goodsId}`, '_blank')
   } else {
     window.open(`${config.PC_URL}/goodsDetail?skuId=${skuId}&goodsId=${goodsId}`, '_blank')
   }
@@ -39,10 +39,10 @@ Vue.prototype.linkToStore = function (storeId) {  // 跳转商家端商品
 Vue.prototype.linkToOrders = function (sn) {
   if (localStorage.getItem('storeFlag') == 'false') {
     // 商家
-    window.open(`${config.PC_STORE_GOODS}order-detail?sn=${sn}`, '_blank')
+    window.open(`${config.PC_STORE}order-detail?sn=${sn}`, '_blank')
   } else {
     // 用户
-    window.open(`${config.STORE_URL}/OrderDetail?sn=${sn}`, '_blank')
+    window.open(`${config.PC_URL}/OrderDetail?sn=${sn}`, '_blank')
   }
 };
 

From c850a27cca8a56455cfdcb6b7708285abc38ca3b Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Wed, 1 Feb 2023 10:18:38 +0800
Subject: [PATCH 14/16] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=80=BC=E4=B8=BA=E7=A9=BA=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC=E9=94=99=E4=B9=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/src/views/goods/goods-seller/goodsOperationSec.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
index f494b380..3c2a9767 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
@@ -1383,6 +1383,10 @@ export default {
         this.$Message.error("已存在相同规格值！");
         return;
       }
+      if (val.value === '') {
+        this.$Message.error("规格值不能为空！");
+        return;
+      }
       let curVal = this.currentSkuVal;
       this.skuTableData = this.skuTableData.map((e) => {
         if (e[val.name] === curVal) {

From 4780ae5b18000dac4519ca743fa3b32ff8d5f12c Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Thu, 2 Feb 2023 17:06:32 +0800
Subject: [PATCH 15/16] =?UTF-8?q?=E6=A0=B8=E9=94=80=E8=87=AA=E6=8F=90?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/src/views/order/order/orderDetail.vue | 9 ++++++++-
 seller/src/views/order/order/orderList.vue   | 5 +++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue
index 5fd939fb..cef64414 100644
--- a/seller/src/views/order/order/orderDetail.vue
+++ b/seller/src/views/order/order/orderDetail.vue
@@ -117,7 +117,7 @@
           </template>
         </Col>
         <Col span="12">
-          <div class="div-item">
+          <div class="div-item" v-if="orderInfo.order.deliveryMethod != 'SELF_PICK_UP'">
             <div class="div-item-left">收货信息：</div>
             <div class="div-item-right">
               {{ orderInfo.order.consigneeName }}
@@ -126,6 +126,13 @@
               {{ orderInfo.order.consigneeDetail }}
             </div>
           </div>
+          <div class="div-item"  v-if="orderInfo.order.deliveryMethod == 'SELF_PICK_UP'">
+            <div class="div-item-left">自提信息：</div>
+            <div class="div-item-right">
+              {{ orderInfo.order.storeAddressPath }}
+              {{ orderInfo.order.storeAddressMobile }}
+            </div>
+          </div>
           <div class="div-item">
             <div class="div-item-left">支付方式：</div>
             <div class="div-item-right">
diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue
index 5db5354a..8aaf7b54 100644
--- a/seller/src/views/order/order/orderList.vue
+++ b/seller/src/views/order/order/orderList.vue
@@ -39,6 +39,7 @@
             <Option value="DELIVERED">已发货</Option>
             <Option value="COMPLETED">已完成</Option>
             <Option value="CANCELLED">已取消</Option>
+            <Option value="STAY_PICKED_UP">待自提</Option>
           </Select>
         </Form-item>
         <Form-item label="订单类型" prop="orderType">
@@ -225,6 +226,10 @@ export default {
               return h("div", [
                 h("tag", { props: { color: "geekblue" } }, "待发货"),
               ]);
+            }else if (params.row.orderStatus == "STAY_PICKED_UP") {
+              return h("div", [
+                h("tag", { props: { color: "geekblue" } }, "待自提"),
+              ]);
             } else if (params.row.orderStatus == "DELIVERED") {
               return h("div", [
                 h("tag", { props: { color: "cyan" } }, "已发货"),

From f0628c59952468971846995215a510deb00681ed Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Thu, 2 Feb 2023 18:04:49 +0800
Subject: [PATCH 16/16] =?UTF-8?q?=E5=A4=B1=E6=95=88=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=A1=B5=E9=9D=A2=E4=B8=8D=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/home/userCenter/MyTracks.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/buyer/src/pages/home/userCenter/MyTracks.vue b/buyer/src/pages/home/userCenter/MyTracks.vue
index 94464f28..a75d69fa 100644
--- a/buyer/src/pages/home/userCenter/MyTracks.vue
+++ b/buyer/src/pages/home/userCenter/MyTracks.vue
@@ -112,7 +112,9 @@ export default {
       tracksList(this.params).then((res) => {
         this.spinShow = false;
         if (res.success && res.result.records.length) {
-          this.list = res.result.records;
+          this.list = res.result.records.filter(item =>{
+            return item != null
+          });
           this.total = res.result.total
         } else {
           this.list = [];