Merge branch 'gray' into 'master'

Gray

1.有货有赚入口页图片替换
2.解决h5内嵌小程序webview接口兼容问题

See merge request !1508

@@ -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
                 },
                 },
                 {
                 {

 {
 {
   "name": "yohobuywap-node",
   "name": "yohobuywap-node",
-  "version": "6.6.27",
+  "version": "6.6.28",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {
@@ -88,7 +88,7 @@
     "xml2js": "^0.4.19",
     "xml2js": "^0.4.19",
     "yoho-express-session": "^2.0.0",
     "yoho-express-session": "^2.0.0",
     "yoho-md5": "^2.0.0",
     "yoho-md5": "^2.0.0",
-    "yoho-node-lib": "=0.6.22",
+    "yoho-node-lib": "=0.6.23",
     "yoho-zookeeper": "^1.0.10"
     "yoho-zookeeper": "^1.0.10"
   },
   },
   "devDependencies": {
   "devDependencies": {

@@ -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,10 +68,14 @@ class HaveGainApplyPage extends Page {
                     yoho.ready(jumpFn);
                     yoho.ready(jumpFn);
                 }
                 }
             } else {
             } else {
+                if (jumpUrl.indexOf('go.minealliance') > -1 && this.query.jumpUrl) {
+                    window.location.href = this.query.jumpUrl;
+                } else {
                     window.location.href = jumpUrl;
                     window.location.href = jumpUrl;
                 }
                 }
             }
             }
         }
         }
+    }
 
 
     changeBtnStatus() {
     changeBtnStatus() {
         let errStatus = 0;
         let errStatus = 0;

@@ -9894,9 +9894,9 @@ yoho-md5@^2.0.0:
   version "2.1.0"
   version "2.1.0"
   resolved "http://npm.yohops.com/yoho-md5/-/yoho-md5-2.1.0.tgz#f0c00d343f775e77952ebce0826863ac52e0ad50"
   resolved "http://npm.yohops.com/yoho-md5/-/yoho-md5-2.1.0.tgz#f0c00d343f775e77952ebce0826863ac52e0ad50"
 
 
-yoho-node-lib@=0.6.19:
-  version "0.6.19"
-  resolved "http://npm.yohops.com/yoho-node-lib/-/yoho-node-lib-0.6.19.tgz#f3df50ea9d4a20ef7dc5f629e1725ee530e3570b"
+yoho-node-lib@=0.6.23:
+  version "0.6.23"
+  resolved "http://npm.yohops.com/yoho-node-lib/-/yoho-node-lib-0.6.23.tgz#7ad4b550c3c66deb860bc6f7b1b7d9598ca89297"
   dependencies:
   dependencies:
     dnscache "^1.0.1"
     dnscache "^1.0.1"
     handlebars "^4.0.5"
     handlebars "^4.0.5"