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

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -2225,61 +2225,74 @@
                         }
                       } else {
                         // 付费用户
-                        // 有个数
-                        if( window.downloadNum > 0) {
-                          // 大会员、商机管理下载
-                          if (window.memberStatus > 0 || window.entniche ) {
-                            if(mySysIsIos()){
-                              iosShow(url,fileName,size,false)
-                            } else {
-                              downloadFileAjax(fileName)
-                            }
-                            return
+                        // 大会员用户 且有附件下载个数
+                        if (window.memberStatus > 0) {
+                          if(mySysIsIos()){
+                            iosShow(url,fileName,size,false)
+                          } else {
+                            downloadFileAjax(fileName)
+                            // location.href = url
                           }
-                          // 超级订阅用户
-                          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
+                          return
+                        }
+                        // 超级订阅用户
+                        if (window.vipStatus > 0) {
+                          // 是新超级订阅用户
+                          if (window.viper) {
+                            // IOS APP端特殊流程处理，先提示填写邮箱后扣次数
+                            if(mySysIsIos()) {
+                              return iosShow(url, fileName,size,false)
                             }
-                          }
-                        } 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',
-                              confirmButtonText: '我知道了',
+                            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',
-                              width: 303,
-                            }).then(() => {})
+                              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
                           }
                         }
+                        // 商机管理用户只要有个数就有下载权限
+                        if(window.entniche && window.downloadNum > 0){
+                          if(mySysIsIos()){
+                            iosShow(url,fileName,size,false)
+                          } else {
+                            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) {

src/web/staticres/common-module/file-pack/js/index-wx.js

@@ -226,6 +226,7 @@ var vm = new Vue({
           if (res.error_msg === '' && res.data && res.data.data) {
             try {
               var tempInfo = res.data.data[0]
+              this.accountInfo = tempInfo
               this.points.total = tempInfo.number
             } catch (e) {
               console.warn(e)

src/web/templates/frontRouter/wx/fileRecord/sess/index.html

@@ -339,6 +339,7 @@
                                 <p class="row-top">
                                     <span>2、兑换</span><span class="handle-text"  @click="exchangeHandle">去兑换 <em class="j-icon icon-arrow-right"></em></span>
                                 </p>
+                                {333333}
                                 <p>您当月剩余剑鱼币兑换附件下载权益 <em class="highlight-color">{ accountInfo.exchangeNum || 0 }</em> 个。</p>
                                 <p><em>350</em> 剑鱼币可兑换查看一个附件下载权益。兑换后30天内有效。</p>
                             </div>

src/web/templates/weixin/wxinfocontent_rec.html

@@ -2439,51 +2439,55 @@ function andownload() {
                       downloadFileAjax(fileName)
                     }
                   }else{
+                    console.log(7777777)
                     // 付费用户
-                    // 有附件下载个数
-                    if(window.downloadNum > 0) {
-                      //大会员或者商机管理
-                      if (window.memberStatus > 0 || window.entniche) {
+                    // 大会员用户且有附件下载个数
+                    if (window.memberStatus >0 ) {
+                      console.log(7777777)
+                      downloadFileAjax(fileName)
+                      return
+                    }
+                    //超级订阅
+                    if (window.vipStatus>0){
+                      //超级订阅新用户
+                      if(window.viper){
                         downloadFileAjax(fileName)
                         return
-                      }
-                      //超级订阅
-                      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',
-                          confirmButtonText: '我知道了',
+                      }else{
+                        //超级订阅老用户  提醒升级
+                        vant.Dialog.confirm({
+                          title: '升级超级订阅',
+                          message: '对不起，暂无权限，您可升级超级订阅解锁附件下载',
+                          showCancelButton: true,
+                          confirmButtonText: '前往升级',
                           confirmButtonColor: '#2ABDD1',
-                          width: 303,
-                        }).then(() => {})
+                          className: 'custom-dialog',
+                          width: 303
+                        }).then(() => {
+                          // location.href = '/front/vipsubscribe/upgradePage'
+                          window.location.href="/jy_mobile/common/order/create/svip?type=upgrade"
+                        }).catch(() => {})
                         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 (window.isNoMember) {