2023-12-8

2023-12-08 18:33:48 +08:00
parent 615911b6ee
commit b84753c252
6 changed files with 46 additions and 21 deletions
--- a/components/NavBar/NavBar.vue
+++ b/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;
+
 			}
 		}
 	}
--- a/pages.json
+++ b/pages.json
@@ -101,7 +101,7 @@
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
-		"navigationBarTitleText": "uni-app",
+		"navigationBarTitleText": "云菜窖",
 		"navigationBarBackgroundColor": "#FE9039",
 		"backgroundColor": "#FE9039"
 	},
--- a/pages/card/card.vue
+++ b/pages/card/card.vue
@@ -138,16 +138,16 @@
 			},
 			detail(item) {

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

 			},
--- a/pages/card/card_bind2.vue
+++ b/pages/card/card_bind2.vue
@@ -3,17 +3,18 @@
 	<!-- 扫码进入 携带参数 -->

 	<view style="display: flex;flex-direction: column;background-color: #fff;">
-	
+
 		<view class="top">
 			<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>
-	
+
 		<!-- <view style="display: flex;flex-direction: column;margin-top: -10vw;box-sizing: border-box;">
 			<view
 				style="display: flex;flex-direction: column;border-radius: 20rpx;background: #FFFFFF;z-index: 1;align-items: center;box-sizing: border-box;">
@@ -38,15 +39,15 @@
 			style="margin: 30px;background-color: #fd3655;width: calc(100% - 60px);border-radius: 100rpx;height: 80rpx;display: flex;flex-direction: column;align-items: center;line-height: 80rpx;color: #FFFFFF;font-size: 36rpx;"
 			@click="save">
 			绑定</view> -->
-	
+
 		<view style="display: flex;flex-direction: column;padding:20px;">
-	
+
 			<view style="display: flex;flex-direction: row;align-items: center;">
 				<view style="background: #FF9D33; border-radius: 50%;width: 12px;height: 12px;"></view>
 				<view style="background: #FFDAB2; border-radius: 50%;width: 12px;height: 12px;"></view>
 				<text style="margin-left: 8px;font-size: 18px;color: #333;">绑定云菜窖卡</text>
 			</view>
-	
+
 			<text style="margin-left: 8px;font-size: 14px;color: #333;margin-top: 20px;">提货编码</text>
 			<view style="display: flex;flex-direction: row;justify-content: space-between;
 				 background: #F8F8F8;border-radius: 5px;box-sizing: border-box;
@@ -65,7 +66,7 @@
 				<input maxlength="6" placeholder="请输入提货密码" style="font-size: 30rpx;flex: 1;padding-left: 10px;"
 					type="number" :value="page.codeKey" @input="onKeyInput2" />
 			</view>
-	
+
 			<view style="background: -webkit-linear-gradient(left,#FFB176,#FE923B); position: absolute; bottom: 30px; 
 				width: 90%;border-radius: 100rpx;height: 80rpx;display: flex;
 				flex-direction: column;align-items: center;line-height: 80rpx;color: #FFFFFF;font-size: 36rpx;" @click="save">
@@ -85,6 +86,12 @@
 				}
 			}
 		},
+		onUnload() {
+			let pages = getCurrentPages().length - 1;
+			wx.navigateBack({
+				delta: pages
+			})
+		},
 		onLoad(options) {
 			let _this = this;
 			wx.login({
@@ -132,8 +139,8 @@
 			});

 			if (options) {
-					console.log("options", options)
-					
+				console.log("options", options)
+
 				const q = decodeURIComponent(options.q) // 获取到二维码原始链接内容
 				console.log("二维码原始链接内容", q)

--- a/pages/card/card_detail.vue
+++ b/pages/card/card_detail.vue
@@ -26,6 +26,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;
--- a/pages/card/card_detail2.vue
+++ b/pages/card/card_detail2.vue
@@ -26,6 +26,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">