1
0

2 Incheckningar f4463aff5f ... e5b4866c15

Upphovsman SHA1 Meddelande Datum
  shmily1213 e5b4866c15 同步基础分支的修改 1 vecka sedan
  shmily1213 eb90250423 调整picker字体大小 1 vecka sedan

+ 2 - 2
src/components/ie-picker/ie-picker.vue

@@ -1,13 +1,13 @@
 <template>
   <view class="w-full" @click="handleClick">
     <view class="flex items-center gap-x-6 justify-start" :style="customStyle">
-      <view v-if="matchValue || customLabel" class="text-[15px] h-[24px] leading-[26px] text-fore-title flex-1 min-w-1 ellipsis-1" :style="getValueStyle"
+      <view v-if="matchValue || customLabel" class="text-[15px] h-[24px] leading-[24px] text-fore-title flex-1 min-w-1 ellipsis-1" :style="getValueStyle"
         :class="{ 'text-[#dce4f6]': disabled || readonly }">
         <slot :label="label">
           {{ label }}
         </slot>
       </view>
-      <view v-else class="text-[15px] h-[24px] leading-[26px] text-[#c0c4cc] flex-1 min-w-1 ellipsis-1" :style="getPlaceholderStyle">{{ placeholder }}</view>
+      <view v-else class="text-[15px] h-[24px] leading-[24px] text-[#c0c4cc] flex-1 min-w-1 ellipsis-1" :style="getPlaceholderStyle">{{ placeholder }}</view>
       <slot name="right">
         <view v-if="!readonly && showArrow" class="transition-all duration-300">
           <uv-icon :name="icon" size="15" color="#B3B3B3" />

+ 3 - 3
src/pagesStudy/components/practice-table.vue

@@ -3,7 +3,7 @@
     <view class="flex gap-x-20">
       <view class="flex items-center gap-x-20 flex-wrap">
         <view class="picker-wrap">
-          <ie-picker ref="pickerRef" v-model="form.year" :list="yearList" placeholder="请选择" title="选择年份" :fontSize="26"
+          <ie-picker ref="pickerRef" v-model="form.year" :list="yearList" placeholder="请选择" title="选择年份" :fontSize="14"
             icon="arrow-down" key-label="label" key-value="value" @change="handleYearChange">
             <template #default="{ label }">
               <text>{{ label }}年</text>
@@ -12,7 +12,7 @@
         </view>
         <view class="picker-wrap">
           <ie-picker ref="pickerRef" :disabled="!form.year" v-model="form.month" :list="monthList" placeholder="请选择"
-            title="选择月份" :fontSize="26" icon="arrow-down" key-label="label" key-value="value"
+            title="选择月份" :fontSize="14" icon="arrow-down" key-label="label" key-value="value"
             @change="handleMonthChange">
             <template #default="{ label }">
               <text>{{ label }}</text>
@@ -20,7 +20,7 @@
           </ie-picker>
         </view>
         <view :class="calendarButtonClass" @click="canOpenCalendar ? handleOpenCalendar() : null">
-          <text>刷题日历</text>
+          <text class="text-[14px]">刷题日历</text>
           <uv-icon name="search" size="16" :color="canOpenCalendar ? 'white' : '#CCCCCC'" />
         </view>
       </view>

+ 4 - 4
src/pagesStudy/pages/study-history/components/exam-history-paperwork.vue

@@ -3,22 +3,22 @@
     <view class="w-full flex mb-30 justify-between">
       <view class="max-w-180">
         <ie-picker ref="pickerRef" v-model="queryForm.buildType" :list="buildTypeList" placeholder="类型" title="类型"
-          icon="arrow-down" key-label="name" key-value="value" :fontSize="28"
+          icon="arrow-down" key-label="name" key-value="value" :fontSize="14"
           :placeholder-style="placeholderStyle"></ie-picker>
       </view>
       <view class="max-w-180">
         <ie-picker ref="pickerRef" v-model="queryForm.batchId" :list="batchList" placeholder="批次" title="批次"
-          icon="arrow-down" key-label="name" key-value="batchId" :fontSize="28"
+          icon="arrow-down" key-label="name" key-value="batchId" :fontSize="14"
           :placeholder-style="placeholderStyle"></ie-picker>
       </view>
       <view class="max-w-180">
         <ie-picker ref="pickerRef" v-model="queryForm.classId" :list="classList" placeholder="班级" title="班级"
-          icon="arrow-down" key-label="name" key-value="classId" :fontSize="28"
+          icon="arrow-down" key-label="name" key-value="classId" :fontSize="14"
           :placeholder-style="placeholderStyle"></ie-picker>
       </view>
       <view class="max-w-180">
         <ie-picker ref="pickerRef" v-model="queryForm.subjectId" :list="subjectList" placeholder="科目" title="科目"
-          icon="arrow-down" key-label="subjectName" key-value="subjectId" :fontSize="28"
+          icon="arrow-down" key-label="subjectName" key-value="subjectId" :fontSize="14"
           :placeholder-style="placeholderStyle"></ie-picker>
       </view>
     </view>

+ 1 - 1
src/uni_modules/uv-input/components/uv-input/uv-input.vue

@@ -320,7 +320,7 @@
 				margin: 0;
 				flex: 1;
 				&__field {
-					line-height: 26px;
+					line-height: 24px;
 					text-align: left;
 					color: $uv-main-color;
 					height: 24px;