Merge branch 'feature/browser-0520-zz' into feature/task1.0.0

Feature/task1.0.0

See merge request yanxuan-frontend/shop-pc!98

env.config.js

@@ -12,16 +12,20 @@ const getRepoInfo  = require('git-repo-info');
 
 const envConfig = {
 	dev : {
-		base_url: 'https://k8s-horse-gateway.mashibing.cn'
+		base_url: 'https://k8s-horse-gateway.mashibing.cn',
+    h5_url:'http://k8s-shop-app.mashibing.cn/'
 	},
 	test : {
-		base_url: 'https://k8s-horse-gateway.mashibing.cn'
+		base_url: 'https://k8s-horse-gateway.mashibing.cn',
+    h5_url:'http://k8s-shop-app.mashibing.cn/'
 	},
 	beta : {
-		base_url: 'https://you-gateway.mashibing.com'
+		base_url: 'https://you-gateway.mashibing.com',
+    h5_url:'https://you-app.mashibing.com/'
 	},
 	prod : {
-		base_url: 'https://you-gateway.mashibing.com'
+		base_url: 'https://you-gateway.mashibing.com',
+    h5_url:'https://you-app.mashibing.com/'
 	}
 }
 const branch = getRepoInfo().branch; // 调用获取git信息

middleware/browser.js

@@ -0,0 +1,126 @@
+import ENV from '@/plugins/config/env.js';
+export default function (context) {
+    context.userAgent = process.server ? context.req.headers['user-agent'] : navigator.userAgent;
+    // 各主流浏览器
+    function getBrowser() {
+        var u = context.userAgent;
+        var bws = [
+            {
+                name: 'sgssapp',
+                it: /sogousearch/i.test(u),
+            },
+            {
+                name: 'wechat',
+                it: /MicroMessenger/i.test(u),
+            },
+            {
+                name: 'weibo',
+                it: !!u.match(/Weibo/i),
+            },
+            {
+                name: 'uc',
+                it: !!u.match(/UCBrowser/i) || u.indexOf(' UBrowser') > -1,
+            },
+            {
+                name: 'sogou',
+                it: u.indexOf('MetaSr') > -1 || u.indexOf('Sogou') > -1,
+            },
+            {
+                name: 'xiaomi',
+                it: u.indexOf('MiuiBrowser') > -1,
+            },
+            {
+                name: 'baidu',
+                it: u.indexOf('Baidu') > -1 || u.indexOf('BIDUBrowser') > -1,
+            },
+            {
+                name: '360',
+                it: u.indexOf('360EE') > -1 || u.indexOf('360SE') > -1,
+            },
+            {
+                name: '2345',
+                it: u.indexOf('2345Explorer') > -1,
+            },
+            {
+                name: 'edge',
+                it: u.indexOf('Edge') > -1,
+            },
+            {
+                name: 'edg',
+                it: u.indexOf('Edg') > -1,
+            },
+            {
+                name: 'ie11',
+                it: u.indexOf('Trident') > -1 && u.indexOf('rv:11.0') > -1,
+            },
+            {
+                name: 'ie',
+                it: u.indexOf('compatible') > -1 && u.indexOf('MSIE') > -1,
+            },
+            {
+                name: 'firefox',
+                it: u.indexOf('Firefox') > -1,
+            },
+            {
+                name: 'safari',
+                it: u.indexOf('Safari') > -1 && u.indexOf('Chrome') === -1,
+            },
+            {
+                name: 'qqbrowser',
+                it: u.indexOf('MQQBrowser') > -1 && u.indexOf(' QQ') === -1,
+            },
+            {
+                name: 'qq',
+                it: u.indexOf('QQ') > -1,
+            },
+            {
+                name: 'chrome',
+                it: u.indexOf('Chrome') > -1 || u.indexOf('CriOS') > -1,
+            },
+            {
+                name: 'opera',
+                it: u.indexOf('Opera') > -1 || u.indexOf('OPR') > -1,
+            },
+        ];
+
+        for (var i = 0; i < bws.length; i++) {
+            if (bws[i].it) {
+                return bws[i].name;
+            }
+        }
+
+        return 'other';
+    }
+
+    var os = (function () {
+        var ua = context.userAgent,
+            isWindowsPhone = /(?:Windows Phone)/.test(ua),
+            isSymbian = /(?:SymbianOS)/.test(ua) || isWindowsPhone,
+            isAndroid = /(?:Android)/.test(ua),
+            isFireFox = /(?:Firefox)/.test(ua),
+            isChrome = /(?:Chrome|CriOS)/.test(ua),
+            isTablet =
+                /(?:iPad|PlayBook)/.test(ua) ||
+                (isAndroid && !/(?:Mobile)/.test(ua)) ||
+                (isFireFox && /(?:Tablet)/.test(ua)),
+            isPhone = /(?:iPhone)/.test(ua) && !isTablet,
+            isPc = !isPhone && !isAndroid && !isSymbian;
+        return {
+            isTablet: isTablet,
+            isPhone: isPhone,
+            isAndroid: isAndroid,
+            isPc: isPc,
+            isChrome: isChrome,
+        };
+    })();
+
+    if (os.isAndroid || os.isPhone) {
+      console.log('手机');
+      let url = ENV.h5_url
+      context.redirect(url);
+    } else if (os.isTablet) {
+      console.log('平板');
+    } else if (os.isPc) {
+      console.log('电脑');
+    }
+}

nuxt.config.js

@@ -30,7 +30,7 @@ export default {
 				component: resolve(__dirname, 'pages/index/index.vue')
 			})
 		},
-		middleware: ['redirect']
+		middleware: ['redirect','browser']
 	},
 
 	// Global CSS: https://go.nuxtjs.dev/config-css

pages/goods/detail/_id.vue

@@ -275,10 +275,8 @@ export default {
       order: "",
     });
     vm.detailData = res1.result;
-    vm.skuData = res2.result.map(i => {
-      i.attributeSymbolList = i.attributeSymbolList.split(',')
-      return i;
-    });
+    vm.skuData = res2.result;
+
     vm.recommendedData = res3.result.records;
     vm.pageLoading = false;
     if (
@@ -310,7 +308,7 @@ export default {
     curSku() {
       return (
         this.skuData.find(
-          (i) => i.attributeSymbolList.join(',') === this.selectedSymbol.join(",")
+          (i) => i.attributeSymbolList === this.selectedSymbol.join(",")
         ) || {}
       );
     },
@@ -319,9 +317,9 @@ export default {
       return this.detailData.attributeGroupList
         .map((item) => {
           const activeAttr = item.attributes.find((i) => i.active);
-          return activeAttr?.symbol;
+          return activeAttr ? activeAttr.symbol : ".";
         })
-        .filter((i) => i).sort();
+        .filter((i) => i)//.sort();
     },
     /**
      * 最大可购买数量
@@ -461,43 +459,26 @@ export default {
     setDisabledItem(item, groupIndex) {
       let vm = this;
       vm.detailData.attributeGroupList.forEach((group, idx) => {
-				// if(groupIndex === idx) return false;
-				// 拿到已选项数组
-				group.attributes.forEach( item => {
-				let symbolCache = Object.assign([],vm.selectedSymbol);
-					symbolCache.push(item.symbol);
-					symbolCache.sort();
-					const res = vm.skuData.filter(item => 
-						symbolCache.map(i => item.attributeSymbolList.includes(i.toString())).every(i => i)
-					).find(i => i.stock > 0);
+        // 拿到已选项数组，这个是按照项组顺序排序好的缓存数组
+        let symbolCache = Object.assign([], this.selectedSymbol);
+        // 跳过当前属性组
+        if (groupIndex === idx) return false;
+        // 遍历其他选项组中的选项
+        group.attributes.forEach((item) => {
+          // 根据选项组下标，补位选项属性
+          symbolCache[idx] = item.symbol;
+          const reg = new RegExp(symbolCache.join(","));
+          // 根据补位选项寻找是否有有效SKU，有则可选，没有则禁用
+          const res = vm.skuData
+            .filter((i) => reg.test(i.attributeSymbolList))
+            .find((i) => i.stock > 0);
           if (res) {
             item.disabled = false;
           } else {
             item.disabled = true;
           }
         });
-			})
-      // vm.detailData.attributeGroupList.forEach((group, idx) => {
-      //   // 拿到已选项数组，这个是按照项组顺序排序好的缓存数组
-      //   let symbolCache = Object.assign([], this.selectedSymbol);
-      //   // 跳过当前属性组
-      //   if (groupIndex === idx) return false;
-      //   // 遍历其他选项组中的选项
-      //   group.attributes.forEach((item) => {
-      //     // 根据选项组下标，补位选项属性
-      //     symbolCache[idx] = item.symbol;
-      //     const reg = new RegExp(symbolCache.join(","));
-      //     // 根据补位选项寻找是否有有效SKU，有则可选，没有则禁用
-      //     const res = vm.skuData
-      //       .filter((i) => reg.test(i.attributeSymbolList))
-      //       .find((i) => i.stock > 0);
-      //     if (res) {
-      //       item.disabled = false;
-      //     } else {
-      //       item.disabled = true;
-      //     }
-      //   });
-      // });
+      });
     },
     buyNow() {
       if (!this.$isLoginValidate()) {