修改样式

miniprogram/pages/address/index.less

@@ -87,13 +87,13 @@
       color: #333333;
       background-color: transparent;
       border-radius: 24rpx;
-      border: 1rpx solid rgba(0, 0, 0, 0.15) !important;
+      border: 0.8px solid rgba(0, 0, 0, 0.15) !important;
     }
 
     .update-btn {
       background: transparent;
       color: #FE2451;
-      border: 1rpx solid #FE2451 !important;
+      border: 0.8px solid #FE2451 !important;
     }
   }
 }
@@ -261,6 +261,10 @@ toolbar-confirm {
 
     .van-field__label {
       color: #666666;
+      font-size: 30rpx !important;
+    }
+    .van-field__control {
+      font-size: 30rpx !important;
     }
     .van-field__control--textarea {
       // padding: 0 !important;

miniprogram/pages/address/index.ts

@@ -254,7 +254,7 @@ Page({
       regionCode: addressInfo.region,
       regionName: addressInfo.regionName,
     }, () => {
-      this.setShowTextarea()
+      // this.setShowTextarea()
       const cityCode: any = this.formateCityCode(true)
       this.setData({
         cityCode

miniprogram/pages/address/index.wxml

@@ -37,7 +37,8 @@
     </view>
 
     <van-popup show="{{ addressShow }}" safe-area-inset-bottom="{{false}}" lock-scroll="{{true}}" bind:close="onCloseAddress" position="bottom" round z-index="101" bind:after-leave="onAddressAfterLeave">
-      <view class="addressContainer" wx:if="{{ !addressAfterLeave }}">
+    <!-- wx:if="{{ !addressAfterLeave }}" -->
+      <view class="addressContainer" >
         <image src="./image/icon-close1.png" class="icon-close" bind:tap="onCloseAddress" />
         <view class="pop-address-title">
           {{ selectAddressId ? '编辑收货地址' : '新建收货地址' }}
@@ -47,7 +48,7 @@
           <van-field model:value="{{ name }}" label="收货人" placeholder="请填写收货人姓名" placeholder-style="color: #bbb" maxlength="50" />
           <van-field model:value="{{ phoneNumber }}" label="电话号码" type="number" placeholder-style="color: #bbb" placeholder="请输入手机号码" maxlength="11" />
           <van-field value="{{ provinceName ? provinceName + '/' + cityName + (regionName ? '/' + regionName : '' )  : '' }}" label="选择地区" placeholder-style="color: #bbb" placeholder="请选择省/市/区" readonly is-link bind:tap="onShowAreaList" />
-          <van-field wx:if="{{ showTextarea }}" model:value="{{ detailAddress }}" label="详细地址" type="textarea" placeholder-style="color: #bbb" placeholder="请填写小区/楼号/单元/门牌号"  autosize maxlength="100" border="{{ false }}" />
+          <van-field wx:if="{{ showTextarea }}" model:value="{{ detailAddress }}" label="详细地址" type="textarea" placeholder-style="color: #bbb" placeholder="请填写小区/楼号/单元/门牌号" autosize maxlength="100" border="{{ false }}" />
         </van-cell-group>
 
         <view class="pop-btn-group">

miniprogram/pages/index/index.less

@@ -746,10 +746,11 @@ page {
 
     .van-field__label {
       color: #666666 !important;
-      line-height: 52rpx;
+      line-height: 48rpx;
     }
     .van-field__body {
       color: #000 !important;
+      font-size: 30rpx !important;
     }
 
     .van-icon-arrow {

miniprogram/pages/index/index.wxml

@@ -212,7 +212,7 @@
             <view class="toolbar-confirm" bind:tap="onSubmitSchool">确认</view>
           </view>
           <view class="select-school">
-            <van-field border="false" value="{{ provinceName ? provinceName + ' ' + cityName + ' ' + regionName : '' }}" bind:tap="onShowAreaList" placeholder="请选择学校地区" is-link readonly />
+            <van-field border="{{ false }}" value="{{ provinceName ? provinceName + ' ' + cityName + ' ' + regionName : '' }}" bind:tap="onShowAreaList" placeholder="请选择学校地区" is-link readonly />
           </view>
           <view class="searchList" wx:if="{{ !showSchoolAfterLeave }}">
             <van-search value="{{ searchName }}" use-left-icon-slot use-action-slot show-action custom-class="searchInput" placeholder="请输入学校名称关键词" bind:search="onSearch" bind:clear="onSearch" bind:change="onSearchChange">

miniprogram/pages/orders/order-detail.less

@@ -496,7 +496,7 @@ page {
     align-items: flex-end;
 
     .desc {
-      font-size: 28rpx;
+      font-size: 24rpx;
       color: #777;
       line-height: 40rpx;
       flex-shrink: 0;

miniprogram/pages/orders/order-result.less

@@ -83,6 +83,7 @@ page {
   .goodsInfo {
     display: flex;
     justify-content: space-between;
+    align-items: flex-end;
     padding-top: 4rpx;
     .goods-name {
       flex: 1 auto;
@@ -91,7 +92,7 @@ page {
       font-weight: 600;
       font-size: 30rpx;
       color: #131415;
-      line-height: 50rpx;
+      line-height: 48rpx;
       text-overflow: ellipsis;
       max-width: 280rpx;
     }
@@ -102,9 +103,9 @@ page {
       font-weight: bold;
       font-size: 28rpx;
       color: #131415;
-      line-height: 46rpx;
-      display: flex;
-      align-items: center;
+      line-height: 48rpx;
+      // display: flex;
+      // align-items: center;
        text {
         font-size: 32rpx;
         padding-left: 4rpx;

miniprogram/pages/orders/orders.less

@@ -26,33 +26,33 @@
   padding: 28rpx 24rpx 16rpx;
 
   >view {
-      font-size: 32rpx;
-      font-family: PingFangSC-Regular, PingFang SC;
-      font-weight: 500;
-      color: rgba(0, 0, 0, 0.4);
-      padding: 0 34rpx;
+    font-size: 32rpx;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 500;
+    color: rgba(0, 0, 0, 0.4);
+    padding: 0 34rpx;
 
-      &.active {
-          font-size: 32rpx;
-          font-family: PingFangSC-Semibold, PingFang SC;
-          font-weight: 600;
-          color: #131415;
-          position: relative;
-          z-index: 2;
-
-          &::before {
-              content: "";
-              position: absolute;
-              left: 50%;
-              margin-left: -24rpx;
-              bottom: -8rpx;
-              z-index: -1;
-              width: 48rpx;
-              height: 8rpx;
-              background: linear-gradient( 90deg, #FF3C3C 0%, rgba(255,118,155,0.5) 100%);
-              border-radius: 72rpx 72rpx 0rpx 0rpx;
-          }
+    &.active {
+      font-size: 32rpx;
+      font-family: PingFangSC-Semibold, PingFang SC;
+      font-weight: 600;
+      color: #131415;
+      position: relative;
+      z-index: 2;
+
+      &::before {
+        content: "";
+        position: absolute;
+        left: 50%;
+        margin-left: -24rpx;
+        bottom: -8rpx;
+        z-index: -1;
+        width: 48rpx;
+        height: 8rpx;
+        background: linear-gradient(90deg, #FF3C3C 0%, rgba(255, 118, 155, 0.5) 100%);
+        border-radius: 72rpx 72rpx 0rpx 0rpx;
       }
+    }
   }
 }
 
@@ -78,12 +78,12 @@
     font-size: 28rpx;
     line-height: 48rpx;
     padding-bottom: 24rpx;
-    
+
     .item-mid {
       color: #131415;
     }
 
-    > text {
+    >text {
       color: #777777;
     }
 
@@ -94,10 +94,11 @@
 
   .item-content {
     display: flex;
+
     &+.item-content {
       padding-top: 40rpx;
     }
-  
+
 
     .goods-icon {
       width: 160rpx;
@@ -118,6 +119,7 @@
       display: flex;
       justify-content: space-between;
       padding-top: 4rpx;
+
       .goods-name {
         flex: 1 auto;
         white-space: nowrap;
@@ -129,7 +131,7 @@
         text-overflow: ellipsis;
         max-width: 280rpx;
       }
-  
+
       .goods-price {
         flex-shrink: 0;
         font-family: DINAlternate, DINAlternate;
@@ -137,7 +139,8 @@
         font-size: 28rpx;
         color: #131415;
         line-height: 48rpx;
-         text {
+
+        text {
           font-size: 32rpx;
           padding-left: 4rpx;
         }
@@ -149,6 +152,7 @@
       justify-content: space-between;
       align-items: center;
       padding-top: 12rpx;
+
       .goods-card {
         background: #FEEDF0;
         border-radius: 6rpx;
@@ -157,6 +161,7 @@
         line-height: 40rpx;
         padding: 0 12rpx;
       }
+
       .goods-num {
         font-size: 26rpx;
         color: #777777;
@@ -173,72 +178,54 @@
     align-items: center;
 
     .order-price {
-      // font-weight: 600;
-      // font-size: 28rpx;
-      // color: #131415;
-      // line-height: 48rpx;
-
-      // .price-first {
-      //   font-weight: bold;
-      //   color: #FE2451;
-      //   font-size: 28rpx;
-      // }
-      // .price {
-      //   font-family: DINAlternate, DINAlternate;
-      //   font-weight: bold;
-      //   font-size: 36rpx;
-      //   color: #FE2451;
-      //   line-height: 48rpx;
-      // }
-      
-        // display: flex;
-        // align-items: flex-end;
-    
-        .desc {
-          font-size: 24rpx;
-          color: #999;
+      display: flex;
+      align-items: flex-end;
+
+      .desc {
+        font-size: 24rpx;
+        color: #999;
+        line-height: 40rpx;
+        flex-shrink: 0;
+        display: inline-block;
+      }
+
+      .currentPrice {
+        font-weight: bold;
+        color: #FE2451;
+        font-family: DINAlternate, DINAlternate;
+
+
+        .stuff {
+          font-size: 28rpx;
+          padding: 0rpx 4rpx 0;
           line-height: 40rpx;
-          flex-shrink: 0;
-          display: inline-block;
-        }
-    
-        .currentPrice {
-          font-weight: bold;
-          color: #FE2451;
-          font-family: DINAlternate, DINAlternate;
-          // display: flex;
-          // align-items: flex-end;
-          display: inline-block;
-          padding-bottom: 2rpx;
-    
-          .stuff {
-            font-size: 28rpx;
-            padding: 0rpx 4rpx 0;
-          }
-    
-          .priceZ {
-            font-size: 40rpx;
-            // line-height: 1;
-          }
-    
-          .priceF {
-            font-size: 32rpx;
-          }
         }
-    
-        .line {
-          margin: 0 12rpx 0rpx;
-          background-color: #D2D2D2;
-          width: 2rpx;
-          height: 20rpx;
-          display: inline-block;
+
+        .priceZ {
+          font-size: 40rpx;
+          line-height: 40rpx;
         }
-    
-        .discountPrice {
-          padding-bottom: 2rpx;
-          font-size: 24rpx;
-          color: #FE2451;
+
+        .priceF {
+          font-size: 32rpx;
+          line-height: 40rpx;
         }
+      }
+
+      .line {
+        margin: 10rpx 12rpx;
+        background-color: #D2D2D2;
+        width: 2rpx;
+        height: 20rpx;
+        display: inline-block;
+      }
+
+      .discountPrice {
+        padding-bottom: 2rpx;
+        font-size: 24rpx;
+        color: #FE2451;
+        line-height: 38rpx;
+      }
     }
 
     button {
@@ -253,6 +240,7 @@
       padding: 14rpx 32rpx;
       line-height: 40rpx;
     }
+
     .sure {
       background: #FE2451;
       border-color: #FE2451;

miniprogram/pages/orders/orders.ts

@@ -198,9 +198,15 @@ Page({
     }
   },
   onOne() {
-    wx.redirectTo({
-      url: '../index/index?currentIndex=1',
-    })
+    const pages = getCurrentPages();
+    const prevPage = pages[pages.length - 2]; // 获取上一个页面实例
+    if (prevPage) {
+      wx.navigateBack()
+    } else {
+      wx.redirectTo({
+        url: '../index/index?currentIndex=1',
+      })
+    }
   },
   onDetail(e: any) {
     const { dataset } = e.currentTarget