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

packages/app/src/pages/home/spread/product-detail/index.vue

@@ -42,7 +42,7 @@ const handleConfirm = async () => {
       list: [
         {
           productId: id.value,
-          points: data.value.points,
+          points: data.value.showFavourable ? data.value.favourablePoints : data.value.points,
           nums: 1,
           productName: data.value.prodcutName,
           orderImgUrl: data.value.productCoverImgUrl,
@@ -52,9 +52,15 @@ const handleConfirm = async () => {
       couponList: [],
     }
     const { data: res, code } = await requestToast(() => productPlacing(body))
-    if (code !== 0) return
+    if (code !== 0) {
+      uni.showToast({
+        title: res.msg,
+        icon: 'none',
+      })
+    } else {
+      await router.push(`/pages/home/mall/confirm-order/index?data=${JSON.stringify(body)}`)
+    }
     // router.push(`/pages/home/mall/confirm-order/index?data=${JSON.stringify(res)}`)
-    await router.push(`/pages/home/mall/confirm-order/index?data=${JSON.stringify(body)}`)
   }
 }
 onLoad(async (query: { id: string; title: string; item: string }) => {
@@ -133,15 +139,13 @@ onShareTimeline(() => ({
     </div>
     <div class="relative flex-1 bg-white p-7 flex flex-col gap-6 rounded-tl-2xl rounded-tr-2xl">
       <div class="flex">
-        <div class=" text-black text-xl font-normal font-['PingFang_SC'] leading-[10.18px]">
+        <div class="text-black text-xl font-normal font-['PingFang_SC'] leading-[10.18px]">
           {{ data?.prodcutName }}
         </div>
       </div>
-              <div
-                class=" text-black/60 text-sm font-normal font-['PingFang_SC'] "
-              >
-                {{ data?.exchangeDesc }}
-              </div>
+      <div class="text-black/60 text-sm font-normal font-['PingFang_SC']">
+        {{ data?.exchangeDesc }}
+      </div>
       <div
         class="text-justify text-black/40 text-base font-normal font-['PingFang_SC'] leading-relaxed"
         v-html="data?.contentDesc"
@@ -152,7 +156,8 @@ onShareTimeline(() => ({
         class="bg-white/90 backdrop-blur-[20px] flex px-10 py-2.5 border-t-1 border-t-solid border-t-[#ececec]"
       >
         <div class="text-[#ef4343] text-2xl font-normal font-['D-DIN_Exp'] leading-normal">
-          {{ data?.points }}
+          <!--          {{ data?.points }}-->
+          {{ data?.showFavourable ? data.favourablePoints : data.points }}
         </div>
         <div class="text-black/40 text-base font-normal font-['PingFang_SC'] leading-[34px]">
           积分
@@ -182,7 +187,7 @@ onShareTimeline(() => ({
             </div>
             <div class="flex items-center">
               <div class="text-[#ef4343] text-[22px] font-normal font-['D-DIN_Exp'] leading-normal">
-                {{ data?.points }}
+                {{ data?.showFavourable ? data?.favourablePoints : data?.points }}
               </div>
               <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[34px]">
                 积分

packages/app/src/pages/home/spread/wx-agent-operation/index.vue

@@ -51,7 +51,7 @@ onShareTimeline(() => ({
             <div class="flex items-center">
               <div 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]">
                 积分