From f444d544a4fb0d80b3bf7b9a992033ee87d270fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 31 Oct 2024 10:53:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=9B=E5=AE=89=E6=96=B0=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96-1=E3=80=813=20=20=E5=A4=A7?=
 =?UTF-8?q?=E5=AE=B6=E5=B8=B8=E4=B9=B0=E5=A2=9E=E5=8A=A0=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=EF=BC=9B=E8=A7=86=E9=A2=91=E5=9C=88=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue          |   1 +
 pages/my/fuwudajiachangmai.vue | 706 +++++++++++++++++++++++++++++++++
 pages/my/index.vue             |   2 +
 pages/videoCircle/index.vue    |   8 +-
 4 files changed, 714 insertions(+), 3 deletions(-)
 create mode 100644 pages/my/fuwudajiachangmai.vue

diff --git a/pages/index/index.vue b/pages/index/index.vue
index c2ecf1a..224b957 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -697,6 +697,7 @@
 					userId: uni.getStorageSync('userId'),
 					page: this.page,
 					limit:4,
+					status: '1'
 				}
 				if(that.parType=='1'){
 					data.longitude='';
diff --git a/pages/my/fuwudajiachangmai.vue b/pages/my/fuwudajiachangmai.vue
new file mode 100644
index 0000000..6af63ff
--- /dev/null
+++ b/pages/my/fuwudajiachangmai.vue
@@ -0,0 +1,706 @@
+<!-- 自定义下拉刷新与上拉加载演示(vue) -->
+<template>
+	<view class="content-view">
+		<z-paging ref="paging" v-model="dataList" @query="queryList">
+			<template #top>
+				<view class="service-head-top">
+					<view class="service-head-top-left">
+						<image @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image>
+						<span>大家常买</span>
+					</view>
+					<view>
+						<uni-search-bar @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue"
+							@input="input" @clear="clear">
+						</uni-search-bar>
+						<view class="search-btn" @click="searchBtn">
+							<image style="width:30rpx; height:30rpx; margin-right: 10rpx;"
+								src="../../static/search.png"></image>
+							搜索
+						</view>
+					</view>
+				</view>
+				<view class="fenlei">
+					<z-tabs class="z-tabs-fenlei" :list="tabListS" @changeClick="changeClick"/>
+				</view>
+			</template>
+			<template #loadingMoreNoMore>
+				<custom-nomore />
+			</template>
+			<!-- 右侧商品 -->
+			<!-- 主体部分 -->
+			<view class="body">
+				<!-- 左侧分类 -->
+				<view class="leftTab">
+					<scroll-view scroll-y="true" class="tabBox">
+						<block v-for="(item,index) in tabList" :key="index">
+							<view class="tabItem" :class="tabCurrent == index?'tabActive':''"
+								@click="changeTab(index,item)">
+								{{item.value}}
+							</view>
+						</block>
+					</scroll-view>
+				</view>
+				<!-- 右侧商品 -->
+				<view class="rightGoods">
+					<!-- <view class="title">{{productTitle}}</view> -->
+					<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
+						<image :src="item.packageImg" mode="" class="item-img"></image>
+						<view class="item-view">
+							<view class="view-cata">
+								<view class="item-view-title">{{item.title}}</view>
+								<span v-if="item.levelName" class="xiaoer item-view-biao">{{item.levelName}}</span>
+							</view>
+							<view class="item-view-bottom-qian">
+								<span></span>
+								<span>￥{{item.price}}</span>
+								<span v-if="item.type!='104' && item.type!='105' && item.type!='106'"></span>
+								<span v-else-if="item.type=='104'">/套</span>
+								<span v-else>/{{item.serviceCount?item.serviceCount:''}}次</span>
+								<span>￥{{item.oldPrice}}</span>
+								<span v-if="item.type!='104' && item.type!='105' && item.type!='106'"></span>
+								<span v-else-if="item.type=='104'">/套</span>
+								<span v-else>/{{item.serviceCount?item.serviceCount:''}}次</span>
+							</view>
+							<view class="flex" style="margin-top: 10rpx;">
+								<view class="shop_label" v-if="item.tagsData!=''">
+									<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
+								</view>
+								<view class="shop_label" v-else>
+									<span>助眠解压</span>
+								</view>
+							</view>
+							<view class="item-view-bottom">
+								<view class="item-view-xiangmu">
+									<span>已售</span><span>{{item.sales}}</span>
+								</view>
+								<view class="item-view-bottom-btn">
+									查看
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+		</z-paging>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				tabListS:[
+					{
+						code: "单项",
+						id: 1,
+						name: "",
+						orderNum: 6,
+						parentId: 22,
+						remark: "单项",
+						status: 1,
+						type: "",
+						value: "单项",
+					},
+					{
+						code: "套餐",
+						id: 104,
+						name: "",
+						orderNum: 6,
+						parentId: 22,
+						remark: "套餐",
+						status: 1,
+						type: "",
+						value: "套餐",
+					},
+					{
+						code: "疗程",
+						id: 106,
+						name: "",
+						orderNum: 6,
+						parentId: 22,
+						remark: "疗程",
+						status: 1,
+						type: "",
+						value: "疗程",
+					},
+					{
+						code: "次卡",
+						id: 105,
+						name: "",
+						orderNum: 6,
+						parentId: 22,
+						remark: "次卡",
+						status: 1,
+						type: "",
+						value: "次卡",
+					},
+					{
+						code: "企业",
+						id: 114,
+						name: "",
+						orderNum: 6,
+						parentId: 22,
+						remark: "企业",
+						status: 1,
+						type: "",
+						value: "企业",
+					},
+				],
+				loadingType: 0,
+				myId: '',
+				// v-model绑定的这个变量不要在分页请求结束中自己赋值！！！
+				dataList: [],
+				tabList: [],
+				typeData: '105',
+				tabIndex: 0,
+				searchValue: '',
+				serviceTrue: true,
+				page: 1,
+				limit: 10,
+				titleNmae: '',
+				classifyId: '',
+				tagsData: [],
+				// 分类列表
+				tabCurrent: 0,
+				productTitle: '氧气罐',
+				type:'1',
+			}
+		},
+		onLoad(e) {
+			this.myId = uni.getStorageSync('userId')
+			if (e) {
+				this.searchValue = e.searchValue;
+			}
+			
+			this.tabNav()
+			this.getData()
+		},
+		// onPullDownRefresh: function() {
+		// 	this.page = 1;
+		// 	this.getData()
+		// },
+		methods: {
+			changeClick(index,item){
+			  this.type=item.id
+			  this.searchValue=''
+			  this.page = 1;
+			  this.dataList = []
+			  this.getData()
+			},
+			tabNav() {
+				let data = {
+					type: "服务类型",
+				}
+				this.$Request.get('/app/dict/list', data).then(res => {
+					if (res.code == 0) {
+						this.tabList = res.data;
+						this.classifyId=res.data[0].id,
+						this.productTitle = this.tabList[0].value
+						this.page = 1;
+						this.dataList = []
+						this.getData()
+					}
+				})
+			},
+			input(res) { //搜索 输入框
+				this.searchValue = res;
+			},
+			searchBtn() { //搜索按钮
+				if (this.searchValue != "") {
+					this.getData()
+				}
+			},
+			getData() {
+				this.$refs.paging.reload(true);
+			},
+			queryList(pageNo, pageSize) {
+				const params = {
+					page: pageNo,
+					limit: pageSize,
+					title: this.searchValue,
+					classifyId: this.classifyId,
+					city:'',
+					type:this.type
+				}
+				this.$Request.get("/app/massage/package/findPackageAndMassagePage", 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){
+							res.data.list[i].levelName = "资深"
+						}
+						if(res.data.list[i].level == 4){
+							res.data.list[i].levelName = "金牌"
+						}
+						if(res.data.list[i].level == 5){
+							res.data.list[i].levelName = "专家"
+						}
+					}
+					this.$refs.paging.complete(res.data.list);
+					console.log(res.data.list);
+				}).catch(res => {
+					this.$refs.paging.complete(false);
+				})
+			},
+			changeTab(index,item) {
+				this.tabCurrent = index
+				this.productTitle = this.tabList[index].value
+				this.classifyId = item.id
+				this.searchValue = ''
+				this.page = 1;
+				this.dataList = []
+				this.getData()
+			},
+			backImg() { //返回上一页
+				uni.reLaunch({
+					url: '/pages/index/index'
+				})
+			},
+			clear(res) {
+				this.getData()
+			},
+			itemClick(item) {
+				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
+					})
+				}
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	/deep/.zp-empty-view-center{
+		position: absolute;
+		margin-top: 106px;
+		margin-left: 42%;
+	}
+	/deep/.z-tabs-item-title /deep/span{
+		    white-space: nowrap;
+	}
+	.fenlei{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		background: #fff;
+	}
+	.body {
+		// height: 100vh;
+		display: flex;
+		justify-content: end;
+		// overflow: hidden;
+		.leftTab {
+			width:19%;
+			height: 100%;
+			background: #ffffff;
+			// border-radius: 0px 15rpx 0px 0px;
+			// padding: 24rpx 11rpx;
+			box-sizing: border-box;
+			border-top: 1px solid #f7f7f7;
+			position: fixed;
+			left: 0;
+			.tabBox {
+				height: 100%;
+	
+				.tabItem {
+					text-align: center;
+					padding: 14rpx 0;
+					// border-radius: 60rpx;
+					color: #464646;
+					font-size: 14px;
+					font-weight: bold;
+					margin-bottom: 20rpx;
+				}
+	
+				.tabActive {
+					background: #f2fffb;
+					color: #019c88;
+				}
+			}
+		}
+	
+		.rightGoods {
+			width:76%;
+			height: 100%;
+			// padding: 0 16rpx 27rpx;
+			box-sizing: border-box;
+			position: absolute;
+			right:20rpx;
+			.whiteBox {
+				height: 100%;
+				background: #ffffff;
+				border-radius: 15rpx;
+				padding: 0 25rpx;
+				box-sizing: border-box;
+				.title {
+					height: 77rpx;
+					line-height: 77rpx;
+					color: #2D2D2D;
+					font-size: 26rpx;
+					font-weight: bold;
+				}
+	
+				
+			}
+		}
+	}
+	.shop_label {
+		display: flex;
+		flex-wrap: wrap;
+		margin-top: 4rpx;
+	}
+
+	.shop_label span {
+		background: linear-gradient(90deg, #ffefde, #fff7ef);
+		height: 34rpx;
+		line-height: 34rpx;
+		border-radius: 8rpx;
+		padding: 0 10rpx;
+		font-size: 22rpx;
+		margin-right: 8rpx;
+		margin-bottom: 8rpx;
+		color: #f68607;
+	}
+
+	/deep/.refresh-body {
+		height: 845px !important;
+		background-color: #f7f7f7;
+	}
+
+	.content-view {
+		width: 100%;
+		height: 100vh;
+		overflow: hidden;
+	}
+
+	.item-view-bottom-btn {
+		text-align: center;
+		width: 131rpx;
+		height: 55rpx;
+		line-height: 55rpx;
+		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
+		border-radius: 10rpx;
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #FFFFFF;
+	}
+
+	.item-view-bottom-qian span:nth-child(5) {
+		font-size: 28rpx;
+		color: #848484;
+		text-decoration-line: line-through;
+	}
+
+	.item-view-bottom-qian span:nth-child(4) {
+		font-size: 28rpx;
+		color: #848484;
+		text-decoration-line: line-through;
+		margin-left: 5px;
+	}
+
+	.item-view-bottom-qian span:nth-child(3) {
+		font-size: 28rpx;
+		color: #FF6000;
+	}
+
+	.item-view-bottom-qian span:nth-child(2) {
+		font-weight: bold;
+		font-size: 36.81rpx;
+		color: #FF6000;
+	}
+
+	.item-view-bottom-qian span:nth-child(1) {
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #FF6000;
+	}
+
+	.item-view-bottom-qian {
+		margin-top: 2px;
+	}
+
+	.item-view-bottom {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.item-view-jianjie {
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #848484;
+		margin: 5px 0px;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		/* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.item-view-biao{
+		padding: 1px 5px;
+		border-radius: 15rpx 3rpx 15rpx 3rpx;
+		width: 50px;
+		text-align: center;
+	}
+
+	.tuina {
+		background-color: #d1f2df;
+		color: #17984d;
+	}
+
+	.xiaoer {
+		background-color: #f1f8d7;
+		color: #58b314;
+	}
+
+	.taishi {
+		background-color: #e5d5c6;
+		color: #805d39;
+	}
+
+	.kangfu {
+		background-color: #fcf3da;
+		color: #ff8600;
+	}
+
+	.item-view-xiangmu span:nth-child(2) {
+		font-weight: normal;
+		color: #333333;
+		font-size: 30rpx;
+	}
+
+	.item-view-xiangmu span:nth-child(1) {
+		font-weight: normal;
+		color: #666666;
+		margin-right: 5rpx;
+		font-size: 30rpx;
+	}
+
+	.item-view-xiangmu {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		font-weight: 400;
+		font-size: 25rpx;
+		align-items: flex-end;
+	}
+
+	.item-view-title {
+		font-weight: bold;
+		font-size: 33rpx;
+		color: #333333;
+	}
+
+	.item-view {
+		width:69%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		justify-content: space-between;
+		padding: 5rpx 0;
+	}
+
+	.item-img {
+		width:70px;
+		height:70px;
+		border-radius: 14rpx;
+		position: relative;
+	}
+
+	.img-span {
+		padding: 2px 5px;
+		font-weight: 400;
+		font-size: 8px;
+		color: #FFFFFF;
+		background: linear-gradient(-90deg, #FF6F48, #FF9E69);
+		border-radius: 7px 0px 7px 0px;
+		position: absolute;
+		bottom: 0px;
+		right: 0;
+		margin-bottom: 5px;
+		margin-right: 5px;
+	}
+
+	.item-img image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.item {
+		width: 100%;
+		margin: 0 auto;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		/*height: 140px;*/
+		background: #FFFFFF;
+		border-radius: 21rpx;
+		margin-top: 10px;
+		// align-items: center;
+		padding: 20rpx;
+	}
+
+	.item-detail {
+		padding: 5rpx 15rpx;
+		border-radius: 10rpx;
+		font-size: 28rpx;
+		color: white;
+		background-color: #007AFF;
+	}
+
+	.item-line {
+		position: absolute;
+		bottom: 0rpx;
+		left: 0rpx;
+		height: 1px;
+		width: 100%;
+		background-color: #eeeeee;
+	}
+
+	/deep/.zp-paging-container {
+		background-color: #f7f7f7;
+		width: 100%;
+	}
+
+	/deep/.zp-paging-container-content {
+		width: 95%;
+		margin: 0 auto;
+	}
+
+	.fenlei {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.index-fenl-title {
+		width: 81rpx;
+		text-align: center;
+		position: relative;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		font-weight: bold;
+		font-size: 34rpx;
+		color: #019C88;
+	}
+
+	.index-fenl-title-bottom {
+		position: absolute;
+		bottom: 0;
+		margin-bottom: 0px;
+		width: 81rpx;
+		height: 14rpx;
+		border-radius: 7rpx;
+		background: linear-gradient(-48deg, rgba(1, 156, 136, 0.35), rgba(45, 196, 142, 0.35));
+	}
+
+	/deep/.uni-searchbar__cancel {
+		display: none;
+	}
+
+	.search-btn {
+		text-align: center;
+		color: #019c88;
+		font-weight: bold;
+		position: absolute;
+		right: 40rpx;
+		top: 20rpx;
+		font-size: 30rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	/deep/.uni-searchbar__box-icon-search,
+	.search-btn {
+		width: 110rpx;
+		height: 50rpx;
+	}
+
+	/deep/.uni-searchbar__box {
+		height: 34px;
+		border-radius: 30px !important;
+		background-color: #fff !important;
+		border: 1px solid #09a28a;
+		display: flex;
+		flex-direction: row;
+		flex-flow: row-reverse;
+		position: relative;
+	}
+
+	/deep/.uni-searchbar {
+		width: 250px;
+		border-radius: 31rpx;
+		padding-right: 24rpx;
+	}
+
+	.service-head-top-left image {
+		width: 20px;
+		height: 20rpx;
+		margin-right: 5px;
+		margin-left: 10rpx;
+	}
+
+	.service-head-top-left span {
+		height: 100rpx;
+		background: url('../../static/images/headline.png') 0rpx 50rpx;
+		background-repeat: no-repeat;
+		font-weight: bold;
+		font-size: 34rpx;
+		color: #171717;
+		display: flex;
+		align-items: center;
+	}
+
+	.service-head-top-left {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.service-head-top {
+		height: 90rpx;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		background: #fff;
+	}
+	
+	.view-cata{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/my/index.vue b/pages/my/index.vue
index 81b8ec1..c179810 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -410,7 +410,9 @@
 					city: '',
 					page: 1,
 					limit: 30,
+					isTj: 1
 				}).then(res => {
+					console.log(res);
 					if (res.code == 0) {
 						if (res.data) {
 							this.dataList = res.data.list || {}; //追加新数据
diff --git a/pages/videoCircle/index.vue b/pages/videoCircle/index.vue
index efc7ec9..884d3ee 100644
--- a/pages/videoCircle/index.vue
+++ b/pages/videoCircle/index.vue
@@ -632,8 +632,9 @@
 			GET(){
 				var data={
 					page: this.page,
-					limit:this.limit,
-					userId:uni.getStorageSync('userId')
+					limit: this.limit,
+					userId: uni.getStorageSync('userId'),
+					status: '1'
 				}
 				this.$Request.get("/app/shipinquan/list", data).then(res => {
 					if (res.code == 0) {
@@ -655,7 +656,8 @@
 				var data={
 					page: this.page,
 					limit:this.limit,
-					userId:uni.getStorageSync('userId')
+					userId:uni.getStorageSync('userId'),
+					status: '1'
 				}
 				this.$Request.get("/app/shipinquan/list", data).then(res => {
 					if (res.code == 0) {