修改样式

miniprogram/components/apply-refound/apply-refound.less

@@ -25,10 +25,10 @@
     border-radius: 32rpx 32rpx 0rpx 0rpx;
     .icon-close {
       position: absolute;
-      width: 38rpx;
-      height: 38rpx;
+      width: 30rpx;
+      height: 30rpx;
       top: 40rpx;
-      right: 40rpx;
+      right: 32rpx;
     }
     .use-title {
       font-weight: 600;
@@ -42,11 +42,12 @@
     .use-form {
       background: #F7F8F9;
       border-radius: 20rpx;
-      padding: 22rpx 24rpx 24rpx 30rpx;
       textarea {
-        height: 140rpx;
+        padding: 20rpx 16rpx;
+        height: 180rpx;
         font-size: 30rpx;
         width: 100%;
+        margin: 0;
         &::placeholder {
           color: #AAAAAA;
         }
@@ -70,6 +71,7 @@
         font-size: 30rpx;
         color: #131415;
         padding-bottom: 24rpx;
+        font-weight: bold;
         .red {
           color: #FC1A19;
         }
@@ -97,7 +99,7 @@
         padding: 22rpx 84rpx;
         font-weight: 500;
         font-size: 32rpx;
-        color: #FBEAC9;
+        color: #fff;
         line-height: 44rpx;
       }
     }

miniprogram/components/apply-refound/apply-refound.wxml

@@ -12,7 +12,7 @@
         </view>
       </view>
       <view class="use-form__input">
-        <view class="title"><text class="red">*</text>联系方式 <text class="sencd">(必填)</text></view>
+        <view class="title"><text class="red">*</text>联系方式</view>
         <input placeholder="请输入手机号码" type="number" maxlength="11" bindinput="phoneInput" value="{{ refoundPhone }}"></input>
       </view>
       <view class="btnSection">

miniprogram/components/service/service.less

@@ -38,10 +38,10 @@
     .iconClose {
       position: absolute;
       z-index: 1;
-      top: 34rpx;
-      right: 36rpx;
-      width: 38rpx;
-      height: 38rpx;
+      top: 38rpx;
+      right: 40rpx;
+      width: 30rpx;
+      height: 30rpx;
     }
   }
 }

miniprogram/pages/index/index.less

@@ -107,7 +107,7 @@ page {
   font-size: 32rpx;
   color: #131415;
   line-height: 44rpx;
-  padding: 24rpx 0 16rpx;
+  padding: 24rpx 0 10rpx;
 }
 
 .goodsInfo {
@@ -124,7 +124,12 @@ page {
   .goodsList {
     display: flex;
     align-items: center;
-    flex-wrap: wrap;
+    flex-wrap: nowrap;
+    overflow-x: auto;
+    overflow-y: hidden;
+    &::-webkit-scrollbar {
+      display: none;
+    }
   }
   .goodsItem {
     line-height: 68rpx;
@@ -142,13 +147,16 @@ page {
     &.selected {
       background: #FFEEE6;
       color: #FF5000;
-      border: 2rpx solid #FF5000;
+      border: 3rpx solid #FF5000;
+      border-radius: 12rpx;
     }
 
     &.nosale {
-      // background: #F4F4F5;
+      background: #F6F5F5;
       color: #B3B3B3;
-      opacity: 0.6;
+      .goods-cover, .name {
+        opacity: 0.6;
+      }
     }
     .name {
       padding-left: 8rpx;
@@ -347,7 +355,7 @@ page {
     width: 100%;
     background: #FFFFFF;
     border-radius: 32rpx 32rpx 0rpx 0rpx;
-    padding: 40rpx 32rpx 58rpx;
+    padding: 40rpx 0 58rpx;
     box-sizing: border-box;
 
     .goodsInfo {
@@ -360,6 +368,8 @@ page {
       }
       .goodsList {
         max-height: 500rpx;
+        padding: 0 32rpx;
+        flex-wrap: wrap;
         overflow-x: hidden;
         overflow-y: auto;
         &::-webkit-scrollbar {
@@ -382,14 +392,15 @@ page {
   .iconClose {
     position: absolute;
     right: 32rpx;
-    top: 42rpx;
-    width: 38rpx;
-    height: 38rpx;
+    top: 40rpx;
+    width: 30rpx;
+    height: 30rpx;
   }
 
   .product-section {
     display: flex;
-    padding-bottom: 60rpx;
+    // padding-bottom: 60rpx;
+    padding: 0 32rpx 60rpx;
     .product-img {
       width: 160rpx;
       height: 160rpx;
@@ -448,12 +459,12 @@ page {
     flex-direction: column;
     align-items: flex-start;
     padding-bottom: 90rpx;
-
+    
     .desc {
       font-size: 28rpx;
       color: #131415;
       line-height: 40rpx;
-      padding-bottom: 30rpx;
+      padding: 0 32rpx 30rpx;
     }
   }
 

miniprogram/pages/index/index.wxml

@@ -64,7 +64,7 @@
     </view>
 
     <view class="popup-section" wx:if="{{popupShow}}">
-      <view class="popup-mask"></view>
+      <view class="popup-mask" bind:tap="onClose"></view>
       <view class="popup-container">
         <image bind:tap="onClose" src="./images/icon-close.png" class="iconClose"></image>
 

miniprogram/pages/orders/order-detail.less

@@ -83,7 +83,8 @@ page {
       white-space: nowrap;
       overflow: hidden;
       font-weight: 600;
-      font-size: 28rpx;
+      font-size: 30rpx;
+      color: #131415;
       text-overflow: ellipsis;
       max-width: 310rpx;
     }
@@ -99,7 +100,7 @@ page {
         font-size: 28rpx;
       }
       .priceZ {
-        font-size: 40rpx;
+        font-size: 48rpx;
       }
       .priceF {
         font-size: 32rpx;

miniprogram/pages/orders/order-detail.wxml

@@ -18,7 +18,7 @@
           <view class="goodsInfo">
             <view class="goods-name">{{ goodsInfo.name }}</view>
             <view class="goods-price">
-              <text class="stuff">¥</text>
+              <text class="stuff">¥ </text>
               <text class="priceZ">{{ goodsInfo.integerPart }}</text>
               <text class="priceF">.{{ goodsInfo.decimalPart }}</text>
             </view>
@@ -47,7 +47,7 @@
       <view class="price">
         <view class="desc">支付金额：</view>
         <view class="currentPrice">
-          <text class="stuff">¥</text>
+          <text class="stuff">¥ </text>
           <text class="priceZ">{{ goodsInfo.integerPart }}</text>
           <text class="priceF">.{{ goodsInfo.decimalPart }}</text>
         </view>

miniprogram/pages/orders/order-result.less

@@ -21,7 +21,7 @@ page {
 }
 
 .scroll-container {
-  padding-bottom: 174rpx;
+  padding-bottom: 184rpx;
 }
 
 .order-status {
@@ -50,7 +50,7 @@ page {
     
     text {
       font-weight: 600;
-      font-size: 36rpx;
+      font-size: 48rpx;
       color: #FFFFFF;
       line-height: 48rpx;
     }
@@ -75,8 +75,8 @@ page {
   display: flex;
   width: 100%;
   .goods-icon {
-    width: 160rpx;
-    height: 160rpx;
+    width: 140rpx;
+    height: 140rpx;
     margin-right: 24rpx;
     flex-shrink: 0;
     border-radius: 6px;
@@ -98,10 +98,18 @@ page {
       white-space: nowrap;
       overflow: hidden;
       font-weight: 600;
-      font-size: 28rpx;
+      font-size: 30rpx;
       text-overflow: ellipsis;
       max-width: 310rpx;
     }
+    // .goods-price {
+    //   flex-shrink: 0;
+    //   font-family: DINAlternate, DINAlternate;
+    //   font-weight: bold;
+    //   font-size: 28rpx;
+    //   color: #131415;
+    //   line-height: 48rpx;
+    // }
     .goods-price {
       flex-shrink: 0;
       font-family: DINAlternate, DINAlternate;
@@ -109,6 +117,16 @@ page {
       font-size: 28rpx;
       color: #131415;
       line-height: 48rpx;
+
+      .stuff {
+        font-size: 28rpx;
+      }
+      .priceZ {
+        font-size: 48rpx;
+      }
+      .priceF {
+        font-size: 32rpx;
+      }
     }
   }
 
@@ -223,15 +241,16 @@ page {
 .order-time {
   margin: 24rpx 26rpx 0;
   border-radius: 20rpx;
-  padding: 36rpx 24rpx;
+  padding: 0 24rpx;
   background-color: #FFFFFF;
 
   .order-item {
     display: flex;
     justify-content: space-between;
-    padding-bottom: 36rpx;
+    padding: 36rpx 0;
+    border-bottom: 2rpx solid #F0F0F0;
     &:last-child {
-      padding-bottom: 0;
+      border-bottom: none;
     }
     .title {
       font-weight: 500;
@@ -267,7 +286,7 @@ page {
   left: 0;
   width: 100%;
   background-color: #FFFFFF;
-  padding: 20rpx 32rpx 58rpx 40rpx;
+  padding: 20rpx 32rpx 58rpx;
   display: flex;
   justify-content: space-between;
   box-sizing: border-box;

miniprogram/pages/orders/order-result.ts

@@ -73,8 +73,12 @@ Page({
         const goodsInfos = result.goodsInfos || []
         const tempGoods: any = []
         goodsInfos.forEach((item: any) => {
+          const prices: any = this.formatPrice(item.paymentCashAmount)
+        
           tempGoods.push({
             ...item,
+            integerPart: prices.integerPart,
+            decimalPart: prices.decimalPart,
             shortUrl: item.activationCodeInfo.shortUrl,
             originalPrice: this.formatPrice(item.paymentCashAmount, 'ALL'),
             typeName: this.formatPeriod(item.activationCodeInfo?.times || 1, item.activationCodeInfo.type)

miniprogram/pages/orders/order-result.wxml

@@ -19,7 +19,12 @@
           <view class="goods-desc">
             <view class="goodsInfo">
               <view class="goods-name">{{ item.goodsName }}</view>
-              <view class="goods-price">¥ {{ item.originalPrice }}</view>
+              <view class="goods-price">
+                <text class="stuff">¥ </text>
+                <text class="priceZ">{{ item.integerPart }}</text>
+                <text class="priceF">.{{ item.decimalPart }}</text>
+              </view>
+              <!-- <view class="goods-price">¥ {{ item.originalPrice }}</view> -->
             </view>
             <view class="goods-type">
               <view class="goods-card">{{ item.typeName }}</view>

miniprogram/pages/orders/orders.less

@@ -104,8 +104,8 @@ page {
     display: flex;
 
     .goods-icon {
-      width: 160rpx;
-      height: 160rpx;
+      width: 140rpx;
+      height: 140rpx;
       margin-right: 24rpx;
       flex-shrink: 0;
       border-radius: 6px;
@@ -127,7 +127,7 @@ page {
         white-space: nowrap;
         overflow: hidden;
         font-weight: 600;
-        font-size: 28rpx;
+        font-size: 30rpx;
         text-overflow: ellipsis;
         max-width: 310rpx;
       }
@@ -138,6 +138,16 @@ page {
         font-size: 28rpx;
         color: #131415;
         line-height: 48rpx;
+  
+        .stuff {
+          font-size: 28rpx;
+        }
+        .priceZ {
+          font-size: 48rpx;
+        }
+        .priceF {
+          font-size: 32rpx;
+        }
       }
     }
 
@@ -217,13 +227,13 @@ page {
   color: #999999;
 
   image {
-    width: 436rpx;
-    height: 364rpx;
+    width: 410rpx;
+    height: 348rpx;
   }
 
   .empty-text {
     font-size: 28rpx;
-    color: #777777;
+    color: #aaa;
     line-height: 40rpx;
     text-align: center;
     padding-top: 24rpx;

miniprogram/pages/orders/orders.wxml

@@ -14,7 +14,7 @@
           <view class="list-item" wx:for="{{recordList}}" wx:key="index" data-orderno="{{item.orderNo}}" data-wechatstatus="{{item.wechatStatus}}" bind:tap="onDetail">
             <view class="item-top">
               <view class="item-mid">订单编号：{{ item.orderNo }}</view>
-              <text class="{{ item.wechatStatus == 'WAIT_PAY' || item.wechatStatus == 'WAIT_USE' ? 'red' : '' }}">{{ item.statusName }}</text>
+              <text class="{{ item.wechatStatus == 'WAIT_PAY' || item.wechatStatus == 'WAIT_USE' || item.wechatStatus == 'REFUNDING' ? 'red' : '' }}">{{ item.statusName }}</text>
             </view>
             <view class="item-content" wx:for="{{item.studentPaymentOrderDetails}}" wx:key="studentIndex">
               <image class='goods-icon' src="{{item.goodsUrl}}" mode="" />
@@ -24,7 +24,12 @@
                     <text class="{{ outerItem.wechatStatus == 'WAIT_PAY' || outerItem.wechatStatus == 'WAIT_USE' ? 'red' : '' }}">{{ outerItem.statusName }}</text>
                     {{item.goodsName}}
                   </view>
-                  <view class="goods-price">¥ {{(item.originalPrice)}}</view>
+                  <view class="goods-price">
+                    <text class="stuff">¥ </text>
+                    <text class="priceZ">{{ item.integerPart }}</text>
+                    <text class="priceF">.{{ item.decimalPart }}</text>
+                  </view>
+                  <!-- <view class="goods-price">¥ {{(item.originalPrice)}}</view> -->
                 </view>
                 <view class="goods-type">
                   <view class="goods-card" wx:if="{{ item.typeName }}">{{item.typeName}}</view>
@@ -50,7 +55,7 @@
       </block>
       <block wx:else>
         <view class="empty-box">
-          <image src="https://oss.dayaedu.com/ktyq/1731839238916.png"></image>
+          <image src="https://oss.dayaedu.com/ktyq/1732697111162.png"></image>
           <view class="empty-text">暂无订单</view>
         </view>
       </block>