测试

addons/zh_jdgjb/inc/web/order.inc.php

@@ -47,6 +47,14 @@ if($operation=='delete'){
 		message('删除失败','','error');
 	}
 }
+if($operation=='cancelOverdue'){
+    $res=pdo_update('zh_jdgjb_order',array('is_out_time'=>0,'status'=>5),array('id'=>$_GPC['id']));
+    if($res){
+        message('入住成功',$this->createWebUrl('order',array()),'success');
+    }else{
+        message('入住失败','','error');
+    }
+}
 if($operation=='rz'){
 	$res=pdo_update('zh_jdgjb_order',array('status'=>5),array('id'=>$_GPC['id']));
 	if($res){

addons/zh_jdgjb/template/web/orderinfo.html

@@ -542,7 +542,9 @@
         <a  class="btn btn-success" style="vertical-align: baseline" href="{php echo $this->createWebUrl('order',array('order_id'=>$list['id'],'op'=>'complete'));}">确认订单完成</a>
     
         
-        {/if} 
+        {/if}
+        {else}
+        <a class="btn btn-info"  style="vertical-align: baseline" href="{php echo $this->createWebUrl('order',array('order_id'=>$list['id'],'op'=>'cancelOverdue'));}"> 撤销违约并入住</a>
         {/if}
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
         <a class="btn btn-warning return" style="vertical-align: baseline" href="{php echo $this->createWebUrl('order');}"> 返回列表</a> 

addons/zh_jdgjb/wxapp.php

@@ -890,8 +890,8 @@ public function doPageMyOrder(){
         $sql="select *  from " . tablename("zh_jdgjb_order") .$where." order by id desc ";
         $select_sql=$sql." LIMIT " .($pageindex - 1) * $pagesize.",".$pagesize;
         $list=pdo_fetchall($select_sql,$data);
-        foreach($list as $key=>$val){
-            $list[$key]['count']=pdo_fetchcolumn("SELECT count(*) FROM ".tablename('zh_jdgjb_order') .$where.' and id<='.$val['id'].' and user_id='.$val['user_id'] ,$data)?:0;
+        foreach($list as $key => $val){
+            $list[$key]['count'] = pdo_fetchcolumn("SELECT count(*) FROM ".tablename('zh_jdgjb_order') .$where.' and id<='.$val['id'].' and user_id='.$val['user_id'] ,$data)?:0;
             $conf = pdo_get('zh_jdgjb_seller',array('id'=>$val['seller_id']));
             $list[$key]['re_pay_money'] = $conf['re_pay_money'];
         }