diff --git a/page_fenbaotwo/hexiao/index.vue b/page_fenbaotwo/hexiao/index.vue
new file mode 100644
index 0000000..1c9a104
--- /dev/null
+++ b/page_fenbaotwo/hexiao/index.vue
@@ -0,0 +1,193 @@
+<template>
+	<view class="page">
+		<u-navbar title="团购兑换" :border-bottom="false" :background="bgc" back-icon-color="#262B37" title-color='#262B37'
+			title-size='36' height='50' id="navbar">
+		</u-navbar>
+        <view class="box">
+        	<view class="top">
+        		<view class="name">
+        			<view class="lt">
+        				福鼎市太姥山
+        			</view>
+					<view class="rt">
+						距您1.6km
+					</view>
+        		</view>
+				<view class="dizhi">
+					福建省宁德市福鼎市太姥山镇玉池南路21-23号
+				</view>
+        	</view>
+			<view class="yanjuan">
+				<input type="text" placeholder="请输入美团,快手或抖音团购劵码"/>
+				<image @click="btnsm" src="https://api.ccttiot.com/smartmeter/img/static/u4dXRqeDvi1s2EuDXAZV" mode=""></image>
+			</view>
+			<view class="yjanniu">
+				立即验劵
+			</view>
+			<view class="kefu">
+				<image src="https://api.ccttiot.com/smartmeter/img/static/uOSlTej17SvPDYLMAT1w" mode=""></image>
+			</view>
+			<view class="tishi">
+				<view class="tit">
+					温馨提示
+				</view>
+				<view class="wz">
+					1、输入团购券码或点击「识图验券」选择二维码图片进 行验证，验证通过后根据弹窗指引前往预定界面进行使 用；
+				</view>
+				<view class="wz">
+					2、抵用券核销之后，将会出现在您的优惠券里，您可在 付费时选择使用，并抵用相应金额；
+				</view>
+				<view class="wz">
+					3、券码一旦使用，概不退换，感谢您的支持与理解；
+				</view>
+				<view class="wz">
+					4、如有疑问，请点击上方联系客服，我们将第一时间为 您处理。
+				</view>
+			</view>
+        </view>
+		<view class="gg" @click="btnjiameng">
+			<image src="https://api.ccttiot.com/smartmeter/img/static/uNAE6YmSEpaH4SsZlg8S" mode=""></image>
+		</view>
+	</view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+                bgc: {
+                	backgroundColor: "#fff",
+                },
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+			// 点击扫码
+			btnsm(){
+				uni.scanCode({
+					onlyFromCamera: true,
+					scanType: ['qrCode'],
+					success: res => {
+                        console.log(res);
+					}
+				})
+			},
+             // 点击跳转到加盟合作页
+             btnjiameng() {
+				 uni.navigateTo({
+				 	url:'/page_fenbaotwo/hexiao/youhuijuan'
+				 })
+             	// uni.navigateTo({
+             	// 	url: '/page_user/zhaoshang'
+             	// })
+             },
+		}
+	}
+</script>
+
+<style lang="scss">
+	/deep/ .u-iconfont,
+	/deep/ .u-title{
+		padding-bottom: 20rpx;
+	}
+	page {
+		background: #F6F6F6;
+	}
+	.gg{
+		width: 100%;
+		margin-top: 40rpx;
+		text-align: center;
+		image{
+			width: 692rpx;
+			height: 196rpx;
+		}
+	}
+	.box{
+		width: 692rpx;
+		height: 1014rpx;
+		background: #FFFFFF;
+		margin: auto;
+		margin-top: 26rpx;
+		box-shadow: 0rpx 2rpx 12rpx 0rpx rgba(0,0,0,0.15);
+		border-radius: 18rpx 18rpx 18rpx 18rpx;
+		padding: 28rpx 30rpx;
+		box-sizing: border-box;
+		.tishi{
+			margin-top: 6rpx;
+			.tit{
+				font-weight: 600;
+				font-size: 32rpx;
+				color: #3D3D3D;
+			}
+			.wz{
+				font-size: 26rpx;
+				color: #636363;
+				margin-top: 20rpx;
+			}
+		}
+		.kefu{
+			width: 100%;
+			text-align: right;
+			margin-top: 26rpx;
+			image{
+				width: 266rpx;
+				height: 134rpx;
+			}
+		}
+		.yjanniu{
+			width: 634rpx;
+			height: 98rpx;
+			line-height: 98rpx;
+			text-align: center;
+			background: #48893B;
+			border-radius: 8rpx 8rpx 8rpx 8rpx;
+			margin-top: 28rpx;
+			font-weight: 600;
+			font-size: 36rpx;
+			color: #FFFFFF;
+		}
+		.yanjuan{
+			width: 634rpx;
+			height: 98rpx;
+			border-radius: 8rpx 8rpx 8rpx 8rpx;
+			border: 2rpx solid #9B9B9B;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 0 28rpx;
+			box-sizing: border-box;
+			margin-top: 48rpx;
+			input{
+				width: 414rpx;
+			}
+			image{
+				width: 46rpx;
+				height: 46rpx;
+			}
+		}
+		.top{
+			.dizhi{
+				font-size: 24rpx;
+				color: #7C7C7C;
+				margin-top: 12rpx;
+			}
+			.name{
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				.lt{
+					font-weight:600;
+					font-size: 32rpx;
+					color: #3D3D3D;
+				}
+				.rt{
+					font-size: 24rpx;
+					color: #7C7C7C;
+				}
+			}
+		}
+	}
+
+
+</style>
\ No newline at end of file
diff --git a/page_fenbaotwo/hexiao/youhuijuan.vue b/page_fenbaotwo/hexiao/youhuijuan.vue
new file mode 100644
index 0000000..cb90bf6
--- /dev/null
+++ b/page_fenbaotwo/hexiao/youhuijuan.vue
@@ -0,0 +1,113 @@
+<template>
+	<view class="page">
+		<u-navbar title="优惠卷" :border-bottom="false" :background="bgc" back-icon-color="#262B37" title-color='#262B37'
+			title-size='36' height='50' id="navbar">
+		</u-navbar>
+        <view class="list">
+        	<view class="list_item" v-for="(item,index) in 20" :key="index">
+        		<image src="https://api.ccttiot.com/smartmeter/img/static/uYPF6s2CHo3inpbeKtfc" mode=""></image>
+				<view class="price">
+					{{index + 1}}
+				</view>
+				<view class="cen">
+					<view class="shuom">
+						满{{90 + index}}可用
+					</view>
+					<view class="riqi">
+						2025.03.11-2025.04.11
+					</view>
+				</view>
+				<view class="rt">
+					<view class="anniu">
+						立即使用
+					</view>
+				</view>
+        	</view>
+        </view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				bgc: {
+					backgroundColor: "",
+				},
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	/deep/ .u-iconfont,
+	/deep/ .u-title{
+		padding-bottom: 20rpx;
+	}
+	page {
+		background-color: #fff;
+	}
+	.list{
+		width: 672rpx;
+		height: 90vh;
+		overflow: scroll;
+		margin: auto;
+		padding-bottom: 50rpx;
+		box-sizing: border-box;
+		.list_item{
+			width: 100%;
+			position: relative;
+			display: flex;
+			align-items: center;
+			padding: 36rpx 36rpx 30rpx 74rpx;
+			box-sizing: border-box;
+			margin-top: 30rpx;
+			.rt{
+				.anniu{
+					width: 168rpx;
+					height: 38rpx;
+					line-height: 38rpx;
+					background: #FFFFFF;
+					border-radius: 22rpx 22rpx 22rpx 22rpx;
+					text-align: center;
+					font-size: 24rpx;
+					color: #48893B;
+				}
+			}
+			.cen{
+				width: 280rpx;
+				.shuom{
+					font-weight: 600;
+					font-size: 48rpx;
+					color: #48893B;
+				}
+				.riqi{
+					font-size: 18rpx;
+					color: #7C7C7C;
+				}
+			}
+			image{
+				width: 672rpx;
+				height: 168rpx;
+				position: absolute;
+				top: 0;
+				left: 0;
+				z-index: -1;
+			}
+			.price{
+				font-weight: 600;
+				font-size: 80rpx;
+				color: #48893B;
+				width: 140rpx;
+			}
+		}
+	}
+
+	
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 46a624c..fb19440 100644
--- a/pages.json
+++ b/pages.json
@@ -536,6 +536,20 @@
 						"enablePullDownRefresh": false,
 						"navigationStyle": "custom"
 					}
+				},{
+					"path": "hexiao/index",
+					"style": {
+						"navigationBarTitleText": "上传",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},{
+					"path": "hexiao/youhuijuan",
+					"style": {
+						"navigationBarTitleText": "上传",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
 				},{
 					"path": "zhangdan",
 					"style": {
diff --git a/pages/my.vue b/pages/my.vue
index 5220ae2..2427156 100644
--- a/pages/my.vue
+++ b/pages/my.vue
@@ -18,7 +18,7 @@
 			</view>
         </view>
 		<view class="top" style="padding: 0;">
-			<text style="color: #fff;margin-left: 10rpx;">{{user.phonenumber == null ? '' : user.phonenumber}}</text>
+			<text style="color: #fff;margin-left: 10rpx;" @click="btnhx">{{user.phonenumber == null ? '' : user.phonenumber}}</text>
 			<image style="" src="https://api.ccttiot.com/smartmeter/img/static/unOSDXbaM4kbZH0gElDy" mode=""></image>
 		</view>
 		
@@ -138,6 +138,12 @@
 			this.getkefutel()
 		},
 		methods: {
+			// 点击进入团购页面
+			btnhx(){
+				uni.navigateTo({
+					url:'/page_fenbaotwo/hexiao/index'
+				})
+			},
 			// 点击进行设备录入
 			// btnluru(){
 			// 	uni.navigateTo({
@@ -178,7 +184,8 @@
 			},
 			// 查询客服电话
 			getkefutel(){
-				this.$u.get(`/app/store/getServicePhone?storeId=1`).then(res => {
+				let id = uni.getStorageSync('storeId')
+				this.$u.get(`/app/store/getServicePhone?storeId=${id}`).then(res => {
 					if (res.code == 200) {
 						this.telobj = res.data
 					}
diff --git a/pages/tj.vue b/pages/tj.vue
index 8e84b57..b63ccd2 100644
--- a/pages/tj.vue
+++ b/pages/tj.vue
@@ -113,7 +113,7 @@
 					{name:'茶室订单',value:'1'},
 					{name:'棋牌订单',value:'2'},
 					{name:'台球订单',value:'3'},
-					{name:'货柜订单',value:'4'},
+					{name:'其他订单',value:'4'},
 				],
 				orderlist:[],
 				type:'1',
@@ -243,6 +243,8 @@
 							   		       icon: 'success',
 							   		       duration:2000
 							   		})
+									that.pagesum = 1
+									that.orderlist = []
 									that.getlist()
 							   	 }else{
 									 uni.showToast({
@@ -278,6 +280,8 @@
 							   		       icon: 'success',
 							   		       duration:2000
 							   		})
+									that.pagesum = 1
+									that.orderlist = []
 									that.getlist()
 							   	 }else{
 									 uni.showToast({