Merge refs/remotes/origin/master into refs/heads/master

litian

2024-03-21 20a26aa0c12c05c3f96afc163c6532c6b1b5cf8e

 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的width保持一致

      height: 200, // 必须，二维码高度，与canvas的height保持一致

      canvasId: 'myQrcode',

      background: '#ffffff', //   非必须，二维码背景颜色，默认值白色

      foreground: '#2bb15e', // 非必须，二维码前景色，默认值黑色    '#000000'

      // ctx: wx.createCanvasContext('myQrcode'), // 非必须，绘图上下文，可通过 wx.createCanvasContext('canvasId') 获取，v1.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 });
  },

})