浏览代码

Merge branch 'dev/v4.8.72_zsy' of qmx/jy into release/v4.8.72

zhangsiya 1 年之前
父节点
当前提交
d6a8aef92c

+ 49 - 56
src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -2225,68 +2225,61 @@
                         }
                       } else {
                         // 付费用户
-                        // 大会员用户 且有附件下载个数
-                        if (window.memberStatus > 0 && window.downloadNum > 0) {
-                          if(mySysIsIos()){
-                            iosShow(url,fileName,size,false)
-                          } else {
-                            downloadFileAjax(fileName)
-                            // location.href = url
-                          }
-                          return
-                        }
-                        // 超级订阅用户
-                        if (window.vipStatus > 0) {
-                          // 是新超级订阅用户
-                          if (window.viper) {
-                            // IOS APP端特殊流程处理,先提示填写邮箱后扣次数
-                            if(mySysIsIos()) {
-                              return iosShow(url, fileName,size,false)
+                        // 有个数
+                        if( window.downloadNum > 0) {
+                          // 大会员、商机管理下载
+                          if (window.memberStatus > 0 || window.entniche ) {
+                            if(mySysIsIos()){
+                              iosShow(url,fileName,size,false)
+                            } else {
+                              downloadFileAjax(fileName)
                             }
-                            downloadFileAjax(fileName)
                             return
-                            //if (window.fileNum <= 0) {
-                            //}else{
-                              //window.fileNum = window.fileNum - 1;
-                              //gotoFilePageOfVip($(this).find('a').text())
-                              //return
-                            //}
-                          } else {
-                            // 老超级订阅用户 提醒升级
-                            vant.Dialog.confirm({
-                              title: '升级超级订阅',
-                              message: '对不起,暂无权限,您可升级超级订阅解锁附件下载',
-                              showCancelButton: true,
-                              confirmButtonText: '前往升级',
-                              confirmButtonColor: '#2ABDD1',
+                          }
+                          // 超级订阅用户
+                          if (window.vipStatus > 0) {
+                            // 是新超级订阅用户
+                            if (window.viper) {
+                              // IOS APP端特殊流程处理,先提示填写邮箱后扣次数
+                              if(mySysIsIos()) {
+                                return iosShow(url, fileName,size,false)
+                              } else {
+                                downloadFileAjax(fileName)
+                              }
+                              return
+                            } else {
+                              // 老超级订阅用户 提醒升级
+                              vant.Dialog.confirm({
+                                title: '升级超级订阅',
+                                message: '对不起,暂无权限,您可升级超级订阅解锁附件下载',
+                                showCancelButton: true,
+                                confirmButtonText: '前往升级',
+                                confirmButtonColor: '#2ABDD1',
+                                className: 'custom-dialog',
+                                width: 303
+                              }).then(() => {
+                                //跳转清除旧套餐缓存,防止计算价格出错
+                                sessionStorage.removeItem('vipSub_oldBuySet')
+                                // location.href = '/jyapp/vipsubscribe/upgradePage'
+                                location.href = '/jy_mobile/common/order/create/svip?type=upgrade'
+                              }).catch(() => {})
+                              return
+                            }
+                          }
+                        } else {
+                          // 是大会员自定义版本没有下载权限 或 非超级订阅的商机管理用户 (弹框提醒联系客服)
+                          var memberNoVip = window.isNoMember == true && !(window.vipStatus >0 && window.viper)
+                          if (memberNoVip || (window.vipStatus <=0 && window.entniche)) {
+                            vant.Dialog.alert({
+                              message: '您未购买此服务,如需使用请联系您的客户经理或客服升级套餐,谢谢!',
                               className: 'custom-dialog',
-                              width: 303
-                            }).then(() => {
-                              //跳转清除旧套餐缓存,防止计算价格出错
-                              sessionStorage.removeItem('vipSub_oldBuySet')
-                              // location.href = '/jyapp/vipsubscribe/upgradePage'
-                              location.href = '/jy_mobile/common/order/create/svip?type=upgrade'
-                            }).catch(() => {})
+                              confirmButtonText: '我知道了',
+                              confirmButtonColor: '#2ABDD1',
+                              width: 303,
+                            }).then(() => {})
                             return
                           }
                         }
-                        // 商机管理用户只要有个数就有下载权限
-                        if(window.entniche && window.downloadNum > 0){
-                          downloadFileAjax(fileName)
-                          return
-                        }
-                        // 是大会员自定义版本没有下载权限 或 非超级订阅的商机管理用户 (弹框提醒联系客服)
-                        var memberNoVip = window.isNoMember == true && !(window.vipStatus >0 && window.viper)
-                        if (memberNoVip || (window.vipStatus <=0 && window.entniche)) {
-                          vant.Dialog.alert({
-                            message: '您未购买此服务,如需使用请联系您的客户经理或客服升级套餐,谢谢!',
-                            className: 'custom-dialog',
-                            confirmButtonText: '我知道了',
-                            confirmButtonColor: '#2ABDD1',
-                            width: 303,
-                          }).then(() => {})
-                          return
-                        }
                       }
                     })
                     if(userId) {

+ 38 - 41
src/web/templates/weixin/wxinfocontent_rec.html

@@ -2440,54 +2440,51 @@ function andownload() {
                     }
                   }else{
                     // 付费用户
-                    // 大会员用户且有附件下载个数
-                    if (window.memberStatus > 0 && window.downloadNum > 0) {
-                      downloadFileAjax(fileName)
-                      return
-                    }
-                    //超级订阅
-                    if (window.vipStatus>0){
-                      //超级订阅新用户
-                      if(window.viper){
+                    // 有附件下载个数
+                    if(window.downloadNum > 0) {
+                      //大会员或者商机管理
+                      if (window.memberStatus > 0 || window.entniche) {
                         downloadFileAjax(fileName)
                         return
-                      }else{
-                        //超级订阅老用户  提醒升级
-                        vant.Dialog.confirm({
-                          title: '升级超级订阅',
-                          message: '对不起,暂无权限,您可升级超级订阅解锁附件下载',
-                          showCancelButton: true,
-                          confirmButtonText: '前往升级',
-                          confirmButtonColor: '#2ABDD1',
+                      }
+                      //超级订阅
+                      if (window.vipStatus>0){
+                        //超级订阅新用户
+                        if(window.viper){
+                          downloadFileAjax(fileName)
+                          return
+                        }else{
+                          //超级订阅老用户  提醒升级
+                          vant.Dialog.confirm({
+                            title: '升级超级订阅',
+                            message: '对不起,暂无权限,您可升级超级订阅解锁附件下载',
+                            showCancelButton: true,
+                            confirmButtonText: '前往升级',
+                            confirmButtonColor: '#2ABDD1',
+                            className: 'custom-dialog',
+                            width: 303
+                          }).then(() => {
+                            // location.href = '/front/vipsubscribe/upgradePage'
+                            window.location.href="/jy_mobile/common/order/create/svip?type=upgrade"
+                          }).catch(() => {})
+                          return
+                        }
+                      }
+                    } else {
+                      // 是大会员自定义版本没有下载权限 或 非超级订阅的商机管理用户 (弹框提醒联系客服)
+                      var memberNoVip = window.isNoMember == true && !(window.vipStatus >0 && window.viper)
+                      if (memberNoVip || (window.vipStatus <=0 && window.entniche)) {
+                        vant.Dialog.alert({
+                          message: '您未购买此服务,如需使用请联系您的客户经理或客服升级套餐,谢谢!',
                           className: 'custom-dialog',
-                          width: 303
-                        }).then(() => {
-                          // location.href = '/front/vipsubscribe/upgradePage'
-                          window.location.href="/jy_mobile/common/order/create/svip?type=upgrade"
-                        }).catch(() => {})
+                          confirmButtonText: '我知道了',
+                          confirmButtonColor: '#2ABDD1',
+                          width: 303,
+                        }).then(() => {})
                         return
                       }
                     }
-                    // 商机管理用户只要有个数就有下载权限
-                    if(window.entniche && window.downloadNum > 0){
-                      downloadFileAjax(fileName)
-                      return
-                    }
-                    // 是大会员自定义版本没有下载权限 或 非超级订阅的商机管理用户 (弹框提醒联系客服)
-                    var memberNoVip = window.isNoMember == true && !(window.vipStatus >0 && window.viper)
-                    if (memberNoVip || (window.vipStatus <=0 && window.entniche)) {
-                      vant.Dialog.alert({
-                        message: '您未购买此服务,如需使用请联系您的客户经理或客服升级套餐,谢谢!',
-                        className: 'custom-dialog',
-                        confirmButtonText: '我知道了',
-                        confirmButtonColor: '#2ABDD1',
-                        width: 303,
-                      }).then(() => {})
-                      return
-                    }
                   }
-                  // return location.href = '/big/wx/page/open_app?type=article-file-download'
-                  // gotoFilePage($(this).find('a').text())
                 })
                 //if (window.isNoMember) {
                   //向所有用户开放