From 4ff2c143af8d59bb2c2a0c91f2bbd72f77ee3617 Mon Sep 17 00:00:00 2001
From: wangzimeng <3297159934@qq.com>
Date: Tue, 15 Jul 2025 18:30:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E5=8F=82=E4=B8=8E=E7=9A=84=E5=8E=BB?=
=?UTF-8?q?=E6=94=AF=E4=BB=98=E6=8C=89=E9=92=AE=E5=92=8C=E8=AF=A6=E6=83=85?=
=?UTF-8?q?=E6=98=AF=E8=B7=B3=E8=BD=AC=E4=B8=80=E4=B8=AA=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E6=8A=AC=E5=A4=B4=E7=9A=84=E8=BE=93?=
=?UTF-8?q?=E5=85=A5=E6=A1=86=20=E6=96=B0=E5=A2=9E=E5=8F=91=E7=A5=A8?=
=?UTF-8?q?=E7=9A=84=E9=A2=84=E8=AE=BE=E6=8A=AC=E5=A4=B4=E7=9A=84=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packageA/my/exercise.vue | 5 +-
packageA/my/orderList.vue | 5 +-
packageA/my/pendinPayStatus.vue | 196 ++++++++++++++++++++++++++------
packageB/invoice/addHead.vue | 2 +-
packageB/invoice/addInvoice.vue | 7 +-
5 files changed, 176 insertions(+), 39 deletions(-)
diff --git a/packageA/my/exercise.vue b/packageA/my/exercise.vue
index a39b126..1f0db3c 100644
--- a/packageA/my/exercise.vue
+++ b/packageA/my/exercise.vue
@@ -279,8 +279,11 @@
},
// 去支付
toPay(id, order_no) {
+ // uni.navigateTo({
+ // url: "/packageA/my/pendinPay?id=" + id + "&order_no=" + order_no
+ // })
uni.navigateTo({
- url: "/packageA/my/pendinPay?id=" + id + "&order_no=" + order_no
+ url: "/packageA/my/pendinPayStatus?id=" + id + "&status=" + status
})
},
// 售后
diff --git a/packageA/my/orderList.vue b/packageA/my/orderList.vue
index 6b13541..5486a11 100644
--- a/packageA/my/orderList.vue
+++ b/packageA/my/orderList.vue
@@ -179,8 +179,7 @@
-
-
+
@@ -188,6 +187,8 @@
{{ item.verification_num }}
/{{ item.stock }}
+
+
diff --git a/packageA/my/pendinPayStatus.vue b/packageA/my/pendinPayStatus.vue
index c7fa1a4..cbd89d8 100644
--- a/packageA/my/pendinPayStatus.vue
+++ b/packageA/my/pendinPayStatus.vue
@@ -44,7 +44,8 @@
- {{detail.address}}{{detail.address_detail}}
+ {{detail.address}}{{detail.address_detail}}
+
@@ -76,22 +77,24 @@
付款方式
{{detailAny.pay_type == 'wechat' ? '微信支付' : '余额'}}
-
+
付款时间
{{ formattime(detailAny.paytime)}}
-
-
+
+
退款原因
- {{ detailAny.auth_reason }}
+ {{ detailAny.auth_reason }}
-
+
是否同意退款
@@ -125,14 +128,17 @@
-
-
+
+ 去支付
+
+
+
+
-
@@ -263,11 +270,86 @@
url: `/packageA/center/detail?id=${this.detail.activity_id}`
})
},
- // 去支付
- toPay(id, order_no) {
- uni.navigateTo({
- url: "/packageA/my/pendinPay?id=" + id + "&order_no=" + order_no
- })
+ // 支付
+ pament() {
+ let that = this
+ that.uloadingShow = false
+ uni.$u.http.post('/api/school.newactivity.pay/payment', {
+ type: 'wechat',
+ order_no: this.detailAny.order_no,
+ platform: 'miniapp'
+ }).then(res => {
+ if (res.code == 1) {
+ wx.requestPayment({
+ timeStamp: res.data.paydata.timeStamp, //时间戳
+ nonceStr: res.data.paydata.nonceStr, //随机字符串
+ package: res.data.paydata.package, //prepay_id
+ signType: res.data.paydata.signType, //签名算法MD5
+ paySign: res.data.paydata.paySign, //签名
+ success(res) {
+ if (res.errMsg == "requestPayment:ok") {
+ that.order_no = ''
+ // uni.redirectTo({
+ // url: "/packageA/my/exercise?status=" +'2,3'
+ // })
+ uni.navigateBack();
+ console.log('支付成功', res)
+ } else {
+ that.uloadingShow = false
+ console.log('支付失败')
+ }
+ },
+ fail(res) {
+ that.uloadingShow = false
+ console.log('支付失败', res)
+ }
+ })
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ })
+ // _this.$api.toast(res.msg);
+ }
+ }).catch(error => {
+
+ });
+ },
+ //取消订单
+ nobuy() {
+ let that = this;
+ let o = this.detailAny.order_no
+ uni.$u.http.post('/api/school.newactivity.order/freecancel', {
+ order_no: o,
+ }).then(res => {
+ if (res.code == 1) {
+ uni.showToast({
+ title: '取消成功',
+ icon: 'success',
+ duration: 2000,
+ complete: function() {
+ setTimeout(function() {
+ uni.navigateBack()
+ // uni.redirectTo({
+ // url: "/packageA/my/exercise"
+ // })
+ }, 2000);
+ }
+ });
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ })
+ that.uloadingShow = false
+
+ // _this.$api.toast(res.msg);
+ }
+ }).catch(error => {
+
+ });
},
//申请售后
service(id) {
@@ -351,21 +433,37 @@
}
}).catch(error => {});
},
-
-
-
-
-
// 导航
toMap(latitude, longitude, name) {
- uni.openLocation({
- latitude: parseFloat(latitude),
- longitude: parseFloat(longitude),
- name: name,
- success: function() {
- console.log('success');
+ // 修改页面标题为"导航"
+ uni.setNavigationBarTitle({
+ title: '导航',
+ success: () => {
+ console.log('导航栏标题修改成功');
+ setTimeout(() => {
+ uni.openLocation({
+ latitude: parseFloat(latitude),
+ longitude: parseFloat(longitude),
+ name: name,
+ success: function() {
+ console.log('success');
+ }
+ });
+ }, 300);
+ },
+ fail: (err) => {
+ console.log('导航栏标题修改失败', err);
}
});
+
+ // uni.openLocation({
+ // latitude: parseFloat(latitude),
+ // longitude: parseFloat(longitude),
+ // name: name,
+ // success: function() {
+ // console.log('success');
+ // }
+ // });
},
// 返回首页
@@ -587,15 +685,30 @@
font-size: 36rpx;
color: #BBFC5B;
}
+
+ .spans {
+ font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
+ font-weight: 400;
+ font-size: 36rpx;
+ color: #BBFC5B;
+ line-height: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
+
+ .u-count-down__text {
+ color: #BBFC5B !important;
+ }
}
-
+
.footer-right2 {
width: 690rpx;
height: 90rpx;
background: #f5f5f5;
border-radius: 148rpx;
border: 2rpx solid #323232;
-
+
span {
font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
font-weight: 400;
@@ -616,6 +729,13 @@
font-size: 36rpx;
color: #9C9C9C;
}
+
+ .spans {
+ font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
+ font-weight: 400;
+ font-size: 36rpx;
+ color: #9C9C9C;
+ }
}
}
@@ -977,6 +1097,18 @@
}