超值划算进度

packages/app/src/core/libs/requests.ts

@@ -638,7 +638,7 @@ export const readCount = () => httpGet('/app-api/member/message-manage/readCount
 /**
  * 批量修改为已读
  */
-export const updateReadByMessageType = (data: { messageType: number; messageSubType: number }) =>
+export const updateReadByMessageType = (data: { messageType: number}) =>
   httpPut('/app-api/member/message-manage/updateReadByMessageType', data)
 /**
  * 积分订单取消

packages/app/src/pages/home/mall/index.vue

@@ -174,14 +174,14 @@ onShareTimeline(() => ({
 
                       <ProgressEvo
                         :height="6"
-                        :model-value="(it.exchangeCount || 0 / it.productRepertory || 0) * 100"
+                        :model-value="(it.exchangeCount / (it.productRepertory + it.exchangeCount) || 0) * 100"
                         color="black"
                       ></ProgressEvo>
                     </div>
                     <div
                       class="text-black/40 text-[10px] font-normal font-['PingFang_SC'] leading-normal"
                     >
-                      还剩{{ it.productRepertory - it.exchangeCount }}件
+                      还剩{{ it.productRepertory}}件
                     </div>
                   </template>
                   <template v-else>

packages/app/src/pages/home/mall/shopping-cart/index.vue

@@ -43,12 +43,16 @@ const points = computed(() =>
 
 const query = ref({userId: userInfo.value?.userId})
 const handleSelect = (product) => {
+  console.log("选中")
   if (product.status || product.deleted || (product.isRestrict == 1 && product.productRepertory == 0)) {
     return null;
   }
   if (selected.value.map((it) => it.productId).includes(product.productId)) {
     selected.value = selected.value.filter(({productId}) => productId !== product.productId)
   } else {
+    if (product.showFavourable){
+      product.points = product.favourablePoints
+    }
     selected.value = [...selected.value, product]
   }
 }