Merge branch 'feature/couponFree' into 'master'

Feature/coupon free

See merge request !61

app/web/component/layout/activity/index.ts

@@ -85,6 +85,6 @@ export default class Layout extends Vue {
   }
 
   defaultTitle() {
-    return +localStorage.get('tenantId') === 560671 ? '羊小咩' : '活动页';
+    return +localStorage.get('tenantId') === 560761 ? '羊小咩' : '活动页';
   }
 }
\ No newline at end of file

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

@@ -161,7 +161,7 @@ export default {
       const { coverImage, pageName, pageDescribe, shareCoverImage } = this.pageInfo;
       const link = `${window.location.origin}${window.location.pathname}?vccToken={token}&tenantId=${localStorage.get('tenantId') || ''}`;
       this.link = link;
-      const defaultTitle = +localStorage.get('tenantId') === 560671 ? '羊小咩' : '活动页';
+      const defaultTitle = +localStorage.get('tenantId') === 560761 ? '羊小咩' : '活动页';
       this.shareInfo = {
         event: "showShareView",
         data: {

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

@@ -8,12 +8,11 @@ import GridLayout from '../../component/VueGridLayout/GridLayout.vue';
 import GridItem from '../../component/VueGridLayout/GridItem.vue';
 import TransformStyleMixin from '@/page/mixins/transformStyle.mixin';
 import SaMixin from '@/page/mixins/sa.mixin';
-import { getStyle, debounce, isApp, isWxMp } from '@/service/utils.service';
+import { getStyle, debounce, isApp, isWxMp, getParameterByName } from '@/service/utils.service';
 import DisableTouchMixin from '@/page/mixins/disableTouch.mixin';
 import { setAppTitleColor } from '@/service/color.service';
 import { EventBus } from '@qg/citrus-ui/src/helper/service/eventBus';
 import localStorage from '@/service/localStorage.service';
-import basicConfig from '@/config';
 
 @Component({ components: { FreedomContainer, GridLayout, GridItem, PageBottomTip, BackTop, EmptyState }, name: 'Activity'})
 export default class Activity extends Mixins(TransformStyleMixin, SaMixin, DisableTouchMixin) {
@@ -81,7 +80,13 @@ export default class Activity extends Mixins(TransformStyleMixin, SaMixin, Disab
   @Watch('pageName', { immediate: true })
   onPageNameChange(newVal) {
     if (EASY_ENV_IS_BROWSER && newVal) {
-      document.title = newVal;
+      let title = newVal;
+      // 支持运营内部福利赛需求，包括优惠券组件也做了处理，如果后期不用，可以考虑下线
+      const pageTitleFromUrl = getParameterByName('pageTitle');
+      if (this.pageData.props.titleUseUrl && pageTitleFromUrl) {
+        title = pageTitleFromUrl;
+      }
+      document.title = title;
       // 如果是 iOS 设备，则使用如下 hack 的写法实现页面标题的更新
       if (navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)) {
         const hackIframe = document.createElement('iframe');

app/web/page/mixins/transformStyle.mixin.ts

@@ -39,7 +39,7 @@ export default class TransformStyleMixin extends Vue {
     // 修改对应组件point
     const eleId = element.getAttribute('id');
     const component = this.pageData.elements.find(v => v.id === eleId);
-    if (!component) { return; }
+    if (!component || (component && component.commonStyle && component.commonStyle.position === 'absolute')) { return; }
     const calcHeight = +height + (component.commonStyle.paddingTop || 0) + (component.commonStyle.paddingBottom || 0);
     const point = { ...component.point, h: component.name === 'cs-goods-tabs' ? Math.floor(+calcHeight) : Math.ceil(+calcHeight) };
     this.setElementPoint({ id: eleId, data: point });

package-lock.json

@@ -2367,9 +2367,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.3.23",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.23.tgz",
-      "integrity": "sha512-DLE3+htghKm3s0ZNeK8FUWH5ZmOxelQjVcPy1Iic1cSaP3XF3GHBym1S+5r2yh8XvAXmt76vc5ivgxv0EtsVJw==",
+      "version": "0.3.23-beta1",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.23-beta1.tgz",
+      "integrity": "sha512-FZ/Udd865iJY6Qtzcl2paKjB6rMZgytiOrVYDaUj0h/IjD08Z2hrDC3iGBwTPzMqwkBb3Fxjaw0ZDJNIFSPzpg==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.23.9",

package.json

@@ -26,7 +26,7 @@
     "@better-scroll/core": "^2.0.5",
     "@qg/apollo-nodejs": "^2.1.2",
     "@qg/cherry-ui": "2.23.10",
-    "@qg/citrus-ui": "0.3.23",
+    "@qg/citrus-ui": "0.3.23-beta1",
     "@qg/js-bridge": "^1.1.12",
     "babel-plugin-transform-vue-jsx": "^4.0.1",
     "cos-nodejs-sdk-v5": "^2.9.12",