Merge pull request 'dengjie commit : tabbar和搜索框样式修改' (#8) from dengjie into dev

Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/8

pages.json

@@ -2,12 +2,12 @@
 	"easycom": {
 		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 	},
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		{
+	"pages": [{
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "食瞳",
-				// "navigationBarTextStyle": "white",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#12CA64",
 				//导航栏取消
 				// "navigationStyle": "custom",
 				//是否开启下拉刷新
@@ -18,6 +18,8 @@
 			"path": "pages/report/report",
 			"style": {
 				"navigationBarTitleText": "行业报告",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#12CA64",
 				"enablePullDownRefresh": false
 			}
 		},
@@ -25,13 +27,8 @@
 			"path": "pages/ideasAndNeeds/ideasAndNeeds",
 			"style": {
 				"navigationBarTitleText": "创意&需求",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/product/product",
-			"style": {
-				"navigationBarTitleText": "产品分类",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#12CA64",
 				"enablePullDownRefresh": false
 			}
 		},
@@ -39,6 +36,8 @@
 			"path": "pages/my/my",
 			"style": {
 				"navigationBarTitleText": "我的",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#12CA64",
 				"enablePullDownRefresh": false
 			}
 		}
@@ -66,12 +65,7 @@
 				"iconPath": "static/tabBar/sy_icon_cyh.png",
 				"selectedIconPath": "static/tabBar/sy_icon_cy.png"
 			},
-			{
-				"pagePath": "pages/product/product",
-				"text": "产品分类",
-				"iconPath": "static/tabBar/sy_icon_cph.png",
-				"selectedIconPath": "static/tabBar/sy_icon_cp.png"
-			},
+
 			{
 				"pagePath": "pages/my/my",
 				"text": "我的",

pages/index/index.vue

@@ -1,7 +1,13 @@
 <!-- 首页 -->
 <template>
 	<view>
-		首页1111
+		<view class="input_block">
+			<view class="input_block_border">
+				<u-input placeholder="搜索优质产品" placeholder-style="color: #969696" prefixIcon="search"
+					prefixIconStyle="font-size: 22px;color: #909399;margin-left:30rpx">
+				</u-input>
+			</view>
+		</view>
 	</view>
 </template>
 <script>
@@ -17,6 +23,28 @@
 	}
 </script>
 
-<style>
+<style lang="scss">
+	.input_block {
+		background: linear-gradient(135deg, #12CA64 0%, #1ACA67 100%);
 
+		.input_block_border {
+			width: 94.6%;
+			height: 124rpx;
+			background: linear-gradient(320deg, #36E182 0%, #26DD76 100%, #26DD76 100%);
+			margin: 0 auto;
+			box-shadow: 0 -1px 3px 0 #31B96D;
+			border-radius: 38rpx 38rpx 0 0;
+
+			.u-border {
+				border: none;
+				padding-top: 16px !important;
+
+				.u-input__content {
+					height: 64rpx;
+					border-radius: 32rpx;
+					background-color: #fff;
+				}
+			}
+		}
+	}
 </style>

pages/product/product.vue

@@ -1,4 +0,0 @@
-<!-- TabBar 文章资讯 -->
-<template>
-	<view>产品分类</view>
-</template>