Commit 33e6793f321741cc8e6d109d19439fdce6ef4754
1 parent
6f37be09
支付页面
Showing
3 changed files
with
12 additions
and
105 deletions
css/home.css
... | ... | @@ -123,9 +123,9 @@ body { |
123 | 123 | } |
124 | 124 | |
125 | 125 | /*折扣描述*/ |
126 | -#discountDesc { | |
127 | - color: #ffffff; background-color: red; border-radius: 2px; margin-left: 5px; padding: 0 3px 0 3px; | |
128 | -} | |
126 | +/*#discountDesc {*/ | |
127 | + /*color: #ffffff; background-color: red; border-radius: 2px; margin-left: 5px; padding: 0 3px 0 3px;*/ | |
128 | +/*}*/ | |
129 | 129 | |
130 | 130 | #linkPayDetail { |
131 | 131 | color:#4395ff;text-decoration:none; | ... | ... |
js/list.js
... | ... | @@ -181,105 +181,7 @@ var dateFormat = function(msd){ |
181 | 181 | |
182 | 182 | return time; |
183 | 183 | }; |
184 | -$(function(){ | |
185 | - // var data = JSON.parse(localStorage.getItem('paybacklist')); | |
186 | - // var htmls=''; | |
187 | - // console.log(data); | |
188 | - // console.log(data.length); | |
189 | - // for (var i=0;i<data.length;i++) { | |
190 | - // var orderFreeDuration = Number((data[i].orderFreeDuration)) | |
191 | - // var parkDuration = Number((data[i].parkDuration)) | |
192 | - // var num = ((data[i].unPayFee) / 100).toFixed(2); | |
193 | - // var outflag = data[i].orderStateRemark; | |
194 | - // | |
195 | - // if (outflag == '出场缴费') { | |
196 | - // if (orderFreeDuration > parkDuration) { | |
197 | - // htmls += '<div class="weui-cells" data-flag="0">' + | |
198 | - // ' <div class="weui-cell">' + | |
199 | - // ' <div class="weui-cell__bd">' + | |
200 | - // ' <p class="carNumber">' + data[i].carNumber + '</p>' + | |
201 | - // ' <p class="parkCode" style="display: none">' + data[i].parkCode + '</p>' + | |
202 | - // // ' <p class="orderId" style="display: none">' + data[i].orderId + '</p>' + | |
203 | - // | |
204 | - // ' </div>' + | |
205 | - // ' <div class="weui-cell__ft paySrcType" style="color: #f00"></div>' + | |
206 | - // ' </div>' + | |
207 | - // ' <div class="weui-cell">' + | |
208 | - // ' <div class="weui-cell__bd">' + | |
209 | - // ' <p>停车场名称:' + data[i].parkName + '</p>' + | |
210 | - // ' <p>进场时间:' + data[i].parkInTime + '</p>' + | |
211 | - // ' <p>出场时间:' + data[i].parkOutTime + '</p>' + | |
212 | - // ' <p>停车时长:' + dateFormat(data[i].parkDuration) + '</p>' + | |
213 | - // ' </div>' + | |
214 | - // ' <div class="weui-cell__ft ">' + | |
215 | - // '<p><span class="paymoney">' + num + '</span>元</p>' + | |
216 | - // '<p class="out-btn arrears-btn">申请离场' + | |
217 | - // ' <span class="orderId" style="display: none">' + data[i].orderId + '</span>' + | |
218 | - // '</p>' + | |
219 | - // '</div>' + | |
220 | - // ' </div>' + | |
221 | - // ' </div>'; | |
222 | - // } else { | |
223 | - // htmls += '<div class="weui-cells" data-flag="1">' + | |
224 | - // ' <div class="weui-cell">' + | |
225 | - // ' <div class="weui-cell__bd">' + | |
226 | - // ' <p class="carNumber">' + data[i].carNumber + '</p>' + | |
227 | - // ' <p class="parkCode" style="display: none">' + data[i].parkCode + '</p>' + | |
228 | - // // ' <p class="orderId" style="display: none">' + data[i].orderId + '</p>' + | |
229 | - // | |
230 | - // ' </div>' + | |
231 | - // ' <div class="weui-cell__ft paySrcType" style="color: #f00"></div>' + | |
232 | - // ' </div>' + | |
233 | - // ' <div class="weui-cell">' + | |
234 | - // ' <div class="weui-cell__bd">' + | |
235 | - // ' <p>停车场名称:' + data[i].parkName + '</p>' + | |
236 | - // ' <p>进场时间:' + data[i].parkInTime + '</p>' + | |
237 | - // ' <p>出场时间:' + data[i].parkOutTime + '</p>' + | |
238 | - // ' <p>停车时长:' + dateFormat(data[i].parkDuration) + '</p>' + | |
239 | - // ' </div>' + | |
240 | - // ' <div class="weui-cell__ft "><p><span class="paymoney">' + num + '</span>元</p>' + | |
241 | - // '<p class="arrears-btn">出场缴费' + | |
242 | - // ' <span class="orderId" style="display: none">' + data[i].orderId + '</span>' + | |
243 | - // '</p>' + | |
244 | - // '</div>' + | |
245 | - // ' </div>' + | |
246 | - // ' </div>'; | |
247 | - // } | |
248 | - // | |
249 | - // } else { | |
250 | - // htmls += '<div class="weui-cells" data-flag="1">' + | |
251 | - // ' <div class="weui-cell">' + | |
252 | - // ' <div class="weui-cell__bd">' + | |
253 | - // ' <p class="carNumber">' + data[i].carNumber + '</p>' + | |
254 | - // ' <p class="parkCode" style="display: none">' + data[i].parkCode + '</p>' + | |
255 | - // // ' <p class="orderId" style="display: none">' + data[i].orderId + '</p>' + | |
256 | - // | |
257 | - // ' </div>' + | |
258 | - // ' <div class="weui-cell__ft paySrcType" style="color: #f00">' + outflag + '</div>' + | |
259 | - // ' </div>' + | |
260 | - // ' <div class="weui-cell">' + | |
261 | - // ' <div class="weui-cell__bd">' + | |
262 | - // ' <p>停车场名称:' + data[i].parkName + '</p>' + | |
263 | - // ' <p>进场时间:' + data[i].parkInTime + '</p>' + | |
264 | - // ' <p>出场时间:' + data[i].parkOutTime + '</p>' + | |
265 | - // ' <p>停车时长:' + dateFormat(data[i].parkDuration) + '</p>' + | |
266 | - // ' </div>' + | |
267 | - // ' <div class="weui-cell__ft "><p><span class="paymoney">' + num + '</span>元</p>' + | |
268 | - // '<p class="arrears-btn">清缴欠费' + | |
269 | - // ' <span class="orderId" style="display: none">' + data[i].orderId + '</span>' + | |
270 | - // '</p>' + | |
271 | - // '</div>' + | |
272 | - // ' </div>' + | |
273 | - // ' </div>'; | |
274 | - // } | |
275 | - // // if(outflag=='出场缴费'){ | |
276 | - // // outflag = '' | |
277 | - // // } | |
278 | - // | |
279 | - // } | |
280 | - // $('#pay_listcont').append(htmls); | |
281 | 184 | |
282 | -}); | |
283 | 185 | |
284 | 186 | $(document).on('click','.weui-cells',function () { |
285 | 187 | console.log($(this).attr('data-flag')) |
... | ... | @@ -454,6 +356,11 @@ function getOneorder(carNumber,parkCode,orderId){ |
454 | 356 | +"&disdesc="+discountDesc |
455 | 357 | +'&discountType='+discountType |
456 | 358 | +'&parkCode='+parkCode |
359 | + +'&orderId='+datas.orderId | |
360 | + +'&discountFee='+datas.discountFee | |
361 | + +'&parkOutTime='+datas.parkOutTime | |
362 | + +'&orderFee='+datas.orderFee | |
363 | + +'&appOrderTimeout='+datas.appOrderTimeout | |
457 | 364 | +"&"; |
458 | 365 | console.log(src) |
459 | 366 | window.location.assign(encodeURI(src)) | ... | ... |
js/pay.js
... | ... | @@ -42,7 +42,7 @@ window.onload = function () { |
42 | 42 | if (state == "wxPay") { |
43 | 43 | webAppCode = webAppClass.getCode(); |
44 | 44 | } |
45 | - $discountBtn.onclick = webAppClass.discountClick; | |
45 | + // $discountBtn.onclick = webAppClass.discountClick; | |
46 | 46 | } |
47 | 47 | /**/ |
48 | 48 | var webAppClass = { |
... | ... | @@ -560,7 +560,7 @@ var webAppClass = { |
560 | 560 | |
561 | 561 | if (params != null && params!="") { |
562 | 562 | var price = keepTwoDecimalFull((params.orderFee / 100));//(params.orderFee / 100); |
563 | - $carNum.innerHTML = params.plateno;//手机号 | |
563 | + $carNum.innerHTML = params.carnum;//手机号 | |
564 | 564 | $orderNum.innerHTML = params.orderId;//订单号 |
565 | 565 | $sumMoney.innerHTML = price;///params.orderFee//缴费金额 |
566 | 566 | $outtime.innerHTML = params.outtime;//实际出场时间 |
... | ... | @@ -573,8 +573,8 @@ var webAppClass = { |
573 | 573 | |
574 | 574 | $due.innerHTML = keepTwoDecimalFull((params.due / 100));//停车总费用 |
575 | 575 | $paid.innerHTML = params.paid; |
576 | - $discountFee.innerHTML = keepTwoDecimalFull((params.discountFee / 100));//优惠金额 | |
577 | - $discountDesc.innerHTML = params.discountDesc; | |
576 | + $discountFee.innerHTML = params.discountFee;//优惠金额 | |
577 | + // $discountDesc.innerHTML = params.discountDesc; | |
578 | 578 | } else { |
579 | 579 | console.log("没有接受到参数"); |
580 | 580 | } | ... | ... |