From d1d7c211571aaceedbca0ac2f0977bac256036b6 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Thu, 28 Feb 2019 12:21:25 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9=E5=81=9C=E8=BD=A6]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/passCar/passCar.js | 26 +++++++++++++++----------
pages/passCar/passCar.wxml | 19 +++++++------------
pages/passCar/passCar.wxss | 39 ++++++++++++++++++++++++--------------
3 files changed, 48 insertions(+), 36 deletions(-)
diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js
index bff2b4f..0ccb3d9 100644
--- a/pages/passCar/passCar.js
+++ b/pages/passCar/passCar.js
@@ -1,12 +1,14 @@
+const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}
+let app = getApp();
let config = require("../../config/config.js");
let Http = require("../../utils/HttpBasics");
let Util = require("../../utils/util");
-let app = getApp();
const imgurl = require("../../utils/imgurl");
Page({
data: {
parkUrl: imgurl.park.url,
jianUrl: imgurl.jian.url,
+ qidaiUrl: imgurl.qidai.url,
addUrl: imgurl.add.url,
quanUrl: imgurl.quan.url,
cheUrl: imgurl.che.url,
@@ -58,9 +60,9 @@ Page({
console.log(res)
},
gotoetcp:function(){
- console.log(this.data.extraData)
+ console.log(this.data.passCarAppId)
wx.navigateToMiniProgram({
- appId:'wx192b7d2e8dcbefd0',
+ appId: that.data.passCarAppId,
extraData: this.data.extraData,
envVersion:'release',
path:"pages/main/main",
@@ -80,6 +82,14 @@ Page({
},
onShow: function(options) {
var that = this;
+ console.log(extConfig);
+ that.setData({
+ passCarAppId: extConfig.attr.passCarAppId,
+ etcpversion: extConfig.attr.etcpversion,
+ passCarreturnUrl: extConfig.attr.passCarreturnUrl,
+ ifHaveCarModular: extConfig.attr.ifHaveCarModular
+ })
+ console.log("停车");
if (app.globalData.token) {
that.getList();
that.init();
@@ -539,7 +549,8 @@ Page({
carNumber: carNumber,
outCarId: outCarId
};
- console.log(postData)
+ console.log(that.data.passCarreturnUrl)
+ console.log("获得停车费用")
Http.post({
url: config.api.getCarStopFee,
data: postData
@@ -551,7 +562,7 @@ Page({
syncId: res.data.orderId,
payType: 6, // 小程序支付
CarNumber: carNumber,
- returnUrl: "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback",
+ returnUrl: passCarreturnUrl,
source: "FUMAO-001",
actionId: "1" //操作ID,1:小程序支付
}
@@ -567,11 +578,6 @@ Page({
})
.catch(error => {
console.log(error)
- wx.showModal({
- title: '提示',
- content: error.message,
- showCancel: false
- })
that.setData({
stopFees: {},
scroll: true
diff --git a/pages/passCar/passCar.wxml b/pages/passCar/passCar.wxml
index 1d3ffb9..c6a0fdc 100644
--- a/pages/passCar/passCar.wxml
+++ b/pages/passCar/passCar.wxml
@@ -1,4 +1,4 @@
-
+
@@ -50,8 +45,6 @@
{{couponList.length}}张可用
-
-
@@ -61,12 +54,9 @@
-
+
立即支付
-
立即支付
@@ -112,4 +102,9 @@
+
+
+
+ 智慧停车即将上线
+ 敬请期待
\ No newline at end of file
diff --git a/pages/passCar/passCar.wxss b/pages/passCar/passCar.wxss
index feeb69f..2c945cf 100644
--- a/pages/passCar/passCar.wxss
+++ b/pages/passCar/passCar.wxss
@@ -375,19 +375,6 @@ page {
.textV3 {
width: 225rpx;
}
-
-/* .textV1{
- position: absolute;
- left: 10rpx;
- top: 22rpx;
-} */
-
-/* .textV2{
- position: absolute;
- top: 22rpx;
- right: 80rpx;
-} */
-
.choice {
width: 80rpx;
height: 80rpx;
@@ -636,4 +623,28 @@ button::after {
vertical-align: middle;
margin-top: -6rpx;
margin-right: -10rpx;
-}
\ No newline at end of file
+}
+
+.img {
+ display: block;
+ width: 211rpx;
+ margin: 168rpx auto 40rpx;
+}
+
+.txt1 {
+ display: block;
+ font-size: 34rpx;
+ color: #333;
+ letter-spacing: 0;
+ text-align: center;
+}
+
+.txt2 {
+ display: block;
+ font-size: 28rpx;
+ color: #999;
+ letter-spacing: 0;
+ text-align: center;
+ line-height: 40rpx;
+ margin-top: 10rpx;
+}