Merge branch 'feature/h5mnprblmwbvw' into 'master'

uid-get



See merge request !2

@@ -81,11 +81,10 @@ let _getCoin = function(data) {
 let _getCoupon = function(data){
 let _getCoupon = function(data){
     data.app = utils.queryString();
     data.app = utils.queryString();
 
 
-    data.app.uid = cookies.cookie('app_uid') || data.app.uid;
-    data.app.app_version = cookies.cookie('app_version') || data.app.app_version;
-    data.app.client_type = cookies.cookie('app_client_type') || data.app.client_type;
-    data.app.session_key = cookies.cookie('app_session_key') || data.app.session_key;
-
+    data.app.uid = data.app.uid || cookies.cookie('app_uid');
+    data.app.app_version = data.app.app_version || cookies.cookie('app_version');
+    data.app.client_type = data.app.client_type ||cookies.cookie('app_client_type');
+    data.app.session_key = data.app.session_key || cookies.cookie('app_session_key');
 
 
     jsonp({
     jsonp({
         url: '//m.yohobuy.com/activity/feature/couponSend?callback=?',
         url: '//m.yohobuy.com/activity/feature/couponSend?callback=?',
@@ -142,7 +141,7 @@ let _initCoin = function(uid){
         } else {
         } else {
             cookies.setCookie('yoho-coin-token', token);
             cookies.setCookie('yoho-coin-token', token);
 
 
-            if (window.__wxjs_environment === 'miniprogram' && wx && wx.miniProgram) {
+            if (window.__wxjs_environment === 'miniprogram' && typeof wx !== 'undefined' && wx.miniProgram) {
                 wx.miniProgram.navigateTo({
                 wx.miniProgram.navigateTo({
                     url: `../bindPhoneNumber/bindPhoneNumber?h5back=${location.href}`
                     url: `../bindPhoneNumber/bindPhoneNumber?h5back=${location.href}`
                 });
                 });
@@ -181,7 +180,7 @@ let _initCoupon = function(uid) {
         } else {
         } else {
             cookies.setCookie('yoho-conpon-token', token);
             cookies.setCookie('yoho-conpon-token', token);
 
 
-            if (window.__wxjs_environment === 'miniprogram' && wx && wx.miniProgram) {
+            if (window.__wxjs_environment === 'miniprogram' && typeof wx !== 'undefined' && wx.miniProgram) {
                 wx.miniProgram.navigateTo({
                 wx.miniProgram.navigateTo({
                     url: `../bindPhoneNumber/bindPhoneNumber?h5back=${location.href}`
                     url: `../bindPhoneNumber/bindPhoneNumber?h5back=${location.href}`
                 });
                 });