验收修改

components/mobile/brand/BrandCenter.vue

@@ -182,6 +182,7 @@
             border-radius: .05rem;
             background: #fff;
             margin: .18rem .42rem .12rem 0;
+            height: .78rem;
             &:nth-child(3n) {
               margin-right: 0;
             }

components/mobile/brand/ComponentDetail.vue

@@ -401,10 +401,7 @@
         tbody {
           background: #fff;
           tr {
-            border-top: 0.2rem solid #f7f7f7;
-            &:first-child {
-              border-top: none;
-            }
+            border-bottom: 0.2rem solid #f7f7f7;
             td {
               padding: .2rem .1rem;
               &.store-name {

components/mobile/search/MainSearch.vue

@@ -50,7 +50,9 @@
           return [
             {name: 'DSP1-DC5V-F', url: '/mobile/brand/componentDetail/0900300200000669'},
             {name: 'Vishay', url: '/mobile/brand/30327265e42a871be050007f01003d96'},
-            {name: 'Panasonic', url: '/mobile/brand/30327265e47d871be050007f01003d96'}
+            {name: 'Panasonic', url: '/mobile/brand/30327265e47d871be050007f01003d96'},
+            {name: 'Taiyo Yuden', url: '/mobile/brand/30327265e4be871be050007f01003d96'},
+            {name: 'AE3ZZP332', url: '/mobile/brand/componentDetail/0100100100000003'}
           ]
         }
       }
@@ -137,19 +139,19 @@
     height: -webkit-fill-available;
     width: -webkit-fill-available;
     position: fixed;
-    z-index: 9;
+    z-index: 100;
     top: 0;
     .main-search-header {
       height: .71rem;
       background: #4391f7;
-      padding-left: .84rem;
+      padding-left: .5rem;
       display: flex;
       align-items: center;
       input {
-        width: 4.48rem;
+        width: 4.78rem;
         height: .54rem;
         line-height: .54rem;
-        font-size: .23rem;
+        font-size: .28rem;
         color: #999;
         padding-left: .2rem;
         border-bottom-left-radius: .05rem;
@@ -165,28 +167,27 @@
         height: .54rem;
         line-height: .54rem;
         color: #366df3;
-        font-size: .23rem;
+        font-size: .28rem;
         margin-left: .02rem;
         border-top-right-radius: .05rem;
         border-bottom-right-radius: .05rem;
         background: #fff;
       }
       a {
-        font-size: .27rem;
+        font-size: .28rem;
         color: #fff;
         margin-left: .2rem;
       }
     }
     .associate-list {
-      padding-top: .25rem;
       background: #fff;
       li {
-        height: .58rem;
-        line-height: .58rem;
-        padding: 0 .45rem;
+        height: 0.7rem;
+        line-height: .9rem;
+        margin: 0 .45rem;
         border-bottom: .01rem solid #f1f0f0;
         i {
-          font-size: .4rem;
+          font-size: .36rem;
           margin-right: .24rem;
           color: #ddd;
         }
@@ -262,7 +263,7 @@
             overflow: hidden;
             text-overflow: ellipsis;
             white-space: nowrap;
-            margin-right: .1rem;
+            margin: 0 .1rem .1rem 0;
             background: #fef1eb;
             height: .56rem;
             line-height: .56rem;

components/mobile/store/StoreDetail.vue

@@ -202,7 +202,7 @@
       height: 3.17rem;
       width: 6.96rem;
       display: inline-block;
-      margin: .38rem auto .18rem;
+      margin: .18rem auto;
       line-height: 2.13rem;
       background: #fff;
       text-align: center;
@@ -258,6 +258,10 @@
     }
     .store-description {
       background: #f7f7f7;
+      position: fixed;
+      top: 5.06rem;
+      width: 100%;
+      bottom: 1rem;
       p {
         background: #fff;
         margin: .2rem auto 0;
@@ -266,7 +270,8 @@
         font-size: .28rem;
         color: #666;
         text-align: left;
-        min-height: 6.8rem;
+        height: 95%;
+        box-shadow: 0 .03rem .01rem 0 #cdcbcb96;
       }
     }
     .product-store {
@@ -288,10 +293,7 @@
         tbody {
           tr {
             background: #fff;
-            border-top: 0.2rem solid #f7f7f7;
-            &:first-child {
-              border-top: none;
-            }
+            border-bottom: 0.2rem solid #f7f7f7;
             td {
               padding: .2rem .1rem;
               text-align: left;

pages/mobile/search/_keycode.vue

@@ -33,8 +33,8 @@
     <div class="detail-brand" v-for="(item, index) in searchLists" v-if="searchLists.length > 0">
       <div class="brand-item" @click="goComponent(item.uuid)">
         <p>型号：<span>{{item.code}}</span></p>
-        <p>品牌：<span>{{item.brand.nameCn}}</span></p>
-        <p>产品描述：<span>{{item.kind.nameCn}}</span></p>
+        <p>品牌：<span>{{item.brandEn || item.brand.nameCn}}</span></p>
+        <p>产品描述：<span>{{item.description || '-'}}</span></p>
         <i class="iconfont icon-shoucang" :style="(item.isFocus)?'color:#ff7800':'color:#bbb'" @click="collect(item, $event)"></i>
       </div>
     </div>
@@ -277,8 +277,8 @@
       h4{
         font-size:.32rem;
         line-height: .6rem;
-        margin:0;
-        margin-left:3.97rem;
+        margin:0 0 0 3.97rem;
+        background: url('/images/mobile/@2x/search/search-brand.png')no-repeat;
       }
       .brand-list{
         display:flex;
@@ -326,7 +326,7 @@
         background: #fff;
         padding:.2rem;
         position:relative;
-        box-shadow: 0 0 0 .02rem #ddd;
+        box-shadow: 0 .03rem .01rem 0 #cdcbcb96;
         &:active{
           background: #e1e1e1;
         }

pages/mobile/shop/index.vue

@@ -203,17 +203,16 @@
   }
   .shop-list {
     background:#fff;
-    margin-top:.12rem;
+    margin-top:.1rem;
     padding-bottom:.28rem;
-     /*&:hover{*/
-        /*background: #e1e1e1;*/
-      /*}*/
+    box-shadow: 0 .03rem .01rem 0 #cdcbcb96;
     h3{
       font-size:.32rem;
       line-height: .8rem;
-      margin:0;
-      margin-left:.27rem;
-      margin-bottom:.14rem;
+      margin:0 0 .14rem .27rem;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
     .list-item{
       width:6.77rem;
@@ -235,6 +234,7 @@
           width:100%;
           height:100%;
           border:.02rem solid #eee;
+          background-color: #fff;
         }
       }
       .list-item-phone{

pages/mobile/user/index.vue

@@ -205,7 +205,7 @@
       }
     }
     .user-name{
-      padding:.14rem 0rem .09rem .34rem;
+      padding:.14rem 0 .09rem .34rem;
       background:#fff;
       display:flex;
       align-items: center;
@@ -213,9 +213,9 @@
       position:relative;
       .supdown{
         position:absolute;
-        top:1rem;
+        top:.8rem;
         right:.3rem;
-        z-index:1000;
+        z-index:10;
         width:1.7rem;
         background:#616264;
         border-radius:.1rem;
@@ -238,7 +238,6 @@
       .user-info {
         margin-left:.25rem;
         display: inline-block;
-        width: 3.92rem;
         p{
           font-size:.3rem;
           margin:0;
@@ -247,6 +246,7 @@
           overflow: hidden;
           text-overflow: ellipsis;
           white-space: nowrap;
+          width: 3.92rem;
           &:nth-child(2) {
             font-weight: normal;
             margin-top: .3rem;
@@ -256,11 +256,13 @@
       span{
         font-size:.28rem;
         color:#53a0f7;
+        position: relative;
+        bottom: .3rem;
       }
     }
     .shop-list {
       background:#fff;
-      margin-top:.12rem;
+      margin-top:.1rem;
       padding-bottom:.28rem;
       h3{
         font-size:.32rem;
@@ -320,7 +322,7 @@
     .detail-brand{
       background: #fff;
       width:100%;
-      margin-top:.12rem;
+      margin-top:.1rem;
       min-height:1.5rem;
       padding:.2rem 0;
       .brand-item{
@@ -357,7 +359,7 @@
       background: #fff;
       margin-top: .1rem;
       margin-bottom: -.11rem;
-      border-bottom: .01rem solid #aaa;
+      border-bottom: .02rem solid #acacac;
       p {
         font-size: .32rem;
         margin: 0 0 0 .13rem;