Merge remote-tracking branch 'origin/master' into test

src/css/basic.css

@@ -171,6 +171,7 @@ a {
     width: 100%;
     height: 100%;
     min-height: 100%;
+    background-color: #fff;
 }
 .vertical-obj .vertical-obj-cont {
     display: table-cell;

src/css/tool_search.css

 @charset "utf-8";
+body{
+    background-color: #f3f3f3;
+}
 .tool-search-box {
     text-align: center;
     width: 100%;
@@ -149,24 +152,56 @@
     color: #999;
 }
 
-.error-code {
+.error-code,
+.type-code {
     margin: 20px 20px 0;
     height: 60px;
     line-height: 60px;
     border-radius: 30px;
     border: 1px solid #e7e7e7;
     background-color: #fff;
+    text-align: left;
+}
+.type-code a {
+    display: block;
+    padding-left: 23px;
+    color: #999;
+    font-size: 14px;
+}
+.type-code a.has-code {
+    color: #333;
 }
 
-.error-code input {
+.error-code-fixed {
+    display: none;
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background-color: #fff;
+    z-index: 2;
+}
+.error-code-fixed input {
     width: 100%;
     border: none;
     outline: none;
-    height: 40px;
-    line-height: 40px;
+    height: 50px;
+    line-height: 50px;
     font-size: 14px;
     text-indent: 25px;
     background: transparent;
+    border-bottom: 1px solid #e7e7e7;
+}
+.error-code-fixed a {
+    position: absolute;
+    right: 0;
+    top: 0;
+    display: inline-block;
+    height: 50px;
+    padding:0 20px;
+    font-size: 12px;
+    line-height: 50px;
 }
 
 .foot-btn {
@@ -1104,31 +1139,7 @@
 }
 
 /*auto complete*/
-.autocomplete-suggestions {
-    background-color: #fff;
-    border: 1px solid #e7e7e7;
-    font-size: 14px;
-    border-radius: 5px;
-    overflow-y: scroll;
-}
-
-.autocomplete-suggestion {
-    padding: 0 15px;
-    line-height: 44px;
-    border-bottom: 1px solid #f3f3f3;
-}
 
-.autocomplete-suggestions .autocomplete-suggestion:last-child {
-    border-bottom: none;
-}
-
-.autocomplete-suggestion strong {
-    color: #3498DA;
-}
-
-.autocomplete-selected {
-    background-color: #f3f3f3;
-}
 
 /*底部导航*/
 .foot-block {
@@ -1892,6 +1903,17 @@
     text-align: center;
     font-size: 12px;
 }
+/*自动完成*/
+.autocomplete-suggestion {
+    height: 50px;
+    line-height: 50px;
+    padding: 0 20px;
+    border-bottom: 1px solid #f3f3f3;
+    font-size: 14px;
+}
+.autocomplete-suggestion strong {
+    color: #3498DA;
+}
 
 /*极验证*/
 .geetest_holder {

src/pages/code.vue

@@ -47,10 +47,6 @@
             </div>
         </div>
 
-        <!--<div v-if="empty" class="add-goup-tip">你也可以加入官方微信群获得帮助</div>-->
-
-        <!--<div @click="showFeedback=true" class="msg"><a href="javascript:;">留言反馈</a></div>-->
-
         <div v-show="showFeedback" class="msg-box">
             <div class="msg-box-tit">留言反馈 <a href="javascript:;" @click="showFeedback=false"><i
                     class="iconfont icon-close"></i></a></div>
@@ -63,36 +59,6 @@
             </div>
         </div>
 
-        <!--微信群二维码-->
-        <a href="javascript:;" @click="showWeixinQrcode=true" class="group-qrcode">微信群</a>
-
-
-        <a href="javascript:;" @click="showCollection=true" class="collection">收藏</a>
-
-        <div v-show="showCollection" class="group-qrcode-box">
-            <div class="tit">
-                如何收藏快查？
-                <a @click="showCollection=false" href="javascript:;">
-                    <i class="iconfont icon-close"></i></a>
-            </div>
-
-            <div class="step" style="padding-top: 20px;"><span>01</span></div>
-            <p style="font-size: 14px;">常按识别二维码关注</p>
-            <img src="../img/qrcode_banshou.jpg" style="padding:0">
-
-            <div class="step"><span>02</span></div>
-            <p style="font-size: 14px;">点击公众号菜单“扳手快查”</p>
-            <img src="../img/banshou_menu.jpg" style="padding:0">
-        </div>
-
-
-        <div v-show="showWeixinQrcode" class="group-qrcode-box">
-            <div class="tit">官方微信群 <a @click="showWeixinQrcode=false" href="javascript:;"><i
-                    class="iconfont icon-close"></i></a></div>
-            <h3>欢迎加入官方微信群</h3>
-            <p>与其在别处闲聊 不如在这里抱团</p>
-            <img src="../img/qrcode.jpg">
-        </div>
 
     </div>
 </template>
@@ -197,6 +163,7 @@
 
             },
             missFeedback(){
+                var self = this;
                 if (this.telephone == '') {
                     return false;
                 }
@@ -260,7 +227,7 @@
                             self.empty = true;
                         } else {
                             self.thumbup++;
-                            shareImg.showShare();
+                            /*shareImg.showShare();*/
                         }
                         self.thumbed = true;
                     } else {