From 9f8d0418597537292f9a6d0c0821c3ee9aa08dcc Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Sun, 30 Dec 2018 01:11:52 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=89=AB=E9=9D=9E=E5=95=86=E6=88=B7=E7=A0=81?=
=?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9A=84=E4=BF=AE=E6=94=B9]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/config.js | 6 +++---
pages/cardorder/index/index.js | 20 +++++++++++++-------
pages/paySuccess/paySuccess.js | 4 ++--
pages/paySuccess/paySuccess.wxml | 2 +-
project.config.json | 2 +-
5 files changed, 20 insertions(+), 14 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/cardorder/index/index.js b/pages/cardorder/index/index.js
index eca2e96..f3edbb2 100644
--- a/pages/cardorder/index/index.js
+++ b/pages/cardorder/index/index.js
@@ -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);
diff --git a/pages/paySuccess/paySuccess.js b/pages/paySuccess/paySuccess.js
index 54cff7b..cdff52e 100644
--- a/pages/paySuccess/paySuccess.js
+++ b/pages/paySuccess/paySuccess.js
@@ -19,8 +19,8 @@ Page({
})
},
goIndex:function(){
- wx.switchTab({
- url: '/pages/index/index',
+ wx.navigateBack({
+ delta: 2
})
},
/**
diff --git a/pages/paySuccess/paySuccess.wxml b/pages/paySuccess/paySuccess.wxml
index 9ce14a6..2b2556d 100644
--- a/pages/paySuccess/paySuccess.wxml
+++ b/pages/paySuccess/paySuccess.wxml
@@ -15,5 +15,5 @@
-
+
\ No newline at end of file
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": {