Merge branch 'master' into dev

# Conflicts:
#	layouts/default.vue
#	pages/job/index.vue

pages/job/index.vue

@@ -323,7 +323,13 @@
       setTimeout(() => {
         this.isShowDownLoad = true;
         console.log("this.isShowDownload=", this.isShowDownLoad);
-      }, 500);
+      }, 500)
+
+      let ua = navigator.userAgent;
+
+      this.isBaiduxapp = navigator.userAgent.indexOf('swan/') > -1;
+      console.log(this.$route.params);
+      this.isWxapp = this.$route.query.isWxMini && this.$route.query.isWxMini == 1;
     },
     methods: {
       //移动端选择器