Merge remote-tracking branch 'origin/master'

doum

2026-04-29 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea

 small-program/shop/pages/message/message.vue

@@ -10,7 +10,7 @@
         </view>
      </view>
      <view class="content">
         <view class="message-item" v-for="item in noticeList" :key="item.id">
         <view class="message-item" v-for="item in noticeList" :key="item.id" @click="goDetail(item)">
            <view class="message-item-image">
               <view class="message-item-image-dian" v-if="item.status === 0"></view>
               <image src="/static/icon/xiaoxi_ic_tongzhi3@2x.png" mode="widthFix"></image>
@@ -62,12 +62,17 @@
         }
      },
      methods: {
         goDetail(item){
            uni.navigateTo({
               url:'/shop/pages/order-details/order-details?userType=0&id='+item.objId
            })
         },
         async getNoticeList() {
            const res = await this.$u.api.getMemberNoticePage({
            const res = await this.$u.api.shopNoticePage({
               page: this.pageNum,
               capacity: this.pageSize,
               model: {
                  userType: 0
                  userType: 2
               }
            })
            if (res.code === 200) {