套餐排序、订单增加显示预约失败状态

Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php

@@ -164,7 +164,7 @@ class ComboController extends Controller
     }
     $list=$list->where(['combos.status'=>1]);
     $count = $list->count();
-    $list = $list
+    $list = $list->orderBy('combos.order','asc')
       ->skip(($page - 1) * $pageSize) // 跳过前9999条记录
       ->take($pageSize)->get();
 
@@ -202,7 +202,8 @@ class ComboController extends Controller
       'cover' => $Info['cover'],
       'intro' => $Info['intro'],
       'sub_intro' => $Info['sub_intro'],
-      'desc' => $Info['desc']
+      'desc' => $Info['desc'],
+      'order' => $Info['order'],
     ]);
     if ($u) {
       return \Yz::Return(true, "更新完成", []);

Laravel/app/Http/Controllers/API/H5/ComboController.php

@@ -140,7 +140,7 @@ class ComboController extends Controller
 
     $combos = DB::select("select * from combos as a LEFT JOIN (
 select combo_id as c_id,count(*) as count from orders where status in(2,4) group by combo_id
-) as b on a.combo_id=b.c_id  where a.status=1 and a.sex in(?,0)" . $sql, $canshu);
+) as b on a.combo_id=b.c_id  where a.status=1 and a.sex in(?,0) " . $sql ."  order by a.`order`  ", $canshu);
 
     foreach ($combos as $key => $combo) {
       $combo->count=$combo->count?$combo->count:0;

admin/src/views/ComboMngr/Combo.vue

@@ -22,6 +22,7 @@
 						<el-tag v-if="scope.row.sex==2" class="ml-2" type="success">女</el-tag>
 					</template>
 				</el-table-column>
+				<el-table-column prop="order" label="排序" />
 				<el-table-column prop="updated_at" label="更新时间" />
 				<el-table-column label="操作" width="100">
 					<template #default="scope">
@@ -75,6 +76,9 @@
 					<el-form-item label="标签2">
 						<el-input v-model="Info.tags2" type="textarea" />
 					</el-form-item>
+					<el-form-item label="排序">
+						<el-input v-model="Info.order" type="number"  />
+					</el-form-item>
 					<el-form-item label="简介">
 						<el-input v-model="Info.intro" type="textarea" />
 					</el-form-item>

h5/pages/main/order/src/order.vue

@@ -145,7 +145,8 @@
 		<view v-if="!!order_info" class="order_wrapper">
 			<view class="order_status_wrapper" :class="[`status${order_info.status}`]">
 				<view v-if="[1].includes(order_info.status)"> 待支付 </view>
-				<view v-if="[2].includes(order_info.status)"> 已预约 </view>
+				<view v-if="[2].includes(order_info.status) && order_info.appointment_number.length>0"> 已预约 </view>
+				<view v-if="[2].includes(order_info.status) && order_info.appointment_number.length==0"> 预约失败 </view>
 				<view v-if="[3, 5].includes(order_info.status)"> 交易关闭 </view>
 				<view v-if="[4].includes(order_info.status)"> 已完成 </view>
 			</view>
@@ -214,7 +215,7 @@
 					<view class="order_pay_button_wrapper">
 						<view v-if="[1].includes(order_info.status)" @click="StartPay(order_info.id)"
 							class="button_item_wrapper pay_button_wrapper">继续付款</view>
-						<view v-if="[2].includes(order_info.status)" @click="GaiYueClick(order_info.id)"
+						<view v-if="[2].includes(order_info.status) && order_info.appointment_number.length>0" @click="GaiYueClick(order_info.id)"
 							class="button_item_wrapper change_button_wrapper">
 							改约</view>
 						<view v-if="[2].includes(order_info.status)" @click="Refound(order_info.id)"