From 4f9a391ef4a1997af8d5d3f70b7861d0e568ca73 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Tue, 18 Dec 2018 15:46:02 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E6=89=AB=E4=B8=80=E6=89=AB]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/config.js | 6 +++++-
pages/cardorder/index/index.js | 14 ++++++++++++++
pages/cardorder/index/index.wxml | 6 +++---
pages/user/index.js | 1 -
pages/user/index.wxml | 2 +-
5 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/config/config.js b/config/config.js
index 599c963..d0811cf 100755
--- a/config/config.js
+++ b/config/config.js
@@ -177,7 +177,11 @@ var config = {
/**
* 卡券详情接口
*/
- cardDetail: "/couponOrder/cardDetail"
+ cardDetail: "/couponOrder/cardDetail",
+ /**
+ * C端扫B端储值卡支付订单
+ */
+ orderCreate:"/carday/order_create"
},
weapp: {
diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js
index ed9d895..2350484 100644
--- a/pages/cardorder/index/index.js
+++ b/pages/cardorder/index/index.js
@@ -36,6 +36,20 @@ Page({
index:2
})
},
+ // 扫一扫去支付
+ gotoPay:function(e){
+ console.log(e.currentTarget.dataset.cardid)
+ Http.post({
+ url: config.api.orderCreate,
+ data: {
+ cardId: e.currentTarget.dataset.cardid,
+ merchantCode: "234567451101102080",
+ totalFee: "5"
+ }
+ }).then(res=>{
+ console.log(res)
+ })
+ },
//点击跳转到券详情页面
gotouse: function (e) {
if (this.data.mystatus == '' || this.data.mystatus == 'undefined') {
diff --git a/pages/cardorder/index/index.wxml b/pages/cardorder/index/index.wxml
index 15ef3f7..5ecb16b 100644
--- a/pages/cardorder/index/index.wxml
+++ b/pages/cardorder/index/index.wxml
@@ -13,7 +13,7 @@
-
+
@@ -26,8 +26,8 @@
{{item.subTitle}}
- 去使用
- 查看
+ 扫一扫
+
diff --git a/pages/user/index.js b/pages/user/index.js
index 82cfec1..1df19af 100644
--- a/pages/user/index.js
+++ b/pages/user/index.js
@@ -116,7 +116,6 @@ Page({
score: res.data.score,
levelName: res.data.levelName,
})
-
if (res.data.nickName || res.data.phone){
that.setData({
ismember:true,
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index a643310..d9fb425 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -21,7 +21,7 @@
编辑
-
+