Browse Source

修復bug

tremble 3 years ago
parent
commit
bf865abf2d
3 changed files with 15 additions and 9 deletions
  1. 1 2
      src/app.vue
  2. 6 5
      src/components/Controls/Panel/Main.vue
  3. 8 2
      src/utils/browser.js

+ 1 - 2
src/app.vue

@@ -147,7 +147,6 @@ watch(
 const changeMode = (name, e, focus3d = false) => {
   if (!flying.value) {
     let width, left;
-    console.dir(e.srcElement);
     store.commit("setMode", name);
     nextTick(() => {
       if (focus3d) {
@@ -271,7 +270,7 @@ onMounted(async () => {
           }
         });
         if (e.data.type == "commodity" || e.data.type == "waterfall") {
-          // e.target.style.zIndex = "999";
+          e.target.style.zIndex = "999";
           e.target.querySelector(".tag-body").classList.add("show");
           e.target.querySelector(".tag-commodity").removeEventListener("click", onClickTagInfo);
           e.target.querySelector(".tag-commodity").addEventListener("click", onClickTagInfo);

+ 6 - 5
src/components/Controls/Panel/Main.vue

@@ -127,9 +127,9 @@ const menulist = computed(() => {
     },
   ];
 
-  if (browser.detectWeixinMiniProgram()) {
-    fff.shift();
-  }
+  // if (browser.detectWeixinMiniProgram()) {
+  //   fff.shift();
+  // }
   return fff;
 });
 
@@ -224,9 +224,10 @@ const brandScroll = () => {
 
 const onClickMenu = (item) => {
   if (item.id == "kefu") {
-    browser.openLink("", "https://wpa1.qq.com/Pi0jD8Ev?_type=wpa&qidian=true");
+    let mglink = 'https://webpage.qidian.qq.com/2/chat/h5/index.html?linkType=1&env=ol&kfuin=3009110132&fid=3655&key=9b4334768c39150ead3f23e11e5dc2e4&cate=7&source=0&isLBS=0&isCustomEntry=0&type=10&ftype=1&_type=wpa&qidian=true&_pid=kvrmvu.74cg11.l43qvbcu&translateSwitch=0&isSsc=0&roleValue=4&roleData=922223821'
+    window.location.href = mglink;
   } else if (item.id == "shopping") {
-    browser.openLink("/subPackage/pages/shoppingcart/shoppingcart", "https://m.cdfmembers.com/shop/600667208/shoppingcart");
+    browser.openLink("/subPackage/pages/shoppingcart/shoppingcart", "https://m.cdfmembers.com/shop/600667208/shoppingcart","/pages/shoppingcart/main");
   }
 };
 

+ 8 - 2
src/utils/browser.js

@@ -316,7 +316,7 @@ var browser = {
     return window.navigator.userAgent.indexOf("Edge") > -1;
   },
   detectApp: function () {
-    return this.urlHasValue("app");
+    return this.urlHasValue("isMiniApp");
   },
   /**
    * 判断标签页是否切换状态
@@ -352,7 +352,7 @@ var browser = {
     }
     return "";
   },
-  openLink(mglink, h5link) {
+  openLink(mglink, h5link, appLink) {
     if (this.detectWeixin()) {
       //ios的ua中无miniProgram,但都有MicroMessenger(表示是微信浏览器)
       wx.miniProgram.getEnv((res) => {
@@ -370,6 +370,12 @@ var browser = {
           // 不在小程序里
         }
       });
+    } else if(this.detectApp()){
+      if (appLink) {
+        wx.miniProgram.navigateTo({
+          url: appLink,
+        });
+      }
     } else {
       if (h5link) {
         window.location.href = h5link;