优惠卷 订单

my/order/payding.vue

@@ -162,7 +162,7 @@
 						<view class="flex align-center margin-top-lg" style="justify-content: flex-end;border-bottom:1px solid #ccc;padding-bottom:5px ;margin: 5px 0px;">
 							<view style="color: #333;font-size: 26rpx;">小计：</view>
 							<view class="" style="color: #333;">￥<text
-									style="font-size: 35rpx;font-weight: bold;">{{order.massagePrice*(order.vipRate/100)*(1+order.technicianRate/100)}}</text></view>
+									style="font-size: 35rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
 						</view>
 						
 						<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">出行费用</view>
@@ -228,7 +228,7 @@
 						<view class="flex align-center margin-top-lg justify-between">
 							<view style="color: #333;font-size: 26rpx;">订单费用：</view>
 							<view class="" style="color: #333;">￥<text
-									style="font-size: 26rpx;font-weight: bold;">{{order.massagePrice*(order.vipRate/100)*(1+order.technicianRate/100)}}</text></view>
+									style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
 						</view>
 						<view class="flex align-center margin-top-lg justify-between" v-if="order.taxiMoney">
 							<view style="color: #333;font-size: 26rpx;">出行费用：</view>

my/wallet/index.vue

@@ -27,42 +27,21 @@
 					<span class="yu-e">余额充值</span>
 					<span v-if="artificerIdMy==true" @click="goNavtherapist('/pages/therapist/therapistDingdan')">为TA充值</span>
 				</view>
-				<view class="coupon-level">
+				<view class="coupon-level" v-for="(item,index) in wallet" :key='index'@click="active(item)" :class="{active:item.isSelect}">
 					<view class="r-amount">
-						<span>充¥500</span>
+						<span>充¥{{item.price}}</span>
-						<span>赠¥598</span>
+						<span>赠¥{{item.sumMoney}}</span>
 					</view>
 					<view class="bo-amount">
 						<view class="amount-balance">
 							<view>
 								<span>赠送</span>
-								<span>548</span>
+								<span>{{item.money}}</span>
 								<span>余额</span>
 							</view>
-							<view>1张</view>
 						</view>
 						<view class="amount-block">
-							<view class="amount-block-lin"><span>40元</span>2张</span></view>
+							<view class="amount-block-lin" v-for="(itemList,indexList) in item.detailList" :key='indexList'><span>{{itemList.coupon.money}}元</span>{{itemList.giveNum}}张</span></view>
-							<view class="amount-block-lin"><span>30元</span>2张</span></view>
-							<view class="amount-block-lin"><span>20元</span>2张</span></view>
-						</view>
-						<view class="amount-block">
-							<view class="amount-block-lin"><span>10元</span>2张</span></view>
-							<view class="amount-block-lin"><span>5元</span>2张</span></view>	
-						</view>
-					</view>
-				</view>
-				<view class="flex justify-between flex-wrap" v-if="wallet.length > 0">
-					<view v-for="(item,index) in wallet" :key='index' class="padding-sm radius"
-						style="color: #555;background-color: #f7f7f7;width: 48%; margin-top: 20rpx;"
-						@click="active(item)" :class="{active:item.isSelect}">
-						<view class="coupon" style="display: flex;justify-content:space-between;align-items: center;">
-							<span>充¥{{item.price}}</span>
-							<span>赠¥{{item.sumMoney}}</span>
-						</view>
-						<view class="coupon-bottom" style="color: #029D88 !important;">
-							赠送 <span style="color: #ff6f36;">{{item.remarks}}</span>
-							<!-- 赠送 <span style="color: #ff6f36;">{{item.giveNum}}张{{item.coupon.money}}</span>元优惠券 -->
 						</view>
 					</view>
 				</view>
@@ -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%;