Merge branch 'dev4.5.5' of ssh://127.0.0.1:10022/qmx/jy into dev4.5.5

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/change_area.js

@@ -461,7 +461,13 @@ $(function () {
         }
         console.log(areaData, 'areaData')
         if (getParam('header') === 'save') {
-          $DoPost('/subscribepay/vipsubscribe/saveChange', params, function (res) {
+            let url = ''
+            if(getParam('subvip') === 'free') {
+                url = '/subscribepay/vipsubscribe/freeSaveChange'
+            } else {
+                url = '/subscribepay/vipsubscribe/saveChange'
+            }
+          $DoPost(url, params, function (res) {
             if (res.data && res.data.doSuccess) {
               weui.toast('修改成功', {
                 duration: 2000,

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/change_industry.js

@@ -293,7 +293,13 @@ $(function () {
         }
         // 超级订阅新套餐 修改订阅条件需要提交后台保存， 因是共用页面,为不影响其他页面逻辑，url加上参数进行判断
         if (getParam('header') === 'save') {
-          $DoPost('/subscribepay/vipsubscribe/saveChange', params, function (res) {
+          let url = ''
+          if(getParam('subvip') === 'free') {
+            url = '/subscribepay/vipsubscribe/freeSaveChange'
+          } else {
+            url = '/subscribepay/vipsubscribe/saveChange'
+          }
+          $DoPost(url, params, function (res) {
             if (res.data && res.data.doSuccess) {
               weui.toast('修改成功', {
                 duration: 2000,

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_introduce.html

@@ -207,8 +207,8 @@
         data: function() {
             return {
                 linkObj: {
-                    area: '/jyapp/vipsubscribe/toChangeArea?header=save',
-                    industry: '/jyapp/vipsubscribe/toChangeIndustry?header=save',
+                    area: '/jyapp/vipsubscribe/toChangeArea?header=save&subvip=free',
+                    industry: '/jyapp/vipsubscribe/toChangeIndustry?header=save&subvip=free',
                     keyword: '/jyapp/vipsubscribe/toSetKeyWordPage',
                     infotype: '/jyapp/vipsubscribe/toSetInfoTypePage',
                     resultview: '/jyapp/vipsubscribe/toVIPViewPage',

src/web/staticres/common-module/vipsubscribe/css/vip-subscribe-set-template.css

@@ -104,13 +104,12 @@
   justify-content: space-between;
 }
 
-.vip-body .area{
+/* .vip-body .area{
   border-top-left-radius: .16rem;
   border-top-right-radius: .16rem;
-}
+} */
 .vip-body .push-set{
-  border-bottom-left-radius: .16rem;
-  border-bottom-right-radius: .16rem;
+  margin-top: .16rem;
 }
 .vip-body .cycle {
   padding: 0.16rem 0;
@@ -133,6 +132,7 @@
   padding-top: 0.2rem !important;
   padding-bottom: 0.2rem !important;
   height: 1.1rem;
+  box-shadow: 0px 8px 0px #f5f6f7;
 }
 
 .vip-body .project-match .item-l .icon-bangzhu {
@@ -221,6 +221,19 @@
 /*/2.10.7/*/
 .vip-body .resultpreview {
     margin-top: 0.16rem;
+    box-shadow: 0px 8px 0px #f5f6f7;
+}
+.vip-body .resultpreview .item-label-other{
+  display: flex;
+  flex-direction: column;
+}
+.vip-body .resultpreview .info-little{
+  font-size: .24rem;
+  font-family: PingFang SC, PingFang SC-Medium;
+  font-weight: 500;
+  text-align: LEFT;
+  color: #fb483d;
+  line-height: .36rem;
 }
 .jy-icon-keywords {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAARcSURBVHgB7VhLcttGEO0egPQyvEGYGzAnMHwCUzuVih8kklOpykLyCUidINZeioamF9mZPoGpE9g+geETmEu7BEy7BxSBGfxpu4obvCp+5oOe/k83AFq0aNGiRYsWhwPus9k/9vvUcW/5qUE8QSDRCS+llBs4ENx9NlO385a/+8kEwgVFHT0+ggNBNN04Hv/pW8zvgDT0T54N4EBoLIAAMS1bUy4N4UBoJID2fXYXL52hgL8Sv+dAOocDoZEA1HFm5hiJLgloYUz1/NGZBwdAMxdC4VljR62FwpU5RQgzOABq0+hodDp0BL5OJgjWi+X1E/13Ojn7zD+9h5UNivC370mpI7aeg/B066bUM9jbsGYCBdEb516t5f8yyD5bm0aZsBW8CGqRygJXrIGd5ntR5Pr8+wIaImZc4K2d3TI6RRpwAhlS1wnG47Or5fLaol/pQtvgRTPDbOTyP5k8rGCdIfYUGmIy+WvqCHhbmJoLQX2B8C8LcZE5sxxRR3jWBJLl9/LV9Vq7VLoOXpNg1ophS+YtxbTYqpe7j0V7xzDHmu/7iZtVupBAnX0o5S/CRe5MhDs2urcbKxHfCWuogOo6F5jGjqYSoIiecPwE2b3MbJ+U+w7S/T2lXG2Fecxj2SGjWJOmeSmINZ6BEKGlSQScmhoqgqD4HqllXkPPK2JrmGcQPE5oQQkcJCt42Q5vSg7YZEzdC0PHgwpwHL1ARUdI6jkz/3sZ8wkvTiitiV0xCVUuFOf+1H2EiEqzi2LhhOFGDqK+mVdQAfnqpnLd2stK4pRtTlXHQK5wYw1XaUlriP10lhDWwcxutM+dcMIFoeNEA0TRZxf5hYlk3JAKnysUIFu4EQtwfPx3H0rw5QvAo0743qyXzEArw0N/cc7P+dsL7MGjsZxhqBMgJmoVbtqbYP6oG85hD+hghgoBJpNn51xP6fUe/AByAqiu6+/VppWC+vpOKMpck8nZDLfMm/s5GYg1IX0QpIIcNRS3RafkBNhqrpn56lB0J8QWzliGhbkCEc2lvCmNGQ7iegHyuZ8LNE510BQIzJyYpcP4TpibwRx13KGVu3WCWN5cVJHVCYFU8ZolwDb3Gw7EpYN8mdY+dYgvMCV0Ck1uzWyBJ4Aem2eokvvFRBSJoSjxa2Edjuibi0WlQxW0pjONTkGBl02PqjLVapfbljTFSATQUtpLxaVDHbKNjk6tp6f//JpQRfpkM1Dea/sn/iD3JiQDt4wQNTBtEbTQHHBaq4mm7++//gG74kuhJGH0GCzgdHx6GxEuwtANYqbc+4FucCj2iOqEIkxC1kJF6VAH3eiYY7P4ypXg8Qb0dW/Ad81H/Yk7QMOdMS6taVUpACnDdwlXdQVWFbhClWC9tVBWXPDbvKOiWj8P4iwIz+XL6zmn2juTv5S2AZ/7X1ZXj5v21Y++LtR1PETC48upNJZ8rrkIHO6FlZcGN5faJN4jRHfMhzT5+Jn8tWjRokWLFi1+Br4BqXrIVt09+j8AAAAASUVORK5CYII=);

src/web/staticres/common-module/vipsubscribe/js/vip-subscribe-set-template.js

@@ -1,6 +1,6 @@
 var subScribeTemplate = `
 <div class="sub-scribe">
-<ul>
+<ul style="border-radius:.16rem;overflow:hidden">
   <li class="body-item area">
     <a class="item-container" :href="linkobj.area">
       <div class="item">
@@ -96,6 +96,7 @@ var subScribeTemplate = `
             <span class="leading_ jy-icon-resultpreview-match"></span>
             <span class="item-label-other">
               <span class="label-text">推送结果预览<span class="threeInfo">{{resultTime}}</span></span>
+              <span class="info-little">当前匹配信息过少，请适当修改订阅条件</span>
             </span>
           </span>
           <span class="item-r media_switch">
@@ -203,10 +204,7 @@ var subComponent = {
       this.getActionDefault()
       this.getIndustryType()
       this.getProjectMatch()
-      if(this.type == 'introduce') {
-        this.pushsetShow = false
-        this.resultTime = '(近三个月)'
-      }
+      this.getResultView()
     },
     // 设置区域
     setArea: function() {
@@ -256,17 +254,18 @@ var subComponent = {
       if(state) {
         if(state.items) {
           if (state.items.length === 0) {
-            $('.body-item.keywords .keywords-text').text('未分类')
+            $('.body-item.keywords .keywords-text').text('已设置' +arr.length+ '组关键词')
           } else {
               var arr = []
               state.items.forEach(function (item, index) {
                   arr.push(item['s_item'])
               })
-              $('.body-item.keywords .keywords-text').text(arr.join('、'))
+              // $('.body-item.keywords .keywords-text').text(arr.join('、'))
+              $('.body-item.keywords .keywords-text').text('已设置' +arr.length+ '组关键词')
           }
         }
       } else {
-        $('.body-item.keywords .keywords-text').text('未分类')
+        $('.body-item.keywords .keywords-text').text('已设置' +arr.length+ '组关键词')
       }
     },
     // 信息类型
@@ -405,6 +404,23 @@ var subComponent = {
               label: '我知道了'
           }]
       });
+    },
+    // 最近三个月推送结果预览总数
+    getResultView: function() {
+      let _this = this
+      $.ajax({
+        type: 'POST',
+        url: '/subscribepay/afterPay/getPushCount',
+        success: function(res) {
+          console.log(res)
+          if(_this.type == 'introduce') {
+            _this.pushsetShow = false
+            _this.resultTime = '(近三个月)'
+          } else {
+            _this.resultTime = '(近3个月内共' + res.count + '条信息)'
+          }
+        }
+      })
     }
   },
 }

src/web/staticres/vipsubscribe/js/change_area.js

@@ -461,7 +461,13 @@ $(function () {
           industry: (areaData.data.industry).join(',')
         }
         if (getParam('header') === 'save') {
-          $DoPost('/subscribepay/vipsubscribe/saveChange', params, function (res) {
+          let url = ''
+          if(getParam('subvip') === 'free') {
+            url = '/subscribepay/vipsubscribe/freeSaveChange'
+          } else {
+            url = '/subscribepay/vipsubscribe/saveChange'
+          }
+          $DoPost(url, params, function (res) {
             if (res.data && res.data.doSuccess) {
               weui.toast('修改成功', {
                 duration: 2000,

src/web/staticres/vipsubscribe/js/change_industry.js

@@ -276,7 +276,13 @@ $(function () {
         }
         // 超级订阅新套餐 修改订阅条件需要提交后台保存， 因是共用页面,为不影响其他页面逻辑，url加上参数进行判断
         if (getParam('header') === 'save') {
-          $DoPost('/subscribepay/vipsubscribe/saveChange', params, function (res) {
+          let url = ''
+          if(getParam('subvip') === 'free') {
+            url = '/subscribepay/vipsubscribe/freeSaveChange'
+          } else {
+            url = '/subscribepay/vipsubscribe/saveChange'
+          }
+          $DoPost(url, params, function (res) {
             if (res.data && res.data.doSuccess) {
               weui.toast('修改成功', {
                 duration: 2000,

src/web/templates/weixin/vipsubscribe/vip_introduce.html

@@ -203,8 +203,8 @@
             data: function() {
                 return {
                     linkObj: {
-                        area: '/front/vipsubscribe/toChangeArea?header=save',
-                        industry: '/front/vipsubscribe/toChangeIndustry?header=save',
+                        area: '/front/vipsubscribe/toChangeArea?header=save&subvip=free',
+                        industry: '/front/vipsubscribe/toChangeIndustry?header=save&subvip=free',
                         keyword: '/front/vipsubscribe/toSetKeyWordPage',
                         infotype: '/front/vipsubscribe/toSetInfoTypePage',
                         resultview: '/front/vipsubscribe/toVIPViewPage',