代理人模块

@@ -27,13 +27,15 @@
             <img src="{:cmf_get_image_url($data.thumbnail)}" alt="">
             <img src="{:cmf_get_image_url($data.thumbnail)}" alt="">
         </div>
         </div>
         <div>
         <div>
-            <if condition="$data['status'] eq 1 && $data['order_about_time'] gt time()">
-                托管中
-                <elseif condition="$data['status'] eq 3 && $data['order_about_time'] lt time() && ($data['order_about_time']+30*24*60*60) gt time() || ($data['status'] eq 1 && $data['order_about_time'] lt time() && ($data['order_about_time']+30*24*60*60) gt time())"/>
+            <if condition="$data['status'] eq 3 && $data['order_about_time'] lt time() && ($data['order_about_time']+30*24*60*60) gt time() || ($data['status'] eq 1 && $data['order_about_time'] lt time() && ($data['order_about_time']+30*24*60*60) gt time())">
                 即将到期
                 即将到期
-                <elseif condition="$data['status'] eq 3 && $data['order_expire_time'] gt time() && $data['order_about_time'] gt time()"/>
+                <elseif condition="$data['status'] eq 1 && $data['order_expire_time2'] gt time()"/>
+                托管中
+                <elseif condition="$data['status'] eq 3 && $data['order_expire_time2'] gt time()"/>
                 托管中
                 托管中
-                <elseif condition="$data['status'] eq 2 || $data['order_expire_time'] lt time() || ($data['order_about_time']+24*30*60*60) lt time()"/>
+                <elseif condition="$data['status'] eq 2"/>
+                未托管
+                <else />
                 未托管
                 未托管
             </if>
             </if>
         </div>
         </div>