Merge branch 'master' of yb/kmall-pt into master

wx-mall/pages/goods/goods.wxss

@@ -253,7 +253,7 @@
 
 .goods-info {
   width: 750rpx;
-  height: 210rpx;
+  height: 250rpx;
   overflow: hidden;
   background: #fff;
 }
@@ -275,11 +275,13 @@
 }
 
 .goods-info .name {
-  height: 41rpx;
+  height: 81rpx;
   margin-bottom: 20rpx;
   font-size: 30rpx;
   line-height: 41rpx;
   margin-top: 10rpx;
+  text-overflow: ellipsis;
+  overflow: hidden;
 }
 
 .goods-info .desc {
@@ -293,7 +295,7 @@
 .desc2{
   position:absolute;
   right:220rpx;
-  top:910rpx;
+  top:950rpx;
   height: 43rpx;
   margin-bottom: 41rpx;
   font-size: 24rpx;
@@ -368,6 +370,9 @@
   font-size: 29rpx;
   color: #333;
   margin-left: 31.25rpx;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
 }
 
 .section-nav .nav1001 {

wx-mall/pages/hotGoods/hotGoods.wxml

@@ -63,7 +63,7 @@
   <view class="sort">
     <view class="sort-box">
       <view class="item {{currentSortType == 'default' ? 'active' : ''}}" bindtap="openSortFilter" id="defaultSort">
-        <text class="txt">综合</text>
+        <text class="txt">热销</text>
       </view>
       <view class="item by-price {{currentSortType == 'price' ? 'active' : ''}} {{currentSortOrder == 'asc'  ? 'asc' : 'desc'}}" bindtap="openSortFilter" id="priceSort">
         <text class="txt">价格</text>