Răsfoiți Sursa

feat: pc标讯收藏页面权限控制

cuiyalong 4 ani în urmă
părinte
comite
e2cc60f7df

+ 0 - 39
src/web/staticres/collection/css/index-pc.css → src/web/staticres/frontRouter/pc/collection/css/index-pc.css

@@ -243,42 +243,3 @@
 .tag-drawer .el-tag {
     margin: 6px;
 }
-
-.j-t-button {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 7px 50px;
-    font-size: 16px;
-    color: #686868;
-    border: 1px solid #e0e0e0;
-    border-radius: 7px;
-    background-color: #fff;
-}
-.j-t-button.confirm {
-    color: #2cb7ca;
-    border-color: #2cb7ca;
-}
-.j-t-button.confirm:hover {
-    color: #fff;
-    background-color: #2cb7ca;
-}
-.j-t-button.cancel {
-    margin-left: 40px;
-}
-.j-el-confirm .el-dialog__header,
-.j-el-confirm .el-dialog__body,
-.j-el-confirm .el-dialog__footer {
-    text-align: center;
-}
-.j-el-confirm .el-dialog__header {
-    padding-top: 30px;
-}
-.j-el-confirm .el-dialog__footer {
-    padding-bottom: 40px;
-}
-.dialog-footer {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}

+ 2 - 0
src/web/staticres/collection/js/index-pc.js → src/web/staticres/frontRouter/pc/collection/js/index-pc.js

@@ -11,6 +11,7 @@ var vm = new Vue({
     data: function () {
         return {
             power: false,
+            powerLoaded: false,
             toast: {
                 show: false,
                 content: '暂无数据'
@@ -82,6 +83,7 @@ var vm = new Vue({
                     }
                 }.bind(this),
                 complete: function () {
+                    this.powerLoaded = true
                     callback && callback()
                 }.bind(this)
             })

+ 5 - 0
src/web/staticres/js/selector/price-pc.js

@@ -38,6 +38,11 @@ var priceComponent = {
             this.price.max = max
         },
         getState: function () {
+            if (this.price.min > this.price.max) {
+                var max = this.price.max
+                this.price.max = this.price.min
+                this.price.min = max
+            }
             return this.price
         },
         confirm: function () {

+ 6 - 6
src/web/templates/frontRouter/pc/collection/sess/index.html

@@ -18,7 +18,7 @@
         <link href="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/theme-chalk/index.css" rel="stylesheet" />
         <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/css/ele-reset.css?v={{Msg "seo" "version"}}'>
         <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/css/selector/selector.css?v={{Msg "seo" "version"}}'>
-        <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/collection/css/index-pc.css?v={{Msg "seo" "version"}}'>
+        <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/frontRouter/pc/collection/css/index-pc.css?v={{Msg "seo" "version"}}'>
         <style>
             .collection-container {
                 line-height: 1;
@@ -34,7 +34,7 @@
         <div class="collection-header w">
             <h3 class="tab-title">标讯收藏</h3>
         </div>
-        <div class="search-content w" v-cloak>
+        <div class="search-content w" v-cloak v-show="powerLoaded">
             <div class="selector-card-container search-filters" v-if="power">
                 <div class="selector-card">
                     <div class="selector-card-header">个人标签:</div>
@@ -117,7 +117,7 @@
                 </div>
             </div>
             <div class="collect-list-container">
-                <div class="collect-list-header">
+                <div class="collect-list-header" v-show="listState.list.length !== 0 && listState.loaded">
                     <div class="c-tab-container flex">
                         <div class="left flex">
                             <el-checkbox v-model="currentPageAllChecked" @change="allCheckboxChange"></el-checkbox>
@@ -166,7 +166,7 @@
                     </div>
                     <div class="list collect-table-list" v-loading="listState.loading" v-show="listState.listType === 'table'" style="display: none;">
                         <table class="table">
-                            <thead class="thead">
+                            <thead class="thead" v-show="listState.list.length !== 0">
                                 <tr>
                                     <td width="48">序号</td>
                                     <td width="315" class="deep-border">项目名称</td>
@@ -241,7 +241,7 @@
                 width="30%">
                 <span>确定删除该标签?</span>
                 <span slot="footer" class="dialog-footer">
-                    <button class="j-t-button confirm" @click="delThisTagConfirm">确 定</el-button>
+                    <button class="j-t-button confirm active" @click="delThisTagConfirm">确 定</el-button>
                     <button class="j-t-button cancel" @click="tagDrawer.dialogShow=false">取 消</button>
                 </span>
             </el-dialog>
@@ -264,7 +264,7 @@
     <script src='{{Msg "seo" "cdn"}}/js/selector/select-level2-pc.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Msg "seo" "cdn"}}/js/selector/article-item-pc.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Msg "seo" "cdn"}}/js/selector/no-data-pc.js?v={{Msg "seo" "version"}}'></script>
-    <script src='{{Msg "seo" "cdn"}}/collection/js/index-pc.js?v={{Msg "seo" "version"}}'></script>
+    <script src='{{Msg "seo" "cdn"}}/frontRouter/pc/collection/js/index-pc.js?v={{Msg "seo" "version"}}'></script>
 </body>
 
 </html>