修改样式

miniprogram/components/navigation-bar/navigation-bar.less

@@ -38,7 +38,7 @@
 }
 
 .weui-navigation-bar__btn_goback_wrapper {
-  padding: 11px 18px 11px 16px;
+  padding: 16px 18px 11px 16px;
   margin: -11px -18px -11px -16px;
 }
 
@@ -47,14 +47,19 @@
 }
 
 .weui-navigation-bar__btn_goback {
-  font-size: 12px;
-  width: 12px;
-  height: 24px;
-  -webkit-mask: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='24' viewBox='0 0 12 24'%3E  %3Cpath fill-opacity='.9' fill-rule='evenodd' d='M10 19.438L8.955 20.5l-7.666-7.79a1.02 1.02 0 0 1 0-1.42L8.955 3.5 10 4.563 2.682 12 10 19.438z'/%3E%3C/svg%3E") no-repeat 50% 50%;
-  mask: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='24' viewBox='0 0 12 24'%3E  %3Cpath fill-opacity='.9' fill-rule='evenodd' d='M10 19.438L8.955 20.5l-7.666-7.79a1.02 1.02 0 0 1 0-1.42L8.955 3.5 10 4.563 2.682 12 10 19.438z'/%3E%3C/svg%3E") no-repeat 50% 50%;
-  -webkit-mask-size: cover;
-  mask-size: cover;
-  background-color: var(--weui-FG-0);
+  // font-size: 12px;
+  // width: 12px;
+  // height: 24px;
+  // -webkit-mask: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='24' viewBox='0 0 12 24'%3E  %3Cpath fill-opacity='.9' fill-rule='evenodd' d='M10 19.438L8.955 20.5l-7.666-7.79a1.02 1.02 0 0 1 0-1.42L8.955 3.5 10 4.563 2.682 12 10 19.438z'/%3E%3C/svg%3E") no-repeat 50% 50%;
+  // mask: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='24' viewBox='0 0 12 24'%3E  %3Cpath fill-opacity='.9' fill-rule='evenodd' d='M10 19.438L8.955 20.5l-7.666-7.79a1.02 1.02 0 0 1 0-1.42L8.955 3.5 10 4.563 2.682 12 10 19.438z'/%3E%3C/svg%3E") no-repeat 50% 50%;
+  // -webkit-mask-size: cover;
+  // mask-size: cover;
+  background: url('./icon-back.png') no-repeat center;
+  // background-color: var(--weui-FG-0);
+  background-size: contain;
+  font-weight: bold;
+  width: 36rpx;
+  height: 36rpx;
 }
 
 .weui-navigation-bar__center {

miniprogram/components/navigation-bar/navigation-bar.wxml

@@ -15,7 +15,8 @@
               aria-role="button"
               aria-label="返回"
             >
-              <view class="weui-navigation-bar__button weui-navigation-bar__btn_goback"></view>
+              <!-- <view class="weui-navigation-bar__button weui-navigation-bar__btn_goback"></view> -->
+              <image class="weui-navigation-bar__button weui-navigation-bar__btn_goback" src="./icon-back.png" mode="widthFix"/>
             </view>
           </view>
         </block>

miniprogram/pages/address/address-detail.json

@@ -6,5 +6,6 @@
     "van-field": "@vant/weapp/field/index",
     "van-popup": "@vant/weapp/popup/index",
     "van-area": "@vant/weapp/area/index"
-  }
+  },
+  "disableScroll": true
 }

miniprogram/pages/address/address-detail.wxml

@@ -4,7 +4,7 @@
 
   <view class="section">
     <van-cell-group border="{{ false }}" class="cell-group">
-    <van-field model:value="{{ name }}" placeholder="姓名" placeholder-style="color: #C0C0C0">
+    <van-field model:value="{{ name }}" placeholder="姓名" placeholder-style="color: #C0C0C0" maxlength="15">
       <view class="required" slot="label">收货人<text>*</text></view>
     </van-field>
     <van-field model:value="{{ phoneNumber }}" type="number" placeholder-style="color: #C0C0C0" placeholder="手机号码" maxlength="11">
@@ -13,7 +13,7 @@
     <van-field value="{{ provinceName ? provinceName + '/' + cityName + (regionName ? '/' + regionName : '' )  : '' }}" placeholder-style="color: #C0C0C0" placeholder="省、市、区" readonly bind:tap="onShowAreaList">
       <view class="required" slot="label">所在地区<text>*</text></view>
     </van-field>
-    <van-field model:value="{{ detailAddress }}" type="textarea" placeholder-style="color: #C0C0C0" placeholder="小区、门牌号等" input-class="textarea" autosize>
+    <van-field model:value="{{ detailAddress }}" type="textarea" placeholder-style="color: #C0C0C0" placeholder="小区、门牌号等" input-class="textarea" autosize maxlength="100">
       <view class="required" slot="label">详细地址<text>*</text></view>
     </van-field>
   </van-cell-group>

miniprogram/pages/address/index.json

@@ -6,5 +6,6 @@
     "van-field": "@vant/weapp/field/index",
     "van-popup": "@vant/weapp/popup/index",
     "van-area": "@vant/weapp/area/index"
-  }
+  },
+  "disableScroll": true
 }

miniprogram/pages/address/index.less

@@ -89,7 +89,7 @@
       }
 
       text {
-        padding-right: 12rpx;
+        padding-right: 8rpx;
 
         &:last-child {
           font-weight: 400;
@@ -109,7 +109,7 @@
     .btn {
       width: 104rpx;
       padding: 0 !important;
-      margin: 0 0 0 24rpx !important;
+      margin: 0 0 0 16rpx !important;
       line-height: 46rpx;
       border-radius: 46rpx;
       font-weight: 400;
@@ -192,8 +192,8 @@
 }
 
 .pop-btn-list {
-  padding: 12rpx 32rpx 50rpx;
-  box-shadow: inset 0rpx 2rpx 0rpx 0rpx #F0F0F0;
+  padding: 12rpx 32rpx 50rpx 32rpx;
+  // box-shadow: inset 0rpx 2rpx 0rpx 0rpx #F0F0F0;
   background-color: #fff;
 
   .submit-btn {

miniprogram/pages/buyerInformation/index.less

@@ -22,7 +22,7 @@
 }
 
 .section {
-  margin: 24rpx 14rpx;
+  margin: 62rpx 14rpx 24rpx;
   // background: linear-gradient(180deg, #E3F9FF 0%, #FFFFFF 9%, #FFFFFF 100%);
   background: rgba(255, 255, 255, 0.56);
   border-radius: 12rpx;

miniprogram/pages/buyerInformation/index.wxml

@@ -25,10 +25,10 @@
             <view class="gender-item {{ gender === '0' ? 'active' : '' }}" bind:tap="onCheckGender" data-gender="0">女</view>
           </view>
         </van-field>
-        <van-field value="{{ currentGradeTxt }}" input-align="right"  placeholder="请选择所在年级" is-link readonly bind:tap="onSelectGradeClass" >
+        <van-field value="{{ currentGradeTxt }}" input-align="right"  placeholder="请选择年级" is-link readonly bind:tap="onSelectGradeClass" >
           <view class="required" slot="label"><text>*</text>所在年级</view>
         </van-field>
-        <van-field value="{{ currentClassTxt }}" input-align="right" placeholder="请选择所在年级" is-link readonly bind:tap="onSelectClass" >
+        <van-field value="{{ currentClassTxt }}" input-align="right" placeholder="请选择班级" is-link readonly bind:tap="onSelectClass" >
           <view class="required" slot="label"><text>*</text>所在班级</view>
         </van-field>
       </view>
@@ -54,7 +54,7 @@
       <view class="toolbar-confirm" bind:tap="onSubmitSchool">确认</view>
     </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">
+      <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">
         <image slot="left-icon" src="./images/icon-search.png" class="icon-search" />
         <view slot="action" class="searchBtn" bind:tap="onSearch">搜索</view>
       </van-search>
@@ -73,12 +73,12 @@
 
   <!-- 年级 -->
   <van-popup round="{{true}}" lock-scroll="{{true}}" z-index="{{102}}" show="{{showGradeClass}}" position="bottom" safe-area-inset-bottom="{{false}}" bind:close="onCloseGradeClass" bind:after-leave="onGradeClassAfterLeave" bind:before-enter="onGradeClassBeforeEnter">
-    <van-picker wx:if="{{ !showGradeClassAfterLeave }}" columns="{{ gradeGradeList }}" visible-item-count="4" show-toolbar default-index="{{ gradeGradeIndex }}" bind:cancel="onCloseGradeClass" bind:confirm="onSubmitGradeClass">
+    <van-picker wx:if="{{ !showGradeClassAfterLeave }}" columns="{{ gradeGradeList }}" visible-item-count="6" item-height="46" show-toolbar default-index="{{ gradeGradeIndex }}" bind:cancel="onCloseGradeClass" bind:confirm="onSubmitGradeClass">
     </van-picker>
   </van-popup>
   <!-- 班级 -->
   <van-popup round="{{true}}" lock-scroll="{{true}}" z-index="{{102}}" show="{{showClass}}" position="bottom" safe-area-inset-bottom="{{false}}" bind:close="onCloseClass" bind:after-leave="onClassAfterLeave" bind:before-enter="onClassBeforeEnter">
-    <van-picker wx:if="{{ !showClassAfterLeave }}" columns="{{ classList }}" visible-item-count="4" show-toolbar default-index="{{ classIndex }}" bind:cancel="onCloseClass" bind:confirm="onSubmitClass">
+    <van-picker wx:if="{{ !showClassAfterLeave }}" columns="{{ classList }}" visible-item-count="6" item-height="46" show-toolbar default-index="{{ classIndex }}" bind:cancel="onCloseClass" bind:confirm="onSubmitClass">
     </van-picker>
   </van-popup>
 </view>

miniprogram/pages/index/index.json

@@ -8,5 +8,6 @@
     "van-field": "@vant/weapp/field/index",
     "van-loading": "@vant/weapp/loading/index",
     "service": "/components/service/service"
-  }
+  },
+  "disableScroll": true
 }

miniprogram/pages/index/index.ts

@@ -8,10 +8,10 @@ Page({
    */
   data: {
     goodsImgList: [
-      'https://oss.dayaedu.com/ktyq/1739524049205.png',
-      'https://oss.dayaedu.com/ktyq/1739523564827.png',
-      'https://oss.dayaedu.com/ktyq/1739523574402.png',
-      'https://oss.dayaedu.com/ktyq/1739523583463.png'
+      'https://oss.dayaedu.com/ktyq/1740018120663.png',
+      'https://oss.dayaedu.com/ktyq/1740018133239.png',
+      'https://oss.dayaedu.com/ktyq/1740018144423.png',
+      'https://oss.dayaedu.com/ktyq/1740018154816.png'
     ],
   },
   isLogin() {

miniprogram/pages/index/index.wxml

@@ -1,6 +1,6 @@
 <view class="pageContainer">
   <!--index.wxml-->
-  <scroll-view class="scrollarea" bounces="false" scroll-y="{{popupShow ? false : true}}" type="list">
+  <scroll-view class="scrollarea" bounces="{{ false }}" enhanced scroll-y="{{popupShow ? false : true}}" type="list">
     <view class="container">
       
       <view class="goodsSection">

miniprogram/pages/orders/order-detail.json

@@ -7,5 +7,6 @@
     "van-cell-group": "@vant/weapp/cell-group/index",
     "van-field": "@vant/weapp/field/index",
     "service": "/components/service/service"
-  }
+  },
+  "disableScroll": true
 }

miniprogram/pages/orders/order-detail.less

@@ -144,6 +144,7 @@ page {
 
     .address {
       display: flex;
+      align-items: center;
       // flex-direction: column;
 
       .userName {
@@ -152,6 +153,7 @@ page {
         overflow: hidden;
         text-overflow: ellipsis;
         display: block;
+        padding-right: 12rpx;
       }
     }
   }
@@ -270,6 +272,10 @@ page {
       font-size: 26rpx;
       color: #AAA;
       line-height: 36rpx;
+      text {
+        font-weight: bold;
+        padding-left: 6rpx;
+      }
     }
   }
 }
@@ -481,6 +487,7 @@ page {
       font-size: 30rpx;
       color: #131415;
       line-height: 40rpx;
+      font-weight: bold;
       flex-shrink: 0;
       padding-right: 46rpx;
     }
@@ -628,7 +635,7 @@ page {
 
       .stuff {
         font-size: 32rpx;
-        padding: 0 4rpx;
+        padding: 0 8rpx 0 4rpx;
       }
 
       .priceZ {
@@ -658,6 +665,9 @@ page {
     text {
       padding-left: 6rpx;
       font-weight: bold;
+      & + text {
+        padding-left: 4rpx;
+      }
     }
   }
 
@@ -665,7 +675,7 @@ page {
     margin-left: 12rpx !important;
     line-height: 94rpx;
     padding: 0 !important;
-    font-weight: 500;
+    font-weight: 600;
     width: 292rpx !important;
     font-size: 32rpx;
     color: #FEFFCA;

miniprogram/pages/orders/order-detail.wxml

@@ -20,7 +20,7 @@
           <view class="info" wx:else>
             <view class="users">
               <image src="./images/icon-address.png" class="icon-man {{ receiveAddress ? 'selected' : '' }}"></image>
-              新建收货地址
+              添加收货地址
             </view>
             <!-- <view class="address">请填写您的收货地址与信息</view> -->
           </view>
@@ -42,7 +42,7 @@
               </view>
 
               <block wx:if="{{ item.originalPrice > item.salePrice }}">
-                <view class="goods-num">优惠前 ¥{{ item.originalPrice }}</view>
+                <view class="goods-num">优惠前 ¥<text>{{ item.originalPrice }}</text></view>
               </block>
             </view>
           </view>
@@ -93,7 +93,7 @@
               <text class="priceF">.{{ goodsInfo.decimalPart }}</text>
             </view>
           </view>
-          <view class="discountPrice" wx:if="{{ goodsInfo.allDiscountPrice > 0 }}">共减<text>¥{{ goodsInfo.allDiscountPrice }}</text></view>
+          <view class="discountPrice" wx:if="{{ goodsInfo.allDiscountPrice > 0 }}">共减<text>¥</text><text>{{ goodsInfo.allDiscountPrice }}</text></view>
         </view>
         <button type="primary" bind:tap="onSubmit">{{ goodsInfo.orderNo ? '继续支付' : '立即支付' }}</button>
       </view>

miniprogram/pages/orders/order-result.json

@@ -3,5 +3,6 @@
     "navigation-bar": "/components/navigation-bar/navigation-bar",
     "service": "/components/service/service",
     "apply-refound": "/components/apply-refound/apply-refound"
-  }
+  },
+  "disableScroll": true
 }

miniprogram/pages/orders/order-result.less

@@ -389,6 +389,7 @@ page {
       font-size: 28rpx;
       color: #131415;
       display: block;
+      width: 600rpx;
     }
 
     .address {
@@ -700,6 +701,7 @@ page {
       color: #131415;
       line-height: 40rpx;
       flex-shrink: 0;
+      font-weight: bold;
       padding-right: 46rpx;
     }
 

miniprogram/pages/orders/orders.json

@@ -2,5 +2,6 @@
   "usingComponents": {
     "navigation-bar": "/components/navigation-bar/navigation-bar",
     "apply-refound": "/components/apply-refound/apply-refound"
-  }
+  },
+  "disableScroll": true
 }

miniprogram/pages/orders/orders.less

@@ -91,6 +91,7 @@
 
     >text {
       color: #777;
+      font-weight: bold;
     }
 
     .cancel {
@@ -176,6 +177,11 @@
         font-size: 26rpx;
         color: #AAAAAA;
         line-height: 36rpx;
+
+        text {
+          padding-left: 4rpx;
+          font-weight: bold;
+        }
       }
     }
 
@@ -216,7 +222,7 @@
 
         .stuff {
           font-size: 28rpx;
-          padding: 2rpx 4rpx 0;
+          padding: 2rpx 6rpx 0 4rpx;
         }
 
         .priceZ {
@@ -246,6 +252,7 @@
         text {
           font-size: 36rpx;
           line-height: 1;
+          padding-left: 6rpx;
         }
       }
     }

miniprogram/pages/orders/orders.ts

@@ -144,10 +144,10 @@ Page({
   formatOrderStatus(status: string) {
     // 订单状态 WAIT_PAY:待付款,  WAIT_USE:待使用, SUCCESS:已完成, CLOSE:已取消
     const template: any = {
-      WAIT_PAY: '等待付款',
+      WAIT_PAY: '待付款',
       WAIT_USE: '等待使用',
-      PAID: '交易完成',
-      CLOSED: '交易取消',
+      PAID: '已完成',
+      CLOSED: '已交易',
       REFUNDING: '售后中',
       REFUNDED: '售后成功'
     }

miniprogram/pages/orders/orders.wxml

@@ -28,7 +28,7 @@
                     <view class="goods-card" wx:if="{{ item.typeName }}">{{item.typeName}}</view>
                   </view>
                   <block wx:if="{{ item.originalPrice > item.salePrice }}">
-                    <view class="goods-num">优惠前 ¥{{ item.originalPrice }}</view>
+                    <view class="goods-num">优惠前 ¥<text>{{ item.originalPrice }}</text></view>
                   </block>
                 </view>
               </view>

miniprogram/pages/select-goods/index.json

@@ -1,5 +1,6 @@
 {
   "usingComponents": {
     "navigation-bar": "/components/navigation-bar/navigation-bar"
-  }
+  },
+  "disableScroll": true
 }

miniprogram/pages/select-goods/index.less

@@ -113,6 +113,7 @@
 
       .priceF {
         font-size: 32rpx;
+        line-height: 1.2;
       }
     }
 
@@ -255,10 +256,9 @@
   }
 
   .goodsItem {
-    background: #F4F4F5;
-    border-color: #F4F4F5;
+    background: #F8F8F8;
     border-radius: 12rpx;
-    border: 4rpx solid rgba(255, 255, 255, 0.7);
+    border: 4rpx solid #F8F8F8;
     padding: 10rpx;
     margin-right: 16rpx;
     font-weight: 600;
@@ -271,12 +271,13 @@
 
     &.selected {
       border: 4rpx solid #FE4600;
+      background: #fff;
     }
 
     &.nosale {
-      background: #F8F8F8;
-      border-color: #F8F8F8;
-      color: #B1B1B1;
+      background: rgba(248, 248, 248, 0.6);
+      border-color: rgba(248, 248, 248, 0.6);
+      color: rgba(19, 20, 21, 0.6);
 
       .infos {
         .price {
@@ -397,6 +398,10 @@
             padding-right: 4rpx;
             font-weight: 400 !important;
           }
+          .showP {
+            font-weight: 600 !important;
+            padding-left: 4rpx;
+          }
         }
       }
     }
@@ -408,13 +413,13 @@
     width: 100%;
     font-weight: 600;
     color: #FFFFFF;
-    padding-top: 0;
-    padding-bottom: 0;
-    line-height: 94rpx;
+    padding-top: 22rpx;
+    padding-bottom: 22rpx;
+    // line-height: 94rpx;
     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: 40rpx !important;
     border: 8rpx solid #FFFFFF;
     font-size: 36rpx;
     box-sizing: border-box;
@@ -426,18 +431,26 @@
   .btn-prices {
     font-size: 32rpx;
     color: #FEFFCA;
+    display: flex;
+    align-items: flex-end;
+    justify-content: center;
+    line-height: 50rpx;
 
     .stuff {
       font-size: 32rpx;
       padding-left: 8rpx;
+      padding-right: 6rpx;
+      line-height: 1.3;
     }
 
     .priceZ {
       font-size: 48rpx;
+      line-height: 1.1;
     }
 
     .priceF {
       font-size: 32rpx;
+      line-height: 1.3;
     }
   }
 }
@@ -445,6 +458,8 @@
 .popupBottom {
   box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0, 0, 0, 0.5);
   padding: 24rpx 24rpx 50rpx;
+  position: relative;
+  top: 1;
 }
 
 .select-buyer {
@@ -523,6 +538,7 @@
             display: inline-block;
             white-space: nowrap;
             text-overflow: ellipsis;
+            padding-right: 6rpx;
           }
         }
 
@@ -562,8 +578,13 @@
     padding-bottom: 4rpx;
   }
 
+  .discountPrice {
+    padding-left: 6rpx;
+  }
+
   text {
     color: rgba(254, 70, 0, 1);
+    font-weight: bold;
   }
 }
 

miniprogram/pages/select-goods/index.ts

@@ -31,7 +31,7 @@ Page({
       name: '',
       phoneNumber: '',
       schoolInfo: ''
-    },
+    }
   },
 
   /**

miniprogram/pages/select-goods/index.wxml

@@ -27,14 +27,14 @@
     </view>
   </view>
   <view class="section-block">
-    <scroll-view class="popup-container" bounces="false" scroll-y="true" type="list">
+    <scroll-view class="popup-container" scroll-y="true" type="list" >
       <view class="popup-scroll">
         <view class="goodsInfo">
           <view class="desc">
             <image src="./images/icon2.png" class="iconBefore"></image>选择规格（{{ list.length }}）
           </view>
           <view class="goodsList">
-            <view wx:for="{{ list }}" wx:key="index" class="goodsItem {{ item.id == selected.id ? 'selected' : '' }} {{ item.stockNum <= 0 ? 'nosale' : '' }}" bind:tap="onSelectGoods" data-id="{{ item.id }}">
+            <view wx:for="{{ list }}" wx:key="index" class="goodsItem {{ item.id == selected.id ? 'selected' : '' }} {{ item.stockNum <= 0 ? 'nosale' : '' }}" bind:tap="onSelectGoods" data-id="{{ item.id }}" id="{{ 'goodsItem-' + index }}">
               <image class="goodImg" src="{{ item.pic }}"></image>
               <view class="infos">
                 <view class="name">{{ item.typeName }}</view>
@@ -68,7 +68,7 @@
                   </view>
                   <block wx:if="{{ item.originalPrice > item.salePrice }}">
                     <text class="line"></text>
-                    <text class="discountPrice"><text>优惠前</text>¥{{ item.originalPrice }}</text>
+                    <text class="discountPrice"><text>优惠前</text>¥<text class="showP">{{ item.originalPrice }}</text></text>
                   </block>
                 </view>
               </view>
@@ -106,14 +106,15 @@
       <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>¥ {{ formatSelectGood.discountPrice }}</text>，
+          共减<text class="discountPrice">¥ {{ formatSelectGood.discountPrice }}</text>，
         </block>应付：
         <text>¥ {{ formatSelectGood.showSalePrice }}</text>
       </view>
       <view class="btnGroup">
         <button type="primary" catch:tap="onSubmit" disabled="{{ isOverSaled }}">
           <view class="btn-prices">
-            立即支付<text class="stuff">¥</text>
+            <text>立即支付</text>
+            <text class="stuff">¥</text>
             <text class="priceZ">{{ formatSelectGood.integerPart || 0 }}</text>
             <text class="priceF">.{{ formatSelectGood.decimalPart || '00' }}</text>
           </view>