Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into dev

src/app.js

   ASSIGN_UNREADNUM,
   INCREASE_UNREADNUM
 } from '@/constants/user'
-import { UPDATE_PRELOAD } from '@/constants/common'
+import { UPDATE_PRELOAD, SYNC_SYSTEMINFO } from '@/constants/common'
 import ready from '@/utils/ready'
 import login from '@/utils/login'
 import store from './store'
     // 预加载数据
     this.wxPreloadData()
 
+    // 获取系统信息
+    wx.getSystemInfo({
+      success: (res) => {
+        store.dispatch({
+          type: SYNC_SYSTEMINFO,
+          payload: res,
+        })
+      }
+    })
+
     // console.info('app componentWillMount', params)
     this.initData()
   }

src/constants/common.js

 
 // 更新预拉取数据
 export const UPDATE_PRELOAD = 'UPDATE_PRELOAD';
+
+// 同步系统信息
+export const SYNC_SYSTEMINFO = 'SYNC_SYSTEMINFO';

src/reducers/system.js

-import { UPDATE_PRELOAD } from '@/constants/common'
+import { UPDATE_PRELOAD, SYNC_SYSTEMINFO } from '@/constants/common'
 
 // 初始数据
 const INITIAL_STATE = {
   orgInfo: {},
   userInfo: {},
   settings: [],
+  systemInfo: {},
 }
 
 export default function (state = INITIAL_STATE, action) {
         ...action.payload,
       }
     }
+    case SYNC_SYSTEMINFO: {
+      return {
+        ...state,
+        systemInfo: action.payload,
+      }
+    }
 
     default:
       return state

src/utils/tools.js

 import Taro from '@tarojs/taro';
+import store from '../store'
+
+console.log('----------store', store.getState())
 
 /**
  * 是否为空
   if (!img) return img
 
   if (img.indexOf('https://estateagents.oss-cn-shanghai.aliyuncs.com') === 0) {
-    return `${img}?x-oss-process=style/compress${quality || 30}`
+    return `${img.replace('oss-cn-shanghai', 'oss-accelerate')}?x-oss-process=style/compress${quality || 30}`
   }
 
   return img
   if (!img) return img
 
   if (img.indexOf('https://estateagents.oss-cn-shanghai.aliyuncs.com') === 0) {
-    return `${img}?x-oss-process=style/resize${size || 750}`
+    return `${img.replace('oss-cn-shanghai', 'oss-accelerate')}?x-oss-process=style/resize${size || 750}`
   }
 
   return img
   if (!img) return img
 
   if (img.indexOf('https://estateagents.oss-cn-shanghai.aliyuncs.com') === 0) {
-    return `${img}?x-oss-process=image/resize,m_lfit,w_750/quality,Q_80`
+    if (store.getState().system.systemInfo.platform !== 'ios') {
+      // ios 暂时不支持 webp
+      return `${img.replace('oss-cn-shanghai', 'oss-accelerate')}?x-oss-process=style/transwebp`
+    }
+
+    return `${img.replace('oss-cn-shanghai', 'oss-accelerate')}?x-oss-process=image/resize,m_lfit,w_750/quality,Q_80`
   }
 
   return img