托管成功短信提示

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

@@ -147,13 +147,13 @@
                         }else if(status == 3){
                             type = "未托管";
                         }else if(status == 0){
-                            if(n.status == 1){
+                            if(n.status == 1 && n.order_about_time > {:time()}){
                                 type = "托管中";
-                            }else if(n.status == 3 && n.order_about_time-30*24*60*60 < {:time()} && n.order_about_time > {:time()}){
+                            }else if(n.status == 3 && n.order_about_time < {:time()} && (n.order_about_time+30*24*60*60) > {:time()} || n.status == 1 && n.order_about_time < {:time()} && (n.order_about_time+30*24*60*60) > {:time()}){
                                 type = "即将到期";
                             }else if(n.status == 3 && n.order_expire_time > {:time()} && n.order_about_time > {:time()}){
                                 type = "托管中";
-                            }else if(n.status == 2 || (n.status == 3 && n.order_expire_time < time()) || n.status == 3 && n.order_about_time < {:time()}){
+                            }else if(n.status == 2 || n.order_expire_time < {:time()} || (n.order_about_time+30*24*60*60) < {:time()}){
                                 type = "未托管";
                             }else{
                                 type = "未托管";