Merge branch 'feature/v4.9.12_ws' of qmx/jy into feature/v4.9.12

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/utils.js

@@ -101,6 +101,8 @@ var utils = {
     // utils版本号
     version: '0.0.3',
     isWeiXinBrowser: navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1,
+    isH5: window.location.href.toLowerCase().indexOf('h5') !== -1,
+    isApp: window.location.href.toLowerCase().indexOf('app') !== -1,
     isAndroid: navigator.userAgent.toLowerCase().indexOf('android') !== -1,
     isIos: /iphone|ipod|ipad|ios/.test(navigator.userAgent.toLowerCase()),
     // 传入你要获取的参数的名字

src/web/staticres/common-module/collection/js/buyer-example.js

@@ -250,7 +250,9 @@ var buyerExample = {
       <div><span class="on">升级超级订阅：</span><span>适合需要订阅更多省份、查看更多采购单位画像及企业画像的用户。</span></div><div style="margin-top:20px"><span class="on">充值画像包：</span><span>适合仅需要查看更多采购单位画像用户。</span></div>
       `
       var isWeixin = utils.isWeiXinBrowser
-      if(!isWeixin) {
+      var isH5 = utils.isH5
+      var isApp = utils.isApp
+      if(!isWeixin|| isH5 || isApp) {
         if (this.getTextMap.btnText == '立即解锁') {
           // 留资
           location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=' + source

src/web/staticres/common-module/collection/js/vip-dialog.js

@@ -343,7 +343,9 @@ var vipComponent = {
       // 点击按钮保存tabActiveName值
       this.$emit('tabactive', 'save')
       const isWeixin = utils.isWeiXinBrowser
-      if (isWeixin) {
+      const isH5 = utils.isH5
+      const isApp = utils.isApp
+      if (isWeixin&&!isH5&&!isApp) {
         this.goOpenOfWx(this.getTextMap.btnText, source)
       } else {
         this.goOpenOfApp(this.getTextMap.btnText, source)