yas上报、公共参数设定

@@ -152,7 +152,6 @@ class App extends Component {
           Taro.setStorage({ key: 'unionid', data: '' });
           Taro.setStorage({ key: 'unionid', data: '' });
           Taro.setStorage({ key: 'user_union_type', data: '' });
           Taro.setStorage({ key: 'user_union_type', data: '' });
         }
         }
-        console.log(result);
       }).catch(error => {
       }).catch(error => {
         console.log(error);
         console.log(error);
       });
       });
@@ -243,7 +242,6 @@ class App extends Component {
               });
               });
             }
             }
           }
           }
-          console.log(result);
         }).catch(error => {
         }).catch(error => {
           let userInfo = Taro.getStorageSync('userInfo');
           let userInfo = Taro.getStorageSync('userInfo');
           if (userInfo && userInfo.uid && userInfo.session_key) {
           if (userInfo && userInfo.uid && userInfo.session_key) {

@@ -263,7 +263,6 @@ const _reportData = async (reportType, pt, pn, param, appObject) => {
     device,
     device,
     sid: sid
     sid: sid
   }
   }
-  console.log(report_params);
   return report_params
   return report_params
 };
 };
 
 

@@ -2,7 +2,6 @@ import api from '../utils/api';
 
 
 export default {
 export default {
 	resource(code) {
 	resource(code) {
-    console.log(code);
 		return api.get({
 		return api.get({
 			url: '/resources',
 			url: '/resources',
 			data: {
 			data: {

@@ -68,7 +68,6 @@ export default class Index extends Component {
   async getResource() {
   async getResource() {
     const pk = await getPrivateKey();
     const pk = await getPrivateKey();
     Taro.setStorage({ key: 'verifyKey', data: pk });
     Taro.setStorage({ key: 'verifyKey', data: pk });
-    console.log(contentCode.index);
     return commonModel.resource(contentCode.index).then(res => {
     return commonModel.resource(contentCode.index).then(res => {
 			if (res && res.code === 200) {
 			if (res && res.code === 200) {
 				this.setState({
 				this.setState({

@@ -339,7 +339,6 @@ export default class Login extends Component {
 	render () {
 	render () {
     let { tipText, verifyBtnText, countryArea, graphicsCodeElement, graphicsCodeSwitch, graphicsCodeUrl, hasUnionID, is_bind } = this.state;
     let { tipText, verifyBtnText, countryArea, graphicsCodeElement, graphicsCodeSwitch, graphicsCodeUrl, hasUnionID, is_bind } = this.state;
     let showBind = wx.getStorageSync('show_bind');
     let showBind = wx.getStorageSync('show_bind');
-    console.log(hasUnionID);
 
 
 		return (
 		return (
 			<View className="login-page">
 			<View className="login-page">

@@ -43,15 +43,11 @@ export default class yas {
     uploadData(params) {
     uploadData(params) {
         let sid = '';
         let sid = '';
         let globalData = getGlobalData();
         let globalData = getGlobalData();
+
         if (this.app && this.app.globalData) {
         if (this.app && this.app.globalData) {
           sid = globalData.sid || '';
           sid = globalData.sid || '';
         }
         }
 
 
-        // 开发环境不上报
-        if (this.devEnv) {
-            return console.log(params);
-        }
-
         return Taro.request({
         return Taro.request({
             url: config.domains.yasHost,
             url: config.domains.yasHost,
             data: { _mlogs: JSON.stringify(params) },
             data: { _mlogs: JSON.stringify(params) },
@@ -117,12 +113,16 @@ export default class yas {
                     }
                     }
                 },
                 },
                 complete() {
                 complete() {
-                    self.app.globalData = self.app.globalData || {};
+                  let globalData = getGlobalData();
+                  let userData = globalData.userInfo || {};
+
+                  if (!Object.keys(userData).length) {
+                    userData = Taro.getStorageSync('userInfo') || {};
+                  }
 
 
-                    let ch = self.app.globalData.ch || '';
-                    let uid = self.app.globalData.userInfo && self.app.globalData.userInfo.uid || '';
+                  let ch = globalData.ch || '';
+                  let uid = userData.uid || '';
 
 
-                    // ch = self.app.getUnion_type() || ch;
                   self.deviceInfo.ch = ch;
                   self.deviceInfo.ch = ch;
                   return resolve(self.uploadData({
                   return resolve(self.uploadData({
                       status: statusInfo,
                       status: statusInfo,
@@ -132,7 +132,7 @@ export default class yas {
                           ts: new Date().getTime(),
                           ts: new Date().getTime(),
                           op: event,
                           op: event,
                           uid: uid,
                           uid: uid,
-                            sid: self.app.globalData.sid || ''
+                          sid: globalData.sid || ''
                       }]
                       }]
                   }));
                   }));
                 }
                 }