diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml
index 13a075c..969cb95 100644
--- a/components/goods_list/goods_list.wxml
+++ b/components/goods_list/goods_list.wxml
@@ -1,128 +1,145 @@
-   <!-- 商品列表 -->
-   <wxs module="filter" src="../../utils/filter.wxs"></wxs>
-   <wxs module="g_filter" src="g_filter.wxs"></wxs>
-    <view class="collects">
-      <view class="hang ">
-        <!-- 商品详情 --> 
-        <view class="collect ib"  wx:for="{{recommend}}" bindtap="go_url" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
-            <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
-          <!-- 商品图片 -->  
-          <image class="sp" src="{{url+item.original_img}}" mode="scaleToFill"  binderror="bind_bnerr_xc" data-url="{{item.original_img}}" data-errorimg="recommend[{{index}}].original_img"></image>
-          <view class="bottom">
-            <!-- 商品名称 -->
-            <view class="goods_name ellipsis-2 fs28">{{item.goods_name}}</view>
-					
-			<!-- 商品价格,先判断下是后又等级价-->	
-			<block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" >	
-					<!-- 当会员是等级卡的时候 -->
-					<block wx:if="{{card_field}}">						         
-						        <!-- 等级价>0 -->
-								<block wx:if="{{item[card_field]>0}}">
-								         <view class="money flex" >
-								           <!-- 办卡价 -->
-								           <view class="flex xc-wc">
-								         	<view class="fs24">￥</view>
-								         	<view class="fs35">{{filter.toFix(item[card_field],2)}}</view>
-											<view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image><view class="card_name">{{card_name}}</view></view>
-								           </view>
-								         </view>
-								         <view class="flex" style="line-height: 28rpx;" >
-								           <!-- 原价 -->
-								           <view class="price flex xc-ash line_th">
-								         	<view class="fs22">￥</view>
-								         	<view class="fs22">{{item.market_price}}</view>
-								           </view>
-								         </view>									
-								</block>	
-								<blocK wx:else>
-									    <view class="money flex" >
-									      <!-- 办卡价 -->
-									      <view class="flex xc-wc">
-									    	<view class="fs24">￥</view>
-									    	<view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
-									      </view>
-									    </view>
-									    <view class="flex" style="line-height: 28rpx;" >
-									      <!-- 原价 -->
-									      <view class="price flex xc-ash line_th">
-									    	<view class="fs22">￥</view>
-									    	<view class="fs22">{{item.market_price}}</view>
-									      </view>
-									    </view>
-								</blocK>				
-					</block>
-					<block wx:else>
-						   <!-- 如果商品有设置等级价大于0的 -->
-						   <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
-							       <view class="money flex" >
-							         <!-- 办卡价 -->
-							         <view class="flex xc-wc">
-							            <view class="fs24">￥</view>
-							            <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>									  
-							         </view>
-									 <!-- 原价 -->
-									 <view class="price flex xc-ash line_th">
-										 <view class="fs22">￥</view>
-										 <view class="fs22">{{item.market_price}}</view>
-									 </view>
-																		 
-							       </view>
-							       <view class="flex" style="line-height: 28rpx;" >
-							         <!-- 等级价 -->
-							         <view class="price flex">
-							          	<view class="fs22">￥</view>
-										<view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
-										<view class="card_bg"> <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}</view>
-							         </view>
-							       </view>	
-						   </block>
-						   <block wx:else>
-							     <view class="money flex" >
-							       <!-- 办卡价 -->
-							       <view class="flex xc-wc">
-							     	<view class="fs24">￥</view>
-							     	<view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
-							       </view>
-							     </view>
-							     <view class="flex" style="line-height: 28rpx;" >
-							       <!-- 原价 -->
-							       <view class="price flex xc-ash line_th">
-							     	<view class="fs22">￥</view>
-							     	<view class="fs22">{{item.market_price}}</view>
-							       </view>
-							     </view>
-						   </block>				   
-					</block>
-			</block>
-					
-			<!-- 商品压根就没有等级价 -->
-			<block wx:else>
-				<view class="money flex" >
-				  <!-- 办卡价 -->
-				  <view class="flex xc-wc">
-					<view class="fs24">￥</view>
-					<view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
-				  </view>
-				</view>
-				<view class="flex" style="line-height: 28rpx;" >
-				  <!-- 原价 -->
-				  <view class="price flex xc-ash line_th">
-					<view class="fs22">￥</view>
-					<view class="fs22">{{item.market_price}}</view>
-				  </view>
-				</view>
-			</block>	
-						
-          </view>
-            </navigator>
+<!-- 商品列表 -->
+<wxs module="filter" src="../../utils/filter.wxs"></wxs>
+<wxs module="g_filter" src="g_filter.wxs"></wxs>
+<view class="collects">
+  <view class="hang ">
+    <!-- 商品详情 -->
+    <view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
+      <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
+        <!-- 商品图片 -->
+        <image class="sp" src="{{url+item.original_img}}" mode="scaleToFill" binderror="bind_bnerr_xc" data-url="{{item.original_img}}" data-errorimg="recommend[{{index}}].original_img"></image>
+        <view class="bottom">
+          <!-- 商品名称 -->
+          <view class="goods_name ellipsis-2 fs28">{{item.goods_name}}</view>
+          <block wx:if="{{item.prom_price}}">
+            <view class="money flex">
+              <!-- 活动价 -->
+              <view class="flex xc-wc">
+                <view class="fs24">￥</view>
+                <view class="fs35">{{filter.toFix(item.prom_price,2)}}</view>
+              </view>
+            </view>
+            <view class="flex" style="line-height: 28rpx;">
+              <!-- 原价 -->
+              <view class="price flex xc-ash line_th">
+                <view class="fs22">￥</view>
+                <view class="fs22">{{item.market_price}}</view>
+              </view>
+            </view>
+          </block>
+          <block wx:else>
+            <!-- 商品价格,先判断下是后又等级价-->
+            <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
+              <!-- 当会员是等级卡的时候 -->
+              <block wx:if="{{card_field}}">
+                <!-- 等级价>0 -->
+                <block wx:if="{{item[card_field]>0}}">
+                  <view class="money flex">
+                    <!-- 办卡价 -->
+                    <view class="flex xc-wc">
+                      <view class="fs24">￥</view>
+                      <view class="fs35">{{filter.toFix(item[card_field],2)}}</view>
+                      <view class="card_bg">
+                        <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+                        <view class="card_name">{{card_name}}</view>
+                      </view>
+                    </view>
+                  </view>
+                  <view class="flex" style="line-height: 28rpx;">
+                    <!-- 原价 -->
+                    <view class="price flex xc-ash line_th">
+                      <view class="fs22">￥</view>
+                      <view class="fs22">{{item.market_price}}</view>
+                    </view>
+                  </view>
+                </block>
+                <blocK wx:else>
+                  <view class="money flex">
+                    <!-- 办卡价 -->
+                    <view class="flex xc-wc">
+                      <view class="fs24">￥</view>
+                      <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+                    </view>
+                  </view>
+                  <view class="flex" style="line-height: 28rpx;">
+                    <!-- 原价 -->
+                    <view class="price flex xc-ash line_th">
+                      <view class="fs22">￥</view>
+                      <view class="fs22">{{item.market_price}}</view>
+                    </view>
+                  </view>
+                </blocK>
+              </block>
+              <block wx:else>
+                <!-- 如果商品有设置等级价大于0的 -->
+                <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
+                  <view class="money flex">
+                    <!-- 办卡价 -->
+                    <view class="flex xc-wc">
+                      <view class="fs24">￥</view>
+                      <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+                    </view>
+                    <!-- 原价 -->
+                    <view class="price flex xc-ash line_th">
+                      <view class="fs22">￥</view>
+                      <view class="fs22">{{item.market_price}}</view>
+                    </view>
+
+                  </view>
+                  <view class="flex" style="line-height: 28rpx;">
+                    <!-- 等级价 -->
+                    <view class="price flex">
+                      <view class="fs22">￥</view>
+                      <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
+                      <view class="card_bg">
+                        <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}</view>
+                    </view>
+                  </view>
+                </block>
+                <block wx:else>
+                  <view class="money flex">
+                    <!-- 办卡价 -->
+                    <view class="flex xc-wc">
+                      <view class="fs24">￥</view>
+                      <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+                    </view>
+                  </view>
+                  <view class="flex" style="line-height: 28rpx;">
+                    <!-- 原价 -->
+                    <view class="price flex xc-ash line_th">
+                      <view class="fs22">￥</view>
+                      <view class="fs22">{{item.market_price}}</view>
+                    </view>
+                  </view>
+                </block>
+              </block>
+            </block>
+
+            <!-- 商品压根就没有等级价 -->
+            <block wx:else>
+              <view class="money flex">
+                <!-- 办卡价 -->
+                <view class="flex xc-wc">
+                  <view class="fs24">￥</view>
+                  <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+                </view>
+              </view>
+              <view class="flex" style="line-height: 28rpx;">
+                <!-- 原价 -->
+                <view class="price flex xc-ash line_th">
+                  <view class="fs22">￥</view>
+                  <view class="fs22">{{item.market_price}}</view>
+                </view>
+              </view>
+            </block>
+            </block>
         </view>
-      </view>
-      <view class="nothing flex-center" wx:if="{{is_no_more==0}}">
-          <view class="Foil"></view>
-          <view class="no_content fs24">没有更多内容了</view>
-          <view class="Foil"></view>
-      </view>
-      </view>
-  
-        
- 
\ No newline at end of file
+      </navigator>
+    </view>
+  </view>
+  <view class="nothing flex-center" wx:if="{{is_no_more==0}}">
+    <view class="Foil"></view>
+    <view class="no_content fs24">没有更多内容了</view>
+    <view class="Foil"></view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index 688da7e..42d5523 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -1,141 +1,154 @@
 <wxs module="g_filter" src="g_filter.wxs"></wxs>
 <view class="container">
-    <view class="nav">
-        <navigator bindtap="changeTab" class="nav-item" data-href="goods_id" data-ad="{{adname}}">综合
-            <view class="ico-dg" wx:if="{{tabname=='goods_id'}}">
-               <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
-               <image class="wh100" src="{{iurl}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
-            </view>
-        </navigator>
-        <navigator bindtap="changeTab" class="nav-item" data-href="sales_sum" data-ad="{{adname}}">销量
-            <view class="ico-dg" wx:if="{{tabname=='sales_sum'}}">
-                  <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
-                  <image class="wh100" src="{{iurl}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
-            </view>
-   
-        </navigator>
-        <navigator bindtap="changeTab" class="nav-item" data-href="shop_price" data-ad="{{adname}}">
-            价格
-            <view class="ico-dg" wx:if="{{tabname=='shop_price'}}">
-                <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
-                <image class="wh100" src="{{iurl}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
-            </view>
-        </navigator>
-        <!-- <navigator bindtap="openFilterModal" class="nav-item">筛选<view class="ico-filter">
+  <view class="nav">
+    <navigator bindtap="changeTab" class="nav-item" data-href="goods_id" data-ad="{{adname}}">综合
+      <view class="ico-dg" wx:if="{{tabname=='goods_id'}}">
+        <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
+        <image class="wh100" src="{{iurl}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
+      </view>
+    </navigator>
+    <navigator bindtap="changeTab" class="nav-item" data-href="sales_sum" data-ad="{{adname}}">销量
+      <view class="ico-dg" wx:if="{{tabname=='sales_sum'}}">
+        <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
+        <image class="wh100" src="{{iurl}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
+      </view>
+
+    </navigator>
+    <navigator bindtap="changeTab" class="nav-item" data-href="shop_price" data-ad="{{adname}}">
+      价格
+      <view class="ico-dg" wx:if="{{tabname=='shop_price'}}">
+        <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
+        <image class="wh100" src="{{iurl}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
+      </view>
+    </navigator>
+    <!-- <navigator bindtap="openFilterModal" class="nav-item">筛选<view class="ico-filter">
                 <image class="wh100" src="{{iurl}}/miniapp/images/xx.png"></image>
             </view>
         </navigator> -->
 
-        <navigator  class="nav-item search" url="/pages/goods/search/search">
-            <image class="wh100 search-img" src="{{iurl}}/miniapp/images/search.png"></image>
-        </navigator>
-    </view>
-    <view class="choice_list">
-        <navigator class="choice_item" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" wx:key="{{index}}">
-            <view class="img-wrap">
-                <image src="{{item.original_img}}" binderror="bind_bnerr2" data-url="{{item.original_img}}"  lazy-load="true"
-                       data-errorimg="requestData[{{index}}].original_img"></image>
+    <navigator class="nav-item search" url="/pages/goods/search/search">
+      <image class="wh100 search-img" src="{{iurl}}/miniapp/images/search.png"></image>
+    </navigator>
+  </view>
+  <view class="choice_list">
+    <navigator class="choice_item" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" wx:key="{{index}}">
+      <view class="img-wrap">
+        <image src="{{item.original_img}}" binderror="bind_bnerr2" data-url="{{item.original_img}}" lazy-load="true" data-errorimg="requestData[{{index}}].original_img"></image>
+      </view>
+      <view class="item-cont">
+        <view class="title">{{item.goods_name}}</view>
+        <!-- 判断是否有活动价 -->
+        <block wx:if="{{item.prom_price>0}}">
+             <!-- 活动价 -->
+            <view class="price">￥{{item.prom_price}}</view>
+            <view class="comment flex jc_sb">
+              <view class="word-line xc-ash">￥{{item.market_price}}</view>
+              <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
             </view>
-            <view class="item-cont">
-                <view class="title">{{item.goods_name}}</view>
-				
-                <!-- 商品价格,先判断下是后又等级价-->
-                <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" >
-                	       <!-- 当会员是等级卡的时候 -->
-                	       <block wx:if="{{card_field}}">	
-                		         <!-- 等级价>0 -->
-                		         <block wx:if="{{item[card_field]>0}}">
-                				       <view class="flex ai-center">
-                				          <view class="price">￥{{item[card_field]}}</view>
-                						  <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                              <view class="card_name">{{card_name}}</view></view>
-                					   </view>
-                				       <view class="comment flex jc_sb">
-                				          <view class="word-line xc-ash">￥{{item.market_price}}</view>	
-                				          <view>评论{{item.comment_count}}  已售{{item.sales_sum}}</view>	
-                				       </view>	 								 
-                				 </block>
-                				 <block wx:else>
-                					    <view class="price">￥{{item.shop_price}}</view>
-                					    <view class="comment flex jc_sb">
-                					       <view class="word-line xc-ash">￥{{item.market_price}}</view>	
-                					       <view>评论{{item.comment_count}}  已售{{item.sales_sum}}</view>	
-                					    </view>		
-                				 </block>						      
-                		   </block>
-                		   <block wx:else>
-                			    <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
-                					 <view class="flex ai-center">
-                					    <view class="price">￥{{item.shop_price}}</view>
-                						<view class="word-line xc-ash mk_price">￥{{item.market_price}}</view>
-                					 </view> 
-                					 <view class="comment flex jc_sb">
-                						<view class="flex">
-                					       <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</view>	
-                						   <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                						      {{g_filter.get_card_price(item,card_list,1)}}
-                						   </view>
-                						</view>
-                					    <view>评论{{item.comment_count}}  已售{{item.sales_sum}}</view>	
-                					 </view>	
-                				</block>
-                				<block wx:else>
-                					 <view class="price">￥{{item.shop_price}}</view>
-                					 <view class="comment flex jc_sb">
-                			  		    <view class="word-line xc-ash">￥{{item.market_price}}</view>	
-                					    <view>评论{{item.comment_count}}  已售{{item.sales_sum}}</view>	
-                					 </view>	
-                				</block>	   						   
-                		   </block>					
-                </block>
-                <block wx:else>			
-                	<view class="price">￥{{item.shop_price}}</view>
-                	<view class="comment flex jc_sb">
-                	   <view class="word-line xc-ash">￥{{item.market_price}}</view>	
-                	   <view>评论{{item.comment_count}}  已售{{item.sales_sum}}</view>	
-                	</view>
-                </block>
+        </block>
+
+        <block wx:else>
+          <!-- 商品价格,先判断下是后又等级价-->
+          <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
+            <!-- 当会员是等级卡的时候 -->
+            <block wx:if="{{card_field}}">
+              <!-- 等级价>0 -->
+              <block wx:if="{{item[card_field]>0}}">
+                <view class="flex ai-center">
+                  <view class="price">￥{{item[card_field]}}</view>
+                  <view class="card_bg">
+                    <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+                    <view class="card_name">{{card_name}}</view>
+                  </view>
+                </view>
+                <view class="comment flex jc_sb">
+                  <view class="word-line xc-ash">￥{{item.market_price}}</view>
+                  <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
+                </view>
+              </block>
+              <block wx:else>
+                <view class="price">￥{{item.shop_price}}</view>
+                <view class="comment flex jc_sb">
+                  <view class="word-line xc-ash">￥{{item.market_price}}</view>
+                  <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
+                </view>
+              </block>
+            </block>
+            <block wx:else>
+              <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
+                <view class="flex ai-center">
+                  <view class="price">￥{{item.shop_price}}</view>
+                  <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view>
+                </view>
+                <view class="comment flex jc_sb">
+                  <view class="flex">
+                    <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</view>
+                    <view class="card_bg">
+                      <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+                      {{g_filter.get_card_price(item,card_list,1)}}
+                    </view>
+                  </view>
+                  <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
+                </view>
+              </block>
+              <block wx:else>
+                <view class="price">￥{{item.shop_price}}</view>
+                <view class="comment flex jc_sb">
+                  <view class="word-line xc-ash">￥{{item.market_price}}</view>
+                  <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
+                </view>
+              </block>
+            </block>
+          </block>
+          <block wx:else>
+            <view class="price">￥{{item.shop_price}}</view>
+            <view class="comment flex jc_sb">
+              <view class="word-line xc-ash">￥{{item.market_price}}</view>
+              <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
             </view>
-        </navigator>
-    </view>
-    <view class="no-data" wx:if="{{(!requestData||requestData.length==0) && is_go}}">
-        <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
-        <view class="no-data-title">没有相关的数据</view>
-        <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>
-    </view>
+          </block>
+        </block>
+      </view>
+    </navigator>
+  </view>
+  <view class="no-data" wx:if="{{(!requestData||requestData.length==0) && is_go}}">
+    <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
+    <view class="no-data-title">没有相关的数据</view>
+    <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>
+  </view>
 </view>
 <view hidden="{{!openFilterModal}}">
-    <view bindtap="closeFilterModal" class="cover-layer"></view>
-    <view class="filter-modal">
-        <icon bindtap="closeFilterModal" class="modal-close" color="gray" size="22" type="cancel"></icon>
-        <button bindtap="restoreData" class="viewall-btn">显示全部分类</button>
-        <view class="filter-box" wx:for="{{requestData.filter_spec}}" wx:key="{{index}}">
-            <view class="filter-name">{{item.name}}</view>
-            <view class="filter-items">
-                <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{item.item}}" wx:key="{{index}}">
-                {{item.name}}</view>
-            </view>
-        </view>
-        <view class="filter-box" wx:for="{{requestData.filter_attr}}" wx:key="{{index}}">
-            <view class="filter-name">{{item.name}}</view>
-            <view class="filter-items">
-                <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{item.item}}" wx:key="{{index}}">
-                {{item.name}}</view>
-            </view>
-        </view>
-        <view class="filter-box" wx:if="{{requestData.filter_brand.length>0}}">
-            <view class="filter-name">相关品牌</view>
-            <view class="filter-items">
-                <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{requestData.filter_brand}}" wx:key="{{index}}">
-                {{item.name}}</view>
-            </view>
-        </view>
-        <view class="filter-box" wx:if="{{requestData.filter_price.length>0}}">
-            <view class="filter-name">价格区间</view>
-            <view class="filter-items">
-                <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{requestData.filter_price}}" wx:key="{{index}}">
-                {{item.name}}</view>
-            </view>
-        </view>
+  <view bindtap="closeFilterModal" class="cover-layer"></view>
+  <view class="filter-modal">
+    <icon bindtap="closeFilterModal" class="modal-close" color="gray" size="22" type="cancel"></icon>
+    <button bindtap="restoreData" class="viewall-btn">显示全部分类</button>
+    <view class="filter-box" wx:for="{{requestData.filter_spec}}" wx:key="{{index}}">
+      <view class="filter-name">{{item.name}}</view>
+      <view class="filter-items">
+        <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{item.item}}" wx:key="{{index}}">
+          {{item.name}}</view>
+      </view>
     </view>
-</view>
+    <view class="filter-box" wx:for="{{requestData.filter_attr}}" wx:key="{{index}}">
+      <view class="filter-name">{{item.name}}</view>
+      <view class="filter-items">
+        <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{item.item}}" wx:key="{{index}}">
+          {{item.name}}</view>
+      </view>
+    </view>
+    <view class="filter-box" wx:if="{{requestData.filter_brand.length>0}}">
+      <view class="filter-name">相关品牌</view>
+      <view class="filter-items">
+        <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{requestData.filter_brand}}" wx:key="{{index}}">
+          {{item.name}}</view>
+      </view>
+    </view>
+    <view class="filter-box" wx:if="{{requestData.filter_price.length>0}}">
+      <view class="filter-name">价格区间</view>
+      <view class="filter-items">
+        <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{requestData.filter_price}}" wx:key="{{index}}">
+          {{item.name}}</view>
+      </view>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml
index 39df1db..a7f6cc4 100644
--- a/pages/goods/search/search.wxml
+++ b/pages/goods/search/search.wxml
@@ -1,158 +1,170 @@
 <wxs module="g_filter" src="g_filter.wxs"></wxs>
 <view class="container">
-    <view class="nav">
-        <navigator bindtap="changeTab" class="nav-item" data-href="goods_id" data-ad="{{adname}}">综合
-             <view class="ico-dg" wx:if="{{tabname=='goods_id'}}">
-               <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
-               <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
-            </view>
-        </navigator>
-        <navigator bindtap="changeTab" class="nav-item" data-href="sales_sum" data-ad="{{adname}}" >销量
-             <view class="ico-dg" wx:if="{{tabname=='sales_sum'}}">
-               <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
-               <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
-            </view>   
-        </navigator>
-        <navigator bindtap="changeTab" class="nav-item" data-href="shop_price" data-ad="{{adname}}" >价格
-               <view class="ico-dg" wx:if="{{tabname=='shop_price'}}">
-               <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
-               <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
-            </view>
-        </navigator>
-        <!-- <navigator bindtap="openFilterModal" class="nav-item">筛选<view class="ico-filter">
+  <view class="nav">
+    <navigator bindtap="changeTab" class="nav-item" data-href="goods_id" data-ad="{{adname}}">综合
+      <view class="ico-dg" wx:if="{{tabname=='goods_id'}}">
+        <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
+        <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
+      </view>
+    </navigator>
+    <navigator bindtap="changeTab" class="nav-item" data-href="sales_sum" data-ad="{{adname}}">销量
+      <view class="ico-dg" wx:if="{{tabname=='sales_sum'}}">
+        <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
+        <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
+      </view>
+    </navigator>
+    <navigator bindtap="changeTab" class="nav-item" data-href="shop_price" data-ad="{{adname}}">价格
+      <view class="ico-dg" wx:if="{{tabname=='shop_price'}}">
+        <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
+        <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
+      </view>
+    </navigator>
+    <!-- <navigator bindtap="openFilterModal" class="nav-item">筛选<view class="ico-filter">
                 <image class="wh100" src="{{url}}/miniapp/images/xx.png"></image>
             </view>
         </navigator> -->
-        <navigator bindtap="openSearchModal" class="nav-item nav-search">
-            <image class="wh100 search-img" src="{{url}}/miniapp/images/search.png"></image>
-        </navigator>
-    </view>
-    <view class="choice_list">
-        <navigator class="choice_item" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" wx:key="{{index}}">
-            <view class="img-wrap">
-                <image src="{{item.original_img}}" lazy-load="true"
-                    binderror="bind_bnerr" data-errorimg="requestData[{{index}}].original_img"></image>
+    <navigator bindtap="openSearchModal" class="nav-item nav-search">
+      <image class="wh100 search-img" src="{{url}}/miniapp/images/search.png"></image>
+    </navigator>
+  </view>
+  <view class="choice_list">
+    <navigator class="choice_item" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" wx:key="{{index}}">
+      <view class="img-wrap">
+        <image src="{{item.original_img}}" lazy-load="true" binderror="bind_bnerr" data-errorimg="requestData[{{index}}].original_img"></image>
+      </view>
+      <view class="item-cont">
+        <view class="title">{{item.goods_name}}</view>
+        <!-- 判断是否有活动价 -->
+        <block wx:if="{{item.prom_price>0}}">
+               <!-- 活动价 -->
+            <view class="price">￥{{item.prom_price}}</view>
+            <view class="comment flex jc_sb">
+              <view class="word-line xc-ash">￥{{item.market_price}}</view>
+              <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
             </view>
-            <view class="item-cont">
-                <view class="title">{{item.goods_name}}</view>
-				<!-- 商品价格,先判断下是后又等级价-->	
-				<block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" >
-					       <!-- 当会员是等级卡的时候 -->
-					       <block wx:if="{{card_field}}">	
-						         <!-- 等级价>0 -->
-						         <block wx:if="{{item[card_field]>0}}">
-								       <view class="flex ai-center">
-								          <view class="price">￥{{item[card_field]}}</view>
-										  <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                     <view class="card_name">{{card_name}}</view> 
-                      </view>
-									   </view>
-								       <view class="comment flex jc_sb">
-								          <view class="word-line xc-ash">￥{{item.market_price}}</view>	
-								          <view>评论{{item.comment_count}}  已售{{item.sales_sum}}</view>	
-								       </view>	 								 
-								 </block>
-								 <block wx:else>
-									    <view class="price">￥{{item.shop_price}}</view>
-									    <view class="comment flex jc_sb">
-									       <view class="word-line xc-ash">￥{{item.market_price}}</view>	
-									       <view>评论{{item.comment_count}}  已售{{item.sales_sum}}</view>	
-									    </view>		
-								 </block>						      
-						   </block>
-						   <block wx:else>
-							    <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
-									 <view class="flex ai-center">
-									    <view class="price">￥{{item.shop_price}}</view>
-										<view class="word-line xc-ash mk_price">￥{{item.market_price}}</view>
-									 </view> 
-									 <view class="comment flex jc_sb">
-										<view class="flex">
-									       <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</view>	
-										   <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-										      {{g_filter.get_card_price(item,card_list,1)}}
-										   </view>
-										</view>
-									    <view>评论{{item.comment_count}}  已售{{item.sales_sum}}</view>	
-									 </view>	
-								</block>
-								<block wx:else>
-									 <view class="price">￥{{item.shop_price}}</view>
-									 <view class="comment flex jc_sb">
-									    <view class="word-line xc-ash">￥{{item.market_price}}</view>	
-									    <view>评论{{item.comment_count}}  已售{{item.sales_sum}}</view>	
-									 </view>	
-								</block>	   						   
-						   </block>					
-				</block>
-				<block wx:else>			
-					<view class="price">￥{{item.shop_price}}</view>
-					<view class="comment flex jc_sb">
-					   <view class="word-line xc-ash">￥{{item.market_price}}</view>	
-					   <view>评论{{item.comment_count}}  已售{{item.sales_sum}}</view>	
-					</view>
-				</block>
+        </block>
+        <block wx:else>
+          <!-- 商品价格,先判断下是后又等级价-->
+          <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
+            <!-- 当会员是等级卡的时候 -->
+            <block wx:if="{{card_field}}">
+              <!-- 等级价>0 -->
+              <block wx:if="{{item[card_field]>0}}">
+                <view class="flex ai-center">
+                  <view class="price">￥{{item[card_field]}}</view>
+                  <view class="card_bg">
+                    <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+                    <view class="card_name">{{card_name}}</view>
+                  </view>
+                </view>
+                <view class="comment flex jc_sb">
+                  <view class="word-line xc-ash">￥{{item.market_price}}</view>
+                  <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
+                </view>
+              </block>
+              <block wx:else>
+                <view class="price">￥{{item.shop_price}}</view>
+                <view class="comment flex jc_sb">
+                  <view class="word-line xc-ash">￥{{item.market_price}}</view>
+                  <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
+                </view>
+              </block>
+            </block>
+            <block wx:else>
+              <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
+                <view class="flex ai-center">
+                  <view class="price">￥{{item.shop_price}}</view>
+                  <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view>
+                </view>
+                <view class="comment flex jc_sb">
+                  <view class="flex">
+                    <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</view>
+                    <view class="card_bg">
+                      <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+                      {{g_filter.get_card_price(item,card_list,1)}}
+                    </view>
+                  </view>
+                  <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
+                </view>
+              </block>
+              <block wx:else>
+                <view class="price">￥{{item.shop_price}}</view>
+                <view class="comment flex jc_sb">
+                  <view class="word-line xc-ash">￥{{item.market_price}}</view>
+                  <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
+                </view>
+              </block>
+            </block>
+          </block>
+          <block wx:else>
+            <view class="price">￥{{item.shop_price}}</view>
+            <view class="comment flex jc_sb">
+              <view class="word-line xc-ash">￥{{item.market_price}}</view>
+              <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
             </view>
-        </navigator>
-    </view>
-    <view class="no-data" wx:if="{{!requestData||requestData.length==0}}">
-        <image class="cart-image" src="{{url}}/miniapp/images/cart-null.png"></image>
-        <view class="no-data-title">没有相关的数据</view>
-        <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>
-    </view>
+          </block>
+        </block>
+      </view>
+    </navigator>
+  </view>
+  <view class="no-data" wx:if="{{!requestData||requestData.length==0}}">
+    <image class="cart-image" src="{{url}}/miniapp/images/cart-null.png"></image>
+    <view class="no-data-title">没有相关的数据</view>
+    <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>
+  </view>
 </view>
 <view hidden="{{!openFilterModal}}">
-    <view bindtap="closeFilterModal" class="cover-layer"></view>
-    <view class="filter-modal">
-        <icon bindtap="closeFilterModal" class="modal-close" color="gray" size="22" type="cancel"></icon>
-        <button bindtap="restoreData" class="viewall-btn">显示全部分类</button>
-        <view class="filter-box" wx:for="{{requestData.filter_spec}}" wx:key="{{index}}">
-            <view class="filter-name">{{item.name}}</view>
-            <view class="filter-items">
-                <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{item.item}}" wx:key="{{index}}">
-                {{item.name}}</view>
-            </view>
-        </view>
-        <view class="filter-box" wx:for="{{requestData.filter_attr}}" wx:key="{{index}}">
-            <view class="filter-name">{{item.name}}</view>
-            <view class="filter-items">
-                <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{item.item}}" wx:key="{{index}}">
-                {{item.name}}</view>
-            </view>
-        </view>
-        <view class="filter-box" wx:if="{{requestData.filter_brand.length>0}}">
-            <view class="filter-name">相关品牌</view>
-            <view class="filter-items">
-                <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{requestData.filter_brand}}" wx:key="{{index}}">
-                {{item.name}}</view>
-            </view>
-        </view>
-        <view class="filter-box" wx:if="{{requestData.filter_price.length>0}}">
-            <view class="filter-name">价格区间</view>
-            <view class="filter-items">
-                <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{requestData.filter_price}}" wx:key="{{index}}">
-                {{item.name}}</view>
-            </view>
-        </view>
+  <view bindtap="closeFilterModal" class="cover-layer"></view>
+  <view class="filter-modal">
+    <icon bindtap="closeFilterModal" class="modal-close" color="gray" size="22" type="cancel"></icon>
+    <button bindtap="restoreData" class="viewall-btn">显示全部分类</button>
+    <view class="filter-box" wx:for="{{requestData.filter_spec}}" wx:key="{{index}}">
+      <view class="filter-name">{{item.name}}</view>
+      <view class="filter-items">
+        <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{item.item}}" wx:key="{{index}}">
+          {{item.name}}</view>
+      </view>
+    </view>
+    <view class="filter-box" wx:for="{{requestData.filter_attr}}" wx:key="{{index}}">
+      <view class="filter-name">{{item.name}}</view>
+      <view class="filter-items">
+        <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{item.item}}" wx:key="{{index}}">
+          {{item.name}}</view>
+      </view>
+    </view>
+    <view class="filter-box" wx:if="{{requestData.filter_brand.length>0}}">
+      <view class="filter-name">相关品牌</view>
+      <view class="filter-items">
+        <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{requestData.filter_brand}}" wx:key="{{index}}">
+          {{item.name}}</view>
+      </view>
+    </view>
+    <view class="filter-box" wx:if="{{requestData.filter_price.length>0}}">
+      <view class="filter-name">价格区间</view>
+      <view class="filter-items">
+        <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{requestData.filter_price}}" wx:key="{{index}}">
+          {{item.name}}</view>
+      </view>
     </view>
+  </view>
 </view>
 <view wx:if="{{openSearchModal}}">
-    <view class="search-modal">
-        <view class="search-bar">
-            <form bindsubmit="submitSearch">
-                <input autoFocus class="search-input" name="word" placeholder="搜索商品"></input>
-                <button class="search-btn" formType="submit">
-                    <image class="wh100 search-img" src="{{url}}/miniapp/images/sea.png"></image>
-                </button>
-            </form>
-        </view>
-        <view class="search-hot">
-            <view class="hot-title">热门搜索</view>
-            <block wx:if="{{hotWords.length>0}}">
-            <view class="hot-row" wx:for="{{hotWords}}" wx:key="{{index}}">
-                <view bindtap="searchHotWord" class="hot-item" data-word="{{item}}" wx:for="{{item}}" wx:key="{{index}}">{{item}}</view>
-            </view>
-            </block>
+  <view class="search-modal">
+    <view class="search-bar">
+      <form bindsubmit="submitSearch">
+        <input autoFocus class="search-input" name="word" placeholder="搜索商品"></input>
+        <button class="search-btn" formType="submit">
+          <image class="wh100 search-img" src="{{url}}/miniapp/images/sea.png"></image>
+        </button>
+      </form>
+    </view>
+    <view class="search-hot">
+      <view class="hot-title">热门搜索</view>
+      <block wx:if="{{hotWords.length>0}}">
+        <view class="hot-row" wx:for="{{hotWords}}" wx:key="{{index}}">
+          <view bindtap="searchHotWord" class="hot-item" data-word="{{item}}" wx:for="{{item}}" wx:key="{{index}}">{{item}}</view>
         </view>
+      </block>
     </view>
-</view>
+  </view>
+</view>
\ No newline at end of file