添加就餐方式选择

src/components/upload/index.vue

@@ -155,7 +155,7 @@ export default defineComponent({
         const getAccept = computed(() => {
             switch (props.type) {
                 case 'image':
-                    return '.jpj,.png,.gif,.jpeg,.ico,.bmp'
+                    return '.jpg,.png,.gif,.jpeg,.ico,.bmp'
                 case 'video':
                     return '.wmv,.avi,.mov,.mp4,.flv,.rmvb'
                 default:

src/views/order/console.vue

@@ -42,8 +42,29 @@
                         show-word-limit
                         type="textarea"
                     />
-                    <el-divider />
-                    <div class="mb-4">
+                    <div class="flex justify-between items-center mt-2">
+                        <div
+                            class="flex-1 h-12 border rounded-md flex items-center justify-center cursor-pointer relative mr-2"
+                            :class="{'border-primary text-primary bg-[#EDEFFF]': params.diningMethods === 1}"
+                            @click="params.diningMethods = 1"
+                        >
+                            <span>店内就餐</span>
+                            <el-icon v-if="params.diningMethods === 1" class="absolute right-0 bottom-0 text-primary" style="font-size: 16px;">
+                                <Check />
+                            </el-icon>
+                        </div>
+                        <div
+                            class="flex-1 h-12 border rounded-md flex items-center justify-center cursor-pointer relative ml-2"
+                            :class="{'border-primary text-primary bg-[#EDEFFF]': params.diningMethods === 2}"
+                            @click="params.diningMethods = 2"
+                        >
+                            <span>打包外带</span>
+                            <el-icon v-if="params.diningMethods === 2" class="absolute right-0 bottom-0 text-primary" style="font-size: 16px;">
+                                <Check />
+                            </el-icon>
+                        </div>
+                    </div>
+                    <div class="mb-4" style="margin-top: 5px;">
                         <div class="flex items-center">
                             <el-input
                                 v-model="data.phone"
@@ -276,7 +297,8 @@ const params = reactive({
     number: '', //订单id
     userId: '', //用户id
     couponId: '', //优惠券id
-    couponAmount: '-'
+    couponAmount: '-',
+    diningMethods: 1, // 就餐方式：1店内就餐 2打包外带
 })
 const submit = () => {
     //出单

src/views/orders/list.vue

@@ -94,8 +94,8 @@
                 <el-table-column label="支付金额" min-width="160" prop="amount">
                     <template #default="{ row }">
                         <div>
-                            <div style="text-decoration: line-through;">订单金额:￥{{row.amount}}</div>
-                            <div style="color: #f01414;">实付金额:￥{{row.payAmount || row.amount}}</div>
+                            <div :style="row.status > 1 ? 'text-decoration: line-through;': ''" v-if="row.status > 0">订单金额:￥{{row.amount}}</div>
+                            <div style="color: #f01414;" v-if="row.status > 1">实付金额:￥{{row.payAmount || row.amount}}</div>
                             <div v-if="row.ticketNo" class="refund-info">
                                 <div style="font-size: 12px;">抵扣券券号:{{ row.ticketNo }}</div>
                                 <div style="font-size: 12px;">抵扣券金额:￥{{ row.ticketAmount }}</div>