订单列表 添加标签 套餐次卡疗程 我的页面去掉顶部图片

pages/index/index.vue

@@ -687,7 +687,7 @@
 			let userId = uni.getStorageSync('userId')
 			if (userId) {
 				uni.navigateTo({
-					url:'/pages/my/fuwuGengduo?searchValue='+this.searchValue+'&text='+'index'
+					url:'/pages/my/fuwuGengduo?searchValue='+this.searchValue
 				})
 			}else{
 				uni.navigateTo({

pages/my/cikarDrtail.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="header">
-			<view class="header-top" :style="backgroundStyle" @click="goNav('/my/vip/index')">
+			<view v-if="dataList.name=='index'" class="header-top" :style="backgroundStyle" @click="goNav('/my/vip/index')">
 				<image src="../../static/activate2.png" mode="widthFix" v-if="isVip=='1'"></image>
 				<image src="../../static/servicePackage/member_ba.png" mode="widthFix" v-else></image>
 			</view>

pages/my/fuwuGengduo.vue

@@ -6,7 +6,7 @@
 				<view class="service-head-top">
 					<view class="service-head-top-left">
 						<image @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image>
-						<span>{{title}}</span>
+						<span>全部项目</span>
 					</view>
 					<view>
 						<uni-search-bar @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue"
@@ -19,7 +19,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="fenlei" v-if="textName=='index'">
+				<view class="fenlei">
 					<z-tabs class="z-tabs-fenlei" :list="tabListS" @changeClick="changeClick"/>
 				</view>
 			</template>
@@ -44,7 +44,7 @@
 				<view class="rightGoods">
 					<!-- <view class="title">{{productTitle}}</view> -->
 					<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
-						<image :src="textName=='index'?item.packageImg:item.massageImg" mode="" class="item-img"></image>
+						<image :src="item.packageImg" mode="" class="item-img"></image>
 						<view class="item-view">
 							<view class="item-view-title">
 								{{item.title}}
@@ -165,26 +165,12 @@
 				tabCurrent: 0,
 				productTitle: '氧气罐',
 				type:'1',
-				textName:'',
-				title:''
 			}
 		},
 		onLoad(e) {
 			this.myId = uni.getStorageSync('userId')
 			if (e) {
 				this.searchValue = e.searchValue;
-				this.textName=e.text
-				if(this.textName=='index'){
-					this.title='全部项目'
-					uni.setNavigationBarTitle({
-					      title: '全部项目'
-					    });
-				}else{
-					this.title='单项'
-					uni.setNavigationBarTitle({
-					      title: '单项'
-					    });
-				}
 			}
 			
 			this.tabNav()
@@ -229,24 +215,15 @@
 				this.$refs.paging.reload(true);
 			},
 			queryList(pageNo, pageSize) {
-				let url=''
 				const params = {
 					page: pageNo,
 					limit: pageSize,
 					title: this.searchValue,
 					classifyId: this.classifyId,
+					city:'',
+					type:this.type
 				}
-				if(this.textName=='index'){
+				this.$Request.get("/app/massage/package/findPackageAndMassagePage", params).then(res => {
-					params.city=''
-					params.type=this.type
-					url="/app/massage/package/findPackageAndMassagePage";
-					
-				}else{
-					params.type='1'
-					url="/app/artificer/selectMassageTypePage";
-				}
-				
-				this.$Request.get(url, params).then(res => {
 					for (var i = 0; i < res.data.list.length; i++) {
 						res.data.list[i].tagsData = res.data.list[i].labels.split(',');
 					}
@@ -273,35 +250,28 @@
 				this.getData()
 			},
 			itemClick(item) {
-				if(this.textName=='index'){
+				if (item.type == '104') {
-					if (item.type == '104') {
-						uni.navigateTo({
-							url: '/pages/my/serviceOderDrtail?id=' + item.id + '&limit=' + this.limit + '&page=' + this
-								.page + '&name=' + 'index' + '&isCanCoupon=' + item.isCanCoupon
-						})
-					} else if (item.type == '105') {
-						uni.navigateTo({
-							url: '/pages/my/cikarDrtail?id=' + item.id + '&limit=' + this.limit + '&page=' + this
-								.page + '&name=' + 'index' + '&isCanCoupon=' + item.isCanCoupon
-						})
-					} else if (item.type == '106') {
-						uni.navigateTo({
-							url: '/pages/my/fuwuliaochengDetail?id=' + item.id + '&limit=' + this.limit + '&page=' +
-								this.page + '&name=' + 'index' + '&isCanCoupon=' + item.isCanCoupon
-						})
-					}  else if(item.type == '114'){
-						uni.navigateTo({
-							url: '/pages/shop/qiyeDatail?id=' + item.id +'&name=' + 'index'
-						})
-					}else {
-						uni.navigateTo({
-							url: '/pages/my/fuwuDateil?id=' + item.id + '&limit=' + this.limit + '&page=' + this.page +
-								'&name=' + 'index' + '&isCanCoupon=' + item.isCanCoupon
-						})
-					}
-				}else{
 					uni.navigateTo({
-						url: '/pages/my/fuwuDateil?id=' + item.massageTypeId + '&limit=' + this.limit + '&page=' + this.page +
+						url: '/pages/my/serviceOderDrtail?id=' + item.id + '&limit=' + this.limit + '&page=' + this
+							.page + '&name=' + 'index' + '&isCanCoupon=' + item.isCanCoupon
+					})
+				} else if (item.type == '105') {
+					uni.navigateTo({
+						url: '/pages/my/cikarDrtail?id=' + item.id + '&limit=' + this.limit + '&page=' + this
+							.page + '&name=' + 'index' + '&isCanCoupon=' + item.isCanCoupon
+					})
+				} else if (item.type == '106') {
+					uni.navigateTo({
+						url: '/pages/my/fuwuliaochengDetail?id=' + item.id + '&limit=' + this.limit + '&page=' +
+							this.page + '&name=' + 'index' + '&isCanCoupon=' + item.isCanCoupon
+					})
+				}  else if(item.type == '114'){
+					uni.navigateTo({
+						url: '/pages/shop/qiyeDatail?id=' + item.id +'&name=' + 'index'
+					})
+				}else {
+					uni.navigateTo({
+						url: '/pages/my/fuwuDateil?id=' + item.id + '&limit=' + this.limit + '&page=' + this.page +
 							'&name=' + 'index' + '&isCanCoupon=' + item.isCanCoupon
 					})
 				}

pages/my/fuwuliaochengDetail.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="header">
-			<view class="header-top" :style="backgroundStyle" @click="goNav('/my/vip/index')">
+			<view v-if="dataList.name=='index'" class="header-top" :style="backgroundStyle" @click="goNav('/my/vip/index')">
 				<image src="../../static/activate2.png" mode="widthFix" v-if="isVip=='1'"></image>
 				<image src="../../static/servicePackage/member_ba.png" mode="widthFix" v-else></image>
 			</view>

pages/my/index.vue

@@ -125,12 +125,6 @@
 					<span class="my-serve-list-text">企业预约</span>
 				</view>
 			</view>
-			<view class="my-serve-view">
-				<view class="my-serve-list" @click="danxiang()">
-					<image src="../../static/my-liaocheng2.png" mode=""></image>
-					<span class="my-serve-list-text">单项</span>
-				</view>
-			</view>
 		</view>
 		<view class="my-use width">
 			<view class="my-use-title">常用功能</view>
@@ -336,7 +330,7 @@
 		methods: {
 			danxiang(){
 				uni.navigateTo({
-					url:'/pages/my/fuwuGengduo?text='+'my'
+					url:'/pages/my/fuwuGengduo'
 				})
 			},
 			getUserInfo() {

pages/my/serviceOderDrtail.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="header">
-			<view class="header-top" :style="backgroundStyle" @click="goNav('/my/vip/index')">
+			<view v-if="serviData.name=='index'" class="header-top" :style="backgroundStyle" @click="goNav('/my/vip/index')">
 				<image src="../../static/activate2.png" mode="widthFix" v-if="isVip=='1'"></image>
 				<image src="../../static/servicePackage/member_ba.png" mode="widthFix" v-else></image>
 			</view>

pages/order/index.vue

@@ -39,12 +39,24 @@
 						mode="square" size="100" style="height: 155rpx;width: 155rpx;flex: 0 0 155rpx;">
 					</u-avatar>
 				</view>
-				<view class="u-flex-1" style="margin-left: 20rpx;">
+				<view class="u-flex-1" style="margin-left: 20rpx;width: 70%;">
-					<view class="text-bold u-line-1">
+					<view class="flex text-bold u-line-1">
 						<view class=" text-lg "
 							style="font-size: 32rpx;margin-top: 0rpx;display: inline-block;width: 470rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
 							{{item.ordersMassageList[0].massageType?item.ordersMassageList[0].massageType.title:item.ordersMassageList[0].userPackageDetail.title}}
 						</view>
+						<view v-if="item.packageType=='104'">
+							套餐
+						</view>
+						<view v-if="item.packageType=='105'">
+							次卡
+						</view>
+						<view v-if="item.packageType=='106'">
+							疗程
+						</view>
+						<view v-if="item.packageType=='114'">
+							企业
+						</view>
 					</view>
 					<view class="u-font-13 u-tips-color justify-between title-font" style="margin-top: 14rpx;">
 						<text class="title-font">预约时间：</text><text class="value-font">{{item.serveTime}}</text>