修改提交 会弹窗

@@ -195,7 +195,7 @@ class BookingController extends AdminBaseController
         $where['yy.uid'] = array('gt',0);
         $where['yy.uid'] = array('gt',0);
         $list = DB::name('yuyue')
         $list = DB::name('yuyue')
             ->alias('yy')
             ->alias('yy')
-            ->join('qnb_user u','u.id=yy.teach_id')
+            ->join('qnb_user u','u.id=yy.teach_id','LEFT')
             ->field('yy.*,u.user_nickname')
             ->field('yy.*,u.user_nickname')
             ->where($where)
             ->where($where)
             ->order('id','desc')
             ->order('id','desc')

@@ -189,11 +189,12 @@ class CommentController extends UserBaseController
         $yuyue_data = Db::name('yuyue')
         $yuyue_data = Db::name('yuyue')
             ->alias('yy')
             ->alias('yy')
             ->join('qnb_user qu','qu.id = yy .uid')
             ->join('qnb_user qu','qu.id = yy .uid')
-            ->join('order o','o.uid=yy.uid')
-            ->join('goods g','g.id=o.gid')
+            ->join('order o','o.uid=yy.uid','LEFT')
+            ->join('goods g','g.id=o.gid','LEFT')
             ->field('yy.*,qu.user_nickname,qu.mobile,qu.headimgurl,g.name as gname')
             ->field('yy.*,qu.user_nickname,qu.mobile,qu.headimgurl,g.name as gname')
             ->where(['yy.id'=>$id])
             ->where(['yy.id'=>$id])
             ->find();
             ->find();
+       //dump($yuyue_data);
 
 
         $cdata = Db::name('commente1')
         $cdata = Db::name('commente1')
             ->alias('yy')
             ->alias('yy')

@@ -16,7 +16,7 @@
         <div class="orderList">
         <div class="orderList">
             <h1>
             <h1>
                 <b>{$yuyue.status|yuyue_status_name}</b>
                 <b>{$yuyue.status|yuyue_status_name}</b>
-                <i>{$yuyue.yuyue_day1}</i>
+             <!--   <i>{$yuyue.yuyue_day1}</i>-->
             </h1>
             </h1>
             <div class="yList_info">
             <div class="yList_info">
                 <img src="{$yuyue.headimgurl}" class="yu_user_head"/>
                 <img src="{$yuyue.headimgurl}" class="yu_user_head"/>
@@ -26,14 +26,13 @@
                 </div>
                 </div>
                 <div class="yu_date">
                 <div class="yu_date">
                     <b class="yu_week">{$yuyue.yuyue_week}</b>
                     <b class="yu_week">{$yuyue.yuyue_week}</b>
-                    <i class="yu_times">{$yuyue.yuyue_hour1}</i>
+                   <!-- <i class="yu_times">{$yuyue.yuyue_hour1}</i>-->
                 </div>
                 </div>
             </div>
             </div>
+            <a href="tel:{$yuyue.mobile}">
             <div class="order_details">
             <div class="order_details">
-                <a href="tel:/{$yuyue.mobile}">
                     <img src="/static/image/tell_stu.png">
                     <img src="/static/image/tell_stu.png">
-                </a>
-            </div>
+            </div>    </a>
         </div>
         </div>
     </div>
     </div>
     <div class="ping_show study_detail">
     <div class="ping_show study_detail">
@@ -41,8 +40,6 @@
             <img src="/static/image/ping_icon.png"/>
             <img src="/static/image/ping_icon.png"/>
             <b>学车情况</b>
             <b>学车情况</b>
         </div>
         </div>
-
-
         <empty name="cdata">
         <empty name="cdata">
             <div class="no_yuyue">
             <div class="no_yuyue">
                 暂无评价
                 暂无评价

@@ -62,23 +62,37 @@
                                 <i class="yu_times">{$vo.yuyue_begin}:00 - {$vo.yuyue_end}:00</i>
                                 <i class="yu_times">{$vo.yuyue_begin}:00 - {$vo.yuyue_end}:00</i>
                             </div>
                             </div>
                         </div>
                         </div>
+
+
                         <switch name="$vo.status">
                         <switch name="$vo.status">
+
                             <case value="0">
                             <case value="0">
                                 <div class="yuyue_btn">
                                 <div class="yuyue_btn">
                                     <b class="click_yuyue" data-id="{$vo.id}">取消预约</b>
                                     <b class="click_yuyue" data-id="{$vo.id}">取消预约</b>
                                 </div>
                                 </div>
                             </case>
                             </case>
+
+
                             <case value="1">
                             <case value="1">
+                                <php>
+                                    $yuyue=strtotime($vo['yuyue_day']);
+                                    $now=time();
+                                </php>
+                                <if condition="$now lt $yuyue">
                                     <div class="yuyue_btn">
                                     <div class="yuyue_btn">
                                         <b class="click_yuyue" data-id="{$vo.id}">取消预约</b>
                                         <b class="click_yuyue" data-id="{$vo.id}">取消预约</b>
                                     </div>
                                     </div>
+                                </if>
+
                             </case>
                             </case>
+
                             <case value="2">
                             <case value="2">
                                 <div class="yuyue_btn" onclick=location.href="{:url('user/comment/index',array('id'=>
                                 <div class="yuyue_btn" onclick=location.href="{:url('user/comment/index',array('id'=>
                                     $vo['teach_id'],'yuyue_id'=>$vo['id']))}">
                                     $vo['teach_id'],'yuyue_id'=>$vo['id']))}">
                                     <b class="click_yuyue">去评价</b>
                                     <b class="click_yuyue">去评价</b>
                                 </div>
                                 </div>
                             </case>
                             </case>
+
                             <case value="3">
                             <case value="3">
                                 <div class="yuyue_btn"
                                 <div class="yuyue_btn"
                                      onclick=location.href="{:url('user/comment/show_stu',array('yuyue_id'=>
                                      onclick=location.href="{:url('user/comment/show_stu',array('yuyue_id'=>

@@ -2087,6 +2087,7 @@ function birthday_old($id){
     return $now - $bir;
     return $now - $bir;
 }
 }
 function id_xueshi($id){
 function id_xueshi($id){
+
     $name = Db::name('yuyue')
     $name = Db::name('yuyue')
         ->where(['uid'=>$id,'status'=>'3'])
         ->where(['uid'=>$id,'status'=>'3'])
         ->field(' SUM(yuyue_end - yuyue_begin) as yyxs ')
         ->field(' SUM(yuyue_end - yuyue_begin) as yyxs ')