From 20a26aa0c12c05c3f96afc163c6532c6b1b5cf8e Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 21 三月 2024 09:24:01 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/cart/paymentPage/index.js | 82 ++++++----------------------------------
1 files changed, 13 insertions(+), 69 deletions(-)
diff --git a/pages/cart/paymentPage/index.js b/pages/cart/paymentPage/index.js
index fcad534..739a4c7 100644
--- a/pages/cart/paymentPage/index.js
+++ b/pages/cart/paymentPage/index.js
@@ -15,20 +15,13 @@
purchasedIds: [],
productList: [],
payPrice: '',
- drawQrcodeText: 'https://www.baidu.com/',
orderGoods: '',
-
-
- confirmBtn: { content: '纭畾', variant: 'base' },
- dialogKey: 'false',
-
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
-
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
@@ -39,44 +32,7 @@
selectedIds: options.selectedIds
})
console.log('鎺ユ敹鍒扮殑璁㈠崟鍙�:', this.data.orderNumber);
-
-
this.getOrderByOrderNum()
-
-
-
-
- drawQrcode({
-
- width: 200, // 蹇呴』锛屼簩缁寸爜瀹藉害锛屼笌canvas鐨剋idth淇濇寔涓�鑷�
-
- height: 200, // 蹇呴』锛屼簩缁寸爜楂樺害锛屼笌canvas鐨刪eight淇濇寔涓�鑷�
-
- canvasId: 'myQrcode',
-
- background: '#ffffff', // 闈炲繀椤伙紝浜岀淮鐮佽儗鏅鑹诧紝榛樿鍊肩櫧鑹�
-
- foreground: '#2bb15e', // 闈炲繀椤伙紝浜岀淮鐮佸墠鏅壊锛岄粯璁ゅ�奸粦鑹� '#000000'
-
- // ctx: wx.createCanvasContext('myQrcode'), // 闈炲繀椤伙紝缁樺浘涓婁笅鏂囷紝鍙�氳繃 wx.createCanvasContext('canvasId') 鑾峰彇锛寁1.0.0+鐗堟湰鏀寔
-
- text: this.data.drawQrcodeText, // 蹇呴』锛屼簩缁寸爜鍐呭
- // v1.0.0+鐗堟湰鏀寔鍦ㄤ簩缁寸爜涓婄粯鍒跺浘鐗�
-
- image: {
- // imageResource: '../../images/icon.png', // 鎸囧畾浜岀淮鐮佸皬鍥炬爣
- dx: 70,
- dy: 70,
- dWidth: 60,
- dHeight: 60
- }
- })
-
-
-
-
-
-
},
/**
@@ -171,32 +127,20 @@
orderNum: this.data.orderGoods
}
app.MG.store.confirmOrder(query).then(res => {
- this.makeWeChatQrPayGet()
+ console.log(res.orderNumber, 'res');
+ if (res.orderNumber) {
+ const resOrderNum = {
+ orderNum: res.orderNumber,
+ };
+
+ // 鐢ㄦ埛鏈粦瀹氬井淇� 鎶�500
+ app.MG.store.makeWeChatPay(resOrderNum).then(payRes => {
+ const payVal = JSON.parse(payRes);
+ console.log(payVal);
+ })
+ }
+ // this.makeWeChatQrPayGet()
})
// 璋冨彇寰俊浜岀淮鐮佹敮浠�
-
},
- // 璋冨彇寰俊浜岀淮鐮佹敮浠�
- makeWeChatQrPayGet() {
- let query = {
- orderNum: this.data.orderGoods
- }
- app.MG.store.makeWeChatQrPay(query).then((res) => {
-
- this.setData({
- drawQrcodeText: res
- })
- this.data.dialogKey = true
- console.log(this.data.drawQrcodeText, 'drawQrcodeText');
- })
- },
- showDialog(e) {
- const { key } = e.currentTarget.dataset;
- this.setData({ [key]: true, dialogKey: key });
- },
- closeDialog() {
- const { dialogKey } = this.data;
- this.setData({ [dialogKey]: false });
- },
-
})
\ No newline at end of file
--
Gitblit v1.9.1