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

components/mobile/Home.vue

@@ -370,7 +370,7 @@
             border-top-right-radius: 0.05rem;
           }
           &.active a {
-            color: #40b6fc;
+            color: #2d8cf0;
           }
         }
       }

pages/mobile/center/user/collect/component/_key.vue

@@ -6,7 +6,7 @@
       <p class="en-name"><img :src="`/images/mobile/center/${user.data.enterprise.uu ? 'en' : 'self'}.png`" alt="">{{currentEnName}}</p>
     </div>
     <div class="mobile-fix-content mobile-centerfix-content" id="mobileFixContent">
-      <div class="search-content search-content2" style="position: relative">
+      <div class="search-content search-content2" style="position: relative;padding-top: .25rem;">
         <input type="text" placeholder="请输入您要查找的型号" @input="onBrandChange" v-model="keyword" @keyup.13="searchComplist">
         <span @click.stop="searchComplist" >
           <i class="iconfont icon-sousuo"></i>

pages/mobile/center/user/collect/component/index.vue

@@ -6,7 +6,7 @@
       <p class="en-name"><img :src="`/images/mobile/center/${user.data.enterprise.uu ? 'en' : 'self'}.png`" alt="">{{currentEnName}}</p>
     </div>
     <div class="mobile-fix-content mobile-centerfix-content" id="mobileFixContent">
-      <div class="search-content search-content2" style="position: relative">
+      <div class="search-content search-content2" style="position: relative;padding-top: .25rem;">
         <input type="text" placeholder="请输入您要查找的型号" @input="onBrandChange" v-model="keyword" @keyup.13="searchComplist">
         <span @click.stop="searchComplist" >
           <i class="iconfont icon-sousuo"></i>

pages/mobile/order/details.vue

@@ -74,7 +74,7 @@
             <div class="list-item clearfix">
               <div class="list-wrap-content-brand clearfix pull-left">
                 <div class="name pull-left">物料名称：</div>
-                <div class="pull-left spec" style="width: 1.79rem">{{details.kiName || '-'}}</div>
+                <div class="pull-left spec" style="width: 2.5rem">{{details.kiName || '-'}}</div>
               </div>
               <div class="pull-left list-wrap-content-brand clearfix">
                 <div class="name pull-left">单价：</div>
@@ -114,7 +114,7 @@
       <!--</div>-->
       <div class="order-details-priInfo">
         <div class="clearfix">
-          <div class="justifyAlign">运费：</div>
+          <div class="justifyAlign">运 &nbsp;&nbsp;费：</div>
           <span style="display: inline-block;min-width:2rem;text-align: left">
             <a v-if="orderList.currency === 'RMB'"  class="red" style="color:#f43938;">¥{{orderList.fare | priceFiter}}</a>
             <a class="red" style="color:#f43938;" v-else>${{orderList.fare | priceFiter}}</a>
@@ -132,7 +132,7 @@
       </div>
       <div class="list-all-info clearfix">
         <!--共<span>{{orderList.batchQty}}</span>件商品&nbsp;&nbsp;合计：-->
-        <div style="font-size: 0.27rem;" class="justifyAlign">合计：</div>
+        <div style="font-size: 0.27rem;" class="justifyAlign">合 &nbsp;&nbsp;计：</div>
         <span class="pri" style="min-width: 2rem;text-align: left">
           <a v-if="orderList.currency === 'RMB'" class="red" style="color:#f43938;font-size: 0.32rem;">¥</a><a class="red" style="color:#f43938;font-size: 0.32rem;" v-else>$</a>{{orderList.ensurePrice}}
         </span>
@@ -1252,10 +1252,13 @@
           color: #999;
         }
         .jianmian {
+          display:inline-block;
+          vertical-align: middle;
           font-size: 0.22rem;
           color: #fff;
-          width: 0.48rem;
-          height:0.25rem;
+          width: 0.6rem;
+          height: 0.28rem;
+          border-radius:.05rem;
           text-align: center;
           line-height: 0.25rem;
           background: #15b262;

pages/mobile/order/index.vue

@@ -78,7 +78,7 @@
           <div class="list-item clearfix">
             <div class="list-wrap-content-brand clearfix pull-left">
               <div class="name pull-left">物料名称：</div>
-              <div class="pull-left spec" style="width: 1.79rem;">{{details.kiName || '-'}}</div>
+              <div class="pull-left spec" style="width: 2.5rem;">{{details.kiName || '-'}}</div>
             </div>
             <div class="pull-left list-wrap-content-brand clearfix">
               <div class="name pull-left">单价：</div>

pages/mobile/search/newkeycode.vue

@@ -709,7 +709,7 @@
               border-top-right-radius: 0.05rem;
             }
             &.active a {
-              color: #40b6fc;
+              color: #2d8cf0;
             }
             a {
               font-size: .26rem;