提交代码

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

@@ -16,9 +16,9 @@
     <div class="j-main portraited" id="proRecord" v-cloak>
       <div class="j-container">
         <div class="j-main">
-          <div class="t-bg flex">
+          <div class="t-bg flex" style="min-height:3.28rem;">
             <div class="nums">
-              <span>{points.total}</span>个
+              <span>{points.total - points.usage}</span>个
               <img src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/portraitRecord/image/help-p.png?v={{Msg "seo" "version"}}' @click="helpTiped" alt="">
             </div>
             <div class="btns flex">

src/web/staticres/common-module/portraitRecord/js/index-wx.js

@@ -117,7 +117,7 @@ var vm = new Vue({
           }
         }
 
-        if (r.data.list) {
+        if (Array.isArray(r.data.list) && r.data.list.length !== 0) {
           var _this = this
           this.list = this.list.concat(r.data.list.map(function (v) {
             return {
@@ -132,6 +132,8 @@ var vm = new Vue({
               checked: false
             }
           }))
+        } else {
+          this.listInfo.finished = true
         }
 
         this.listInfo.loading = false
@@ -159,9 +161,9 @@ var vm = new Vue({
     },
     helpTiped() {
       let _this = this
-      if (_this.points.provin === -1) {
+      if (_this.points.provin === -1&&_this.points.usage !== _this.points.total) {
         this.$dialog.alert({
-          message: '每订购1个省，可查看50个企业画像/月。 您当前订阅了全国。',
+          message: '每订购1个省，可查看50个企业画像/月。',
           className: 'pro-log',
           messageAlign: 'left',
           confirmButtonColor: '#2ABED1',

src/web/staticres/common-module/portraitRecord/js/index.js

@@ -117,7 +117,7 @@ var vm = new Vue({
           }
         }
 
-        if (r.data.list) {
+        if (Array.isArray(r.data.list) && r.data.list.length !== 0) {
           var _this = this
           this.list = this.list.concat(r.data.list.map(function (v) {
             return {
@@ -132,6 +132,8 @@ var vm = new Vue({
               checked: false
             }
           }))
+        } else {
+          this.listInfo.finished = true
         }
 
         this.listInfo.loading = false
@@ -159,9 +161,9 @@ var vm = new Vue({
     },
     helpTiped() {
       let _this = this
-      if (_this.points.provin === -1) {
+      if (_this.points.provin === -1&&_this.points.usage !== _this.points.total) {
         this.$dialog.alert({
-          message: '每订购1个省，可查看50个企业画像/月。 您当前订阅了全国。',
+          message: '每订购1个省，可查看50个企业画像/月。',
           className: 'pro-log',
           messageAlign: 'left',
           confirmButtonColor: '#2ABED1',

src/web/staticres/frontRouter/pc/seeHistory/js/index-pc.js

@@ -88,8 +88,8 @@ var vm = new Vue({
             }).done(res => {
                 var _this = this
                 if (res.error_code == 0 && res.data.list) {
-                    if (res.data.count) {
-                        this.listState.total = res.data.count
+                    if (res.data.total) {
+                        this.listState.total = res.data.total
                     }
                     res.data.list.forEach(v => {
                         const arrs = {

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

@@ -32,7 +32,7 @@
         <div class="j-main">
           <div class="t-bg flex">
             <div class="nums">
-              <span>{points.total}</span>个
+              <span>{points.total - points.usage}</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">