diff --git a/components/goods-list/goods-list.vue b/components/goods-list/goods-list.vue
index 42921a40..18101e5b 100644
--- a/components/goods-list/goods-list.vue
+++ b/components/goods-list/goods-list.vue
@@ -267,14 +267,6 @@
                 switch(page[0]) {
                     // 商品详情页面
                     case 'pages/goods-detail/goods-detail' :
-                        var res = app.globalData.get_page_object(page[0]);
-                        if(res.length > 0) {
-                            for(var i in res) {
-                                res[i].$vm.goods_cart_count_handle(cart_total);
-                            }
-                        }
-                        break;
-
                     // 商品搜索
                     case 'pages/goods-search/goods-search' :
                         var res = app.globalData.get_page_object(page[0]);
diff --git a/components/search/search.vue b/components/search/search.vue
index 87c49aa6..997c0672 100644
--- a/components/search/search.vue
+++ b/components/search/search.vue
@@ -4,7 +4,7 @@
             <view class="search-icon dis-inline-block pa" @tap="search_icon_event">
                 <uni-icons :type="propIcon" size="24rpx" :color="propIconColor"></uni-icons>
             </view>
-            <input type="text" confirm-type="search" class="round wh-auto dis-block" :placeholder="propPlaceholder" :placeholder-class="propPlaceholderClass" :value="propDefaultValue" @confirm="search_input_event" :style="'color:'+propTextColor+';background:'+propBgColor+';'+((propBrColor || null) != null ? 'border:1px solid '+propBrColor+';' : '')">
+            <input type="text" confirm-type="search" class="round wh-auto dis-block" :placeholder="propPlaceholder" :placeholder-class="propPlaceholderClass" :value="propDefaultValue" @input="search_input_value_event" @confirm="search_submit_confirm_event" @focus="search_input_focus_event" @blur="search_input_blur_event" :style="'color:'+propTextColor+';background:'+propBgColor+';'+((propBrColor || null) != null ? 'border:1px solid '+propBrColor+';' : '')">
         </view>
     </view>
 </template>
@@ -56,6 +56,18 @@
             	type: Boolean,
             	default: false
             },
+            propIsOnFocusEvent: {
+            	type: Boolean,
+            	default: false
+            },
+            propIsOnBlurEvent: {
+            	type: Boolean,
+            	default: false
+            },
+            propIsOnInputEvent: {
+            	type: Boolean,
+            	default: false
+            },
             propIcon: {
             	type: String,
             	default: 'search'
@@ -67,30 +79,52 @@
             propIsIconOnEvent: {
             	type: Boolean,
             	default: false
-            },
+            }
         },
         methods: {
-            // 搜索事件
-            search_input_event(e) {
-                var keywords = e.detail.value || null;
-                
+            // 搜索输入事件
+            search_input_value_event(e) {
+                // 是否回调事件
+                if(this.propIsOnInputEvent) {
+                    this.$emit('oninput', e.detail.value);
+                }
+            },
+
+            // 搜索失去焦点事件
+            search_input_blur_event(e) {
+                // 是否回调事件
+                if(this.propIsOnBlurEvent) {
+                    this.$emit('onblur', e.detail.value);
+                }
+            },
+
+            // 搜索获取焦点事件
+            search_input_focus_event(e) {
+                // 是否回调事件
+                if(this.propIsOnFocusEvent) {
+                    this.$emit('onfocus', e.detail.value);
+                }
+            },
+
+            // 搜索确认事件
+            search_submit_confirm_event(e) {
                 // 是否验证必须要传值
-                if (this.propIsRequired && keywords == null) {
+                if (this.propIsRequired && e.detail.value == '') {
                     app.globalData.showToast("请输入搜索关键字");
                     return false;
                 }
-                
+
                 // 是否回调事件
                 if(this.propIsOnEvent) {
-                    this.$emit('onsearch', keywords);
+                    this.$emit('onsearch', e.detail.value);
                 } else {
                     // 进入搜索页面
                     uni.navigateTo({
-                        url: this.propUrl+'?'+this.propFormName+'=' + keywords
+                        url: this.propUrl+'?'+this.propFormName+'=' + e.detail.value
                     });
                 }
             },
-            
+
             // icon事件
             search_icon_event(e) {
                 // 是否回调事件
diff --git a/pages/goods-search/goods-search.vue b/pages/goods-search/goods-search.vue
index abf44af6..cd94e68c 100644
--- a/pages/goods-search/goods-search.vue
+++ b/pages/goods-search/goods-search.vue
@@ -4,14 +4,14 @@
             <!-- 搜索关键字 -->
             <view class="padding-horizontal-main padding-top-main padding-bottom-sm pr">
                 <view class="top-search-input">
-                    <input type="text" confirm-type="search" placeholder="输入商品名称搜索" :value="(post_data.wd || '')" class="map-keywords wh-auto round bg-base" placeholder-class="cr-grey" @input="search_input_value_event" @confirm="search_input_confirm_event" @focus="search_input_focus_event" @blur="search_input_blur_event">
+                    <component-search :propDefaultValue="post_data.wd || ''" @onsearch="search_input_confirm_event" :propIsOnEvent="true" @oninput="search_input_value_event" :propIsOnInputEvent="true" @onfocus="search_input_focus_event" :propIsOnFocusEvent="true" @onblur="search_input_blur_event" :propIsOnBlurEvent="true" :propIsRequired="false" propPlaceholder="输入商品名称搜索"></component-search>
                 </view>
                 <view class="pa top-search-right">
                     <view v-if="top_search_right_type_status" class="pr cp" @tap="search_submit_confirm_event">
-                        <uni-icons type="search" size="66rpx" color="#bbb"></uni-icons>
+                        <uni-icons type="search" size="60rpx" color="#bbb"></uni-icons>
                     </view>
                     <view v-if="!top_search_right_type_status" class="pr cp" data-value="/pages/cart-page/cart-page" @tap="url_event">
-                        <uni-icons type="cart" size="66rpx" color="#bbb"></uni-icons>
+                        <uni-icons type="cart" size="60rpx" color="#bbb"></uni-icons>
                         <view v-if="top_right_cart_total != 0" class="badge-icon pa">
                             <component-badge :propNumber="top_right_cart_total"></component-badge>
                         </view>
@@ -157,6 +157,7 @@
     import componentNoData from "../../components/no-data/no-data";
     import componentBottomLine from "../../components/bottom-line/bottom-line";
 	import componentGoodsList from "../../components/goods-list/goods-list";
+    import componentSearch from "../../components/search/search";
     import componentBadge from "../../components/badge/badge";
 
     var common_static_url = app.globalData.get_static_url('common');
@@ -223,6 +224,7 @@
             componentNoData,
             componentBottomLine,
 			componentGoodsList,
+            componentSearch,
             componentBadge
         },
         props: {},
@@ -616,11 +618,6 @@
                 this.get_data_list(1);
             },
 
-            // url事件
-            url_event(e) {
-                app.globalData.url_event(e);
-            },
-
             // 数据展示类型
             data_show_type_event(e) {
                 this.setData({data_show_type_value: this.data_show_type_value == 0 ? 1 : 0});
@@ -635,20 +632,27 @@
                 }
             },
 
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
+
             // 搜索输入事件
-            search_input_value_event(e) {
+            search_input_value_event(value) {
                 var temp_post = this.post_data;
-                temp_post['wd'] = e.detail.value || '';
+                temp_post['wd'] = value;
                 this.setData({
                     post_data: temp_post
                 });
             },
 
             // 搜索输入框输入失去焦点事件
-            search_input_blur_event(e) {
-                this.setData({
-                    top_search_right_type_status: false
-                });
+            search_input_blur_event(value) {
+                if(value == '') {
+                    this.setData({
+                        top_search_right_type_status: false
+                    });
+                }
             },
 
             // 搜索输入框输入获取焦点事件
@@ -659,20 +663,22 @@
             },
 
             // 搜索输入确认事件
-            search_input_confirm_event(e) {
+            search_input_confirm_event(value) {
                 var temp_post = this.post_data;
-                temp_post['wd'] = e.detail.value || '';
+                temp_post['wd'] = value;
                 this.setData({
                     post_data: temp_post,
-                    data_page: 1
+                    data_page: 1,
+                    top_search_right_type_status: false
                 });
                 this.get_data_list(1);
             },
 
             // 搜索确认事件
-            search_submit_confirm_event(e) {
+            search_submit_confirm_event() {
                 this.setData({
-                    data_page: 1
+                    data_page: 1,
+                    top_search_right_type_status: false
                 });
                 this.get_data_list(1);
             },
@@ -682,6 +688,8 @@
                 this.setData({
                     top_right_cart_total: cart_number
                 });
+                // 导航购物车处理
+                this.set_tab_bar_badge_handle();
             }
         }
     };