From 4c472f6bbf82e5ef95b60ac8e417760d89a7ba36 Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期五, 29 三月 2024 19:39:17 +0800
Subject: [PATCH] 购物车2

---
 pages/cart/paymentPage/index.js |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/pages/cart/paymentPage/index.js b/pages/cart/paymentPage/index.js
index d1b3162..de51373 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,7 @@
   },
 
 
-  getOrderByOrderNum() {
+  getOrderByOrderNumData() {
     let query = {
       orderNum: this.data.orderNumber,
       fields: {
@@ -113,14 +116,17 @@
       })
       res.saleMethodLinks.forEach(item => {
 
+        const type = item.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 +138,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