|
@@ -2,6 +2,7 @@
|
|
|
|
|
|
namespace app\index\controller;
|
|
|
|
|
|
+use app\common\enum\order\PayStatus;
|
|
|
use app\index\model\Goods;
|
|
|
use app\index\model\ShareKey;
|
|
|
use app\index\service\passport\MailCaptcha as MailCaptchaService;
|
|
@@ -92,7 +93,9 @@ class User extends Controller
|
|
|
$selfTrack[] = ['time' => date('Y-m-d H:i:s', $createTimeInt + 3653), 'text' => 'Orders taken', 'desc' => 'The merchant has received your order and is waiting to be shipped'];
|
|
|
}
|
|
|
|
|
|
- $selfTrack[] = ['time' => date('Y-m-d H:i:s', $createTimeInt + 5), 'text' => 'Order paid', 'desc' => 'Successful'];
|
|
|
+ if ($model['pay_status'] == PayStatus::SUCCESS){
|
|
|
+ $selfTrack[] = ['time' => date('Y-m-d H:i:s', $createTimeInt + 5), 'text' => 'Order paid', 'desc' => 'Successful'];
|
|
|
+ }
|
|
|
|
|
|
return view('orderDetails', ['order' => $model, 'orderAddress' => $orderAddress, 'selfTrack' => $selfTrack, 'f1Track' => $f1Track]);
|
|
|
}
|