隐藏展品人气展示

components/layout/nav-bar.vue

@@ -1,180 +1,197 @@
 <template>
-	<view v-if="!hideNavbar" class="nav-bar" :class="{ 'nav-bar-transparent': transparent,'hide_nav_bar':hideNavbar }">
-		<view class="nav-bar-status" :style="{ height: statusBarHeight + 'px' }"></view>
-		<view class="nav-bar-title">
-			<template v-if="showTitle">
-				<view class="btn-back" @click="goBack">
-					<van-icon name="arrow-left" />
-				</view>
-				<view class="nav-bar-title-text">{{ title }} </view>
-				<view></view>
-			</template>
-			<template v-else>
-				 <slot></slot>
-			</template>
-		</view>
-	</view>
+  <view v-if="!hideNavbar" class="nav-bar" :class="{ 'nav-bar-transparent': transparent,'hide_nav_bar':hideNavbar }">
+    <view class="nav-bar-status" :style="{ height: statusBarHeight + 'px' }"></view>
+    <view class="nav-bar-title">
+      <template v-if="showTitle">
+        <view class="btn-back" @click="goBack">
+          <van-icon name="arrow-left"/>
+        </view>
+        <view class="nav-bar-title-text">{{ title }}</view>
+        <view></view>
+      </template>
+      <template v-else>
+        <slot></slot>
+      </template>
+    </view>
+  </view>
 
 </template>
 
 <script>
-	export default {
-		props: {
-			title: String,
-			transparent: Boolean,
-			showTitle: {
-				type: Boolean,
-				default: true
-			}
-		},
-		computed: {
-			hasParent() {
-				return getCurrentPages().length > 1
-			}
-		},
+export default {
+  props: {
+    title: String,
+    transparent: Boolean,
+    showTitle: {
+      type: Boolean,
+      default: true
+    }
+  },
+  computed: {
+    hasParent() {
+      return getCurrentPages().length > 1
+    }
+  },
 
-		data() {
-			return {
-				hideNavbar: false,
-				titleBarHeight: 0,
-				statusBarHeight: 0,
-				isNotchScreen: false
-			}
-		},
-		created() {
-			const self = this
-			const windowInfo = uni.getWindowInfo()
-			this.statusBarHeight = windowInfo.statusBarHeight
-			const menuButtonInfo = uni.getMenuButtonBoundingClientRect()
-			this.titleBarHeight = (menuButtonInfo.top - this.statusBarHeight) * 2 + menuButtonInfo.height + (windowInfo.screenWidth / 750 * 16)
-			if (this.showTitle) {
-				uni.getSystemInfo({
-					success(res) {
-						const os = res.system.toLowerCase()
-						self.$config.os = os
-						if (os.includes('windows') || os.includes('mac')) {
-							self.$emit('init', {
-								detail: {
-									navbarHeight: 0,
-									pageHeight: windowInfo.screenHeight
-								}
-							})
-							self.hideNavbar = true
+  data() {
+    return {
+      hideNavbar: false,
+      titleBarHeight: 0,
+      statusBarHeight: 0,
+      isNotchScreen: false
+    }
+  },
+  created() {
+    const self = this
+    const windowInfo = uni.getWindowInfo()
+    this.statusBarHeight = windowInfo.statusBarHeight
+    const menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+    this.titleBarHeight = (menuButtonInfo.top - this.statusBarHeight) * 2 + menuButtonInfo.height + (windowInfo.screenWidth / 750 * 16)
+    if (this.showTitle) {
+      uni.getSystemInfo({
+        success(res) {
+          const os = res.system.toLowerCase()
+          self.$config.os = os
+          if (os.includes('windows') || os.includes('mac')) {
+            self.$emit('init', {
+              detail: {
+                navbarHeight: 0,
+                pageHeight: windowInfo.screenHeight
+              }
+            })
+            self.hideNavbar = true
 
-							// self.statusBarHeight = 0
-							// self.titleBarHeight = (windowInfo.screenWidth / 750 * 100)
-							// self.$emit('init', {
-							// 	detail: {
-							// 		navbarHeight: (windowInfo.screenWidth / 750 * 100),
-							// 		pageHeight: windowInfo.screenHeight -  (windowInfo.screenWidth / 750 * 100)
-							// 	}
-							// })
-						} else {
-							self.$emit('init', {
-								detail: {
-									navbarHeight: self.hideNavbar ? 0 : (self.statusBarHeight + self.titleBarHeight),
-									pageHeight: windowInfo.screenHeight - (self.hideNavbar ? 0 : (self.statusBarHeight + self.titleBarHeight)) - res.safeAreaInsets.bottom
-								}
-							})
-						}
-					}
-				})
-			} else {
-				uni.getSystemInfo({
-					success(res) {
-						const os = res.system.toLowerCase()
-						self.$config.os = os
-						if (os.includes('windows') || os.includes('mac')) {
-							self.statusBarHeight = 0
-							self.titleBarHeight = (windowInfo.screenWidth / 750 * 120)
-							self.$emit('init', {
-								detail: {
-									navbarHeight: (windowInfo.screenWidth / 750 * 120),
-									pageHeight: windowInfo.screenHeight -  (windowInfo.screenWidth / 750 * 120)
-								}
-							})
-						} else {
-							self.$emit('init', {
-								detail: {
-									navbarHeight: self.hideNavbar ? 0 : (self.statusBarHeight + self.titleBarHeight),
-									pageHeight: windowInfo.screenHeight - (self.hideNavbar ? 0 : (self.statusBarHeight + self.titleBarHeight))- res.safeAreaInsets.bottom
-								}
-							})
-						}
-					}
-				})
-			}
-			// this.$emit('init', {
-			// 	detail: {
-			// 		navbarHeight: self.hideNavbar ? 0 : (this.statusBarHeight + this.titleBarHeight),
-			// 		pageHeight: windowInfo.screenHeight - (self.hideNavbar ? 0 : (this.statusBarHeight + this.titleBarHeight))
-			// 	}
-			// })
-		},
-		methods: {
-			hasSlot() {
-				const nodes = this.getRelationNodes(`view`);
-				return nodes.length > 0;
-			},
-			goBack() {
-        this.refreshData()
-        if (this.hasParent) {
-          uni.navigateBack()
-        } else if(this.$store.getters.page.length > 0) {
-          this.$store.commit('DELETE_PAGE')
-          console.log(this.$store.getters.page)
-        } else {
-          this.navigateTo('/pages/index/index')
+            // self.statusBarHeight = 0
+            // self.titleBarHeight = (windowInfo.screenWidth / 750 * 100)
+            // self.$emit('init', {
+            // 	detail: {
+            // 		navbarHeight: (windowInfo.screenWidth / 750 * 100),
+            // 		pageHeight: windowInfo.screenHeight -  (windowInfo.screenWidth / 750 * 100)
+            // 	}
+            // })
+          } else {
+            self.$emit('init', {
+              detail: {
+                navbarHeight: self.hideNavbar ? 0 : (self.statusBarHeight + self.titleBarHeight),
+                pageHeight: windowInfo.screenHeight - (self.hideNavbar ? 0 : (self.statusBarHeight + self.titleBarHeight)) - res.safeAreaInsets.bottom
+              }
+            })
+          }
         }
-			}
-		}
-	}
+      })
+    } else {
+      uni.getSystemInfo({
+        success(res) {
+          const os = res.system.toLowerCase()
+          self.$config.os = os
+          if (os.includes('windows') || os.includes('mac')) {
+            self.statusBarHeight = 0
+            self.titleBarHeight = (windowInfo.screenWidth / 750 * 120)
+            self.$emit('init', {
+              detail: {
+                navbarHeight: (windowInfo.screenWidth / 750 * 120),
+                pageHeight: windowInfo.screenHeight - (windowInfo.screenWidth / 750 * 120)
+              }
+            })
+          } else {
+            self.$emit('init', {
+              detail: {
+                navbarHeight: self.hideNavbar ? 0 : (self.statusBarHeight + self.titleBarHeight),
+                pageHeight: windowInfo.screenHeight - (self.hideNavbar ? 0 : (self.statusBarHeight + self.titleBarHeight)) - res.safeAreaInsets.bottom
+              }
+            })
+          }
+        }
+      })
+    }
+    // this.$emit('init', {
+    // 	detail: {
+    // 		navbarHeight: self.hideNavbar ? 0 : (this.statusBarHeight + this.titleBarHeight),
+    // 		pageHeight: windowInfo.screenHeight - (self.hideNavbar ? 0 : (this.statusBarHeight + this.titleBarHeight))
+    // 	}
+    // })
+
+  },
+  methods: {
+    hasSlot() {
+      const nodes = this.getRelationNodes(`view`);
+      return nodes.length > 0;
+    },
+    goBack() {
+      const pages = getCurrentPages();
+      // 获取当前页面的实例
+      const currentPage = pages[pages.length - 1];
+      // 获取当前页面的路径
+      const currentPath = currentPage.route;
+      if (currentPath === 'pages/checkIn/activity-end') {
+        this.navigateTo('/pages/index/index')
+        return false
+      }
+
+      this.refreshData()
+      if (this.hasParent) {
+        uni.navigateBack()
+      } else if (this.$store.getters.page.length > 0) {
+        this.$store.commit('DELETE_PAGE')
+        console.log(this.$store.getters.page)
+      } else {
+        this.navigateTo('/pages/index/index')
+      }
+    }
+  }
+}
 </script>
 
 <style lang="scss">
 
-	.nav-bar {
-		background: linear-gradient( 270deg, #2b2359 9%, #405491 44%, #2b2359 92%), rgba(0,0,0,0.2);
-    width: 100%;
-    position: fixed;
-    left: 0;
-    z-index: 10;
-    height: $navBarHeight;
-    top: 0;
+.nav-bar {
+  background: linear-gradient(270deg, #2b2359 9%, #405491 44%, #2b2359 92%), rgba(0, 0, 0, 0.2);
+  width: 100%;
+  position: fixed;
+  left: 0;
+  z-index: 10;
+  height: $navBarHeight;
+  top: 0;
+  display: flex;
+  flex-direction: column;
+
+  &.nav-bar-transparent {
+    background: none;
+
+    .nav-bar-title {
+      view {
+        color: #333333;
+      }
+    }
+  }
+
+  .nav-bar-title {
     display: flex;
-    flex-direction: column;
-		&.nav-bar-transparent{
-			background: none;
-			.nav-bar-title{
-				view{
-					color: #333333;
-				}
-			}
-		}
-		.nav-bar-title{
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 0 16rpx;
-      flex: 1;
-      min-height: 1px;
-			view{
-				color: #ffffff;
-			}
-		}
-		.nav-bar-title-text{
-			flex: 1;
-			font-weight: 500;
-			font-size: $fontSize5;
-			//line-height: 42rpx;
-      line-height: 1.5;
-			text-align: left;
-			text-transform: none;
-			padding-left: 8rpx;
-		}
-		.btn-back{
-			padding: 0 6rpx;
-			cursor: pointer;
-		}
-	}
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 16rpx;
+    flex: 1;
+    min-height: 1px;
+
+    view {
+      color: #ffffff;
+    }
+  }
+
+  .nav-bar-title-text {
+    flex: 1;
+    font-weight: 500;
+    font-size: $fontSize5;
+    //line-height: 42rpx;
+    line-height: 1.5;
+    text-align: left;
+    text-transform: none;
+    padding-left: 8rpx;
+  }
+
+  .btn-back {
+    padding: 0 6rpx;
+    cursor: pointer;
+  }
+}
 </style>

pages.json

@@ -174,6 +174,13 @@
 			"style": {
 				"navigationBarTitleText": ""
 			}
+		},
+		{
+			"path": "pages/checkIn/activity-end",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
 		}
 	],
 	"globalStyle": {
@@ -199,7 +206,7 @@
 			{
 				"name": "单页面",
 				//模式名称
-				"path": "pages/user/award",
+				"path": "pages/checkIn/index",
 				//启动页面，必选
 				"query": "tab=exhibitor"
 				//启动参数，在页面的onLoad函数里面得到

pages/checkIn/activity-end.vue

@@ -0,0 +1,60 @@
+<template>
+  <page-layout>
+    <nav-bar title="福利嘉年华" @init="onInitNavbar"></nav-bar>
+    <u-scroll-view :tabbar-conflict="false">
+      <view class="activity-container">
+        <view class="text">
+          <view>本次活动已结束，</view>
+          <view>期待我们下一场福利大放送！</view>
+        </view>
+        <view class="btn" @click="backHome">
+          返回首页
+        </view>
+      </view>
+    </u-scroll-view>
+  </page-layout>
+
+</template>
+
+<script>
+import NavBar from '@/components/layout/nav-bar'
+import UScrollView from '@/components/common/u-scroll-view'
+import PageLayout from "@/components/layout/page-layout";
+    export default {
+      components: {
+        PageLayout,
+        NavBar,
+        UScrollView
+      },
+      data() {
+          return {};
+      },
+      methods: {
+        backHome() {
+          this.navigateTo('/pages/index/index')
+        }
+      }
+    }
+</script>
+
+<style lang="scss" scoped>
+.activity-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  grid-gap: 42rpx;
+  height: 100%;
+}
+.text {
+  font-size: 30rpx;
+  text-align: center;
+}
+.btn {
+  padding: 8rpx 34rpx;
+  border: 1rpx solid #4085C7;
+  border-radius: 50px;
+  font-size: 20rpx;
+  color: #4085C7;;
+}
+</style>

pages/checkIn/index.vue

@@ -91,6 +91,10 @@ export default {
       this.showLoading()
       getActivityInfo().then(res => {
           this.activityInfo = res.data
+        if (!this.activityInfo || this.activityInfo.length === 0) {
+          this.navigateTo('/pages/checkIn/activity-end')
+          return false
+        }
         this.hideLoading()
       })
     },