订单

my/order/pay.vue

@@ -171,7 +171,7 @@
 							<view style="color: #999;font-size: 26rpx;">全程距离</view>
 							<view class="" style="color: #333;font-size: 26rpx;">{{order.km}}km</view>
 						</view>
-						<view class="flex justify-between" v-if="order.taxiMoney" style="margin-top: 19rpx;border-bottom:1px solid #ccc;padding-bottom:5px ;margin-bottom: 5px;">
+						<view class="flex justify-between" style="margin-top: 19rpx;border-bottom:1px solid #ccc;padding-bottom:5px ;margin-bottom: 5px;">
 							<view style="color: #999;font-size: 26rpx;">出行费用</view>
 							<view class="" style="color: #333;font-size: 26rpx;">￥{{order.taxiMoney}}</view>
 						</view>
@@ -192,7 +192,7 @@
 							<view class="" style="color: #333;">￥<text
 									style="font-size: 26rpx;font-weight: bold;">{{order.massagePrice*(order.vipRate/100)*(1+order.technicianRate/100)}}</text></view>
 						</view>
-						<view class="flex align-center margin-top-lg justify-between" v-if="order.taxiMoney">
+						<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.taxiMoney}}</text></view>
@@ -378,9 +378,13 @@
 								:key="index">{{items}}</text>
 						</view>
 						<view class="btnview">
-							<view class="item_money"> <text style="font-size: 24upx;">￥</text> <text
+							<view class="item_money"> 
-									v-if="isVip">{{item.memberPrice}}</text><text v-if="!isVip">{{item.price}}</text>
+								<text style="font-size: 24upx;">￥</text> 
-								/<text style="font-weight: 500;font-size: 24upx;	">{{item.duration}}分钟</text></view>
+								<text>{{item.price}}</text>
+								/<text style="font-weight: 500;font-size: 24upx;">
+								{{item.duration}}分钟
+								</text>
+							</view>
 							<view class="item_btn" @click="goOrderJ(item,'加钟')">确认加钟</view>
 						</view>
 					</view>
@@ -1162,8 +1166,9 @@
 											title: '支付成功',
 											icon: 'none'
 										})
+										
 										if(that.jiazhong=='加钟'){
-											uni.navigateTo({	
+											uni.navigateTo({
 												url:'/my/order/payJaZ?ordersId='+that.order.ordersId
 											})
 										}else if(that.shengji=='升级'){

my/order/payJaZ.vue

@@ -253,11 +253,10 @@
 								-￥<text style="font-size: 26rpx;font-weight: bold;">{{order.couponMoney}}</text></view>
 							<view class="" v-else>-</view>
 						</view>
-						<view class="flex align-center margin-top-lg justify-between">
+						<view class="flex align-center margin-top-lg justify-between" v-if="order.addMoney!=null">
 							<view style="color: #333;font-size: 26rpx;">加钟费用：</view>
-							<view class="" style="color: #333;" v-if="order.addMoney">￥
+							<view class="" style="color: #333;">￥
-							<text style="font-size: 26rpx;font-weight: bold;">{{order.addMoney}}</text></view>
+							<text style="font-size: 26rpx;font-weight: bold;">{{order.addMoney?order.addMoney:0}}</text></view>
-							<view class="" v-else>-</view>
 						</view>
 						<view class="flex align-center margin-top-lg justify-between" v-if="order.oldOrdersId!=null">
 							<view style="color: #333;font-size: 26rpx;">升级费用：</view>
@@ -412,13 +411,13 @@
 							充值
 						</u-button>
 						<u-button
-							v-if="order.oldOrdersId && order.status == 6"
+							v-if="order.addNum==null && order.status == 6"
 							shape="circle" :plain="true"
 							@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)"
 							class="btns">
 							加钟
 						</u-button>
-						<u-button  v-if="order.addNum==null && order.status == 6"
+						<u-button  v-if="order.oldOrdersId==null && order.status == 6"
 							shape="circle" :plain="true"
 							@tap="saveJZS(order.artificerId)"
 							class="btns">

my/order/payShengji.vue

@@ -424,9 +424,13 @@
 								:key="index">{{items}}</text>
 						</view>
 						<view class="btnview">
-							<view class="item_money"> <text style="font-size: 24upx;">￥</text> <text
+							<view class="item_money"> 
-									v-if="isVip">{{item.memberPrice}}</text><text v-if="!isVip">{{item.price}}</text>
+								<text style="font-size: 24upx;">￥</text> 
-								/<text style="font-weight: 500;font-size: 24upx;	">{{item.duration}}分钟</text></view>
+								<text>{{item.price}}</text>
+								/<text style="font-weight: 500;font-size: 24upx;">
+									{{item.duration}}分钟
+								</text>
+							</view>
 							<view class="item_btn" @click="goOrderJ(item)">确认加钟</view>
 						</view>
 					</view>
@@ -606,7 +610,8 @@
 				earlyFinishReason:'',
 				qurenJd:[],
 				artificerlist:[],
-				tordersId:''
+				tordersId:'',
+				oldOrdersId:''
 			}
 		},
 		onLoad(e) {
@@ -726,7 +731,7 @@
 			},
 			goOrderJ(item) {//加钟 生成订单
 				let that = this
-				let payMoney = that.isVip ? item.memberPrice : item.price;
+				let payMoney = item.price*(that.order.vipRate/100)*(1+that.order.technicianRate/100);
 				let data = {
 					parentId: that.order.ordersId,
 					artificerId: that.order.artificerId,

pages/order/index.vue

@@ -323,6 +323,10 @@
 					uni.navigateTo({
 						url:'/my/order/payJaZ?ordersId='+item.ordersId
 					})
+				}else if(item.addNum&&item.oldOrdersId){
+					uni.navigateTo({
+						url:'/my/order/payJaZ?ordersId='+item.ordersId
+					})
 				}else if(text=='修改'){
 					uni.navigateTo({
 						url:'/my/order/payModifyDzhifu?ordersId='+item.ordersId