diff --git a/src/project/pidu/AppConversation/conversationDetail.vue b/src/project/pidu/AppConversation/conversationDetail.vue
index 5259b87f..de0010b0 100644
--- a/src/project/pidu/AppConversation/conversationDetail.vue
+++ b/src/project/pidu/AppConversation/conversationDetail.vue
@@ -23,9 +23,12 @@
           <!-- <img src="./img/fail-icon.png" alt="" class="fail-img" v-if="item.userId == user.wxUserId"> -->
           <img :src="item.userAvatar" alt="" class="user-img" v-if="item.userId != user.wxUserId && item.userAvatar">
           <img src="./img/user-img.png" alt="" class="user-img" v-if="item.userId != user.wxUserId && !item.userAvatar">
+
+          <p class="user-name">{{item.userName}}<span>{{item.msgSendTime}}</span></p>
+
           <div class="content">
             <span class="cir" v-if="item.msgType == 'text'"></span>
-            <p v-if="item.msgType == 'text'">{{item.content}}</p>
+            <p class="content-text" v-if="item.msgType == 'text'">{{item.content}}</p>
 
             <div class="img-list" v-if="item.msgType == 'image'">
               <img :src="item.sdkFileUrl" alt="" @click="previewImage(item.sdkFileUrl)">
@@ -47,6 +50,27 @@
 
             <div class="revoke-text" v-if="item.msgType == 'revoke'">{{item.userName}}{{item.msgSendTime.substring(0, 16)}}撤回了一条消息</div>
 
+            <div class="revoke-text" v-if="item.msgType == 'disagree'">对方不同意会话存档内容，你将无法继续提供服务</div>
+
+            <div class="revoke-text" v-if="item.msgType == 'agree'">对方同意会话存档内容，你可以继续提供服务</div>
+
+            <div class="card-info" v-if="item.msgType == 'card'">
+              <div class="top">
+                <div class="card-left">
+                  <h3>{{item.cardCorpName}}</h3>
+                  <p>{{item.cardUserName}}</p>
+                  <div>{{item.cardUserId}}</div>
+                </div>
+                <div class="card-right">
+                  <img :src="item.cardUserAvatar" alt="" v-if="item.cardUserAvatar">
+                  <img src="./img/user-img.png" alt="" v-else>
+                </div>
+              </div>
+              <!-- <div class="bottom">个人名片</div> -->
+            </div>
+
+            <img :src="item.sdkFileUrl" alt="" v-if="item.msgType == 'emotion'" :style="[{width: item.width/2+'px'}, {height: item.height/2+'px'}]">
+
           </div>
           <img :src="item.userAvatar" alt="" class="user-img" v-if="item.userId == user.wxUserId">
           <!-- <img src="./img/fail-icon.png" alt="" class="fail-img" v-if="item.userId != user.wxUserId"> -->
@@ -156,7 +180,7 @@ export default {
       this.$http.post(`/app/appsessionarchiveinfo/listByUser`, null, {
         params: {
           current: this.current,
-          size: 15,
+          size: 10,
           msgType: this.tabList[this.currentTabs].value,
           // msgType: 'file',
           toUserId: this.toUserId,
@@ -247,6 +271,23 @@ export default {
     .item {
       margin-bottom: 48px;
       display: flex;
+      position: relative;
+      .user-name {
+        position: absolute;
+        top: 0;
+        left: 24px;
+        font-family: PingFangSC-Regular;
+        font-size: 22px;
+        color: #666;
+        padding:0 0 0 64px;
+        span {
+          display: inline-block;
+          margin: 0 12px;
+          font-family: PingFangSC-Regular;
+          font-size: 20px;
+          color: #999;
+        }
+      }
       .user-img {
         width: 72px;
         height: 72px;
@@ -256,6 +297,7 @@ export default {
       .content {
         max-width: calc(100% - 144px);
         position: relative;
+        margin-top: 44px;
         .cir {
           width: 0px;
           height: 0px;
@@ -263,7 +305,7 @@ export default {
           position: absolute;
           top: 20px;
         }
-        p {
+        .content-text {
           display: inline-block;
           padding: 14px 54px 14px 32px;
           width: 100%;
@@ -282,8 +324,8 @@ export default {
       }
       .img-list {
         img {
-          width: 100px;
-          height: 100px;
+          width: 200px;
+          height: 200px;
           margin: 0 16px 16px 0;
         }
       }
@@ -350,6 +392,51 @@ export default {
           }
         }
       }
+      .card-info {
+        width: 450px;
+        background: #FFF;
+        .top {
+          padding: 16px 32px;
+          display: flex;
+          .card-left {
+            width: calc(100% - 120px);
+            h3 {
+              font-family: PingFangSC-Regular;
+              font-size: 32px;
+              color: #333;
+              line-height: 44px;
+              height: 74px;
+            }
+            p {
+              font-family: PingFangSC-SNaNpxibold;
+              font-size: 32px;
+              color: #333;
+              line-height: 44px;
+            }
+            div {
+              font-family: PingFangSC-Regular;
+              font-size: 24px;
+              color: #999;
+              line-height: 34px;
+            }
+          }
+          .card-right {
+            img {
+              width: 84px;
+              height: 84px;
+            }
+            
+          }
+        }
+        .bottom {
+          padding-left: 32px;
+          line-height: 48px;
+          font-family: PingFangSC-Regular;
+          font-size: 22px;
+          color: #999;
+          border-top: 1px solid #eee;
+        }
+      }
     }
     .item-left {
       .content {
@@ -362,6 +449,11 @@ export default {
     .item-right {
       width: 100%;
       justify-content: right;
+      .user-name {
+        left: 0;
+        right: 82px;
+        text-align: right;
+      }
       .user-img {
         margin: 0 0 0 20px;
       }
@@ -370,7 +462,7 @@ export default {
           border-left-color: #C7E7FE;
           right: -18px;
         }
-        p {
+        .content-text {
           background-color: #C7E7FE;
           padding: 14px 32px 14px 54px;
         }