Browse Source

[扫非商户码状态的修改]

tags/广东版3.2.1
meo 6 years ago
parent
commit
9f8d041859
5 changed files with 20 additions and 14 deletions
  1. +3
    -3
      config/config.js
  2. +13
    -7
      pages/cardorder/index/index.js
  3. +2
    -2
      pages/paySuccess/paySuccess.js
  4. +1
    -1
      pages/paySuccess/paySuccess.wxml
  5. +1
    -1
      project.config.json

+ 3
- 3
config/config.js View File

@@ -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: {


+ 13
- 7
pages/cardorder/index/index.js View File

@@ -27,11 +27,9 @@ Page({
mystatus: '',
showPage: false
},
onLoad() {
this.getList(4, 1);
},
onShow: function() {
let that = this;
that.getList(4,1);
wx.setStorage({
key: 'couponNum2',
data: "couponNum3",
@@ -43,12 +41,20 @@ Page({
// 扫一扫去支付
gotoPay: function(e) {
let that = this;
console.log(e.currentTarget.dataset.remainingamount)
wx.scanCode({
success: (res) => {
wx.navigateTo({
url: `/pages/scanPay/scanPay?merChant=${res.result}&cardid=${e.currentTarget.dataset.cardid}&remainingAmount=${e.currentTarget.dataset.remainingamount}`,
})
console.log(JSON.parse(res.result).merchant_id)
if(JSON.parse(res.result).merchant_id&&e.currentTarget.dataset.cardid&&e.currentTarget.dataset.remainingamount){
wx.navigateTo({
url: `/pages/scanPay/scanPay?merChant=${res.result}&cardid=${e.currentTarget.dataset.cardid}&remainingAmount=${e.currentTarget.dataset.remainingamount}`,
})
}else{
wx.showToast({
title:"未识别到商户二维码",
icon:"none",
mask: false
})
}
},
fail: (res) => {
console.log(res);


+ 2
- 2
pages/paySuccess/paySuccess.js View File

@@ -19,8 +19,8 @@ Page({
})
},
goIndex:function(){
wx.switchTab({
url: '/pages/index/index',
wx.navigateBack({
delta: 2
})
},
/**


+ 1
- 1
pages/paySuccess/paySuccess.wxml View File

@@ -15,5 +15,5 @@
</view>
</view>
</view>
<button bindtap='goIndex' hover-class='active'>返回首页</button>
<button bindtap='goIndex' hover-class='active'>返回卡包</button>
</view>

+ 1
- 1
project.config.json View File

@@ -13,7 +13,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.0.9",
"appid": "wxea71200db93d756b",
"appid": "wx649b3be73c1afe47",
"projectname": "C",
"isGameTourist": false,
"condition": {


Loading…
Cancel
Save