格式调整

@@ -1006,6 +1006,9 @@ class Seller extends Common
         $rs = Db::query("SELECT * FROM `xt-member-two-LINE`.xt_dc_dz_cancel where up_rid = ".$data['rid']." order by cdate desc");
         $rs = Db::query("SELECT * FROM `xt-member-two-LINE`.xt_dc_dz_cancel where up_rid = ".$data['rid']." order by cdate desc");
         if($rs){
         if($rs){
             foreach ($rs as $key => $value) {
             foreach ($rs as $key => $value) {
+                if($this->isjson_str($value['desc'])){
+                    $rs[$key]['desc']   = "diff";
+                }
                 switch ($value['action_type']) {
                 switch ($value['action_type']) {
                     case '1':
                     case '1':
                         $rs[$key]['action_type'] = '取消预定';
                         $rs[$key]['action_type'] = '取消预定';
@@ -1038,6 +1041,13 @@ class Seller extends Common
         return $this->fetch();
         return $this->fetch();
     }
     }
 
 
+    public function isjson_str($data='',$assoc = false){
+        $data = json_decode($data,$assoc);
+        if(($data&&is_object($data))||(is_array($data)&&!empty($data))){
+            return true;
+        }
+        return false;
+    }
     /**
     /**
      * 状态设置
      * 状态设置
      */
      */

@@ -19,7 +19,7 @@
         到店日期：
         到店日期：
         <div class="layui-input-inline" >
         <div class="layui-input-inline" >
             <input type="text" style = "width:300px"; class="layui-input" id="dtime" placeholder="无默认值">
             <input type="text" style = "width:300px"; class="layui-input" id="dtime" placeholder="无默认值">
-        </div>
+        </div><hr>
         订单状态：
         订单状态：
         <div class="layui-input-inline layui-form">
         <div class="layui-input-inline layui-form">
                 <div class="layui-input-8">
                 <div class="layui-input-8">
@@ -54,7 +54,6 @@
                     </select>
                     </select>
                 </div>
                 </div>
         </div>
         </div>
-
         <button class="layui-btn"  id="search" data-type="reload">查询统计</button>
         <button class="layui-btn"  id="search" data-type="reload">查询统计</button>
     </div>
     </div>
     <br>
     <br>

@@ -15,7 +15,13 @@
                                 (<b>{$vo.uid}</b>) 在  
                                 (<b>{$vo.uid}</b>) 在  
                                 <b>{$vo.cdate}</b> 对该订单 进行了 
                                 <b>{$vo.cdate}</b> 对该订单 进行了 
                                 <b>{$vo.action_type}</b> 
                                 <b>{$vo.action_type}</b> 
-                                操作 {if $vo.desc}<b>描述:{$vo.desc}</b>{/if}
+                                操作 {if $vo.desc eq 'diff'}
+                                            <b> </b>
+                                     {elseif $vo.desc && $vo.desc neq 'diff'}
+                                            <b> 描述:{$vo.desc}</b> 
+                                     {elsif $vo.desc eq ''}
+                                            <b>{$vo.desc}</b> 
+                                     {/if}
                             </td>
                             </td>
                         </tr>
                         </tr>
                     {/foreach}
                     {/foreach}