Pārlūkot izejas kodu

🎨 按要求修改标题样式,点亮页地图,挖掘页细节

快乐的梦鱼 9 stundas atpakaļ
vecāks
revīzija
a8fbca4966

+ 1 - 0
src/common/components/CommonTopBanner.vue

@@ -16,6 +16,7 @@
           fontSize: '40rpx',
           fontFamily: 'SongtiSCBlack',
         }"
+        textColor="text.title"
         leftButton="back" 
         :leftButtonProps="{
           buttonStyle: {

+ 1 - 1
src/common/components/parts/IndexCommonImageItem.vue

@@ -20,7 +20,7 @@
           <Text :text="userName" :fontSize="24" color="gray" />
         </FlexRow>
         <FlexRow align="center" :gap="10">
-          <Icon icon="favorite" :color="isLike ? 'primary' : 'gray'" :size="30" />
+          <Icon icon="good" :color="isLike ? 'primary' : 'gray'" :size="30" />
           <Text :text="likes" :fontSize="30" :color="isLike ? 'primary' : 'gray'" />
         </FlexRow>
       </FlexRow>

+ 5 - 3
src/pages/dig/forms/common.vue

@@ -34,9 +34,10 @@
           <PrimaryButton 
             text="提交"
             width="560rpx"
+            :loading="loading"
             @click="debounceSubmit.executeWithDelay()"
           />
-          <Button v-if="querys.id > 0" type="text" textColor="danger" :loading="loading" @click="deleteInfo">删除</Button>
+          <Button v-if="querys.id > 0 && !loading" type="text" textColor="danger" :loading="deleteing" @click="deleteInfo">删除</Button>
         </FlexCol>
       </FlexCol>
       <XBarSpace />
@@ -69,6 +70,7 @@ import BackgroundBox from '@/components/display/block/BackgroundBox.vue';
 import PrimaryButton from '@/common/components/PrimaryButton.vue';
 
 const loading = ref(false);
+const deleteing = ref(false);
 const subTitle = ref('');
 
 const formRef = ref<IDynamicFormRef>();
@@ -237,7 +239,7 @@ async function deleteInfo() {
   });
   if (!res)
     return;
-  loading.value = true;
+  deleteing.value = true;
   try {
     await waitTimeOut(800);
     await VillageInfoApi.deleteInfo(querys.value.id);
@@ -246,7 +248,7 @@ async function deleteInfo() {
   } catch (e) {
     showError(e);
   } finally {
-    loading.value = false;
+    deleteing.value = false;
   }
 }
 const localSavedState = ref(false);

+ 0 - 1
src/pages/home/components/LightMap.vue

@@ -11,7 +11,6 @@
       id="prevMap"
       map-id="prevMap"
       class="light-map-map"
-      :enable-poi="false"
       :show-location="true"
       :scale="12"
       :longitude="lonlat?.longitude"

+ 1 - 0
src/pages/home/discover/details.vue

@@ -79,6 +79,7 @@
                     fontConfig="lightGoldTitle" 
                     fontSize="30" 
                   />
+                  <Text fontConfig="subText" fontSize="20">点此进入村(社区)主页了解更多</Text>
                 </FlexCol>
               </template>
             </ImageBlock3>

+ 2 - 2
src/pages/home/index.vue

@@ -180,8 +180,8 @@
             :desc="item.content ?? ''"
             :userName="item.villageVolunteerName ?? ''"
             :userAvatar="item.villageVolunteerAvatar"
-            :likes="0"
-            :isLike="false"
+            :likes="item.likeNum"
+            :isLike="item.likeType === 1"
             @click="handleGoRecommendDetails(item)"
           />
         </FlexRow>