commit

src/main/resources/views/platform/activity/site/SiteReserve.html

@@ -333,9 +333,15 @@ layout("/layouts/platform.html"){
                 <el-select v-model="formData.time" style="width: 100%" filterable @change="timeChange"
                            placeholder="请选择预约时间">
                     <el-option v-for="item in allowTimeList"
-                               :label="item.hasCount >= item.allowCount ? item.start_time + ' - ' + item.end_time + '（已约满）' : item.start_time + ' - ' + item.end_time"
-                               :disabled="item.hasCount >= item.allowCount"
-                               :value="item.start_time + '-' + item.end_time"></el-option>
+                               :disabled="item.disabled === true"
+                               :value="item.start_time + '-' + item.end_time">
+                        <template #default>
+                            <span v-if="item.disabled === true">
+                                {{ item.start_time + ' - ' + item.end_time + '（' + item.tooltip + '）' }}
+                            </span>
+                            <span v-else>{{ item.start_time + ' - ' + item.end_time }}</span>
+                        </template>
+                    </el-option>
                 </el-select>
             </el-form-item>