黄琪勇 пре 4 месеци
родитељ
комит
43689ea8ba

+ 2 - 1
miniprogram/pages/index/index.less

@@ -231,10 +231,11 @@ page {
           }
 
           .currentPrice {
+            display: flex;
+            align-items: baseline;
             font-weight: bold;
             color: #FE462E;
             font-family: DINAlternate, DINAlternate;
-            line-height: 1;
 
             .stuff {
               font-size: 32rpx;

+ 16 - 18
miniprogram/pages/orders/order-detail.less

@@ -116,7 +116,6 @@
     &::-webkit-scrollbar {
       display: none;
     }
-
     .instrumentItem {
       width: 200rpx;
       background: #FFFFFF;
@@ -128,9 +127,8 @@
       display: flex;
       flex-direction: column;
       position: relative;
-
-      &:last-child {
-        margin-right: 26rpx;
+      &:nth-last-child(2){
+        margin-right: 0;
       }
 
       .itemSel {
@@ -166,13 +164,14 @@
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
+        display: flex;
+        align-items: baseline;
 
         .stuff {
           margin-right: 2rpx;
         }
 
         .numberDisplay--integer {
-          line-height: 1;
           font-size: 32rpx;
         }
 
@@ -192,6 +191,11 @@
         text-overflow: ellipsis;
       }
     }
+    .lastInstrumentItem {
+      width: 26rpx;
+      height: 100%;
+      flex-shrink: 0;
+    }
   }
 }
 
@@ -199,7 +203,7 @@
   margin-top: 16rpx;
   background: linear-gradient(315deg, #FFEEE9 0%, #FFF6EC 100%);
   border-radius: 20rpx;
-  border: 3rpx solid rgba(255,170,157,0.56);
+  border: 3rpx solid rgba(255, 170, 157, 0.56);
 
   &.showAddressInfoTip {
     border-color: #FD4502;
@@ -318,7 +322,7 @@
         font-weight: 400;
         font-size: 24rpx;
         color: #AAAAAA;
-        line-height: 34rpx;
+        line-height: 36rpx;
       }
     }
   }
@@ -326,11 +330,10 @@
   .priceRight {
     display: flex;
     justify-content: flex-end;
-    align-items: flex-end;
+    align-items: baseline;
     font-weight: bold;
     font-size: 28rpx;
     color: #000000;
-    line-height: 44rpx;
 
     &.discountTip {
       color: #FD4502;
@@ -338,11 +341,9 @@
 
     .stuff {
       margin-right: 4rpx;
-      line-height: 48rpx;
     }
 
     .numberDisplay--integer {
-      line-height: 1;
       font-size: 32rpx;
     }
 
@@ -600,6 +601,7 @@
     justify-content: space-between;
     align-items: center;
     margin-top: 8rpx;
+    line-height: 48rpx;
 
     .goods-name {
       flex: 1 auto;
@@ -610,7 +612,6 @@
       font-weight: 600;
       font-size: 28rpx;
       color: #131415;
-      line-height: 48rpx;
     }
 
     .goods-price {
@@ -620,17 +621,15 @@
       font-size: 24rpx;
       color: #131415;
       display: flex;
-      align-items: flex-end;
+      align-items: baseline;
       justify-content: flex-end;
 
       .stuff {
         margin-right: 6rpx;
         font-size: 24rpx;
-        line-height: 34rpx;
       }
 
       .numberDisplay--integer {
-        line-height: 1;
         font-size: 32rpx;
       }
 
@@ -736,7 +735,7 @@
 
   .price {
     display: flex;
-    align-items: flex-end;
+    align-items: baseline;
     font-weight: bold;
     font-size: 32rpx;
     color: #FE462E;
@@ -759,7 +758,6 @@
     }
 
     .numberDisplay--integer {
-      line-height: 1;
       font-size: 52rpx;
     }
 
@@ -839,7 +837,7 @@
 
         &:last-child {
           margin-left: 32rpx;
-          background: linear-gradient( 135deg, #FF412A 0%, #FF764D 100%), linear-gradient( 150deg, rgba(255,134,49,0) 0%, rgba(255,210,105,0.5) 100%), linear-gradient( 216deg, rgba(255,104,71,0) 0%, #FF6141 100%);
+          background: linear-gradient(135deg, #FF412A 0%, #FF764D 100%), linear-gradient(150deg, rgba(255, 134, 49, 0) 0%, rgba(255, 210, 105, 0.5) 100%), linear-gradient(216deg, rgba(255, 104, 71, 0) 0%, #FF6141 100%);
           font-weight: 500;
           color: #fff;
           border-color: transparent;

+ 3 - 1
miniprogram/pages/orders/order-detail.wxml

@@ -38,7 +38,7 @@
         </view>
         <view class="tip">以下乐器图片仅作示意,具体产品请以实物为准</view>
         <view class="instrumentsListBox">
-          <view scroll-x class="instrumentsListCon">
+          <view class="instrumentsListCon">
             <view class="instrumentItem" wx:for="{{ instrumentsList }}" wx:key="index" bind:tap="onSelectInstrumentsGoods" data-index="{{ index }}">
               <image wx:if="{{ item.id == instrumentsInfo.id  }}" class="itemSel" src="../member/images/radioAct1.png"></image>
               <image wx:else class="itemSel" src="../member/images/radio.png"></image>
@@ -50,6 +50,8 @@
               </view>
               <view wx:if="{{(item.originalPrice-item.salePrice)>0}}" class="itemOriginalPrice">原价¥{{ my.formatValue(item.originalPrice) }}</view>
             </view>
+            <!-- ios给最后一个元素设置margin-right 没有效果 -->
+            <view class="lastInstrumentItem"></view>
           </view>
         </view>
         <view wx:if="{{ instrumentsInfo.id }}" class="memberBox {{isAddressInfoTip?'showAddressInfoTip':''}}">

+ 3 - 7
miniprogram/pages/orders/order-result.less

@@ -220,7 +220,7 @@
         font-weight: 400;
         font-size: 24rpx;
         color: #AAAAAA;
-        line-height: 34rpx;
+        line-height: 36rpx;
       }
     }
   }
@@ -228,23 +228,20 @@
   .priceRight {
     display: flex;
     justify-content: flex-end;
-    align-items: flex-end;
+    align-items: baseline;
     font-weight: bold;
     font-size: 28rpx;
     color: #000000;
-    line-height: 44rpx;
 
     &.discountTip {
       color: #FD4502;
     }
 
     .stuff {
-      line-height: 48rpx;
       margin-right: 4rpx;
     }
 
     .numberDisplay--integer {
-      line-height: 1;
       font-size: 32rpx;
     }
 
@@ -389,7 +386,7 @@
 
   .price {
     display: flex;
-    align-items: flex-end;
+    align-items: baseline;
     font-weight: bold;
     font-size: 32rpx;
     color: #FE462E;
@@ -412,7 +409,6 @@
     }
 
     .numberDisplay--integer {
-      line-height: 1;
       font-size: 52rpx;
     }