update0419

src/app.vue

@@ -406,6 +406,7 @@ onMounted(async () => {
                 '/subPackage/pages/activity/activity?pageId=' + hotcontent.couponLink,
                 `${metadata.value?.cdfProductSource?.cdfHost}/shop/${metadata.value?.cdfProductSource?.cdfMchId}/showactivity?pageId=${hotcontent.couponLink}`,
                 `/pages/showactivity/showactivity?pageId=${hotcontent.couponLink}`
+                `${metadata.value?.cdfProductSource?.cdfHostPc}/showactivity/${hotcontent.couponLink}`,
               );
 
               apis.burying_point({ type: 2 });
@@ -431,7 +432,8 @@ onMounted(async () => {
               browser.openLink(
                 '/subPackage/pages/home/home?pageType=2&pageId=' + hotcontent.liveLink,
                 `${metadata.value?.cdfProductSource?.cdfHost}/shop/${metadata.value?.cdfProductSource?.cdfMchId}/showactivity?pageId=${hotcontent.liveLink}`,
-                `/pages/showactivity/showactivity?pageId=${hotcontent.liveLink}`
+                `/pages/showactivity/showactivity?pageId=${hotcontent.liveLink}`,
+                `${metadata.value?.cdfProductSource?.cdfHostPc}/showactivity/${hotcontent.couponLink}`,
               );
             } catch (error) {}
           } else if (tag.type == 'link_scene') {

src/components/Controls/Panel/Main.vue

@@ -3,8 +3,8 @@
     <Panel v-show="player.showWidgets" :class="{ disabled: !showdaogou }" :isOpen="isOpen">
       <div @click="toggleOpen" class="menu color">
         <div class="logo">
-          <img :src="require('@/assets/images/icon/logo.png')" alt="" />
-          <p>{{ $t('common.title') }}</p>
+          <img :src="require(`@/assets/images/icon/${logo_key}.png`)" alt="" />
+          <p>{{ $t(`common.${title_key}`) }}</p>
         </div>
         <div class="vline"></div>
         <ul :class="player.lang" @touchmove.stop>
@@ -181,6 +181,9 @@ const player = computed(() => store.getters['player']);
 const tours = computed(() => store.getters['tour/tours']);
 
 const isShowLive = ref(false)
+const logo_key = ref('logo')
+const title_key = ref('title')
+
 
 const menulist = computed(() => {
   console.log('result:',);
@@ -201,6 +204,11 @@ const menulist = computed(() => {
     isShowLive.value = true
   }
 
+  if (metadata.value?.cdfProductSource?.cdfMchId == '604163145') {
+    logo_key.value = 'logo_beauty'
+    title_key.value = 'cdfTitle'
+  }
+
   if (!browser.isMobile()) {
     fff.shift();
   }
@@ -276,7 +284,11 @@ const onClickMenu = (item) => {
       `${metadata.value?.cdfProductSource?.cdfHost}/shop/${metadata.value?.cdfProductSource?.cdfMchId}/qidian?terminalType=${envtype}`;
     window.open(mglink, '_blank');
   } else if (item.id == 'shopping') {
-    browser.openLink('/subPackage/pages/shoppingcart/shoppingcart', `${metadata.value?.cdfProductSource?.cdfHost}/shop/${metadata.value?.cdfProductSource?.cdfMchId}/shoppingcart`, '/subPackage/pages/shoppingcart/shoppingcart');
+    browser.openLink(
+    '/subPackage/pages/shoppingcart/shoppingcart', 
+    `${metadata.value?.cdfProductSource?.cdfHost}/shop/${metadata.value?.cdfProductSource?.cdfMchId}/shoppingcart`, 
+    '/subPackage/pages/shoppingcart/shoppingcart',
+    `${metadata.value?.cdfProductSource?.cdfHostPc}/shoppingcart`);
   } else if (item.id == 'help') {
     store.commit('showUserGuide', true);
   } else if (item.id == 'guided_shopping') {

src/components/Tags/goods-list.vue

@@ -119,7 +119,8 @@ const viewDetail = (item) => {
     browser.openLink(
       `/pages/item/item?productId=${item.id}`,
       `${tagclick.value.data.productSource.cdfHost}/shop/${tagclick.value.data.productSource.cdfMchId}/item?productId=${item.id}`,
-      `/pages/item/item?productId=${item.id}`
+      `/pages/item/item?productId=${item.id}`,
+      `${tagclick.value.data.productSource.cdfHostPc}/item/${item.id}`
     );
     console.log(`${tagclick.value.data.productSource.cdfHost}/shop/${tagclick.value.data.productSource.cdfMchId}/item?productId=${item.id}`);
   }
@@ -173,6 +174,7 @@ const addCart = async (item) => {
       `/pages/login/login?callbackHttpUrl=${encodeURIComponent(callbackUrl)}`,
       `${tagclick.value.data.productSource.cdfHost}/shop/${tagclick.value.data.productSource.cdfMchId}/h5login?redirectUrl=${encodeURIComponent(callbackUrl)}`,
       `/pages/login/login?callbackHttpUrl=${encodeURIComponent(callbackUrl)}`
+      `${tagclick.value.data.productSource.cdfHostPc}/login?redirectUrl=${encodeURIComponent(callbackUrl)}`,
     );
   }
 };

src/components/Tags/treasure.vue

@@ -33,7 +33,9 @@ const goto_now = () => {
     browser.openLink(
       "/subPackage/pages/activity/activity?pageId=" + tag.couponLink,
       `https://m.cdfmembers.com/shop/600667208/showactivity?pageId=${tag.couponLink}`,
-      `/pages/showactivity/showactivity?pageId=${tag.couponLink}`
+      `/pages/showactivity/showactivity?pageId=${tag.couponLink}`,
+      `https://m.cdfmembers.com/shop/600667208/showactivity?pageId=${tag.couponLink}`,
+
     );
     emit("close");
   } catch (error) {

src/components/Tags/waterfall.vue

@@ -54,9 +54,12 @@ const gotoGoods = (item) => {
       window.open(item.url, "_blank");
     }
   }else{
-    browser.openLink(`/pages/item/item?productId=${item.id}`,
+    browser.openLink(
+    `/pages/item/item?productId=${item.id}`,
     `${tagclick.value.data.productSource.cdfHost}/shop/${tagclick.value.data.productSource.cdfMchId}/item?productId=${item.id}`,
-    `/pages/item/item?productId=${item.id}`);
+    `/pages/item/item?productId=${item.id}`,
+    `${tagclick.value.data.productSource.cdfHostPc}/item/${item.id}`
+    );
     // browser.openLink(item.url)
   }
 };

src/locales/en.json

@@ -19,6 +19,7 @@
     "all": "All",
     "model": "Dollhouse",
     "title":"Duty Zero by cdf",
+    "cdfTitle": "cdf Beauty",
     "mode":"Live",
     "shopping":"Cart",
     "guide":"Guide",

src/locales/zh.json

@@ -19,6 +19,7 @@
     "all": "全部",
     "model": "三維模式",
     "title": "Duty Zero by cdf",
+    "cdfTitle": "cdf Beauty",
     "mode": "一起逛",
     "shopping": "購物",
     "guide": "專櫃導航",

src/locales/zh_CN.json

@@ -19,6 +19,7 @@
     "all": "全部",
     "model": "三维模式",
     "title":"Duty Zero by cdf",
+    "cdfTitle": "cdf Beauty",
     "mode":"一起逛",
     "shopping":"购物",
     "guide":"专柜导航",

src/locales/zh_HK.json

@@ -19,6 +19,7 @@
     "all": "全部",
     "model": "三維模式",
     "title":"Duty Zero by cdf",
+    "cdfTitle": "cdf Beauty",
     "mode":"一起逛",
     "shopping":"購物",
     "guide":"專櫃導航",

src/utils/browser.js

@@ -361,7 +361,7 @@ var browser = {
     }
     return (url.replace(re, name + "=" + value)).replace("?&",'?');
   },
-  openLink(mglink, h5link, appLink) {
+  openLink(mglink, h5link, appLink,pcLink) {
     if (this.getURLParam("isBuyerApp") === "1") {
       if (appLink) {
         wx.miniProgram.navigateTo({
@@ -397,11 +397,18 @@ var browser = {
         });
       }
     } else {
-      if (h5link) {
-        if (this.detectIOS()) {
-          window.location.href = h5link;
-        } else {
-          window.open(h5link, "_blank");
+      if (this.isMobile()) {
+        if (h5link) {
+          if (this.detectIOS()) {
+            window.location.href = h5link;
+          } else {
+            window.open(h5link, "_blank");
+          }
+        }
+      }
+      else {
+        if (pcLink){
+          window.location.href = pcLink;
         }
       }
     }