游学行程样式调整

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

@@ -42,7 +42,11 @@ onMounted(async () => {
   <view class="flex-grow flex flex-col">
     <NavbarEvo transparent dark></NavbarEvo>
     <view class="bg-black w-full aspect-[1.26/1]">
-      <ImageEvo :src="currentStudyTour?.bannerUrl"></ImageEvo>
+<!--      <ImageEvo :src="currentStudyTour?.bannerUrl"></ImageEvo>-->
+      <div
+        class="w-full h-full bg-[length:100%_auto]"
+        :style="{ backgroundImage: `url(${currentStudyTour?.bannerUrl})` }"
+      ></div>
       <div
         class="aspect-[4.17/1] bg-gradient-to-t from-black to-black/0 absolute left-0 bottom-0 w-full flex items-center"
       ></div>
@@ -80,62 +84,58 @@ onMounted(async () => {
           v-for="(item, itemIndex) in schedules?.[dayjs().format('YYYY-MM-DD')]"
           :key="itemIndex"
         >
-          <view class="grid grid-gap-2 mt-8" style="margin-left: -40px;">
-            <view class="col-start-1 row-start-1 flex items-center justify-center" style="margin-left: -40px;">
-              <view
-                class="w-[30px] h-[27px] bg-[#f6f6f6] rounded-full flex justify-center items-center"
-              >
+          <view class="flex flex-col mt-8">
+            <!-- 左侧图标 -->
+            <view class="flex items-center">
+              <view class="w-[30px] h-[30px] bg-[#f6f6f6] rounded-full flex justify-center items-center">
                 <wd-img width="16" height="16" :src="map"></wd-img>
               </view>
-            </view>
-            <view class="col-start-2 row-start-1 flex">
-              <div
-                class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-normal mr-5"
-              >
+              <div class="ml-3 text-black/90 text-base font-normal">
                 {{ dayjs(item?.travelTime).format('HH:mm') }}
               </div>
-              <div class="text-black/90 text-base font-normal font-['PingFang_SC'] leading-normal">
+              <div class="ml-10 mt-1 text-black/90 text-base font-normal">
                 {{ item.title }}
               </div>
             </view>
-            <view
-              class="col-start-2 row-start-2 border-b border-black/10 pb-5"
-              :class="`${itemIndex < (schedules?.[dayjs().format('YYYY-MM-DD')] || []).length - 1 ? 'border-b-solid' : ''}`"
-            >
-              <div class="">
-                <span class="text-black/60 text-sm font-normal font-['PingFang_SC'] leading-[23px]">
-                  行程介绍:
-                </span>
-                <span class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-[23px]">
-                  {{ item.travelDesc }}
-                </span>
-              </div>
-              <template v-if="item.clockExplainUrl">
-                <view class="flex items-center my-4">
-                  <wd-img width="16" height="16" :src="camera"></wd-img>
-                  <div
-                    class="ml-1 text-black/90 text-xs font-normal font-['PingFang_SC'] leading-normal"
-                  >
-                    打卡示例
-                  </div>
-                </view>
-                <wd-img
-                  v-if="(item.clockExplainUrl ?? '') !== ''"
-                  width="100%"
-                  custom-class="rounded-2xl overflow-hidden"
-                  :src="item.clockExplainUrl"
-                  mode="widthFix"
-                  enable-preview
-                ></wd-img>
-                <div
-                  class="mt-2.5 text-black/40 text-xs font-normal font-['PingFang_SC'] leading-normal"
-                >
-                  {{ item.clockExplainDesc }}
-                </div>
-              </template>
+
+            <!-- 标题 -->
+
+
+            <!-- 描述 -->
+            <view class="ml-10 mt-2 border-b border-black/10 pb-5">
+      <span class="text-black/60 text-sm font-normal">
+        行程介绍:
+      </span>
+              <span class="text-black/40 text-sm font-normal">
+        {{ item.travelDesc }}
+      </span>
             </view>
+
+            <!-- 打卡示例 -->
+            <template v-if="item.clockExplainUrl">
+              <view class="flex items-center mt-4 ml-10">
+                <wd-img width="16" height="16" :src="camera"></wd-img>
+                <div class="ml-1 text-black/90 text-xs font-normal">
+                  打卡示例
+                </div>
+              </view>
+              <wd-img
+                v-if="(item.clockExplainUrl ?? '') !== ''"
+                width="100%"
+                custom-class="rounded-2xl overflow-hidden mt-4"
+                :src="item.clockExplainUrl"
+                mode="widthFix"
+                enable-preview
+              ></wd-img>
+              <div
+                class="mt-2.5 ml-10 text-black/40 text-xs font-normal"
+              >
+                {{ item.clockExplainDesc }}
+              </div>
+            </template>
           </view>
         </template>
+
       </view>
     </div>
     <BottomAppBar fixed placeholder>
@@ -153,7 +153,7 @@ onMounted(async () => {
         </div> -->
         <view class="flex-1"></view>
         <view>
-          <ButtonEvo size="lg" @click="router.push('/pages/publish/moment/index')">
+          <ButtonEvo size="lg" @click="router.push('/pages/publish/moment/index?circleType=1')">
             发圈子
           </ButtonEvo>
         </view>

packages/app/src/pages/home/study-tour/list.vue

@@ -16,7 +16,7 @@ import PageHelper from '@/components/page-helper.vue'
 const designStudyAbroadYear = ref('')
 const title = ref('')
 const studyYear = ref('')
-const designDesc = ref()
+const designDesc = ref('')
 
 const { data: levels, run: setLevels } = useRequest(() => getAppMemberLevelConfigs(), {
   initialData: [],

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

@@ -154,8 +154,12 @@ onMounted(async () => {
                           {{
                             it.thisYearComplete && it.target
                               ? (
-                                  Number(Number(it.thisYearComplete) / Number(it.target)) * 100
-                                ).toFixed(0)
+                                Number(it.thisYearComplete) / Number(it.target) * 100
+                              ) % 1 === 0
+                                ? Number(Number(it.thisYearComplete) / Number(it.target) * 100)
+                                : (
+                                  Number(it.thisYearComplete) / Number(it.target) * 100
+                                ).toFixed(1)
                               : 0
                           }}%
                         </div>