Commit 5632c28244e616fbf0ac82c9d39b17a3946e4206

Authored by liuqimichale
1 parent f8ae5678

支付页面添加优惠券功能

.idea/vcs.xml 0 → 100644
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project version="4">
  3 + <component name="VcsDirectoryMappings">
  4 + <mapping directory="$PROJECT_DIR$" vcs="Git" />
  5 + </component>
  6 +</project>
0 7 \ No newline at end of file
... ...
js/url.js
... ... @@ -86,7 +86,7 @@ mUrl.getJx = function(){
86 86 }
87 87  
88 88 /*end*/
89   -
  89 +// var cepath = 'http://39.98.54.240:8090'
90 90 var cepath = 'http://pay.service.renniting.cn/v1';//http://pay.service.renniting.cn/v1//http://pay.service.renniting.cn//http://39.98.54.240:8090//http://app.api.dyszt.com:8090//var cepath = 'http://app.api.dyszt.com:8090';//https://pay.service.rnting.com//'http://47.96.41.38:8090';
91 91 /*----------------------------------------------登录登出绑定手机号 start*/
92 92 //发送验证码
... ... @@ -213,3 +213,7 @@ mUrl.vipxwxfpay = cepath+ &#39;/weixinpay/publicUnifiedOrder&#39;;//统一下单接口
213 213 mUrl.vipxwxpay = cepath+ '/weixinpay/unifiedVipCardOrder';
214 214 //会员卡支付宝支付app
215 215 mUrl.vipxAliPay = cepath+ '/alipay/sendAliPayVipCardOrderInfo';
  216 +
  217 +
  218 +//优惠券
  219 +mUrl.discountUrl = cepath+ '/keyTopQrCodeInOutPark/useCouponQueryFee';
... ...
stoppayment/Temporary/check.html
... ... @@ -116,6 +116,22 @@
116 116 <span class="youhuid"></span>
117 117 </div>
118 118 </div>
  119 + <div class="weui-cell weui-cell_vcode">
  120 + <div class="weui-cell__hd">
  121 + <label class="weui-label">优惠券码</label>
  122 + </div>
  123 + <div class="weui-cell__bd">
  124 + <input class="weui-input" id="discountBox" type="tel" placeholder="请输入优惠券码" maxlength="10">
  125 + </div>
  126 + <div class="weui-cell__ft">
  127 + <button class="weui-vcode-btn" id="discountBtn">确定</button>
  128 + </div>
  129 + </div>
  130 + <div class="weui-cell weui-cell_vcode" style="color: #fc3817;text-align: center">
  131 + <div class="weui-cell__hd" id="dicountTip">
  132 +
  133 + </div>
  134 + </div>
119 135 </div>
120 136  
121 137 <div class="pay-content-padded">
... ... @@ -132,12 +148,13 @@
132 148 <script src="../../js/ajax.js"></script>
133 149  
134 150 <script type="text/javascript">
  151 +
135 152 var func ={
136 153 openid:'',
137 154 token:'',
138 155 unpaid:'',
139 156 countType:''
140   -
  157 +
141 158 };
142 159  
143 160 $(function(){
... ... @@ -156,8 +173,50 @@
156 173 var disFee = dataselectt[8].split('=')[1];
157 174 var disDesc = dataselectt[9].split('=')[1];
158 175 func.countType = dataselectt[10].split('=')[1];
159   -
160   -
  176 +
  177 + $('#discountBtn').on('click',function () {
  178 + var val = $.trim($('#discountBox').val())
  179 + if(val){
  180 + var discountParams = {
  181 + app_id:'1',
  182 + salt:'1',
  183 + deviceInfo:'1',
  184 + sign_type:'1',
  185 + sign:'1',
  186 + token:'1',
  187 + terminalSource:3,
  188 + orderId:orderID,
  189 + cardNo:val,
  190 + codeType:3
  191 + };
  192 + //http://39.98.54.240:8090
  193 + jsajax.defaultReq(
  194 + mUrl.discountUrl,
  195 + JSON.stringify(discountParams),
  196 + function(data){
  197 + if(data.code == 0){
  198 + console.log(data)
  199 + $('#discountBtn').prop('disabled',true)
  200 + $('#discountBtn').addClass('weui-btn_disabled')
  201 + $('#discountBox').attr("readOnly","true");
  202 + $('#orderNotPayFee').text(data.data.orderFee/100)
  203 + $('#disFee').text('-'+data.data.discountFee/100+'元')
  204 + $('#dicountTip').text(data.data.couponDescribe)
  205 + }else {
  206 + $('#dicountTip').text(data.message)
  207 + //$.alert(data.message);
  208 + }
  209 +
  210 + }
  211 + )
  212 +
  213 + }else{
  214 + return false
  215 + }
  216 + });
  217 +
  218 +
  219 +
161 220 var staytimes =jsajax.formatSeconds(staytime); //Math.floor(staytime/60) + "小时" + (staytime%60) + "分" ;
162 221 //staytimes = jsajax.fStohours(staytime);
163 222 due = jsajax.fenToYuan(due);
... ... @@ -169,11 +228,11 @@
169 228 paid = '0';
170 229 }
171 230 console.log('是0'+func.countType);
172   -
  231 +
173 232 if(func.countType=='0'){
174 233 $('.youhuid').css('display','none');
175 234 }else{$('.youhuid').css('display','inline')};
176   -
  235 +
177 236 $("#orderID").val(orderID);
178 237 $("#carNumber").text(carnum);
179 238 $("#parkName").text(parkName);
... ... @@ -184,7 +243,7 @@
184 243 $("#orderPayedFee").text(paid);
185 244 if(disFee&&disFee!=''&&disFee!='undefined'&&disFee!=undefined){
186 245 $("#disFee").text(disFee);
187   - //youhuid
  246 + //youhuid
188 247 }else{
189 248 $("#disFee").text('0');
190 249 }
... ... @@ -193,7 +252,7 @@
193 252 $(".youhuid").css('display','inline');
194 253 }else{
195 254 }
196   -
  255 +
197 256 var orderNotPayFee = $('#orderNotPayFee').text();
198 257 if("0" ==orderNotPayFee || null == orderNotPayFee || "" == orderNotPayFee){
199 258 $('#showTooltips').attr('class', 'weui-btn weui-btn_primary weui-btn_disabled');
... ... @@ -224,56 +283,56 @@
224 283 var unpaid = $("#orderNotPayFee").text();
225 284 var carnum = $("#carNumber").text();
226 285 if(func.unpaid>0.00){
227   -
  286 +
228 287 var url=decodeURI(location.href);
229 288 var dataselect = url.split('?');
230 289 var dataselectt = dataselect[1].split('&');
231 290 var parkCode = dataselectt[11].split('=')[1];
232   -
  291 +
233 292 var Urlsrc = '../../pay/immediatepaycs.html?orderID='+orderID+"&carnum="+carnum+"&unpaid="+unpaid
234 293 +"&parkCode="+parkCode
235 294 +"&";
236 295 getOneorder(carnum,parkCode,orderID,'',Urlsrc);
237 296  
238   -
239   -
240   -
  297 +
  298 +
  299 +
241 300 }else{
242 301 $.toptip('无需支付', 'warning');
243 302 }
244 303 }
245 304 });
246   -
247   -
248   -
249   -
250   -
  305 +
  306 +
  307 +
  308 +
  309 +
251 310 //查询单个待支付单费用
252 311 function getOneorder(carNumber,parkCode,orderId,cardNo,Urlsrc){
253   -
254   -
255   -
  312 +
  313 +
  314 +
256 315 var salt = jsajax.salt(32);
257 316 var token = mUrl.GetToken();
258 317 if (token == null) {
259 318 token = '';
260 319 }
261 320 var jsondata = {
262   -
  321 +
263 322 app_id: "0eca8f5373ca4866aec2f8e9d9367104",
264 323 deviceInfo : "BC0703A4-AFB0-4B51-9089-9B7487C0CC6E",
265 324 salt : salt,
266 325 sign : getMd5sign(),
267 326 sign_type : "md5",
268 327 token : token,
269   -
  328 +
270 329 appId:jsajax.appID,
271 330 orderId:orderId,
272 331 terminalSource:'3',
273 332 parkCode:parkCode,
274 333 carNumber:carNumber
275   -
276   -
  334 +
  335 +
277 336 }
278 337 console.log('查询单个的入参 '+JSON.stringify(jsondata)+" 请求的接口"+mUrl.oneCardorder);
279 338 jsajax.defaultReq(
... ... @@ -302,10 +361,10 @@ function getOneorder(carNumber,parkCode,orderId,cardNo,Urlsrc){
302 361 }
303 362 )
304 363 }
305   -
306   -
307   -
308   -
  364 +
  365 +
  366 +
  367 +
309 368 function getMd5sign()
310 369 {
311 370 var salt = jsajax.salt(32);
... ... @@ -322,10 +381,10 @@ function getOneorder(carNumber,parkCode,orderId,cardNo,Urlsrc){
322 381 ];
323 382 var md5sign = jsajax.getsign(sortd);
324 383 return md5sign;
325   -
  384 +
326 385 }
327   -
328   -
  386 +
  387 +
329 388 </script>
330 389 </body>
331 390 </html>
... ...
stoppayment/select.html
... ... @@ -18,12 +18,12 @@
18 18 </head>
19 19 <style>
20 20 body,html{
21   - height: 100%;
  21 + height: 100%;
22 22 }
23 23 body{
24 24 padding-top: 15px;
25 25 box-sizing: border-box;
26   - background: #4a4a4a;
  26 + background: #4a4a4a;
27 27 }
28 28 .bodybg{
29 29 border-top-right-radius: 10px;
... ... @@ -84,7 +84,7 @@
84 84 left: 50%;
85 85 width: 23px;
86 86 height: 2px;
87   - margin-left: -11.5px;
  87 + margin-left: -11.5px;
88 88 }
89 89 .sbzg>span.active .bottom{
90 90 background: #75cbbe;
... ... @@ -210,7 +210,7 @@
210 210 color: #fff;
211 211 margin-top: 25px;
212 212 }
213   -
  213 +
214 214 /*进度条*/
215 215 .loadings{
216 216 width: 100%;
... ... @@ -281,7 +281,7 @@
281 281 添加车辆
282 282 </span>
283 283 </div>-->
284   - </div>
  284 + </div>
285 285 </div>
286 286 <div class="logo">
287 287 <div class="imgss">
... ... @@ -308,7 +308,7 @@
308 308 <a class="weui-btn weui-btn_primary " href="javascript:" id="view_now">立即查看</a>
309 309 </div>
310 310 <br/>
311   - </div>
  311 + </div>
312 312 </div>
313 313 <script src="../js/jquery-3.2.1.min.js"></script>
314 314 <script src="../js/bootstrap/bootstrap.js"></script>
... ... @@ -375,7 +375,7 @@ var func={
375 375 $('.loadings').css('display','block');
376 376 var val = carnum;//$.trim($("#input").val());
377 377 var hiscar = localStorage.getItem('historycar');
378   -
  378 +
379 379 console.log("插入历史车牌"+hiscar);
380 380 if(val&&val!=''){
381 381 if(hiscar&&hiscar!=""&&hiscar!='null'){
... ... @@ -412,7 +412,7 @@ var func={
412 412 }
413 413 var jsondata = {
414 414 carNum:carnum,
415   - paySource:'3'
  415 + terminalSource:'3'
416 416 }
417 417 jsondata = JSON.stringify(jsondata);
418 418 jsajax.defaultReq(
... ... @@ -425,9 +425,9 @@ var func={
425 425 $('.loadings').css('display','none');
426 426 var discountFee = data.data.discountFee;//已优惠
427 427 var discountDesc = data.data.discountDesc;//已优惠
428   -
  428 +
429 429 var datas = data.data;
430   -
  430 +
431 431 if(datas&&datas.length>0){
432 432 for(var i=0;i<datas.length;i++){
433 433 var carnumm = datas[i].carNumber;//.plateno;//获取车牌号
... ... @@ -464,9 +464,9 @@ var func={
464 464 +'&discountType='+discountType
465 465 +'&parkCode='+parkCode
466 466 +"&";
467   -
468   -
469   -
  467 +
  468 +
  469 +
470 470 $('#input').val('');
471 471 setdiv();
472 472 setTimeout(function(){
... ... @@ -486,7 +486,7 @@ var func={
486 486 var src = 'Temporary/checkerror.html?carnum='+carnum+"&";
487 487 window.location.assign(encodeURI(src));
488 488 },100);
489   -
  489 +
490 490 }
491 491 }
492 492 }else{
... ... @@ -495,7 +495,7 @@ var func={
495 495 setdiv();
496 496 setTimeout(function(){
497 497 $('#input').val('');
498   -
  498 +
499 499 console.log("checkerror-491");
500 500 var src = 'Temporary/checkerror.html?carnum='+carnum+"&";
501 501 window.location.assign(encodeURI(src));
... ... @@ -568,7 +568,7 @@ function qiehuan(){
568 568 $('.qiehuan').html('<i class="icon iconfont">&#xe62f;</i>&nbsp;&nbsp;切换新能源车牌');
569 569 xinnengyuan = false;
570 570 }
571   -
  571 +
572 572 }
573 573 $(function(){
574 574 init();
... ... @@ -589,7 +589,7 @@ function init(){
589 589 }else if(n==0){//用户未绑定手机号
590 590 $('.chxunlishi').css('display','block');
591 591 $('.yibangding').css('display','none');
592   -
  592 +
593 593 }
594 594 });
595 595 }else{
... ... @@ -609,10 +609,10 @@ function init(){
609 609 $('.yibangding').css('display','none');
610 610 }
611 611 });
612   -
  612 +
613 613 });//获取openid token
614 614 }
615   -
  615 +
616 616 }
617 617 }
618 618 //获取用户已绑定的车牌号
... ... @@ -655,17 +655,17 @@ function init(){
655 655 +'<div class="col-xs-4">查看订单<i class="icon iconfont">&#xe61e;</i></div>';
656 656 document.querySelector('.yibangdingcar').appendChild(li);
657 657 }
658   - }
  658 + }
659 659 if(datas.length>=0&&datas.length<3){
660 660 //$(".carbd").next('.btn').html('');
661 661 $(".yibangdingcar").append('<div class="addCar" onclick="addcar()" style="text-align: center;color: rgba(74,74,74,1);"> <i class="icon iconfont">&#xe6bb;</i><span> 添加车辆 </span> </div>');
662 662 }
663 663 }else{
664   -
  664 +
665 665 }
666 666 }
667 667 );
668   -
  668 +
669 669 }
670 670 function addcar(){
671 671 window.location.href = '../more/self/Vehiclemanagement/addCar.html';
... ... @@ -674,7 +674,7 @@ function init(){
674 674 function chakna(obj){
675 675 var car = obj.getAttribute('data-car');
676 676 console.log('呵呵呵哒'+car);
677   -
  677 +
678 678 func.userallorders(car);
679 679 }
680 680 </script>
... ... @@ -684,4 +684,4 @@ function init(){
684 684 <!--var urll = document.referrer;
685 685 var arrurl = urll.split('/');
686 686 console.log(arrurl.length);
687   - console.log(arrurl[arrurl.length-1]);-->
688 687 \ No newline at end of file
  688 + console.log(arrurl[arrurl.length-1]);-->
... ...