Merge branch 'master' of http://119.23.72.7/liangjianmin/h5

src/views/download/Index.vue

@@ -82,11 +82,29 @@
     computed: {
     computed: {
       ...mapState({
       ...mapState({
         getfileuploadbanner: state => state.download.getfileuploadbanner,
         getfileuploadbanner: state => state.download.getfileuploadbanner,
-        articleShowData: state => state.download.articleShowData,
+        articleShowData: state => state.download.articleShowData.result,
         loginCheck: state => state.common.loginCheck,
         loginCheck: state => state.common.loginCheck,
         showClass: state => state.download.showClass
         showClass: state => state.download.showClass
       })
       })
     },
     },
+    beforeCreate() {
+      if (!/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) {
+        let url = "";
+        let paramsStr = '';
+        for (let k in this.$route.query) {
+          paramsStr += k + '=' + this.$route.query[k] + '&'
+        }
+        paramsStr = paramsStr.slice(0, -1);
+        switch (window.location.hostname) {
+          case "m.liexin.com":
+            window.location.href = (paramsStr ? ("http://www.liexin.com/v3/download?" + paramsStr) : ("http://www.liexin.com/v3/download"));
+            break;
+          default:
+            window.location.href = window.location.origin + (paramsStr ? ("/v3/download?" + paramsStr) : ("/v3/download"));
+            break;
+        }
+      }
+    },
     created() {
     created() {
       this.getData();
       this.getData();
     },
     },