样式修改

miniprogram/app.less

@@ -2,8 +2,12 @@
 .container {
   height: 100%;
 }
+button::after {
+  border: none;
+}
 
 page {
+  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
   --overlay-background-color: rgba(0, 0, 0, 0.6);
   --search-background-color: #f4f4f4;
   --picker-cancel-action-color: #777777;

miniprogram/pages/address/addAddress.less

@@ -29,6 +29,7 @@
 
     .fromBox {
       margin-top: 30rpx;
+      height: 736rpx;
 
       .fromCon {
         display: flex;
@@ -51,6 +52,7 @@
           margin-left: 20rpx;
           flex-grow: 1;
           .index--van-cell{
+            padding-left: 0;
             padding-right: 0;
           }
           .index--van-cell__right-icon-wrap {

miniprogram/pages/address/addAddress.wxml

@@ -2,7 +2,7 @@
   <view class="popup-mask" bind:tap="onDialogClose"></view>
   <view class="popup-container">
     <view class="closeBtn" bind:tap="onDialogClose"></view>
-    <view class="tit">{{ editId?"编辑收货信息":"添加收货地址" }}</view>
+    <view class="tit">{{ editId?"编辑收货信息":"添加收货信息" }}</view>
     <view class="fromBox">
       <view class="fromCon">
         <text class="fromTit">收货人</text>

miniprogram/pages/index/index.less

@@ -331,6 +331,10 @@ page {
           .infoCon {
             display: flex;
             align-items: center;
+            font-weight: 600;
+            font-size: 28rpx;
+            color: #131415;
+            line-height: 40rpx;
 
             .name {
               white-space: nowrap;
@@ -382,7 +386,7 @@ page {
     .goodsInfo {
       margin-top: 48rpx;
       padding: 0 26rpx;
-      max-height: 578rpx;
+      height: 394rpx;
       overflow-x: hidden;
       overflow-y: auto;
 
@@ -475,8 +479,7 @@ page {
     .memberListCon {
       margin-top: 40rpx;
       overflow: hidden;
-      max-height: 500rpx;
-      min-height: 400rpx;
+      height: 790rpx;
 
       .memberInfo {
         display: flex;

miniprogram/pages/member/addMember.less

@@ -38,6 +38,7 @@
       align-items: center;
 
       .labelLeft {
+        margin-top: 12rpx;
         display: flex;
         flex-direction: column;
 
@@ -105,6 +106,7 @@
           flex-grow: 1;
           .index--van-cell{
             padding-right: 0;
+            padding-left: 0;
           }
           .index--van-cell__right-icon-wrap {
             margin-right: -6rpx !important;
@@ -132,6 +134,7 @@
         .genderIpt {
           padding: 10rpx 0;
           display: flex;
+          align-items: center;
 
           .gender {
             padding: 10rpx 0;

miniprogram/pages/orders/order-detail.less

@@ -105,7 +105,7 @@
   position: relative;
 
   .instrumentsListCon {
-    width: calc(100% + 50rpx);
+    width: calc(100% + 24rpx);
     height: 100%;
     position: absolute;
     white-space: nowrap;
@@ -199,7 +199,11 @@
   margin-top: 16rpx;
   background: linear-gradient(315deg, #FFEEE9 0%, #FFF6EC 100%);
   border-radius: 20rpx;
-  border: 3rpx solid #FD4502;
+  border: 3rpx solid rgba(255,170,157,0.56);
+
+  &.showAddressInfoTip {
+    border-color: #FD4502;
+  }
 
   .memberCon {
     padding: 24rpx;
@@ -333,8 +337,8 @@
     }
 
     .stuff {
-      line-height: 40rpx;
       margin-right: 4rpx;
+      line-height: 48rpx;
     }
 
     .numberDisplay--integer {
@@ -432,8 +436,7 @@
 
     .memberListCon {
       overflow: hidden;
-      max-height: 500rpx;
-      min-height: 400rpx;
+      height: 790rpx;
 
       .memberListInfo {
         background: #F6F6F6;
@@ -515,18 +518,19 @@
           }
         }
       }
+
       .empty-box {
         height: 400rpx;
         display: flex;
         flex-direction: column;
         justify-content: center;
         align-items: center;
-      
+
         image {
           width: 375rpx;
           height: 250rpx;
         }
-      
+
         .empty-text {
           font-weight: 400;
           font-size: 28rpx;
@@ -612,10 +616,14 @@
       font-weight: bold;
       font-size: 24rpx;
       color: #131415;
+      display: flex;
+      align-items: flex-end;
+      justify-content: flex-end;
 
       .stuff {
         margin-right: 6rpx;
         font-size: 24rpx;
+        line-height: 34rpx;
       }
 
       .numberDisplay--integer {
@@ -729,17 +737,16 @@
     font-weight: bold;
     font-size: 32rpx;
     color: #FE462E;
-    line-height: 56rpx;
 
     .goodsNum {
       margin-right: 10rpx;
-      font-weight: 600;
+      font-weight: 400;
       font-size: 24rpx;
       color: #777777;
     }
 
     .desc {
-      font-weight: 600;
+      font-weight: 400;
       font-size: 24rpx;
       color: #777777;
     }
@@ -797,9 +804,9 @@
 
     .tit {
       font-weight: 600;
-      font-size: 32rpx;
+      font-size: 36rpx;
       color: #000000;
-      line-height: 44rpx;
+      line-height: 50rpx;
       text-align: center;
     }
 
@@ -830,6 +837,7 @@
           margin-left: 32rpx;
           background: url("https://oss.dayaedu.com/ktyq/1739864864169.png") no-repeat;
           background-size: 100% 100%;
+          font-weight: 500;
           color: #fff;
           border-color: transparent;
         }

miniprogram/pages/orders/order-detail.wxml

@@ -1,5 +1,5 @@
 <!--pages/orders/order-detail.wxml-->
-<page-meta page-style="{{ popupShow ? 'overflow: hidden;' : '' }}" style="height: 100vh;">
+<page-meta page-style="{{ (addressPopupShow||popupShow) ? 'overflow: hidden;' : '' }}" style="height: 100vh;">
   <view class="container">
     <navigation-bar title="确认订单"></navigation-bar>
 
@@ -25,7 +25,8 @@
             </view>
             <view class="goods-type">
               <view class="goods-card">{{ "时长: "+goodsInfo.typeName }}</view>
-              <view class="goods-num">原价¥{{ my.formatValue(goodsInfo.originalPrice) }}</view>
+              <view wx:if="{{ (goodsInfo.originalPrice-goodsInfo.salePrice)>0 }}" class="goods-num">原价¥{{ my.formatValue(goodsInfo.originalPrice) }}</view>
+              <view wx:else></view>
             </view>
           </view>
         </view>
@@ -47,15 +48,15 @@
                 <text class="stuff">¥</text>
                 <numberDisplay number="{{ item.salePrice }}" />
               </view>
-              <view class="itemOriginalPrice">原价¥{{ my.formatValue(item.originalPrice) }}</view>
+              <view wx:if="{{(item.originalPrice-item.salePrice)>0}}" class="itemOriginalPrice">原价¥{{ my.formatValue(item.originalPrice) }}</view>
             </view>
           </view>
         </view>
-        <view wx:if="{{ instrumentsInfo.id }}" class="memberBox">
+        <view wx:if="{{ instrumentsInfo.id }}" class="memberBox {{isAddressInfoTip?'showAddressInfoTip':''}}">
           <view wx:if="{{ !addressInfo.id }}" class="memberCon" bind:tap="onAddressInfo">
             <image class="memberImg" src="./images/address.png"></image>
             <view class="infoBox">
-              <text class="topInfo">添加收货地址</text>
+              <text class="topInfo">添加收货信息</text>
               <text class="info">在此填写您的收货信息，我们将尽快为您发货</text>
             </view>
             <image class="chevronImg" src="../index/images/chevron.png"></image>
@@ -132,7 +133,7 @@
     <view class="popup-section addressPopup" wx:if="{{addressPopupShow}}">
       <view class="popup-mask" bind:tap="onCloseAddress"></view>
       <view class="popup-container">
-        <view class="topTit">收货地址</view>
+        <view class="topTit">收货信息</view>
         <image bind:tap="onCloseAddress" src="../index/images/icon-close.png" class="iconClose"></image>
         <scroll-view scroll-y class="memberListCon">
           <block wx:if="{{ addressList.length }}">
@@ -169,7 +170,7 @@
       <view class="popup-mask" bind:tap="onDialogClose"></view>
       <view class="popup-container">
         <view class="tit">温馨提示</view>
-        <view class="titCon">是否要删除该收货地址？</view>
+        <view class="titCon">是否要删除该收货信息？</view>
         <view class="btnCon">
           <view bind:tap="onDialogClose">取消</view>
           <view bind:tap="onDialogOk">确认</view>

miniprogram/pages/orders/order-result.less

@@ -75,7 +75,7 @@
 .order-content {
   margin: 20rpx 26rpx 0;
   border-radius: 20rpx;
-  padding: 24rpx 24rpx 32rpx;
+  padding: 24rpx;
   display: flex;
   flex-direction: column;
   background-color: #FFFFFF;
@@ -97,18 +97,20 @@
   line-height: 40rpx;
   margin-bottom: 32rpx;
   position: relative;
-  &.priceTip{
+
+  &.priceTip {
     margin-bottom: 0;
   }
 }
 
 .item-content {
-  margin-top: 40rpx;
   display: flex;
   width: 100%;
 
-  &.first-item-content {
-    margin-top: 0;
+  &.last-item-content {
+    margin-top: 24rpx;
+    border-top: 2rpx solid #F2F2F2;
+    padding-top: 24rpx;
   }
 
   .goods-icon {
@@ -237,6 +239,7 @@
     }
 
     .stuff {
+      line-height: 48rpx;
       margin-right: 4rpx;
     }
 
@@ -260,6 +263,11 @@
     margin-bottom: 0;
   }
 
+  &.orderNoCode {
+    padding-top: 32rpx;
+    border-top: 2rpx solid #F2F2F2;
+  }
+
   .orderInfoRight {
     display: flex;
     align-items: center;
@@ -269,12 +277,23 @@
     line-height: 40rpx;
 
     .copy {
-      border-left: 2rpx solid #D2D2D2;
       margin-left: 12rpx;
       padding-left: 12rpx;
       font-weight: 400;
       font-size: 28rpx;
       line-height: 40rpx;
+      position: relative;
+
+      &::after {
+        content: "";
+        position: absolute;
+        left: -2rpx;
+        top: 50%;
+        transform: translateY(-50%);
+        width: 2rpx;
+        height: 24rpx;
+        background: #D2D2D2;
+      }
     }
   }
 
@@ -363,26 +382,27 @@
   .more {
     display: flex;
   }
+
   .priceCon {
     margin-right: 32rpx;
   }
+
   .price {
     display: flex;
     align-items: flex-end;
     font-weight: bold;
     font-size: 32rpx;
     color: #FE462E;
-    line-height: 56rpx;
 
     .goodsNum {
+      font-weight: 400;
       margin-right: 10rpx;
-      font-weight: 600;
       font-size: 24rpx;
       color: #777777;
     }
 
     .desc {
-      font-weight: 600;
+      font-weight: 400;
       font-size: 24rpx;
       color: #777777;
     }

miniprogram/pages/orders/order-result.wxml

@@ -14,7 +14,7 @@
     </view> -->
 
     <view class="order-content">
-      <view class="item-content first-item-content">
+      <view class="item-content">
         <image class='goods-icon' src="{{ goodsInfo.pic }}" mode="" />
         <view class="goods-desc">
           <view class="goodsInfo">
@@ -26,11 +26,12 @@
           </view>
           <view class="goods-type">
             <view class="goods-card">{{ goodsInfo.typeName }}</view>
-            <view class="goods-num">{{ "原价¥"+my.formatValue(goodsInfo.originalPrice) }}</view>
+            <view wx:if="{{(goodsInfo.originalPrice-goodsInfo.salePrice)>0}}" class="goods-num">{{ "原价¥"+my.formatValue(goodsInfo.originalPrice) }}</view>
+            <view wx:else></view>
           </view>
         </view>
       </view>
-      <view wx:if="{{ instrumentsInfo.id }}" class="item-content">
+      <view wx:if="{{ instrumentsInfo.id }}" class="item-content last-item-content">
         <image class='goods-icon' src="{{ instrumentsInfo.pic }}" mode="" />
         <view class="goods-desc">
           <view class="goodsInfo">
@@ -42,7 +43,8 @@
           </view>
           <view class="goods-type">
             <view class="goods-card"></view>
-            <view class="goods-num">{{ "原价¥"+my.formatValue(instrumentsInfo.originalPrice) }}</view>
+            <view wx:if="{{(instrumentsInfo.originalPrice-instrumentsInfo.salePrice)>0}}" class="goods-num">{{ "原价¥"+my.formatValue(instrumentsInfo.originalPrice) }}</view>
+            <view wx:else></view>
           </view>
         </view>
       </view>
@@ -107,7 +109,7 @@
         <text>学校信息</text>
         <text>{{ memberInfo.schoolInfo }}</text>
       </view>
-      <view class="memberInfo">
+      <view class="memberInfo orderNoCode">
         <text>订单编号</text>
         <view class="orderInfoRight">
           <text>{{ orderInfo.orderNo }}</text>

miniprogram/pages/orders/orders.less

@@ -260,9 +260,6 @@
       font-size: 24rpx;
       color: #FE462E;
       line-height: 54rpx;
-      &::after {
-        border: none;
-      }
     }
 
     .lookDetails {