Merge branch 'XK_sample20190923'

# Conflicts:
#	view/14.js

src/views/sample/sample.vue

@@ -145,12 +145,17 @@ export default {
   beforeCreate() {
   beforeCreate() {
     if (!/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) {
     if (!/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) {
       let url = "";
       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) {
       switch (window.location.hostname) {
         case "m.liexin.com":
         case "m.liexin.com":
-          window.location.href = "http://www.liexin.com/v3/sample";
+          window.location.href = (paramsStr?("http://www.liexin.com/v3/sample?"+paramsStr):("http://www.liexin.com/v3/sample"));
           break;
           break;
         default:
         default:
-          window.location.href = window.location.origin + "/v3/sample";
+          window.location.href = window.location.origin + (paramsStr?("/v3/sample?"+paramsStr):("/v3/sample"));
           break;
           break;
       }
       }
     }
     }