Merge remote-tracking branch 'origin/main' into main

packages/app/src/pages/home/offline-activity/list/index.vue

@@ -29,13 +29,14 @@ onShareTimeline(() => ({
 </script>
 <template>
   <div class="flex-grow flex flex-col gap-6 mx-3.5">
-    <div class="mx--3.5">
+    <div class="mx--3.5 fixed left-4 w-full bg-white z-10">
       <wd-tabs v-model="tab" custom-class="" :slidable-num="4">
         <block v-for="(it, item) in tabs" :key="item">
           <wd-tab :title="it.label"></wd-tab>
         </block>
       </wd-tabs>
     </div>
+    <div class="mt-[50px]">
     <PageHelper
       v-if="tabs.length"
       :request="getActivities"
@@ -143,5 +144,6 @@ onShareTimeline(() => ({
         </div>
       </template>
     </PageHelper>
+    </div>
   </div>
 </template>

packages/merchant/src/pages/agent/designer/archives/index.vue

@@ -252,11 +252,13 @@ onShow(async () => {
 </script>
 <template>
   <div class="flex-grow flex flex-col">
-    <wd-tabs v-model="tab" :swipeable="true" :slidable-num="4">
-      <template v-for="(it, index) in tabs" :key="index">
-        <wd-tab :title="it.label" :name="it.value"></wd-tab>
-      </template>
-    </wd-tabs>
+    <div class="mx--3.5 fixed left-4 w-full bg-white z-10">
+      <wd-tabs v-model="tab" :swipeable="true" :slidable-num="4" >
+        <template v-for="(it, index) in tabs" :key="index">
+          <wd-tab :title="it.label" :name="it.value" ></wd-tab>
+        </template>
+      </wd-tabs>
+    </div>
     <div class="flex flex-col flex-grow gap-5">
       <template v-if="tab === 'basic'">
         <div class="bg-white mt-4 flex flex-col gap-5 p-4">
@@ -520,7 +522,7 @@ onShow(async () => {
         </div>
       </template>
       <template v-if="tab === 'activity'">
-        <div class="bg-white p-4 mt-4 flex-grow flex flex-col">
+        <div class="bg-white p-4 mt-4 flex-grow flex flex-col " >
           <SectionHeading title="游学/活动信息"></SectionHeading>
           <ListHelperEvo
             ref="activityListRef"

packages/merchant/src/pages/mine/components/agent-mine.vue

@@ -303,7 +303,7 @@ onMounted(async () => {
                     style="border-top-left-radius: 15px; border-bottom-left-radius: 5px"
                   >
                     <div class="flex items-center gap-1">
-                      <div class="w-1 h-1 bg-white rounded-full border"></div>
+                      <div  class="w-1 h-1 bg-white rounded-full border"></div>
                       <!-- 线下拜访 -->
                       {{ it.followTypeName }}
                     </div>
@@ -327,9 +327,10 @@ onMounted(async () => {
                     />
                   </template>
                 </div>
-                <div class="flex items-center justify-between mt-[19px]">
+                <div class="flex items-center justify-between mt-[19px] relative">
                   <div
                     class="h-[25px] px-1.5 bg-[#f4f4f4] rounded-md justify-center items-center gap-1 inline-flex"
+                    v-if="it?.followType == 1"
                   >
                     <wd-img width="15px" height="15px" :src="locationIcon"></wd-img>
 
@@ -341,7 +342,7 @@ onMounted(async () => {
                     </div>
                   </div>
                   <div
-                    class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-relaxed mr-[15px]"
+                    class="text-black/90 text-sm font-normal font-['PingFang_SC'] leading-relaxed mr-[15px] absolute right-0"
                     @click="confirmDelete(it.id)"
                   >
                     删除