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

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

@@ -61,11 +61,15 @@
                                     {between name="ps.attr_id" value="1,2"}
                                     <li class="attr_value tip1 attr_item" data-index="{$pk}">
                                     {else/}
+                                    55
                                     <li class="attr_value tip1 attr_item_defalut" data-index="{$pk}">
+                                        11
                                     {/between}
                                         {eq name="attr_value_type" value="IMAGE"}
+                                        22
                                         <span class="co-bg"><img src="{$pv.attr_value}" /></span>
                                         {elseif condition="$attr_value_type == 'RGB'" /}
+                                        33
                                         <span class="co-bg" {:style(['background-color'=>$pv.attr_value])}></span>
                                         {else/}
                                         <span>{$pv.attr_value}</span>

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

@@ -35,7 +35,7 @@
 .oircoEgapp-head .top-menu .it-ct .it-1 {
   padding: 1rem 3.5% 0.65rem;
   border-bottom: 1px solid #e5e5e5;
-  font-size: 12px;
+  font-size: 1rem;
   position: relative;
 }
 .oircoEgapp-head .top-menu .it-ct .it-1-more {
@@ -49,7 +49,7 @@
 }
 .oircoEgapp-head .top-menu .it-ct .it-1-2 {
   padding-left: 1rem;
-  font-size: 12px;
+  font-size: 0.9rem;
   line-height: 1.8rem;
   font-weight: 100;
   font-weight: bold;

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

@@ -44,7 +44,9 @@
   height: 2.25rem;
 }
 .oricoEGapp .oricoEGapp-index .oidx-cate .cateit span {
-  font-size: 0.8rem;
+  font-size: 0.9rem;
+  white-space: nowrap;
+  word-break: keep-all;
 }
 .oricoEGapp .oricoEGapp-index .oidx-gg {
   width: 100%;
@@ -123,6 +125,12 @@
 .oricoEGapp .text_center {
   text-align: center;
 }
+.oricoEGapp .oidx-FP .m_Container .inprotext .title{
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+   width: 170%;
+}
 .oricoEGapp .inprotext {
   display: flex;
   flex-direction: column;

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

@@ -3,7 +3,8 @@
   flex-direction: column;
 }
 .oricoEGapp-catelists .first_list_category {
-  margin-top: 50px;
+  /* margin-top: 50px; */
+  margin-top:0px;
   width: 100%;
   overflow-x: auto;
   height: 3.4rem;

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

@@ -30,10 +30,9 @@
   color: #fff;
   cursor: pointer;
   background: #0060ff;
-  height: 2rem;
-  line-height: 2rem;
   border-radius: 20px;
-  padding: 0 1rem;
+  padding: 8px 0;
+  width: 24%;
   display: inline-block;
 }
 .oricoEGapp-topsearch .prlist {
@@ -49,22 +48,22 @@
 }
 .oricoEGapp-topsearch .prlist .pritem .primg {
   margin: 0.5rem;
-  width: 4.26rem;
+  width: 22%;
 }
 .oricoEGapp-topsearch .prlist .pritem .prinfo {
   display: flex;
   flex-direction: column;
-  width: 65%;
+  width: 70%;
   float: right;
 }
 .oricoEGapp-topsearch .prlist .pritem .prinfo .t1 {
-  font-size: 0.64rem;
+  font-size: 0.875rem;
   padding-top: 1rem;
   color: #333;
   padding-bottom: 0.45rem;
 }
 .oricoEGapp-topsearch .prlist .pritem .prinfo .t2 {
-  font-size: 0.586rem;
+  font-size: 0.75rem;
   color: #666;
 }
 .oricoEGapp-topsearch .Pages {

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

@@ -462,7 +462,6 @@ a {
   overflow: hidden;
   padding: 1% 0;
   position: relative;
-  padding-top: 1rem;
 }
 
 .swiper-container-vertical > .swiper-wrapper {
@@ -893,11 +892,16 @@ video img {
   background: #0060ff;
   height: 2.5rem;
   border-radius: 20px;
-  padding: 0 0.8rem;
+  padding: 0 1rem;
-  -webkit-border-radius: 20px;
+  width: 22%;
-  -moz-border-radius: 20px;
+}
-  -ms-border-radius: 20px;
+.search-in form{
-  -o-border-radius: 20px;
+  display: flex;
+  flex-direction: row;
+   align-items: center;
+}
+.search-in .title-text p a{
+  font-size: 1rem;
 }
 /*头部国家*/
 .m-Country {
@@ -1204,14 +1208,14 @@ video img {
   overflow: hidden;
   height: 1.5rem;
   font-family: 'Montserrat-Medium';
-  font-weight: 100;
+  font-weight: 400;
 }
 .faq-title p {
   font-size: 1.125rem;
   color: #7f7f7f;
   padding-bottom: 1rem;
   font-family: 'Montserrat-Medium';
-  font-weight: 100;
+  font-weight: 400;
 }
 /*foot */
 .footer {
@@ -1480,7 +1484,7 @@ video img {
 }
 .product_list_title {
   width: 100%;
-  margin-top: 0.9rem;
+  margin: 1rem 0;
   overflow: hidden;
 }
 .product_list_title .product_title {
@@ -1488,6 +1492,7 @@ video img {
   float: left;
   text-align: left;
   margin-top: 0rem;
+  font-size: 0.8rem;
 }
 .product_list_title .view_all {
   /* width: 38%; */
@@ -1497,6 +1502,7 @@ video img {
   flex-direction: row;
   align-items: center;
   margin-bottom: -3%;
+  font-size: 0.8rem;
 }
 .product_list_title .icon-Double-Arrow {
   margin-left: 0.15rem;
@@ -1534,12 +1540,18 @@ video img {
   margin-right: 0;
 }
 .product_list .title {
-  font-size: 0.54rem;
+  font-size: 0.75rem;
   color: #333;
   margin-top: 1rem;
 }
+.oricoEGapp-catelists .m_Container .product_list .img-responsive .title{
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+   width: 90%;
+}
 .product_list .subtitle {
-  font-size: 0.48rem;
+  font-size: 0.7rem;
   color: #666666;
   margin-top: 0.35rem;
 }
@@ -1583,6 +1595,7 @@ video img {
 }
 .first_list_category .category_list p {
   margin-top: 0.25rem;
+  font-size: 1rem;
 }
 .first_list_category img {
   width: 1.5rem;
@@ -1637,10 +1650,11 @@ video img {
   border-bottom: 1px solid #e5e5e5;
 }
 .goods_all_title .title {
-  font-size: 0.7rem;
+  font-size: 1rem;
   text-align: center;
   color: #333333;
   margin: 2rem 0 0;
+  font-weight: bold;
 }
 .goods_all_title .subtitle {
   font-size: 0.64rem;
@@ -1663,7 +1677,8 @@ video img {
 .proTfg .swt-Table .Table-Row .Table-Cell {
   display: table-cell;
   margin: 0;
-  padding-bottom: 0.28rem;
+  padding-bottom: 0.4rem;
+  font-size: 0.8rem;
 }
 .msul {
   font-size: 0.62rem;
@@ -1726,6 +1741,7 @@ video img {
   padding-left: 1.5rem;
   line-height: 0.64rem;
   height: 0.54rem;
+  font-size: 1.2rem;
 }
 .goods_details .cpa li:nth-child(2) {
   border-left: 1px solid #009fdf;