Merge branch 'developer' of http://git.caimei365.com/caimei365/caimei365-www into developer

src/main/resources/static/css/article/article.css

@@ -369,6 +369,7 @@ dl,dd,dt{zoom:1}
 	.ross-from .from-row .link.left{float: left;}
 	.ross-from .from-row .link.right{float: right;}
 	@keyframes rundbottom{ 0%{bottom: -260px;opacity: 0;} 100%{bottom:0;opacity: 1;} }
+	.el-carousel__button{ width: 10px !important; }
 
 }
 @media screen and (max-width:768px){
@@ -620,6 +621,7 @@ dl,dd,dt{zoom:1}
 	.ross-from .from-row .link.left{float: left;}
 	.ross-from .from-row .link.right{float: right;}
 	@keyframes rundbottom{ 0%{bottom: -113.8vw;opacity: 0;} 100%{bottom:0;opacity: 1;} }
+	.el-carousel__button{ width: 10px !important; }
 }
 @media screen and (min-width: 768px) {
 	.auto-input ul.auto-select-list{margin: 0;position:absolute;left:0;top:50px;width:50%;padding:8px 0;background:#fff; z-index: 999;box-shadow: 0px 6px 12px 1px rgba(0,0,0,0.1);max-height: 420px;overflow-y:auto;}

src/main/resources/static/css/index/index_new.h5.css

@@ -115,3 +115,4 @@
 .bg_icon .mIcon{width:10vw;height:10vw;display:inline-block}
 .bg_icon .mIcon:before{width:10vw;height:10vw;background-position:-33.3vw -77.3vw;cursor:pointer}
  .section_right .section_right_item.ross img{width: 100%;height: 61.6vw;display: block;border-radius: 2px;object-fit:cover;}
+ .el-carousel__button{ width: 10px !important; }

src/main/resources/static/css/index/index_new.pc.css

@@ -221,3 +221,4 @@ footer{width:100%;height:auto;float:left}
 .bg_icon{text-align: right;position: absolute;right: -50px; top: 30px;}
 .bg_icon .icon{width: 50px;height: 50px;display: inline-block;}
 .bg_icon .icon:before{width: 50px;height: 50px;background-position: -187px -545px;cursor: pointer;}
+.el-carousel__button{ width: 10px !important; }

src/main/resources/static/css/supplier-center/encyclopedia/chart.css

@@ -49,9 +49,9 @@
   .chart-main-top-right-tips .tips.c{ background: #91CC75; }
   .chart-main-top-right-li p{ font-size: 14px;line-height: 22px;color: #666666; }
 
-  .chart-main-bot{width: 100%;height: auto;}
+  .chart-main-bot{width: 100%;height: auto;box-sizing: border-box;padding: 20px 0;background: #FFFFFF;}
   .chart-main-top img{width: 100%;height: auto;}
-  .chart-main-bot img{width: 100%;height: auto;}
+  .chart-main-bot img{width: 792px;height: 203px;display: block;margin: 0 auto; }
   .chart-main-box{width: 592px;height: 420px;background: #FFFFFF;box-sizing: border-box;padding: 24px;}
   .chart-main-box.le{float: left;}
   .chart-main-box.ri{float: right;}
@@ -87,14 +87,18 @@
   .chart-content{width: 100%;margin: 0 auto;box-sizing: border-box;padding: 3vw;}
   .chart-title{ width: 100%;float: left; line-height: 8vw;font-size: 4vw;color: #333333;font-weight: bold;}
   .chart-title span{line-height: 8vw;font-size: 16px;color: #333333;font-weight: normal;}
-  .chart-content-text{ min-height: 60vw;width: 100%;box-sizing: border-box;padding: 3vw;background: #FFFFFF;float: left;margin-bottom: 10vw; }
+  .chart-content-text{ min-height: 60vw;width: 100%;box-sizing: border-box;padding: 3vw;background: #FFFFFF;float: left;margin-bottom: 4vw; }
   .chart-content-text h1,.chart-content-text p{font-size: 3.4vw;color: #666666;line-height: 6vw;}
   .chart-content-main{width: 100%;height: auto;float: left;margin-bottom: 16px;}
+
+  .chart-main-bot{width: 100%;height: auto;box-sizing: border-box;padding: 3vw;background: #FFFFFF;}
+  .chart-main-top img{width: 100%;height: auto;}
+  .chart-main-bot img{width: 100%;height: auto;display: block;}
   .chart-main-box{width: 100%;height: 86vw;background: #FFFFFF;box-sizing: border-box;padding: 3vw;}
   .chart-main-box.le{float: left;margin-bottom: 16px;}
   .chart-main-box.ri{float: left;}
   .chart-main-min{width: 100%;height: 42vw;background: #FFFFFF;box-sizing: border-box;padding: 3vw;}
-  .chart-main-max{width: 100%;height: 86vw;background: #FFFFFF;box-sizing: border-box;padding: 3vw;}
+  .chart-main-max{width: 100%;min-height: 86vw;background: #FFFFFF;box-sizing: border-box;padding: 3vw;}
   .chart-main-min.le{float: left;margin-bottom: 16px;}
   .chart-main-min.ri{float: left;}
   .chart-main-568{width: 100%;height: 86vw;background: #FFFFFF;box-sizing: border-box;padding: 3vw;float: left;margin-bottom: 16px;}

src/main/resources/static/css/supplier-center/encyclopedia/charts.css

@@ -49,9 +49,9 @@
   .chart-main-top-right-tips .tips.c{ background: #91CC75; }
   .chart-main-top-right-li p{ font-size: 14px;line-height: 22px;color: #666666; }
 
-  .chart-main-bot{width: 100%;height: auto;}
+  .chart-main-bot{width: 100%;height: auto;box-sizing: border-box;padding: 20px 0;background: #FFFFFF;}
   .chart-main-top img{width: 100%;height: auto;}
-  .chart-main-bot img{width: 100%;height: auto;}
+  .chart-main-bot img{width: 792px;height: 203px;display: block;margin: 0 auto; }
   .chart-main-box{width: 592px;height: 420px;background: #FFFFFF;box-sizing: border-box;padding: 24px;}
   .chart-main-box.le{float: left;}
   .chart-main-box.ri{float: right;}
@@ -88,14 +88,19 @@
   .chart-content{width: 100%;margin: 0 auto;box-sizing: border-box;padding: 3vw;}
   .chart-title{ width: 100%;float: left; line-height: 8vw;font-size: 4vw;color: #333333;font-weight: bold;}
   .chart-title span{line-height: 8vw;font-size: 16px;color: #333333;font-weight: normal;}
-  .chart-content-text{ min-height: 60vw;width: 100%;box-sizing: border-box;padding: 3vw;background: #FFFFFF;float: left;margin-bottom: 10vw; }
+  .chart-content-text{ min-height: 60vw;width: 100%;box-sizing: border-box;padding: 3vw;background: #FFFFFF;float: left;margin-bottom: 4vw; }
   .chart-content-text h1,.chart-content-text p{font-size: 3.4vw;color: #666666;line-height: 6vw;}
   .chart-content-main{width: 100%;height: auto;float: left;margin-bottom: 16px;}
+
+
+  .chart-main-bot{width: 100%;height: auto;box-sizing: border-box;padding: 3vw ;background: #FFFFFF;}
+  .chart-main-top img{width: 100%;height: auto;}
+  .chart-main-bot img{width: 100%;height: auto;display: block;}
   .chart-main-box{width: 100%;height: 86vw;background: #FFFFFF;box-sizing: border-box;padding: 3vw;}
   .chart-main-box.le{float: left;margin-bottom: 16px;}
   .chart-main-box.ri{float: left;}
   .chart-main-min{width: 100%;height: 42vw;background: #FFFFFF;box-sizing: border-box;padding: 3vw;}
-  .chart-main-max{width: 100%;height: 86vw;background: #FFFFFF;box-sizing: border-box;padding: 3vw;}
+  .chart-main-max{width: 100%;min-height: 86vw;background: #FFFFFF;box-sizing: border-box;padding: 3vw;}
   .chart-main-min.le{float: left;margin-bottom: 16px;}
   .chart-main-min.ri{float: left;}
   .chart-main-568{width: 100%;height: 86vw;background: #FFFFFF;box-sizing: border-box;padding: 3vw;float: left;margin-bottom: 16px;}

src/main/resources/templates/supplier-center/encyclopedia/chart.html

@@ -105,7 +105,8 @@
         </div>
         <div class="chart-content-main">
           <div class="chart-main-bot">
-            <img src="https://img.caimei365.com/group1/M00/04/A0/rB-lGGVcQ2eAVvLYAADU4nvPMS4889.jpg" alt="漏斗模型">
+              <img v-if="isPC" src="https://admin.caimei365.com/userfiles/1/images/photo/2023/12/chart-pc-2.png" alt="漏斗模型">
+              <img v-else src="https://admin.caimei365.com/userfiles/1/images/photo/2023/12/chart-h5-2.png" alt="漏斗模型">
           </div>
         </div>
         <div class="chart-content-main">

src/main/resources/templates/supplier-center/encyclopedia/charts.html

@@ -105,7 +105,8 @@
         </div>
         <div class="chart-content-main">
             <div class="chart-main-bot">
-                <img src="https://img.caimei365.com/group1/M00/04/A0/rB-lGGVcQ2eAVvLYAADU4nvPMS4889.jpg" alt="漏斗模型">
+                <img v-if="isPC" src="https://admin.caimei365.com/userfiles/1/images/photo/2023/12/chart-pc-2.png" alt="漏斗模型">
+                <img v-else src="https://admin.caimei365.com/userfiles/1/images/photo/2023/12/chart-h5-2.png" alt="漏斗模型">
             </div>
         </div>
         <div class="chart-content-main">