@@ -1,9 +1,9 @@ | |||||
var extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}; | var extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}; | ||||
var appId = extConfig.appId; | var appId = extConfig.appId; | ||||
var config = { | 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://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.33.68:7000/C/api', | ||||
// url: 'http://10.100.30.172:7000/C/api', | // url: 'http://10.100.30.172:7000/C/api', | ||||
api: { | api: { | ||||
@@ -199,7 +199,7 @@ var config = { | |||||
}, | }, | ||||
weapp: { | weapp: { | ||||
AppId: "wxea71200db93d756b" | |||||
AppId: "wx649b3be73c1afe47" | |||||
}, | }, | ||||
ErrorCode: { | ErrorCode: { | ||||
@@ -59,18 +59,18 @@ Page({ | |||||
}, | }, | ||||
gotoetcp:function(){ | gotoetcp:function(){ | ||||
console.log(this.data.extraData) | console.log(this.data.extraData) | ||||
// wx.navigateToMiniProgram({ | |||||
// appId:'wx192b7d2e8dcbefd0', | |||||
// extraData: this.data.extraData, | |||||
// envVersion:'release', | |||||
// path:"pages/main/main", | |||||
// }) | |||||
wx.navigateToMiniProgram({ | wx.navigateToMiniProgram({ | ||||
appId:'wxc07f9d67923d676d', | |||||
appId:'wx192b7d2e8dcbefd0', | |||||
extraData: this.data.extraData, | extraData: this.data.extraData, | ||||
envVersion:'release', | 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() { | showquan: function() { | ||||
wx.navigateTo({ | wx.navigateTo({ | ||||
@@ -550,7 +550,7 @@ Page({ | |||||
syncId: res.data.orderId, | syncId: res.data.orderId, | ||||
payType: 6, // 小程序支付 | payType: 6, // 小程序支付 | ||||
CarNumber: carNumber, | CarNumber: carNumber, | ||||
returnUrl: "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback", | |||||
returnUrl: "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback", | |||||
source: "FUMAO-001", | source: "FUMAO-001", | ||||
actionId: "1" //操作ID,1:小程序支付 | actionId: "1" //操作ID,1:小程序支付 | ||||
} | } | ||||
@@ -61,12 +61,12 @@ | |||||
<view class="buy-view" wx:if="{{stopFees.orderId}}"> | <view class="buy-view" wx:if="{{stopFees.orderId}}"> | ||||
<!-- <navigator bindfail="bindfail" path="pages/main/main" wx:if="{{canIUse}}" class='buy' target="miniProgram" open-type="navigate" app-id="wx192b7d2e8dcbefd0" extra-data='{{extraData}}' version="release"> | |||||
立即支付 | |||||
</navigator> --> | |||||
<navigator wx:if="{{canIUse}}" class='buy' path="pages/main/main" target="miniProgram" open-type="navigate" app-id="wxc07f9d67923d676d" extra-data='{{extraData}}' version="release"> | |||||
<navigator bindfail="bindfail" path="pages/main/main" wx:if="{{canIUse}}" class='buy' target="miniProgram" open-type="navigate" app-id="wx192b7d2e8dcbefd0" extra-data='{{extraData}}' version="release"> | |||||
立即支付 | 立即支付 | ||||
</navigator> | </navigator> | ||||
<!-- <navigator wx:if="{{canIUse}}" class='buy' path="pages/main/main" target="miniProgram" open-type="navigate" app-id="wxc07f9d67923d676d" extra-data='{{extraData}}' version="release"> | |||||
立即支付 | |||||
</navigator> --> | |||||
<view wx:if="{{!canIUse}}" class='buy' bindtap='gotoetcp'>立即支付</view> | <view wx:if="{{!canIUse}}" class='buy' bindtap='gotoetcp'>立即支付</view> | ||||
</view> | </view> | ||||
</view> | </view> | ||||
@@ -1,18 +1,22 @@ | |||||
// pages/paySuccess/paySuccess.js | |||||
Page({ | |||||
let Util = require("../../utils/util"); | |||||
Page({ | |||||
/** | /** | ||||
* 页面的初始数据 | * 页面的初始数据 | ||||
*/ | */ | ||||
data: { | data: { | ||||
data:null | |||||
}, | }, | ||||
/** | /** | ||||
* 生命周期函数--监听页面加载 | * 生命周期函数--监听页面加载 | ||||
*/ | */ | ||||
onLoad: function (options) { | 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(){ | goIndex:function(){ | ||||
wx.switchTab({ | wx.switchTab({ | ||||
@@ -1,5 +1,4 @@ | |||||
<view class='content'> | <view class='content'> | ||||
<!-- <image src='./../../assets/images/success.png' mode="widthFix"></image> --> | |||||
<view class="payContent"> | <view class="payContent"> | ||||
<view class="payHeader"></view> | <view class="payHeader"></view> | ||||
<view class="payBody"> | <view class="payBody"> | ||||
@@ -10,12 +9,11 @@ | |||||
</view> | </view> | ||||
</view> | </view> | ||||
<view class="payMessage"> | <view class="payMessage"> | ||||
<view>订单号:{{number}}</view> | |||||
<view>商户名:{{number}}</view> | |||||
<view>交易时间:{{number}}</view> | |||||
<view>金额:<text class="price">{{number}}</text></view> | |||||
<view>订单号:{{data.orderId}}</view> | |||||
<view>交易时间:{{data.updateDate}}</view> | |||||
<view>金额:<text class="price">{{data.payment/100}}元</text></view> | |||||
</view> | </view> | ||||
</view> | </view> | ||||
</view> | </view> | ||||
<button bindtap='goIndex'>返回首页</button> | |||||
<button bindtap='goIndex' hover-class='active'>返回首页</button> | |||||
</view> | </view> |
@@ -73,4 +73,7 @@ height: 70rpx; | |||||
} | } | ||||
.payMessage .price{ | .payMessage .price{ | ||||
color: #FF3535; | color: #FF3535; | ||||
} | |||||
.active{ | |||||
opacity: .6; | |||||
} | } |
@@ -19,7 +19,6 @@ Page({ | |||||
* 生命周期函数--监听页面加载 | * 生命周期函数--监听页面加载 | ||||
*/ | */ | ||||
onLoad: function(options) { | onLoad: function(options) { | ||||
console.log(options.remainingAmount) | |||||
let that = this; | let that = this; | ||||
that.setData({ | that.setData({ | ||||
merChant: JSON.parse(options.merChant), | merChant: JSON.parse(options.merChant), | ||||
@@ -50,7 +49,7 @@ Page({ | |||||
console.log(res); | console.log(res); | ||||
if(res.code==200){ | if(res.code==200){ | ||||
wx.navigateTo({ | wx.navigateTo({ | ||||
url: '/pages/paySuccess/paySuccess', | |||||
url: `/pages/paySuccess/paySuccess?data=${JSON.stringify(res.data)}`, | |||||
}) | }) | ||||
} | } | ||||
}) | }) | ||||
@@ -76,7 +76,7 @@ | |||||
<view class="margin"></view> | <view class="margin"></view> | ||||
<!-- <button bindtap="navigateTo" class="user-out-btn">退出登陆</button> --> | <!-- <button bindtap="navigateTo" class="user-out-btn">退出登陆</button> --> | ||||
<view bindlongtap='showVersion' class='version'> | <view bindlongtap='showVersion' class='version'> | ||||
<view wx:if="{{flag=='show'}}">版本号:3.2.2</view> | |||||
<view wx:if="{{flag=='show'}}">版本号:3.2.3</view> | |||||
<view wx:if="{{flag=='hidden'}}"></view> | <view wx:if="{{flag=='hidden'}}"></view> | ||||
</view> | </view> | ||||
</view> | </view> | ||||
@@ -13,7 +13,7 @@ | |||||
}, | }, | ||||
"compileType": "miniprogram", | "compileType": "miniprogram", | ||||
"libVersion": "2.0.9", | "libVersion": "2.0.9", | ||||
"appid": "wxea71200db93d756b", | |||||
"appid": "wx649b3be73c1afe47", | |||||
"projectname": "C", | "projectname": "C", | ||||
"isGameTourist": false, | "isGameTourist": false, | ||||
"condition": { | "condition": { | ||||