Merge branch 'feature-fix-miniapp-0901' into 'master'

Feature fix miniapp 0901

See merge request !123

app/web/page/activity/component/BackTop/index.vue

@@ -107,7 +107,7 @@ export default {
         }
         return btAttachVal;
       } else if (isWxMp) {
-        return btAttachVal.filter((item) => item.persets !== "购物车");
+        return btAttachVal.filter((item) => item.persets !== "购物车").filter((item) => item.persets !== "分享");
       }
       return [];
       // if (this.pageData.props && this.pageData.props.btAttachVal) {

app/web/page/activity/view/activity/index.ts

@@ -17,7 +17,6 @@ import { setAppTitleColor } from '@/service/color.service';
 import { EventBus } from '@qg/citrus-ui/src/helper/service/eventBus';
 import localStorage from '@/service/localStorage.service';
 import { home, shopcart, user } from '@/config/nav.config';
-import { isWxMp, isApp } from '@/service/utils.service';
 import Bridge from '@qg/js-bridge';
 import MpBridge from '@qg/citrus-ui/src/helper/service/mp';
 import navigatorApi from '@/api/navigator.api';
@@ -59,7 +58,7 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle
   showCouponModal: boolean = false;
   couponModalData: object = {};
   get layout() {
-    if (isWxMp && !EASY_ENV_IS_NODE) {
+    if (!EASY_ENV_IS_NODE) {
       this.pageData.elements = this.$route.query.isPreview ? this.pageData.elements : this.pageData.elements.filter(v => v.name !== 'cs-snap-up' && v.name !== 'cs-seckill');
     }
     return this.pageData && this.pageData.elements.map(v => v.point) || [];
@@ -124,9 +123,10 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle
     //   //  && v.name !== 'cs-snap-up' && v.name !== 'cs-seckill'   放开H5访问秒杀、抢购的限制
     //   this.pageData.elements = this.$route.query.isPreview ? this.pageData.elements : this.pageData.elements.filter(v => v.name !== 'cs-search-bar');
     // }
-    if (isWxMp && !EASY_ENV_IS_NODE) {
-      this.pageData.elements = this.$route.query.isPreview ? this.pageData.elements : this.pageData.elements.filter(v => v.name !== 'cs-snap-up' && v.name !== 'cs-seckill');
+    if (!EASY_ENV_IS_NODE) {
+      // this.pageData.elements = this.$route.query.isPreview ? this.pageData.elements : this.pageData.elements.filter(v => v.name !== 'cs-snap-up' && v.name !== 'cs-seckill');
     }
+    console.log('%cisWxMp =====》', 'color: #1677ff; font-weight: bold;', isWxMp, EASY_ENV_IS_NODE, this.pageData.elements);
     this.targetEle = document.querySelector('body');
     if (EASY_ENV_IS_BROWSER) { this.showBackTop = true; }
     this.pageVisibilityChange();

config/apollo.json

 {
   "api": {
-    "apiHost": "https://quantum-blocks-toc2.liangkebang.net",
-    "h5Host": "https://quantum-h5-toc2.liangkebang.net",
-    "opapiHost": "https://opapi-toc2.liangkebang.net",
-    "passportHost": "https://passportapi-toc2.liangkebang.net",
-    "talosHost": "https://talos-toc2.liangkebang.net",
-    "kdspHost": "https://kdsp-api-toc2.liangkebang.net",
+    "apiHost": "https://quantum-blocks-yxm2.liangkebang.net",
+    "h5Host": "https://quantum-h5-yxm2.liangkebang.net",
+    "opapiHost": "https://opapi-yxm2.liangkebang.net",
+    "passportHost": "https://passportapi-yxm2.liangkebang.net",
+    "talosHost": "https://talos-yxm2.liangkebang.net",
+    "kdspHost": "https://kdsp-api-yxm2.liangkebang.net",
     "loginUrl": "",
     "newApolloFlag": true,
-    "h5ShopHost": "https://tenet-toc2.liangkebang.net/#",
-    "mallHost": "https://mall-toc2.liangkebang.net",
-    "h5MallHost": "https://xincheng-toc2.liangkebang.net",
-    "xyqbH5Host": "https://mapi-toc2.liangkebang.net",
+    "h5ShopHost": "https://tenet-yxm2.liangkebang.net/#",
+    "mallHost": "https://mall-yxm2.liangkebang.net",
+    "h5MallHost": "https://xincheng-yxm2.liangkebang.net",
+    "xyqbH5Host": "https://mapi-yxm2.liangkebang.net",
     "yxmTenantId": 560761,
     "appIdMap": {
       "560761": "wxe16bf9293671506c",
@@ -20,7 +20,7 @@
   },
   "redis": {
     "port": "31217",
-    "host": "172.24.192.10",
+    "host": "172.24.192.7",
     "password": "",
     "db": 0
   },
@@ -44,10 +44,6 @@
     "/yB3tnMTnRc.txt": "5c9d1a08b3bda49beb0f950b1cdec27b",
     "/gAnCcSGwFu.txt": "a8ae84f68ea72f82beff325a59fd2c58",
     "/qqCExxuPJ7.txt": "a1da927722f735a09065407e32beb56a",
-    "/nc7QENWU7D.txt": "e9372355b4d2d128391b125c10547583",
-    "/G9yvqknBT8.txt": "a577d5c579061ec2782e9264e66f907f",
-    "/jg8jNUY2C5.txt": "8d9308d2d33911fa8cd1a108c5944339",
-    "/t3oh8XDXaU.txt": "006bf178a420b5e01493474283c0cfcb",
     "/86b9af10a6b70c8be78c9095b24448ec.html": "5c9d1a08b3bda49beb0f950b1cdec27b",
     "/bd_mapp_domaincer_25998612.txt": "a7ff4d126c6a7b90c73356e410a163b9",
     "/MP_verify_f4VWFoFpHgzmqFbo.txt": "f4VWFoFpHgzmqFbo",

config/apollo.ssr.json

-{"apiHost":"https://quantum-blocks-toc2.liangkebang.net","h5Host":"https://quantum-h5-toc2.liangkebang.net","opapiHost":"https://opapi-toc2.liangkebang.net","passportHost":"https://passportapi-toc2.liangkebang.net","talosHost":"https://talos-toc2.liangkebang.net","kdspHost":"https://kdsp-api-toc2.liangkebang.net","loginUrl":"","newApolloFlag":true,"h5ShopHost":"https://tenet-toc2.liangkebang.net/#","mallHost":"https://mall-toc2.liangkebang.net","h5MallHost":"https://xincheng-toc2.liangkebang.net","xyqbH5Host":"https://mapi-toc2.liangkebang.net","yxmTenantId":560761,"appIdMap":{"560761":"wxe16bf9293671506c","560867":"wxccb8435d68e8c7d6"},"qiniuUpHost":"https://up-z0.qiniup.com","qiniuHost":"https://appsync.91xr.cn"}
\ No newline at end of file
+{"apiHost":"https://quantum-blocks-yxm2.liangkebang.net","h5Host":"https://quantum-h5-yxm2.liangkebang.net","opapiHost":"https://opapi-yxm2.liangkebang.net","passportHost":"https://passportapi-yxm2.liangkebang.net","talosHost":"https://talos-yxm2.liangkebang.net","kdspHost":"https://kdsp-api-yxm2.liangkebang.net","loginUrl":"","newApolloFlag":true,"h5ShopHost":"https://tenet-yxm2.liangkebang.net/#","mallHost":"https://mall-yxm2.liangkebang.net","h5MallHost":"https://xincheng-yxm2.liangkebang.net","xyqbH5Host":"https://mapi-yxm2.liangkebang.net","yxmTenantId":560761,"appIdMap":{"560761":"wxe16bf9293671506c","560867":"wxccb8435d68e8c7d6"},"qiniuUpHost":"https://up-z0.qiniup.com","qiniuHost":"https://appsync.91xr.cn"}
\ No newline at end of file

package.json

@@ -26,7 +26,7 @@
     "@better-scroll/core": "^2.0.5",
     "@qg/apollo-nodejs": "^3.0.0",
     "@qg/cherry-ui": "2.23.10",
-    "@qg/citrus-ui": "^0.3.70",
+    "@qg/citrus-ui": "^0.3.72",
     "@qg/js-bridge": "^1.1.12",
     "@sentry/vue": "^7.41.0",
     "babel-plugin-transform-vue-jsx": "^4.0.1",