Merge branch 'main' of http://git.ycjcjy.com/marketing/miniapp into main

config/dev.js

@@ -4,11 +4,11 @@ module.exports = {
   },
   defineConstants: {
     HOST: '"https://xlk.njyz.tech"',
-    // HOST: '"https://xlj.newlandsh.com"',
+    // HOST: '"https://www.newhousehold.cn"',
     // HOST: '"http://127.0.0.1:8567"',
     WSS_HOST: '"wss://xlk.njyz.tech"',
-    OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
-    OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
+    OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
+    OSS_FAST_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
     Version: '"V0.0.20"'
   },

config/prod.js

@@ -3,14 +3,14 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"https://xlj.newlandsh.com"', //正式
-    WSS_HOST: '"wss://xlj.newlandsh.com"',
+    HOST: '"https://www.newhousehold.cn"', //正式
+    WSS_HOST: '"wss://www.newhousehold.cn"',
     // HOST: '"https://xlk.njyz.tech"', //正式
     // WSS_HOST: '"wss://xlk.njyz.tech"',
-    OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
-    OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
+    OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
+    OSS_FAST_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
-    Version: '"V0.0.56-20210817"'
+    Version: '"V0.0.58-20210819"'
   },
   mini: {},
   h5: {

src/utils/image.js

@@ -1,14 +1,34 @@
 
 import Taro from '@tarojs/taro'
 import { authorize } from './wxAuth'
+
 // eslint-disable-next-line no-undef
 const host = HOST;
+// eslint-disable-next-line no-undef
+const ossPath = OSS_PATH;
+
+let platform = null;
+
+function getPlatform() {
+  if (!platform) {
+    platform = Taro.getSystemInfoSync().platform;
+  }
+  return platform;
+}
 
 export function getImgURL(img) {
   if (!img) return undefined;
 
-  if (img.indexOf('http') === 0) return img;
+  if (img.indexOf(ossPath) > -1) {
+    const plat = getPlatform();
+    if (plat.toLocaleLowerCase().indexOf('ios') > -1) {
+      return `${img}?x-oss-process=style/thumb`
+    } else {
+      return `${img}?x-oss-process=style/webp`
+    }
+  }
 
+  if (img.indexOf('http') === 0) return img;
   return `${host}${img}`;
 }