feat:附件下载权益权限处理

src/jfw/modules/app/src/web/templates/frontRouter/fileRecord/sess/index.html

@@ -245,66 +245,88 @@
                 <div class="t-bg flex" style="min-height:3.28rem;">
                     <span class="view-detail" @click="viewDetail">兑换/购买附件下载明细<em class="j-icon icon-arrow-right"></em></span>
                     <div class="nums">
-                        <span v-if="points.total>=0">{points.total}</span>个
-<!--                        <img src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/portraitRecord/image/help-p.png?v={{Msg "seo" "version"}}' @click="helpTiped" alt="">-->
-                    </div>
+                        <span v-if="points.total>=0">{points.total}</span>个</div>
                     <div class="btns flex">
                         <span>当月附件下载余额</span>
-                        <!-- <van-button round type="primary"  @click="setBook">立即充值</van-button>-->
                     </div>
                 </div>
-                <div  class="rights-box" :class="{'subscribe-box': showSubscribeBox }">
-                    <div class="subscribe-title" v-if="showSubscribeBox">
-                    <!-- 超级订阅展示-->
-                        <template v-if="userPower.vipStatus > 0">
-                            <img src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/subscribe-icon.png?v={{Msg "seo" "version"}}' alt="">
-                            <span>
-                                <strong>您当前是超级订阅用户</strong>，您每月享有 <em>10</em> 个附件下载权益。每月1号上余额清零重新计算。本月剩余 <em>{ accountInfo.grantNum || 0} </em> 个权益。
-                            </span>
-                       </template>
-                    <!--免费用户展示-->
-                        <span class="free-title" v-if="userPower.isFree">
+                <!--大会员且没有附件下载权益-->
+                <div  class="rights-box" v-if="userPower.memberStatus > 0">
+                    <div class="box-container">
+                        <div class="box-title">不够用这么办？你有以下两种途径补充余额</div>
+                        <div class="box-content">
+                            <!-- 大会员-->
+                            <div class="p-row upgrade-row">
+                                <p class="row-top">
+                                    <span>1、服务升级</span>
+                                    <span class="handle-text"   @click="consultKf">咨询客服 <em class="j-icon icon-arrow-right"></em></span>
+                                </p>
+                                <p>您当前是大会员用户，目前不享有附件下载权益。您可以联系客服进行服务升级后获得。</p>
+                            </div>
+                            <div class="p-row exchange-row">
+                                <p class="row-top">
+                                    <span>2、兑换</span>
+                                    <span class="handle-text"  @click="exchangeHandle">去兑换 <em class="j-icon icon-arrow-right"></em></span>
+                                </p>
+                                <p>您当月剩余剑鱼币兑换附件下载权益 <em class="highlight-color">{ accountInfo.exchangeNum || 0 }</em> 个。</p>
+                                <p><em>350</em> 剑鱼币可兑换查看一个附件下载权益。兑换后30天内有效。</p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <!-- 超级订阅且有附件下载权益-->
+                <div  class="rights-box subscribe-box" v-else-if="userPower.vipStatus > 0">
+                    <div class="subscribe-title">
+                        <img src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/subscribe-icon.png?v={{Msg "seo" "version"}}' alt="">
+                        <span>
+                            <strong>您当前是超级订阅用户</strong>，您每月享有 <em>10</em> 个附件下载权益。每月1号上余额清零重新计算。本月剩余 <em>{ accountInfo.grantNum || 0} </em> 个权益。
+                        </span>
+                    </div>
+                    <div class="box-container">
+                        <div class="box-title">不够用这么办？你有以下两种途径补充余额</div>
+                        <div class="box-content">
+                            <div class="p-row upgrade-row">
+                                <p class="row-top">
+                                    <span>1、服务升级</span>
+                                    <span class="handle-text" @click="knowMore">了解详情 <em class="j-icon icon-arrow-right"></em></span>
+                                </p>
+                                <p>您可购买大会员，获得每个月不限量附件下载。</p>
+                            </div>
+                            <div class="p-row recharge-row">
+                                <p class="row-top">
+                                 <span>2、充值</span><span class="handle-text" @click="setBook">去充值 <em class="j-icon icon-arrow-right"></em></span>
+                                </p>
+                                <p>您购买了附加下载包，当月有效。本月剩余权益 <em class="highlight-color">{ accountInfo.purchaseNum || 0 }</em> 个权益。</p>
+                            </div>
+                            <div class="p-row exchange-row">
+                                <p class="row-top">
+                                    <span>3、兑换</span><span class="handle-text"  @click="exchangeHandle">去兑换 <em class="j-icon icon-arrow-right"></em></span>
+                                </p>
+                                <p>您当月剩余剑鱼币兑换附件下载权益 <em class="highlight-color">{ accountInfo.exchangeNum || 0 }</em> 个。</p>
+                                <p><em>350</em> 剑鱼币可兑换查看一个附件下载权益。兑换后30天内有效。</p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <!--免费用户-->
+                <div  class="rights-box" :class="{'subscribe-box': accountInfo.freeNum > 0 }" v-else-if="userPower.isFree">
+                    <div class="subscribe-title" v-if="accountInfo.freeNum > 0">
+                        <span class="free-title">
                             <strong>您当前是免费用户</strong>，可免费下载附件 <em>{ accountInfo.freeNum || 0}</em> 次。
                         </span>
                     </div>
                     <div class="box-container">
                         <div class="box-title">不够用这么办？你有以下两种途径补充余额</div>
                         <div class="box-content">
-                            <template v-if="!userPower.isFree">
-                                <!-- 大会员-->
-                                <div class="p-row upgrade-row" v-if="userPower.memberStatus > 0">
-                                    <p class="row-top">
-                                        <span><em>1</em>、服务升级</span>
-                                        <span class="handle-text"   @click="consultKf">咨询客服 <em class="j-icon icon-arrow-right"></em></span>
-                                    </p>
-                                    <p>您当前是大会员用户，目前不享有附件下载权益。您可以联系客服进行服务升级后获得。</p>
-                                </div>
-                                <!--非大会员-->
-                                <div class="p-row upgrade-row" v-else>
-                                    <p class="row-top">
-                                        <span><em>1</em>、服务升级</span>
-                                        <span class="handle-text" @click="knowMore">了解详情 <em class="j-icon icon-arrow-right"></em></span>
-                                    </p>
-                                    <p>您可购买大会员，获得每个月不限量附件下载。</p>
-                                </div>
-                            </template>
-                            <!-- 非大会员展示充值-->
-                            <template v-if="userPower.memberStatus <= 0">
-                                <div class="p-row recharge-row">
-                                    <p class="row-top">
-                                    <span>
-                                        <em>{userPower.isFree ? 1 : 2}</em>、充值</span><span class="handle-text" @click="setBook">去充值 <em class="j-icon icon-arrow-right"></em>
-                                    </span>
-                                    </p>
-                                    <p>您购买了附加下载包，当月有效。本月剩余权益 <em class="highlight-color">{ accountInfo.purchaseNum || 0 }</em> 个权益。</p>
-                                </div>
-                            </template>
+                            <div class="p-row recharge-row">
+                                <p class="row-top">
+                                    <span>1、充值</span><span class="handle-text" @click="setBook">去充值 <em class="j-icon icon-arrow-right"></em></span>
+                                </p>
+                                <p>超级订阅用户每月享有下载10个附件的权限，也可充值附件下载包增加当月附件下载个数，每月1号上余额清零重新计算。</p>
+                            </div>
                             <div class="p-row exchange-row">
                                 <p class="row-top">
-                                    <span>
-                                        <em>{ (userPower.memberStatus > 0 || userPower.isFree) ? 2 : 3  }</em>
-                                        、兑换</span><span class="handle-text"  @click="exchangeHandle">去兑换 <em class="j-icon icon-arrow-right"></em>
-                                    </span>
+                                    <span>2、兑换</span><span class="handle-text"  @click="exchangeHandle">去兑换 <em class="j-icon icon-arrow-right"></em></span>
                                 </p>
                                 <p>您当月剩余剑鱼币兑换附件下载权益 <em class="highlight-color">{ accountInfo.exchangeNum || 0 }</em> 个。</p>
                                 <p><em>350</em> 剑鱼币可兑换查看一个附件下载权益。兑换后30天内有效。</p>

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

@@ -127,10 +127,6 @@ var vm = new Vue({
     // 大会员是否拥有附件下载权益
     hasDownloadPower () {
       return this.userPower.power.indexOf(3) > -1
-    },
-    // 展示外层边框（权益）(非大会员、免费用户且有免费权益、或者为超级订阅)
-    showSubscribeBox () {
-      return (this.userPower.vipStatus > 0 || (this.userPower.isFree && this.accountInfo.number4)) && this.userPower.memberStatus <= 0
     }
   },
   created: function () {
@@ -188,7 +184,15 @@ var vm = new Vue({
     },
     // 兑换明细
     viewDetail () {
-
+      location.href = '/jy_mobile/fileRecord/exchange'
+    },
+    // 去充值
+    setBook() {
+      if(this.userPower && this.userPower.isFree){
+        location.href = '/jy_mobile/common/order/create/svip?type=buy'
+        return
+      }
+      location.href = '/jy_mobile/common/order/create/filepack?type=0'
     },
     getPType(paraName){
           let _this = this
@@ -375,15 +379,6 @@ var vm = new Vue({
     contractPerson() {
       // location.href = '400-108-6670'
       location.href = '/big/wx/page/customer'
-    },
-    // 去充值
-    setBook() {
-      var temp = {
-        wx: '/jy_mobile/common/order/create/filepack?type=0',
-        app: '/jy_mobile/common/order/create/filepack?type=0'
-      }
-      var isWeixin = navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1
-      location.href = temp[isWeixin ? 'wx' : 'app']
     }
   }
 })

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

@@ -104,10 +104,6 @@ var vm = new Vue({
     // 大会员是否拥有附件下载权益
     hasDownloadPower () {
       return this.userPower.power.indexOf(3) > -1
-    },
-    // 展示外层边框（权益）(非大会员、免费用户且有免费权益、或者为超级订阅)
-    showSubscribeBox () {
-      return (this.userPower.vipStatus > 0 || (this.userPower.isFree && this.accountInfo.freeNum)) && this.userPower.memberStatus <= 0
     }
   },
   created: function () {
@@ -217,7 +213,15 @@ var vm = new Vue({
     },
     // 兑换明细
     viewDetail () {
-
+      location.href = '/jy_mobile/fileRecord/exchange'
+    },
+    // 去充值
+    setBook() {
+      if(this.userPower && this.userPower.isFree){
+        location.href = '/jy_mobile/common/order/create/svip?type=buy'
+        return
+      }
+      location.href = '/jy_mobile/common/order/create/filepack?type=0'
     },
     getPType (paraName) {
       let _this = this
@@ -410,15 +414,6 @@ var vm = new Vue({
       // } catch (error) {
       //   console.log(error)
       // }
-    },
-    // 去充值
-    setBook() {
-      var temp = {
-        wx: '/jy_mobile/common/order/create/filepack?type=0',
-        app: '/jy_mobile/common/order/create/filepack?type=0'
-      }
-      var isWeixin = navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1
-      location.href = temp[isWeixin ? 'wx' : 'app']
     }
   }
 })

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

@@ -253,65 +253,88 @@
                 <div class="t-bg flex">
                     <div class="nums">
                         <span v-if="points.total>=0">{points.total}</span>个
-<!--                        <img src='{{Msg "seo" "cdn"}}/common-module/portraitRecord/image/help-p.png?v={{Msg "seo" "version"}}' @click="helpTiped" alt="">-->
                     </div>
                     <div class="btns flex">
                         <span>当月附件下载余额</span>
-<!--                        <van-button round type="primary"  @click="setBook">立即充值</van-button>-->
                     </div>
                 </div>
-                <div  class="rights-box" :class="{'subscribe-box': showSubscribeBox }">
-                    <div class="subscribe-title" v-if="showSubscribeBox">
-                        <!-- 超级订阅展示-->
-                        <template v-if="userPower.vipStatus > 0">
-                            <img src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/subscribe-icon.png?v={{Msg "seo" "version"}}' alt="">
-                            <span>
-                                <strong>您当前是超级订阅用户</strong>，您每月享有 <em>10</em> 个附件下载权益。每月1号上余额清零重新计算。本月剩余 <em>{ accountInfo.grantNum || 0} </em> 个权益。
-                            </span>
-                        </template>
-                        <!--免费用户展示-->
-                        <span class="free-title" v-if="userPower.isFree">
+                <!--大会员且没有附件下载权益-->
+                <div  class="rights-box" v-if="userPower.memberStatus > 0">
+                    <div class="box-container">
+                        <div class="box-title">不够用这么办？你有以下两种途径补充余额</div>
+                        <div class="box-content">
+                            <!-- 大会员-->
+                            <div class="p-row upgrade-row">
+                                <p class="row-top">
+                                    <span>1、服务升级</span>
+                                    <span class="handle-text"   @click="consultKf">咨询客服 <em class="j-icon icon-arrow-right"></em></span>
+                                </p>
+                                <p>您当前是大会员用户，目前不享有附件下载权益。您可以联系客服进行服务升级后获得。</p>
+                            </div>
+                            <div class="p-row exchange-row">
+                                <p class="row-top">
+                                    <span>2、兑换</span>
+                                    <span class="handle-text"  @click="exchangeHandle">去兑换 <em class="j-icon icon-arrow-right"></em></span>
+                                </p>
+                                <p>您当月剩余剑鱼币兑换附件下载权益 <em class="highlight-color">{ accountInfo.exchangeNum || 0 }</em> 个。</p>
+                                <p><em>350</em> 剑鱼币可兑换查看一个附件下载权益。兑换后30天内有效。</p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <!-- 超级订阅且有附件下载权益-->
+                <div  class="rights-box subscribe-box" v-else-if="userPower.vipStatus > 0">
+                    <div class="subscribe-title">
+                        <img src='{{Msg "seo" "cdn"}}/common-module/collection/image/subscribe-icon.png?v={{Msg "seo" "version"}}' alt="">
+                        <span>
+                            <strong>您当前是超级订阅用户</strong>，您每月享有 <em>10</em> 个附件下载权益。每月1号上余额清零重新计算。本月剩余 <em>{ accountInfo.grantNum || 0} </em> 个权益。
+                        </span>
+                    </div>
+                    <div class="box-container">
+                        <div class="box-title">不够用这么办？你有以下两种途径补充余额</div>
+                        <div class="box-content">
+                            <div class="p-row upgrade-row">
+                                <p class="row-top">
+                                    <span>1、服务升级</span>
+                                    <span class="handle-text" @click="knowMore">了解详情 <em class="j-icon icon-arrow-right"></em></span>
+                                </p>
+                                <p>您可购买大会员，获得每个月不限量附件下载。</p>
+                            </div>
+                            <div class="p-row recharge-row">
+                                <p class="row-top">
+                                    <span>2、充值</span><span class="handle-text" @click="setBook">去充值 <em class="j-icon icon-arrow-right"></em></span>
+                                </p>
+                                <p>您购买了附加下载包，当月有效。本月剩余权益 <em class="highlight-color">{ accountInfo.purchaseNum || 0 }</em> 个权益。</p>
+                            </div>
+                            <div class="p-row exchange-row">
+                                <p class="row-top">
+                                    <span>3、兑换</span><span class="handle-text"  @click="exchangeHandle">去兑换 <em class="j-icon icon-arrow-right"></em></span>
+                                </p>
+                                <p>您当月剩余剑鱼币兑换附件下载权益 <em class="highlight-color">{ accountInfo.exchangeNum || 0 }</em> 个。</p>
+                                <p><em>350</em> 剑鱼币可兑换查看一个附件下载权益。兑换后30天内有效。</p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <!--免费用户-->
+                <div  class="rights-box" :class="{'subscribe-box': accountInfo.freeNum > 0 }" v-else-if="userPower.isFree">
+                    <div class="subscribe-title" v-if="accountInfo.freeNum > 0">
+                        <span class="free-title">
                             <strong>您当前是免费用户</strong>，可免费下载附件 <em>{ accountInfo.freeNum || 0}</em> 次。
                         </span>
                     </div>
                     <div class="box-container">
                         <div class="box-title">不够用这么办？你有以下两种途径补充余额</div>
                         <div class="box-content">
-                            <template v-if="!userPower.isFree">
-                                <!-- 大会员-->
-                                <div class="p-row upgrade-row" v-if="userPower.memberStatus > 0">
-                                    <p class="row-top">
-                                        <span><em>1</em>、服务升级</span>
-                                        <span class="handle-text"   @click="consultKf">咨询客服 <em class="j-icon icon-arrow-right"></em></span>
-                                    </p>
-                                    <p>您当前是大会员用户，目前不享有附件下载权益。您可以联系客服进行服务升级后获得。</p>
-                                </div>
-                                <!--非大会员-->
-                                <div class="p-row upgrade-row" v-else>
-                                    <p class="row-top">
-                                        <span><em>1</em>、服务升级</span>
-                                        <span class="handle-text" @click="knowMore">了解详情 <em class="j-icon icon-arrow-right"></em></span>
-                                    </p>
-                                    <p>您可购买大会员，获得每个月不限量附件下载。</p>
-                                </div>
-                            </template>
-                            <!-- 非大会员展示充值-->
-                            <template v-if="userPower.memberStatus <= 0">
-                                <div class="p-row recharge-row">
-                                    <p class="row-top">
-                                    <span>
-                                        <em>{userPower.isFree ? 1 : 2}</em>、充值</span><span class="handle-text" @click="setBook">去充值 <em class="j-icon icon-arrow-right"></em>
-                                    </span>
-                                    </p>
-                                    <p>您购买了附加下载包，当月有效。本月剩余权益 <em class="highlight-color">{ accountInfo.purchaseNum || 0 }</em> 个权益。</p>
-                                </div>
-                            </template>
+                            <div class="p-row recharge-row">
+                                <p class="row-top">
+                                    <span>1、充值</span><span class="handle-text" @click="setBook">去充值 <em class="j-icon icon-arrow-right"></em></span>
+                                </p>
+                                <p>超级订阅用户每月享有下载10个附件的权限，也可充值附件下载包增加当月附件下载个数，每月1号上余额清零重新计算。</p>
+                            </div>
                             <div class="p-row exchange-row">
                                 <p class="row-top">
-                                    <span>
-                                        <em>{ (userPower.memberStatus > 0 || userPower.isFree) ? 2 : 3  }</em>
-                                        、兑换</span><span class="handle-text"  @click="exchangeHandle">去兑换 <em class="j-icon icon-arrow-right"></em>
-                                    </span>
+                                    <span>2、兑换</span><span class="handle-text"  @click="exchangeHandle">去兑换 <em class="j-icon icon-arrow-right"></em></span>
                                 </p>
                                 <p>您当月剩余剑鱼币兑换附件下载权益 <em class="highlight-color">{ accountInfo.exchangeNum || 0 }</em> 个。</p>
                                 <p><em>350</em> 剑鱼币可兑换查看一个附件下载权益。兑换后30天内有效。</p>