From bc632bb91c94939ff3dd77fb284b628d9a783e74 Mon Sep 17 00:00:00 2001
From: 王晓刚 <wxg@bronet.cn>
Date: Thu, 7 Mar 2019 19:41:42 +0800
Subject: [PATCH] 代理人模块

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

diff --git a/public/themes/admin_simpleboot3/admin/order/index.html b/public/themes/admin_simpleboot3/admin/order/index.html
index c431425..1ed6bf7 100644
--- a/public/themes/admin_simpleboot3/admin/order/index.html
+++ b/public/themes/admin_simpleboot3/admin/order/index.html
@@ -77,14 +77,16 @@
 						</if>
 					</td>
 					<td>
-						<if condition="$vo['status'] eq 1 && $vo['order_about_time'] gt time()">
-							<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_about_time']+30*24*60*60) gt time() || ($vo['status'] eq 1 && $vo['order_about_time'] lt time() && ($vo['order_about_time']+30*24*60*60) 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() && $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['order_expire_time'] lt time() || ($vo['order_about_time']+24*30*60*60) lt time()"/>
-							<a data-toggle="tooltip" title="未托管"><i class="fa fa-close text-danger"></i></a>
+						<if condition="$vo['status'] eq 3 && $vo['order_about_time'] lt time() && ($vo['order_about_time']+30*24*60*60) gt time() || ($vo['status'] eq 1 && $vo['order_about_time'] lt time() && ($vo['order_about_time']+30*24*60*60) gt time())">
+							即将到期
+							<elseif condition="$vo['status'] eq 1 && $vo['order_expire_time2'] gt time()"/>
+							托管中
+							<elseif condition="$vo['status'] eq 3 && $vo['order_expire_time2'] gt time()"/>
+							托管中
+							<elseif condition="$vo['status'] eq 2"/>
+							未托管
+							<else />
+							未托管
 						</if>
 					</td>
 					<td>
--
libgit2 0.24.0