Merge branch 'develop' of ssh://8.134.10.79:222/Leadfyy.co/hainan into develop

app/Http/Controllers/Api/OrderController.php

@@ -77,7 +77,7 @@ class OrderController extends Controller
 			}
 
 			//未付款订单提示剩余付款时间
-			if ($v['status'] == Status::UNPAID) {
+			if ($v['timeout'] !== null && $v['status'] == Status::UNPAID) {
 				$second = strtotime($v['timeout']) - $time;
 
 				if ($second > 0) {
@@ -413,7 +413,7 @@ class OrderController extends Controller
 			];
 			$app = Factory::miniProgram($config);
 
-			$response = $app->app_code->getUnlimit($order->verify_code, ['path' => 'pages/verification/index']);
+			$response = $app->app_code->getUnlimit($order->verify_code, ['page' => 'pages/verification/index']);
 
 			if ($response instanceof \EasyWeChat\Kernel\Http\StreamResponse) {
 				$filename = $response->saveAs(storage_path('app/public/verify_code'), $order->verify_code);

ready.md

@@ -4,6 +4,7 @@
 3、首页轮播图；
 4、演示产品、公告、专题、产品分类；
 5、关于我们、注册协议、购买协议等信息；
+6、启动订单超时定时器；
 
 ```sql
 # 11:12 2021/8/26
@@ -77,4 +78,4 @@ INSERT INTO `channels` (`id`, `agent_id`, `pid`, `name`, `icon`, `sort`, `delete
 ALTER TABLE `products`
 	AUTO_INCREMENT=1000;
 
-```
+```