Merge branch '8.1.5' into 8.3.0

# Conflicts:
#	js/groupPurchase/reducers/app/appActions.js

@@ -116,7 +116,7 @@ class GroupPurchaseContainer extends Component {
         if (!resource) {
         if (!resource) {
           return;
           return;
         }
         }
-        let miniProgramPath = '/pages/groupPurchase/groupPurchase?activity_id=' + activityId;
+        let miniProgramPath = '/pages/groupPurchase/groupPurchase?activityId=' + activityId;
         let fromPage = 'GroupPurchase';
         let fromPage = 'GroupPurchase';
         let bigImage = shareCodeInfo.get('bigImage');
         let bigImage = shareCodeInfo.get('bigImage');
         let productIcon = bigImage ? getSlicedUrl(bigImage,150*DEVICE_WIDTH_RATIO, 120*DEVICE_WIDTH_RATIO, 2) : '';
         let productIcon = bigImage ? getSlicedUrl(bigImage,150*DEVICE_WIDTH_RATIO, 120*DEVICE_WIDTH_RATIO, 2) : '';

@@ -13,9 +13,14 @@ import { fetchShareCodeInfo } from '../groupPurchase/groupPurchaseActions';
 
 
 export function getUid() {
 export function getUid() {
     return async dispatch => {
     return async dispatch => {
-        let uid = await NativeModules.YH_CommonHelper.uid();
+        NativeModules.YH_CommonHelper.uid()
+        .then(uid => {
           dispatch(setUid(uid));
           dispatch(setUid(uid));
           dispatch(fetchShareCodeInfo());
           dispatch(fetchShareCodeInfo());
+        })
+        .catch(error => {
+          dispatch(fetchShareCodeInfo());
+        });
       }
       }
 }
 }
 
 
@@ -28,8 +33,12 @@ export function setUid(uid) {
 
 
 export function getUnionType() {
 export function getUnionType() {
     return async dispatch => {
     return async dispatch => {
-        let unionType = await NativeModules.YH_CommonHelper.unionType();
-        dispatch(setUnionType(unionType));
+      NativeModules.YH_CommonHelper.unionType()
+      .then(unionType => {
+        dispatch(setUnionType(unionType))
+      })
+      .catch(error => {
+      });
     }
     }
 }
 }
 
 

@@ -7,7 +7,7 @@ let InitialState = Record({
     host: 'http://api.yoho.cn',
     host: 'http://api.yoho.cn',
     serviceHost: 'http://api.yoho.cn',
     serviceHost: 'http://api.yoho.cn',
     unionType: '',
     unionType: '',
-    uid: '',
+    uid: 0,
 });
 });
 
 
 export default InitialState;
 export default InitialState;