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

Feat/v1.6

See merge request !83

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

 import { Component, Vue } from 'vue-property-decorator';
-import { transformStyle, getStyle } from '@/service/utils.service';
+import { transformStyle, getStyle, isPx, pxToRem } from '@/service/utils.service';
 import { Mutation } from 'vuex-class';
 
 @Component({ name: 'TransformStyleMixin' })
@@ -17,7 +17,7 @@ export default class TransformStyleMixin extends Vue {
       if ( typeof styleObj[key] === 'number') {
         style[key] = `${(styleObj[key] / 37.5).toFixed(2)}rem`;
       } else {
-        style[key] = styleObj[key]?.includes('px') ? `${(+(styleObj[key].slice(0, -2)) / 37.5).toFixed(2)}rem` : styleObj[key];
+        style[key] = isPx(styleObj[key]) ? pxToRem(styleObj[key]) : styleObj[key];
       }
       if (key === 'backgroundImage' && style.backgroundImage) {
         style.backgroundImage = `url(${style.backgroundImage})`;

app/web/service/utils.service.ts

@@ -108,6 +108,15 @@ export const validateType = function(obj) {
   return typeof obj === 'object' ? class2type[Object.prototype.toString.call(obj)] || 'object' : typeof obj;
 };
 
+export const isPx = str => /(\d+(\.\d*)?)+(px)/gi.test(str);
+export const pxToRem = (str, width = 37.5) => {
+  const reg = /(\d+(\.\d*)?)+(px)/gi; //可以匹配浮点数
+  let newStr = str.replace(reg, function (_x) {
+    _x = _x.replace(/px"/gi, '');
+    return parseFloat(parseFloat(_x) / width).toFixed(2) + 'rem';
+  });
+  return newStr;
+}
 export const transformStyle = function(styleObj = {}) {
   // console.log('transformStyle', styleObj);
   const style = {};
@@ -115,7 +124,7 @@ export const transformStyle = function(styleObj = {}) {
     if ( typeof styleObj[key] === 'number') {
       style[key] = `${(styleObj[key] / 37.5).toFixed(3)}rem`;
     } else {
-      style[key] = styleObj[key].includes('px') ? `${(+(styleObj[key].slice(0, -2)) / 37.5).toFixed(3)}rem` : styleObj[key];
+      style[key] = isPx(styleObj[key]) ? pxToRem(styleObj[key]) : styleObj[key];
     }
     if (key === 'backgroundImage' && style.backgroundImage) {
       style.background = `url(${style.backgroundImage}) no-repeat 0 0 / cover`;

config/apollo.json

@@ -7,6 +7,7 @@
     "talosHost": "https://talos-test1.liangkebang.net",
     "kdspHost": "https://kdsp-api-test1.liangkebang.net",
     "loginUrl": "",
+    "newApolloFlag": true,
     "h5ShopHost": "https://tenet-test1.liangkebang.net/#",
     "mallHost": "https://mall-test1.liangkebang.net",
     "xyqbH5Host": "https://mapi-test1.liangkebang.net",
@@ -18,7 +19,7 @@
   },
   "redis": {
     "port": "32625",
-    "host": "172.17.5.3",
+    "host": "172.17.5.22",
     "password": "",
     "db": 0
   },

config/apollo.ssr.json

-{"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"}
+{"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":"","newApolloFlag":true,"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

@@ -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.46",
+    "@qg/citrus-ui": "0.3.47",
     "@qg/js-bridge": "^1.1.12",
     "babel-plugin-transform-vue-jsx": "^4.0.1",
     "cos-nodejs-sdk-v5": "^2.9.12",