修复信息中心统计三次问题

src/main/resources/static/js/article/common.js

@@ -10,15 +10,6 @@ const handleFileUrl = (id) => {
     //     window.open(fileUrl, '_blank')
     // }
 }
-const advertisement = new Vue({
-    el: "#advertisement",
-    mixins: [cmSysVitaMixins],
-    data: {},
-    mounted() {
-
-    },
-    methods: {}
-});
 const articleSide = new Vue({
     el: '#articleSide',
     data: {
@@ -97,7 +88,6 @@ const articleSide = new Vue({
 
     }
 });
-
 const drawerFooter = new Vue({
     el: "#drawer-footer",
     data: {

src/main/resources/static/js/article/detail.js

@@ -19,7 +19,7 @@
 //相关阅读
 const articleContent = new Vue({
     el: "#articleContent",
-    mixins: [cmSysVitaMixins],
+    mixins: [cmSysVitaMixins,searchMixins],
     data: {
         infoId: $("#articleId").val()?$("#articleId").val()*1:0,
         articleLabels: $("#articleLabels").val()?$("#articleLabels").val():"",
@@ -27,18 +27,6 @@ const articleContent = new Vue({
         relatedLabels:''
     },
     methods: {
-        // getRelatedList: function () {
-        //     var _self = this;
-        //     if(this.infoId ===0){return;}
-        //     $.getJSON("/article/related",{
-        //         id: this.infoId,
-        //         labels: this.articleLabels
-        //     }).done(function (r) {
-        //         if (r.code === 0 && r.data) {
-        //             _self.related = r.data;
-        //         }
-        //     });
-        // },
 
     },
     created: function () {

src/main/resources/static/js/article/list.js

@@ -5,8 +5,8 @@ const requestUrlConfig = {
 };
 
 const articleList = new Vue({
-    el: '#articleList',
-    mixins: [cmSysVitaMixins],
+    el: '#ArticleContent',
+    mixins: [cmSysVitaMixins,searchMixins],
     filters: {
         keywordSlice: function (keyword) {
             return keyword.length > 6 ? keyword.slice(0, 6) + '…' : keyword;
@@ -78,7 +78,6 @@ const articleList = new Vue({
         self.initAuthInputComplete();
         this.getNewList()
     },
-
     methods: {
         // init auto-input complete
         initAuthInputComplete() {
@@ -403,115 +402,6 @@ const articleList = new Vue({
         }
     }
 });
-
-const infoNotice = new Vue({
-    el: "#infoNotice",
-    data: {
-        newsList: [],
-    },
-    mounted() {
-        this.getNewList()
-    },
-    methods: {
-        hanldDetails(id) {
-            window.open('/news/details.html?id='+id);
-        },
-        getNewList() {
-            PublicApi.GetHomeInit({ source: 1 },({ data }) => {
-                if (isPC) {
-                    this.newsList = data.annlist
-                } else {
-                    this.newsList = data.annlist.slice(0,1)
-                }
-            });
-        }
-    }
-})
-
-const searchTop = new Vue({
-    el: "#info-header",
-    data: {
-        show: false,
-        searchKeys: "",
-        right_drawer: false,
-        activeNames: '', // active names
-        keywords: '',
-        keywordsList: [],
-        selectUlKeys: null,
-    },
-    mounted() {
-    },
-    watch: {
-    //    关键词搜索
-        keywords(val) {
-            if (val) {
-                setTimeout(() => {
-                    this.getKeywordsList(val)
-                }, 500)
-            }
-        },
-    },
-    methods: {
-        async getKeywordsList(key) {
-            const {data} = await PublicApi.fetchQueryKeywordList({keyword: key})
-            this.keywordsList = data
-            this.selectUlKeys = document.getElementsByClassName('auto-select-list')[0]
-            if (data.length > 0) {
-                this.renderList()
-                this.selectUlKeys.style.display = 'block'
-            } else {
-                this.selectUlKeys.style.display = 'none'
-            }
-        },
-        renderList() {
-            this.selectUlKeys.innerHTML = ''
-            this.keywordsList.forEach((text) => {
-                const li = document.createElement('li');
-                li.innerHTML = text.keyword.replace(new RegExp(this.keywords, 'ig'), (match)=> '<span style="color: #FF5B00;">' + match + '</span>');
-                li.addEventListener('click', () => this.listItemClick(text));
-                this.selectUlKeys.appendChild(li);
-            })
-        },
-        listItemClick(text) {
-            this.keywords = text.keyword
-            this.selectUlKeys.innerHTML = ''
-            this.selectUlKeys.style.display = 'none'
-            this.itemClick(text.keyword)
-        },
-        itemClick: function (keyword) {
-            window.location.href = '/info/search-1.html?keyword='+keyword + '&linkageFlag=1';
-        },
-        // h5弹窗搜索
-        handlerH5Search() {
-            let tip = this.searchKeys === '' ? '请输入文章关键字！' : this.searchKeys.length < 2 ? '请至少输入两个关键字！' : true;
-            if(!tip) {
-                $.confirm({
-                    useBootstrap: false,
-                    boxWidth: (isPC ? '300px' : '70%'),
-                    title: '提示',
-                    content: tip,
-                    closeIcon: true,
-                    animation: 'opacity',
-                    closeAnimation: 'opacity',
-                    animateFromElement: false,
-                    buttons: {
-                        close: {
-                            text: '确定',
-                            btnClass: 'btn-confirm'
-                        }
-                    }
-                });
-            } else {
-                this.show = !this.show;
-                window.location.href = '/info/search-1.html?keyword=' + this.searchKeys
-            }
-        },
-        handleOpenLink() {
-            window.location.href = '/info/center-3-1.html'
-        }
-    }
-})
-
 function initFilterSort(option = {}) {
     var sortControl = $(option.el);
     var sortItem = sortControl.find('.search__sort_select li');

src/main/resources/static/js/article/mixins/searchMixins.js

@@ -0,0 +1,84 @@
+// 信息中心头部搜索
+const searchMixins = new Vue({
+    el: "#info-header",
+    data: {
+        show: false,
+        searchKeys: "",
+        right_drawer: false,
+        activeNames: '', // active names
+        keywords: '',
+        keywordsList: [],
+        selectUlKeys: null,
+    },
+    mounted() {
+    },
+    watch: {
+        //    关键词搜索
+        keywords(val) {
+            if (val) {
+                setTimeout(() => {
+                    this.getKeywordsList(val)
+                }, 500)
+            }
+        },
+    },
+    methods: {
+        async getKeywordsList(key) {
+            const {data} = await PublicApi.fetchQueryKeywordList({keyword: key})
+            this.keywordsList = data
+            this.selectUlKeys = document.getElementsByClassName('auto-select-list')[0]
+            if (data.length > 0) {
+                this.renderList()
+                this.selectUlKeys.style.display = 'block'
+            } else {
+                this.selectUlKeys.style.display = 'none'
+            }
+        },
+        renderList() {
+            this.selectUlKeys.innerHTML = ''
+            this.keywordsList.forEach((text) => {
+                const li = document.createElement('li');
+                li.innerHTML = text.keyword.replace(new RegExp(this.keywords, 'ig'), (match)=> '<span style="color: #FF5B00;">' + match + '</span>');
+                li.addEventListener('click', () => this.listItemClick(text));
+                this.selectUlKeys.appendChild(li);
+            })
+        },
+        listItemClick(text) {
+            this.keywords = text.keyword
+            this.selectUlKeys.innerHTML = ''
+            this.selectUlKeys.style.display = 'none'
+            this.itemClick(text.keyword)
+        },
+        itemClick: function (keyword) {
+            window.location.href = '/info/search-1.html?keyword='+keyword + '&linkageFlag=1';
+        },
+        // h5弹窗搜索
+        handlerH5Search() {
+            let tip = this.searchKeys === '' ? '请输入文章关键字！' : this.searchKeys.length < 2 ? '请至少输入两个关键字！' : true;
+            if(!tip) {
+                $.confirm({
+                    useBootstrap: false,
+                    boxWidth: (isPC ? '300px' : '70%'),
+                    title: '提示',
+                    content: tip,
+                    closeIcon: true,
+                    animation: 'opacity',
+                    closeAnimation: 'opacity',
+                    animateFromElement: false,
+                    buttons: {
+                        close: {
+                            text: '确定',
+                            btnClass: 'btn-confirm'
+                        }
+                    }
+                });
+            } else {
+                this.show = !this.show;
+                window.location.href = '/info/search-1.html?keyword=' + this.searchKeys
+            }
+        },
+        handleOpenLink() {
+            window.location.href = '/info/center-3-1.html'
+        }
+    }
+})

src/main/resources/static/js/mixins/cmSysMixins.js

@@ -159,6 +159,7 @@ var cmSysVitaMixins = function () {
                 PublicApi.getShopAdvert(params, function (response) {
                     if(response.code === 0){
                         _self.shopAdvert = response.data
+                        console.log('shopAdvert',_self.shopAdvert);
                     }else{
                         console.log('error',response.msg);
                     }

src/main/resources/templates/article/detail.html

@@ -122,7 +122,7 @@
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/ajax.service.js}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/article/common.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/article/list.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/article/mixins/searchMixins.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/article/detail.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript">
     const closeContent = document.getElementsByClassName("related-content-close")[0]

src/main/resources/templates/article/list.html

@@ -247,6 +247,7 @@
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/ajax.service.js}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/article/common.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/article/mixins/searchMixins.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/article/list.js(v=${version})}"></script>
 </body>
 </html>