صفحهٔ اصلی گشت‌و‌گذار راهنما
ورود
caimei365
/
caimei365-www
3
0
انشعاب 0
پرونده‌ها مشکلات 0 درخواست واکشی 0 ویکی
فهرست منبع

用户行为记录修改

zhengjinyi 2 سال پیش
والد
4db1afa6ab
کامیت
148ef8e5c5
8فایلهای تغییر یافته به همراه17 افزوده شده و 12 حذف شده
مشاهده تقسیم شده نمایش آمار تفاوت ها
  1. 1 1
      src/main/resources/static/css/article/article.css
  2. 0 1
      src/main/resources/static/js/article/common.js
  3. 1 0
      src/main/resources/static/js/document/beauty-archive.js
  4. 0 2
      src/main/resources/templates/article/components/article-link.html
  5. 4 4
      src/main/resources/templates/article/components/article-sidebar.html
  6. 4 1
      src/main/resources/templates/article/detail.html
  7. 4 1
      src/main/resources/templates/article/list.html
  8. 3 2
      src/main/resources/templates/document/beauty-archive.html

+ 1 - 1
src/main/resources/static/css/article/article.css
مشاهده فایل 

@@ -232,7 +232,7 @@ dl,dd,dt{zoom:1}
 
 	.dea-tag a{display:inline-block;color:#fff;height:32px;line-height:32px;padding:0 12px;background:#e15616;text-align:center;border-radius:4px;margin-right:15px;cursor:pointer;margin-bottom: 10px}
 
 	.article .like:hover{background: #ffe6dc}
 
 	/*ross广告图*/
 
-	.article-right-ross{width:284px;height:343px;background: #F3920D;text-align: center;line-height: 343px;font-size: 50px;color: #FFFFFF;border-radius: 2px;margin-bottom: 16px;}
 
+	.article-right-ross{width:284px;height:343px;float: right; background: #F3920D;text-align: center;line-height: 343px;font-size: 50px;color: #FFFFFF;border-radius: 2px;margin-bottom: 16px;}
 
 	.article-right-ross.none{display: none;}
 
 	.article-right-ross.show{display: block;}
 
 	.article-right-ross>a{width: 100%;height: 100%;display: block;border-radius: 2px;}

+ 0 - 1
src/main/resources/static/js/article/common.js
مشاهده فایل 

@@ -1,7 +1,6 @@
 
 /*var articleTypeNav = new Swiper('#articleTypeNav');*/
 
 var articleSide = new Vue({
 
     el: '#articleSide',
 
-    mixins: [cmSysVitaMixins],
 
     data: {
 
         typeId: 0,
 
         labelId: 0,

+ 1 - 0
src/main/resources/static/js/document/beauty-archive.js
مشاهده فایل 

@@ -10,6 +10,7 @@ $(window).on('resize', function () {
 
 //美业资料库列表
 
 var beautyArchive = new Vue({
 
     el: '#beautyArchive',
 
+    mixins: [cmSysVitaMixins],
 
     data: {
 
         listLoading: false,
 
         total: 0, // 商品总数

+ 0 - 2
src/main/resources/templates/article/components/article-link.html
مشاهده فایل 

@@ -14,5 +14,3 @@
 
     <link href="/lib/datapicker/daterangepicker.css" rel="stylesheet">
 
     <link th:href="@{/css/base/init.css(v=${version})}" rel="stylesheet" type="text/css">
 
     <link th:href="@{/css/article/article.css(v=${version})}" rel="stylesheet" type="text/css">
 
-    <script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/router.config.js(v=${version})}"></script>
 
-    <script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/cmSysMixins.js(v=${version})}"></script>

+ 4 - 4
src/main/resources/templates/article/components/article-sidebar.html
مشاهده فایل 

@@ -1,9 +1,9 @@
 
 <html xmlns:th="http://www.w3.org/1999/xhtml">
 
 <div class="other" id="articleSide" v-cloak>
 
-    <!--侧边栏Ross广告图-->
 
-    <div v-if="isPC && isRossShow" class="article-right-ross" :class="isRossShow ? 'show' : 'none'">
 
-        <a href="/supplier-1378.html" v-if="isPC"><img src="/img/ross/ross-image@1x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a>
 
-    </div>
 
+<!--    &lt;!&ndash;侧边栏Ross广告图&ndash;&gt;-->
 
+<!--    <div v-if="isPC && isRossShow" class="article-right-ross" :class="isRossShow ? 'show' : 'none'">-->
 
+<!--        <a href="/supplier-1378.html" v-if="isPC"><img src="/img/ross/ross-image@1x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a>-->
 
+<!--    </div>-->
 
     <div id="mHotWord">
 
         <div class="tags clearfix">
 
             <p class="classify">

+ 4 - 1
src/main/resources/templates/article/detail.html
مشاهده فایل 

@@ -87,6 +87,10 @@
 
             </template>
 
         </div>
 
     </div>
 
+    <!--侧边栏Ross广告图-->
 
+    <div v-if="isPC && isRossShow" class="article-right-ross" :class="isRossShow ? 'show' : 'none'">
 
+        <a href="/supplier-1378.html" v-if="isPC"><img src="/img/ross/ross-image@1x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a>
 
+    </div>
 
     <!--侧边栏-->
 
     <template th:replace="article/components/article-sidebar"></template>
 
 
@@ -94,7 +98,6 @@
 
 <template th:replace="article/components/article-footer"></template>
 
 <template th:replace="components/foot-link"></template>
 
 <script charset="utf-8" type="text/javascript" src="/lib/jquery.qrcode.min.js"></script>
 
-<script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/cmSysMixins.js(v=${version})}"></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/detail.js(v=${version})}"></script>
 
 </body>

+ 4 - 1
src/main/resources/templates/article/list.html
مشاهده فایل 

@@ -20,7 +20,6 @@
 
 <!--主体内容-->
 
 <div class="content clearfix" id="ArticleContent">
 
     <!--侧边栏Ross广告图-->
 
-
 
     <div class="mainData">
 
         <div class="new-list" id="articleList" v-cloak>
 
             <div v-if="!isPC && isRossShow" class="article-right-ross" :class="isRossShow ? 'show' : 'none'"><a href="/supplier-1378.html" ><img src="/img/ross/ross-image@2x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a></div>
 
@@ -118,6 +117,10 @@
 
             </div>
 
         </div>
 
     </div>
 
+    <!--侧边栏Ross广告图-->
 
+    <div v-if="isPC && isRossShow" class="article-right-ross" :class="isRossShow ? 'show' : 'none'">
 
+        <a href="/supplier-1378.html" v-if="isPC"><img src="/img/ross/ross-image@1x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a>
 
+    </div>
 
     <!--侧边栏-->
 
     <template th:replace="article/components/article-sidebar"></template>
 
     <div id="scrollTop">

+ 3 - 2
src/main/resources/templates/document/beauty-archive.html
مشاهده فایل 

@@ -100,8 +100,9 @@
 
 <script charset="utf-8" type="text/javascript" src="/lib/lazyload.js"></script>
 
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/ajax.service.js(v=${version})}"></script>
 
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/utils.service.js(v=${version})}"></script>
 
-<script charset="utf-8" type="text/javascript"
 
-        th:src="@{/js/common/serviceapi/beautyArchive.service.js(v=${version})}"></script>
 
+<script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/router.config.js(v=${version})}"></script>
 
+<script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/cmSysMixins.js(v=${version})}"></script>
 
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/beautyArchive.service.js(v=${version})}"></script>
 
 <script charset="utf-8" type="text/javascript" th:src="@{/js/auto-input.js(v=${version})}"></script>
 
 <script charset="utf-8" type="text/javascript" th:src="@{/js/document/beauty-archive.js(v=${version})}"></script>