diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index d4bfb97..95529d2 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -848,7 +848,7 @@ Page({
         newd.member_goods_price = th.data.prom_price,
           newd.prom_type = th.data.prom_type;
         newd.prom_id = th.data.prom_id;
-      } else if (th.data.prom_type == 3) {
+      } else if (th.data.prom_type == 3 || th.data.prom_type == 2 || th.data.prom_type == 4 || th.data.prom_type == 5) {
         newd.prom_type = 0;
         newd.prom_id = 0;
       }
@@ -3032,6 +3032,7 @@ Page({
         },
         fail: function(res) {
           //th.onShow();
+		  th.data.is_get_local_ok = 1;
           th.get_sto();
           if (res.errCode == 2) {
             th.setData({
@@ -3045,7 +3046,7 @@ Page({
               is_gps: "3"
             });
           }
-          th.data.is_get_local_ok = 1;
+          
         }
       })
     }else{
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index efb1d69..ef7cb6d 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -857,14 +857,14 @@
         <view class="spec-goods-info">
           <view class="spec-goods-name ellipsis-1">{{sele_g.goods_name}}</view>
           <view class="flex ai_end xc-val-money">
-          <view class="spec-goods-price" wx:if="{{prom_price==null}}">			  
+          <view class="spec-goods-price" wx:if="{{prom_price==null}}" >			  
 			  <text class="fs20">￥</text>
 		            	 <!-- 如果是等级会员，且有等级价 -->
-			 			  <block wx:if="card_field && sele_g[card_field]>0">
+			 			  <block wx:if="{{card_field && sele_g[card_field]>0}}">
 			 			      {{sele_g[card_field]}}
 			 			  </block> 		 
 			 			  <block wx:else>
-			 			      {{sele_g.shop_price}} 
+			 			      {{sele_g.shop_price}}
 			 			  </block>	  
 			  
 		      </view>
@@ -981,10 +981,10 @@
         <image class="wh100 spec-img xc-distance-bottom" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
         <view class="spec-goods-info">
           <view class="spec-goods-name ellipsis-1">{{sele_g.goods_name}}</view>
-          <view class="flex ai_end xc-val-money">
-            <view class="spec-goods-price" wx:if="{{is_normal==1}}">
+          <view class="flex ai_end xc-val-money {{sele_g[card_field]}}" >
+            <view class="spec-goods-price" wx:if="{{is_normal==1}}" >
 			                 <!-- 如果是等级会员，且有等级价 -->
-			     			  <block wx:if="card_field && sele_g[card_field]>0">
+			     			  <block wx:if="{{card_field && sele_g[card_field]>0}}">
 			     			    ￥ {{sele_g[card_field]}}
 			     			  </block> 		 
 			     			  <block wx:else>
diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index 3d89412..53b794b 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -1,4 +1,4 @@
-var t = function(t) {
+  var t = function(t) {
     return t && t.__esModule ? t : {
         default: t
     };
diff --git a/pages/goods/goodsList/goodsList.json b/pages/goods/goodsList/goodsList.json
index c3b12b5..074fc3a 100644
--- a/pages/goods/goodsList/goodsList.json
+++ b/pages/goods/goodsList/goodsList.json
@@ -1,3 +1,3 @@
-{
+ {
     "navigationBarTitleText": "商品列表"
 }
\ No newline at end of file
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index 9d5260e..688da7e 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -82,7 +82,7 @@
                 				<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 class="word-line xc-ash">￥{{item.market_price}}</view>	
                 					    <view>评论{{item.comment_count}}  已售{{item.sales_sum}}</view>	
                 					 </view>	
                 				</block>	   						   
diff --git a/pages/goods/goodsList/goodsList.wxss b/pages/goods/goodsList/goodsList.wxss
index ea50eba..843bb89 100644
--- a/pages/goods/goodsList/goodsList.wxss
+++ b/pages/goods/goodsList/goodsList.wxss
@@ -1,4 +1,4 @@
-.container {
+  .container {
     color: #666;
 }