2023-10-6

pages.json

@@ -35,12 +35,9 @@
 					"navigationStyle": "custom"
 				}
 		},
-<<<<<<< HEAD
 		
 		
 		
-=======
->>>>>>> 5484fdcffd2d98e5c349c7b62d17099d3096b743
 		{
 			"path": "pages/public/register",
 			"style": {
@@ -86,12 +83,19 @@
 			}
 		},
 		
+		
+		
+		
+		
 		{
 			"path": "pages/set/set",
 			"style": {
 				"navigationBarTitleText": "设置"
 			}
 		},
+		
+		
+		
 		{
 			"path": "pages/set/phone",
 			"style": {
@@ -159,6 +163,10 @@
 				}
 			}
 		},
+		
+		
+		
+		
 		{
 			"path": "pages/money/paySuccess",
 			"style": {
@@ -346,58 +354,36 @@
 		"selectedColor": "#FEB041 ",
 		"borderStyle": "black",
 		"backgroundColor": "#000000",
-<<<<<<< HEAD
 		"list": [{
-			    // "visible":false,
-=======
-		"list": [
-			{
-				"visible":false,
->>>>>>> 5484fdcffd2d98e5c349c7b62d17099d3096b743
+			    "visible":false,
 				"pagePath": "pages/index/index",
 				"iconPath": "static/tabBar/shouye.png",
 				"selectedIconPath": "static/tabBar/shouye-home.png",
 				"text": "首頁"
 			},
 			{
-<<<<<<< HEAD
-				// "visible":false,
-=======
 				"visible":false,
->>>>>>> 5484fdcffd2d98e5c349c7b62d17099d3096b743
 				"pagePath": "pages/index/pledge",
 				"iconPath": "static/tabBar/baoya.png",
 				"selectedIconPath": "static/tabBar/baoya-home.png",
 				"text": "質押"
 			},
 			{
-<<<<<<< HEAD
-				// "visible":false,
-=======
 				"visible":false,
->>>>>>> 5484fdcffd2d98e5c349c7b62d17099d3096b743
 				"pagePath": "pages/index/entertainment",
 				"iconPath": "static/tabBar/huyu.png",
 				"selectedIconPath": "static/tabBar/huyu-home.png",
 				"text": "互娛"
 			},
 			{
-<<<<<<< HEAD
-				// "visible":false,
-=======
 				"visible":false,
->>>>>>> 5484fdcffd2d98e5c349c7b62d17099d3096b743
 				"pagePath": "pages/index/information",
 				"iconPath": "static/tabBar/zixun.png",
 				"selectedIconPath": "static/tabBar/zixun-home.png",
 				"text": "資訊"
 			},
 			{
-<<<<<<< HEAD
-				// "visible":false,
-=======
 				"visible":false,
->>>>>>> 5484fdcffd2d98e5c349c7b62d17099d3096b743
 				"pagePath": "pages/index/user",
 				"iconPath": "static/tabBar/my.png",
 				"selectedIconPath": "static/tabBar/my-home.png",

pages/index/entertainment.vue

@@ -198,14 +198,19 @@
 			</view>
 		</view>
 		<view class="aaa"></view>
+		<taber tab='entertainment'></taber>
 	</view>
 </template>
 
 <script>
 	import * as echarts from "echarts";
 	import { getGame, SZlineData } from "@/api/game.js";
+	import taber from "@/components/footer/footer.vue";
 
 	export default {
+		components: {
+			taber
+		},
 		data() {
 			return {
 				data: [

pages/index/information.vue

@@ -33,11 +33,16 @@
 			項目亮點
 		</view>
 		<image class="img" src="../../static/img/zixun5.png" mode="" ></image>
+		<taber tab='information'></taber>
 	</view>
 </template>
 
 <script>
+	import taber from "@/components/footer/footer.vue";
 	export default {
+		components: {
+			taber
+		},
 		data() {
 			return {};
 		},

pages/index/user.vue

@@ -120,10 +120,11 @@
 		</view>
 		
 		<view class="" style="width: 750rpx; height: 30rpx; background-color: #000;"></view>
+		<taber tab='user'></taber>
 	</view>
-	
 </template>
 <script>
+	import taber from "@/components/footer/footer.vue";
 	import {
 		mapState,
 		mapMutations
@@ -144,9 +145,11 @@
 		moveY = 0,
 		pageAtTop = true;
 	export default {
+		
 		components: {
-			uniList,
-			uniListItem
+			// uniList,
+			// uniListItem,
+			taber
 		},
 		data() {
 			return {