Bläddra i källkod

fix: card de propostas de prestadores

Gustavo Zanatta 2 veckor sedan
förälder
incheckning
fc9c622fbf

+ 2 - 2
src/pages/dashboard/DashboardPage.vue

@@ -14,6 +14,8 @@
         <DashboardRegistrationIncomplete v-if="!registrationComplete" />
         <DashboardSummaryInfos v-else :data="summaryInfos" />
         <DashboardPaymentIncomplete v-if="showPaymentBanner" />
+        <DashboardPendingCustomSchedules v-if="customSchedulesNoProposals.length > 0" />
+        <DashboardClientProposals v-if="clientProposals.length > 0" :data="clientProposals" @refresh-data="reloadDashboard" />
         <DashboardPendingSchedules
           v-if="pendingServicePackages.length > 0"
           :data="pendingServicePackages"
@@ -29,8 +31,6 @@
         />
         <DashboardTodaySchedules v-if="todaySchedules.length > 0" :data="todaySchedules" @rate="openRatingDialog" />
         <DashboardScrollAreaSchedules />
-        <DashboardClientProposals v-if="clientProposals.length > 0" :data="clientProposals" @refresh-data="reloadDashboard" />
-        <DashboardPendingCustomSchedules v-if="customSchedulesNoProposals.length > 0" />
         <DashboardNextSchedules v-if="nextSchedules.length > 0" :data="nextSchedules" @view-details="openNextScheduleDialog" />
         <DashboardLastDoneSchedules v-if="lastDoneSchedules.length > 0" :data="lastDoneSchedules" />
         <DashboardFavoriteProviders v-if="favoriteProviders.length > 0" :data="favoriteProviders" />

+ 20 - 20
src/pages/dashboard/components/DashboardClientProposals.vue

@@ -47,7 +47,7 @@
             <div class="row justify-between items-center text-text">
               <div>
                 <div class="font12 fontmedium">
-                  {{ item.provider_name }}
+                  {{ getFirstName(item.provider_name) }}
 
                   <span class="font9 fontregular">
                     {{
@@ -56,27 +56,27 @@
                       })
                     }}
                   </span>
+                  <span class="font10 fontmedium">
+                    <q-icon
+                      class="font9 fontregular"
+                      color="warning"
+                      name="star"
+                      size="12px"
+                    />
+
+                    <span>
+                      {{ item.average_rating }}
+                    </span>
+                  </span>
                 </div>
 
-                <span
+                <!-- <span
                   v-if="getProviderGenderLabel(item, t)"
                   class="font9 fontregular text-grey-7"
                 >
                   {{ getProviderGenderLabel(item, t) }}
-                </span>
-
-                <span class="font10 fontmedium">
-                  <q-icon
-                    class="font9 fontregular"
-                    color="warning"
-                    name="star"
-                    size="12px"
-                  />
+                </span> -->
 
-                  <span>
-                    {{ item.average_rating }}
-                  </span>
-                </span>
               </div>
             </div>
 
@@ -129,7 +129,7 @@
               </span>
             </div>
 
-            <div class="actions">
+            <div class="actions q-pt-sm">
               <q-btn
                 class="btn-reject"
                 flat
@@ -164,10 +164,11 @@ import {
   chooseprice,
   filterCurrency,
   formatLabelByPeriodType,
+  getFirstName,
 } from "src/helpers/utils";
 
-import { getProviderGenderLabel } from "src/helpers/provider";
-import { useI18n } from "vue-i18n";
+// import { getProviderGenderLabel } from "src/helpers/provider";
+// import { useI18n } from "vue-i18n";
 
 const emit = defineEmits(["refreshData"]);
 
@@ -178,7 +179,7 @@ defineProps({
   },
 });
 
-const { t } = useI18n();
+// const { t } = useI18n();
 const $q = useQuasar();
 
 // const formatTime = (time) => {
@@ -336,7 +337,6 @@ const handleRefuseProposal = async (proposalId) => {
   display: flex;
   justify-content: flex-end;
   gap: 8px;
-  margin-top: auto;
 }
 
 .btn-reject {