From 59fb63e4f6e2452b563757b10b0898c1a5736694 Mon Sep 17 00:00:00 2001
From: 王晓刚 <wxg@bronet.cn>
Date: Mon, 11 Feb 2019 17:08:47 +0800
Subject: [PATCH] 代理人注册

---
 public/themes/admin_simpleboot3/admin/order/index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/themes/admin_simpleboot3/admin/order/index.html b/public/themes/admin_simpleboot3/admin/order/index.html
index 0bef46b..218f22e 100644
--- a/public/themes/admin_simpleboot3/admin/order/index.html
+++ b/public/themes/admin_simpleboot3/admin/order/index.html
@@ -79,11 +79,11 @@
 					<td>
 						<if condition="$vo['status'] eq 1">
 							<a data-toggle="tooltip" title="托管中"><i class="fa fa-check"></i></a>
-							<elseif condition="$vo['status'] eq 3 && $vo['order_about_time'] lt time() && $vo['order_expire_time'] gt time()"/>
+							<elseif condition="$vo['status'] eq 3 && ($vo['order_about_time']-30*24*60*60) lt time() && $vo['order_about_time'] gt time()"/>
 							<a data-toggle="tooltip" title="即将到期"><i class="fa fa-check text-warning"></i></a>
-							<elseif condition="$vo['status'] eq 3 && $vo['order_expire_time'] gt time()"/>
+							<elseif condition="$vo['status'] eq 3 && $vo['order_expire_time'] gt time() && $vo['order_about_time'] gt time()"/>
 							<a data-toggle="tooltip" title="托管中"><i class="fa fa-check"></i></a>
-							<elseif condition="$vo['status'] eq 2 || ($vo['status'] eq 3 && $vo['order_expire_time'] lt time())"/>
+							<elseif condition="$vo['status'] eq 2 || $vo['status'] eq 3 && $vo['order_expire_time'] lt time() || $vo['status'] eq 3 && $vo['order_about_time'] lt time()"/>
 							<a data-toggle="tooltip" title="未托管"><i class="fa fa-close text-danger"></i></a>
 						</if>
 					</td>
--
libgit2 0.24.0