Merge branch 'XK_sample20190923'

# Conflicts:
#	view/14.js

src/views/sample/sample.vue

@@ -142,6 +142,19 @@ export default {
       }
     }
   },
+  beforeCreate() {
+    if (!/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) {
+      let url = "";
+      switch (window.location.hostname) {
+        case "m.liexin.com":
+          window.location.href = "http://www.liexin.com/v3/sample";
+          break;
+        default:
+          window.location.href = window.location.origin + "/v3/sample";
+          break;
+      }
+    }
+  },
   created() {
     this.$store.dispatch({
       type: "getClasslist"
@@ -198,25 +211,24 @@ export default {
         .catch(function(err) {});
     },
     yaoqing(item) {
-      let loginpta = util.isLogin() //1强登入态
-      if (loginpta!=1) {
+      let loginpta = util.isLogin(); //1强登入态
+      if (loginpta != 1) {
         window.location.href =
           "/v3/login?referer=" + encodeURIComponent(window.location.href);
         return;
       } else {
-        if (this.applyCount!=0) {
-          if(item.goods_info&&item.goods_info.stock){
+        if (this.applyCount != 0) {
+          if (item.goods_info && item.goods_info.stock) {
             this.$router.push({
               path: "/sampleapply",
               query: {
                 id: item.goods_id
               }
             });
-          }else{
-              Toast("样品库存不足");
+          } else {
+            Toast("样品库存不足");
           }
-        
-        }else{
+        } else {
           this.getPop = true;
         }
       }