Merge branch 'fix/im-0526' into msb_test

pages/account/index/message.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-04 17:48:12
  * @LastEditors: ch
- * @LastEditTime: 2022-05-26 21:10:34
+ * @LastEditTime: 2022-05-27 10:30:25
  * @Description: file content
 -->
 
@@ -13,8 +13,10 @@
       <section class="section">
         <div
           class="section__item flex"
+          :class="item.payload.customType === 'orderAutoDelivery' && 'section__pointer'"
           v-for="item in msgData"
           :key="item.id"
+          @click="handleDetail(item)"
         >
           <img
             class="section__item-img"
@@ -26,14 +28,13 @@
               <span>{{ item.payload.title || `` }}</span>
               <span class="section__item-content--time">{{item.createTimeStamp}}</span>
             </div>
+            <div class="section__item-content--txt" >{{ item.payload.content }}</div>
             <div class="section__item-content--txt" v-if="item.payload.customType === 'orderAutoDelivery'">
                 <template v-for="i in item.payload.virtualProductContentList" @click="openLink(i)">
                   <a v-if="i.shipType === 1"  :key="i.shipContent" :href="i.shipContent" target="_blank">[下载文件]</a>
                   <span v-else :key="i.shipContent" >{{i.shipContent}}</span>
                 </template>
             </div>
-            <div class="section__item-content--txt" v-else 
-            @click="handleDetail(item)" >{{ item.payload.content }}</div>
           </div>
         </div>
         <UiEmpty
@@ -73,7 +74,9 @@ export default {
 		 * 点击详情跳转
 		 */
 		handleDetail(item){
-			if(['orderPay','orderDelivery','orderCancel'].includes(item.payload.customType)){
+      if(item.payload.customType === 'orderAutoDelivery'){
+          return false;
+      }else if(['orderPay','orderDelivery','orderCancel'].includes(item.payload.customType)){
 				this.$router.push(`/account/order/detail?id=${item.payload.primaryId}`)
 			}else if(['refundFail','refundSuccess'].includes(item.payload.customType)){
 				this.$message.warning('请在移动端查看售后详情~');
@@ -106,6 +109,9 @@ export default {
     margin-top: -1px;
     max-height: 600px;
     overflow-y: auto;
+    &__pointer{
+      cursor: pointer;
+    }
 
     &__item {
       margin-bottom: 20px;
@@ -118,7 +124,6 @@ export default {
 
       &-content {
         width: 840px;
-        cursor: pointer;
         &--title {
           margin: 8px 0;
           font-size: 16px;