From 56d6401cda4970bebc813fb7471441856978759b Mon Sep 17 00:00:00 2001
From: mahe <mh980577760@163.com>
Date: Fri, 3 Feb 2023 10:22:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4im=E6=A0=B7=E5=BC=8F=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im/src/components/chat/panel/OtherLink.vue    | 19 ++--
 .../chat/panel/template/footPrint.vue         | 90 +++++++++++++------
 .../chat/panel/template/goodsLink.vue         |  2 +-
 im/src/views/layout/MainLayout.vue            | 45 +++++-----
 4 files changed, 100 insertions(+), 56 deletions(-)

diff --git a/im/src/components/chat/panel/OtherLink.vue b/im/src/components/chat/panel/OtherLink.vue
index 2b8dcf06..a1b7b673 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;">
+      <div>
         <GoodsLink :goodsDetail="goodsDetail" v-if="toUser.userId === goodsDetail.storeId"
           @sendMessage="submitSendMessage" />
         <FootPrint :list="footPrintList" @loadMore="loadMoreFootPrint()" :orderList="orderPrintList"
@@ -57,6 +57,7 @@ export default {
       localStorage.setItem('storeFlag', this.toUser.storeFlag)
       this.footPrintList = []
       this.orderPrintList = []
+      this.footPrintParams.pageNumber = 1
       if (this.toUser.storeFlag) {
         this.getStoreDetail()
       } 
@@ -75,7 +76,7 @@ export default {
       storeInfo: {}, //店铺信息
       memberInfo: {}, //会员信息
       footPrintParams: {
-        pageSize: 10,
+        pageSize: 20,
         pageNumber: 1,
         memberId: '',
         storeId: '',
@@ -133,6 +134,9 @@ export default {
         this.footPrintParams.memberId = this.id
         this.footPrintParams.storeId = this.toUser.userId
         ServeGetFootPrint(this.footPrintParams).then(res => {
+          res.result.records=res.result.records.filter((item)=>{
+            return item!=null
+          })
           res.result.records.forEach((item, index) => {
             if (localStorage.getItem(item.goodsId)) {
               item.btnHide = 0
@@ -142,10 +146,9 @@ export default {
             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) {
@@ -161,6 +164,9 @@ export default {
         this.footPrintParams.memberId = this.toUser.userId
         this.footPrintParams.storeId = this.id
         ServeStoreGetFootPrint(this.footPrintParams).then(res => {
+          res.result.records=res.result.records.filter((item)=>{
+            return item!=null
+          })
           res.result.records.forEach((item, index) => {
             if (localStorage.getItem(item.goodsId)) {
               item.btnHide = 0
@@ -264,6 +270,9 @@ export default {
 }
 
 /deep/ .el-tab-pane {
-  margin-left: 12px;
+  // margin-left: 12px;
+}
+/deep/.el-tabs__nav-scroll{
+  min-width: 362px;
 }
 </style>
\ No newline at end of file
diff --git a/im/src/components/chat/panel/template/footPrint.vue b/im/src/components/chat/panel/template/footPrint.vue
index c84ce064..7a0c9bbe 100644
--- a/im/src/components/chat/panel/template/footPrint.vue
+++ b/im/src/components/chat/panel/template/footPrint.vue
@@ -35,28 +35,31 @@
         <el-tab-pane label="订单列表" name="orders">
           <dl>
             <dd v-for="(item, index) in orderList" v-infinite-scroll="loadMore" :key="index">
-              <div class="orderlist">
-                <div class="order_top">
+              <div class="orderlist" >
+                <div class="order_top order_padding">
                   <span class="order_sn">订单号:{{ item.sn }}</span>
                 </div>
-                <div class="order_section">
+                <div class="order_section order_padding">
                   <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">
+                  <div class="orderBtn ">
                     <el-button type="danger" class="store-button" v-if="item.btnHide == 1 && toUser.storeFlag"
                       size="mini" @click="submitSendOrderMessage(item, index)" plain>发送</el-button>
                   </div>
                 </div>
-                <div class="order_footer">
+                <div class="order_footer order_padding" >
                   <span> 订单金额： <span style="color: red;">￥{{ item.orderItems[0].goodsPrice }}</span></span>
-                  <span class="order_status" v-if="item.orderStatus"
+                  <!-- <span class="order_status" v-if="item.orderStatus"
                     :style="{ 'color': item.orderStatus == 'CANCELLED' || item.orderStatus == 'UNPAID' || item.orderStatus == 'TAKE' ? '#5a606b' : '#f23030' }">{{
   item.orderStatus == 'CANCELLED' ? '已取消' : item.orderStatus == 'UNPAID' ? '未付款' : item.orderStatus ==
     'PAID' ? '已付款' : item.orderStatus == 'UNDELIVERED' ? '待发货' : item.orderStatus == 'DELIVERED'
       ? '已发货' : item.orderStatus == 'COMPLETED' ? '已完成' : item.orderStatus == 'TAKE' ? '待校验' : ''
-                    }}</span>
+                    }}</span> -->
+                    <el-tag :type="col[item.orderStatus]">{{ item.orderStatus == 'STAY_PICKED_UP' ? '待自提' :item.orderStatus == 'CANCELLED' ? '已取消' : item.orderStatus == 'UNPAID' ? '未付款' : item.orderStatus ==
+    'PAID' ? '已付款' : item.orderStatus == 'UNDELIVERED' ? '待发货' : item.orderStatus == 'DELIVERED'
+      ? '已发货' : item.orderStatus == 'COMPLETED' ? '已完成' : item.orderStatus == 'TAKE' ? '待校验' : ''}}</el-tag>
                 </div>
 
               </div>
@@ -80,7 +83,17 @@ export default {
     return {
       activeName: 'goods',
       btnHide: undefined,
-      hide: true
+      hide: true,
+      col:{
+        CANCELLED:'error',
+        PAID:'error',
+        TAKE:'',
+        COMPLETED:'success',
+        DELIVERED:'danger',
+        UNDELIVERED:'warning',
+        UNPAID:'',
+        STAY_PICKED_UP:''
+      },
     }
   },
   computed: {
@@ -187,7 +200,7 @@ export default {
 
 .Underline {
   border: 1px solid silver;
-  width: 90%;
+  // width: 90%;
   margin: 0 auto;
 }
 
@@ -196,11 +209,11 @@ export default {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  width: 260px;
+  width: 232px;
 }
 
 .box {
-  width: 400px;
+  max-width: 362px;
 
   .top {
     text-align: center;
@@ -222,7 +235,8 @@ export default {
   }
 
   .item {
-    margin: 4px;
+    // margin: 4px;
+    margin-top:16px
   }
 
   .left .el-tooltip__popper,
@@ -236,14 +250,18 @@ export default {
 }
 
 .orderlist {
+  max-width:352px;
   margin-bottom: 10px;
   background: #fff;
   color: #5a606b;
+  box-sizing: border-box;
 }
+.box::-webkit-scrollbar {
+        width: 0px!important;
+    }
 
 .order_top {
   border-bottom: 1px solid #f2f2f2;
-
   .order_sn {}
 }
 
@@ -252,8 +270,8 @@ export default {
   height: 100px;
 
   img {
-    width: 80px;
-    height: 80px;
+    width: 60px;
+    height: 60px;
     margin-top: 20px;
   }
 }
@@ -294,11 +312,20 @@ export default {
   text-overflow: ellipsis;
   white-space: nowrap
 }
-
-/deep/ .el-tabs__item.is-top:last-child {
-  color: black;
+ /deep/ .el-tabs__header{
+  position: absolute;
+  width: 362px;
+  height: 50px;
+  left: 0;
+  z-index: 2;
+  background: #ffffff;
+ }
+// /deep/ .el-tabs__item.is-top:last-child {
+//   color: black;
+// }
+/deep/.is-active{
+  color: #f23030;
 }
-
 /deep/.el-tabs__active-bar {
   background-color: #f23030;
 }
@@ -312,13 +339,18 @@ export default {
   justify-content: center;
   align-items: center;
 }
-
-.box {
-  height: 500px;
-  overflow: auto;
-  width: 350px;
+/deep/.el-tabs__content{
+    margin-top: 50px;
+}
+.box {
+  height: 700px;
+  overflow: auto;
+  // margin-top: 50px;
+  // width: 350px;
+}
+.order_padding{
+  padding:0 10px;
 }
-
 .store-button {
   background-color: white;
   border-color: #F56C6C;
@@ -354,4 +386,12 @@ export default {
 .separate {
   margin-top: 8px;
 }
+// .el-tabs--card {
+//   height: calc(100vh - 110px);
+//   overflow-y: auto; 
+// }
+// /deep/.el-tab-pane {
+//   height: calc(100vh - 110px);
+//   overflow-y: auto;
+// }
 </style>
\ No newline at end of file
diff --git a/im/src/components/chat/panel/template/goodsLink.vue b/im/src/components/chat/panel/template/goodsLink.vue
index 1e7f1dc3..a51d0403 100644
--- a/im/src/components/chat/panel/template/goodsLink.vue
+++ b/im/src/components/chat/panel/template/goodsLink.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="width: 350px;">
+  <div style="max-width: 362px;">
     当前浏览
     <div class="base">
       <div>
diff --git a/im/src/views/layout/MainLayout.vue b/im/src/views/layout/MainLayout.vue
index 1cb9b102..22fd0f67 100644
--- a/im/src/views/layout/MainLayout.vue
+++ b/im/src/views/layout/MainLayout.vue
@@ -96,11 +96,6 @@ export default {
     setApplyNum () {
       // TODO 暂且return
       return;
-      ServeFindFriendApplyNum().then((res) => {
-        if (res.code == 200 && res.data.unread > 0) {
-          this.$store.commit("INCR_APPLY_NUM");
-        }
-      });
     },
   },
 };
@@ -239,29 +234,29 @@ export default {
   background-color: #121212;
   transition: ease-in 0.5s;
 
-  &.bag001 {
-    background: url(~@/assets/image/background/001.jpg);
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
-  }
+  // &.bag001 {
+  //   background: url(~@/assets/image/background/001.jpg);
+  //   background-repeat: no-repeat;
+  //   background-size: 100% 100%;
+  // }
 
-  &.bag002 {
-    background: url(~@/assets/image/background/002.jpg);
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
-  }
+  // &.bag002 {
+  //   background: url(~@/assets/image/background/002.jpg);
+  //   background-repeat: no-repeat;
+  //   background-size: 100% 100%;
+  // }
 
-  &.bag003 {
-    background: url(~@/assets/image/background/003.jpg);
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
-  }
+  // &.bag003 {
+  //   background: url(~@/assets/image/background/003.jpg);
+  //   background-repeat: no-repeat;
+  //   background-size: 100% 100%;
+  // }
 
-  &.bag004 {
-    background: url(~@/assets/image/background/005.png);
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
-  }
+  // &.bag004 {
+  //   background: url(~@/assets/image/background/005.png);
+  //   background-repeat: no-repeat;
+  //   background-size: 100% 100%;
+  // }
 }
 
 @keyframes notifymove {