m 1 år sedan
förälder
incheckning
a13eb99b91

+ 1 - 1
src/components/custom-tab-bar/custom-tab-bar.vue

@@ -40,7 +40,7 @@
 					})
 				} else if (e == 'activity') {
 					uni.switchTab({
-						url: '/pages/lottery/index'
+						url: '/pages/activity/index'
 					})
 				} else if (e == 'user') {
 					uni.switchTab({

+ 1 - 1
src/pages.json

@@ -244,7 +244,7 @@
 			"pagePath": "pages/core/index",
 			"text": "商城"
 		}, {
-			"pagePath": "pages/lottery/index",
+			"pagePath": "pages/activity/index",
 			"text": "抽奖活动"
 		}, {
 			"pagePath": "pages/user/index",

+ 5 - 19
src/pages/activity/index.vue

@@ -1,23 +1,9 @@
 <template>
 	<view class="activity">
-		<!-- #ifdef MP-ALIPAY -->
-		<u-navbar title="免费抽奖" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" leftIconSize="0" />
-		<!-- #endif -->
-		<!-- #ifdef MP-WEIXIN -->
-		<u-navbar title="免费抽奖" :border="true" :placeholder="true" :autoBack="true" bgColor="#fff" />
-		<!-- #endif -->
-		<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
-		<view v-if="pagesNum > 1">
-			<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="免费抽奖" />
-		</view>
-		<view v-else>
-			<u-navbar leftIconSize="0" :placeholder="true" bgColor="#fff" :border="true" title="免费抽奖">
-				<view class="nav-left flex" slot="left" @click="$toIndex()">
-					<u-icon name="arrow-left" size="20" color="#333"></u-icon>
-				</view>
-			</u-navbar>
-		</view>
-		<!-- #endif -->
+		<u-navbar leftIconSize="0" :placeholder="true" bgColor="#ffffff">
+			<view slot="left" style="font-size: 32rpx;">免费抽奖</view>
+		</u-navbar>
+		
 		<view class="status">
 			<u-tabs @change="changeTab" :scrollable="false" :list="statusArr" lineWidth="34" lineHeight="3"
 				lineColor="#8E51F7" :activeStyle="{
@@ -70,7 +56,7 @@
 			</view>
 		</view>
 		<u-loadmore :line="true" v-if="list.length>5" :status="status" :loading-text="'努力加载中'" :nomore-text="'已经到底了'" />
-		<!-- <custom-tab-bar :activeValue="'activity'" /> -->
+		<custom-tab-bar :activeValue="'activity'" />
 	</view>
 </template>
 

+ 1 - 1
src/pages/lottery/index.vue

@@ -9,7 +9,7 @@
 		<view class="activity-item" @click="toGroupActivity">
 			拼团抽奖
 		</view>
-		<custom-tab-bar :activeValue="'activity'" />
+		<!-- <custom-tab-bar :activeValue="'activity'" /> -->
 	</view>
 </template>