From 6c91dab252a6b147778a2d44e8f471dc673d0b0c Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Fri, 28 Dec 2018 21:13:19 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BB=98=E6=AC=BE=E6=88=90=E5=8A=9F]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/config.js | 6 +++---
pages/passCar/passCar.js | 18 +++++++++---------
pages/passCar/passCar.wxml | 8 ++++----
pages/paySuccess/paySuccess.js | 12 ++++++++----
pages/paySuccess/paySuccess.wxml | 10 ++++------
pages/paySuccess/paySuccess.wxss | 3 +++
pages/scanPay/scanPay.js | 3 +--
pages/user/index.wxml | 2 +-
project.config.json | 2 +-
9 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/config/config.js b/config/config.js
index 006b46a..98502ba 100755
--- a/config/config.js
+++ b/config/config.js
@@ -1,9 +1,9 @@
var extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {};
var appId = extConfig.appId;
var config = {
- url: "https://ciformall.youlane.cn/C/api",
+ // url: "https://ciformall.youlane.cn/C/api",
// url:"https://c.malls.iformall.com/C/api",
- // url:'https://ctest.malls.iformall.com/C/api',
+ url:'https://ctest.malls.iformall.com/C/api',
// url:'http://10.100.33.68:7000/C/api',
// url: 'http://10.100.30.172:7000/C/api',
api: {
@@ -199,7 +199,7 @@ var config = {
},
weapp: {
- AppId: "wxea71200db93d756b"
+ AppId: "wx649b3be73c1afe47"
},
ErrorCode: {
diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js
index 813c94b..6f3c594 100644
--- a/pages/passCar/passCar.js
+++ b/pages/passCar/passCar.js
@@ -59,18 +59,18 @@ Page({
},
gotoetcp:function(){
console.log(this.data.extraData)
- // wx.navigateToMiniProgram({
- // appId:'wx192b7d2e8dcbefd0',
- // extraData: this.data.extraData,
- // envVersion:'release',
- // path:"pages/main/main",
- // })
wx.navigateToMiniProgram({
- appId:'wxc07f9d67923d676d',
+ appId:'wx192b7d2e8dcbefd0',
extraData: this.data.extraData,
envVersion:'release',
- path: "pages/main/main",
+ path:"pages/main/main",
})
+ // wx.navigateToMiniProgram({
+ // appId:'wxc07f9d67923d676d',
+ // extraData: this.data.extraData,
+ // envVersion:'release',
+ // path: "pages/main/main",
+ // })
},
showquan: function() {
wx.navigateTo({
@@ -550,7 +550,7 @@ Page({
syncId: res.data.orderId,
payType: 6, // 小程序支付
CarNumber: carNumber,
- returnUrl: "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback",
+ returnUrl: "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback",
source: "FUMAO-001",
actionId: "1" //操作ID,1:小程序支付
}
diff --git a/pages/passCar/passCar.wxml b/pages/passCar/passCar.wxml
index 3d37832..1d3ffb9 100644
--- a/pages/passCar/passCar.wxml
+++ b/pages/passCar/passCar.wxml
@@ -61,12 +61,12 @@
-
-
+
立即支付
+
立即支付
diff --git a/pages/paySuccess/paySuccess.js b/pages/paySuccess/paySuccess.js
index 5464e5d..54cff7b 100644
--- a/pages/paySuccess/paySuccess.js
+++ b/pages/paySuccess/paySuccess.js
@@ -1,18 +1,22 @@
-// pages/paySuccess/paySuccess.js
-Page({
+let Util = require("../../utils/util");
+Page({
/**
* 页面的初始数据
*/
data: {
-
+ data:null
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
-
+ let pamars = JSON.parse(options.data);
+ pamars.updateDate = Util.formatTime(pamars.updateDate, "yyyy-MM-dd hh:mm:ss");
+ this.setData({
+ data:pamars
+ })
},
goIndex:function(){
wx.switchTab({
diff --git a/pages/paySuccess/paySuccess.wxml b/pages/paySuccess/paySuccess.wxml
index a25c3cd..ca4697a 100644
--- a/pages/paySuccess/paySuccess.wxml
+++ b/pages/paySuccess/paySuccess.wxml
@@ -1,5 +1,4 @@
-
@@ -10,12 +9,11 @@
- 订单号:{{number}}
- 商户名:{{number}}
- 交易时间:{{number}}
- 金额:{{number}}
+ 订单号:{{data.orderId}}
+ 交易时间:{{data.updateDate}}
+ 金额:{{data.payment/100}}元
-
+
\ No newline at end of file
diff --git a/pages/paySuccess/paySuccess.wxss b/pages/paySuccess/paySuccess.wxss
index b64e613..b8b316d 100644
--- a/pages/paySuccess/paySuccess.wxss
+++ b/pages/paySuccess/paySuccess.wxss
@@ -73,4 +73,7 @@ height: 70rpx;
}
.payMessage .price{
color: #FF3535;
+}
+.active{
+ opacity: .6;
}
\ No newline at end of file
diff --git a/pages/scanPay/scanPay.js b/pages/scanPay/scanPay.js
index be47ea6..767814a 100644
--- a/pages/scanPay/scanPay.js
+++ b/pages/scanPay/scanPay.js
@@ -19,7 +19,6 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
- console.log(options.remainingAmount)
let that = this;
that.setData({
merChant: JSON.parse(options.merChant),
@@ -50,7 +49,7 @@ Page({
console.log(res);
if(res.code==200){
wx.navigateTo({
- url: '/pages/paySuccess/paySuccess',
+ url: `/pages/paySuccess/paySuccess?data=${JSON.stringify(res.data)}`,
})
}
})
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index e6eee87..404766d 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -76,7 +76,7 @@
- 版本号:3.2.2
+ 版本号:3.2.3
diff --git a/project.config.json b/project.config.json
index 4e30ca0..2970aaf 100644
--- a/project.config.json
+++ b/project.config.json
@@ -13,7 +13,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.0.9",
- "appid": "wxea71200db93d756b",
+ "appid": "wx649b3be73c1afe47",
"projectname": "C",
"isGameTourist": false,
"condition": {