Merge branch 'master' of http://114.215.101.231:8099/outsource/signUpForCar

# Conflicts:
#	public/themes/simpleboot3/user/yuyue/my_yuyue.html

@@ -109,7 +109,7 @@
                     <div class="yuyueList">
                     <div class="yuyueList">
                         <div class="yList_top">
                         <div class="yList_top">
                             <b>{$vo.status|yuyue_status_name}</b>
                             <b>{$vo.status|yuyue_status_name}</b>
-                            <i>{$vo.create_time|date="Y-m-d",###}</i>
+                            <i>{$vo.yuyue_day|date_to_date}</i>
                         </div>
                         </div>
                         <div class="yList_info">
                         <div class="yList_info">
                             <img src="{$vo.headimgurl}" class="yu_user_head"/>
                             <img src="{$vo.headimgurl}" class="yu_user_head"/>
@@ -144,7 +144,7 @@
                     <div class="yuyueList">
                     <div class="yuyueList">
                         <div class="yList_top">
                         <div class="yList_top">
                             <b>{$vo.status|yuyue_status_name}</b>
                             <b>{$vo.status|yuyue_status_name}</b>
-                            <i>{$vo.create_time|date="Y-m-d",###}</i>
+                            <i>{$vo.yuyue_day|date_to_date}</i>
                         </div>
                         </div>
                         <div class="yList_info">
                         <div class="yList_info">
                             <img src="{$vo.headimgurl}" class="yu_user_head"/>
                             <img src="{$vo.headimgurl}" class="yu_user_head"/>
@@ -180,7 +180,7 @@
                     <div class="yuyueList">
                     <div class="yuyueList">
                         <div class="yList_top">
                         <div class="yList_top">
                             <b>{$vo.status|yuyue_status_name}</b>
                             <b>{$vo.status|yuyue_status_name}</b>
-                            <i>{$vo.create_time|date="Y-m-d",###}</i>
+                            <i>{$vo.yuyue_day|date_to_date}</i>
                         </div>
                         </div>
                         <div class="yList_info">
                         <div class="yList_info">
                             <img src="{$vo.headimgurl}" class="yu_user_head"/>
                             <img src="{$vo.headimgurl}" class="yu_user_head"/>

@@ -398,12 +398,13 @@
             }
             }
             if (data_qr == 1) {
             if (data_qr == 1) {
                 var data_days = $(".day_bg i").attr("data-day").replace(/(\d{4})(\d{2})(\d{2})/, "$1-$2-$3");
                 var data_days = $(".day_bg i").attr("data-day").replace(/(\d{4})(\d{2})(\d{2})/, "$1-$2-$3");
+                var weeks = $(".day_bg b").html();
                 $.ajax({
                 $.ajax({
                     url: "{:url('yuyue_coach_do')}",
                     url: "{:url('yuyue_coach_do')}",
                     type: "post",
                     type: "post",
                     data: {
                     data: {
                         day: data_days,
                         day: data_days,
-                        week: week,
+                        week: weeks,
                         begin: parseInt(list[0].getElementsByTagName('b')[0].innerHTML.split("-")[0]),
                         begin: parseInt(list[0].getElementsByTagName('b')[0].innerHTML.split("-")[0]),
                         end: parseInt(list[list.length - 1].getElementsByTagName('b')[0].innerHTML.split('-')[1]),
                         end: parseInt(list[list.length - 1].getElementsByTagName('b')[0].innerHTML.split('-')[1]),
                         id: {$id}
                         id: {$id}