添加普通项目tab

pages/my/txszList.vue

@@ -28,7 +28,7 @@
 				<custom-nomore />
 			</template>
 			<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
-				<image :src="item.packageImg" mode="" class="item-img"></image>
+				<image :src="item.packageImg?item.packageImg:item.massageImg" mode="" class="item-img"></image>
 				<view class="item-view">
 					<view class="view-cata">
 						<view class="item-view-title">{{item.title}}</view>
@@ -37,11 +37,17 @@
 					<view class="item-view-bottom-qian">
 						<span></span>
 						<span>￥{{item.price}}</span>
-						<span>/ <text v-if="item.type!='104'">{{item.serviceCount}}</text>
+						<span v-if="type=='104'||type=='105'||type=='106'">/ <text v-if="item.type!='104'">{{item.serviceCount}}</text>
-							{{typeData=='104'?'套':typeData=='105'?'次':'次'}}</span>
+							{{type=='104'?'套':type=='105'?'次':'次'}}</span>
 						<span></span>
-						<span>￥{{item.oldPrice}}<text
+						<span>￥{{item.oldPrice}}</span>
-								v-if="item.type!='104'">/{{item.serviceCount}}</text>{{typeData=='104'?'套':typeData=='105'?'次':'次'}}</span>
+						<span v-if="type=='104'||type=='105'||type=='106'">
+							<text v-if="item.type!='104'">
+								/{{item.serviceCount}}{{type=='104'?'套':type=='105'?'次':'次'}}
+							</text>
+						</span>	
+							
+						</span>
 					</view>
 					<view class="flex" style="margin-top: 10rpx;">
 						<view class="shop_label" v-if="item.tagsData!=''">
@@ -78,11 +84,23 @@
 				serviceTrue: true,
 				page: 1,
 				limit: 10,
-				type:'104',
+				type:'95',
 				titleNmae: '',
 				classifyId: '',
 				getName: '',
-				tabList: [{
+				tabList: [
+					{
+						code: "服务项目",
+						id: 95,
+						name: "",
+						orderNum: 5,
+						parentId: 22,
+						remark: "",
+						status: 1,
+						type: "95",
+						value: "服务项目",
+					},
+					{
 						code: "服务套餐",
 						id: 104,
 						name: "",
@@ -115,6 +133,7 @@
 						type: "106",
 						value: "服务疗程",
 					},
+					
 				],
 			}
 		},
@@ -123,17 +142,14 @@
 			this.classifyId=e.classifyId
 			this.myId = uni.getStorageSync('userId')
 			// this.getData();
+			// this.tabList[0]=this.typeData
 			uni.setNavigationBarTitle({
 				title: this.typeData == '95' ? '中医推拿' : this.typeData == '101' ? '小儿推拿' : this.typeData ==
 					'102' ? '产后康复' : this.typeData == '91' ? '私密护理' : '正骨拨筋',
 			})
-			this.taocan()
 		},
 
 		methods: {
-			taocan() {
-
-			},
 			input(res) { //搜索 输入框
 				this.searchValue = res;
 			},
@@ -147,14 +163,29 @@
 				this.$refs.paging.reload(true);
 			},
 			queryList(pageNo, pageSize) {
-				const params = {
+				// console.log("item======",this.type)
-					page: pageNo,
+				if(this.type!='104'&&this.type!='105'&&this.type!='106'){//初始加载 加载普通项目列表
-					limit: pageSize,
+					var url='/app/artificer/selectMassageTypePage'
-					type: this.type,
+					var params = {
-					title: this.searchValue,
+						page: pageNo,
-					classifyId: this.classifyId
+						limit: pageSize,
+						by: 3,
+						status: 1,
+						classifyId: this.classifyId,
+						title:this.searchValue
+					}
+				}else{//套餐次卡疗程 列表
+					var url='/app/massage/package/findPage'
+					var params = {
+						page: pageNo,
+						limit: pageSize,
+						type: this.type,
+						title: this.searchValue,
+						classifyId: this.classifyId
+					}
 				}
-				this.$Request.get('/app/massage/package/findPage', params).then(res => {
+				
+				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(',');
 						if (res.data.list[i].level == 3) {
@@ -173,7 +204,8 @@
 				})
 			},
 			changeClick(index, item) {
-				this.type = item.type
+				this.type = item.type;
+				this.classifyId=item.classifyId
 				this.searchValue = ''
 				this.page = 1;
 				this.dataList = []
@@ -188,6 +220,7 @@
 				this.getData()
 			},
 			itemClick(item) {
+				console.log('item=========',item)
 				if (this.type == '104') {
 					uni.navigateTo({
 						url: '/pages/my/serviceOderDrtail?id=' + item.id + '&limit=' + this.limit + '&page=' + this
@@ -203,6 +236,11 @@
 						url: '/pages/my/fuwuliaochengDetail?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 + '&name=' + 'index' + '&isCanCoupon=' + item.isCanCoupon
+					})
 				}
 			}
 		}