Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/cats/cats.vue

@@ -101,6 +101,7 @@ export default {
 		  Type:1,
 		  Style:1
 	  },
+	  cat_id:''
     };
   },
   components: {
@@ -118,7 +119,7 @@ export default {
     style10,
     style11,
   },
-  onLoad() {
+  onLoad(option) {
     this.navHeight = this.$navHeight - 2;
     // this.cstyle = uni.getStorageSync("basedata")
     //   ? uni.getStorageSync("basedata").cat_style
@@ -131,6 +132,9 @@ export default {
       //   left: "0",
       // };
     }
+	if(option&&option.cat_id){
+		this.cat_id=option.cat_id;
+	}
   },
   mounted() {
     let currentPages = getCurrentPages();
@@ -161,7 +165,9 @@ export default {
 		this.request2(
 			{
 				url: '/api/AppletGoods/GetProductCategoryTreeList',
-				data: {}
+				data: {
+					RootId:this.cat_id
+				}
 			},
 			res => {
 				console.log("res",res);