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

yvan.ni
2 parents 351cbc07 de39c3a2
Showing 2 changed files with 2 additions and 6 deletions
components/goods_list/goods_list.wxml
components/goods_list/goods_list.wxss
@@ -42,7 +42,7 @@
                       <view class="fs35">{{filter.toFix(item[card_field],2)}}</view>
                       <view class="card_bg ellipsis-1">
                         <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                        <view class="card_name">{{card_name}}</view>
+                        <text class="card_name">{{card_name}}</text>
                       </view>
                     </view>
                   </view>
@@ -186,18 +186,14 @@
 .card_bg {
 	box-sizing: border-box;
-  /* display: flex; */
   padding: 2rpx 10rpx;
   height: 28rpx;
-  /* align-items: center; */
   border-radius: 26rpx;
   font-size: 18rpx;
   line-height: 28rpx;
-  /* max-width: 110rpx; */
-	max-width: 220rpx;
+	max-width: 210rpx;
   background: #333;
   color: #fff;
-  /* justify-content: center; */
   margin-left: 8rpx;
 }