Merge branch 'feature-201820-wangcz' into release-201820-wangcz

# Conflicts:
#	components/mobile/Home.vue
#	pages/mobile/search/newkeycode.vue

components/mobile/Home.vue

@@ -339,7 +339,7 @@
     padding-bottom: 1rem;
     background: #f3f3f7;
     .search-content {
-      padding: 0.15rem 0;
+      padding: 0.19rem 0 0.15rem;
       position: absolute;
       z-index: 11;
       width: 100%;
@@ -370,7 +370,7 @@
             border-top-right-radius: 0.05rem;
           }
           &.active a {
-            color: #2d8cf0;
+            color: #3e82f5;
           }
         }
       }
@@ -379,7 +379,7 @@
       position: absolute;
       width: 100%;
       background: #fff;
-      top: 1.25rem;
+      top: 1.29rem;
       border: 1px solid #dcdcdc;
       z-index: 100;
       height: 100%;

pages/mobile/search/newkeycode.vue

@@ -11,7 +11,10 @@
        </div>
      </div>
      <input type="text" id="search-box" v-model="keyword" @keyup.13="onClickSearchHander()" :placeholder="placeholder" @input="changeKeyWord()">
-     <span @click="onClickSearchHander()">搜索</span>
+     <!--<span @click="onClickSearchHander()">搜索</span>-->
+     <span @click="onClickSearchHander()">
+        <i class="iconfont icon-sousuo"></i>
+      </span>
      <a @click="cancelSearchHander()" style="margin-top: 0.14rem;display: inline-block;">取消</a>
    </div>
    <ul class="associate-list" v-show="associate.show" @click="associate.show = false">
@@ -138,7 +141,7 @@
                        <div class="middle_bottom-leftitem clearfix">
                          <div class="bottom-title">电话</div><label style="float: left">：</label>
                          <div class="overHidden" style="width: 3.9rem">
-                           <a :href="'tel:' + AlertstoreInfo.enterprise.enTel" target="_blank" class="content-line" style="color: #2d8cf0">{{item.enTel}}</a>
+                           <a :href="'tel:' + item.enTel" target="_blank" class="content-line" style="color: #2d8cf0">{{item.enTel}}</a>
                          </div>
                        </div>
                        <!--<div class="middle_bottom-leftitem clearfix">-->
@@ -208,7 +211,7 @@
                        <div class="middle_bottom-leftitem clearfix">
                          <div class="bottom-title">电话</div><label style="float: left">：</label>
                          <div class="overHidden" style="width: 3.9rem">
-                           <a :href="'tel:' + AlertstoreInfo.enterprise.enTel" target="_blank" class="content-line" style="color: #2d8cf0">{{item.enTel}}</a>
+                           <a :href="'tel:' + item.enTel" target="_blank" class="content-line" style="color: #2d8cf0">{{item.enTel}}</a>
                          </div>
                        </div>
                        <!--<div class="middle_bottom-leftitem clearfix">-->
@@ -242,10 +245,10 @@
      <div class="mobile-modal-box mobile-link-en">
        <div class="mobile-modal-header">联系方式<i @click="showStoreInfo = false" class="icon-guanbi iconfont"></i></div>
        <div class="mobile-modal-content">
-         <div v-if="AlertstoreInfo.enterprise.enTel"><span >电话：</span><a :href="'tel:' + AlertstoreInfo.enterprise.enTel" target="_blank" class="content-line link-url">{{AlertstoreInfo.enterprise.enTel}}</a></div>
-         <div v-if="AlertstoreInfo.enterprise.enPhone"><span >手机：</span><a :href="'tel:' + AlertstoreInfo.enterprise.enPhone" target="_blank" class="content-line link-url">{{AlertstoreInfo.enterprise.enPhone}}</a></div>
-         <div v-if="AlertstoreInfo.enterprise.enWeixin"><span >微信：</span><span class="content-line">{{AlertstoreInfo.enterprise.enWeixin}}</span></div>
-         <div v-if="AlertstoreInfo.enterprise.enQQ"><span >Q&nbsp;Q：</span><span class="content-line">{{AlertstoreInfo.enterprise.enQQ}}</span></div>
+         <div v-if="AlertstoreInfo.enterpriseInfo.enTel"><span >电话：</span><a :href="'tel:' + AlertstoreInfo.enterpriseInfo.enTel" target="_blank" class="content-line link-url">{{AlertstoreInfo.enterpriseInfo.enTel}}</a></div>
+         <div v-if="AlertstoreInfo.enterpriseInfo.enPhone"><span >手机：</span><a :href="'tel:' + AlertstoreInfo.enterpriseInfo.enPhone" target="_blank" class="content-line link-url">{{AlertstoreInfo.enterpriseInfo.enPhone}}</a></div>
+         <div v-if="AlertstoreInfo.enterpriseInfo.enWeixin"><span >微信：</span><span class="content-line">{{AlertstoreInfo.enterpriseInfo.enWeixin}}</span></div>
+         <div v-if="AlertstoreInfo.enterpriseInfo.enQQ"><span >Q&nbsp;Q：</span><span class="content-line">{{AlertstoreInfo.enterpriseInfo.enQQ}}</span></div>
          <div v-if="!empty">暂无联系方式</div>
        </div>
      </div>
@@ -324,7 +327,7 @@
         keyword: '', // 关键字搜索
         showStoreInfo: false, // 联系买卖家弹窗
         AlertstoreInfo: { // 买卖家弹窗信息
-          enterprise: {}
+          enterpriseInfo: {}
         },
         navType: 'hasStore', // 现货 期货
         ChooseTop: 'component', // 型号， 物料名称， 卖家， 品牌
@@ -361,7 +364,7 @@
         }
       },
       empty () {
-        return this.checkInfo(this.AlertstoreInfo.enterprise.enTel) || this.checkInfo(this.AlertstoreInfo.enterprise.enPhone) || this.checkInfo(this.AlertstoreInfo.enterprise.enWeixin) || this.checkInfo(this.AlertstoreInfo.enterprise.enQQ)
+        return this.checkInfo(this.AlertstoreInfo.enterpriseInfo.enTel) || this.checkInfo(this.AlertstoreInfo.enterpriseInfo.enPhone) || this.checkInfo(this.AlertstoreInfo.enterpriseInfo.enWeixin) || this.checkInfo(this.AlertstoreInfo.enterpriseInfo.enQQ)
       },
       placeholder() {
         if (this.ChooseTop === 'component') {
@@ -650,12 +653,12 @@
     .main-search-header {
       position: absolute;
       background: #3e82f5;
-      padding: 0.15rem 0;
+      padding: 0.19rem 0 0.15rem;
       margin-top: 0;
       z-index: 1;
       width: 100%;
       input {
-        width: 5.1rem;
+        width: 6.48rem;
         height: .58rem;
         line-height: .58rem;
         font-size: .26rem;
@@ -669,22 +672,24 @@
         float: left;
         /*margin-top: .12rem;*/
         -webkit-appearance: none;
-        border-top-left-radius: .14rem;
-        border-bottom-left-radius: .14rem;
+        border-radius: .14rem;
+        /*border-top-left-radius: .14rem;*/
+        /*border-bottom-left-radius: .14rem;*/
       }
       span {
         display: inline-block;
-        width: 1.02rem;
-        text-align: center;
         height: .58rem;
         line-height: .58rem;
-        color: #366df3;
-        font-size: .28rem;
-        margin-left: .02rem;
-        border-top-right-radius: .14rem;
-        border-bottom-right-radius: .14rem;
-        background: #fff;
-        float: left;
+        position: relative;
+        top: .04rem;
+        width: .68rem;
+        color: #376ff3;
+        border-left: .02rem solid #376ff3;
+        margin-left: -.68rem;
+        text-align: center;
+        i {
+          font-size: .31rem;
+        }
         /*margin-top: .12rem;*/
       }
       a {
@@ -709,7 +714,7 @@
               border-top-right-radius: 0.05rem;
             }
             &.active a {
-              color: #2d8cf0;
+              color: #3e82f5;
             }
             a {
               font-size: .26rem;
@@ -1142,7 +1147,7 @@
       position: absolute;
       width: 100%;
       background: #fff;
-      top: 1.4rem;
+      top: 1.44rem;
       border: 1px solid #dcdcdc;
       z-index: 100;
       height: 100%;