Merge branch 'develop' into hotfix/report

@@ -163,6 +163,17 @@ const xianyu = {
         errorAction && errorAction(error);
         errorAction && errorAction(error);
       });
       });
     }
     }
+  },
+  getClientInfo(okAction, errorAction) {
+    if (this.isAliApp && window.WindVane) {
+      window.WindVane.call('WVNativeDetector', 'getModelInfo', {}, data => {
+        okAction && okAction(data);
+      }, error => {
+        errorAction && errorAction(error);
+      });
+    } else {
+      errorAction && errorAction();
+    }
   }
   }
 };
 };
 
 

@@ -83,6 +83,7 @@ Vue.use(ChangeBidPriceDialog);
 initClient(store);
 initClient(store);
 initBaseLogs();
 initBaseLogs();
 
 
+store.$xianyu = xianyu;
 xianyu.$router = router;
 xianyu.$router = router;
 yoho.auth = async(args) => {
 yoho.auth = async(args) => {
   let {
   let {

 import * as Types from './types';
 import * as Types from './types';
 import cookie from 'yoho-cookie';
 import cookie from 'yoho-cookie';
-import { merge } from 'lodash';
+import { get, set, merge } from 'lodash';
 
 
 export default function(mergeState = {}) {
 export default function(mergeState = {}) {
   return {
   return {
@@ -201,12 +201,38 @@ export default function(mergeState = {}) {
         {
         {
           params: { appop, param },
           params: { appop, param },
           asyncindx = false,
           asyncindx = false,
+          retry = false
         },
         },
       ) {
       ) {
+
         try {
         try {
           // console.log(appop)
           // console.log(appop)
           // console.log(param)
           // console.log(param)
           setTimeout(() => {
           setTimeout(() => {
+            // 获取设备信息
+            if (!retry && !get(window, 'appBaseLogs.device.dm') && this.$xianyu.getClientInfo) {
+              this.$xianyu.getClientInfo(info => {
+                info = info || {}
+                set(window, 'appBaseLogs.device.dm', info.platformName ? info.platformName : `${info.brand} ${info.model}`);
+
+                this.dispatch('reportYas', {
+                  params: { appop, param },
+                  asyncindx,
+                  retry: true
+                });
+              }, (error) => {
+                error && set(window, 'appBaseLogs.device.dm', 'unknown');
+
+                this.dispatch('reportYas', {
+                  params: { appop, param },
+                  asyncindx,
+                  retry: true
+                });
+              });
+
+              return;
+            }
+
             if (window._yas && window._yas.sendAppLogs) {
             if (window._yas && window._yas.sendAppLogs) {
               param = param || {};
               param = param || {};
 
 

 {
 {
   "name": "xianyu-ufo-app-web",
   "name": "xianyu-ufo-app-web",
-  "version": "0.0.2-beta-1",
+  "version": "0.0.2-beta-2",
   "private": true,
   "private": true,
   "description": "Xianyu Project With Express",
   "description": "Xianyu Project With Express",
   "repository": {
   "repository": {