Browse Source

bug修改

15591641157 3 months ago
parent
commit
dc755ddb5f

+ 2 - 2
packages/app/src/pages/home/mall/detail/index.vue

@@ -79,7 +79,7 @@ const handleClick = (product) => {
     return null
   }
   let levelIds = product.memberLevelIds.split(",");
-  if (!levelIds.includes(userInfo.value.level.level)) {
+  if (!levelIds.includes(String(userInfo.value.level.level))) {
     toast.show("您当前会员等级不符合兑换条件")
     return null
   }
@@ -187,7 +187,7 @@ onShareTimeline(() => ({
             <ButtonEvo
               block
               size="lg"
-              :disabled="(data?.isRestrict === 1 && data?.productRepertory == 0) || (!data?.memberLevelIds.split(',').includes(userInfo.level.level)) ? 'isDisabled': null"
+              :disabled="(data?.isRestrict === 1 && data?.productRepertory == 0) || (!data?.memberLevelIds.split(',').includes(String(userInfo.level.level))) ? 'isDisabled': null"
               @click="handleClick(data)"
             >
               立即兑换

+ 12 - 11
packages/app/src/pages/home/schedule/index.vue

@@ -42,7 +42,7 @@ 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?.backgroundUrl"></ImageEvo>
+      <ImageEvo :src="currentStudyTour?.bannerUrl"></ImageEvo>
       <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,10 +80,10 @@ onMounted(async () => {
           v-for="(item, itemIndex) in schedules?.[dayjs().format('YYYY-MM-DD')]"
           :key="itemIndex"
         >
-          <view class="grid grid-gap-2 mt-8">
-            <view class="col-start-1 row-start-1 flex items-center justify-center">
+          <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-[27px] h-[27px] bg-[#f6f6f6] rounded-full flex justify-center items-center"
+                class="w-[30px] h-[27px] bg-[#f6f6f6] rounded-full flex justify-center items-center"
               >
                 <wd-img width="16" height="16" :src="map"></wd-img>
               </view>
@@ -119,13 +119,14 @@ onMounted(async () => {
                     打卡示例
                   </div>
                 </view>
-                <div class="w-[285px]">
-                  <img
-                    v-if="item.clockExplainUrl"
-                    class="w-[285px] h-[157px] rounded-lg"
-                    :src="item.clockExplainUrl"
-                  />
-                </div>
+                <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"
                 >