Merge remote-tracking branch 'origin/feature/yc-mobile-1020' into feature/yc-mobile-1020

components/mobile/Home.vue

@@ -227,34 +227,10 @@
       width:1.14rem;
       height:1.14rem;
       margin:0 auto;
-      position:relative;
-    }
-    .home-main .home-main-content div:first-child{
-      background:rgb(255,48,100);
-    }
-    .home-main .home-main-content:nth-child(2) div{
-      background:rgb(250,103,67);
-    }
-    .home-main .home-main-content:nth-child(3) div {
-      background: rgb(252, 184, 54);
-    }
-    .home-main .home-main-content:nth-child(4) div{
-      background:rgb(99,147,255);
-    }
-    .home-main .home-main-content:nth-child(5) div{
-      background:rgb(67,201,173);
-    }
-    .home-main .home-main-content:last-child div{
-      background:rgb(135,201,79);
     }
     .home-main .home-main-content div>img{
-      width: .8rem;
-      height:.8rem;
-      position:absolute;
-      left:50%;
-      top:50%;
-      margin-left:-36%;
-      margin-top:-36%;
+      width: 100%;
+      height:100%;
     }
 
     .home-main .home-main-content p{

pages/mobile/shop/index.vue

@@ -2,7 +2,12 @@
   <div class="shop">
     <div class="shop-top">
       <p><i class="iconfont icon-dianpu1"></i><span>{{list.numberOfElements}}</span>家店铺</p>
-      <span>全部 <i class="iconfont icon-jiantoushang"></i></span>
+      <span @click="onClick()">全部 <i class="iconfont icon-jiantoushang"></i></span>
+      <ul class="supdown" v-if="down">
+        <li>原厂</li>
+        <li>代理</li>
+        <li>经销</li>
+      </ul>
     </div>
     <div class="shop-list" v-for="item in list.content">
       <h3>{{item.storeName}}</h3>
@@ -29,7 +34,8 @@
       return {
         page: '',
         count: '',
-        types: ''
+        types: '',
+        down: false
       }
     },
     fetch ({ store }) {
@@ -41,6 +47,11 @@
       list () {
         return this.$store.state.provider.stores.storeList.data
       }
+    },
+    methods: {
+      onClick () {
+        this.down = !this.down
+      }
     }
   }
 </script>
@@ -58,7 +69,24 @@
     width:100%;
     height:1.14rem;
     padding:0 .3rem;
+    position:relative;
     background:#fff;
+    .supdown{
+      position:absolute;
+      top:.8rem;
+      right:.2rem;
+      z-index:100;
+      background:#616264;
+      border-radius:.1rem;
+      li{
+        font-size: .28rem;
+        color:#ffffff;
+        height: .32rem;
+        line-height: .32rem;
+        margin: .2rem;
+        margin-right:.4rem;
+      }
+    }
     p{
       font-size:.24rem;
       color:#000;

pages/mobile/user/_uuid.vue

@@ -3,7 +3,11 @@
     <div class="user-name">
       <img src="/images/component/default.png"/>
       <p>{{userName}}uu用户名</p>
-      <span>全部收藏 <i class="iconfont icon-jiantoushang"></i></span>
+      <span @click="onclick()">全部收藏 <i class="iconfont icon-jiantoushang"></i></span>
+      <ul class="supdown" v-if="down">
+        <li>店铺关注</li>
+        <li>器件收藏</li>
+      </ul>
     </div>
     <div class="shop-list">
       <h3>{{1213}}</h3>
@@ -28,13 +32,19 @@
     layout: 'main',
     data () {
       return {
-        userName: ''
+        userName: '',
+        down: false
       }
     },
     fetch ({ store, storeName }) {
       return Promise.all([
         store.dispatch('shop/storeInfo', { storeName: storeName })
       ])
+    },
+    methods: {
+      onclick () {
+        this.down = !this.down
+      }
     }
   }
 </script>
@@ -51,6 +61,24 @@
       display:flex;
       align-items: center;
       width:100%;
+      position:relative;
+      .supdown{
+        position:absolute;
+        top:1rem;
+        right:.3rem;
+        z-index:1000;
+        width:1.7rem;
+        background:#616264;
+        border-radius:.1rem;
+        padding-left:.18rem;
+        li{
+          font-size: .28rem;
+          color:#ffffff;
+          height: .32rem;
+          line-height: .32rem;
+          margin: .2rem 0;
+        }
+      }
       img{
         display: inline-block;
         width:1.25rem;