diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php
index e39882a..9d28694 100644
--- a/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php
+++ b/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, "更新完成", []);
diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php
index b8cd2a3..efccb2d 100644
--- a/Laravel/app/Http/Controllers/API/H5/ComboController.php
+++ b/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;
diff --git a/admin/src/views/ComboMngr/Combo.vue b/admin/src/views/ComboMngr/Combo.vue
index 9df7fb6..8268c66 100644
--- a/admin/src/views/ComboMngr/Combo.vue
+++ b/admin/src/views/ComboMngr/Combo.vue
@@ -22,6 +22,7 @@
女
+
@@ -75,6 +76,9 @@
+
+
+
diff --git a/h5/pages/main/order/src/order.vue b/h5/pages/main/order/src/order.vue
index 8dbe701..a954b63 100644
--- a/h5/pages/main/order/src/order.vue
+++ b/h5/pages/main/order/src/order.vue
@@ -145,7 +145,8 @@
待支付
- 已预约
+ 已预约
+ 预约失败
交易关闭
已完成
@@ -214,7 +215,7 @@
继续付款
-
改约