Merge branch 'master' of http://git.shengws.com/xmg123/micro_vue

src/scrm_pages/activitylist/activitylist.vue

         },
         created(){
             const id = this.$route.query.id;
-           const orgid = this.$route.query.orgid;
-           console.log("id是多少",id)
+            const orgid = this.$route.query.orgid;
+            console.log("id是多少",id)
             console.log("orgid是多少",orgid)
             this.Activitiesmore(id,orgid)
         }

src/scrm_pages/micro/micro.vue

            getDefalutNavigationData(orgid).then(response=>{
              if(response.data.state == 1){
                var navigation =  response.data.data.navigation;
+               console.log("navigation是什么",navigation)
                this.navigationdata = navigation;
                
              }