소스 검색

修改样式

lex-xin 8 달 전
부모
커밋
32021bb432

+ 9 - 5
miniprogram/pages/orders/order-detail.less

@@ -272,10 +272,10 @@ page {
       font-size: 26rpx;
       color: #AAA;
       line-height: 36rpx;
-      text {
+      // text {
         // font-weight: bold;
         // padding-left: 6rpx;
-      }
+      // }
     }
   }
 }
@@ -373,7 +373,9 @@ page {
     font-family: DINAlternate, DINAlternate;
     font-weight: bold;
     color: #131415;
-    line-height: 48rpx;
+    // line-height: 48rpx;
+    display: flex;
+    align-items: flex-end;
 
     .before {
       font-weight: 400;
@@ -390,11 +392,12 @@ page {
     .stuff {
       font-size: 28rpx;
       padding-right: 4rpx;
+      line-height: 1.1;
     }
 
     .priceZ {
-      font-size: 40rpx;
-      // line-height: 1;
+      font-size: 36rpx;
+      line-height: 1;
       color: #FE4600;
     }
 
@@ -414,6 +417,7 @@ page {
     .afterPrice {
       color: #333333;
       font-size: 36rpx;
+      line-height: 1;
     }
   }
 }

+ 30 - 26
miniprogram/pages/orders/order-result.less

@@ -272,7 +272,9 @@ page {
     font-family: DINAlternate, DINAlternate;
     font-weight: bold;
     color: #131415;
-    line-height: 48rpx;
+    // line-height: 48rpx;
+    display: flex;
+    align-items: flex-end;
 
     .before {
       font-weight: 400;
@@ -289,11 +291,12 @@ page {
     .stuff {
       font-size: 28rpx;
       padding-right: 4rpx;
+      line-height: 1.1;
     }
 
     .priceZ {
       font-size: 36rpx;
-      // line-height: 1;
+      line-height: 1;
       color: #FE4600;
     }
 
@@ -313,6 +316,7 @@ page {
     .afterPrice {
       color: #333333;
       font-size: 36rpx;
+      line-height: 1;
     }
   }
 }
@@ -501,30 +505,30 @@ page {
 
 
 /* HTML: <div class="loader"></div> */
-.loader {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  right: 0;
-  bottom: 0;
-  margin-top: -50rpx;
-  margin-left: -50rpx;
-  z-index: 9;
-  width: 100rpx;
-  aspect-ratio: 1;
-  border-radius: 50%;
-  background:
-    radial-gradient(farthest-side, #E8E8E8 94%, #0000) top/8px 8px no-repeat,
-    conic-gradient(#0000 30%, #E8E8E8);
-  -webkit-mask: radial-gradient(farthest-side, #0000 calc(100% - 8px), #000 0);
-  animation: tempLoading 1s infinite linear;
-}
-
-@keyframes tempLoading {
-  100% {
-    transform: rotate(1turn)
-  }
-}
+// .loader {
+//   position: absolute;
+//   top: 50%;
+//   left: 50%;
+//   right: 0;
+//   bottom: 0;
+//   margin-top: -50rpx;
+//   margin-left: -50rpx;
+//   z-index: 9;
+//   width: 100rpx;
+//   aspect-ratio: 1;
+//   border-radius: 50%;
+//   background:
+//     radial-gradient(farthest-side, #E8E8E8 94%, #0000) top/8px 8px no-repeat,
+//     conic-gradient(#0000 30%, #E8E8E8);
+//   -webkit-mask: radial-gradient(farthest-side, #0000 calc(100% - 8px), #000 0);
+//   animation: tempLoading 1s infinite linear;
+// }
+
+// @keyframes tempLoading {
+//   100% {
+//     transform: rotate(1turn)
+//   }
+// }
 
 .only_canvas {
   position: absolute;

+ 94 - 35
miniprogram/pages/orders/orders.less

@@ -196,63 +196,122 @@
     align-items: flex-end;
     border-top: 2rpx solid #F2F2F2;
 
-    .order-price {
+    // .order-price {
+    //   display: flex;
+    //   align-items: flex-end;
+
+    //   .desc {
+    //     font-size: 24rpx;
+    //     color: #999;
+    //     line-height: 40rpx;
+    //     flex-shrink: 0;
+    //   }
+
+    //   .currentPrice {
+    //     font-weight: bold;
+    //     font-family: DINAlternate, DINAlternate;
+    //     // display: flex;
+    //     // align-items: center;
+    //     color: #333;
+
+    //     .before {
+    //       font-size: 28rpx;
+    //       color: #131415;
+    //       font-weight: 400;
+    //     }
+
+    //     .stuff {
+    //       font-size: 28rpx;
+    //       padding: 2rpx 6rpx 0 4rpx;
+    //     }
+
+    //     .priceZ {
+    //       font-size: 36rpx;
+    //       line-height: 1;
+    //     }
+
+    //     // .priceF {
+    //     //   font-size: 32rpx;
+    //     // }
+    //   }
+
+    //   // .line {
+    //   //   margin: 0 12rpx 8rpx;
+    //   //   background-color: #D2D2D2;
+    //   //   width: 2rpx;
+    //   //   height: 20rpx;
+    //   // }
+
+    //   .discountPrice {
+    //     font-size: 28rpx;
+    //     color: #FE4600;
+    //     font-weight: bold;
+    //     padding-left: 8rpx;
+    //     padding-right: 12rpx;
+
+    //     text {
+    //       font-size: 36rpx;
+    //       line-height: 1;
+    //       padding-left: 6rpx;
+    //     }
+    //   }
+    // }
+
+
+    .goodsInfo-count {
       display: flex;
-      align-items: flex-end;
+      justify-content: flex-end;
 
-      .desc {
-        font-size: 24rpx;
-        color: #999;
-        line-height: 40rpx;
+      .goods-price {
         flex-shrink: 0;
-      }
-
-      .currentPrice {
-        font-weight: bold;
         font-family: DINAlternate, DINAlternate;
-        // display: flex;
-        // align-items: center;
-        color: #333;
+        font-weight: bold;
+        color: #131415;
+        // line-height: 48rpx;
+        display: flex;
+        align-items: flex-end;
 
         .before {
-          font-size: 28rpx;
-          color: #131415;
           font-weight: 400;
+          font-size: 24rpx;
+          color: #777777;
+          vertical-align: middle;
+          padding-right: 6rpx;
+        }
+
+        .red {
+          color: #FE4600;
         }
 
         .stuff {
           font-size: 28rpx;
-          padding: 2rpx 6rpx 0 4rpx;
+          padding-right: 4rpx;
+          line-height: 1.1;
         }
 
         .priceZ {
           font-size: 36rpx;
           line-height: 1;
+          color: #FE4600;
         }
 
-        // .priceF {
-        //   font-size: 32rpx;
-        // }
-      }
-
-      // .line {
-      //   margin: 0 12rpx 8rpx;
-      //   background-color: #D2D2D2;
-      //   width: 2rpx;
-      //   height: 20rpx;
-      // }
+        .priceF {
+          font-size: 24rpx;
+          color: #FE4600;
+        }
 
-      .discountPrice {
-        font-size: 28rpx;
-        color: #FE4600;
-        font-weight: bold;
-        padding-left: 8rpx;
-        padding-right: 12rpx;
+        .afterTxt {
+          font-weight: 400;
+          font-size: 24rpx;
+          color: #777777;
+          vertical-align: middle;
+          padding-left: 12rpx;
+        }
 
-        text {
+        .afterPrice {
+          color: #333333;
           font-size: 36rpx;
           line-height: 1;
-          padding-left: 6rpx;
         }
       }
     }

+ 10 - 7
miniprogram/pages/orders/orders.wxml

@@ -34,14 +34,17 @@
               </view>
             </view>
             <view class="item-footer">
-              <view class="order-price">
-                <view class="desc">共{{ item.studentPaymentOrderDetails.length }}件,共减</view>
-                <view class="discountPrice">¥<text>{{ item.discountPrice }}</text></view>
-                <view class="currentPrice">
-                  <text class="before">应付:</text>
+              <view class="goodsInfo-count">
+                <view class="goods-price">
+                  <text class="before">共{{ item.studentPaymentOrderDetails.length }}件 <block wx:if="{{ item.discountPrice > 0 }}">,共减</block></text>
+                  <block wx:if="{{ item.discountPrice > 0 }}">
+                    <text class="stuff red">¥</text>
+                    <text class="priceZ">{{ item.discountPrice }}</text>
+                  </block>
+                  <!-- <text class="priceF">.{{ goodsInfo.decimalPart }}</text> -->
+                  <text class="afterTxt">应付:</text>
                   <text class="stuff">¥</text>
-                  <text class="priceZ">{{ item.integerPart }}.{{ item.decimalPart }}</text>
-                  <!-- <text class="priceF"></text> -->
+                  <text class="afterPrice">{{ item.integerPart }}.{{ item.decimalPart }}</text>
                 </view>
               </view>
 

+ 10 - 5
miniprogram/pages/select-goods/index.less

@@ -104,7 +104,7 @@
       .stuff {
         font-size: 32rpx;
         padding: 0 4rpx;
-        line-height: 1.2;
+        line-height: 1.3;
       }
 
       .priceZ {
@@ -129,6 +129,7 @@
       padding-bottom: 2rpx;
       font-size: 24rpx;
       color: #AAAAAA;
+      line-height: 1.3;
     }
   }
 }
@@ -400,10 +401,10 @@
             padding-right: 4rpx;
             font-weight: 400 !important;
           }
-          .showP {
+          // .showP {
             // font-weight: 600 !important;
             // padding-left: 4rpx;
-          }
+          // }
         }
       }
     }
@@ -438,16 +439,20 @@
     justify-content: center;
     line-height: 50rpx;
 
+    .text {
+      line-height: 1.3;
+    }
+
     .stuff {
       font-size: 32rpx;
       padding-left: 8rpx;
       padding-right: 6rpx;
-      line-height: 1.3;
+      line-height: 1.2;
     }
 
     .priceZ {
       font-size: 48rpx;
-      line-height: 1.1;
+      line-height: 1;
     }
 
     .priceF {

+ 1 - 1
miniprogram/pages/select-goods/index.wxml

@@ -113,7 +113,7 @@
       <view class="btnGroup">
         <button type="primary" catch:tap="onSubmit" disabled="{{ isOverSaled }}">
           <view class="btn-prices">
-            <text>立即支付</text>
+            <text class="text">立即支付</text>
             <text class="stuff">¥</text>
             <text class="priceZ">{{ formatSelectGood.integerPart || 0 }}</text>
             <text class="priceF">.{{ formatSelectGood.decimalPart || '00' }}</text>