Merge branch 'feature-search-bar' into 'feat/v1.3'

Feature search bar

See merge request !34

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

@@ -6,7 +6,7 @@ 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 } from '@/service/utils.service';
+import { getStyle, debounce, isApp, isWxMp } from '@/service/utils.service';
 import { setAppTitleColor } from '@/service/color.service';
 @Component({ components: { FreedomContainer, GridLayout, GridItem, PageBottomTip }, name: 'Activity'})
 export default class Activity extends Mixins(TransformStyleMixin, SaMixin) {
@@ -32,6 +32,9 @@ export default class Activity extends Mixins(TransformStyleMixin, SaMixin) {
   modfiTabsStyleDebounce = debounce(this.modfiTabsStyle, 300);
 
   get layout() {
+    if (!isApp && !isWxMp) {
+      this.pageData.elements = this.pageData.elements.filter(v => v.name != 'cs-search-bar');
+    }
     return this.pageData && this.pageData.elements.map(v => v.point) || [];
   }