merge

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

@@ -227,31 +227,16 @@ onShareTimeline(() => ({ title: data.value.name, imageUrl: data.value.thumbnailU
   >
     <NavbarEvo transparent dark></NavbarEvo>
     <div class="aspect-[1.26/1] relative mx--3.5 relative">
-      <!-- <wd-img width="100%" height="100%" :src="data.bannerUrl?.at(0)"></wd-img> -->
       <canvas
         class="w-full h-full absolute top--1000"
         canvas-id="firstCanvas"
         id="firstCanvas"
       ></canvas>
-      <!--      <ImageEvo :src="data?.bannerUrl" mode="aspectFill"></ImageEvo>-->
       <div
         class="w-full h-full bg-[length:100%_auto]"
         :style="{ backgroundImage: `url(${data?.bannerUrl})` }"
       ></div>
-      <!-- <wd-img width="100%" height="100%" :src="data?.backgroundUrl"></wd-img> -->
       <div class="absolute left-3.5 bottom-3" @click="isActivity && (listShow = true)">
-        <!--        <div-->
-        <!--          v-if="isStudyTour"-->
-        <!--          class="bg-white/20 rounded-[20px] backdrop-blur-[6px] px-3.5 py-1 flex gap-2.5"-->
-        <!--        >-->
-        <!--          <wd-img width="20" height="20" :src="bell"></wd-img>-->
-        <!--          <div class="text-[#c1c1c1] text-base font-normal font-['PingFang_SC'] leading-normal">-->
-        <!--            白金会员王凯峰已报名-->
-        <!--          </div>-->
-        <!--          <div class="w-6 bg-black aspect-square rounded-full flex items-center justify-center">-->
-        <!--            <wd-img width="18" height="18" :src="rightFill"></wd-img>-->
-        <!--          </div>-->
-        <!--        </div>-->
         <div class="flex items-center gap-1.25">
           <AvatarGroupCasual
             :urls="
@@ -288,7 +273,6 @@ onShareTimeline(() => ({ title: data.value.name, imageUrl: data.value.thumbnailU
     <div
       class="px-4 py-6 bg-[#010102]/30 backdrop-blur-[20px] rounded-2xl my-8 flex flex-col gap-3"
     >
-      <!-- {{ levelsById }} -->
       <template v-for="(it, i) in infos" :key="i">
         <div v-if="it.visable" class="flex items-center gap-1.5">
           <wd-img width="16" height="16" :src="it.icon"></wd-img>
@@ -328,12 +312,10 @@ onShareTimeline(() => ({ title: data.value.name, imageUrl: data.value.thumbnailU
         v-if="tab === 0"
         class="text-justify text-[#c1c1c1] text-base font-normal font-['PingFang_SC'] leading-relaxed"
       >
-        <!-- <u-parse :content="data['activityDesc'] || data['studyDesc']"></u-parse> -->
         <mpHtml :content="data['activityDesc'] || data['studyDesc']"></mpHtml>
       </div>
 
       <div v-if="tab === 1 && 'studyTravelList' in data" class="flex flex-col gap-6">
-        <!-- {{ mapEntries(schedules, (key, value) => [key, value]) }} -->
         <template v-for="([key, items], i) in Object.entries(schedules)" :key="key">
           <div class="flex flex-col gap-6">
             <div class="text-white text-base font-normal font-['PingFang_SC'] leading-normal">
@@ -475,9 +457,6 @@ onShareTimeline(() => ({ title: data.value.name, imageUrl: data.value.thumbnailU
                 {{ data.needPointsCount || 0 }}
               </div>
               <div class="text-black/40 text-sm font-normal font-['PingFang_SC']">积分</div>
-              <!--              <div class="ml-1 text-black/40 text-xs font-normal font-['PingFang_SC']">-->
-              <!--                剩余：{{ remainedCount || 0 }}-->
-              <!--              </div>-->
               <div class="flex-1"></div>
             </div>
           </div>

packages/app/src/pages-sub/mine/homepage/index.vue

@@ -367,6 +367,7 @@ defineExpose({
           <div
             v-if="designerInfo?.videoNumber"
             class="text-[#e08e38] text-xs font-normal font-['PingFang_SC'] leading-normal"
+            @click="handle2Video"
           >
             去看看
           </div>
@@ -427,25 +428,6 @@ defineExpose({
           </wd-button>
         </div>
         <div class="flex-1" v-if="isOwn && !isShared">
-          <!-- <button
-            v-if="features.shareMoment"
-            class="p-0 after:b-none"
-            block
-            :round="false"
-            :open-type="features.shareMoment ? 'share' : ''"
-            :data-type="'homepage'"
-            :data-share-content="{
-              title: `${userInfo.nickname}: “${designerInfo.designDesc}”`,
-              imageUrl: designerInfo.sharePageUrl,
-              path: `/pages-sub/mine/homepage/index?id=${id}&isShared=true`,
-            }"
-            :data-options="{
-              homepageId: id,
-              userId: userInfo.userId,
-            }"
-          >
-            <wd-button block :round="false">分享</wd-button>
-          </button> -->
           <button
             v-if="features.shareMoment"
             class="p-0 after:b-none"

packages/app/src/pages-sub/mine/honors/detail/index.vue

@@ -18,6 +18,7 @@ import { useUserStore } from '@/store'
 import { Canvas } from '@/core/utils/canvas'
 
 const show = ref<boolean>(false)
+const id = ref<string | number>('')
 const canvasHidden = ref<boolean>(false)
 const posterUrl = ref<string | any>()
 const userStore = useUserStore()
@@ -29,7 +30,7 @@ const panels = ref([
     index: 0,
   },
 ])
-const { data: designer, run: setData } = useRequest(() => getDesignerInfo(userInfo.value.userId))
+const { data: designer, run: setData } = useRequest(() => getDesignerInfo(id.value))
 /**
  * 生成分享海拔
  * */
@@ -164,6 +165,7 @@ const { data: banners, run: setBanners } = useRequest(
 onLoad(async (query: { type: 'badge' | 'certificate'; data: string; id: number }) => {
   console.log(query, 'query2')
   if (query.type === 'badge') {
+    id.value = query?.id
     const badge = JSON.parse(query.data) as Badge
     data.value = {
       name: badge.badgeName,