样式修改

miniprogram/pages/address/addAddress.less

@@ -1,4 +1,4 @@
-.popup-section {
+.addAddress-popup-section {
   .popup-mask {
     position: fixed;
     top: 0;
@@ -75,8 +75,8 @@
       right: 26rpx;
       top: 30rpx;
       position: absolute;
-      width: 80rpx;
-      height: 80rpx;
+      width: 64rpx;
+      height: 64rpx;
       background: url("https://oss.dayaedu.com/ktyq/1739246513167.png") no-repeat;
       background-size: 52rpx 52rpx;
       background-position: center center;

miniprogram/pages/address/addAddress.ts

@@ -1,5 +1,8 @@
 import { api_sysAreaQueryAllProvince, api_userReceiveAddressUpdate, api_userReceiveAddressSave, api_userReceiveAddressDetail } from "../../api/login";
 Component({
+  options: {
+    styleIsolation: 'shared'
+  },
   properties: {
     popupShow: {
       type: Boolean,
@@ -201,7 +204,7 @@ Component({
           mask: true,
           title: "",
         });
-         // 转换CityCode
+        // 转换CityCode
         const citycode = this.formateCityCode()
         // 编辑
         let id

miniprogram/pages/address/addAddress.wxml

@@ -1,4 +1,4 @@
-<view class="popup-section" wx:if="{{popupShow}}">
+<view class="addAddress-popup-section" wx:if="{{popupShow}}">
   <view class="popup-mask" bind:tap="onDialogClose"></view>
   <view class="popup-container">
     <view class="closeBtn" bind:tap="onDialogClose"></view>

miniprogram/pages/address/addressList.less

@@ -54,12 +54,18 @@
         line-height: 40rpx;
 
         .tip {
+          flex-shrink: 0;
           width: 44rpx;
           height: 44rpx;
         }
-
-        .name,
+        .name{
+          margin-left: 16rpx;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
         .phone {
+          flex-shrink: 0;
           margin-left: 16rpx;
         }
       }
@@ -70,12 +76,12 @@
         .schoolInfo {
           margin-right: 8rpx;
           border-radius: 4rpx;
-          border: 1rpx solid rgba(243, 131, 9, 0.5);
+          border: 1.6rpx solid rgba(243, 131, 9, 0.5);
           padding: 2rpx 6rpx;
           font-weight: 400;
           font-size: 20rpx;
           color: #F38309;
-          line-height: 30rpx;
+          line-height: 32rpx;
         }
 
         .schoolInfoDes {
@@ -214,6 +220,7 @@
             margin-left: 32rpx;
             background: #000000;
             color: #fff;
+            border-color: transparent;
           }
         }
       }

miniprogram/pages/index/index.less

@@ -179,14 +179,14 @@ page {
     width: 100%;
     background: #FFFFFF;
     border-radius: 32rpx 32rpx 0rpx 0rpx;
-    padding: 40rpx 0 58rpx;
+    padding: 40rpx 0 56rpx;
     box-sizing: border-box;
     .iconClose {
       position: absolute;
       right: 40rpx;
       top: 40rpx;
-      width: 40rpx;
-      height: 40rpx;
+      width: 32rpx;
+      height: 32rpx;
     }
     .product-section {
       display: flex;
@@ -304,11 +304,18 @@ page {
           color: #131415;
           line-height: 40rpx;
           .tip {
+            flex-shrink: 0;
             width: 44rpx;
             height: 44rpx;
           }
-          .name,
+          .name{
+            margin-left: 16rpx;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
           .phone {
+            flex-shrink: 0;
             margin-left: 16rpx;
           }
         }
@@ -319,12 +326,12 @@ page {
           .schoolInfo{
             margin-right: 8rpx;
             border-radius: 4rpx;
-            border: 1rpx solid rgba(15,179,96,0.5);
+            border: 1.6rpx solid rgba(15,179,96,0.5);
             padding: 2rpx 6rpx;
             font-weight: 400;
             font-size: 20rpx;
             color: #0FB360;
-            line-height: 30rpx;
+            line-height: 32rpx;
             flex-shrink: 0;
           }
           .schoolInfoDes{
@@ -341,7 +348,7 @@ page {
       }
     }
     .btnSections {
-      margin-top: 128rpx;
+      margin-top: 20rpx;
       padding: 0 40rpx;
       button {
         width: 100%;
@@ -362,7 +369,7 @@ page {
     }
     .goodsInfo {
       padding: 0 40rpx;
-      max-height: 478rpx;
+      max-height: 578rpx;
       overflow-x: hidden;
       overflow-y: auto;
       &::-webkit-scrollbar {
@@ -384,6 +391,11 @@ page {
       .goodsList {
         display: flex;
         flex-wrap: wrap;
+        &.instrumentsList{
+          .goodsItem{
+            padding: 10rpx 24rpx;
+          }
+        }
         .goodsItem {
           margin-right: 24rpx;
           margin-top: 24rpx;
@@ -395,7 +407,7 @@ page {
           color: #444444;
           line-height: 40rpx;
           position: relative;
-          border:2rpx solid transparent;
+          border:2.4rpx solid transparent;
           &.instrumentsGoodsItem{
             display: flex;
             align-items: center;

miniprogram/pages/index/index.ts

@@ -12,10 +12,10 @@ Page({
    */
   data: {
     goodsImgList: [
-      "https://oss.dayaedu.com/ktyq/1738911119867.png",
-      "https://oss.dayaedu.com/ktyq/1738911247330.png",
-      "https://oss.dayaedu.com/ktyq/1738911265298.png",
-      "https://oss.dayaedu.com/ktyq/1738911576725.png"
+      "https://oss.dayaedu.com/ktyq/1739445414362.png",
+      "https://oss.dayaedu.com/ktyq/1739445449067.png",
+      "https://oss.dayaedu.com/ktyq/1739445464592.png",
+      "https://oss.dayaedu.com/ktyq/1739445477533.png"
     ],
     serviceShow: true,
     popupShow: false,

miniprogram/pages/index/index.wxml

@@ -78,7 +78,7 @@
             </view>
           </view>
           <view wx:if="{{ instrumentsList.length > 0 }}" class="desc">乐器套装</view>
-          <view wx:if="{{ instrumentsList.length > 0 }}" class="goodsList">
+          <view wx:if="{{ instrumentsList.length > 0 }}" class="goodsList instrumentsList">
             <view wx:for="{{ instrumentsList }}" wx:key="index" class="goodsItem instrumentsGoodsItem {{ item.id == selectedInstruments.id ? 'selected' : '' }}" bind:tap="onSelectInstrumentsGoods" data-index="{{ index }}">
               <text class="name">{{ item.name }}</text>
               <view></view>

miniprogram/pages/login/login.less

@@ -26,8 +26,8 @@
   }
   .appname {
     margin-top: 24rpx;
-    width: 248rpx;
-    height: 43rpx;
+    width: 256rpx;
+    height: 62rpx;
   }
 }
 
@@ -46,7 +46,7 @@
     border-radius: 78rpx;
     &[disabled][type=primary] {
       color: #fff;
-      opacity: 0.7;
+      opacity: 0.4;
     }
   }
 

miniprogram/pages/login/login.wxml

@@ -4,7 +4,7 @@
   <navigation-bar title="" ></navigation-bar>
   <view class="appInfo">
     <image class="appImg" src="https://oss.dayaedu.com/ktyq/1738896831535.png"></image>
-    <image class="appname" src="https://oss.dayaedu.com/ktyq/1738896882332.png"></image>
+    <image class="appname" src="https://oss.dayaedu.com/ktyq/1739445615235.png"></image>
   </view>
   <view class="login-section">
     <view class="btnSection">

miniprogram/pages/member/addMember.ts

@@ -207,12 +207,15 @@ Page({
       tempChangeSchoolAreaId: '',
       schoolAreaId: '',
       schoolAreaName: '',
+      schoolAreaIndex: 0,
 
       gradeId: "",
       gradeName: "",
+      gradeIndex: 0,
 
       classId: "",
-      className: ""
+      className: "",
+      classIndex: 0
     }, () => {
       this.getSchools()
     })
@@ -326,9 +329,11 @@ Page({
 
       gradeId: "",
       gradeName: "",
+      gradeIndex: 0,
 
       classId: "",
-      className: ""
+      className: "",
+      classIndex: 0,
     }, () => {
       this.getSchoolAreaDetail()
     })
@@ -503,8 +508,10 @@ Page({
       gradeName: selectedOptions[0].text,
       showGrade: false,
       gradeIndex,
+      
       classId: "",
-      className: ""
+      className: "",
+      classIndex: 0,
     })
     this.setData({
       classList: [{

miniprogram/pages/member/memberList.less

@@ -56,10 +56,16 @@
         .tip {
           width: 44rpx;
           height: 44rpx;
+          flex-shrink: 0;
+        }
+        .name{
+          margin-left: 16rpx;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
         }
-
-        .name,
         .phone {
+          flex-shrink: 0;
           margin-left: 16rpx;
         }
       }
@@ -70,12 +76,12 @@
         .schoolInfo {
           margin-right: 8rpx;
           border-radius: 4rpx;
-          border: 1rpx solid rgba(15, 179, 96, 0.5);
+          border: 1.6rpx solid rgba(15, 179, 96, 0.5);
           padding: 2rpx 6rpx;
           font-weight: 400;
           font-size: 20rpx;
           color: #0FB360;
-          line-height: 30rpx;
+          line-height: 32rpx;
         }
 
         .schoolInfoDes {
@@ -215,6 +221,7 @@
             margin-left: 32rpx;
             background: #000000;
             color: #fff;
+            border-color: transparent;
           }
         }
       }

miniprogram/pages/orders/order-detail.less

@@ -59,7 +59,7 @@
 }
 
 .memberBox {
-  margin: 0 20rpx;
+  margin: 0 24rpx;
   background: #ffffff;
   border-radius: 20rpx;
   border: 3rpx solid transparent;
@@ -105,14 +105,19 @@
       font-size: 28rpx;
       color: #131415;
       line-height: 40rpx;
-
       .tip {
+        flex-shrink: 0;
         width: 44rpx;
         height: 44rpx;
       }
-
-      .name,
+      .name{
+        margin-left: 16rpx;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
       .phone {
+        flex-shrink: 0;
         margin-left: 16rpx;
       }
     }
@@ -125,12 +130,12 @@
       .schoolInfo {
         margin-right: 8rpx;
         border-radius: 4rpx;
-        border: 1rpx solid rgba(243, 131, 9, 0.5);
-        padding: 2rpx 6rpx;
+        border: 1.6rpx solid rgba(243, 131, 9, 0.5);
+        padding: 0rpx 6rpx;
         font-weight: 400;
         font-size: 20rpx;
         color: #F38309;
-        line-height: 30rpx;
+        line-height: 32rpx;
         flex-shrink: 0;
       }
 
@@ -233,8 +238,10 @@
       font-size: 28rpx;
       color: #131415;
       line-height: 48rpx;
+      display: flex;
 
       .stuff {
+        margin-right: 6rpx;
         font-size: 28rpx;
       }
 
@@ -296,9 +303,11 @@
     font-size: 32rpx;
     color: #FD4502;
     line-height: 48rpx;
+    display: flex;
 
     text {
       &:first-child {
+        margin-right: 6rpx;
         font-size: 28rpx;
       }
     }
@@ -315,12 +324,12 @@
   font-weight: bold;
   font-size: 32rpx;
   color: #000000;
+  line-height: 56rpx;
 
   .titPic {
     font-weight: 600;
     font-size: 24rpx;
     color: #777777;
-    line-height: 34rpx;
   }
 
   .stuff {
@@ -329,7 +338,7 @@
   }
 
   .numberDisplay--integer {
-    line-height: 56rpx;
+    line-height: 1;
     font-size: 48rpx;
   }
 
@@ -342,6 +351,9 @@
   display: flex;
   justify-content: space-between;
   margin-bottom: 32rpx;
+  &:last-child{
+    margin-bottom: 0;
+  }
 
   text {
     &:nth-child(1) {
@@ -435,13 +447,12 @@
     font-weight: bold;
     font-size: 32rpx;
     color: #000000;
-    line-height: 38rpx;
+    line-height: 56rpx;
 
     .desc {
       font-weight: 600;
       font-size: 24rpx;
       color: #777777;
-      line-height: 34rpx;
     }
 
     .stuff {
@@ -449,7 +460,7 @@
     }
 
     .numberDisplay--integer {
-      line-height: 56rpx;
+      line-height: 1;
       font-size: 48rpx;
     }
 
@@ -459,7 +470,6 @@
   }
 
   .discountVal {
-    margin-top: 4rpx;
     font-weight: 600;
     font-size: 24rpx;
     color: #FD4502;

miniprogram/pages/orders/order-detail.wxml

@@ -41,7 +41,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">{{ my.formatValue(goodsInfo.originalPrice) }}</text>
               </view>
             </view>
@@ -57,7 +57,7 @@
             <view class="goodsInfo">
               <view class="goods-name">{{ instrumentsInfo.name }}</view>
               <view class="goods-price">
-                <text class="stuff">¥ </text>
+                <text class="stuff">¥</text>
                 <text class="priceZ">{{ my.formatValue(instrumentsInfo.originalPrice) }}</text>
               </view>
             </view>
@@ -73,7 +73,7 @@
             <text>优惠活动</text>
           </view>
           <view class="discount">
-            <text>-¥ </text>
+            <text>-¥</text>
             <text>{{my.formatValue(goodsInfo.originalPrice + (instrumentsInfo.originalPrice || 0) - (goodsInfo.salePrice + (instrumentsInfo.salePrice || 0)))}}</text>
           </view>
         </view>

miniprogram/pages/orders/order-result.less

@@ -63,7 +63,7 @@
 }
 
 .memberBox {
-  margin: 0 20rpx;
+  margin: 0 24rpx;
   background: #ffffff;
   border-radius: 20rpx;
   border: 3rpx solid transparent;
@@ -111,30 +111,34 @@
       line-height: 40rpx;
 
       .tip {
+        flex-shrink: 0;
         width: 44rpx;
         height: 44rpx;
       }
-
-      .name,
+      .name{
+        margin-left: 16rpx;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
       .phone {
+        flex-shrink: 0;
         margin-left: 16rpx;
       }
     }
 
     .schoolInfoCon {
       margin-top: 20rpx;
-      display: flex;
-      align-items: center;
 
       .schoolInfo {
         margin-right: 8rpx;
         border-radius: 4rpx;
-        border: 1rpx solid rgba(243, 131, 9, 0.5);
+        border: 1.6rpx solid rgba(243, 131, 9, 0.5);
         padding: 2rpx 6rpx;
         font-weight: 400;
         font-size: 20rpx;
         color: #F38309;
-        line-height: 30rpx;
+        line-height: 32rpx;
         flex-shrink: 0;
       }
 
@@ -144,9 +148,6 @@
         font-size: 24rpx;
         color: #777777;
         line-height: 32rpx;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
       }
     }
   }
@@ -164,6 +165,10 @@
     margin-top: 0;
   }
 }
+.bottomBlock{
+  width: 100%;
+  height: 60rpx;
+}
 
 .titTip {
   font-weight: 600;
@@ -237,8 +242,10 @@
       font-size: 28rpx;
       color: #131415;
       line-height: 48rpx;
+      display: flex;
 
       .stuff {
+        margin-right: 6rpx;
         font-size: 28rpx;
       }
 
@@ -300,9 +307,11 @@
     font-size: 32rpx;
     color: #FD4502;
     line-height: 48rpx;
+    display: flex;
 
     text {
       &:first-child {
+        margin-right: 6rpx;
         font-size: 28rpx;
       }
     }
@@ -319,12 +328,12 @@
   font-weight: bold;
   font-size: 32rpx;
   color: #000000;
+  line-height: 56rpx;
 
   .titPic {
     font-weight: 600;
     font-size: 24rpx;
     color: #777777;
-    line-height: 34rpx;
   }
 
   .stuff {
@@ -333,7 +342,7 @@
   }
 
   .numberDisplay--integer {
-    line-height: 56rpx;
+    line-height: 1;
     font-size: 48rpx;
   }
 
@@ -346,6 +355,9 @@
   display: flex;
   justify-content: space-between;
   margin-bottom: 32rpx;
+  &:last-child{
+    margin-bottom: 0;
+  }
   .orderInfoRight{
     display: flex;
     align-items: center;
@@ -453,13 +465,12 @@
     font-weight: bold;
     font-size: 32rpx;
     color: #000000;
-    line-height: 38rpx;
+    line-height: 56rpx;
 
     .desc {
       font-weight: 600;
       font-size: 24rpx;
       color: #777777;
-      line-height: 34rpx;
     }
 
     .stuff {
@@ -467,7 +478,7 @@
     }
 
     .numberDisplay--integer {
-      line-height: 56rpx;
+      line-height: 1;
       font-size: 48rpx;
     }
 
@@ -477,7 +488,6 @@
   }
 
   .discountVal {
-    margin-top: 4rpx;
     font-weight: 600;
     font-size: 24rpx;
     color: #FD4502;

miniprogram/pages/orders/order-result.wxml

@@ -35,7 +35,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">{{ my.formatValue(goodsInfo.originalPrice) }}</text>
             </view>
           </view>
@@ -51,7 +51,7 @@
           <view class="goodsInfo">
             <view class="goods-name">{{ instrumentsInfo.name }}</view>
             <view class="goods-price">
-              <text class="stuff">¥ </text>
+              <text class="stuff">¥</text>
               <text class="priceZ">{{ my.formatValue(instrumentsInfo.originalPrice) }}</text>
             </view>
           </view>
@@ -67,7 +67,7 @@
           <text>优惠活动</text>
         </view>
         <view class="discount">
-          <text>-¥ </text>
+          <text>-¥</text>
           <text>{{my.formatValue(goodsInfo.originalPrice + (instrumentsInfo.originalPrice || 0) - (goodsInfo.salePrice + (instrumentsInfo.salePrice || 0)))}}</text>
         </view>
       </view>
@@ -106,6 +106,7 @@
         <text>{{ orderInfo.createTime }}</text>
       </view>
     </view>
+    <view class="bottomBlock"></view>
     <!-- <view class="order-time">
       <view class="order-item">
         <view class="title">订单号</view>

miniprogram/pages/orders/orders.less

@@ -52,7 +52,7 @@
         position: absolute;
         left: 50%;
         transform: translateX(-50%);
-        bottom: -4rpx;
+        bottom: -6rpx;
         z-index: -1;
         width: 32rpx;
         height: 8rpx;
@@ -86,6 +86,7 @@
   .item-top {
     display: flex;
     justify-content: space-between;
+    align-items: center;
     padding-bottom: 24rpx;
 
     .item-mid {

miniprogram/pages/orders/orders.ts

@@ -238,16 +238,18 @@ Page({
         this.onExecutePay(paymentConfig, paymentType, orderNo)
       } else {
         this.onPayError()
-        this.setData(
-          {
-            page: 1,
-            maxPage: 1,
-            recordList: [],
-          },
-          () => {
-            this.getList();
-          }
-        );
+        setTimeout(() => {
+          this.setData(
+            {
+              page: 1,
+              maxPage: 1,
+              recordList: [],
+            },
+            () => {
+              this.getList();
+            }
+          );
+        }, 1000)
       }
     } catch {
       wx.hideLoading()
@@ -268,16 +270,18 @@ Page({
         if (res.data.code === 200) {
           this.onPaying(paymentType, res.data.data.reqParams, orderNo)
         } else {
-          this.setData(
-            {
-              page: 1,
-              maxPage: 1,
-              recordList: [],
-            },
-            () => {
-              this.getList();
-            }
-          );
+          setTimeout(() => {
+            this.setData(
+              {
+                page: 1,
+                maxPage: 1,
+                recordList: [],
+              },
+              () => {
+                this.getList();
+              }
+            );
+          }, 1000)
           this.onPayError(res.data.message)
         }
       },