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

@@ -25,8 +25,8 @@ try {
     $deta   = $_REQUEST;
 
     //测试专用 0.01
-    //$fee          = $deta['fe'] ? $deta['fe'] * 100 : 100;
-    $fee          = 1;
+    $fee          = $deta['fe'] ? $deta['fe'] * 100 : 100;
+    //$fee          = 1;
     $out_trade_no = $deta['ot'] ? $deta['ot'] : date('YmdHis') . uniqid();
     $body         = $deta['sn'] ? $deta['sn'] : 'ceshi';
     $attach       = $deta['at'] ? $deta['at'] : 'ceshi';

@@ -109,7 +109,7 @@
                     <div class="yuyueList">
                         <div class="yList_top">
                             <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 class="yList_info">
                             <img src="{$vo.headimgurl}" class="yu_user_head"/>
@@ -144,7 +144,7 @@
                     <div class="yuyueList">
                         <div class="yList_top">
                             <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 class="yList_info">
                             <img src="{$vo.headimgurl}" class="yu_user_head"/>
@@ -180,7 +180,7 @@
                     <div class="yuyueList">
                         <div class="yList_top">
                             <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 class="yList_info">
                             <img src="{$vo.headimgurl}" class="yu_user_head"/>
@@ -219,6 +219,7 @@
 <script type="text/javascript" src="/static/js/jquery-1.11.0.min.js"></script>
 <script type="text/javascript" src="/static/js/common.js"></script>
 <script type="text/javascript" src="/static/js/study_car.js"></script>
+<script type="text/javascript" src="/static/js/layer/layer.js"></script>
 <script>
     $(function () {
         $('.yList_top').each(function () {

@@ -179,7 +179,7 @@
 <div class="yu_tan" data-qr="1">
     <div class="yu_tan_box">
         <img src="/static/image/tan_car1.png" class="tan_car"/>
-        <h1 class="tan_text">您确定要预约<span id="time_duan"></span>{$data.user_nickname}的课程吗</h1>
+        <h1 class="tan_text">您确定要预约{$data.user_nickname}的课程吗</h1>
         <h2 class="btn_qr">确认</h2>
     </div>
     <div class="syudy_cancel"></div>