外包项目 / signUpForCar · 提交

转到一个项目

作者 lianghiu
提交 efd54abdafb83e93cde96a148a0a6f4340a681ee 2 个父辈 65f205b0 4bce41ae

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

内嵌 并排对比
正在显示 3 个修改的文件 包含 7 行增加 和 6 行删除
@@ -25,8 +25,8 @@ try { @@ -25,8 +25,8 @@ try {
25 $deta = $_REQUEST; 25 $deta = $_REQUEST;
26 26
27 //测试专用 0.01 27 //测试专用 0.01
28 - //$fee = $deta['fe'] ? $deta['fe'] * 100 : 100;  
29 - $fee = 1; 28 + $fee = $deta['fe'] ? $deta['fe'] * 100 : 100;
  29 + //$fee = 1;
30 $out_trade_no = $deta['ot'] ? $deta['ot'] : date('YmdHis') . uniqid(); 30 $out_trade_no = $deta['ot'] ? $deta['ot'] : date('YmdHis') . uniqid();
31 $body = $deta['sn'] ? $deta['sn'] : 'ceshi'; 31 $body = $deta['sn'] ? $deta['sn'] : 'ceshi';
32 $attach = $deta['at'] ? $deta['at'] : 'ceshi'; 32 $attach = $deta['at'] ? $deta['at'] : 'ceshi';
@@ -109,7 +109,7 @@ @@ -109,7 +109,7 @@
109 <div class="yuyueList"> 109 <div class="yuyueList">
110 <div class="yList_top"> 110 <div class="yList_top">
111 <b>{$vo.status|yuyue_status_name}</b> 111 <b>{$vo.status|yuyue_status_name}</b>
112 - <i>{$vo.create_time|date="Y-m-d",###}</i> 112 + <i>{$vo.yuyue_day|date_to_date}</i>
113 </div> 113 </div>
114 <div class="yList_info"> 114 <div class="yList_info">
115 <img src="{$vo.headimgurl}" class="yu_user_head"/> 115 <img src="{$vo.headimgurl}" class="yu_user_head"/>
@@ -144,7 +144,7 @@ @@ -144,7 +144,7 @@
144 <div class="yuyueList"> 144 <div class="yuyueList">
145 <div class="yList_top"> 145 <div class="yList_top">
146 <b>{$vo.status|yuyue_status_name}</b> 146 <b>{$vo.status|yuyue_status_name}</b>
147 - <i>{$vo.create_time|date="Y-m-d",###}</i> 147 + <i>{$vo.yuyue_day|date_to_date}</i>
148 </div> 148 </div>
149 <div class="yList_info"> 149 <div class="yList_info">
150 <img src="{$vo.headimgurl}" class="yu_user_head"/> 150 <img src="{$vo.headimgurl}" class="yu_user_head"/>
@@ -180,7 +180,7 @@ @@ -180,7 +180,7 @@
180 <div class="yuyueList"> 180 <div class="yuyueList">
181 <div class="yList_top"> 181 <div class="yList_top">
182 <b>{$vo.status|yuyue_status_name}</b> 182 <b>{$vo.status|yuyue_status_name}</b>
183 - <i>{$vo.create_time|date="Y-m-d",###}</i> 183 + <i>{$vo.yuyue_day|date_to_date}</i>
184 </div> 184 </div>
185 <div class="yList_info"> 185 <div class="yList_info">
186 <img src="{$vo.headimgurl}" class="yu_user_head"/> 186 <img src="{$vo.headimgurl}" class="yu_user_head"/>
@@ -219,6 +219,7 @@ @@ -219,6 +219,7 @@
219 <script type="text/javascript" src="/static/js/jquery-1.11.0.min.js"></script> 219 <script type="text/javascript" src="/static/js/jquery-1.11.0.min.js"></script>
220 <script type="text/javascript" src="/static/js/common.js"></script> 220 <script type="text/javascript" src="/static/js/common.js"></script>
221 <script type="text/javascript" src="/static/js/study_car.js"></script> 221 <script type="text/javascript" src="/static/js/study_car.js"></script>
  222 +<script type="text/javascript" src="/static/js/layer/layer.js"></script>
222 <script> 223 <script>
223 $(function () { 224 $(function () {
224 $('.yList_top').each(function () { 225 $('.yList_top').each(function () {
@@ -179,7 +179,7 @@ @@ -179,7 +179,7 @@
179 <div class="yu_tan" data-qr="1"> 179 <div class="yu_tan" data-qr="1">
180 <div class="yu_tan_box"> 180 <div class="yu_tan_box">
181 <img src="/static/image/tan_car1.png" class="tan_car"/> 181 <img src="/static/image/tan_car1.png" class="tan_car"/>
182 - <h1 class="tan_text">您确定要预约<span id="time_duan"></span>{$data.user_nickname}的课程吗</h1> 182 + <h1 class="tan_text">您确定要预约{$data.user_nickname}的课程吗</h1>
183 <h2 class="btn_qr">确认</h2> 183 <h2 class="btn_qr">确认</h2>
184 </div> 184 </div>
185 <div class="syudy_cancel"></div> 185 <div class="syudy_cancel"></div>