merge code

packages/app/src/core/libs/requests.ts

@@ -240,7 +240,7 @@ export const createCircleReview = (
   }>,
 ) => httpPost<any>('/app-api/member/circle-review/create', data)
 export const deleteCircleReview = (id) => httpGet('/app-api/member/circle-review/delete', { id })
-export const getCircleReviews = (query: { circleId: string }) =>
+export const getCircleReviews = (query: { circleId: string ,hot:boolean}) =>
   httpGet<{
     list: Comment[]
   }>('/app-api/member/circle-review/getCircleReviewByCircleId', query)

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

@@ -494,7 +494,9 @@ onShareTimeline(() => ({ title: data.value.name, imageUrl: data.value.thumbnailU
               <div class="text-justify text-white text-2xl font-bold font-['Alimama_ShuHeiTi']">
                 报名详情
               </div>
+              <div @click="listShow = true"><wd-icon name="close" size="22px" color="#ffff"></wd-icon></div>
             </div>
+
             <div class="flex flex-col justify-center aspect-[0.7/1] gap-5 p-6.5">
               <PageHelper
                 :request="isActivity ? getActivitySignups : getStudyTourSignups"

packages/app/src/pages/home/components/comment-item.vue

@@ -13,6 +13,7 @@ import { dayjs } from 'wot-design-uni'
 import { storeToRefs } from 'pinia'
 import CommentItem from './comment-item.vue'
 import Avatar from '@/pages/common/components/avatar.vue'
+import {likeActived} from "@designer-hub/assets/src/icons";
 
 const props = withDefaults(
   defineProps<{ options: Partial<Comment>; isChild?: boolean; index?: number }>(),
@@ -136,7 +137,7 @@ defineExpose({
       </view>
       <view class="col-start-3 row-start-1 flex flex-col items-center" @click="handleUpvote">
         <div class="w-[18px] h-[18px] relative">
-          <wd-img :src="options.upvote ? thumbsUpActive : thumbsUp" width="18" height="18"></wd-img>
+          <wd-img :src="options.upvote ? likeActived : thumbsUp" width="18" height="18"></wd-img>
         </div>
         <div
           class="mt-1.5 text-black/40 text-[10px] font-normal font-['PingFang_SC'] leading-[10.18px]"

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

@@ -52,11 +52,12 @@ const commentRef = ref<InstanceType<typeof WdInput>>()
 const commentItemRef = ref<InstanceType<typeof CommentItem>[]>()
 const instance = getCurrentInstance()
 const momentVideoRef = ref<ComponentExposed<typeof MomentVideo>[]>()
-
 const focus = ref(false)
+const hot = ref(true)
+const active = ref('hot');
 const { data, run } = useRequest(() => getCircle(id.value), { initialData: {} })
 const { data: reviews, run: runGetReviews } = useRequest(
-  () => getCircleReviews({ circleId: id.value }),
+  () => getCircleReviews({ circleId: id.value,hot:hot.value}),
   {
     initialData: {
       list: [],
@@ -175,6 +176,13 @@ onLoad(async (query?: { id: string; isShared?: boolean }) => {
 //   return { title: data.value?.circleDesc }
 // })
 onShareAppMessage(shareAppMessage)
+
+
+const handleClick = async (value:boolean) => {
+  active.value = value ? 'hot' : 'time';
+  hot.value = value
+  await runGetReviews()
+};
 </script>
 <template>
   <view class="bg-white flex-grow">
@@ -324,15 +332,21 @@ onShareAppMessage(shareAppMessage)
       <SectionHeading v-if="!isShared" :title="`评论`" size="base">
         <template #append>
           <view v-if="reviews?.list" class="flex">
-            <div class="text-black/90 text-xs font-normal font-['PingFang_SC'] leading-[10.18px]">
+            <div @click="handleClick(true)" :class="{
+        'text-black/90': active === 'hot',
+        'text-black/40': active !== 'hot'
+      }" class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-[10.18px]">
               按热度
             </div>
             <div
-              class="mx-2 text-black/40 text-xs font-normal font-['PingFang_SC'] leading-[10.18px]"
+              class="text-xs font-normal font-['PingFang_SC'] leading-[10.18px]"
             >
               |
             </div>
-            <div class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-[10.18px]">
+            <div @click="handleClick(false)"  :class="{
+        'text-black/90': active === 'time',
+        'text-black/40': active !== 'time'
+      }"  class="text-xs font-normal font-['PingFang_SC'] leading-[10.18px]">
               按时间
             </div>
           </view>

packages/app/src/pages/mine/levels/components/level-card.vue

@@ -58,7 +58,7 @@ const isLowerThanCurrent = computed(() => {
     <template v-else-if="isLowerThanCurrent">
       <div class="text-[#61311b] text-xs font-normal font-['PingFang_SC'] leading-relaxed">
         <!--        还差{{ props.option[props.index]?.points - userInfo.level.point }}积分升级-->
-        距{{ option[index].memberLevelName }}会员还需{{
+        距{{ option[index].memberLevelName }}还需{{
           option[index].points - userInfo.level.point
         }}积分
       </div>
@@ -71,7 +71,7 @@ const isLowerThanCurrent = computed(() => {
     </template>
     <template v-else>
       <div class="text-[#61311b] text-xs font-normal font-['PingFang_SC'] leading-relaxed">
-        距{{ option[index + 1].memberLevelName }}会员还需{{
+        距{{ option[index + 1].memberLevelName }}还需{{
           option[index + 1].points - userInfo.level.point
         }}积分
       </div>

packages/app/src/pages/mine/orders/detail/index.vue

@@ -101,7 +101,7 @@ onLoad((query: { id: string }) => {
       <template #append>
         <div class="flex items-center gap-1">
           <div class="text-[#ef4343] text-sm font-normal font-['PingFang_SC'] leading-[10.18px]">
-            -{{ Number(data.points) - Number(data.orderMoney) }}
+            -{{ Number(data.points) - Number(data.payPoints) }}
           </div>
           <wd-img :src="right" width="12" height="12"></wd-img>
         </div>

packages/merchant/src/pages/mine/index.vue

@@ -86,16 +86,16 @@ onPageScroll(({ scrollTop }: { scrollTop: number }) => {
             <wd-img width="64" height="64" round :src="data?.avatar" />
           </div>
           <div class="ml-[10px]">
-            <div class="text-black/90 text-lg font-normal font-['PingFang_SC'] leading-[10.18px]">
+            <div class="text-black/90 text-lg font-normal font-['PingFang_SC'] leading-[10.18px] "  style="margin-top: -5px;">
               商家：{{ data?.vendorName }}
             </div>
-            <div
-              class="h-6 px-1.5 py-1 bg-[#f5f6fa] rounded justify-center items-center gap-2.5 inline-flex mt-[17px]"
-            >
-              <div class="text-[#8b8b8b] text-xs font-normal font-['PingFang_SC'] leading-none">
-                ID：{{ data?.id }}
-              </div>
-            </div>
+<!--            <div-->
+<!--              class="h-6 px-1.5 py-1 bg-[#f5f6fa] rounded justify-center items-center gap-2.5 inline-flex mt-[17px]"-->
+<!--            >-->
+<!--              <div class="text-[#8b8b8b] text-xs font-normal font-['PingFang_SC'] leading-none">-->
+<!--                {{ data?.id }}-->
+<!--              </div>-->
+<!--            </div>-->
           </div>
         </div>
         <div class="flex items-center mt-[20px]">

packages/merchant/src/pages/mine/merchant/merchant_settings.vue

@@ -37,14 +37,14 @@ onMounted(async () => {
           {{ data?.vendorName }}
         </div>
       </div>
-      <div class="flex justify-between items-center mb-[30px]">
-        <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-none">ID</div>
-        <div
-          class="text-right text-[#999999] text-sm font-normal font-['PingFang_SC'] leading-none"
-        >
-          {{ data?.id }}
-        </div>
-      </div>
+<!--      <div class="flex justify-between items-center mb-[30px]">-->
+<!--        <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-none">ID</div>-->
+<!--        <div-->
+<!--          class="text-right text-[#999999] text-sm font-normal font-['PingFang_SC'] leading-none"-->
+<!--        >-->
+<!--          {{ data?.id }}-->
+<!--        </div>-->
+<!--      </div>-->
       <div class="flex justify-between items-center mb-[30px]">
         <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-none">
           登录用户