Merge remote-tracking branch 'origin/main' into main

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

@@ -203,7 +203,8 @@ onShareTimeline(() => ({
                 <div class="flex items-end gap-1 mt-5">
                   <div class="text-[#ef4343] text-[22px] font-normal font-['D-DIN_Exp'] pb-3">
                     <!-- 1600 -->
-                    {{ it.favourablePoints }}
+<!--                    {{ it.showFavourable ? it.favourablePoints : it.points }}-->
+                    {{it.favourablePoints}}
                   </div>
                   <div class="text-black/60 text-sm font-normal font-['PingFang_SC'] pb-3">
                     积分
@@ -219,7 +220,7 @@ onShareTimeline(() => ({
                   <div
                     class="text-black/30 text-[10px] font-normal font-['PingFang_SC'] line-through leading-normal"
                   >
-                    {{ it.points }}积分
+                    {{ it.showFavourable ? it.favourablePoints : it.points }} 积分
                   </div>
                   <div
                     class="text-black/30 text-[10px] font-normal font-['PingFang_SC'] line-through leading-normal"

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

@@ -34,8 +34,13 @@ const router = useRouter()
 const { userInfo } = storeToRefs(userStore)
 const selected = ref([])
 const points = computed(() =>
-  selected.value.reduce((acc, item) => acc + item.points * item.nums, 0),
+  selected.value.reduce(
+    (acc, item) =>
+      item.showFavourable ? acc + item.favourablePoints * item.nums : acc + item.points * item.nums,
+    0,
+  ),
 )
+
 const query = ref({ userId: userInfo.value?.userId })
 const handleSelect = (product) => {
   if (selected.value.map((it) => it.productId).includes(product.productId)) {
@@ -182,7 +187,8 @@ const handlePlaceOrder = async () => {
                     <div
                       class="text-[#ef4343] text-[22px] font-normal font-['D-DIN_Exp'] leading-normal"
                     >
-                      {{ it.points }}
+                      <!--                      {{ it.points }}-->
+                      {{ it.showFavourable ? it.favourablePoints : it.points }}
                     </div>
                     <div
                       class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px]"

packages/app/src/pages/home/spread/case-shooting/index.vue

@@ -54,7 +54,7 @@ onShareTimeline(() => ({
                   class="text-[#ef4343] text-[22px] font-normal font-['D-DIN_Exp'] leading-normal"
                 >
                   <!-- 1600 -->
-                  {{ it.points }}
+                  {{ it.showFavourable ? it.favourablePoints : it.points }}
                 </div>
                 <div class="text-black/60 text-sm font-normal font-['PingFang_SC'] leading-[34px]">
                   积分
@@ -63,7 +63,7 @@ onShareTimeline(() => ({
                 <div
                   class="w-[53px] text-black/30 text-xs font-normal font-['PingFang_SC'] line-through leading-normal"
                 >
-                  2000积分
+                  ￥{{ it.productPrice }}
                 </div>
               </div>
             </div>