|
@@ -29,7 +29,6 @@ Page({ |
|
|
onLoad: function(options) { |
|
|
onLoad: function(options) { |
|
|
let that = this; |
|
|
let that = this; |
|
|
let merChant = decodeURIComponent(options.merChant) |
|
|
let merChant = decodeURIComponent(options.merChant) |
|
|
console.log(merChant) |
|
|
|
|
|
that.setData({ |
|
|
that.setData({ |
|
|
merChant: JSON.parse(merChant), |
|
|
merChant: JSON.parse(merChant), |
|
|
cardid: options.cardid, |
|
|
cardid: options.cardid, |
|
|