修改样式

miniprogram/pages/address/address-detail.less

@@ -29,7 +29,7 @@
     padding: 0 !important;
     background: linear-gradient(90deg, #544F4A 0%, #302F2B 100%);
     box-shadow: 0rpx 14rpx 14rpx 0rpx rgba(0, 0, 0, 0.18);
-    border-radius: 30rpx;
+    border-radius: 36rpx !important;
     border: 8rpx solid #FFFFFF;
     color: #FEFFCA;
     font-size: 36rpx;
@@ -158,7 +158,7 @@ toolbar-confirm {
     line-height: 94rpx;
     background: linear-gradient(90deg, #544F4A 0%, #302F2B 100%);
     box-shadow: 0rpx 14rpx 14rpx 0rpx rgba(0, 0, 0, 0.18);
-    border-radius: 30rpx;
+    border-radius: 36rpx;
     border: 8rpx solid #FFFFFF;
     font-weight: 600;
     font-size: 36rpx;

miniprogram/pages/address/index.less

@@ -202,7 +202,7 @@
     padding: 0 !important;
     background: linear-gradient(90deg, #544F4A 0%, #302F2B 100%);
     box-shadow: 0rpx 14rpx 14rpx 0rpx rgba(0, 0, 0, 0.18);
-    border-radius: 30rpx;
+    border-radius: 36rpx;
     border: 8rpx solid #FFFFFF;
     color: #FEFFCA;
     font-size: 36rpx;

miniprogram/pages/buyerInformation/index.less

@@ -22,7 +22,7 @@
 }
 
 .section {
-  margin: 62rpx 14rpx 24rpx;
+  margin: 50rpx 14rpx 24rpx;
   // background: linear-gradient(180deg, #E3F9FF 0%, #FFFFFF 9%, #FFFFFF 100%);
   background: rgba(255, 255, 255, 0.56);
   border-radius: 12rpx;
@@ -105,7 +105,7 @@
     font-size: 36rpx;
     background: linear-gradient(90deg, #544F4A 0%, #302F2B 100%);
     box-shadow: 0rpx 14rpx 14rpx 0rpx rgba(0, 0, 0, 0.18);
-    border-radius: 40rpx;
+    border-radius: 36rpx;
     border: 8rpx solid #FFFFFF;
     box-sizing: border-box;
   }

miniprogram/pages/index/index.less

@@ -188,7 +188,7 @@
     flex: 1;
     background: linear-gradient(90deg, #544F4A 0%, #302F2B 100%);
     box-shadow: 0rpx 14rpx 14rpx 0rpx rgba(0, 0, 0, 0.18);
-    border-radius: 30rpx;
+    border-radius: 36rpx;
     border: 8rpx solid #FFFFFF;
     // box-sizing: border-box;
 

miniprogram/pages/orders/order-detail.less

@@ -273,8 +273,8 @@ page {
       color: #AAA;
       line-height: 36rpx;
       text {
-        font-weight: bold;
-        padding-left: 6rpx;
+        // font-weight: bold;
+        // padding-left: 6rpx;
       }
     }
   }
@@ -684,7 +684,7 @@ page {
 
     background: linear-gradient(90deg, #544F4A 0%, #302F2B 100%);
     box-shadow: 0rpx 14rpx 14rpx 0rpx rgba(0, 0, 0, 0.18);
-    border-radius: 30rpx;
+    border-radius: 36rpx;
     border: 8rpx solid #FFFFFF;
   }
 }

miniprogram/pages/orders/order-result.less

@@ -292,7 +292,7 @@ page {
     }
 
     .priceZ {
-      font-size: 40rpx;
+      font-size: 36rpx;
       // line-height: 1;
       color: #FE4600;
     }
@@ -317,6 +317,7 @@ page {
   }
 }
 
+
 .addBuyer {
   position: relative;
   margin: 26rpx;
@@ -350,6 +351,7 @@ page {
 
   .addBuyer-left {
     display: flex;
+    width: 100%;
   }
 
   .users {
@@ -359,10 +361,10 @@ page {
     color: #131415;
     line-height: 44rpx;
 
-    width: 540rpx;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
+    // width: 540rpx;
+    // white-space: nowrap;
+    // overflow: hidden;
+    // text-overflow: ellipsis;
   }
 
   .address {
@@ -384,12 +386,14 @@ page {
   }
 
   .selected {
+    width: 100%;
     .users {
       font-weight: 400;
       font-size: 28rpx;
       color: #131415;
       display: block;
-      width: 600rpx;
+      // width: 600rpx;
+      word-wrap: break-word;
     }
 
     .address {
@@ -495,38 +499,6 @@ page {
   }
 }
 
-.goodsInfo-count {
-  display: flex;
-  justify-content: flex-end;
-
-  .goods-price {
-    flex-shrink: 0;
-    font-family: DINAlternate, DINAlternate;
-    font-weight: bold;
-    color: #131415;
-    line-height: 48rpx;
-
-    .before {
-      font-weight: 400;
-      font-size: 24rpx;
-      color: #777777;
-    }
-
-    .stuff {
-      font-size: 38rpx;
-      padding-right: 4rpx;
-    }
-
-    .priceZ {
-      font-size: 40rpx;
-      line-height: 1;
-    }
-
-    .priceF {
-      font-size: 24rpx;
-    }
-  }
-}
 
 /* HTML: <div class="loader"></div> */
 .loader {

miniprogram/pages/orders/order-result.ts

@@ -75,6 +75,7 @@ Page({
         goodsInfos.forEach((item: any) => {
           tempGoods.push({
             ...item,
+            salePrice: formatPrice(item.paymentCashAmount, 'ALL'),
             originalPrice: formatPrice(item.originalPrice, 'ALL'),
             typeName: this.formatPeriod(item.activationCodeInfo?.times || 1, item.activationCodeInfo?.type)
           })

miniprogram/pages/orders/order-result.wxml

@@ -41,13 +41,13 @@
           <view class="goods-desc">
             <view class="goodsInfo">
               <view class="goods-name">{{ item.goodsName }}</view>
-              <block wx:if="{{ item.originalPrice > item.salePrice }}">
-                <view class="goods-price">¥<text>{{item.originalPrice}}</text></view>
-              </block>
+              <view class="goods-price">¥<text>{{item.salePrice}}</text></view>
             </view>
             <view class="goods-type">
               <view class="goods-card">{{ item.typeName }}</view>
-              <view class="goods-num">x1</view>
+              <block wx:if="{{ item.originalPrice > item.salePrice }}">
+                <view class="goods-num">优惠前 ¥<text>{{ item.originalPrice }}</text></view>
+              </block>
             </view>
           </view>
         </view>

miniprogram/pages/orders/orders.less

@@ -30,13 +30,13 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 28rpx 24rpx 16rpx;
+  padding: 28rpx 24rpx 0;
 
   >view {
     font-size: 32rpx;
     font-family: PingFangSC-Regular, PingFang SC;
     color: rgba(0, 0, 0, 0.5);
-    padding: 0 34rpx;
+    padding: 0 34rpx 16rpx;
 
     &.active {
       font-size: 32rpx;
@@ -51,8 +51,8 @@
         position: absolute;
         left: 50%;
         margin-left: -19rpx;
-        bottom: -16rpx;
-        z-index: -1;
+        bottom: 0;
+        z-index: 1;
         width: 34rpx;
         height: 4rpx;
         background: #534E49;

miniprogram/pages/orders/orders.ts

@@ -147,7 +147,7 @@ Page({
       WAIT_PAY: '待付款',
       WAIT_USE: '等待使用',
       PAID: '已完成',
-      CLOSED: '已交易',
+      CLOSED: '已取消',
       REFUNDING: '售后中',
       REFUNDED: '售后成功'
     }

miniprogram/pages/select-goods/index.less

@@ -304,6 +304,7 @@
         font-weight: bold;
         font-size: 24rpx;
         color: #FE4600;
+        margin-left: -4rpx;
       }
     }
 
@@ -400,8 +401,8 @@
             font-weight: 400 !important;
           }
           .showP {
-            font-weight: 600 !important;
-            padding-left: 4rpx;
+            // font-weight: 600 !important;
+            // padding-left: 4rpx;
           }
         }
       }
@@ -420,7 +421,7 @@
     flex: 1;
     background: linear-gradient(90deg, #544F4A 0%, #302F2B 100%);
     box-shadow: 0rpx 14rpx 14rpx 0rpx rgba(0, 0, 0, 0.18);
-    border-radius: 40rpx !important;
+    border-radius: 36rpx !important;
     border: 8rpx solid #FFFFFF;
     font-size: 36rpx;
     box-sizing: border-box;

miniprogram/pages/select-goods/index.wxml

@@ -106,9 +106,9 @@
       <view class="current-good" wx:if="{{!isOverSaled && selected.id}}">
         <view class="current-item-text">您已选中</view>
         <text>{{ formatSelectGood.typeName }}</text>，<block wx:if="{{ formatSelectGood.originalPrice > formatSelectGood.salePrice }}">
-          共减<text class="discountPrice">¥ {{ formatSelectGood.discountPrice }}</text>，
+          共减<text class="discountPrice">¥ {{formatSelectGood.discountPrice}}</text>，
         </block>应付：
-        <text>¥ {{ formatSelectGood.showSalePrice }}</text>
+        <text>¥ {{formatSelectGood.showSalePrice}}</text>
       </view>
       <view class="btnGroup">
         <button type="primary" catch:tap="onSubmit" disabled="{{ isOverSaled }}">