Merge branch 'feat/v1.3' into feat/share

# Conflicts:
#	config/apollo.ssr.json
#	package.json

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

@@ -7,7 +7,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, BackTop }, 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) || [];
   }
 

config/apollo.ssr.json

-{"apiHost":"https://quantum-blocks-vcc2.liangkebang.net","h5Host":"https://quantum-h5-vcc2.liangkebang.net","opapiHost":"https://opapi-vcc2.liangkebang.net","passportHost":"https://passportapi-vcc2.liangkebang.net","kdspHost":"https://talos-vcc2.liangkebang.net","loginUrl":"","h5ShopHost":"https://tenet-vcc2.liangkebang.net/#","qiniuUpHost":"https://up-z0.qiniup.com","qiniuHost":"https://appsync.lkbang.net"}
\ No newline at end of file
+{
+  "apiHost": "https://quantum-blocks-vcc2.liangkebang.net",
+  "h5Host": "https://quantum-h5-vcc2.liangkebang.net",
+  "opapiHost": "https://opapi-vcc2.liangkebang.net",
+  "passportHost": "https://passportapi-vcc2.liangkebang.net",
+  "kdspHost": "https://talos-vcc2.liangkebang.net",
+  "loginUrl": "",
+  "h5ShopHost": "https://tenet-vcc2.liangkebang.net/#",
+  "qiniuUpHost": "https://up-z0.qiniup.com",
+  "qiniuHost": "https://appsync.lkbang.net"
+}

config/config.local.ts

@@ -29,8 +29,8 @@ export default (appInfo: EggAppConfig) => {
 
   exports.redis = {
     client: {
-      port: 32625,          // Redis port
-      host: '172.17.6.7',   // Redis host
+      port: 31565,          // Redis port
+      host: '172.17.5.13',   // Redis host
       password: '',
       db: 0
     }