Merge branch 'feature/cps-passjump' into 'release/0806'

Feature/cps passjump



See merge request !1505

@@ -17,7 +17,7 @@ module.exports = class extends global.yoho.BaseModel {
             let gainList = [
             let gainList = [
                 {
                 {
                     url: _.get(res[1], 'data.checkUrl', ''),
                     url: _.get(res[1], 'data.checkUrl', ''),
-                    img: '//img11.static.yhbimg.com/yhb-img01/2018/07/09/10/018092224dc2f48195e3ad15269f981d1f.jpg?imageView2/{mode}/w/{width}/h/{height}', // eslint-disable-line
+                    img: '//img11.static.yhbimg.com/yhb-img01/2018/08/06/11/01b915610bd29715162266f17cdc93451d.jpg?imageView2/{mode}/w/{width}/h/{height}', // eslint-disable-line
                     isShow: false
                     isShow: false
                 },
                 },
                 {
                 {

@@ -48,12 +48,6 @@ class HaveGainApplyPage extends Page {
 
 
             // app内审核通过跳转区分处理
             // app内审核通过跳转区分处理
             if (yoho.isApp && jumpUrl.indexOf('go.minealliance') > -1) {
             if (yoho.isApp && jumpUrl.indexOf('go.minealliance') > -1) {
-
-                // 若指定跳转
-                if (this.query.passJump === 'Y') {
-                    jumpUrl = `//m.yohobuy.com/?openby:yohobuy={"action":"go.h5","params":{"title":"${this.query.title}","url":"${this.query.jumpUrl}"}}`; // eslint-disable-line
-                }
-
                 $('body').append('<a id="jump-url" href="javascript:;" style="display: none;"></a>');
                 $('body').append('<a id="jump-url" href="javascript:;" style="display: none;"></a>');
                 $('#jump-url').attr('href', jumpUrl);
                 $('#jump-url').attr('href', jumpUrl);
 
 
@@ -74,7 +68,11 @@ class HaveGainApplyPage extends Page {
                     yoho.ready(jumpFn);
                     yoho.ready(jumpFn);
                 }
                 }
             } else {
             } else {
-                window.location.href = jumpUrl;
+                if (jumpUrl.indexOf('go.minealliance') > -1 && this.query.jumpUrl) {
+                    window.location.href = this.query.jumpUrl;
+                } else {
+                    window.location.href = jumpUrl;
+                }
             }
             }
         }
         }
     }
     }