2021-8-30

pages.json

@@ -1,144 +1,9 @@
-<<<<<<< HEAD
-{
-	"pages": [{
-			"path": "pages/index/index",
-			"style": {
-				"enablePullDownRefresh": true,
-				// #ifdef MP
-				"navigationStyle": "custom",
-				// #endif
-				// #ifndef MP
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent",
-						"searchInput": {
-							"backgroundColor": "rgba(231, 231, 231,.7)",
-							"borderRadius": "16px",
-							"placeholder": "请输入关键字",
-							"disabled": true,
-							"placeholderColor": "#606266",
-							"align": "left"
-						}
-					}
-				},
-				// #endif
-				"navigationBarTitleText": "商城首页"
-			}
-		},
-		{
-			"path": "pages/category/category",
-			"style": {
-				// #ifdef APP-PLUS
-				"navigationStyle": "custom",
-				// #endif
-				// #ifndef MP
-				"app-plus": {
-					"bounce": "none",
-					"titleNView": {
-						"searchInput": {
-							"backgroundColor": "rgba(231, 231, 231,.7)",
-							"borderRadius": "16px",
-							"placeholder": "商品搜索",
-							"disabled": true,
-							"placeholderColor": "#606266",
-							"align": "left"
-						}
-					}
-				},
-				// #endif
-				"navigationBarTitleText": "分类",
-				"navigationBarBackgroundColor":"#FFFFFF"
-			}
-		}, {
-			"path": "pages/cart/cart",
-			"style": {
-				"navigationBarTitleText": "购物车",
-				"navigationBarBackgroundColor":"#FFFFFF",
-				"navigationBarTextStyle":"black"
-			}
-		},
-		{
-			"path": "pages/user/user",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "个人中心"
-			}
-		},
-		{
-			"path": "pages/user/balance",
-					"style": {
-						"navigationBarTextStyle":"black",
-						"navigationBarBackgroundColor": "transparent",
-						"app-plus": {
-							"titleNView": {
-								"type": "float",
-								"titleText": "我的钱包"
-								}
-							}
-						}
-		},
-		{
-			"path": "pages/user/accounts",
-					"style": {
-						"navigationBarTextStyle":"black",
-						"navigationBarBackgroundColor": "transparent",
-						"app-plus": {
-							"titleNView": {
-								"type": "float",
-								"titleText": "我的佣金"
-								}
-							}
-						}
-		},
-		{
-			"path": "pages/user/integral",
-					"style": {
-						"navigationBarTextStyle":"black",
-						"navigationBarBackgroundColor": "transparent",
-						"app-plus": {
-							"titleNView": {
-								"type": "float",
-								"titleText": "我的积分"
-								}
-							}
-						}
-		},
-		{
-			"path": "pages/user/extend",
-					"style": {
-						"navigationBarTextStyle":"black",
-						"navigationBarBackgroundColor": "transparent",
-						"app-plus": {
-							"titleNView": {
-								"type": "float",
-								"titleText": "我的推广"
-								}
-							}
-						}
-=======
 {
 	"pages": [{
 			"path": "pages/index/index",
 			"style": {
 				"enablePullDownRefresh": true,
-
 				"navigationStyle": "custom",
-
-
-				// "app-plus": {
-				// 	"titleNView": {
-				// 		"type": "transparent",
-				// 		"searchInput": {
-				// 			"backgroundColor": "rgba(231, 231, 231,.7)",
-				// 			"borderRadius": "16px",
-				// 			"placeholder": "请输入关键字",
-				// 			"disabled": true,
-				// 			"placeholderColor": "#606266",
-				// 			"align": "left"
-				// 		}
-				// 	}
-				// },
-
 				"navigationBarTitleText": "商城首页"
 			}
 		},
@@ -173,7 +38,6 @@
 				"navigationBarBackgroundColor": "#FFFFFF",
 				"navigationBarTextStyle": "black"
 			}
->>>>>>> 4c6639bcd76c747d3f8c6a4ff42da6c240281c59
 		},
 		{
 			"path": "pages/user/user",
@@ -382,62 +246,6 @@
 					"navigationBarTitleText": "修改资料"
 				}
 			}
-<<<<<<< HEAD
-		},
-		{
-			"path": "pages/user/refer",
-			"style": {
-				"navigationBarTitleText": "提交成功",
-				"navigationBarBackgroundColor":"#FFFFFF",
-				"navigationBarTextStyle":"black"
-			}
-		},
-		{
-			"path": "pages/story/story",
-			"style": {
-				"navigationBarTitleText": "品牌中心",
-				"navigationBarBackgroundColor":"#FFFFFF",
-				"navigationBarTextStyle":"black"
-			}
-		}
-	],
-	"tabBar": {
-		"color": "#C0C4CC",
-		"selectedColor": "#5DBC7C",
-		"borderStyle": "black",
-		"backgroundColor": "#ffffff",
-		"list": [{
-				"pagePath": "pages/index/index",
-				"iconPath": "static/tabBar/tab-home.png",
-				"selectedIconPath": "static/tabBar/tab-home-current.png",
-				"text": "首页"
-			},
-			{
-				"pagePath": "pages/category/category",
-				"iconPath": "static/tabBar/tab-cate.png",
-				"selectedIconPath": "static/tabBar/tab-cate-current.png",
-				"text": "分类"
-			},
-			{
-				"pagePath": "pages/story/story",
-				"iconPath": "static/tabBar/tab-cart.png",
-				"selectedIconPath": "static/tabBar/tab-cart-current.png",
-				"text": "品牌故事"
-			},
-			{
-				"pagePath": "pages/cart/cart",
-				"iconPath": "static/tabBar/tab-cart.png",
-				"selectedIconPath": "static/tabBar/tab-cart-current.png",
-				"text": "购物车"
-			},
-			{
-				"pagePath": "pages/user/user",
-				"iconPath": "static/tabBar/tab-my.png",
-				"selectedIconPath": "static/tabBar/tab-my-current.png",
-				"text": "我的"
-			}
-		]
-=======
 		],
 		"tabBar": {
 			"color": "#C0C4CC",
@@ -476,5 +284,4 @@
 				}
 			]
 		}
->>>>>>> 4c6639bcd76c747d3f8c6a4ff42da6c240281c59
-	}
+		}