Quellcode durchsuchen

fix 卡支付问题

pull/1/head
Stormeye Wu vor 5 Jahren
Ursprung
Commit
cda758664c
3 geänderte Dateien mit 14 neuen und 13 gelöschten Zeilen
  1. +10
    -12
      pages/addPark/addPark.js
  2. +1
    -0
      pages/cardorder/index/index.js
  3. +3
    -1
      pages/scanPay/scanPay.js

+ 10
- 12
pages/addPark/addPark.js Datei anzeigen

@@ -60,22 +60,22 @@ Page({
}, },




onLoad: function (options) {
onLoad: function(options) {
let that = this; let that = this;


if (Object.keys(options).length!=0){
if (Object.keys(options).length != 0) {
that.setData({ that.setData({
flags: options.flags flags: options.flags
}) })
} }
}, },
jumpTo: function () {
jumpTo: function() {
// 返回 // 返回
wx.navigateBack({ wx.navigateBack({
url: '/index/passCar' url: '/index/passCar'
}) })
}, },
handleTap: function (e) {
handleTap: function(e) {
this.buttonStatus(); this.buttonStatus();
this.setData({ this.setData({
choose: e.target.dataset.cardata, choose: e.target.dataset.cardata,
@@ -116,7 +116,7 @@ Page({


} }
}, },
chooseNum: function (e) {
chooseNum: function(e) {
if (e.target.dataset.msg == 'I') { if (e.target.dataset.msg == 'I') {
return return
} }
@@ -340,7 +340,7 @@ Page({
this.buttonStatus(); this.buttonStatus();
}, },


submit: function () {
submit: function() {
if (this.data.title != "" && this.data.numFir != "" && this.data.numSco != "" && this.data.numThr != "" && this.data.numFor != "" && this.data.numFive != "" && this.data.numSix != "") { if (this.data.title != "" && this.data.numFir != "" && this.data.numSco != "" && this.data.numThr != "" && this.data.numFor != "" && this.data.numFive != "" && this.data.numSix != "") {
var carNumber = '' var carNumber = ''
carNumber += this.data.title + this.data.numFir + this.data.numSco + this.data.numThr + this.data.numFor + this.data.numFive + this.data.numSix carNumber += this.data.title + this.data.numFir + this.data.numSco + this.data.numThr + this.data.numFor + this.data.numFive + this.data.numSix
@@ -351,12 +351,11 @@ Page({
prevPage.setData({ prevPage.setData({
addCar: carNumber addCar: carNumber
}) })
if (this.data.flags =='managepalte'){
if (this.data.flags == 'managepalte') {
wx.navigateBack({ wx.navigateBack({
url: '/pages/managelicenseplate/managelicenseplate?addcar=' + carNumber, url: '/pages/managelicenseplate/managelicenseplate?addcar=' + carNumber,
}) })
}
else{
} else {
wx.navigateBack({ wx.navigateBack({
url: '/index/passCar?addcar=' + carNumber, url: '/index/passCar?addcar=' + carNumber,
}) })
@@ -364,7 +363,7 @@ Page({
} }
}, },


buttonStatus: function () {
buttonStatus: function() {
if (this.data.title != "" && this.data.numFir != "" && this.data.numSco != "" && this.data.numThr != "" && this.data.numFor != "" && this.data.numFive != "" && this.data.numSix != "") { if (this.data.title != "" && this.data.numFir != "" && this.data.numSco != "" && this.data.numThr != "" && this.data.numFor != "" && this.data.numFive != "" && this.data.numSix != "") {
this.setData({ this.setData({
buttonStatus: true buttonStatus: true
@@ -375,5 +374,4 @@ Page({
}); });
} }
} }
})

})

+ 1
- 0
pages/cardorder/index/index.js Datei anzeigen

@@ -82,6 +82,7 @@ Page({
if (res.code == 200) { if (res.code == 200) {
let merChantDetail = JSON.stringify(res.data); let merChantDetail = JSON.stringify(res.data);
if (merChantDetail && e.currentTarget.dataset.cardid && e.currentTarget.dataset.remainingamount) { if (merChantDetail && e.currentTarget.dataset.cardid && e.currentTarget.dataset.remainingamount) {
merChantDetail = encodeURIComponent(merChantDetail)
wx.navigateTo({ wx.navigateTo({
url: `/pages/scanPay/scanPay?merChant=${merChantDetail}&cardid=${e.currentTarget.dataset.cardid}&remainingAmount=${e.currentTarget.dataset.remainingamount}`, url: `/pages/scanPay/scanPay?merChant=${merChantDetail}&cardid=${e.currentTarget.dataset.cardid}&remainingAmount=${e.currentTarget.dataset.remainingamount}`,
}) })


+ 3
- 1
pages/scanPay/scanPay.js Datei anzeigen

@@ -28,8 +28,10 @@ Page({
*/ */
onLoad: function(options) { onLoad: function(options) {
let that = this; let that = this;
let merChant = decodeURIComponent(options.merChant)
console.log(merChant)
that.setData({ that.setData({
merChant: JSON.parse(options.merChant),
merChant: JSON.parse(merChant),
cardid: options.cardid, cardid: options.cardid,
cardids: options.cardid, cardids: options.cardid,
remainingAmount: options.remainingAmount, remainingAmount: options.remainingAmount,


Laden…
Abbrechen
Speichern