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

assets/css/brand/brand.scss

+.brandpage{
+	height:100vh;
+	background: linear-gradient(200deg, #D6E8FF 0%, #F5F5F7 554rpx);
+	padding-top:88rpx;
+	.header{
+		height:88rpx;
+		background: linear-gradient(200deg, #D6E8FF 0%, #F5F5F7 554rpx);
+		box-sizing: border-box;
+		padding:0 32rpx;
+		position: fixed;
+		top:0rpx;
+		left:0rpx;
+		.icon-arrleft{
+			font-size: 44rpx;
+			color:$uni-color999;
+			margin-right: 22rpx;
+		}
+		.inputbox{
+			width: 538rpx;
+			height: 66rpx;
+			background: #FFFFFF;
+			border-radius: 33rpx;
+			padding-left: 16rpx;
+			box-sizing: border-box;
+			border:1rpx solid #fff;
+			.icon-search{
+				color:#c2c4cc;
+				font-size: 34rpx;
+				margin-right: 11rpx;
+			}
+			input{
+				height: 66rpx;
+				line-height: 66rpx;
+				width:300rpx;
+				font-size: 24rpx;
+				color:$uni-color666;
+				
+			}
+		}
+		.icon-car{
+			font-size: 44rpx;
+			color:$uni-color999;
+			margin-left: 27rpx;
+		}
+		.searchbtn{
+			font-size: 28rpx;
+			color:$uni-coloract;
+			font-weight: 400;
+			margin-left: 28rpx;
+			display: none;
+		}
+		&.act{
+			.inputbox{
+				border:1rpx solid $uni-coloract;
+			}
+			.icon-car{
+				display: none;
+			}
+			.searchbtn{
+				display: block;
+			}
+		}
+	}
+	.brandinfo{
+		padding:24rpx;
+		.tp1{
+			height:101rpx;
+			image{width:180rpx;height:101rpx;}
+			font-size: 28rpx;
+			font-weight: 600;
+			color:$uni-color333;
+		}
+		.tp2{
+			padding:12rpx;
+			border-bottom: 1rpx solid #fff;
+			color:$uni-color666;
+			font-size: 24rpx;
+			font-weight: 400;
+			line-height: 46rpx;
+			box-sizing: content-box;
+			&.zazts{height:88rpx;}
+		}
+		.zkbtnsi{
+			color:$uni-coloract;
+			font-size: 24rpx;
+			width:150rpx;
+			text-align: center;
+			cursor: pointer;
+			margin:24rpx auto;
+			height:33rpx;
+			.icon{font-size: 32rpx;margin-left: 12rpx;}
+		}
+	}
+
+}
\ No newline at end of file

components/addcar.vue

@@ -151,7 +151,7 @@
 				}
 			},
 			getData:function(goods_id){
-				this.request(Api_Url + "/goods/detail", 'POST', {id:this.goods_id},true,true).then(res => {
+				this.request(Api_Url + "/goods/detail", 'POST', {id:goods_id},true,true).then(res => {
 					
 					if (res.error_code == 0) {
 					

pages.json

@@ -36,6 +36,12 @@
             }
         },
 		{
+		    "path": "pages/brand/brand",
+		    "style": {
+		        "navigationBarTitleText": "品牌详情"
+		    }
+		},
+        {
             "path": "pages/mine/login",
             "style": {
                 "navigationBarTitleText": "登录"

pages/brand/brand.vue

+<template>
+	<view class="brandpage">
+		<view class="header row verCenter " :class="{'act':isSearch}">
+			<text v-back class="icon iconfont icon-arrleft"></text>
+			<view class="inputbox row verCenter" >
+				<text class="icon iconfont icon-search "></text>
+				<input   placeholder="在此品牌下搜索型号" @focus="isSearch=!isSearch" @blur="isSearch=!isSearch" />
+			</view>
+			<navigator url="/joincart">
+				<text class="icon iconfont icon-car"></text>
+			</navigator>
+			<view class="searchbtn">搜索</view>
+		</view>
+		<view class="brandinfo">
+			<view class="tp1 row bothSide verCenter">
+				<image src="https://img.ichunt.com/images/brands/174.png"></image>
+				<text>关于ADI</text>
+			</view>
+			<view class="tp2 " :class="{'zazts elep2':!zkshow}">
+				Analog Devices以追求创新、品质和卓越为使命，是一家历史悠久，成长迅速的技术公司。Analog Devices的客户逾Analog Devices以追求创新、品质和卓越为使命，是一家历史悠久，成长迅速的技术公司。Analog Devices的客户逾……
+			</view>
+			<view class="zkbtnsi row verCenter" v-show="!zkshow" @click="zkshow=!zkshow">展开详情<text class="icon iconfont icon-arrbot"></text></view>
+			<view class="zkbtnsi row verCenter" v-show="zkshow" @click="zkshow=!zkshow">收起详情<text class="icon iconfont icon-arrtop"></text></view>
+		</view>
+		<addCar ref="addCarPop" />
+	</view>
+</template>
+
+<script>
+	import addCar from '@/components/addcar.vue';
+	export default {
+		data() {
+			return {
+				brand_id:"",
+				isSearch:false,
+				zkshow:false
+			}
+		},
+		onLoad: function(option) {
+			this.brand_id = this.$Route.query.brand_id;
+			console.log(this.brand_id);
+		},
+		methods: {
+			getData() {
+			
+			},
+			addcarpopfunc(goods_id) {
+				this.$refs.addCarPop.addcarpopfunc(goods_id);
+			}
+			
+		},
+		components: {
+			addCar
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import '../../assets/css/brand/brand.scss';
+</style>
\ No newline at end of file

pages/classp/list.vue

@@ -106,7 +106,6 @@
 						this.page++;
 						let newDataList = res.data.goods_lists||[];
 						this.list = this.list.concat(newDataList);
-						console.log(newDataList,this.list)
 						if (newDataList.length <this.page_size) {
 						  this.isLoadEnd = true;
 						}

router/index.js

@@ -58,6 +58,13 @@ const router = new Router({
             }
         },
 		{
+		    path: '/pages/brand/brand',
+		    aliasPath: '/brand/:brand_id',
+		    meta: {
+		        title: '品牌详情'
+		    }
+		},
+        {
             path: '/pages/mine/login',
             aliasPath: '/login',
             meta: {

util/util.js

@@ -15,7 +15,8 @@ const request = (url = '', type = 'GET', param = {}, Loading, headertype) => {
         pf: 2
     });
     //请求es相关
-    if (url.indexOf("so12.ichunt.") != -1 || url.indexOf("/esapi/") != -1) {
+	console.log(url)
+    if (url.indexOf("so12.ichunt.") != -1 || url.indexOf("/esapi/") != -1|| url.indexOf("/goods/detail") != -1) {
         params = Object.assign(param, { hkyefgyd: 1 });
     }