merge

packages/app/src/composables/share.ts

@@ -47,7 +47,7 @@ export const useShare = () => {
         }
         res.path = `/pages-sub/home/moment/index?id=${target.dataset.options.id}&isShared=true&circleType=${target.dataset.options.circleType}`
         res.imageUrl = target.dataset.options.bannerUrls[0]
-        res.title = `${target.dataset.options.stylistName}: ${target.dataset.options.circleDesc}`
+        res.title = `${target.dataset.options.stylistName}: ${target.dataset.options.circleType == '2' ? '设计案例-' + target.dataset.options.caseName : target.dataset.options.circleDesc}`
       }
     }
     if (from === 'menu') {

packages/app/src/pages-sub/home/moment/index.vue

@@ -174,8 +174,8 @@ const toDesignerHomepage = () => {
   }
 }
 onMounted(async () => {})
-const dictMemberDesignStyle = ref<[]>()
-const dictCircleSpaceType = ref<[]>()
+const dictMemberDesignStyle = ref<any[]>()
+const dictCircleSpaceType = ref<any[]>()
 onLoad(async (query?: { id: string; isShared?: boolean; circleType?: string }) => {
   id.value = query?.id
   isShared.value = query?.isShared
@@ -188,17 +188,23 @@ onLoad(async (query?: { id: string; isShared?: boolean; circleType?: string }) =
   dictCircleSpaceType.value = value1.data
   let value2 = await getByDictType(DictType.memberDesignStyle)
   dictMemberDesignStyle.value = value2.data
+
+  if (data.value?.levelId < 2) {
+    uni.hideShareMenu({
+      hideShareItems: ['shareAppMessage', 'shareTimeline'],
+    })
+  }
 })
 // onShareAppMessage(async () => {
 //   await shareCircle(id.value)
 //   return { title: data.value?.circleDesc }
 // })
-onShareAppMessage(({ from }) => {
+onShareAppMessage(({ from, target }) => {
   if (from === 'button') {
-    return shareAppMessage
+    return shareAppMessage({ from, target })
   } else if (from === 'menu') {
     return {
-      title: `${data.value?.stylistName}: ${data.value?.circleDesc}`,
+      title: `${data.value?.stylistName}: ${data.value?.circleType === '2' ? '设计案例-' + data.value?.caseName : data.value?.circleDesc}`,
       path: `/pages-sub/home/moment/index?id=${data.value?.id}&isShared=true&circleType=${data.value?.circleType}`,
       imageUrl: data.value?.bannerUrls[0],
     }