Merge branch 'master' of http://git.ichunt.net/xiaokang/H5_2.0

App.vue

@@ -19,5 +19,8 @@ export default {
 uni-page-head {
     display: none;
 }
+body{
+	background: #f5f5f5;
+}
 /* #endif */
 </style>

assets/css/classp/map.scss

 
 .mapPage{
+	padding-bottom: 100rpx;
+	padding-top:88rpx;
 	.maphead{
 		position: fixed;
+		top:0rpx;
+		left:0rpx;
 		width:100%;
 		height:88rpx;
 		font-size: 34rpx;
@@ -9,4 +13,52 @@
 		color:$uni-color333;
 		background: #F5F5F7;
 	}
+	.mapcons{
+		padding:0 24rpx;
+		.c-lp{
+			width:180rpx;
+			.item{
+				width:180rpx;
+				font-weight: 400;
+				font-size: 24rpx;
+				color:$uni-color999;
+				margin-bottom: 50rpx;
+				cursor: pointer;
+				&.act{
+					color:$uni-coloract;
+				}
+			}
+		}
+		.c-rp{
+			width:494rpx;
+			.item{
+				background: #fff;
+				border-radius: 10rpx;
+				margin-bottom: 27rpx;
+				box-sizing: border-box;
+				padding:24rpx;
+				.title{
+					color:$uni-color333;
+					font-size: 26rpx;
+					font-weight: 600;
+					margin-bottom: 25rpx;
+					.icon{
+						font-size: 32rpx;
+						font-weight: normal;
+						color:#d1d1d1;
+					}
+				}
+				.lastbox{
+					flex-wrap: wrap;
+				}
+				.lasttitle{
+					width:210rpx;
+					color:$uni-color666;
+					font-size: 24rpx;
+					margin-bottom: 12rpx;
+				}
+			}
+		}
+		
+	}
 }
\ No newline at end of file

assets/css/index/index.scss

 .indexPage{
 	padding-bottom: 100rpx;
+	background:#fff;
 }
 
 

assets/css/search/search.scss

+.searchIndex{
+	background: #fff;
+	height:100vh;
+}
 .header{
 	width: 750rpx;
 	height: 88rpx;

pages/classp/map.vue

@@ -2,17 +2,36 @@
 
 	<view class="page mapPage">
 		<div class="maphead row verCenter rowCenter">分类选型</div>
+		<div class="mapcons row bothSide">
+			<div class="c-lp" >
+				<view class="item " @click="tab(item.bcat_id)" v-for="(item,index) in obj" :key="index">{{item.bcat_name}}</view>
+			</div>
+			<div class="c-rp">
+				<view v-for="(item,index) in obj" :key="index">
+					<view class="item" v-for="(item1,index1) in item.classify" :key="index1">
+						<navigator url="" class="row bothSide title">
+							<text>{{item1.class_name}}</text>
+							<text class="icon iconfont icon-jt"></text>
+						</navigator>
+						<view class="lastbox row bothSide">
+							<navigator url="" class="row bothSide lasttitle" v-for="(item2,index2) in item1.lower" :key="index2">{{item2.class_name}}</navigator>
+						</view>
+					</view>
+				</view>
+				
+			</div>
+		</div>
 		<bottomNavFixed actval="2" />
 	</view>
 </template>
 <script>
-	import {Ichunt_Api,Api_Url} from '@/util/api.js';
+	import {Ichunt_Api} from '@/util/api.js';
 	import bottomNavFixed from '@/components/bottom_nav.vue';
 	export default {
 		data() {
 			return {
-			
-				
+				obj:"",
+					
 			};
 		},
 
@@ -23,15 +42,15 @@
 	
 
 		methods: {
-			
-			getData() {
+			tab(id_){
 				
-				
-				// this.request(Api_Url + "/msg/allnum", 'POST', {}, ).then(res => {
-				// 	if (res.err_code === 0) {
-				// 		this.newscount=res.data
-				// 	}
-				// });
+			},
+			getData() {
+				this.request(Ichunt_Api + "/api/classify/getClassifyMap", 'GET', {}, ).then(res => {
+					if (res.err_code === 0) {
+						this.obj=res.data
+					}
+				});
 			}
 		},
 		components: {

pages/index/index.vue

@@ -175,7 +175,7 @@
 
 		onShow() {
 			this.getData();
-
+		
 		},
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
@@ -208,6 +208,7 @@
 				this.request(Ichunt_Api + "/api/index/index", 'GET', {}, ).then(res => {
 					if (res.err_code === 0) {
 						this.obj = res.data;
+						clearInterval(this.intervalHandler)
 						if(this.obj.h5_home_notice.length<=1){
 							return
 						}