bug1

yiming

2024-04-19 56b70cdad0a96691eaf37e04a79ef5e92b892480

 packagePersonal/pages/myOrder/index.js

@@ -40,7 +40,9 @@
    isBackTop: false,
    setScrollValue: 0,
    skeletonLoding: true,
    queryFilter: []
    queryFilter: [],
    isPaySuccess: false,
    isPayComplete: false,
  },

  /**
@@ -78,7 +80,6 @@

  getDataList(isReachBottom) {
    var searchArr = [];
    console.log(this.data.searchText, "earch")
    if (this.data.searchText != undefined && this.data.searchText != "") {
      searchArr.push({
        compareType: "Contains",
@@ -155,7 +156,6 @@
          })
        } else {
          this.setData({
            list: false,
            skeletonLoding: false,
            loading: false
          })
@@ -171,7 +171,26 @@
    })
    this.getDataList(false);
  },
  async goBookDetails(e) {

    console.log(e.currentTarget.dataset);
    const {
      book,
      remarks
    } = e.currentTarget.dataset;
    let parentData = null;
    let bookId = book.orderSaleMethod.product.id;

    parentData = await app.MG.store.getProductBySaleMethod({
      'saleMethodId': book.orderSaleMethod.id
    })
    if (parentData.parentProduct.length > 0) {
      bookId = parentData.parentProduct[parentData.parentProduct.length - 1].id;
    }
    wx.navigateTo({
      url: `/packageBookService/pages/bookServices/detail/index?id=${bookId}&name=${book.name}`,
    });
  },

  /**
   * 页面相关事件处理函数--监听用户下拉动作
@@ -222,6 +241,7 @@
  },

  onCancel(e) {
    let that = this;
    let {
      orderNum
    } = e.currentTarget.dataset
@@ -232,13 +252,16 @@
        if (res.confirm) {
          app.MG.store.cancelOrder({
            orderNum: orderNum
          }).then(() => {
            wx.showToast({
              title: "订单已取消",
              icon: 'success',
              duration: 1000
            })
            this.getDataList(false)
          }).then((res) => {
            if (res) {
              wx.showToast({
                title: "订单已取消",
                icon: 'success',
                duration: 1000
              })
              that.getDataList(false)
            }

          })
        } else if (res.cancel) {
          console.log('用户点击了取消')
@@ -257,93 +280,41 @@
      orderNum: orderNum,
    };
    app.MG.store.getOrderByOrderNum(data).then(res => {
      if (res && res.state != "WaitPay") {
        app.MG.store.confirmOrder(data).then(conRes => {
          if (conRes.orderNumber) {
            const resOrderNum = {
              orderNum: conRes.orderNumber,
            };
            if (conRes.payPrice != 0) {
              app.MG.store.makeWeChatPay(resOrderNum).then(payRes => {
                const payVal = JSON.parse(payRes);
                wx.requestPayment({
                  "appId": payVal.appId,
                  "timeStamp": payVal.timeStamp,
                  "nonceStr": payVal.nonceStr,
                  "package": payVal.package,
                  "signType": payVal.signType,
                  "paySign": payVal.paySign,
                  "success": function (res) {
                    if (res.errMsg == 'requestPayment:ok') {
                      that.setData({
                        isPaySuccess: true
                      })
                    }
                    console.log(res, "成功")
                  },
                  "fail": function (res) {
                    console.log(res, "失败")
                  },
                  "complete": function (res) {
                    if (res.errMsg == 'requestPayment:ok') {
                      that.setData({
                        isPayComplete: true
                      })
                    }
                    if (that.data.isPaySuccess && that.data.isPayComplete) {
                      that.navToBack()
                    }
                  }
      app.MG.store.makeWeChatPay({
          orderNum: res.orderNumber,
          platform: "WeChatAppCustom"
        })
        .then(payRes => {
          const payVal = JSON.parse(payRes);
          wx.requestPayment({
            "appId": payVal.appId,
            "timeStamp": payVal.timeStamp,
            "nonceStr": payVal.nonceStr,
            "package": payVal.package,
            "signType": payVal.signType,
            "paySign": payVal.paySign,
            "success": function (res) {
              if (res.errMsg == 'requestPayment:ok') {
                that.setData({
                  isPaySuccess: true
                })
              });
            } else {
              wx.showToast({
                title: '领取成功',
              })
              // 可添加返回上级
              setTimeout(() => {
                that.navToBack()
              }, 2000);
            }
          }
        });
      } else {
        app.MG.store
          .makeWeChatPay({
            orderNum: orderNum
          })
          .then(payRes => {
            const payVal = JSON.parse(payRes);
            wx.requestPayment({
              "appId": payVal.appId,
              "timeStamp": payVal.timeStamp,
              "nonceStr": payVal.nonceStr,
              "package": payVal.package,
              "signType": payVal.signType,
              "paySign": payVal.paySign,
              "success": function (res) {
                if (res.errMsg == 'requestPayment:ok') {
                  that.setData({
                    isPaySuccess: true
                  })
                }
              },
              "fail": function (res) {
                console.log(res, "失败")
              },
              "complete": function (res) {
                if (res.errMsg == 'requestPayment:ok') {
                  that.setData({
                    isPayComplete: true
                  })
                }
                if (that.data.isPaySuccess && that.data.isPayComplete) {
                  that.navToBack()
                }
              }
            })
          });
      }
            },
            "fail": function (res) {
              console.log(res, "失败")
            },
            "complete": function (res) {
              if (res.errMsg == 'requestPayment:ok') {
                that.setData({
                  isPayComplete: true
                })
              }
              if (that.data.isPaySuccess && that.data.isPayComplete) {
                that.navToBack()
              }
            }
          })
        });
    });

  },