Merge remote-tracking branch 'origin/master'

orderPages/orderDetail/index.vue

@@ -139,7 +139,7 @@
 
             <view class="bottomHeight"></view>
 
-            <view class="bottom1 flex-col"  v-if="order.orderStatus == 1 ">
+            <view class="bottom1 flex-col"  v-if="order.orderStatus == 6 ">
                 <text class="allMoney"></text>
                 <view class="bottomBtn　flex-row justify-between">
                     <view class=" flex-row">

pages/index/index.vue

@@ -741,11 +741,11 @@ export default {
           }
 
           .adress {
-            font-size: 11px;
+            font-size: 22rpx;
             white-space: nowrap;
             overflow: hidden;
             text-overflow: ellipsis;
-            padding-left: 40px;
+            padding-left: 80rpx;
             color: #666;
           }
         }
@@ -930,7 +930,13 @@ export default {
           }
 
           .adress {
-            font-size: 14px;
+            font-size: 28rpx;
+            line-height: 36rpx;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp:1 ;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
             color: #666;
           }