2023-12-8

components/NavBar/NavBar.vue

@@ -165,7 +165,21 @@
 					") 0.75%,rgba(255,177,118," + x + ") 99.78%)"
 			},
 			clickIcon() {
-				uni.navigateBack()
+				// uni.navigateBack()
+
+				const pages = getCurrentPages()
+				// 有可返回的页面则直接返回，uni.navigateBack 默认返回失败之后会自动刷新页面 ，无法继续返回
+				if (pages.length > 1) {
+					uni.navigateBack(1)
+					return;
+				}else{
+					uni.switchTab({
+						url: '/pages/card/card'
+					})
+				}
+					
+				return;
+
 			}
 		}
 	}

pages.json

@@ -101,7 +101,7 @@
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
-		"navigationBarTitleText": "uni-app",
+		"navigationBarTitleText": "云菜窖",
 		"navigationBarBackgroundColor": "#FE9039",
 		"backgroundColor": "#FE9039"
 	},

pages/card/card.vue

@@ -138,15 +138,15 @@
 			},
 			detail(item) {
 
-				if (item.state == '失效') {
-					// 记录
+				if (item.showBtn) {
+					// 正常
 					uni.navigateTo({
-						url: '/pages/card/card_record?sid=' + item.sid
+						url: '/pages/card/card_detail?sid=' + item.sid
 					})
 				} else {
-					// 详情
+					// 过期 已完成
 					uni.navigateTo({
-						url: '/pages/card/card_detail?sid=' + item.sid
+						url: '/pages/card/card_detail2?sid=' + item.sid
 					})
 				}
 

pages/card/card_bind2.vue

@@ -8,8 +8,9 @@
 			<NavBar ref="nav" navTitle="绑定云菜窖卡" :showIcon="true" :start-change-height="page.startHeight"
 				:end-change-height="page.endHeight">
 			</NavBar>
-			<view >
-				<image src="https://supervise.yxtsoft.com/lpk/image/card_example.png" mode="scaleToFill" style="width: 100%;height: 70vw"></image>
+			<view>
+				<image src="https://supervise.yxtsoft.com/lpk/image/card_example.png" mode="scaleToFill"
+					style="width: 100%;height: 70vw"></image>
 			</view>
 
 		</view>
@@ -85,6 +86,12 @@
 				}
 			}
 		},
+		onUnload() {
+			let pages = getCurrentPages().length - 1;
+			wx.navigateBack({
+				delta: pages
+			})
+		},
 		onLoad(options) {
 			let _this = this;
 			wx.login({
@@ -132,7 +139,7 @@
 			});
 
 			if (options) {
-					console.log("options", options)
+				console.log("options", options)
 
 				const q = decodeURIComponent(options.q) // 获取到二维码原始链接内容
 				console.log("二维码原始链接内容", q)

pages/card/card_detail.vue

@@ -27,6 +27,8 @@
 			<image src="https://supervise.yxtsoft.com/lpk/image/giftpack.png" mode="aspectFit"
 				style="margin-left: 20px;margin-right: 20px; width: 80vw;height: 25vw;"></image>
 				
+				<text style="color: #fff;font-size: 18px;z-index: 10;position: absolute;margin-top: 11vw;">{{data.pname}}</text>
+
 		</view>
 		<loading-state ref="pageView" @request="request">
 
@@ -112,7 +114,7 @@
 
 			<view style="height: 50px;"></view>
 
-			<view  v-if="data.showBtn" style="width: 100%; background-color: #fff;height: 15vw;position: fixed;bottom: 0;overflow:hidden;
+			<view  v-if="data.notRese" style="width: 100%; background-color: #fff;height: 15vw;position: fixed;bottom: 0;overflow:hidden;
 			display: flex;flex-direction: row;" >
 				<view style="flex: 1;"></view>
 				<text style=" width: 20vw;font-size: 16px;color: #fff; background-color: #FF9D33;

pages/card/card_detail2.vue

@@ -27,6 +27,8 @@
 			<image src="https://supervise.yxtsoft.com/lpk/image/giftpack.png" mode="aspectFit"
 				style="margin-left: 20px;margin-right: 20px; width: 80vw;height: 25vw;"></image>
 				
+					<text style="color: #fff;font-size: 18px;z-index: 10;position: absolute;margin-top: 11vw;">{{data.pname}}</text>
+
 		</view>
 		<loading-state ref="pageView" @request="request">