diff --git a/src/project/fd/AppRedemptionPoints/goodsList.vue b/src/project/fd/AppRedemptionPoints/goodsList.vue
index d0fc1616..9cb99f95 100644
--- a/src/project/fd/AppRedemptionPoints/goodsList.vue
+++ b/src/project/fd/AppRedemptionPoints/goodsList.vue
@@ -82,7 +82,7 @@ export default {
   name: 'goodsList',
   data() {
     return {
-      tabList: [{name: '全部'}, {name: '免费兑'}, {name: '京东低价商品'}],
+      tabList: [{name: '全部'}, {name: '积分兑换'}, {name: '京东低价商品'}],
       currentTabs: 1,
       barStyle: {
         'width': '20px',
@@ -139,7 +139,7 @@ export default {
     getList() {
       this.$http.post(`/app/appintegralsupermarketshop/goodsListWXCP`, null, {
         params: {
-          goodsType: this.currentTabs,  //商品类型，0：全部、1：免费兑、2：京东低价商品，默认0
+          goodsType: this.currentTabs,  //商品类型，0：全部、1：积分兑换、2：京东低价商品，默认0
           orderType: this.currentType == 0 ? 1 : 0,  //排序类型，0：积分升序、1：上架时间倒序，默认0
           filterIntegral: this.currentType == 2 ? true : false,  //过滤我可兑换的，默认false
           integralRange: this.currentType == 1 ? this.currentPoint : '',  //积分区间类型，0：全部、1：50分以下、2:100分以下、3：200分以下、4：5000分以下默认0
diff --git a/src/project/fd/AppRedemptionPoints/myOrderList.vue b/src/project/fd/AppRedemptionPoints/myOrderList.vue
index 561b1c12..5afedb18 100644
--- a/src/project/fd/AppRedemptionPoints/myOrderList.vue
+++ b/src/project/fd/AppRedemptionPoints/myOrderList.vue
@@ -22,7 +22,7 @@
           </div>
         </div>
         <p class="tips" v-if="item.goodsType == 2"><span>兑换成功后，点击「去购买」前往京东低价购买</span></p>
-         <p class="tips" v-else>免费兑换商品，可到固定的兑换点进行「核销兑换」</p>
+         <p class="tips" v-else>积分兑换商品，可到固定的兑换点进行「核销兑换」</p>
         <p class="remark" v-if="item.remarks">备注：{{item.remarks}}</p>
         <div class="flex-btn" v-if="item.goodsType == 2 && item.status != 2">
           <p></p>
diff --git a/src/project/fd/AppRedemptionPoints/placeOrder.vue b/src/project/fd/AppRedemptionPoints/placeOrder.vue
index 0e5e4641..bde5e0ca 100644
--- a/src/project/fd/AppRedemptionPoints/placeOrder.vue
+++ b/src/project/fd/AppRedemptionPoints/placeOrder.vue
@@ -13,7 +13,7 @@
         </div>
       </div>
       <p class="tips" v-if="goodsInfo.type == 2">兑换成功后，点击「去购买」前往京东低价购买</p>
-      <p class="tips" v-else>免费兑换商品，可到固定的兑换点进行「核销兑换」</p>
+      <p class="tips" v-else>积分兑换商品，可到固定的兑换点进行「核销兑换」</p>
     </div>
     <div class="content">
       <div class="item-flex" @click="show=true">
diff --git a/src/project/fd/AppRedemptionPoints/productDetails.vue b/src/project/fd/AppRedemptionPoints/productDetails.vue
index 0e11fd60..2ef42365 100644
--- a/src/project/fd/AppRedemptionPoints/productDetails.vue
+++ b/src/project/fd/AppRedemptionPoints/productDetails.vue
@@ -7,7 +7,7 @@
       <h3>{{goodsInfo.integralPrice}}积分<span v-if="goodsInfo.type == 2">+￥{{goodsInfo.payMoney}}<span v-if="goodsInfo.type == 2">（兑换后再付）</span></span></h3>
       <div>零售单价¥{{goodsInfo.retailPrice}}</div>
       <span class="tips" v-if="goodsInfo.type == 2">兑换成功后，点击「去购买」前往京东低价购买</span>
-      <span class="tips" v-else>免费兑换商品，可到固定的兑换点进行「核销兑换」</span>
+      <span class="tips" v-else>积分兑换商品，可到固定的兑换点进行「核销兑换」</span>
     </div>
     <div class="product-content">
       <p>商品描述：</p>
diff --git a/src/project/fd/AppRedemptionPoints/successOrder.vue b/src/project/fd/AppRedemptionPoints/successOrder.vue
index 41a93027..298f7b4e 100644
--- a/src/project/fd/AppRedemptionPoints/successOrder.vue
+++ b/src/project/fd/AppRedemptionPoints/successOrder.vue
@@ -3,7 +3,7 @@
     <img src="./img/success.png" alt="">
     <div v-if="goodsInfo.type == 0">
       <h3>提交成功</h3>
-      <p>提交「免费兑」订单成功，扣减 <span>{{integralPrice}}积分</span></p>
+      <p>提交「积分兑换」订单成功，扣减 <span>{{integralPrice}}积分</span></p>
       <div class="btn-flex">
         <div @click="back">返回</div>
         <div @click="toOrderList">查看订单</div>
diff --git a/src/project/pidu/AppConversation/AppConversation.vue b/src/project/pidu/AppConversation/AppConversation.vue
index 08a573a3..173d7651 100644
--- a/src/project/pidu/AppConversation/AppConversation.vue
+++ b/src/project/pidu/AppConversation/AppConversation.vue
@@ -44,14 +44,14 @@
     </AiTopFixed>
     <div class="user-list" v-if="list.length">
       <div class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)">
-        <div class="flex-left">
-          <img :src="item.toUserAvatar" alt="" v-if="currentTabs == 1">
-          <p v-if="currentTabs == 1">{{item.toUserName}}</p>
-          <img src="./img/group-img.png" alt="" v-if="currentTabs != 1">
-          <p v-if="currentTabs != 1">{{item.roomName}}</p>
+        <img :src="item.toUserAvatar" alt="" v-if="currentTabs == 1">
+        <img src="./img/group-img.png" alt="" v-else>
+        <div class="item-border">
+          <div class="flex-left">
+            <p>{{currentTabs == 1 ? item.toUserName : item.roomName}}</p>
+          </div>
+          <div class="flex-right" :class="`type`+item.userType" v-if="item.userType > 0">{{item.userType == 1 ? '内部' : '外部'}}</div>
         </div>
-        <div class="flex-right" :class="`type`+item.roomType" v-if="currentTabs == 1 && item.roomType > 0">{{item.roomType == 1 ? '内部' : '外部'}}</div>
-        <div class="flex-right" :class="`type`+item.toUserType" v-if="currentTabs != 1 && item.toUserType > 0">{{item.toUserType == 1 ? '内部' : '外部'}}</div>
       </div>
     </div>
     <AiEmpty v-else/>
@@ -134,6 +134,13 @@ export default {
         }
       }).then(res=> {
         if(res?.data) {
+          res.data.records.map((item) => {
+            if(item.type == 1) {
+              item.userType = item.roomType
+            }else {
+              item.userType = item.toUserType
+            }
+          })
           this.list = this.current > 1 ? [...this.list, ...res.data.records]: res.data.records
           this.pages = res.data.pages
         }
@@ -199,9 +206,15 @@ export default {
     border-top: 1px solid #eee;
     background-color: #fff;
     .item {
-      padding: 24px 32px 0 32px;
+      padding: 24px 0 0 32px;
       display: flex;
-      justify-content: space-between;
+      .item-border {
+        width: calc(100% - 112px);
+        padding-right: 32px;
+        display: flex;
+        justify-content: space-between;
+        border-bottom: 1px solid #eee;
+      }
       .flex-left {
         padding-right: 8px;
         box-sizing: border-box;
@@ -238,9 +251,9 @@ export default {
         font-size: 32px;
         color: #333;
         letter-spacing: 0.3px;
-        border-bottom: 1px solid #eee;
         display: inline-block;
         vertical-align: top;
+        width: 100%;
       }
     }
     .item:nth-last-child(1) {