Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

后端研发-倪永富
2 parents 7c1971ba 8fc717cb
Showing 4 changed files with 4 additions and 4 deletions
pages/goods/goodsList/goodsList.js
pages/goods/goodsList/goodsList.json
pages/goods/goodsList/goodsList.wxml
pages/goods/goodsList/goodsList.wxss
-var t = function(t) {
+  var t = function(t) {
     return t && t.__esModule ? t : {
         default: t
     };
-{
+ {
     "navigationBarTitleText": "商品列表"
 }
 \ No newline at end of file
@@ -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>	   						   
-.container {
+  .container {
     color: #666;
 }