更新

admin/src/views/consumer/prescription/order_list.vue

@@ -8,7 +8,6 @@
             </div>
         </header>
 
-<<<<<<< HEAD
         <el-card class="!border-none shadow-sm mb-4" shadow="never">
             <div class="flex flex-col gap-3">
                 <div class="flex items-center gap-2 flex-wrap">
@@ -41,32 +40,6 @@
                         @click="handlePayAuditTabClick(tab.value)"
                     >
                         <span class="font-medium">{{ tab.label }}</span>
-=======
-        <!-- 状态标签页 -->
-        <el-card class="!border-none shadow-sm mb-4" shadow="never">
-            <div class="flex items-center gap-2 flex-wrap">
-                <div
-                    v-for="tab in statusTabs"
-                    :key="tab.value"
-                    :class="[
-                        'px-4 py-2 rounded-lg cursor-pointer transition-all duration-200 select-none',
-                        queryParams.fulfillment_status === tab.value
-                            ? 'bg-primary text-white shadow-md'
-                            : 'bg-gray-50 text-gray-600 hover:bg-gray-100'
-                    ]"
-                    @click="handleStatusTabClick(tab.value)"
-                >
-                    <div class="flex items-center gap-2">
-                        <span class="font-medium">{{ tab.label }}</span>
-                        <span v-if="tab.count !== undefined" :class="[
-                            'text-xs px-1.5 py-0.5 rounded',
-                            queryParams.fulfillment_status === tab.value
-                                ? 'bg-white/20'
-                                : 'bg-gray-200'
-                        ]">
-                            {{ tab.count }}
-                        </span>
->>>>>>> master
                     </div>
                 </div>
             </div>