Merge branch 'dev'

app/index/view/pc/product/detail.html

@@ -133,10 +133,12 @@
                 {/notempty}
             </div>
             <!-- 富文本渲染-->
-            <div class="products_des" id="detail">
+            <div class="ql-container">
+                <div class="products_des ql-editor" id="detail">
                     {$product.detail|default=''|raw}
                 </div>
             </div>
+        </div>
         <!-- 关联产品 -->
         {notempty name="product_related"}
         <div class="glcpmain" id="related">

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

@@ -154,7 +154,7 @@ body {
     tab-size: 4;
     -moz-tab-size: 4;
     text-align: left;
-    white-space: pre-wrap;
+    /* white-space: pre-wrap; */
     word-wrap: break-word
 }
 

public/static/index/mobile/css/style.css

@@ -2314,7 +2314,10 @@ video img {
   margin-left: 0.4rem;
   margin-right: 0.4rem;
 }
-/*详情样式*/
+//*详情样式*/
+.o_detail_title {font-size:2.25em; color: #101010; margin-top:3.125vw; font-weight: 600; margin-bottom:1.25vw; line-height: 1.2em;}
+.o_detail_small {font-size:1.5em; color: #333; margin-bottom:0.7vw;}
+.o_detail_text {font-size:1em;color: #737373; line-height: 1.5em;width:80%; margin-left: auto; margin-right: auto; margin-bottom: 0.7vw;}
 .o_detail_all {
   text-align: center;
   background-color: #fff;
@@ -2342,6 +2345,59 @@ video img {
   margin-bottom: 1.3rem;
 }
 
+.products_des {
+  width: 100%;
+  margin-bottom: 50px;
+}
+.products_des img {
+  width: 100%;
+}
+.de_t_n {
+  font-size: 1.5em;
+  color: #333;
+}
+.detail_title {
+  text-align: center;
+  padding: 2% 0;
+}
+.detail_title p {
+  line-height: 2em;
+}
+.detail_con_a {
+  margin: auto;
+  overflow: hidden;
+}
+.lj_detail_text,
+.lj_detail_texts {
+  font-size: 0.875em;
+}
+.lj_detail_text p {
+  line-height: 1.6em;
+  padding: 0.5% 0;
+}
+/*seo-pro*/
+.seo-pro h3 {
+  font-size: 1.5em;
+  text-align: center;
+  color: #333;
+  margin: 2% 0 1%;
+  line-height: 1.2;
+  font-weight: 400;
+}
+.seo-pro p {
+  text-align: center;
+  margin: 0 0 11px;
+}
+.seo-pro a {
+  color: #333;
+  text-decoration: none;
+}
+.sa_blue,
+.sa_blue a,
+.seo-pro a:hover {
+  color: #009fdf;
+}
+
 /*两列*/
 .list_two {
   width: 100%;

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

@@ -258,7 +258,7 @@ div{
     tab-size: 4;
     -moz-tab-size: 4;
     text-align: left;
-    white-space: pre-wrap;
+    /* white-space: pre-wrap; */
     word-wrap: break-word
 }
 
@@ -1547,3 +1547,86 @@ div{
   margin: -2px 0;
   /* 与标签对齐 */
 }
+/*详情样式*/
+.o_detail_title {font-size:2.25em; color: #101010; margin-top:3.125vw; font-weight: 600; margin-bottom:1.25vw; line-height: 1.2em;}
+.o_detail_small {font-size:1.5em; color: #333; margin-bottom:0.7vw;}
+.o_detail_text {font-size:1em;color: #737373; line-height: 1.5em;width:80%; margin-left: auto; margin-right: auto; margin-bottom: 0.7vw;}
+.o_detail_all {
+  text-align: center;
+  background-color: #fff;
+  overflow: hidden;
+}
+.o_detail_title {
+  font-size: 0.85rem;
+  color: #101010;
+}
+.o_detail_small {
+  font-size: 0.75rem;
+  color: #333;
+  margin-top: 0.4rem;
+}
+.o_detail_text {
+  font-size: 0.64rem;
+  color: #737373;
+  line-height: 1rem;
+  width: 80%;
+  margin: auto;
+  margin-top: 0.5rem;
+}
+.o_detail_img {
+  margin-top: 0.3rem;
+  margin-bottom: 1.3rem;
+}
+
+.products_des {
+  width: 100%;
+  margin-bottom: 50px;
+}
+.products_des img {
+  width: 100%;
+}
+.de_t_n {
+  font-size: 1.5em;
+  color: #333;
+}
+.detail_title {
+  text-align: center;
+  padding: 2% 0;
+}
+.detail_title p {
+  line-height: 2em;
+}
+.detail_con_a {
+  margin: auto;
+  overflow: hidden;
+}
+.lj_detail_text,
+.lj_detail_texts {
+  font-size: 0.875em;
+}
+.lj_detail_text p {
+  line-height: 1.6em;
+  padding: 0.5% 0;
+}
+/*seo-pro*/
+.seo-pro h3 {
+  font-size: 1.5em;
+  text-align: center;
+  color: #333;
+  margin: 2% 0 1%;
+  line-height: 1.2;
+  font-weight: 400;
+}
+.seo-pro p {
+  text-align: center;
+  margin: 0 0 11px;
+}
+.seo-pro a {
+  color: #333;
+  text-decoration: none;
+}
+.sa_blue,
+.sa_blue a,
+.seo-pro a:hover {
+  color: #009fdf;
+}