添加信息页面

miniprogram/app.less

@@ -7,7 +7,7 @@ page {
   --overlay-background-color: rgba(0, 0, 0, 0.6);
   --search-background-color: #f4f4f4;
   --picker-cancel-action-color: #777777;
-  --picker-confirm-action-color: #0AAF20;
+  --picker-confirm-action-color: #FE462E;
   --picker-option-text-color: #000000;
   --picker-option-font-size: 32rpx;
 }

miniprogram/pages/address/addAddress.wxml

@@ -7,7 +7,7 @@
       <view class="fromCon">
         <text class="fromTit">收货人</text>
         <view class="fromIpt">
-          <van-field model:value="{{ name }}" input-align="right" placeholder="请填写收货人姓名" border="{{ false }}" />
+          <van-field maxlength="11" model:value="{{ name }}" input-align="right" placeholder="请填写收货人姓名" border="{{ false }}" />
         </view>
       </view>
       <view class="fromCon">

miniprogram/pages/address/addressList.less

@@ -15,8 +15,8 @@
     left: 0;
     top: 0;
     width: 100%;
-    height: 592rpx;
-    background: url("https://oss.dayaedu.com/ktyq/1738997023805.png") no-repeat;
+    height: 489rpx;
+    background: url("https://oss.dayaedu.com/ktyq/1739529857509.png") no-repeat;
     background-size: 100% 100%;
     z-index: 1;
   }
@@ -89,6 +89,7 @@
           font-size: 24rpx;
           color: #777777;
           line-height: 32rpx;
+          word-break: break-all;
         }
       }
 

miniprogram/pages/member/addMember.less

@@ -15,8 +15,8 @@
     left: 0;
     top: 0;
     width: 100%;
-    height: 592rpx;
-    background: url("https://oss.dayaedu.com/ktyq/1738997023805.png") no-repeat;
+    height: 489rpx;
+    background: url("https://oss.dayaedu.com/ktyq/1739529857509.png") no-repeat;
     background-size: 100% 100%;
     z-index: 1;
   }
@@ -29,8 +29,9 @@
     overflow: hidden;
 
     .labelCon {
-      padding-top: 22rpx;
-      padding-left: 40rpx;
+      padding-top: 6rpx;
+      padding-left: 48rpx;
+      padding-right: 12rpx;
       box-sizing: border-box;
       display: flex;
       justify-content: space-between;
@@ -41,12 +42,12 @@
         flex-direction: column;
 
         image {
-          width: 244rpx;
-          height: 66rpx;
+          width: 217rpx;
+          height: 55rpx;
         }
 
         text {
-          margin-top: 24rpx;
+          margin-top: 26rpx;
           font-weight: 400;
           font-size: 26rpx;
           color: rgba(0, 0, 0, 0.6);
@@ -56,8 +57,8 @@
 
       .labelRight {
         flex-shrink: 0;
-        width: 134rpx;
-        height: 154rpx;
+        width: 268rpx;
+        height: 172rpx;
       }
     }
 
@@ -68,7 +69,16 @@
       padding: 0 24rpx;
 
       &.firstFromBox {
-        margin-top: 44rpx;
+        margin-top: 38rpx;
+      }
+
+      .topTit {
+        padding-top: 36rpx;
+        padding-bottom: 10rpx;
+        font-weight: 600;
+        font-size: 30rpx;
+        color: #000000;
+        line-height: 42rpx;
       }
 
       .fromCon {
@@ -84,29 +94,16 @@
 
         .fromTit {
           flex-shrink: 0;
-          font-weight: 600;
-          font-size: 28rpx;
+          font-weight: 400;
+          font-size: 30rpx;
           color: #666666;
-          line-height: 40rpx;
-          position: relative;
-          margin-left: 20rpx;
-
-          &::after {
-            content: "*";
-            position: absolute;
-            top: 50%;
-            transform: translateY(-38%);
-            left: -20rpx;
-            font-weight: 600;
-            font-size: 28rpx;
-            color: #FD4502;
-            line-height: 1;
-          }
+          line-height: 42rpx;
         }
 
         .fromIpt {
-          margin-left: 20rpx;
+          margin-left: 48rpx;
           flex-grow: 1;
+
           .van-field {
             padding: 0;
             --cell-line-height: 80rpx;
@@ -126,27 +123,35 @@
         }
 
         .genderIpt {
-          padding: 16rpx 0;
+          padding: 10rpx 0;
           display: flex;
-          justify-content: flex-end;
 
           .gender {
-            font-weight: 600;
-            font-size: 28rpx;
-            color: #000000;
-            line-height: 48rpx;
-            width: 104rpx;
-            height: 48rpx;
-            text-align: center;
-            background: #F2F2F2;
-            border-radius: 8rpx;
+            padding: 10rpx 0;
+            display: flex;
+            align-items: center;
+
+            image {
+              width: 30rpx;
+              height: 30rpx;
+            }
+
+            text {
+              margin-left: 12rpx;
+              font-weight: 400;
+              font-size: 30rpx;
+              color: #AAAAAA;
+              line-height: 42rpx;
+            }
 
             &:first-child {
-              margin-right: 24rpx;
+              margin-right: 40rpx;
             }
 
             &.active {
-              background: #AAED51;
+              text {
+                color: #FE462E;
+              }
             }
           }
         }
@@ -183,33 +188,38 @@
       background-size: 100% 100%;
     }
   }
+
   // 弹窗
-  .toolbar-top{
+  .toolbar-top {
     display: flex;
     justify-content: space-between;
     height: 44px;
     margin: 0 26rpx;
     border-bottom: 2rpx solid #F2F2F2;
     font-size: var(--picker-option-font-size);
-    .toolbar-cancel{
+
+    .toolbar-cancel {
       color: var(--picker-cancel-action-color);
       line-height: 44px;
       padding: 0 14rpx
     }
-    .toolbar-confirm{
+
+    .toolbar-confirm {
       color: var(--picker-confirm-action-color);
       line-height: 44px;
       padding: 0 14rpx
     }
   }
-  .areaListOpen{
+
+  .areaListOpen {
     display: flex;
     justify-content: space-between;
     align-items: center;
     height: 56rpx;
-    margin: 20rpx 40rpx ;
+    margin: 20rpx 40rpx;
     overflow: hidden;
-    text{
+
+    text {
       margin-right: 20rpx;
       font-weight: 400;
       font-size: 32rpx;
@@ -219,19 +229,21 @@
       overflow: hidden;
       text-overflow: ellipsis;
     }
-    image{
+
+    image {
       flex-shrink: 0;
       width: 32rpx;
       height: 32rpx;
     }
   }
+
   .searchList {
     .icon-search {
       width: 32rpx;
       height: 32rpx;
       margin: auto 10rpx auto auto;
     }
-  
+
     .van-search {
       margin: 26rpx !important;
       padding: 0 !important;
@@ -240,22 +252,23 @@
       border-radius: 35rpx !important;
       border: 1rpx solid #FFFFFF !important;
     }
-  
+
     .van-search__content {
       border-top-left-radius: 35rpx !important;
       border-bottom-left-radius: 35rpx !important;
     }
-  
+
     .van-cell {
       font-size: 26rpx !important;
     }
-  
+
     .searchBtn {
       width: 112rpx;
       line-height: 54rpx !important;
       padding: 0 !important;
       text-align: center;
-      background-color: #000000;
+      background: url('https://oss.dayaedu.com/ktyq/1739695178829.png') no-repeat;
+      background-size: 100% 100%;
       font-weight: 500;
       font-size: 28rpx;
       color: #FFFFFF;
@@ -263,18 +276,20 @@
       margin-right: 8rpx;
     }
   }
-  .empty-box{
+
+  .empty-box {
     width: 100%;
     height: 528rpx;
     display: flex;
     flex-direction: column;
     justify-content: center;
     align-items: center;
+
     image {
       width: 225rpx;
       height: 150rpx;
     }
-  
+
     .empty-text {
       font-weight: 400;
       font-size: 28rpx;

miniprogram/pages/member/addMember.ts

@@ -79,13 +79,12 @@ Page({
     gradeList: [] as any,
     gradeId: "",
     gradeName: "",
-    gradeIndex: 0,
+    gradeClassIndexs: [0, 0],
 
     showClass: false, //班级
     classList: [] as any,
     classId: "",
     className: "",
-    classIndex: 0,
   },
   async onLoad(options: any) {
     const { redirectUrl, id } = options;
@@ -153,16 +152,13 @@ Page({
           return item.value === this.data.classId
         }))
         this.setData({
-          classList: [{
-            values: classListData
-          }]
-        }, () => {
-          // 不知道为啥 直接写在上面 gradeIndex 不能回显
-          this.setData({
-            schoolAreaIndex,
-            gradeIndex,
-            classIndex
-          })
+          schoolAreaIndex,
+          "gradeList[0].defaultIndex": gradeIndex,
+          "gradeList[1]": {
+            values: classListData,
+            defaultIndex: classIndex,
+          },
+          gradeClassIndexs:[gradeIndex, classIndex]
         })
       }
     } catch (e: any) {
@@ -171,7 +167,7 @@ Page({
   },
   /** 选择男女 */
   onCheckGender(e: any) {
-    const { dataset } = e.target
+    const { dataset } = e.currentTarget
     this.setData({
       gender: dataset.gender
     })
@@ -221,11 +217,10 @@ Page({
 
       gradeId: "",
       gradeName: "",
-      gradeIndex: 0,
+      gradeClassIndexs: [0, 0],
 
       classId: "",
       className: "",
-      classIndex: 0
     }, () => {
       this.getSchools()
     })
@@ -346,11 +341,10 @@ Page({
 
       gradeId: "",
       gradeName: "",
-      gradeIndex: 0,
+      gradeClassIndexs: [0, 0],
 
       classId: "",
       className: "",
-      classIndex: 0,
     }, () => {
       this.getSchoolAreaDetail()
     })
@@ -410,6 +404,10 @@ Page({
       if (schoolInfo.instrumentSetType === 'SCHOOL') {
         const gradeClassList = [{
           values: getGradeList(schoolInfo.gradeYear),
+          defaultIndex: 0
+        }, {
+          values: classList,
+          defaultIndex: 0
         }]
         this.setData({
           gradeList: gradeClassList
@@ -425,7 +423,11 @@ Page({
         });
         gradeList.sort((a: any, b: any) => a.value - b.value);
         const gradeClassList = [{
-          values: gradeList
+          values: gradeList,
+          defaultIndex: 0
+        }, {
+          values: classList,
+          defaultIndex: 0
         }]
         this.setData({
           gradeList: gradeClassList,
@@ -469,12 +471,20 @@ Page({
         console.log(lastGradeList, 'lastGradeList')
         this.setData({
           gradeList: [{
-            values: lastGradeList
+            values: lastGradeList,
+            defaultIndex: 0
+          }, {
+            values: lastGradeList[0]?.classList || [],
+            defaultIndex: 0
           }]
         })
       } else {
         const gradeClassList = [{
           values: getGradeList(),
+          defaultIndex: 0
+        }, {
+          values: classList,
+          defaultIndex: 0
         }]
         this.setData({
           gradeList: gradeClassList
@@ -483,6 +493,10 @@ Page({
     } else {
       const gradeClassList = [{
         values: getGradeList(),
+        defaultIndex: 0
+      }, {
+        values: classList,
+        defaultIndex: 0
       }]
       this.setData({
         gradeList: gradeClassList
@@ -507,6 +521,15 @@ Page({
       showGrade: false
     })
   },
+  /** 年级班级切换时 */
+  onGradeChange(event: any) {
+    const { picker, index, value } = event.detail;
+    const classListData = value[index]?.classList
+    if (index === 0 && classListData) {
+      picker.setColumnIndex(1, '0')
+      picker.setColumnValues(1, classListData);
+    }
+  },
   /** 确认选择年级 */
   onSubmitGrade(e: any) {
     const selectedOptions: any = e.detail.value
@@ -517,11 +540,8 @@ Page({
       })
       return
     }
-    const gradeIndex = (this.data.gradeList[0]?.values || []).findIndex((item: any) => {
-      return item.value === selectedOptions[0].value
-    })
-
-    if (selectedOptions[0].value == this.data.gradeId) {
+    const selectedIndexs: any = e.detail.index
+    if (selectedOptions[0].value == this.data.gradeId && selectedOptions[1].value == this.data.classId) {
       this.setData({
         showGrade: false
       })
@@ -532,63 +552,12 @@ Page({
       gradeId: selectedOptions[0].value,
       gradeName: selectedOptions[0].text,
       showGrade: false,
-      gradeIndex,
-      
-      classId: "",
-      className: "",
-      classIndex: 0,
-    })
-    this.setData({
-      classList: [{
-        values: selectedOptions[0].classList || classList
-      }]
-    })
-  },
-  /** 选择班级 */
-  onSelectClass() {
-    if (!this.data.gradeId) {
-      wx.showToast({
-        title: '请先选择年级',
-        icon: 'none'
-      })
-      return
-    }
-    this.setData({
-      showClass: true
-    })
-  },
-  onCloseClass() {
-    this.setData({
-      showClass: false
-    })
-  },
-  /** 确认选择班级 */
-  onSubmitClass(e: any) {
-    const selectedOptions: any = e.detail.value
-    if (!selectedOptions || !selectedOptions[selectedOptions.length - 1]) {
-      wx.showToast({
-        title: '未选中值',
-        icon: 'none'
-      })
-      return
-    }
-    // 班级index
-    const classIndex = (this.data.classList[0]?.values || []).findIndex(((item: any) => {
-      return item.value === selectedOptions[0].value
-    }))
+      gradeClassIndexs: selectedIndexs,
+      'gradeList[0].defaultIndex': selectedIndexs[0],
+      'gradeList[1].defaultIndex': selectedIndexs[1],
 
-    if (selectedOptions[0].value == this.data.classId) {
-      this.setData({
-        showClass: false
-      })
-      return
-    }
-
-    this.setData({
-      classId: selectedOptions[0].value,
-      className: selectedOptions[0].text,
-      classIndex,
-      showClass: false
+      classId: selectedOptions[1].value,
+      className: selectedOptions[1].text
     })
   },
   messageName(value: string) {

miniprogram/pages/member/addMember.wxml

@@ -6,61 +6,63 @@
       <view class="labelCon">
         <view class="labelLeft">
           <image src="./images/label1.png"></image>
-          <text>为了提供更好的服务，请您耐心填写以下内容</text>
+          <text>为了给您更好的服务，请认真填写</text>
         </view>
         <image class="labelRight" src="./images/label2.png"></image>
       </view>
       <view class="fromBox firstFromBox">
+        <view class="topTit">个人信息</view>
         <view class="fromCon">
-          <text class="fromTit">联系电话</text>
+          <text class="fromTit">手机号码</text>
           <view class="fromIpt">
-            <van-field maxlength="11" model:value="{{ phone }}" input-align="right" type="{{ 'number' }}" placeholder="请输入联系电话" border="{{ false }}" />
+            <van-field maxlength="11" model:value="{{ phone }}" input-align="left" type="{{ 'number' }}" placeholder="请输入手机号码" border="{{ false }}" />
           </view>
         </view>
         <view class="fromCon">
           <text class="fromTit">学生姓名</text>
           <view class="fromIpt">
-            <van-field maxlength="14" model:value="{{ name }}" input-align="right" placeholder="请输入学生姓名" border="{{ false }}" />
+            <van-field maxlength="14" model:value="{{ name }}" input-align="left" placeholder="请输入学生姓名" border="{{ false }}" />
           </view>
         </view>
         <view class="fromCon">
           <text class="fromTit">学生性别</text>
           <view class="fromIpt genderIpt">
-            <view class="gender {{gender==='1'?'active':''}}" bind:tap="onCheckGender" data-gender="1">男</view>
-            <view class="gender {{gender==='0'?'active':''}}" bind:tap="onCheckGender" data-gender="0">女</view>
+            <view class="gender {{gender==='1'?'active':''}}" bind:tap="onCheckGender" data-gender="1">
+              <image src="{{ gender==='1'?'./images/radioAct.png':'./images/radio.png' }}" mode="" />
+              <text>男生</text>
+            </view>
+            <view class="gender {{gender==='0'?'active':''}}" bind:tap="onCheckGender" data-gender="0">
+              <image src="{{ gender==='0'?'./images/radioAct.png':'./images/radio.png' }}" mode="" />
+              <text>女生</text>
+            </view>
           </view>
         </view>
       </view>
       <view class="fromBox">
+        <view class="topTit">学校信息</view>
         <view class="fromCon">
           <text class="fromTit">学校地区</text>
           <view class="fromIpt">
-            <van-field placeholder="请选择学校地区" value="{{  provinceName  + cityName  + regionName}}" input-align="right" bind:tap="onShowAreaList" border="{{ false }}" is-link readonly />
+            <van-field placeholder="请选择学校地区" value="{{  provinceName  + cityName  + regionName}}" input-align="left" bind:tap="onShowAreaList" border="{{ false }}" is-link readonly />
           </view>
         </view>
         <view class="fromCon">
           <text class="fromTit">所在学校</text>
           <view class="fromIpt">
-            <van-field placeholder="请选择学校" value="{{ schoolAreaName }}" input-align="right" bind:tap="onSelectSchool" border="{{ false }}" is-link readonly />
+            <van-field placeholder="请选择学校" value="{{ schoolAreaName }}" input-align="left" bind:tap="onSelectSchool" border="{{ false }}" is-link readonly />
           </view>
         </view>
         <view class="fromCon">
-          <text class="fromTit">所在年级</text>
+          <text class="fromTit">年级班级</text>
           <view class="fromIpt">
-            <van-field placeholder="请选择年级" value="{{ gradeName }}" input-align="right" bind:tap="onSelectGrade" border="{{ false }}" is-link readonly />
-          </view>
-        </view>
-        <view class="fromCon">
-          <text class="fromTit">所在班级</text>
-          <view class="fromIpt">
-            <van-field placeholder="请选择班级" value="{{ className }}" input-align="right" bind:tap="onSelectClass" border="{{ false }}" is-link readonly />
+            <van-field placeholder="请选择年级班级" value="{{ gradeName + className }}" input-align="left" bind:tap="onSelectGrade" border="{{ false }}" is-link readonly />
           </view>
         </view>
       </view>
       <view class="botBox"></view>
     </scroll-view>
     <view class="submitCon">
-      <view class="subBtn" bind:tap="onSubmit">保存</view>
+      <view class="subBtn" bind:tap="onSubmit">确认</view>
     </view>
     <!-- 地区 -->
     <van-popup round="{{true}}" lock-scroll="{{true}}" z-index="{{103}}" show="{{showArea}}" position="bottom" safe-area-inset-bottom="{{false}}" bind:close="onCloseAreaList">
@@ -93,12 +95,7 @@
     </van-popup>
     <!-- 年级 -->
     <van-popup round="{{true}}" lock-scroll="{{true}}" z-index="{{102}}" show="{{showGrade}}" position="bottom" safe-area-inset-bottom="{{false}}" bind:close="onCloseGrade">
-      <van-picker wx:if="{{ showGrade }}" columns="{{ gradeList }}" visible-item-count="6" show-toolbar bind:cancel="onCloseGrade" bind:confirm="onSubmitGrade" default-index="{{ gradeIndex }}">
-      </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">
-      <van-picker wx:if="{{ showClass }}" columns="{{ classList }}" visible-item-count="6" show-toolbar bind:cancel="onCloseClass" bind:confirm="onSubmitClass" default-index="{{ classIndex }}">
+      <van-picker wx:if="{{ showGrade }}" columns="{{ gradeList }}" visible-item-count="6" show-toolbar bind:cancel="onCloseGrade" bind:confirm="onSubmitGrade" bind:change="onGradeChange">
       </van-picker>
     </van-popup>
   </view>

miniprogram/pages/member/memberList.less

@@ -15,8 +15,8 @@
     left: 0;
     top: 0;
     width: 100%;
-    height: 592rpx;
-    background: url("https://oss.dayaedu.com/ktyq/1738997023805.png") no-repeat;
+    height: 489rpx;
+    background: url("https://oss.dayaedu.com/ktyq/1739529857509.png") no-repeat;
     background-size: 100% 100%;
     z-index: 1;
   }
@@ -89,6 +89,7 @@
           font-size: 24rpx;
           color: #777777;
           line-height: 32rpx;
+          word-break: break-all;
         }
       }
 

miniprogram/pages/orders/order-detail.less

@@ -14,8 +14,8 @@
     top: 0;
     width: 100%;
     width: 100%;
-    height: 592rpx;
-    background: url("https://oss.dayaedu.com/ktyq/1738997023805.png") no-repeat;
+    height: 489rpx;
+    background: url("https://oss.dayaedu.com/ktyq/1739529857509.png") no-repeat;
     background-size: 100% 100%;
   }
 

miniprogram/pages/orders/order-result.less

@@ -14,8 +14,8 @@
     top: 0;
     width: 100%;
     width: 100%;
-    height: 592rpx;
-    background: url("https://oss.dayaedu.com/ktyq/1738997023805.png") no-repeat;
+    height: 489rpx;
+    background: url("https://oss.dayaedu.com/ktyq/1739529857509.png") no-repeat;
     background-size: 100% 100%;
   }
 

miniprogram/pages/orders/orders.less

@@ -10,8 +10,8 @@
     position: absolute;
     top: 0;
     width: 100%;
-    height: 592rpx;
-    background: url("https://oss.dayaedu.com/ktyq/1738997023805.png") no-repeat;
+    height: 489rpx;
+    background: url("https://oss.dayaedu.com/ktyq/1739529857509.png") no-repeat;
     background-size: 100% 100%;
   }
 }