diff --git a/Laravel/app/Http/Controllers/API/ApiMapController.php b/Laravel/app/Http/Controllers/API/ApiMapController.php
index c764121..b7a90c8 100644
--- a/Laravel/app/Http/Controllers/API/ApiMapController.php
+++ b/Laravel/app/Http/Controllers/API/ApiMapController.php
@@ -103,6 +103,7 @@ class ApiMapController extends Controller
'ZhongKangGetHexiaoCode' => $base_url . '/api/H5/ZhongKangGetHexiaoCode', // 中康查询核销码
'GetPendingOrders' => $base_url . '/api/H5/GetPendingOrders', // 获取用户待预约订单
'LockPlan' => $base_url . '/api/H5/LockPlan', // 锁定号源
+ 'ChangeOrderButtonStatus' => $base_url . '/api/H5/ChangeOrderButtonStatus', // 锁定号源
];
}
diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php
index 4679d44..038417d 100644
--- a/Laravel/app/Http/Controllers/API/H5/OrderController.php
+++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php
@@ -40,7 +40,7 @@ class OrderController extends Controller
}
$OrderList = DB::table('orders');
$OrderList=$OrderList
- ->select('id', 'source','title','person_id','buy_info','plan_id', 'checkup_type_id','hunjian_status','status', 'name','appointment_date as date', 'appointment_time as time', 'order_number as order','appointment_number','transfer_type',
+ ->select('id', 'source','title','person_id','buy_info','plan_id', 'checkup_type_id','hunjian_status','status', 'name','appointment_date as date', 'appointment_time as time', 'order_number as order','appointment_number','transfer_type','button_status',
DB::raw("CASE WHEN type = 1 THEN '个检' WHEN type = 2 THEN '团检' ELSE 'unknown' END as type"),
'price', 'true_price', 'pay_time', 'refund_time', 'created_at');
if(isset($searchInfo['dateRange'])){
diff --git a/Laravel/app/Http/Controllers/API/H5/OrderNewController.php b/Laravel/app/Http/Controllers/API/H5/OrderNewController.php
index a40e2bb..12555fb 100644
--- a/Laravel/app/Http/Controllers/API/H5/OrderNewController.php
+++ b/Laravel/app/Http/Controllers/API/H5/OrderNewController.php
@@ -831,6 +831,19 @@ class OrderNewController extends Controller
return \Yz::Return(true,"线下订单自动取消完成",['find_orderids'=>$orderids]);
}
}
+ //奇葩需求,要求线下推送零元订单先显示“支付”,点击后调用此接口记录点击过,下次再看到这个订单按钮就显示“购买套餐”
+ public function ChangeOrderButtonStatus()
+ {
+ $orderid = request('orderid');
+ $order = DB::table('orders')->where(['id'=>$orderid])->first();
+ if(!!$order and $order->source=='线下体检预约-空号源' and $order->button_status==0){
+ $u=DB::table('orders')->where(['id'=>$order->id])->update(['button_status'=>1]);
+ if($u){
+ return \Yz::Return(true,"更新完成",['orderid'=>$orderid]);
+ }
+ }
+ return \Yz::echoError1('更新按钮状态失败');
+ }
private function sendWXNotice($aspZhuan, $order)
{
$person = DB::table('web_user_person')
diff --git a/Laravel/routes/web.php b/Laravel/routes/web.php
index 2ce702a..40dfbfa 100644
--- a/Laravel/routes/web.php
+++ b/Laravel/routes/web.php
@@ -95,6 +95,7 @@ Route::group(['middleware' => ['log'],'prefix' => 'api/H5'], function () {
Route::post('/ZhongKangGetHexiaoCode', 'App\Http\Controllers\API\H5\ZhongKangController@GetHexiaoCode');//中康查询核销码
Route::post('/GetPendingOrders', 'App\Http\Controllers\API\H5\OrderNewController@GetPendingOrders');//获取用户待预约订单
Route::post('/LockPlan', 'App\Http\Controllers\API\H5\PlanController@LockPlan');//锁定号源
+ Route::post('/ChangeOrderButtonStatus', 'App\Http\Controllers\API\H5\OrderNewController@ChangeOrderButtonStatus');//改变按钮状态
diff --git a/h5/pages/main/order/src/order.vue b/h5/pages/main/order/src/order.vue
index baebee8..f774488 100644
--- a/h5/pages/main/order/src/order.vue
+++ b/h5/pages/main/order/src/order.vue
@@ -34,11 +34,15 @@
},
});
let TransferPopupRef=ref(null)
+ let button_0_label=ref('支付');
const order_info = ref(false);
const deepInfo = () => {
order_info.value = JSON.parse(JSON.stringify($props.info));
+ if(order_info.value.button_status==1){
+ button_0_label.value='选择套餐'
+ }
checkStatus();
};
@@ -385,6 +389,18 @@
}
}
+ const updateButtonStatus=async(orderInfo)=>{
+ uni.showLoading();
+ const response = await $api("ChangeOrderButtonStatus", {
+ orderid: orderInfo.id
+ });
+ uni.hideLoading();
+ $response(response, () => {
+ if (response.status) {
+ button_0_label.value='选择套餐'
+ }
+ })
+ }
onMounted(() => {
@@ -671,8 +687,11 @@
-->
退款取消
- 购买套餐
+
+ {{button_0_label}}
+ {{button_0_label}}
+
+
取消