소스 검색

feat:常用功能样式、订阅设置调整

yangfeng 2 년 전
부모
커밋
51fb1fad34
3개의 변경된 파일26개의 추가작업 그리고 6개의 파일을 삭제
  1. 16 5
      src/components/push-list/PushList.vue
  2. 8 1
      src/views/SubPush.vue
  3. 2 0
      src/views/workspace/components/CommonUse.vue

+ 16 - 5
src/components/push-list/PushList.vue

@@ -60,14 +60,14 @@
       <empty v-show="showEmpty">
         <div v-if="isAllFirst && showMButton">
           <span>您尚未设置关键词</span>
-          <div class="add-key-button" @click="$router.push('/set_subscribe/config')">
+          <div class="add-key-button" @click="goManage">
             <!-- <span class="icon-chahao"></span> -->
             <span class="button-text">前往订阅设置</span>
           </div>
         </div>
         <div v-else>
           <span>对不起,没有匹配到数据,请修改订阅设置</span>
-          <div class="add-key-button" @click="$router.push('/set_subscribe/config')">
+          <div class="add-key-button" @click="goManage">
             <span class="button-text">前往订阅设置</span>
           </div>
         </div>
@@ -109,9 +109,16 @@
         </div>
       </div>
       <empty v-show="!tableList.length">
-        <div>
+        <div v-if="isAllFirst && showMButton">
+          <span>您尚未设置关键词</span>
+          <div class="add-key-button" @click="goManage">
+            <!-- <span class="icon-chahao"></span> -->
+            <span class="button-text">前往订阅设置</span>
+          </div>
+        </div>
+        <div v-else>
           <span>对不起,没有匹配到数据,请修改订阅设置</span>
-          <div class="add-key-button" @click="$router.push('/set_subscribe/config')">
+          <div class="add-key-button" @click="goManage">
             <span class="button-text">前往订阅设置</span>
           </div>
         </div>
@@ -575,7 +582,11 @@ export default {
       return arr
     },
     goManage () {
-      this.$router.push('/set_subscribe/config')
+      if (this.vt === 'f') {
+        this.$emit('free', 'f')
+      } else {
+        this.$router.push('/set_subscribe/config')
+      }
     },
     resetAllCheck () {
       $('.custom-checkbox.has-top').prop('checked', false)

+ 8 - 1
src/views/SubPush.vue

@@ -172,7 +172,7 @@
         </el-dialog>
       </div>
       <push-list @personCount="personCount" :vt="vt" :config="config" showManageButton :filters="filters" class="m-24"
-        ref="pushList" :showMore="false"></push-list>
+        ref="pushList" :showMore="false" @free="onFreeTip"></push-list>
       <CustomDialog title="开通超级订阅" class="text-center" custom-class="open-vip-dialog" width="380px" top="30vh" center
         :visible.sync="dialog.buyVip">
         立享更多搜索权限,寻找商机更精准
@@ -1016,6 +1016,13 @@ export default {
     // 查看详情
     viewDetailCallBack (val) {
       this.isOpenedViewDetail = val
+    },
+    onFreeTip (data) {
+      // 免费用户
+      // 弹窗提示关注公众号
+      if (data === 'f') {
+        this.dialog.toFollowOfficialAccount = true
+      }
     }
   }
 }

+ 2 - 0
src/views/workspace/components/CommonUse.vue

@@ -461,6 +461,7 @@ $main: #2cb7ca;
           color: #fff;
           font-weight: bold;
           cursor: pointer;
+          font-size: 16px;
         }
       }
       .drag-move-item{
@@ -499,6 +500,7 @@ $main: #2cb7ca;
         height: 100%;
         padding: 0 20px;
         cursor: pointer;
+        font-size: 16px;
       }
       .active{
         position: relative;