unionType动态获取

@@ -2,7 +2,6 @@ import wx from './utils/wx';
 import udid from './common/udid';
 import event from './common/event';
 import {verify} from './common/api';
-import config from './config';
 import Promise from './vendors/es6-promise';
 import { MD5 } from './vendors/crypto';
 import { wechatAuthLogin, verifySessionKey } from './common/login';
@@ -262,7 +261,7 @@ App({
     return wx.getExtConfigSync().miniappName;
   },
   getUnionType() {
-    return config.unionType;
+    return this.globalData.unionShop && this.globalData.unionShop.unionType;
   },
   getShopId() {
     return this.globalData.unionShop && this.globalData.unionShop.shopId;

@@ -15,7 +15,7 @@ export default class yas {
       res: '', // 屏幕大小
       osv: '', // 系统版本
       ak: 'yhshop_mp',
-      ch: config.unionType,
+      ch: '',
       udid: this.app.globalData.udid
     };
 
@@ -77,7 +77,9 @@ export default class yas {
     if (!userInfo.PV_ID) {
       userInfo.PV_ID = this.pvid;
     }
-
+    
+    self.deviceInfo.ch = getApp().getUnionType();
+    
     return new Promise(resolve => {
       wx.getNetworkType({
         success(res) {

@@ -15,11 +15,5 @@ export default {
     "app_version": "6.6.0"
   },
   "appid": "wxe8bfc9b404772199",
-  "unionType": "100000000011678",
-  "mini_app_type": "6",
-  "resourceContentCode": {
-    "home": {
-      "top": "72c65730150543d295532c942b0e5a33"
-    }
-  }
+  "mini_app_type": "6"
 }
\ No newline at end of file