From 892efc9976feb68ce1a3a4d759317e2585d67ebe Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期六, 07 九月 2024 18:16:18 +0800
Subject: [PATCH] bug修改
---
packagePersonal/pages/myOrder/index.js | 148 +++++++++++++++++++-----------------------------
1 files changed, 59 insertions(+), 89 deletions(-)
diff --git a/packagePersonal/pages/myOrder/index.js b/packagePersonal/pages/myOrder/index.js
index 0559897..075570e 100644
--- a/packagePersonal/pages/myOrder/index.js
+++ b/packagePersonal/pages/myOrder/index.js
@@ -40,14 +40,15 @@
isBackTop: false,
setScrollValue: 0,
skeletonLoding: true,
- queryFilter: []
+ queryFilter: [],
+ isPaySuccess: false,
+ isPayComplete: false,
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
- console.log(options);
this.getDataList(false)
},
@@ -78,7 +79,6 @@
getDataList(isReachBottom) {
var searchArr = [];
- console.log(this.data.searchText, "earch")
if (this.data.searchText != undefined && this.data.searchText != "") {
searchArr.push({
compareType: "Contains",
@@ -154,8 +154,11 @@
loading: false
})
} else {
+ wx.showToast({
+ icon: 'error',
+ title: '鏆傛棤鏁版嵁',
+ })
this.setData({
- list: [],
skeletonLoding: false,
loading: false
})
@@ -166,12 +169,31 @@
})
},
onSearchOrder(e) {
+ console.log(e.detail.value);
this.setData({
searchText: e.detail.value,
})
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}`,
+ });
+ },
/**
* 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
@@ -261,93 +283,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()
+ }
+ }
+ })
+ });
});
},
--
Gitblit v1.9.1