Merge pull request 'chenxuelian' (#45) from chenxuelian into dev

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

packageSearch/goods-category-search/category-index.vue

@@ -199,14 +199,15 @@
 				isAllData: false
 			}
 		},
-		onLoad() {
+		onLoad(options) {
+			console.log(options)
 			const menuButtonInfo = uni.getMenuButtonBoundingClientRect();
 			this.searchBarTop = menuButtonInfo.top;
 			this.searchBarHeight = menuButtonInfo.height;
 			this.imgUrl = uni.getStorageSync('img_url')
 			this.goodsList = []
 			this.isAllData = false
-			this.getCategoryList()
+			this.getCategoryList(options.categoryId)
 		},
 		onReady() {
 			let that = this;
@@ -303,13 +304,17 @@
 					url: '../search/search'
 				})
 			},
-			getCategoryList() {
+			getCategoryList(selectedCategoryId) {
 				this.$apiServe.getCategories().then(res => {
 					this.categoryList = res.data.data.map((item, index) => {
 						item.icon = this.imgUrl + item.icon
-						if (this.selectedCategory && this.selectedCategory === index) {
+						if(selectedCategoryId && selectedCategoryId === item.id) {
 							item.active = true
-						} else if (!this.selectedCategory && !index) {
+							this.selectedCategory = index
+						} else if (selectedCategoryId === null && this.selectedCategory && this.selectedCategory === index) {
+							item.active = true
+							active = true
+						} else if (selectedCategoryId === null && !this.selectedCategory && !index) {
 							item.active = true
 						} else {
 							item.active = false

pages/index/index.vue

@@ -13,7 +13,7 @@
 			<!-- 分类模块 -->
 			<view class="classify">
 				<u-grid :border="false" col="5">
-					<u-grid-item v-for="(listItem,listIndex) in classifyList" :key="listIndex" @click="toClassify()">
+					<u-grid-item v-for="(listItem,listIndex) in classifyList" :key="listIndex" @click="toClassify(listItem.id)">
 						<u--image :src="imgUrl+listItem.icon" width="86rpx" height="86rpx" :lazy-load="true">
 						</u--image>
 						<!-- <u-icon size="86rpx" :name="listItem.icon"></u-icon> -->
@@ -173,9 +173,9 @@
 				})
 			},
 			//点击一级分类跳转到分类页
-			toClassify() {
+			toClassify(id) {
 				uni.navigateTo({
-					url: '../../packageSearch/goods-category-search/category-index'
+					url: '../../packageSearch/goods-category-search/category-index?categoryId=' + id
 				})
 			},
 			getImgUrl() {