Merge branch 'dev-market-20200813' of...

Merge branch 'dev-market-20200813' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-market-20200813

src/views/goods/goods-manage.vue

@@ -199,7 +199,7 @@
           goodsType	:'',
           pageNo:1,
           pageSize:	10,
-
+          storeId:0,
         },
         selectList:[],
         batchParm:{
@@ -221,7 +221,10 @@
     created() {
       this.getLists()
       this.getLever()
-
+      const {storeId} = this.$route.query
+      if(storeId){
+        this.searchForm.storeId = storeId
+      }
     },
     filters:{
       rangeType(type){