From d5b03511a554d0087a5143274e21113fc6d4eb02 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Mon, 1 Jul 2024 13:55:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8D=B7=20=E8=AE=A2?=
=?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
my/order/payding.vue | 4 +--
my/wallet/index.vue | 70 ++++++++++++++++++++++++++------------------
2 files changed, 43 insertions(+), 31 deletions(-)
diff --git a/my/order/payding.vue b/my/order/payding.vue
index 092e768..c1f32d3 100644
--- a/my/order/payding.vue
+++ b/my/order/payding.vue
@@ -162,7 +162,7 @@
小计：
￥{{order.massagePrice*(order.vipRate/100)*(1+order.technicianRate/100)}}
+ style="font-size: 35rpx;font-weight: bold;">{{order.massageMoney}}
出行费用
@@ -228,7 +228,7 @@
订单费用：
￥{{order.massagePrice*(order.vipRate/100)*(1+order.technicianRate/100)}}
+ style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}
出行费用：
diff --git a/my/wallet/index.vue b/my/wallet/index.vue
index 28869b2..e3a6a4b 100644
--- a/my/wallet/index.vue
+++ b/my/wallet/index.vue
@@ -27,42 +27,21 @@
余额充值
为TA充值
-
+
- 充¥500
- 赠¥598
+ 充¥{{item.price}}
+ 赠¥{{item.sumMoney}}
赠送
- 548
+ {{item.money}}
余额
- 1张
- 40元2张
- 30元2张
- 20元2张
-
-
- 10元2张
- 5元2张
-
-
-
-
-
-
- 充¥{{item.price}}
- 赠¥{{item.sumMoney}}
-
-
- 赠送 {{item.remarks}}
-
+ {{itemList.coupon.money}}元{{itemList.giveNum}}张
@@ -594,6 +573,7 @@
})
},
active(e) {
+ console.log("sadsadsadsadsad",e)
this.wallet.forEach(res => {
if (res.payClassifyId == e.payClassifyId) {
res.isSelect = true
@@ -624,7 +604,12 @@
payClassifyId: this.thisSelect.payClassifyId,
type: 1,
userId: uni.getStorageSync('userId'),
- ordersId:this.ordersId
+ }
+ if(this.artificerId){
+ data.artificerId=this.artificerId
+ }
+ if(this.ordersId){
+ data.ordersId=this.ordersId
}
this.$Request.post("/app/wxPay/payMoney", data).then(ret => {
console.log(ret)
@@ -639,6 +624,12 @@
type: 3,
userId: uni.getStorageSync('userId')
}
+ if(this.artificerId){
+ data.artificerId=this.artificerId
+ }
+ if(this.ordersId){
+ data.ordersId=this.ordersId
+ }
this.$Request.post('/app/wxPay/payMoney', data).then(ret => {
uni.hideLoading()
uni.requestPayment({
@@ -678,6 +669,12 @@
type: 2,
userId: uni.getStorageSync('userId')
}
+ if(this.artificerId){
+ data.artificerId=this.artificerId
+ }
+ if(this.ordersId){
+ data.ordersId=this.ordersId
+ }
this.$Request.post('/app/wxPay/payMoney', data).then(res => {
if (res.code == 0) {
this.callPay(res.data);
@@ -695,6 +692,12 @@
type: 4,
userId: uni.getStorageSync('userId')
}
+ if(this.artificerId){
+ data.artificerId=this.artificerId
+ }
+ if(this.ordersId){
+ data.ordersId=this.ordersId
+ }
this.$Request.post('/app/wxPay/payMoney', data).then(res => {
if (res.code == 0) {
const urlArr = window.location.href;
@@ -719,11 +722,12 @@
payClassifyId: this.thisSelect.payClassifyId,
type: 2,
userId: uni.getStorageSync('userId'),
- ordersId:this.ordersId
}
if(this.artificerId){
data.artificerId=this.artificerId
-
+ }
+ if(this.ordersId){
+ data.ordersId=this.ordersId
}
this.$Request.post('/app/aliPay/payOrderMoney', data).then(
@@ -756,6 +760,12 @@
type: 1,
userId: uni.getStorageSync('userId')
}
+ if(this.artificerId){
+ data.artificerId=this.artificerId
+ }
+ if(this.ordersId){
+ data.ordersId=this.ordersId
+ }
this.$Request.post("/app/aliPay/payOrderMoney", data).then(ret => {
console.log(ret)
this.getMoney()
@@ -1348,6 +1358,8 @@
.amount-block{
display:flex;
justify-content: space-between;
+ flex-direction: row;
+ flex-wrap: wrap;
}
.amount-block-lin{
width: 32%;