Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user

my/order/pay.vue

@@ -298,7 +298,7 @@
 						class="btns">
 						提前结束
 					</u-button>
-					<u-button  v-if="order.oldOrdersId==null && order.status == 6&&order.addNum==null"
+					<u-button  v-if="order.isSupplement!=2"
 						shape="circle" :plain="true"
 						@tap="saveJZS(order.artificerId)"
 						class="btns">

my/order/payJaZ.vue

@@ -167,7 +167,7 @@
 						    </view>
 							<view class="" style="color: #333;">
 								<text style="font-size: 35rpx;font-weight: bold;">
-									￥{{(order.massagePrice*order.ordersMassageList[0].num)*(order.vipRate/100)*(1+order.technicianRate/100)}}
+									￥{{order.massageCouponMoney}}
 								</text>
 							</view>
 						</view>
@@ -203,7 +203,7 @@
 							<view class="" v-else>-</view>
 						</view>
 						<view class="jusitify-line-end"></view>
-						<view v-if="order.addNum!=null">
+						<view>
 							<view class="justify-title-nav">
 								<view class="justify-title">加钟信息</view>
 								<view class="justify-title-nav-bor"></view>
@@ -234,30 +234,6 @@
 										style="font-size: 35rpx;font-weight: bold;">{{order.addMoney}}</text></view>
 							</view>
 						</view>
-						<view class="jusitify-line-end"></view>
-						<view v-if="order.oldOrdersId!=null">
-							<view class="justify-title-nav">
-								<view class="justify-title">升级服务</view>
-								<view class="justify-title-nav-bor"></view>
-							</view>
-							<view class="jusitify-line">
-								<view class="line-word">升级项目</view>
-								<view class="line-word-r">{{order.ordersMassageList[0].massageType.title}}</view>
-							</view>
-							<view class="jusitify-line">
-								<view class="line-word">升级价格</view>
-								<view class="line-word-r">￥{{order.sumMoney}}</view>
-							</view>
-							<view class="jusitify-line">
-								<view class="line-word">会员折扣</view>
-								<view class="line-word-r">{{order.vipRate}}%</view>
-							</view>
-							<view class="jusitify-line">
-								<view style="color: #333;font-size: 26rpx;">小计：</view>
-								<view class="" style="color: #333;">￥<text
-										style="font-size: 35rpx;font-weight: bold;">{{order.sumMoney}}</text></view>
-							</view>
-						</view>
 						
 						<view class="jusitify-line-end"></view>
 					
@@ -268,7 +244,7 @@
 						<view class="jusitify-line">
 							<view class="line-word">订单费用：</view>
 							<view class="" style="color: #333;">￥<text
-									style="font-size: 26rpx;font-weight: bold;">{{(order.massagePrice*order.ordersMassageList[0].num)*(order.vipRate/100)*(1+order.technicianRate/100)}}</text></view>
+									style="font-size: 26rpx;font-weight: bold;">{{order.massageCouponMoney}}</text></view>
 						</view>
 						<view class="jusitify-line">
 							<view class="line-word">出行费用：</view>
@@ -281,28 +257,17 @@
 								-￥<text style="font-size: 26rpx;font-weight: bold;">{{order.couponMoney}}</text></view>
 							<view class="" v-else>-</view>
 						</view>
-						<view class="jusitify-line"" v-if="order.addMoney!=null">
+						<view class="jusitify-line">
 							<view class="line-word">加钟费用：</view>
-							<view class="line-word-r"">￥
-							<text style="font-size: 26rpx;font-weight: bold;">{{order.addMoney?order.addMoney:0}}</text></view>
-						</view>
-						<view class="jusitify-line" v-if="order.oldOrdersId!=null">
-							<view class="line-word">升级费用：</view>
 							<view class="line-word-r">￥
-								<text style="font-size: 26rpx;font-weight: bold;">
+							<text style="font-size: 26rpx;font-weight: bold;">{{order.addMoney}}</text></view>
-									{{order.sumMoney?order.sumMoney:'0'}}
-								</text>
-							</view>
 						</view>
+						
 						<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
 							<view style="color: #333;font-size: 26rpx;">合计：</view>
 							<view class="line-word-r">￥<text
 									style="font-size: 35rpx;font-weight: bold;">
-									{{
+									{{order.payMoneyTotal}}
-										((order.massagePrice*order.ordersMassageList[0].num)*(order.vipRate/100)*(1+order.technicianRate/100))
-										+order.taxiMoney-order.couponMoney+order.addMoney
-										
-										}}
 								</text></view>
 						</view>
 						
@@ -311,70 +276,7 @@
 						</view>
 					</view>
 				</view>
-				<!-- <view class="pay-ding feiuong">
-					<view class="fei-title">费用明细</view>
-					<view class="fei-view">
-						<view class="fei-view-list">
-							<span>服务费用</span>
-							<span>￥268</span>
 			</view>
-						<view class="fei-view-list">
-							<span>出行费用</span>
-							<span>￥{{order.taxiMoney}}</span>
-						</view>
-						<view class="fei-view-list">
-							<span>优惠券</span>
-							<span style="color: #FF3939;">-￥2</span>
-						</view>
-						<view class="fei-view-list-z">
-							<span>总金额</span>
-							<span style="color: #FF3939;font-size: 29rpx;">￥286</span>
-						</view>
-					</view>
-				</view> -->
-			</view>
-
-
-			<!-- <view class="bg padding radius margin-top-sm">
-				<view class="text-lg text-bold">
-					服务信息
-				</view>
-				<view class="margin-right-xs">
-					<view class="flex justify-between margin-top-lg">
-						<view style="width: 170rpx;">服务时间</view>
-						<view class="">
-							<text>{{order.serveTime}}</text>
-						</view>
-					</view>
-					<view class="flex justify-between margin-top-lg">
-						<view style="width: 170rpx;">服务地点</view>
-						<view class="flex" @tap="bindGps(order.latitude,order.longitude,order.address)">
-							<view class="">
-								{{order.address}}
-								<image src="../../static/images/address.png" style="width: 13px;height: 15px;"></image>
-							</view>
-						</view>
-					</view>
-
-					<view class="flex justify-between margin-top-lg">
-						<view style="width: 170rpx;">联系方式</view>
-						<view class="" @click="bindphone(order.phone)">
-							{{order.phone}}
-							<image src="../../static/images/phone.png" style="width: 15px;height: 15px;"></image>
-						</view>
-					</view>
-					<view class="flex justify-between margin-top-lg" v-if="order.remark">
-						<view style="width: 170rpx;">备注内容</view>
-						<view class="flex">
-							<view class="">
-								{{order.remark}}
-							</view>
-						</view>
-					</view>
-				</view>
-			</view> -->
-
-			
 			<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
 				<view class="showBtn-mian">
 					<view class="showBtn">
@@ -398,7 +300,7 @@
 							充值
 						</u-button>
 					</view>
-					<view v-if="btnShow==true" class="flex padding-top-sm padding-bottom-sm align-center">
+					<view v-if="btnShow==true" class="showBtnClass">
 						<u-button :custom-style="customStyle2"
 							shape="circle" :plain="true"
 							@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
@@ -591,7 +493,7 @@
 					width: '310upx',
 
 					// #endif	
-					margin: '0 10upx',
+					// margin: '0 10upx',
 				},
 				id: '',
 				order: {
@@ -735,7 +637,6 @@
 			},
 			goOrderJ(item) {//加钟 生成订单
 				let that = this
-				let payMoney = that.isVip ? item.memberPrice : item.price;
 				let data = {
 					parentId: that.order.ordersId,
 					artificerId: that.order.artificerId,
@@ -743,9 +644,7 @@
 						massageId: item.massageTypeId,
 						num: 1,
 					}],
-					price: payMoney,
 					couponId: '',
-					payMoney: payMoney,
 					userId: uni.getStorageSync('userId'),
 					addMassageTypeId:item.massageTypeId,
 					addEntryName:item.title
@@ -754,7 +653,7 @@
 					that.showorder = false
 					if (res.code == 0) {
 						that.tordersId = res.data.ordersId;
-						that.tpayMoney = payMoney;
+						that.tpayMoney = res.data.payMoney;
 						that.showpay = true;
 						that.paySel = 1;
 					} else {
@@ -1632,6 +1531,16 @@
 </script>
 
 <style lang="scss" scoped>
+	.showBtnClass{
+		position: absolute;
+		background: #f7f7f7;
+		display: flex;
+		flex-direction: column;
+		width: 100px;
+		left: 0;
+		margin-bottom: 50px;
+		margin-left: 20px;
+	}
 	.dingshi,.btns{
 		width: 0px !important;
 		padding: 0px 42px !important;

my/order/payShengji.vue

@@ -168,7 +168,7 @@
 						    </view>
 							<view class="" style="color: #333;">
 								<text style="font-size: 35rpx;font-weight: bold;">
-									￥{{((order.oldMassagePrice*order.oldMassageNum)*(order.vipRate/100)*(1+order.technicianRate/100)).toFixed(2)}}
+									￥{{order.massageCouponMoney}}
 								</text>
 							</view>
 						</view>
@@ -273,7 +273,7 @@
 						<view class="flex justify-between jusitify-line">
 							<view class="line-word">订单费用：</view>
 							<view class="line-word-r">￥<text
-									style="font-size: 26rpx;font-weight: bold;">{{((order.oldMassagePrice*order.oldMassageNum)*(order.vipRate/100)*(1+order.technicianRate/100)).toFixed(2)}}</text></view>
+									style="font-size: 26rpx;font-weight: bold;">{{order.massageCouponMoney}}</text></view>
 						</view>
 						<view class="flex justify-between jusitify-line">
 							<view class="line-word">出行费用：</view>
@@ -299,12 +299,7 @@
 							<view class="line-word">合计：</view>
 							<view class="" style="color: #333;">
 								￥<text style="font-size: 35rpx;font-weight: bold;">
-									{{
+									{{order.payMoneyTotal}}
-										(((order.oldMassagePrice*order.oldMassageNum)*(order.vipRate/100)*(1+order.technicianRate/100))
-										+order.taxiMoney-order.couponMoney+order.addMoney+order.payMoney).toFixed(2)
-										
-									}}
-									
 								</text>
 							</view>
 						</view>
@@ -735,7 +730,6 @@
 			},
 			goOrderJ(item) {//加钟 生成订单
 				let that = this
-				let payMoney = item.price*(that.order.vipRate/100)*(1+that.order.technicianRate/100);
 				let data = {
 					parentId: that.order.ordersId,
 					artificerId: that.order.artificerId,
@@ -743,9 +737,7 @@
 						massageId: item.massageTypeId,
 						num: 1,
 					}],
-					price: payMoney,
 					couponId: '',
-					payMoney: payMoney,
 					userId: uni.getStorageSync('userId'),
 					addMassageTypeId:item.massageTypeId,
 					addEntryName:item.title
@@ -754,7 +746,7 @@
 					that.showorder = false
 					if (res.code == 0) {
 						that.tordersId = res.data.ordersId;
-						that.tpayMoney = payMoney;
+						that.tpayMoney = res.data.payMoney;
 						that.showpay = true;
 						that.paySel = 1;
 					} else {

pages/my/fuwuliaochengDetail.vue

@@ -1174,7 +1174,7 @@
 		flex-direction: row;
 		align-items: center;
 		justify-content: center;
-		padding: 2px 12px;
+		padding: 2px 5px;
 		height: 22px;
 		line-height: 22px;
 		background-color: rgba(230, 246, 243, 1);

pages/order/index.vue

@@ -463,11 +463,14 @@
 			
 			goNav(url,item,text) {
 				this.$queue.setData('xiangmu',item);
-				if(item.isSupplement=='2'||(item.addNum&&item.isSupplement=='2')){//如果有订单有升级 那就去升级订单详情
+				if(item.isSupplement=='2'&&item.status==6){//如果有订单有升级 那就去升级订单详情
+					if(item.addNum||item.isSupplement=='2'){
 						uni.navigateTo({
 							url:'/my/order/payShengji?ordersId='+item.ordersId
 						})
-				}else if(item.addNum){
+					}
+					
+				}else if(item.addNum&&item.status=='6'){
 					uni.navigateTo({
 						url:'/my/order/payJaZ?ordersId='+item.ordersId
 					})