From 3d73fb33c46aada16a6060adcd4ea14bb33b6b2a Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 09 四月 2024 10:39:11 +0800
Subject: [PATCH] 详情页tabs样式优化，答题添加页面退出拦截，合并代码
---
pages/cart/paymentPage/index.js | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/pages/cart/paymentPage/index.js b/pages/cart/paymentPage/index.js
index d1b3162..5ebd7ac 100644
--- a/pages/cart/paymentPage/index.js
+++ b/pages/cart/paymentPage/index.js
@@ -1,6 +1,8 @@
// pages/cart/paymentPage/index.js
const app = getApp()
-import { getPublicImage } from '../../../assets/js/middleGround/tool';
+import {
+ getPublicImage
+} from '../../../assets/js/middleGround/tool';
import drawQrcode from './js/weapp.qrcode'
Page({
@@ -18,6 +20,7 @@
orderGoods: '',
isPaySuccess: false,
isPayComplete: false,
+ type: ''
},
/**
@@ -34,7 +37,7 @@
selectedIds: options.selectedIds
})
console.log('鎺ユ敹鍒扮殑璁㈠崟鍙�:', this.data.orderNumber);
- this.getOrderByOrderNum()
+ this.getOrderByOrderNumData()
},
/**
@@ -90,7 +93,8 @@
},
- getOrderByOrderNum() {
+ getOrderByOrderNumData() {
+ console.log(this.data.orderNumber, 'this.data.orderNumber');
let query = {
orderNum: this.data.orderNumber,
fields: {
@@ -112,15 +116,16 @@
payPrice: res.payPrice.toFixed(2)
})
res.saleMethodLinks.forEach(item => {
+ console.log(item.type, 'item.type');
+ const type = item.orderSaleMethod.type == 'createProductItemSaleMethod' ? 'item' : 'product';
+ item.type = type; // 灏唗ype璁剧疆涓篿tem瀵硅薄鐨勫睘鎬э紝鑰屼笉鏄娇鐢╯etData
item.paymentIcon = getPublicImage(item.orderSaleMethod.product.icon)
- console.log(item.orderSaleMethod.type);
-
- this.setData({
- productList: res.saleMethodLinks,
- type: item.orderSaleMethod.type == 'createProductItemSaleMethod' ? 'item' : 'product'
- })
-
+ console.log(item.type, 'item');
+ })
+ this.setData({
+ productList: res.saleMethodLinks,
+ // type: item.orderSaleMethod.type == 'createProductItemSaleMethod' ? 'item' : 'product'
})
})
},
@@ -132,12 +137,14 @@
app.MG.store.confirmOrder(query).then(res => {
console.log(res.orderNumber, 'res');
if (res.orderNumber) {
- const resOrderNum = {
+ let resOrderNum = {
orderNum: res.orderNumber,
+ platform: "WeChatAppCustom"
};
-
+ console.log(resOrderNum, 'resOrderNum');
// 鐢ㄦ埛鏈粦瀹氬井淇� 鎶�500
app.MG.store.makeWeChatPay(resOrderNum).then(payRes => {
+ console.log(payRes, 'payRes');
const payVal = JSON.parse(payRes);
wx.requestPayment({
"appId": payVal.appId,
--
Gitblit v1.9.1