From 0c34797e9aa41d06971dfef29049a639742228c0 Mon Sep 17 00:00:00 2001
From: wangzimeng <3297159934@qq.com>
Date: Tue, 5 Aug 2025 15:57:22 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E6=83=A0=E5=88=B8=E7=9A=84?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=88=B7=E6=96=B0=E6=97=B6=E4=B8=8D=E4=BC=9A?=
 =?UTF-8?q?=E9=81=AE=E6=8C=A1tabs=E6=A0=87=E7=AD=BE=202=E3=80=81=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=A0=87=E7=AD=BE=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=B9=8B=E5=90=8E=E5=86=8D=E5=88=A0=E9=99=A4=E4=B8=8D?=
 =?UTF-8?q?=E4=BB=85=E5=B1=95=E7=A4=BA=E7=9A=84=E5=9C=B0=E6=96=B9=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=EF=BC=8C=E5=B7=B2=E5=9C=A8=E9=80=89=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E5=88=A0=E9=99=A4=EF=BC=88=E5=8C=85?=
 =?UTF-8?q?=E6=8B=AC=E5=8F=91=E5=B8=83=E9=A1=B5=E9=9D=A2=E5=92=8C=E5=B7=B2?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=9A=84=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=89=203=E3=80=81=E8=B6=B3=E8=BF=B9=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=8B=9B=E7=A7=9F?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=204=E3=80=81=E7=AD=BE=E5=88=B0=E7=9A=84?=
 =?UTF-8?q?=E8=B5=9A=E9=92=B1=E7=A7=AF=E5=88=86=E4=BB=BB=E5=8A=A1=E7=9A=84?=
 =?UTF-8?q?=E5=8E=BB=E5=8F=91=E5=B8=83=E4=BF=A1=E6=81=AF=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E5=85=88=E5=BC=B9=E6=A1=86=E6=8F=90=E7=A4=BA=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=80=9A=E8=BF=87=E5=90=8E=E6=89=8D=E5=8F=91?=
 =?UTF-8?q?=E6=94=BE=E7=A7=AF=E5=88=86=205=E3=80=81=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E4=BF=A1=E6=81=AF=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91=E5=AE=8C=E5=96=84=206=E3=80=81?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AE=A2=E5=8D=95=E5=9B=9B=E4=B8=AA=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=82=B9=E5=87=BB=E8=BF=9B=E5=8E=BB=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9B=B8=E5=BA=94=E7=9A=84=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/app/sign.vue             | 75 +++++++++++++++++++++++++++-
 pages/canteenRent/rentEdit.vue | 80 ++++++++++++++++++++----------
 pages/canteenRent/rentList.vue | 46 +++++++++++++++++
 pages/coupon/list.vue          | 12 +++--
 pages/index/fabu.vue           | 91 +++++++++++++++++++++++++++-------
 pages/index/user.vue           |  8 +--
 pages/order/list.vue           | 11 ++--
 pages/user/goods-log.vue       |  9 +++-
 8 files changed, 273 insertions(+), 59 deletions(-)

diff --git a/pages/app/sign.vue b/pages/app/sign.vue
index 66be885..5831640 100644
--- a/pages/app/sign.vue
+++ b/pages/app/sign.vue
@@ -84,7 +84,7 @@
 						</view>
 					</view>
 
-					<view class="signBtn" @click="toTabb('/pages/index/fabu')">
+					<view class="signBtn" @click="openFB">
 						去发布
 					</view>
 				</view>
@@ -205,6 +205,23 @@
 				</view>
 			</view>
 		</su-popup>
+		<!-- 去发布提示 -->
+		<su-popup :show="showFB == true" type="center" round="10" :isMaskClick="false">
+			<view class="popupContacted">
+				<view class="contactedBox">
+					<view
+						style="font-size: 36rpx;line-height: 50rpx;font-weight: 900;color: #3d3d3d;text-align: center;">
+						发布积分</view>
+					<view
+						style="font-size: 30rpx;line-height: 44rpx;font-weight: 400;color: #3d3d3d;text-align: center;">
+						发布审核通过后发放积分</view>
+				</view>
+				<view class="contactBtn">
+					<view class="tactBtnBox" style="color: #999999;" @click="showFB = false">取消</view>
+					<view class="tactBtnBox2" style="color: #323232;" @click="toTabb('/pages/index/fabu')">去发布</view>
+				</view>
+			</view>
+		</su-popup>
 	</s-layout>
 </template>
 
@@ -215,6 +232,7 @@
 		onReady
 	} from '@dcloudio/uni-app';
 	import {
+		ref,
 		computed,
 		reactive
 	} from 'vue';
@@ -390,6 +408,15 @@
 		})
 	}
 	
+	const showFB = ref(false)
+	function openFB() {
+		showFB.value = true;
+	}
+	function closeFB() {
+		showFB.value = false;
+	}
+	
+	
 	//分享功能
 	function showShare() {
 	  // 确保使用有效的图片URL
@@ -409,6 +436,52 @@
 </script>
 
 <style lang="scss" scoped>
+	.popupContacted {
+		width: 600rpx;
+		height: 300rpx;
+		background-color: #fff;
+		display: grid;
+		border-radius: 18rpx;
+	
+		.contactedBox {
+			width: 600rpx;
+			height: 146rpx;
+			padding: 30rpx 0;
+			// margin-top: 40rpx;
+			display: grid;
+			justify-content: center;
+			align-items: center;
+		}
+	
+		.contactBtn {
+			width: 600rpx;
+			height: 92rpx;
+			border-top: 1rpx solid #eeeeee;
+			display: flex;
+			border-radius: 0 0 18rpx 18rpx;
+			// margin-top: 40rpx;
+	
+			.tactBtnBox {
+				width: 300rpx;
+				height: 92rpx;
+				border-right: 1rpx solid #eeeeee;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+			
+			.tactBtnBox2 {
+				width: 300rpx;
+				height: 92rpx;
+				// border-right: 1rpx solid #eeeeee;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+	
+	}
+	
 	.header-box {
 		border-top: 2rpx solid rgba(#dfdfdf, 0.5);
 	}
diff --git a/pages/canteenRent/rentEdit.vue b/pages/canteenRent/rentEdit.vue
index 277c2f0..3e7dcf3 100644
--- a/pages/canteenRent/rentEdit.vue
+++ b/pages/canteenRent/rentEdit.vue
@@ -178,27 +178,6 @@
 		</su-popup>
 
 
-		<!-- 身份证是否认证 -->
-		<su-popup :show="cardShow == true" type="center" round="10" :isMaskClick="false">
-			<view class="popupContacted">
-				<view class="contactedBox">
-					<image style="width: 198rpx;height: 122rpx;position: relative;left: 12rpx;"
-						src="https://jiangxiaoxian.0rui.cn/couponSuccess.png"></image>
-					<view
-						style="font-size: 36rpx;line-height: 50rpx;font-weight: 900;color: #3d3d3d;text-align: center;">
-						身份认证</view>
-					<view
-						style="font-size: 30rpx;line-height: 44rpx;font-weight: 400;color: #3d3d3d;text-align: center;">
-						认证后即可发布信息</view>
-				</view>
-				<view class="contactBtn">
-					<view class="tactBtnBox" style="color: #999999;" @click="cardShow = false">取消</view>
-					<view class="tactBtnBox2" style="color: #323232;" @click="toPage('')">去认证</view>
-				</view>
-			</view>
-		</su-popup>
-
-
 		<!-- 省市区弹窗 -->
 		<su-regionCity-picker :show="state.showRegion" @cancel="state.showRegion = false" @confirm="onRegionConfirm">
 		</su-regionCity-picker>
@@ -510,12 +489,15 @@
 
 	//删除标签（本地）
 	function removebq(i) {
+		for (let w = 0; w < tagShowList.value.length; w++) {
+			if (tagShowList.value[w].name == selectTagslist.value[i].name) {
+				tagShowList.value[w].isSelect = false
+			}
+		}
 		selectTagslist.value.splice(i, 1);
 		tagSelectedNum.value -= 1;
 		console.log('删除标签', tagSelectedNum.value);
-		let arr = selectTagslist.value.map((item) => {
-			return item.name
-		})
+		
 	}
 
 	function change() {
@@ -530,7 +512,7 @@
 
 	//详情
 	function getDetail() {
-		console.log('详情',tagList.value);
+		console.log('详情1',tagList.value);
 		if(tagList.value.length == 0){
 			tagList.value = uni.getStorageInfoSync('tagList');
 			tagShowList.value = tagList.value
@@ -546,7 +528,7 @@
 					if (form.value.cate_ids.includes(obj.id)) {
 						acc.push(obj);
 					}
-					return acc;wwwwwwwwwwwwwwwwwwwwwww
+					return acc;
 				}, []);
 				tagSelectedNum.value = selectTagslist.value.length
 				form.value.area = form.value.address_city_text
@@ -687,6 +669,52 @@
 </script>
 
 <style lang="scss" scoped>
+	.popupContacted {
+		width: 660rpx;
+		height: 477rpx;
+		background-color: #fff;
+		display: grid;
+		border-radius: 18rpx;
+	
+		.contactedBox {
+			width: 660rpx;
+			height: 325rpx;
+			padding: 30rpx 0;
+			// margin-top: 40rpx;
+			display: grid;
+			justify-content: center;
+			align-items: center;
+		}
+	
+		.contactBtn {
+			width: 660rpx;
+			height: 92rpx;
+			border-top: 1rpx solid #eeeeee;
+			display: flex;
+			border-radius: 0 0 18rpx 18rpx;
+			// margin-top: 40rpx;
+	
+			.tactBtnBox {
+				width: 330rpx;
+				height: 92rpx;
+				border-right: 1rpx solid #eeeeee;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+			
+			.tactBtnBox2 {
+				width: 330rpx;
+				height: 92rpx;
+				// border-right: 1rpx solid #eeeeee;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+	
+	}
+	
 	.checkedLabel {
 		width: 690rpx;
 		display: flex;
diff --git a/pages/canteenRent/rentList.vue b/pages/canteenRent/rentList.vue
index 0d6e987..14c6d09 100644
--- a/pages/canteenRent/rentList.vue
+++ b/pages/canteenRent/rentList.vue
@@ -305,6 +305,52 @@
 </script>
 
 <style lang="scss" scoped>
+	.popupContacted {
+		width: 660rpx;
+		height: 477rpx;
+		background-color: #fff;
+		display: grid;
+		border-radius: 18rpx;
+	
+		.contactedBox {
+			width: 660rpx;
+			height: 325rpx;
+			padding: 30rpx 0;
+			// margin-top: 40rpx;
+			display: grid;
+			justify-content: center;
+			align-items: center;
+		}
+	
+		.contactBtn {
+			width: 660rpx;
+			height: 92rpx;
+			border-top: 1rpx solid #eeeeee;
+			display: flex;
+			border-radius: 0 0 18rpx 18rpx;
+			// margin-top: 40rpx;
+	
+			.tactBtnBox {
+				width: 330rpx;
+				height: 92rpx;
+				border-right: 1rpx solid #eeeeee;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+			
+			.tactBtnBox2 {
+				width: 330rpx;
+				height: 92rpx;
+				// border-right: 1rpx solid #eeeeee;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+	
+	}
+	
 	.search-result {
 		padding-top: 10px;
 		padding-bottom: 20px;
diff --git a/pages/coupon/list.vue b/pages/coupon/list.vue
index 7d312a1..d354e8b 100644
--- a/pages/coupon/list.vue
+++ b/pages/coupon/list.vue
@@ -1,6 +1,6 @@
 <!-- 优惠券中心  -->
 <template>
-	<s-layout title="我的优惠券" :bgStyle="{ color: '#f2f2f2' }">
+	<s-layout title="我的优惠券">
 		<view class="container">
 			<!-- tabs页签 -->
 			<view class="tabs-box">
@@ -10,7 +10,7 @@
 			<!-- 可兑换券列表 -->
 			<scroll-view @scrolltolower="onScrolltolower" :refresher-enabled="true" :refresher-triggered="homrS"
 				@refresherrefresh="onS" scroll-y="true" class="flex align-items"
-				style="height: 85vh;box-sizing: border-box;margin-top: 30rpx;">
+				style="height: 83vh;box-sizing: border-box;margin-top: 30rpx;">
 				<!-- 满减券 -->
 				<view class="exChangeBox" v-if="currentTab == 0">
 					<view class="couponsListFull">
@@ -114,7 +114,9 @@
 		listQuery.value.limit = 10;
 		listQuery.value.list_rows = 10
 		couponFullList.value = []
-		couponTimesCount.value = []
+		couponFullCount.value = 0;
+		couponTimesList.value = [];
+		couponTimesCount.value = 0;
 		if (currentTab.value == 0) {
 			getCouponFullList();
 		} else {
@@ -252,7 +254,7 @@
 		// getCouponList();
 	}
 
-	onLoad(() => {
+	onShow(() => {
 		getCouponFullList();
 	});
 </script>
@@ -330,10 +332,10 @@
 	.c9 {
 		color: #999999;
 	}
+	
 
 	.container {
 		background-color: #f7f7f7;
-		height: 100vh;
 
 		.exChangeBox {
 			// height: 80vh;
diff --git a/pages/index/fabu.vue b/pages/index/fabu.vue
index a40c01f..941c8c9 100644
--- a/pages/index/fabu.vue
+++ b/pages/index/fabu.vue
@@ -195,7 +195,7 @@
 				</view>
 				<view class="contactBtn">
 					<view class="tactBtnBox" style="color: #999999;" @click="cardShow = false">取消</view>
-					<view class="tactBtnBox2" style="color: #323232;" @click="toPage('')">去认证</view>
+					<view class="tactBtnBox2" style="color: #323232;" @click="toAuthen()">去认证</view>
 				</view>
 			</view>
 		</su-popup>
@@ -342,8 +342,9 @@
 	const Negotiate = ref('') //富文本
 	const cardShow = ref(false) //身份认证
 	const status = ref(0)
-	
+
 	onShow(() => {
+		getAuthentied();
 		getFbKnow();
 		getTagList();
 		getTypeList();
@@ -352,10 +353,10 @@
 	function getAuthentied() {
 		sheep.$api.rent.isAuthentied().then((res) => {
 			if (res.code == 1) {
-				if (res.data != 1) {
-					cardShow.value = true;
-				} else {
+				if (res.data.status == 1) {
 					cardShow.value = false;
+				} else {
+					cardShow.value = true;
 				}
 			}
 		})
@@ -370,10 +371,12 @@
 			}
 		})
 	}
-	const toPage = () => {
+
+	function toAuthen() {
 		if (isLogin.value == true) {
+			cardShow.value = false
 			uni.navigateTo({
-				url: e
+				url: '/pages/user/authentication'
 			})
 		} else {
 
@@ -382,7 +385,7 @@
 				icon: 'none',
 				duration: 2000
 			})
-
+			cardShow.value = false
 			setTimeout(function() {
 				uni.switchTab({
 					url: '/pages/index/user'
@@ -499,12 +502,16 @@
 
 	//删除标签（本地）
 	function removebq(i) {
+		console.log('删除标签1', i, selectTagslist.value[i].name);
+		for (let w = 0; w < tagShowList.value.length; w++) {
+			if (tagShowList.value[w].name == selectTagslist.value[i].name) {
+				tagShowList.value[w].isSelect = false
+			}
+		}
+		console.log('删除标签2', tagShowList.value);
 		selectTagslist.value.splice(i, 1);
 		tagSelectedNum.value -= 1;
-		console.log('删除标签', tagSelectedNum.value);
-		let arr = selectTagslist.value.map((item) => {
-			return item.name
-		})
+		console.log('删除标签3', tagSelectedNum.value);
 	}
 
 	function change() {
@@ -522,13 +529,13 @@
 		sheep.$api.rent.rentInfo(rentEditId.value).then((res) => {
 			if (res.code == 1) {
 				form.value = res.data,
-				selectTagslist.value = tagList.value.reduce((acc, obj) => {
-					if (form.value.cate_ids.includes(obj.id)) {
-						acc.push(obj);
-					}
-					return acc;
-				}, []);
-				console.log('详情',selectTagslist.value);
+					selectTagslist.value = tagList.value.reduce((acc, obj) => {
+						if (form.value.cate_ids.includes(obj.id)) {
+							acc.push(obj);
+						}
+						return acc;
+					}, []);
+				console.log('详情', selectTagslist.value);
 			}
 		})
 	}
@@ -651,6 +658,52 @@
 </script>
 
 <style lang="scss" scoped>
+	.popupContacted {
+		width: 660rpx;
+		height: 477rpx;
+		background-color: #fff;
+		display: grid;
+		border-radius: 18rpx;
+
+		.contactedBox {
+			width: 660rpx;
+			height: 325rpx;
+			padding: 30rpx 0;
+			// margin-top: 40rpx;
+			display: grid;
+			justify-content: center;
+			align-items: center;
+		}
+
+		.contactBtn {
+			width: 660rpx;
+			height: 92rpx;
+			border-top: 1rpx solid #eeeeee;
+			display: flex;
+			border-radius: 0 0 18rpx 18rpx;
+			// margin-top: 40rpx;
+
+			.tactBtnBox {
+				width: 330rpx;
+				height: 92rpx;
+				border-right: 1rpx solid #eeeeee;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+
+			.tactBtnBox2 {
+				width: 330rpx;
+				height: 92rpx;
+				// border-right: 1rpx solid #eeeeee;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+
+	}
+
 	.checkedLabel {
 		width: 690rpx;
 		display: flex;
diff --git a/pages/index/user.vue b/pages/index/user.vue
index c1b3cf0..609ddec 100644
--- a/pages/index/user.vue
+++ b/pages/index/user.vue
@@ -70,19 +70,19 @@
 						</view>
 					</view>
 					<view class="myOrder-second">
-						<view class="pendingBox" @click="toPage('/pages/order/list')">
+						<view class="pendingBox" @click="toPage('/pages/order/list?type=1')">
 							<image class="pendImg" src="https://jiangxiaoxian.0rui.cn/pendPay.png"></image>
 							<view class="fs-28 weight4" style="margin-top: 20rpx;color: #3d3d3d;">待支付</view>
 						</view>
-						<view class="pendingBox" @click="toPage('/pages/order/list')">
+						<view class="pendingBox" @click="toPage('/pages/order/list?type=2')">
 							<image class="pendImg" src="https://jiangxiaoxian.0rui.cn/shipment.png"></image>
 							<view class="fs-28 weight4" style="margin-top: 20rpx;color: #3d3d3d;">待发货</view>
 						</view>
-						<view class="pendingBox" @click="toPage('/pages/order/list')">
+						<view class="pendingBox" @click="toPage('/pages/order/list?type=3')">
 							<image class="pendImg" src="https://jiangxiaoxian.0rui.cn/pendingDoods.png"></image>
 							<view class="fs-28 weight4" style="margin-top: 20rpx;color: #3d3d3d;">待收货</view>
 						</view>
-						<view class="pendingBox" @click="toPage('/pages/order/list')">
+						<view class="pendingBox" @click="toPage('/pages/order/list?type=4')">
 							<image class="pendImg" src="https://jiangxiaoxian.0rui.cn/completed.png"></image>
 							<view class="fs-28 weight4" style="margin-top: 20rpx;color: #3d3d3d;">已完成</view>
 						</view>
diff --git a/pages/order/list.vue b/pages/order/list.vue
index 7233993..aeb08bd 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -286,6 +286,7 @@
 
   // 切换选项卡
   function onTabsChange(e) {
+	  console.log('切换Tabs',e.index, e);
     if (state.currentTab === e.index) return;
 
     state.pagination = pagination;
@@ -473,9 +474,13 @@
   }
 
   onLoad(async (options) => {
-    if (options.type) {
-      state.currentTab = options.type;
-    }
+	  console.log('onLoad',options.type);
+    // if (options.type) {
+    //   state.currentTab = options.type;
+    // }
+	if(options.type) {
+		state.currentTab = options.type;
+	}
     getOrderList();
   });
 
diff --git a/pages/user/goods-log.vue b/pages/user/goods-log.vue
index 821c6d9..ea51e4b 100644
--- a/pages/user/goods-log.vue
+++ b/pages/user/goods-log.vue
@@ -7,7 +7,7 @@
 				<view class="cart-content">
 					<view class="goods-box ss-r-10 ss-m-b-14" v-for="(item, index) in feetHisList" :key="index">
 						<view class="dataBox">{{item.date_text}}</view>
-						<view class="rrecommList" v-for="(e,i) in item.log" :key="i">
+						<view class="rrecommList" v-for="(e,i) in item.log" :key="i" @click="toDetail(e)">
 							<view class="reListItem">
 								<!-- 左侧图片 -->
 								<view class="listItem-images">
@@ -188,6 +188,13 @@
 		loadStatus.value = "loading";
 		getFeetList();
 	}
+	
+	function toDetail(e){
+		console.log('跳转详情',e);
+		uni.navigateTo({
+			url:'/pages/canteenRent/rentDetail?id=' + e.id
+		})
+	}
 
 	const sys_navBar = sheep.$platform.navbar;
 	onReachBottom(() => {});