Merge branch 'hotfix/free-mail' into 'master'

Hotfix/free mail



See merge request !837

 {
 {
   "name": "m-yohobuy-node",
   "name": "m-yohobuy-node",
-  "version": "6.0.4",
+  "version": "6.0.5",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {

 'use strict';
 'use strict';
 const yoho = require('yoho-app');
 const yoho = require('yoho-app');
 
 
+let tip = require('plugin/tip');
+
 import {
 import {
     Controller
     Controller
 } from 'yoho-mvc';
 } from 'yoho-mvc';
@@ -25,13 +27,7 @@ class FreeMailIndexController extends Controller {
         this.freeMailModel.receiveVerify().then(result => {
         this.freeMailModel.receiveVerify().then(result => {
             if (result.code === 200) {
             if (result.code === 200) {
                 if (yoho.isApp) {
                 if (yoho.isApp) {
-                    yoho.goH5('http://m.yohobuy.com/activity/free-mail/list', JSON.stringify({
-                        action: 'go.h5',
-                        params: {
-                            islogin: 'N',
-                            url: 'http://m.yohobuy.com/activity/free-mail/list'
-                        }
-                    }));
+                    yoho.goH5(location.protocol + '//m.yohobuy.com/activity/free-mail/list');
                 } else {
                 } else {
                     location.href = '//m.yohobuy.com/activity/free-mail/list';
                     location.href = '//m.yohobuy.com/activity/free-mail/list';
                 }
                 }
@@ -47,6 +43,8 @@ class FreeMailIndexController extends Controller {
             }
             }
 
 
             this.receiveView.popHide();
             this.receiveView.popHide();
+        }).catch(() => {
+            tip.show('服务异常，请稍后重试');
         });
         });
     }
     }
 }
 }

@@ -11,7 +11,7 @@ class FreeMail {
     receiveVerify() {
     receiveVerify() {
         return http({
         return http({
             type: 'GET',
             type: 'GET',
-            url: '/activity/free-mail/verify'
+            url: location.protocol + '//m.yohobuy.com/activity/free-mail/verify'
         });
         });
     }
     }
 }
 }

@@ -30,13 +30,7 @@ class FreeMailIndexController extends Controller {
 
 
                 setTimeout(function() {
                 setTimeout(function() {
                     if (yoho.isApp) {
                     if (yoho.isApp) {
-                        yoho.goH5('http://m.yohobuy.com/home/coupons', JSON.stringify({
-                            action: 'go.coupon',
-                            params: {
-                                islogin: 'N',
-                                url: 'http://m.yohobuy.com/home/coupons'
-                            }
-                        }));
+                        yoho.goH5(location.protocol + '//m.yohobuy.com/home/coupons');
                     } else {
                     } else {
                         location.href = '//m.yohobuy.com/home/coupons';
                         location.href = '//m.yohobuy.com/home/coupons';
                     }
                     }
@@ -44,6 +38,8 @@ class FreeMailIndexController extends Controller {
             } else {
             } else {
                 tip.show(result.message);
                 tip.show(result.message);
             }
             }
+        }).catch(() => {
+            tip.show('服务异常，请稍后重试');
         });
         });
     }
     }
 }
 }

@@ -11,7 +11,7 @@ class FreeMailList {
     receiveCoupon() {
     receiveCoupon() {
         return http({
         return http({
             type: 'GET',
             type: 'GET',
-            url: '/activity/free-mail/verifyCoupon'
+            url: location.protocol + '//m.yohobuy.com/activity/free-mail/verifyCoupon'
         });
         });
     }
     }
 }
 }