merge

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

@@ -69,11 +69,11 @@ onLoad(async (query: { id: string; title: string; item: string }) => {
 })
 onShareAppMessage(() => ({
   title: data.value?.prodcutName,
-  imageUrl:data.value?.productCoverImgUrl
+  imageUrl: data.value?.productCoverImgUrl,
 }))
 onShareTimeline(() => ({
   title: data.value?.prodcutName,
-  imageUrl:data.value?.productCoverImgUrl
+  imageUrl: data.value?.productCoverImgUrl,
 }))
 </script>
 
@@ -136,11 +136,11 @@ onShareTimeline(() => ({
       <div class="absolute aspect-[1.26/1] top-0 w-full">
         <!--        <wd-img width="100%" height="100%" :src="data?.productDetailsImgUrl" />-->
         <swiper>
-<!--          <template v-for="(it, index) in data?.productDetailsImgUrl?.split(',')" :key="index">-->
-<!--            <swiper-item>-->
-<!--              <wd-img width="100%" height="100%" mode="aspectFill" :src="it" />-->
-<!--            </swiper-item>-->
-<!--          </template>-->
+          <!--          <template v-for="(it, index) in data?.productDetailsImgUrl?.split(',')" :key="index">-->
+          <!--            <swiper-item>-->
+          <!--              <wd-img width="100%" height="100%" mode="aspectFill" :src="it" />-->
+          <!--            </swiper-item>-->
+          <!--          </template>-->
           <wd-swiper
             custom-class="rounded-1xl overflow-hidden aspect-[1.29/1]"
             width="100%"
@@ -159,7 +159,8 @@ onShareTimeline(() => ({
         v-if="String(data?.needPoints) === '1'"
         class="text-black/60 text-base font-normal font-['PingFang_SC'] leading-4"
       >
-        <span style="color: red;">{{ data?.points }}</span> 折
+        <span style="color: red">{{ data?.points }}</span>
+        折
       </div>
       <div class="flex">
         <div class="text-black text-xl font-normal font-['PingFang_SC'] leading-[10.18px]">
@@ -191,14 +192,18 @@ onShareTimeline(() => ({
 
     <BottomAppBar fixed placeholder v-if="String(data?.needPoints) !== '1'">
       <div
-        class="bg-white/90 backdrop-blur-[20px] flex px-10 py-2.5 border-t-1 border-t-solid border-t-[#ececec]"
+        class="bg-white/90 backdrop-blur-[20px] flex 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?.showFavourable ? data?.favourablePoints : data?.points }}
-        </div>
-        <div class="text-black/40 text-base font-normal font-['PingFang_SC'] leading-[34px]">
-          积分
+        <div class="flex items-center gap-2">
+          <div class="text-[#ef4343] text-2xl font-normal font-['D-DIN_Exp'] leading-normal">
+            <!--          {{ data?.points }}-->
+            {{ data?.showFavourable ? data?.favourablePoints : data?.points }}
+          </div>
+          <div
+            class="text-black/40 text-[14px] pt-5px font-normal font-['PingFang_SC'] leading-[34px]"
+          >
+            积分
+          </div>
         </div>
         <div class="flex-1"></div>
         <div