Ver código fonte

验收修改第一轮

yangc 8 anos atrás
pai
commit
ef2cd54c4c

+ 2 - 3
components/mobile/MobileHeader.vue

@@ -246,9 +246,6 @@
 </script>
 <style lang="scss" scoped>
   @import '~assets/scss/mobileCommon';
-  .mobile-nav {
-    position: relative;
-  }
   .mobile-header{
     width:100%;
     height:.88rem;
@@ -265,6 +262,8 @@
     font-size:.36rem;
     text-align: center;
     margin: 0;
+    width: 6rem;
+    padding-left: 1rem;
   }
   .mobile-header a{
     font-size:.28rem;

+ 1 - 0
components/mobile/brand/BrandCenter.vue

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

+ 1 - 1
components/mobile/brand/BrandDetail.vue

@@ -297,7 +297,7 @@
       height: 3.17rem;
       width: 6.96rem;
       display: inline-block;
-      margin: .38rem auto .18rem;
+      margin: .28rem auto;
       line-height: 2.13rem;
       background: #fff;
       text-align: center;

+ 2 - 2
components/mobile/brand/ComponentDetail.vue

@@ -265,9 +265,9 @@
     font-size: .28rem;
     margin-bottom: 1.2rem;
     background: #f7f7f7;
-    padding-top: .26rem;
+    padding-top: .2rem;
     .base-detail {
-      margin: 0 .27rem .19rem .27rem;
+      margin: 0 .27rem .2rem .27rem;
       padding: .18rem .36rem 0 .36rem;
       border-radius: .1rem;
       background: url('/images/mobile/@2x/productDetail/component-desc-bg.png')no-repeat;

+ 11 - 9
components/mobile/search/MainSearch.vue

@@ -114,12 +114,10 @@
       document.getElementById('search-box').focus()
     },
     watch: {
-      'keyword': {
-        handler (val, oldVal) {
-          let keywords = this.similarKeywords.data
-          if (!keywords || !keywords.length) {
-            this.onChange()
-          }
+      'keyword': function (val, oldVal) {
+        let keywords = this.similarKeywords.data
+        if (!keywords || !keywords.length) {
+          this.onChange()
         }
       }
     },
@@ -153,11 +151,13 @@
         font-size: .28rem;
         color: #999;
         padding-left: .2rem;
-        border-bottom-left-radius: .05rem;
-        border-top-left-radius: .05rem;
         border: .01rem solid #fff;
         background: #fff;
         outline: none;
+        border-radius: 0;
+        float: left;
+        margin-top: .08rem;
+        -webkit-appearance: none;
       }
       span {
         display: inline-block;
@@ -171,6 +171,8 @@
         border-top-right-radius: .05rem;
         border-bottom-right-radius: .05rem;
         background: #fff;
+        float: left;
+        margin-top: .08rem;
       }
       a {
         font-size: .28rem;
@@ -233,7 +235,7 @@
             overflow: hidden;
             text-overflow: ellipsis;
             white-space: nowrap;
-            margin-right: .1rem;
+            margin: 0 .1rem .1rem 0;
             background: #f2f6ff;
             height: .56rem;
             line-height: .56rem;

+ 1 - 1
components/mobile/store/StoreDetail.vue

@@ -202,7 +202,7 @@
       height: 3.17rem;
       width: 6.96rem;
       display: inline-block;
-      margin: .18rem auto;
+      margin: .2rem auto;
       line-height: 2.13rem;
       background: #fff;
       text-align: center;

+ 15 - 6
pages/mobile/search/_keycode.vue

@@ -39,8 +39,9 @@
       </div>
     </div>
 
-    <div class="none-state" v-if="!productList.expose">
-      <img src="/images/mobile/@2x/sousuokongzhuangtai@2x.png">
+    <div class="none-state" v-if="!productList.components || productList.components.length === 0">
+      <img :src="brandList && brandList.length > 0 ? '/images/mobile/@2x/car@2x.png':'/images/mobile/@2x/search-empty.png'">
+      <p v-text="brandList && brandList.length > 0 ? '抱歉,暂无器件信息' : '抱歉,暂无搜索结果'"></p>
       <a @click="goLastPage">返回上一页</a>
     </div>
     <remind-box :title="collectResult" :timeoutCount="timeoutCount"></remind-box>
@@ -185,8 +186,13 @@
       width:100%;
       img{
         margin:0 auto;
-        width: 4.08rem;
-        height: 4.13rem;
+        width: 3.31rem;
+        height: 2.13rem;
+      }
+      p {
+        font-size: .32rem;
+        color: #999;
+        margin: 1.19rem 0 0 0;
       }
       a {
         display: block;
@@ -281,8 +287,8 @@
         position: relative;
         img {
           position: absolute;
-          left: -132px;
-          top: 24px;
+          left: -1.32rem;
+          top: .24rem;
         }
       }
       .brand-list{
@@ -306,6 +312,9 @@
             width:100%;
             background: #418ef7;
             line-height: .45rem;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
           }
         }
         p{

+ 7 - 3
pages/mobile/shop/index.vue

@@ -170,7 +170,7 @@
       position:absolute;
       top:.8rem;
       right:.2rem;
-      z-index:100;
+      z-index:1;
       background:#616264;
       border-radius:.1rem;
       li{
@@ -256,10 +256,14 @@
         i{
           display:block;
           position:absolute;
-          top: 0;
-          right: 0;
+          top: -.06rem;
+          right: -.06rem;
           font-size:.4rem;
           color:#ff7800;
+          width: .6rem;
+          height: .6rem;
+          text-align: center;
+          line-height: .6rem;
         }
         i.active{
           color:#333;

+ 3 - 2
pages/mobile/user/index.vue

@@ -209,6 +209,7 @@
       background:#fff;
       width:100%;
       position:relative;
+      border-bottom: .1rem solid #dfe2e4;
       .supdown{
         position:absolute;
         top:.8rem;
@@ -275,7 +276,7 @@
         width:6.77rem;
         margin-left:.39rem;
         .item-img{
-          width:2.42rem;
+          width:2.4rem;
           vertical-align: middle;
           display: inline-block;
           i{
@@ -287,9 +288,9 @@
             background-size: .65rem .33rem;
           }
           img{
-            border:.02rem solid #418bf6;
             width:2.4rem;
             height:1.69rem;
+            border:.02rem solid #eee;
           }
         }
         .list-item-phone{