Merge branch 'dev' of https://gitea.f2b211.com/jsasg/orico-official-website into dev

app/index/view/mobile/topic_nas/help_detail.html

@@ -33,8 +33,10 @@
             </div>
         </div>
         <!-- 文章内容 -->
-        <div id="rendered-content" class="nhlp-app-content">
+         <div class="ql-container">
-            {$article.content|raw|default=''}
+            <div id="rendered-content" class="nhlp-app-content ql-editor">
+                {$article.content|raw|default=''}
+            </div>
         </div>
         <!-- 搜索 -->
         <div class="nhlpapp-search">

app/index/view/pc/topic_nas/help_detail.html

@@ -58,7 +58,9 @@
                 {/notempty}
             </div>
             <!--文章详情 -->
-            <div class="nars-hlpdt-mm" id="rendered-content">{$article.content|raw|default=''}</div>
+            <div class="ql-container ">
+                <div class="nars-hlpdt-mm ql-editor" id="rendered-content">{$article.content|raw|default=''}</div>
+            </div>
             <!--锚点定位 -->
             <div class="nars-hlpdt-mr">
                 <div id="title-list">

public/static/index/mobile/css/contactus_bulkbuy.css

@@ -137,7 +137,7 @@
   font-size: 14px;
   font-family: Montserrat-Bold, Montserrat;
   font-weight: bold;
-  width: 212px;
+  /* width: 212px; */
 /*  height: 48px; */
   padding: 15px 60px;
   background: #004bfa;

public/static/index/mobile/css/contactus_distributor.css

@@ -130,7 +130,7 @@
   padding: 15px;
   background: #f2f2f2;
   border-radius: 8px;
-  font-family: Montserrat-Regular, Montserrat;
+  font-family: Montserrat-Regular, Montserrat;
   border: 0;
 }
 
@@ -138,7 +138,7 @@
   font-size: 14px;
   font-family: Montserrat-Bold, Montserrat;
   font-weight: bold;
-  width: 212px;
+  /* width: 212px; */
   padding: 15px 60px;
   background: #004bfa;
   border-radius: 28px;

public/static/index/pc/css/index.css

@@ -541,7 +541,7 @@
   margin-left: 1%;
   border-radius: 26px 26px 26px 26px;
   width: 98%;
-  height: 41.625rem;
+  /* height: 41.625rem; */
 }
 
 .orico_Page_index .pageMain .brandStory .swiper-wrapper .bsitem .bsinf {

public/static/index/pc/css/product_detail.css

@@ -608,13 +608,13 @@
 .scrollbutton_01.smallImgUp,
 .scrollbutton_01.smallImgUp.disabled {
   background: url(/static/index/pc/images/fl.png);
-  left: 0px;
+  left: 10%;
 }
 
 .scrollbutton_01.smallImgDown,
 .scrollbutton_01.smallImgDown.disabled {
   background: url(/static/index/pc/images/rh.png);
-  right: 0px;
+  right: 10%;
 }
 
 .scrollbutton.smallImgUp,