Merge remote-tracking branch 'origin/release-wangcz-201814' into release-wangcz-201814

assets/scss/common.scss

@@ -668,11 +668,11 @@ input[type="number"]{
 }
 
 .fl {
-  float: left;
+  float: left !important;
 }
 
 .fr {
-  float: right;
+  float: right !important;
 }
 /*new 标签*/
 @keyframes newAnimate {

components/mobile/user/Info.vue

@@ -15,15 +15,19 @@
         <span><i class="iconfont icon-yonghuming"></i>用户名：</span>
         <span class="describe">{{info.userName}}</span>
       </div>
-      <div class="line" @click="jumpSet('email')">
+      <!--<div class="line" @click="jumpSet('email')">-->
+      <div class="line">
         <span><i class="iconfont icon-youxiang"></i>邮箱：</span>
         <span class="describe">{{info.userEmail}}
-        <i class="iconfont icon-xiangyou"></i></span>
+        <!--<i class="iconfont icon-xiangyou"></i>-->
+        </span>
       </div>
-      <div class="line" @click="jumpSet('mobile')">
+      <!--<div class="line" @click="jumpSet('mobile')">-->
+      <div class="line">
         <span><i class="iconfont icon-shouji"></i>手机：</span>
         <span class="describe">{{info.userTel}}
-        <i class="iconfont icon-xiangyou"></i></span>
+        <!--<i class="iconfont icon-xiangyou"></i>-->
+        </span>
       </div>
     </div>
   </div>
@@ -72,14 +76,14 @@
               }
             })
         }
-      },
-      jumpSet (info) {
-        if (info === 'email') {
-          window.location.herf = decodeURIComponent(this.getEmail)
-        } else if (info === 'mobile') {
-          window.location.herf = decodeURIComponent(this.getMobile)
-        }
       }
+      // jumpSet (info) {
+      //   if (info === 'email') {
+      //     window.location.herf = decodeURIComponent(this.getEmail)
+      //   } else if (info === 'mobile') {
+      //     window.location.herf = decodeURIComponent(this.getMobile)
+      //   }
+      // }
     }
   }
 </script>

components/pcb/search/GoodList.vue

@@ -268,6 +268,7 @@
     background: #f4f4f4;
     padding: 5px 31px 0 14px;
     margin-bottom: 20px;
+    line-height: normal;
     .item {
       width: 74px;
       height: 24px;

pages/mobile/user/storeinfo.vue

@@ -21,7 +21,6 @@
                     </div>
                     <div class="file_input" v-if="storeState !== 'look'">
                       <input type="file"
-                             class="file-input"
                              name="name"
                              accept="image/jpeg,image/jpg,image/gif,image/bmp,image/png"
                              @change="uploadImg"/>
@@ -516,6 +515,7 @@
         }
         span{
           font-size: .20rem;
+          vertical-align: top;
         }
       }
     }