Merge branch 'feat/v1.6' into 'master'

Feat/v1.6

See merge request !79

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

@@ -49,7 +49,7 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle
   modfiTabsStyleDebounce = debounce(this.modfiTabsStyle, 300);
   get layout() {
     if (!isApp && !isWxMp && !EASY_ENV_IS_NODE) {
-      this.pageData.elements = this.pageData.elements.filter(v => v.name !== 'cs-search-bar');
+      this.pageData.elements = this.pageData.elements.filter(v => v.name !== 'cs-search-bar' && v.name !== 'cs-snap-up');
     }
     return this.pageData && this.pageData.elements.map(v => v.point) || [];
   }
@@ -113,7 +113,7 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle
     // const { index } = this.$route.query();
     // console.log(this.navigatorConfig, 999);
     if (!isApp && !isWxMp && !EASY_ENV_IS_NODE) {
-      this.pageData.elements = this.pageData.elements.filter(v => v.name !== 'cs-search-bar');
+      this.pageData.elements = this.pageData.elements.filter(v => v.name !== 'cs-search-bar' && v.name !== 'cs-snap-up');
     }
     this.targetEle = document.querySelector('body');
     if (EASY_ENV_IS_BROWSER) { this.showBackTop = true; }
@@ -280,8 +280,8 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle
   // 添加或修改url中的参数
   addOrEditUrlParams(url, paramName, replaceWith) {
     if (url.indexOf(paramName) > -1) {
-      const re = new RegExp(paramName + '=[^&]*', 'gi')
-      return url.replace(re, paramName + '=' + replaceWith)
+      const re = new RegExp(paramName + '=[^&]*', 'gi');
+      return url.replace(re, paramName + '=' + replaceWith);
     } else {
       const paraStr = paramName + '=' + replaceWith;
       const idx = url.indexOf('?');

config/apollo.json

 {
   "api": {
-    "apiHost": "https://quantum-blocks-qa.liangkebang.net",
-    "h5Host": "https://quantum-h5-qa.liangkebang.net",
-    "opapiHost": "https://opapi-qa.liangkebang.net",
-    "passportHost": "https://passportapi-qa.liangkebang.net",
-    "talosHost": "https://talos-qa.liangkebang.net",
-    "kdspHost": "https://kdsp-api-qa.liangkebang.net",
+    "apiHost": "https://quantum-blocks-test1.liangkebang.net",
+    "h5Host": "https://quantum-h5-test1.liangkebang.net",
+    "opapiHost": "https://opapi-test1.liangkebang.net",
+    "passportHost": "https://passportapi-test1.liangkebang.net",
+    "talosHost": "https://talos-test1.liangkebang.net",
+    "kdspHost": "https://kdsp-api-test1.liangkebang.net",
     "loginUrl": "",
-    "h5ShopHost": "https://tenet-qa.liangkebang.net/#",
-    "mallHost": "https://mall-qa.liangkebang.net",
-    "xyqbH5Host": "https://mapi-qa.liangkebang.net",
+    "h5ShopHost": "https://tenet-test1.liangkebang.net/#",
+    "mallHost": "https://mall-test1.liangkebang.net",
+    "xyqbH5Host": "https://mapi-test1.liangkebang.net",
     "yxmTenantId": 560761,
     "appIdMap": {
       "560761": "wxe16bf9293671506c",
@@ -17,8 +17,8 @@
     }
   },
   "redis": {
-    "port": "30556",
-    "host": "172.17.5.22",
+    "port": "32625",
+    "host": "172.17.5.3",
     "password": "",
     "db": 0
   },

config/apollo.ssr.json

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

package.json

@@ -8,7 +8,7 @@
     "test": "cross-env NODE_ENV=production EGG_SERVER_ENV=sit egg-scripts start --port 80 --workers 1",
     "stop": "egg-scripts stop",
     "backend": "nohup egg-scripts start --port 7001 --workers 4",
-    "dev": "cross-env NODE_ENV=test APOLLO_CLUSTER=k8s NAMESPACE=qa npm run apollo && egg-bin dev -r egg-ts-helper/register",
+    "dev": "cross-env NODE_ENV=test APOLLO_CLUSTER=k8s NAMESPACE=test1 npm run apollo && egg-bin dev -r egg-ts-helper/register",
     "debug": "egg-bin debug -r egg-ts-helper/register",
     "apollo": "node bin/apollo.js",
     "build": "cross-env NODE_ENV=production APOLLO_CLUSTER=3C npm run apollo && cross-env COS_ENV=production easy build --devtool",
@@ -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.39",
+    "@qg/citrus-ui": "0.3.42",
     "@qg/js-bridge": "^1.1.12",
     "babel-plugin-transform-vue-jsx": "^4.0.1",
     "cos-nodejs-sdk-v5": "^2.9.12",