purui преди 2 месеца
родител
ревизия
1011d7b86b

+ 1 - 1
packages/app/src/components/moment-item.vue

@@ -105,7 +105,7 @@ onMounted(async () => {
           <wd-img
             v-if="getMemberAvatarFrame(options?.levelId)"
             custom-class="absolute! level-circle"
-            :width="38"
+            :width="37"
             :height="40"
             :src="getMemberAvatarFrame(options?.levelId) || ''"
           ></wd-img>

+ 1 - 1
packages/app/src/pages-sub/home/components/info-card.vue

@@ -8,7 +8,7 @@ const props = defineProps<{
 </script>
 <template>
   <card custom-class="my-6">
-    <div class="my-7.5 text-black text-xl font-normal font-['PingFang_SC'] leading-[10.18px]">
+    <div class="my-7.5 text-black text-xl font-normal font-['PingFang_SC'] leading-[10.18px]" style="line-height: 20rpx;">
       {{ props.title }}
     </div>
     <div

+ 1 - 4
packages/app/src/pages-sub/home/spread/index.vue

@@ -83,10 +83,7 @@ onMounted(async () => {
     </view>
     <info-card
       title="筑巢荟-设计传播"
-      desc="我们为您精心打造了一个独特且极具价值的游学项目。这个项目的核心旨在全方位提升您作为设计师的能力。
-在这里,您将拥有无比优质的游学资源。我们与全球知名的设计学府、顶尖设计工作室以及具有代表性的经典建筑和室内空间建立了紧密合作。您将有机会深入这些卓越的场所,亲身体验最前沿的设计理念和实践。
-参与专业的研讨会和工作坊,与同行们分享见解、碰撞思维火花,进一步深化对设计的理解。
-"
+      desc="我们专注于设计传播板块,通过微信代运营、设计奖项评选及案例拍摄等服务,为设计师提供全方位的赋能支持。我们利用专业平台与资源,帮助设计师扩大影响力,提升知名度。同时,通过展示优秀设计案例,激发创意灵感,促进设计交流,助力设计师在职业生涯中脱颖而出,实现个人与作品的双重价值提升。"
     ></info-card>
     <section-heading title="最新资讯"></section-heading>
     <div class="my-6 flex flex-col gap-6">

+ 5 - 1
packages/app/src/pages-sub/home/study-tour/index.vue

@@ -179,7 +179,7 @@ onMounted(async () => {
       tip="暂无内容"
     ></wd-status-tip>
     <section-heading custom-class="" title="设计圈"></section-heading>
-    <PageHelper :request="getCircles" :query="{}" class="flex-grow flex flex-col">
+    <PageHelper :request="getCircles" :query="{tagName: '设计游学'}" class="flex-grow flex flex-col">
       <template #default="{ source }">
         <div class="flex-grow flex flex-col gap-6">
           <template v-for="(it, i) in source.list" :key="i">
@@ -199,4 +199,8 @@ onMounted(async () => {
 	.bg-active{
 		width:40rpx;
 	}
+	:deep(.level-circle){
+		top: -10rpx;
+		left:-5rpx;
+	}
 </style>

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

@@ -171,7 +171,7 @@ const shareMessage = () =>{
 			  reject()
 		  }else{
 			  const res: Page.CustomShareContent = {}
-			  res.title = `${designerInfo.value?.homePageName?designerInfo.value?.homePageName:userInfo.value?.nickname}: “${designerInfo.value?.designDesc}”`;
+			  res.title = designerInfo.value?.homePageName?designerInfo.value?.homePageName:userInfo.value?.nickname+" “${designerInfo.value?.designDesc}”";
 			  res.imageUrl = designerInfo.value.sharePageUrl;
 			  res.path = `/pages-sub/mine/homepage/index?id=${userInfo.value?.id}&isShared=true`
 			  resolve(res)
@@ -186,7 +186,7 @@ onShareAppMessage(shareMessage)
 //   path:`/pages-sub/mine/homepage/index?id=${id}&isShared=true`
 // }))
 onShareTimeline(()=>({
-	title:`${designerInfo.value?.homePageName?designerInfo.value?.homePageName:userInfo.value?.nickname}: “${designerInfo.value?.designDesc}”`,
+	title:designerInfo.value?.homePageName?designerInfo.value?.homePageName:userInfo.value?.nickname + " “${designerInfo.value?.designDesc}”",
 	imageUrl:designerInfo.value.sharePageUrl,
 	query:`${id}&isShared=true`
 }))

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

@@ -8,8 +8,8 @@
 </route>
 <script setup lang="ts">
 import NavbarEvo from '@/components/navbar-evo.vue'
-import { getDesignerInfo } from '../../../../core/libs/requests'
-import { Badge } from '../../../../core/libs/models'
+import { getBanners,getDesignerInfo } from '../../../../core/libs/requests'
+import { Badge, BannerMode } from '../../../../core/libs/models'
 import { NetImages } from '../../../../core/libs/net-images'
 import { useMessage } from 'wot-design-uni'
 import { pick } from 'radash'
@@ -103,6 +103,7 @@ const cancelSaveImage = () => {
 }
 const data = ref<{
   name: string
+  userId: number
   quantity: number
   // 已获取的图片和未获取的图片
   image: string
@@ -129,9 +130,17 @@ const setBadgesPath = (type: string) => {
       url: `/pages-sub/home/offline-activity/index`,
     })
   } else if(type === '游学徽章' || type === '典藏勋章') {
-    uni.switchTab({
-      url: `/pages/home/index`,
-    })
+	  if(banners.value?.length > 0){
+		  uni.redirectTo({
+		    url: `/pages-sub/home/study-tour/list?designStudyAbroadYear=${banners.value[0].designStudyAbroadYear}&designDesc=${banners.value[0].designDesc}`,
+		  })
+	  }else{
+		  uni.showToast({
+		  	title:"暂无游学计划",
+			icon:"none"
+		  })
+	  }
+    
   } else {
     uni.switchTab({
       url: `/pages/home/index`,
@@ -151,12 +160,18 @@ const select = (item: any) => {
     save()
   }
 }
-onLoad(async (query: { type: 'badge' | 'certificate'; data: string }) => {
+const { data: banners, run: setBanners } = useRequest(
+  () => getBanners({ mode: BannerMode.StudyTour }),
+  { initialData: [] },
+)
+onLoad(async (query: { type: 'badge' | 'certificate'; data: string; id: number }) => {
   console.log(query, 'query2')
   if (query.type === 'badge') {
     const badge = JSON.parse(query.data) as Badge
+	console.log(badge)
     data.value = {
       name: badge.badgeName,
+	  userId:query.id,
       quantity: badge.quantity,
       image: badge.badgeNotObtainedImage,
       activedImage: badge.badgeYesObtainedImage,
@@ -164,9 +179,12 @@ onLoad(async (query: { type: 'badge' | 'certificate'; data: string }) => {
       badgeDescription: badge.badgeDescription,
       createTime: badge.createTime,
     }
+	await setBanners()
     if (data.value.quantity > 0) {
-      await setData()
-      posterUrl.value = await createPoster()
+      await setData();	  
+      if(data.value.userId == userInfo.value.userId){
+		  posterUrl.value = await createPoster()
+	  }
     }
   }
 })
@@ -226,20 +244,22 @@ onLoad(async (query: { type: 'badge' | 'certificate'; data: string }) => {
         累计参与{{ data.quantity }}次
       </div>
     </div>
-    <wd-button
-      custom-class="w-[161px] h-12 bg-[#0cbe7c]! rounded-[30px]"
-      @click="showActions"
-      v-if="data.quantity > 0"
-    >
-      去分享
-    </wd-button>
-    <wd-button
-      custom-class="w-[161px] h-12 bg-[#0cbe7c]! rounded-[30px]"
-      @click="setBadgesPath(data.badgeType)"
-      v-else
-    >
-      去获得
-    </wd-button>
+    <template v-if="data.userId == userInfo.userId">
+		<wd-button
+		  custom-class="w-[161px] h-12 bg-[#0cbe7c]! rounded-[30px]"
+		  @click="showActions"
+		  v-if="data.quantity > 0"
+		>
+		  去分享
+		</wd-button>
+		<wd-button
+		  custom-class="w-[161px] h-12 bg-[#0cbe7c]! rounded-[30px]"
+		  @click="setBadgesPath(data.badgeType)"
+		  v-else
+		>
+		  去获得
+		</wd-button>
+	</template>
     <canvas
       class="w-[347px] h-[494px] absolute rounded-[20px] top--1000"
       canvas-id="firstCanvas"

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

@@ -190,7 +190,7 @@ onLoad(async (query?: Record<string | 'active' | 'id' | 'isShared', string>) =>
               <div class="grid grid-cols-[90px_1fr] gap-x-4">
                 <div class="grid-row-start-1 grid-row-end-4 col-start-1" @click="
                   router.push(
-                    `/pages-sub/mine/honors/detail/index?type=badge&data=${JSON.stringify(item)}`,
+                    `/pages-sub/mine/honors/detail/index?type=badge&id=${id}&data=${JSON.stringify(item)}`,
                   )
                 ">
                   <!-- <wd-img
@@ -213,7 +213,7 @@ onLoad(async (query?: Record<string | 'active' | 'id' | 'isShared', string>) =>
                     class="text-center text-[#ffecb9] text-lg font-normal font-['PingFang_SC'] leading-relaxed"
 					@click="
 					  router.push(
-					    `/pages-sub/mine/honors/detail/index?type=badge&data=${JSON.stringify(item)}`,
+					    `/pages-sub/mine/honors/detail/index?type=badge&id=${id}&data=${JSON.stringify(item)}`,
 					  )
 					"
                   >
@@ -291,7 +291,7 @@ onLoad(async (query?: Record<string | 'active' | 'id' | 'isShared', string>) =>
                 class="w-full px-4 box-border"
                 @click="
                   router.push(
-                    `/pages-sub/mine/honors/detail/index?type=badge&data=${JSON.stringify(item)}`,
+                    `/pages-sub/mine/honors/detail/index?type=badge&id=${id}&data=${JSON.stringify(item)}`,
                   )
                 "
               >

+ 1 - 1
packages/app/src/pages/home/index.vue

@@ -312,6 +312,6 @@ onShareAppMessage(shareAppMessage)
 	}
 	:deep(.level-circle){
 		top: -10rpx;
-		left:-7rpx;
+		left:-5rpx;
 	}
 </style>

+ 3 - 3
packages/app/src/pages/mine/index.vue

@@ -74,7 +74,7 @@ const { data: taskStatusData, run: setTaskStatus } = useRequest(
         btnProps: {
           content: '去关注',
           // onClick: () => uni.showToast({ title: '敬请期待', icon: 'none' }),
-		  onClick: () => official.value = true,
+		  onClick: () => uni.previewImage({ urls: ["https://image.zhuchaohui.com/zhucaohui/de0f43be81ba577eda016a994ab203bb79149f09a7a919b7598ec2c0cb04c75d.png"] }),
         },
       },
     ]),
@@ -477,12 +477,12 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
       <SectionHeading custom-class="my-6" title="和筑巢荟一起共同成长"></SectionHeading>
       <CardMenu :items="pieces" custom-class="grid-cols-2" />
     </view>
-	<wd-overlay :show="official" @click="official = false">
+	<!-- <wd-overlay :show="official" @click="official = false">
 		<view class="wrapper" @click.stop="">
 		    <wd-img :width="'100%'" :height="'100%'" src="https://image.zhuchaohui.com/zhucaohui/de0f43be81ba577eda016a994ab203bb79149f09a7a919b7598ec2c0cb04c75d.png" mode="widthFix"></wd-img>
 			<wd-img @click="official = false" :src="close" width="28" height="28" custom-class="vertical-bottom"></wd-img>
 		</view>
-	</wd-overlay>
+	</wd-overlay> -->
   </view>
 </template>