套餐 次卡 疗程

my/address/address.vue

@@ -61,7 +61,8 @@
 				limit: 5,
 				address: '',
 				isfa: '',
-				noneData:'地址'
+				noneData:'地址',
+				orderXm:[]
 			}
 		},
 		onShow() {
@@ -91,6 +92,18 @@
 					uni.reLaunch({
 						url:'/my/order/payModify'
 					})
+				}else if (this.isfa == '104') {
+					uni.reLaunch({
+						url:'/my/order/payModifyTc'
+					})
+				}else if (this.isfa == '105') {
+					uni.reLaunch({
+						url:'/my/order/payModifyCi'
+					})
+				}else if (this.isfa == '106') {
+					uni.reLaunch({
+						url:'/my/order/payModifyLiao'
+					})
 				} else if (this.isfa == 3) {
 					this.updateaddress()
 				}else if (this.isfa == 4) {

my/hongbao/youhuijuanList.vue

@@ -99,7 +99,7 @@
 					})
 				}else if(this.content=='疗程'){
 					uni.navigateTo({//返回项目订单
-						url:'/my/order/payModifyLiaoCi'
+						url:'/my/order/payModifyLiao'
 					})
 				}else if(this.content=='次卡'){
 					uni.navigateTo({//返回项目订单

my/order/payModifyCi.vue

@@ -38,7 +38,7 @@
 			
 			<view class="detail-foot">
 				<view class="detail-foot-nav">
-					<span class="detail-foot-nav-text">套餐详情</span>
+					<span class="detail-foot-nav-text">次卡详情</span>
 					<span class="detail-foot-nav-bor"></span>
 				</view>
 				<view class="detail-foot-mian">
@@ -68,7 +68,7 @@
 						</view>
 						
 						<view class="detail-foot-title">
-							服务项目{{index+1}}
+							项目次卡
 						</view>
 					</view>
 				</view>
@@ -367,7 +367,7 @@
 			},
 			youhuijuan(){
 				uni.navigateTo({
-					url:'/my/hongbao/youhuijuanList?price='+this.orderXm.price+'&text='+'套餐'
+					url:'/my/hongbao/youhuijuanList?price='+this.orderXm.price+'&text='+'次卡'
 				})
 			},
 			openpay() {//验证
@@ -1249,6 +1249,13 @@
 </script>
 
 <style lang="scss" scoped>
+	.header-bottom-money-jia{
+		font-size: 28rpx;
+		color: #848484;
+		line-height: 37rpx;
+		margin-left: 5px;
+		text-decoration: line-through;
+	}
 	.header-bottom-money{
 		width: 100%;
 		display: flex;

my/order/payModifyLiao.vue

@@ -38,7 +38,7 @@
 			
 			<view class="detail-foot">
 				<view class="detail-foot-nav">
-					<span class="detail-foot-nav-text">套餐详情</span>
+					<span class="detail-foot-nav-text">疗程详情</span>
 					<span class="detail-foot-nav-bor"></span>
 				</view>
 				<view class="detail-foot-mian">
@@ -68,7 +68,7 @@
 						</view>
 						
 						<view class="detail-foot-title">
-							服务项目{{index+1}}
+							服务疗程
 						</view>
 					</view>
 				</view>
@@ -367,7 +367,7 @@
 			},
 			youhuijuan(){
 				uni.navigateTo({
-					url:'/my/hongbao/youhuijuanList?price='+this.orderXm.price+'&text='+'套餐'
+					url:'/my/hongbao/youhuijuanList?price='+this.orderXm.price+'&text='+'疗程'
 				})
 			},
 			openpay() {//验证

my/order/payModifyTc.vue

@@ -3,7 +3,7 @@
 		<view class="padding-bottom u-skeleton">
 			<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
 				<view class="head-top">
-					<view class="pay-title" style="">服务项目</view>
+					<view class="pay-title" style="">{{orderXm.type=='104'?'服务套餐':orderXm.type=='105'?'项目次卡':'服务疗程'}}</view>
 					<view class="flex">
 						<view class="" style="width: 160upx;height: 160upx;">
 							<image :src="orderXm.packageImg"
@@ -35,7 +35,6 @@
 				
 			</view>
 			
-			
 			<view class="detail-foot">
 				<view class="detail-foot-nav">
 					<span class="detail-foot-nav-text">套餐详情</span>
@@ -74,7 +73,6 @@
 				</view>
 			</view>
 			<view class="padding margin-top-sm header-view" style="width: 95%;margin: 0 auto;">
-				
 				<view class="liliao" @click="youhuijuan" style="margin-top: 0px;">
 					<view class="liliao-top" style="width: 30%;">
 						<span>平台优惠劵</span>
@@ -274,6 +272,7 @@
 			}
 			
 			this.ordersId = this.$queue.getData('ordersId');
+			console.log("this.ordersId=======",this.ordersId)
 			this.userPackageDetailId = this.$queue.getData('userPackageDetailId');
 			this.youhui()
 			// this.getOrder()
@@ -318,6 +317,38 @@
 			// #endif
 		},
 		methods: {
+			goOrder() {//生成orderId
+				let that = this
+				console.log('asdasd',that.couponId)
+				// let payMoney =item.price;
+				// let payMoney = that.isVip ? item.memberPrice : item.price;
+				let data = {
+				  userId: uni.getStorageSync('userId'),
+				  couponId: that.couponId,
+				  oldSumMoney: that.orderXm.oldPrice,
+				  sumMoney: that.orderXm.price,
+				  // oldSumMoney: that.mainData.oldPrice*that.detailData.length,
+				  // sumMoney: that.mainData.price*that.detailData.length,
+				  ordersPackageList:[
+				    {packageId: that.orderXm.id,num: that.number},
+				  ]
+				}
+				that.$Request.postJson("/app/user/package/order/insertOrders", data).then(res => {
+					that.showorder = false
+					if (res.code == 0) {
+						that.tordersId = res.data.ordersId;
+						that.tpayMoney = res.data.payMoney;
+						// that.showpay = true;
+						that.paySel = 1;
+						uni.navigateTo({
+							url:'/my/order/paydingTc?ordersId='+ res.data.ordersId
+						})
+					} else {
+						that.$queue.showToast(res.msg)
+					}
+							
+				});
+			},
 			changeValue(value){
 				this.number=value
 			},
@@ -491,7 +522,7 @@
 					});
 				} else {
 					uni.navigateTo({
-						url: '../address/address?id=' + 2
+						url: '../address/address?id=' + this.orderXm.type
 					})
 				}
 				
@@ -575,39 +606,7 @@
 					}
 				});
 			},
-			goOrder() {//生成orderId
+			
-				let that = this
-				console.log('asdasd',that.couponId)
-				// let payMoney =item.price;
-				// let payMoney = that.isVip ? item.memberPrice : item.price;
-				let data = {
-				  userId: uni.getStorageSync('userId'),
-				  couponId: that.couponId,
-				  oldSumMoney: that.orderXm.oldPrice,
-				  sumMoney: that.orderXm.price,
-				  // oldSumMoney: that.mainData.oldPrice*that.detailData.length,
-				  // sumMoney: that.mainData.price*that.detailData.length,
-				  ordersPackageList:[
-				    {packageId: that.orderXm.id,num: that.number},
-				  ]
-				}
-				that.$Request.postJson("/app/user/package/order/insertOrders", data).then(res => {
-					that.showorder = false
-					if (res.code == 0) {
-						that.tordersId = res.data.ordersId;
-						that.tpayMoney = res.data.payMoney;
-						// that.showpay = true;
-						that.paySel = 1;
-						// console.log("res.data",res.data)
-						uni.navigateTo({
-							url:'/my/order/paydingTc?ordersId='+ res.data.ordersId
-						})
-					} else {
-						that.$queue.showToast(res.msg)
-					}
-							
-				});
-			},
 			payJZ() {
 				let that = this;
 				if (that.openWay == 1) { //零钱支付
@@ -1249,6 +1248,10 @@
 </script>
 
 <style lang="scss" scoped>
+	.ske-padding{
+		padding: 5rpx 30rpx 36rpx 30rpx;
+		
+	}
 	.header-bottom-money{
 		width: 100%;
 		display: flex;

my/order/payModifyTcMy.vue

@@ -21,7 +21,7 @@
 									<view class="money-pay">
 										<view class="money-pay-zhen">
 											<span>￥</span>
-											<span>{{orderXm.price}}</span>
+											<span>{{orderXm.packagePrice}}</span>
 										</view>
 										<view>
 											<uni-number-box :disabled="true" :width='27' :min="1" :value='1' @change="changeValue" />

my/order/payding.vue

@@ -200,9 +200,14 @@
 							<view style="color: #999;font-size: 26rpx;">加钟费用</view>
 							<view class="" style="color: #F93731;font-size: 26rpx;">￥{{order.addMoney}}</view>
 						</view>
-						<view class="textarea-pay-list">
+						<!-- <view class="textarea-pay-list">
 							<view style="color: #999;font-size: 26rpx;margin-bottom: 9px;">备注内容</view>
 							<textarea class="textarea-pay" v-model="order.remark" disabled="disabled" placeholder="请输入备注" name="" maxlength="100"></textarea>
+						</view> -->
+						<view class="textarea-pay-list" v-if="order.remark">
+							<view style="color: #999;font-size: 26rpx;margin-bottom: 9px;">备注内容</view>
+							<view class="beizhu">{{order.remark}}</view>
+							<!-- <textarea class="textarea-pay" v-model="order.remark" disabled="disabled" placeholder="请输入备注" name="" maxlength="100"></textarea> -->
 						</view>
 						<!-- <view class="flex justify-between textarea-pay-list" v-if="order.remark" style="margin-top: 19rpx;background-color: #f3f3f3;padding: 7px;border-radius: 6px;">
 							<view style="color: #999;font-size: 26rpx;">备注内容</view>
@@ -1452,6 +1457,14 @@
 </script>
 
 <style lang="scss" scoped>
+	.beizhu{
+		width: 100%;
+	    display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
 	.bottom-view{
 		margin-top: 9px;
 		border-bottom: 1px solid #ccc;

my/order/paydingDd.vue

@@ -163,8 +163,13 @@
 							<view style="color: #999;font-size: 26rpx;">加钟费用</view>
 							<view class="" style="color: #F93731;font-size: 26rpx;">￥{{order.addMoney}}</view>
 						</view>
-						<view class="textarea-pay-list">
+						<!-- <view class="textarea-pay-list">
 							<textarea class="textarea-pay" v-model="order.remark" disabled="disabled" placeholder="请输入备注" name="" maxlength="100"></textarea>
+						</view> -->
+						<view class="textarea-pay-list" v-if="order.remark">
+							<view style="color: #999;font-size: 26rpx;margin-bottom: 9px;">备注内容</view>
+							<view class="beizhu">{{order.remark}}</view>
+							<!-- <textarea class="textarea-pay" v-model="order.remark" disabled="disabled" placeholder="请输入备注" name="" maxlength="100"></textarea> -->
 						</view>
 						<!-- <view class="flex justify-between textarea-pay-list" v-if="order.remark" style="margin-top: 19rpx;background-color: #f3f3f3;padding: 7px;border-radius: 6px;">
 							<view style="color: #999;font-size: 26rpx;">备注内容</view>
@@ -1404,6 +1409,14 @@
 </script>
 
 <style lang="scss" scoped>
+	.beizhu{
+		width: 100%;
+	    display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
 	/deep/.u-drawer{
 		z-index:11 !important;
 	}

my/order/paydingTCX.vue

@@ -42,7 +42,7 @@
 									<view class="money-pay" style="justify-content: space-between;">
 										<view class="money-pay-zhen">
 											<span>￥</span>
-											<span>{{order.massagePrice}} </span>
+											<span>{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.packagePrice:order.ordersMassageList[0].userPackageDetail.packagePrice}} </span>
 											<!-- <span style="color: #666;font-size: 12px;margin-left: 3px;"> x{{order.massageNum}}</span> -->
 										</view>
 										<view>
@@ -120,7 +120,7 @@
 						
 						<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">订单费用</view>
 						<view class="flex justify-between" style="margin-top: 19rpx;">
-							<view style="color: #999;font-size: 26rpx;">套餐名称</view>
+							<view style="color: #999;font-size: 26rpx;"> {{order.packageType=='105'?'项目次卡':order.packageType=='106'?'服务疗程':'套餐名称'}}</view>
 							<view class="" style="color: #333;font-size: 26rpx;">
 								{{order.ordersMassageList[0].userPackageDetail?order.ordersMassageList[0].userPackageDetail.mainTitle:order.ordersMassageList[0].massageType.mainTitle}}
 							</view>
@@ -165,10 +165,10 @@
 							<view style="color: #999;font-size: 26rpx;">出行交通费用</view>
 							<view class="" style="color: #333;font-size: 26rpx;">￥{{order.taxiMoney}}</view>
 						</view>
-						
 						<view class="textarea-pay-list" v-if="order.remark">
 							<view style="color: #999;font-size: 26rpx;margin-bottom: 9px;">备注内容</view>
-							<textarea class="textarea-pay" v-model="order.remark" disabled="disabled" placeholder="请输入备注" name="" maxlength="100"></textarea>
+							<view class="beizhu">{{order.remark}}</view>
+							<!-- <textarea class="textarea-pay" v-model="order.remark" disabled="disabled" placeholder="请输入备注" name="" maxlength="100"></textarea> -->
 						</view>
 					</view>
 				</view>
@@ -1390,6 +1390,14 @@
 </script>
 
 <style lang="scss" scoped>
+	.beizhu{
+		width: 100%;
+	    display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
 	.bottom-view{
 		margin-top: 9px;
 		border-bottom: 1px solid #ccc;

my/order/paydingTc.vue

@@ -7,7 +7,7 @@
 			<view class="bgImg u-skeleton-fillet" v-if="order.ordersPackageList && order.ordersPackageList.length > 0"
 				style="padding: 0 29rpx;">
 				<view class="head-top">
-					<view class="pay-title" style="">服务项目</view>
+					<view class="pay-title" style="">{{orderXm.type=='104'?'服务套餐':orderXm.type=='105'?'项目次卡':'服务疗程'}}</view>
 					<view class="flex justify-around">
 						<view class="" style="width: 160upx;height: 160upx;">
 							<image :src="order.ordersPackageList[0].packageImg"
@@ -36,44 +36,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="ske-padding margin-top-sm header-view">
-					<view v-if="!detailaddress">请选择地址</view>
-					<view class="margin-right-xs">
-						<view class="flex justify-between margin-top-lg">
-							<view class="header-view-text">联系人</view>
-							<view class="header-view-data">
-								<text>{{name}}</text>
-								<text class="xuanzhe" @click="getAddressList()">修改</text>
-							</view>
-						</view>
-						<view class="flex justify-between margin-top-lg">
-							<view class="header-view-text">手机号码</view>
-							<view class="header-view-data">
-								{{mobile}}
-							</view>
-						</view>
-						<view class="flex justify-between margin-top-lg">
-							<view class="header-view-text">详细地址</view>
-							<view class="flex adders-view">
-									<span>
-										{{province}}/{{city}}/{{district}}/{{detailaddress}}
-									</span>
-									<span class="view-more"></span>
-							</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="margin-top-xl pay-ding">
-					
 					<view class="list-pay">
 						<view class="flex justify-between" style="margin-top: 19rpx;">
 							<view style="color: #999;font-size: 26rpx;">订单编号</view>
@@ -83,21 +46,17 @@
 								<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon>
 							</view>
 						</view>
-						<!-- <view class="flex justify-between" v-if="order.couponMoney" style="margin-top: 19rpx;">
-							<view style="color: #999;font-size: 26rpx;">优惠券</view>
-							<view class="" style="color: #F93731;font-size: 26rpx;">-￥{{order.couponMoney}}</view>
-						</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>{{orderXm.type=='104'?'套餐':orderXm.type=='105'?'次卡':'疗程'}}价格</span>
 							<span>￥{{order.sumMoney}}</span>
 						</view>
 						<view class="fei-view-list">
-							<span>套餐数量</span>
+							<span>{{orderXm.type=='104'?'套餐':orderXm.type=='105'?'次卡':'疗程'}}数量</span>
 							<span>{{order.ordersPackageList[0].num}}</span>
 						</view>
 						<view class="fei-view-list" v-if="order.couponMoney">
@@ -322,7 +281,7 @@
 					});
 				} else {
 					uni.navigateTo({
-						url: '../address/address?id=' + 2
+						url: '../address/address?id=' + this.orderXm.type
 					})
 				}
 				

my/order/paydingXiuGai.vue

@@ -200,9 +200,14 @@
 							<view style="color: #999;font-size: 26rpx;">加钟费用</view>
 							<view class="" style="color: #F93731;font-size: 26rpx;">￥{{order.addMoney}}</view>
 						</view>
-						<view class="textarea-pay-list">
+						<!-- <view class="textarea-pay-list">
 							<view style="color: #999;font-size: 26rpx;margin-bottom: 9px;">备注内容</view>
 							<textarea class="textarea-pay" v-model="order.remark" disabled="disabled" placeholder="请输入备注" name="" maxlength="100"></textarea>
+						</view> -->
+						<view class="textarea-pay-list" v-if="order.remark">
+							<view style="color: #999;font-size: 26rpx;margin-bottom: 9px;">备注内容</view>
+							<view class="beizhu">{{order.remark}}</view>
+							<!-- <textarea class="textarea-pay" v-model="order.remark" disabled="disabled" placeholder="请输入备注" name="" maxlength="100"></textarea> -->
 						</view>
 						<!-- <view class="flex justify-between textarea-pay-list" v-if="order.remark" style="margin-top: 19rpx;background-color: #f3f3f3;padding: 7px;border-radius: 6px;">
 							<view style="color: #999;font-size: 26rpx;">备注内容</view>
@@ -1452,6 +1457,14 @@
 </script>
 
 <style lang="scss" scoped>
+	.beizhu{
+		width: 100%;
+	    display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
 	.bottom-view{
 		margin-top: 9px;
 		border-bottom: 1px solid #ccc;

pages/my/cika.vue

@@ -62,7 +62,7 @@
 						<view class="item-view-bottom-qian">
 							<span>￥</span>
 							<span>{{item.price}}</span>
-							<span>元/次</span>
+							<span>元/{{item.serviceCount}}次</span>
 							<span>￥</span>
 							<span>{{item.oldPrice}}</span>
 						</view>

pages/my/cikarDrtail.vue

@@ -25,10 +25,10 @@
 							<view class="header-bottom-money-zhen">
 								<span>￥</span>
 								<span>{{mainData.price}}</span>
-								<span>元/{{serviceCount}}次</span>
+								<span>元/{{mainData.serviceCount}}次</span>
 							</view>
 							<view class="header-bottom-money-jia">
-								￥{{mainData.oldPrice}}元/{{serviceCount}}次
+								￥{{mainData.oldPrice}}元/
 							</view>
 						</view>
 					</view>
@@ -86,7 +86,7 @@
 		</view>
 		<view class="detail-foot" v-if="dataList.name=='my'">
 			<view class="detail-foot-nav">
-				<span class="detail-foot-nav-text">次卡详情1</span>
+				<span class="detail-foot-nav-text">次卡详情</span>
 				<span class="detail-foot-nav-bor"></span>
 			</view>
 			<view class="detail-foot-mian1">
@@ -113,7 +113,7 @@
 						</view>
 					</view>
 					<view class="detail-foot-title">
-						服务项目{{index+1}}
+						项目次卡
 					</view>
 				</view>
 			</view>
@@ -218,6 +218,30 @@
 			// #endif
 		},
 		methods:{
+			detail(item){//详情
+				if(item.usedQuantity){
+					uni.navigateTo({
+						url:'/pages/my/orderDetailsList?id='+item.massageTypeId+'&mainId='+this.mainId+'&name='+'次卡'
+					})
+				}else{
+					uni.showToast({
+						icon:'error',
+						title:'项目次卡尚未使用，无订单信息！'
+					})
+				}
+			},
+			goumai(item){//立即购买
+				if(item.unUsedQuantity>'0'){
+					uni.navigateTo({
+						url:'/pages/my/myCiLiaoDetail?id='+item.massageTypeId+'&mainId='+this.mainId+'&name='+'次卡'
+					})
+				}else{
+					uni.showToast({
+						icon:'error',
+						title:'项目次卡已使用完成，无订单信息！'
+					})
+				}
+			},
 			goNav(e) {
 				uni.navigateTo({
 					url: e
@@ -633,10 +657,8 @@
 					that.$Request.get('/app/massage/packageDetail/findAppPage', data).then(res => {
 						if (res.code == 0) {
 							that.mainData=res.mainData;
-							
 							that.contentImg=that.mainData.contentImg.split(",");
 							that.detailData=res.detailData.list;
-							that.serviceCount=res.detailData.list[0].serviceCount
 							that.backgroundImageUrl=that.mainData.packageImg
 						}
 					})
@@ -651,8 +673,6 @@
 							that.mainData=res.data.mainData;
 							that.contentImg=that.mainData.contentImg.split(",");
 							that.detailData=res.data.detailData;
-							that.serviceCount=res.data.detailData.list[0].serviceCount
-							
 							that.mainId=that.mainData.id
 							that.backgroundImageUrl=that.mainData.packageImg
 						}
@@ -660,16 +680,7 @@
 				}
 				
 			},
-			detail(item){//详情
+			
-				uni.navigateTo({
-					url:'/pages/my/orderDetailsList?id='+item.massageTypeId+'&mainId='+this.mainId+'&name='+'次卡'
-				})
-			},
-			goumai(item){//立即购买
-				uni.navigateTo({
-					url:'/pages/my/myCiLiaoDetail?id='+item.massageTypeId+'&mainId='+this.mainId+'&name='+'次卡'
-				})
-			},
 		}
 	}
 </script>
@@ -1167,6 +1178,7 @@
 		color: #848484;
 		line-height: 37rpx;
 		margin-left: 5px;
+		text-decoration: line-through;
 	}
 	.header-bottom-money-zhen span{
 		color: #F95900;

pages/my/cureOderDrtail.vue

@@ -160,21 +160,22 @@
 				})
 			},
 			goumai(item){//立即购买
-					this.$queue.setData('getJishi','')
 					// this.$queue.setData('ordersId',this.dataList.massageTypeId);
 					// this.$queue.setData('userPackageDetailId',this.dataList.id);
+					this.$queue.setData('getJishi','')
 					this.$queue.setData('daibudan','');
 					this.$queue.setData('detailData',this.detailData)
 					this.$queue.setData('mainData',item);
 					this.$queue.setData('xiangmu',item);
 					this.$queue.setData('getJishi','');
 					this.$queue.setData('youhui','');
-					// uni.navigateTo({
-					// 	url:'/my/order/payModifyTcMy?ordersId='+item.packageDetailId
-					// })
 					uni.navigateTo({
 						url:'/my/order/payModifyTcMy?ordersId='+item.id
 					})
+					// uni.navigateTo({
+					// 	url:'/my/order/payModifyTcMy?ordersId='+item.packageDetailId
+					// })
+					
 			},
 			getIndexData(){//从首页 推荐进入 请求的接口
 				var that=this;

pages/my/fuwuliaocheng.vue

@@ -62,8 +62,8 @@
 						<view class="item-view-bottom-qian">
 							<span>￥</span>
 							<span>{{item.price}}</span>
-							<span>元/套</span>
+							<span>元/{{item.serviceCount}}次</span>
-							<span>{{item.oldPrice}}</span>
+							<span style="text-decoration: line-through;">￥{{item.oldPrice}}</span>
 						</view>
 						<view class="item-view-bottom-btn">
 							查看

pages/my/fuwuliaochengDetail.vue

@@ -25,10 +25,10 @@
 							<view class="header-bottom-money-zhen">
 								<span>￥</span>
 								<span>{{mainData.price}}</span>
-								<span>元/疗程</span>
+								<span>/{{mainData.serviceCount}}次</span>
 							</view>
-							<view class="header-bottom-money-jia">
+							<view class="header-bottom-money-jia" style="text-decoration: line-through;">
-								￥{{mainData.oldPrice}}/次
+								￥{{mainData.oldPrice}}/{{mainData.serviceCount}}次
 							</view>
 						</view>
 					</view>
@@ -99,13 +99,13 @@
 					<view class="detail-foot-list-top">
 						<span style="margin-right: 5px;">{{item.title}}</span>
 						<span style="display: none;">详情</span>
-						<span>上次预约:{{item.maxTime}}</span>
+						<span v-if="item.maxTime">上次预约:{{item.maxTime}}</span>
 					</view>
 					<view class="header-bottom-money">
 						<view class="header-bottom-money-zhen">
 							已使用{{item.usedQuantity}}次
 						</view>
-						<view class="dingdan-btn" @click="goumai(item)" :class="[item.usedQuantity=='0'?'dingdan-btn-h':'dingdan-btn-l']">
+						<view class="dingdan-btn" @click="details(item)" :class="[item.usedQuantity=='0'?'dingdan-btn-h':'dingdan-btn-l']">
 							订单详情
 						</view>
 					</view>
@@ -118,7 +118,7 @@
 						</view>
 					</view>
 					<view class="detail-foot-title">
-						服务项目{{index+1}}
+						服务疗程
 					</view>
 				</view>
 			</view>
@@ -194,6 +194,7 @@
 			that.getData()
 		},
 		onShow() {
+			
 			// #ifndef MP-WEIXIN
 			this.openLists = [{
 					image: '../../static/images/icon_weixin.png',
@@ -225,6 +226,31 @@
 			// #endif
 		},
 		methods:{
+			details(item){//详情
+			console.log("item.usedQuantity",item)
+				if(item.usedQuantity){
+					uni.navigateTo({
+						url:'/pages/my/orderDetailsList?id='+item.massageTypeId+'&mainId='+this.mainId+'&name='+'次卡'
+					})
+				}else{
+					uni.showToast({
+						icon:'error',
+						title:'服务疗程尚未使用，无订单信息！'
+					})
+				}
+			},
+			goumai(item){//立即购买
+				if(item.unUsedQuantity>'0'){
+					uni.navigateTo({
+						url:'/pages/my/myCiLiaoDetail?id='+item.massageTypeId+'&mainId='+this.mainId+'&name='+'疗程'
+					})
+				}else{
+					uni.showToast({
+						icon:'error',
+						title:'服务疗程已使用完成，无订单信息！'
+					})
+				}
+			},
 			goNav(e) {
 				uni.navigateTo({
 					url: e
@@ -574,7 +600,7 @@
 				this.$queue.setData('xiangmu',item)
 				this.$queue.setData('youhui','');
 				uni.navigateTo({
-					url:'/my/order/payModifyLiao?ordersId='+item.id
+					url:'/my/order/payModifyTcMy?ordersId='+item.id
 				})
 				// this.goOrder()
 				// this.showpay = true
@@ -634,11 +660,7 @@
 					// })
 				}
 			},
-			goumai(item){//立即购买
+			
-				uni.navigateTo({
-					url:'/pages/my/orderDetailsList?id='+item.massageTypeId+'&mainId='+this.mainId+'&name='+'疗程'
-				})
-			},
 			getData(){
 				var that=this;
 				if(that.dataList.name=='index'){
@@ -1176,6 +1198,7 @@
 		font-size: 28rpx;
 		color: #848484;
 		margin-left: 5px;
+		text-decoration: line-through;
 	}
 	.header-bottom-money-zhen span{
 		color: #F95900;

pages/my/fuwuxiangm.vue

@@ -41,7 +41,7 @@
 								<span>{{item.price}}</span>
 								<span>/元套</span>
 								<span>￥</span>
-								<span>{{item.oldPrice}}</span>
+								<span style="text-decoration: line-through;">{{item.oldPrice}}</span>
 							</view>
 							<view class="item-view-bottom-btn">
 								查看

pages/my/myCiLiaoDetail.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="header">
-			<view class="header-top" :style="backgroundStyle">
+			<view class="header-top" :style="backgroundStyle" @click="goNav('/my/vip/index')">
 				<image src="../../static/servicePackage/member_ba.png" mode="widthFix" v-if="!isVIP"></image>
 				<image src="../../static/activate2.png" mode="widthFix" v-if="isVIP"></image>
 			</view>
@@ -24,10 +24,10 @@
 						<view class="header-bottom-money1">
 							<view class="header-bottom-money-zhen">
 								<span>￥</span>
-								<span>{{getList.price}}</span>
+								<span>{{getList.packagePrice}}</span>
-								<span>元/套</span>
+								<span>元/次</span>
 							</view>
-							<view class="header-bottom-money-jia">
+							<view class="header-bottom-money-jia" style="text-decoration: line-through;">
 								￥{{getList.oldPrice}}
 							</view>
 						</view>
@@ -119,29 +119,40 @@
 			that.getData()
 		},
 		methods:{
+			goNav(e) {
+				uni.navigateTo({
+					url: e
+				})
+			},
 			goumai(item){//立即购买
 					this.$queue.setData('getJishi','')
-					this.$queue.setData('ordersId','');
-					this.$queue.setData('ordersId',item.massageTypeId);
-					this.$queue.setData('userPackageDetailId',item.id);
 					this.$queue.setData('daibudan','');
+					this.$queue.setData('detailData',this.detailData)
+					this.$queue.setData('xiangmu',item);
+					this.$queue.setData('mainData',item);
+					this.$queue.setData('getJishi','');
+					this.$queue.setData('youhui','');
 					uni.navigateTo({
-						url:'/my/order/payModify?ordersId='+item.massageTypeId
+						url:'/my/order/payModifyTcMy?ordersId='+item.id
 					})
-					
 			},
 			getData(){//次卡
 				var that=this;
 				let data = {
-							massageTypeId:that.dataList.id,
+							// massageTypeId:that.dataList.id,
+							// mainId: that.dataList.mainId,
+							// page: that.page,
+							// limit:  that.limit,
+							// id: that.dataList.id,
+							limit: 10,
 							mainId: that.dataList.mainId,
-							page: that.page,
+							massageTypeId:that.dataList.id,
-							limit:  that.limit,
+							page:1,
 						}
 				that.$Request.get('/app/user/package/detail/getMyPackageDetail', data).then(res => {
 					if (res.code == 0) {
 						that.getList=res.data;
-						that.backgroundImageUrl=that.getList.packageImg
+						that.backgroundImageUrl=that.getList.massageImg
 					}
 				})
 			},