修复问题

miniprogram/components/navigation-bar/navigation-bar.ts

@@ -68,8 +68,8 @@ Component({
       this.setData({
         ios: !isAndroid,
         innerPaddingRight: `padding-right: ${wxWindowInfo.windowWidth - rect.left}px;`,
-        leftWidth: `width: ${wxWindowInfo.windowWidth - rect.left }px;`,
-        safeAreaTop: isDevtools || isAndroid ? `height: calc(var(--height) + ${wxWindowInfo.safeArea.top}px); padding-top: ${wxWindowInfo.safeArea.top}px;` : ``
+        leftWidth: `width: ${wxWindowInfo.windowWidth - rect.left}px;`,
+        safeAreaTop: isDevtools || isAndroid ? `height: calc(var(--height) + ${wxWindowInfo.safeArea.top || 26}px); padding-top: ${wxWindowInfo.safeArea.top || 26}px;` : ``
       })
     },
   },
@@ -81,9 +81,8 @@ Component({
       const animated = this.data.animated
       let displayStyle = ''
       if (animated) {
-        displayStyle = `opacity: ${
-          show ? '1' : '0'
-        };transition:opacity 0.5s;`
+        displayStyle = `opacity: ${show ? '1' : '0'
+          };transition:opacity 0.5s;`
       } else {
         displayStyle = `display: ${show ? '' : 'none'}`
       }

miniprogram/pages/buyerInformation/index.json

@@ -7,5 +7,6 @@
     "van-search": "@vant/weapp/search/index",
     "van-field": "@vant/weapp/field/index",
     "van-loading": "@vant/weapp/loading/index"
-  }
+  },
+  "disableScroll": true
 }

miniprogram/pages/buyerInformation/index.less

@@ -1,13 +1,10 @@
 /* pages/buyerInformation/index.wxss */
-page {
-  height: 100vh;
-  background: #D7F2FA;
-}
-
 .container {
+  height: 100vh;
   display: flex;
   flex-direction: column;
   background: url('https://oss.dayaedu.com/ktyq/1738907060663.png') top center no-repeat;
+  background-color: #D7F2FA;
   background-size: contain;
 }
 
@@ -37,6 +34,7 @@ page {
     overflow: hidden;
   }
 
+
   .section-title {
     width: 236rpx;
     height: 46rpx;
@@ -48,6 +46,14 @@ page {
     font-size: 30rpx;
     line-height: 42rpx;
 
+    .required {
+      font-weight: 600;
+      color: #666666;
+      text {
+        color: #FF5A56;
+      }
+    }
+
     .van-field__label {
       font-weight: 600;
       color: #666666;
@@ -92,6 +98,7 @@ page {
     background: linear-gradient(90deg, #544F4A 0%, #302F2B 100%);
     border-radius: 44rpx;
     padding: 0 !important;
+    color: #FBEAC9;
   }
 }
 
@@ -139,6 +146,9 @@ toolbar-confirm {
     border-radius: 35rpx !important;
     border: 1rpx solid #FFFFFF !important;
   }
+  .van-search__content {
+    background: #F6F6F6 !important;
+  }
 
   .van-search__content {
     border-top-left-radius: 35rpx !important;

miniprogram/pages/buyerInformation/index.ts

@@ -99,10 +99,6 @@ Page({
 
   async getUserDetail() {
     try {
-      // const { data } = await api_userBeneficiaryDetail({
-      //   id: this.data.userBeneficiaryId
-      // })
-      // console.log(data, 'data')
       const information = wx.getStorageSync('buyerInfomation')
       const users = information ? JSON.parse(information) : null
       if (users) {
@@ -158,6 +154,8 @@ Page({
       const { data } = await api_sysAreaQueryAllProvince({})
       this.setData({
         areaList: this.formateArea(data.data)
+      }, () => {
+        console.log(this.data.areaList)
       })
     } catch {
       // 
@@ -172,10 +170,11 @@ Page({
     });
     area.forEach((item: any) => {
       item.areas && item.areas.forEach((city: any) => {
+        // console.log(city.code, city.code.toString().split(''))
         city_list[city.code] = city.name;
       });
     });
-    area.forEach((item: any) => {
+    area.forEach((item: any) => { 
       item.areas && item.areas.forEach((city: any) => {
         city.areas && city.areas.forEach((county: any) => {
           county_list[county.code] = county.name;
@@ -235,22 +234,22 @@ Page({
   async getSchoolAreaDetail() {
     const { data } = await api_schoolAreaDetail({ id: this.data.schoolAreaId })
     const result = data.data || {}
+
+    let gradeClassList: any = []
+    let schoolInstrumentSetType = ''
     if (result.school) {
       const schoolInfo = result.school || {};
       const schoolInstrumentList = schoolInfo.schoolInstrumentList || [];
       // forms.schoolInstrumentSetType = schoolInfo.instrumentSetType;
       if (schoolInfo.instrumentSetType === 'SCHOOL') {
-        const gradeClassList = [{
+        gradeClassList = [{
           values: getGradeList(schoolInfo.gradeYear),
           defaultIndex: this.data.gradeClassIndexs[0]
         }, {
           values: classList,
           defaultIndex: this.data.gradeClassIndexs[1]
         }]
-        this.setData({
-          gradeClassList,
-          schoolInstrumentSetType: schoolInfo.instrumentSetType
-        })
+        schoolInstrumentSetType = schoolInfo.instrumentSetType
       } else if (schoolInfo.instrumentSetType === 'GRADE') {
         const gradeList: any = []
         schoolInstrumentList.forEach((item: any) => {
@@ -261,17 +260,14 @@ Page({
           })
         });
         gradeList.sort((a: any, b: any) => a.value - b.value);
-        const gradeClassList = [{
+        gradeClassList = [{
           values: gradeList,
           defaultIndex: this.data.gradeClassIndexs[0]
         }, {
           values: classList,
           defaultIndex: this.data.gradeClassIndexs[1]
         }]
-        this.setData({
-          gradeClassList,
-          schoolInstrumentSetType: schoolInfo.instrumentSetType
-        })
+        schoolInstrumentSetType = schoolInfo.instrumentSetType
       } else if (schoolInfo.instrumentSetType === 'CLASS') {
         //   // 班级
         const tempGradeList: any[] = [];
@@ -309,7 +305,7 @@ Page({
         });
         lastGradeList.sort((a: any, b: any) => a.value - b.value);
         // console.log(lastGradeList, 'lastGradeList')
-        const gradeClassList = [{
+        gradeClassList = [{
           values: lastGradeList,
           defaultIndex: this.data.gradeClassIndexs[0]
         }, {
@@ -317,12 +313,9 @@ Page({
           defaultIndex: this.data.gradeClassIndexs[1]
         }]
 
-        this.setData({
-          gradeClassList,
-          schoolInstrumentSetType: schoolInfo.instrumentSetType
-        })
+        schoolInstrumentSetType = schoolInfo.instrumentSetType
       } else {
-        const gradeClassList = [{
+        gradeClassList = [{
           values: getGradeList(),
           defaultIndex: this.data.gradeClassIndexs[0]
         }, {
@@ -330,25 +323,44 @@ Page({
           defaultIndex: this.data.gradeClassIndexs[1]
         }]
 
-        this.setData({
-          gradeClassList,
-          schoolInstrumentSetType: ''
-        })
+        schoolInstrumentSetType = ''
       }
     } else {
-      const gradeClassList = [{
+      gradeClassList = [{
         values: getGradeList(),
         defaultIndex: this.data.gradeClassIndexs[0]
       }, {
         values: classList,
         defaultIndex: this.data.gradeClassIndexs[1]
       }]
+      schoolInstrumentSetType = ''
+    }
+
+
 
+    // 格式化年级班级 - 如果后台改了学校配置，本地保存了缓存，判断年级、班级是否存在
+    const grade = this.data.gradeClassIndexs
+    const tempGradeList = gradeClassList[0]
+    const tempClassList = gradeClassList[1]
+    if ((tempGradeList?.values?.length || 0) - 1 < grade[0] || (tempClassList?.values?.length || 0) - 1 < grade[1]) {
+      gradeClassList[0].defaultIndex = 0
+      gradeClassList[1].defaultIndex = 0
       this.setData({
         gradeClassList,
-        schoolInstrumentSetType: ''
+        gradeClassIndexs: [0, 0],
+        currentClass: null,
+        currentGradeNum: null,
+        currentGradeClassTxt: '',
+        schoolInstrumentSetType
+      })
+    } else {
+      this.setData({
+        gradeClassList,
+        schoolInstrumentSetType
       })
     }
+
+    
   },
   /** 选择男女 */
   onCheckGender(e: any) {
@@ -369,16 +381,19 @@ Page({
       showArea: false
     })
   },
+  onChangeAreaList(e: any) {
+    // console.log(e, '3')
+  },
   /** 确定选择地区 */
   submitArea(e: any) {
     const selectedOptions: any = e.detail.values
     this.setData({
       provinceCode: selectedOptions[0].code,
       cityCode: selectedOptions[1].code,
-      regionCode: selectedOptions[2].code,
+      regionCode: selectedOptions[2]?.code,
       provinceName: selectedOptions[0].name,
       cityName: selectedOptions[1].name,
-      regionName: selectedOptions[2].name,
+      regionName: selectedOptions[2]?.name,
       showArea: false,
 
       searchName: '',
@@ -431,7 +446,7 @@ Page({
     const detail = this.data.schoolAreaList.find((item: any) => item.value === this.data.tempChangeSchoolAreaId)
     const detailIndex = this.data.schoolAreaList.findIndex((item: any) => item.value === this.data.tempChangeSchoolAreaId)
     // console.log(detail, detailIndex, this.data.tempChangeSchoolAreaId)
-    if(detailIndex === -1) return
+    if (detailIndex === -1) return
     this.setData({
       schoolAreaName: detail.text,
       schoolAreaId: detail.value,

miniprogram/pages/buyerInformation/index.wxml

@@ -7,9 +7,14 @@
     <view class="section">
       <view class="section-content">
         <image src="./images/title1.png" class="section-title" />
-        <van-field required label="联系方式" model:value="{{ phone }}" maxlength="11" type="number" placeholder="请输入手机号码" input-align="right" />
-        <van-field required label="学生姓名" model:value="{{ name }}" placeholder="请输入学生姓名" input-align="right" />
-        <van-field border="{{ false }}" required label="学生性别" input-align="right">
+        <van-field model:value="{{ phone }}" maxlength="11" type="number" placeholder="请输入手机号码" input-align="right" >
+          <view class="required" slot="label"><text>*</text>联系方式</view>
+        </van-field>
+        <van-field model:value="{{ name }}" placeholder="请输入学生姓名" input-align="right" >
+          <view class="required" slot="label"><text>*</text>学生姓名</view>
+        </van-field>
+        <van-field border="{{ false }}" input-align="right">
+          <view class="required" slot="label"><text>*</text>学生性别</view>
           <view class="gender-section" slot="button">
             <view class="gender-item {{ gender === '1' ? 'active' : '' }}" bind:tap="onCheckGender" data-gender="1">男</view>
             <view class="gender-item {{ gender === '0' ? 'active' : '' }}" bind:tap="onCheckGender" data-gender="0">女</view>
@@ -21,9 +26,15 @@
     <view class="section">
       <view class="section-content">
         <image src="./images/title2.png" class="section-title" />
-        <van-field required label="所在地区" value="{{ provinceName ? provinceName + ' ' + cityName + ' ' + regionName : '' }}" bind:tap="onShowAreaList" placeholder="请选择地区" input-align="right" is-link readonly />
-        <van-field required model:value="{{ schoolAreaName }}" label="就读学校" placeholder="请选择学校" input-align="right" is-link readonly bind:tap="onSelectSchool" />
-        <van-field border="{{ false }}" value="{{ currentGradeClassTxt }}" required label="年级班级" placeholder="请选择年级" input-align="right" is-link readonly bind:tap="onSelectGradeClass" />
+        <van-field value="{{ provinceName ? provinceName + ' ' + cityName + ' ' + regionName : '' }}" bind:tap="onShowAreaList" placeholder="请选择地区" input-align="right" is-link readonly >
+          <view class="required" slot="label"><text>*</text>所在地区</view>
+        </van-field>
+        <van-field model:value="{{ schoolAreaName }}" placeholder="请选择学校" input-align="right" is-link readonly bind:tap="onSelectSchool" >
+          <view class="required" slot="label"><text>*</text>就读学校</view>
+          </van-field>
+        <van-field border="{{ false }}" value="{{ currentGradeClassTxt }}" placeholder="请选择年级" input-align="right" is-link readonly bind:tap="onSelectGradeClass" >
+          <view class="required" slot="label"><text>*</text>年级班级</view>
+        </van-field>
       </view>
     </view>
   </scroll-view>
@@ -36,7 +47,7 @@
 
   <!-- 地区 -->
   <van-popup round="{{true}}" lock-scroll="{{true}}" z-index="{{102}}" show="{{showArea}}" position="bottom" safe-area-inset-bottom="{{false}}" bind:close="onCloseAreaList">
-    <van-area id='area1' areaList="{{areaList}}" visible-item-count="5" item-height="46" value="{{ regionCode }}" bind:cancel="onCloseAreaList" bind:confirm="submitArea" />
+    <van-area id='area1' areaList="{{areaList}}" visible-item-count="5" item-height="46" value="{{ regionCode || cityCode }}" bind:cancel="onCloseAreaList" bind:confirm="submitArea" bind:change="onChangeAreaList" />
   </van-popup>
 
   <!-- 学校 -->
@@ -46,7 +57,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" placeholder-style="color: #aaa">
         <image slot="left-icon" src="./images/icon-search.png" class="icon-search" />
         <view slot="action" class="searchBtn" bind:tap="onSearch">搜索</view>
       </van-search>

miniprogram/pages/index/index.less

@@ -406,9 +406,18 @@ page {
     display: none;
   }
 
+  .video-section {
+    position: relative;
+    width: 100%;
+    padding-top: 56.25%;
+  }
   .videoItem {
+    position: absolute;
+    top: 0;
+    bottom: 0;
     width: 100%;
-    height: 368rpx;
+    height: 100%;
+    // height: 368rpx;
     border-radius: 24rpx;
     box-shadow: 4rpx 8rpx 24rpx 1rpx rgba(96, 168, 223, 0.45);
   }
@@ -700,8 +709,10 @@ page {
 .popupBottom {
   background: #ffffff;
   // box-shadow: 0 2rpx 8rpx 0rpx rgba(0, 0, 0, 0.5);
-  box-shadow: 0rpx 2rpx 8rpx 0rpx rgba(0,0,0,0.5);
+  box-shadow: 0rpx 2rpx 8rpx 0rpx rgba(0,0,0,0.25);
   padding: 0 32rpx 58rpx;
+  position: relative;
+  z-index: 1;
 }
 
 .current-item {

miniprogram/pages/index/index.ts

@@ -22,10 +22,10 @@ Page({
       "https://oss.dayaedu.com/ktyq/1733449097054.png",
     ],
     goodsImgList: [
-      "https://oss.dayaedu.com/ktyq/1738822393434.png",
-      "https://oss.dayaedu.com/ktyq/1738822501555.png",
-      "https://oss.dayaedu.com/ktyq/1738822528040.png",
-      "https://oss.dayaedu.com/ktyq/1738822590749.png",
+      "https://oss.dayaedu.com/ktyq/1739353790443.png",
+      "https://oss.dayaedu.com/ktyq/1739353815962.png",
+      "https://oss.dayaedu.com/ktyq/1739353843494.png",
+      "https://oss.dayaedu.com/ktyq/1739353862133.png",
     ],
     detailImgList: [
       {

miniprogram/pages/index/index.wxml

@@ -59,8 +59,8 @@
       <view class="goodsIntro">
         <view class="images">
           <image id="type1" mode="widthFix" bind:tap="onPreivewGoodsImg" src="https://oss.dayaedu.com/ktyq/1738822393434.png" data-src="https://oss.dayaedu.com/ktyq/1738822393434.png"></image>
-          <image mode="widthFix" bind:tap="onPreivewGoodsImg" src="https://oss.dayaedu.com/ktyq/1738822501555.png" data-src="https://oss.dayaedu.com/ktyq/1738822501555.png"></image>
-          <image mode="widthFix" bind:tap="onPreivewGoodsImg" src="https://oss.dayaedu.com/ktyq/1738822528040.png" data-src="https://oss.dayaedu.com/ktyq/1738822528040.png"></image>
+          <image mode="widthFix" bind:tap="onPreivewGoodsImg" src="https://oss.dayaedu.com/ktyq/1739353815962.png" data-src="https://oss.dayaedu.com/ktyq/1739353815962.png"></image>
+          <image mode="widthFix" bind:tap="onPreivewGoodsImg" src="https://oss.dayaedu.com/ktyq/1739353843494.png" data-src="https://oss.dayaedu.com/ktyq/1739353843494.png"></image>
           <!-- <image  mode="widthFix" bind:tap="onPreivewGoodsImg" src="https://oss.dayaedu.com/ktyq/173339759143825859f65.png" data-src="https://oss.dayaedu.com/ktyq/173339759143825859f65.png"></image> -->
           <!-- <view id="type3" class="liu-section">
             <view class="liu-img1">
@@ -78,7 +78,10 @@
                 音乐数字课堂已赢得超过100万名注册师生的喜爱与赞誉，成为学生乐器学习旅程中的得力伙伴，更是一路陪伴他们从初探音乐世界走向精通乐器。为学生带来极佳的学习体验。
               </view>
               <view class="titleVideoSection">
-                <video object-fit="contain" show-center-play-btn="{{false}}" picture-in-picture-mode="[]" controls="{{titleControls}}" bindplay="onTitlePlay" class="videoItem" id="titleVideo" src="https://oss.dayaedu.com/ktyq/1733395673461fc6123ca.mp4"></video>
+                <view class="video-section">
+                  <video object-fit="contain" show-center-play-btn="{{false}}" picture-in-picture-mode="[]" controls="{{titleControls}}" bindplay="onTitlePlay" class="videoItem" id="titleVideo" src="https://oss.dayaedu.com/ktyq/1733395673461fc6123ca.mp4"></video>
+                </view>
+
                 <image wx:if="{{!titleControls}}" bind:tap="onTItleVideoPlay" src="./images/icon-video.png" class="icon-video"></image>
               </view>
               <view class="content2">实践知真章，合作学校仅用两节课便完成母亲节主题演奏</view>
@@ -97,7 +100,7 @@
               </view>
             </view>
           </view>
-          <image id="type2" mode="widthFix" bind:tap="onPreivewGoodsImg" src="https://oss.dayaedu.com/ktyq/1738822590749.png" data-src="https://oss.dayaedu.com/ktyq/1738822590749.png"></image>
+          <image id="type2" mode="widthFix" bind:tap="onPreivewGoodsImg" src="https://oss.dayaedu.com/ktyq/1739353862133.png" data-src="https://oss.dayaedu.com/ktyq/1739353862133.png"></image>
         </view>
       </view>
     </view>
@@ -187,13 +190,12 @@
             ，合计：
             <text>¥ {{ formatSelectGood.showSalePrice }}</text>
             <block wx:if="{{ formatSelectGood.originalPrice > formatSelectGood.salePrice }}">
-              ，已省
-              <text>¥ {{ formatSelectGood.discountPrice }}</text>
+              ，已省<text>¥ {{ formatSelectGood.discountPrice }}</text>
             </block>
           </view>
           <view class="btnGroup">
             <view class="left-section">
-              <image src="./images/icon1.png" class="icon1" />
+              <image mode="widthFix" src="./images/icon1.png" class="icon1" />
               <view class="currentPrice2">
                 <text class="stuff">¥</text>
                 <text class="priceZ">{{ formatSelectGood.integerPart || "0" }}</text>

miniprogram/pages/orders/order-detail.less

@@ -132,8 +132,8 @@ page {
 
   .qrcode-line {
     position: relative;
-    background: linear-gradient(to right, transparent 50%, rgba(219, 219, 219, 1) 50%) repeat-x; // 设置水平方向的线性渐变，透明与半透明色交替，模拟虚线线段
-    background-size: 10px 1px; // 设置背景大小，控制虚线的线段长度和粗细，这里线段长度为10px，粗细为1px
+    background: linear-gradient(to right, transparent 50%, rgba(242, 242, 242, 1) 50%) repeat-x; // 设置水平方向的线性渐变，透明与半透明色交替，模拟虚线线段
+    background-size: 6px 1px; // 设置背景大小，控制虚线的线段长度和粗细，这里线段长度为10px，粗细为1px
     height: 2rpx; // 元素高度，可根据实际需求调整，用于展示虚线效果的高度范围
     // margin: 42rpx 0 32rpx;
 
@@ -150,11 +150,11 @@ page {
     }
 
     &::before {
-      left: -50rpx;
+      left: -45rpx;
     }
 
     &::after {
-      right: -50rpx;
+      right: -45rpx;
     }
   }
 }
@@ -301,6 +301,9 @@ page {
 }
 
 .select-address {
+  .address-info {
+    padding-right: 36rpx;
+  }
   .address-text {
     font-weight: 600;
     font-size: 30rpx;
@@ -316,12 +319,17 @@ page {
 
     text {
       padding-right: 12rpx;
+
+      &:last-child {
+        color: #777;
+      }
     }
   }
 
   .icon-arrow {
     width: 24rpx;
     height: 24rpx;
+    flex-shrink: 0;
   }
 }
 
@@ -355,6 +363,10 @@ page {
     // align-items: center;
     justify-content: space-between;
 
+    &:last-child {
+      padding-bottom: 0;
+    }
+
     .left-label {
       width: 196rpx;
     }
@@ -434,10 +446,9 @@ page {
   // }
 
   button {
-    margin: 0 0 0 12rpx;
     width: 100%;
     background: linear-gradient(90deg, #544f4a 0%, #302f2b 100%);
-    border-radius: 44rpx;
+    border-radius: 88rpx;
     padding: 22rpx 84rpx;
     font-weight: 500;
     font-size: 32rpx;
@@ -455,6 +466,8 @@ page {
       font-weight: bold;
       color: #FBEAC9;
       font-family: DINAlternate, DINAlternate;
+      display: flex;
+      align-items: flex-end;
 
       .before {
         font-size: 28rpx;
@@ -474,6 +487,7 @@ page {
 
       .priceZ {
         font-size: 56rpx;
+        line-height: 1;
       }
 
       .priceF {
@@ -528,7 +542,7 @@ page {
   z-index: 1;
   text-align: center;
   padding-top: 36rpx;
-  padding-bottom: 36rpx;
+  padding-bottom: 26rpx;
   font-weight: 600;
   font-size: 36rpx;
   color: #131415;
@@ -541,6 +555,14 @@ page {
     font-size: 30rpx;
   }
 
+  .required {
+    font-weight: 600;
+    color: #666666;
+    text {
+      color: #FF5A56;
+    }
+  }
+
   .van-field__label {
     font-weight: 600;
     color: #666666;
@@ -579,7 +601,7 @@ page {
 }
 
 .address-list {
-  padding: 40rpx 26rpx 0;
+  padding: 30rpx 26rpx 0;
   max-height: 534rpx;
   overflow-x: hidden;
   overflow-y: auto;
@@ -615,6 +637,10 @@ page {
 
       text {
         padding-right: 8rpx;
+
+        &:last-child {
+          color: #777;
+        }
       }
     }
 
@@ -639,6 +665,7 @@ page {
       .update-btn {
         background: linear-gradient(90deg, #544F4A 0%, #302F2B 100%);
         color: #FBEAC9;
+        border: none !important;
       }
     }
   }

miniprogram/pages/orders/order-detail.ts

@@ -54,7 +54,7 @@ Page({
     cityName: "",
     provinceCode: 0,
     provinceName: "",
-    regionCode: '',
+    regionCode: null,
     regionName: "",
   },
 
@@ -357,7 +357,9 @@ Page({
             title: data.message,
             icon: 'none'
           })
-          wx.navigateBack()
+          setTimeout(() => {
+            wx.navigateBack()
+          }, 1000)
         } else {
           this.onPayError()
         }
@@ -386,7 +388,9 @@ Page({
             title: res.data.message,
             icon: 'none'
           })
-          wx.navigateBack()
+          setTimeout(() => {
+            wx.navigateBack()
+          }, 1000)
         } else {
           this.onPayError(res.data.message)
         }
@@ -456,7 +460,11 @@ Page({
   /** 关闭添加/修改地址 */
   onCloseAddress() {
     this.setData({
-      addressShow: false,
+      addressShow: false
+    })
+  },
+  onAddressAfterLeave() {
+    this.setData({
       id: "",
       name: '',
       phoneNumber: '',

miniprogram/pages/orders/order-detail.wxml

@@ -128,7 +128,7 @@
     <service wx:if="{{serviceShow}}"></service>
 
 
-    <van-popup show="{{ addressShow }}" safe-area-inset-bottom="{{false}}" lock-scroll="{{true}}" bind:close="onCloseAddress" position="bottom" round z-index="101">
+    <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="top-bg"></view>
       <image src="./images/icon-close1.png" class="icon-close" bind:tap="onCloseAddress" />
       <view class="pop-address-title">
@@ -136,10 +136,18 @@
       </view>
 
       <van-cell-group border="{{ false }}" class="cell-group">
-        <van-field required model:value="{{ name }}" label="收货人姓名" placeholder="请输入收货人姓名" input-align="right" />
-        <van-field required model:value="{{ phoneNumber }}" label="联系方式" type="number" placeholder="请输入手机号码" input-align="right" maxlength="11" />
-        <van-field required value="{{ provinceName ? provinceName + ' ' + cityName + ' ' + regionName : '' }}" label="收货地区" placeholder="请选择地区" input-align="right" readonly is-link bind:tap="onShowAreaList" />
-        <van-field border="{{ false }}" model:value="{{ detailAddress }}" required label="详细地址" type="textarea" placeholder="请输入详细地址" input-align="right" input-class="textarea" />
+        <van-field model:value="{{ name }}" placeholder="请输入收货人姓名" input-align="right" >
+          <view class="required" slot="label"><text>*</text>收货人姓名</view>
+        </van-field>
+        <van-field model:value="{{ phoneNumber }}" type="number" placeholder="请输入手机号码" input-align="right" maxlength="11" >
+          <view class="required" slot="label"><text>*</text>联系方式</view>
+        </van-field>
+        <van-field value="{{ provinceName ? provinceName + ' ' + cityName + ' ' + regionName : '' }}" placeholder="请选择地区" input-align="right" readonly is-link bind:tap="onShowAreaList" >
+          <view class="required" slot="label"><text>*</text>收货地区</view>
+        </van-field>
+        <van-field border="{{ false }}" model:value="{{ detailAddress }}" type="textarea" placeholder="请输入详细地址" input-align="right" input-class="textarea" >
+          <view class="required" slot="label"><text>*</text>详细地址</view>
+        </van-field>
       </van-cell-group>
 
       <view class="pop-btn-group">

miniprogram/pages/orders/orders.less

@@ -87,7 +87,10 @@ page {
     }
 
     >text {
-      color: #777777;
+      color: #777;
+    }
+    .cancel {
+      color: #AAA;
     }
 
     .red {
@@ -234,7 +237,7 @@ page {
       background-color: #FFFFFF;
       border: 2rpx solid #DCDCDC;
       font-weight: 500;
-      font-size: 28rpx;
+      font-size: 24rpx;
       color: #333333;
       width: auto;
       padding: 10rpx 22rpx;
@@ -246,6 +249,7 @@ page {
       background: linear-gradient(90deg, #544F4A 0%, #302F2B 100%);
       border-radius: 76rpx;
       border: none;
+      font-size: 24rpx;
       color: #FBEAC9;
       width: 140rpx !important;
       line-height: 52rpx !important;

miniprogram/pages/orders/orders.wxml

@@ -14,7 +14,7 @@
           <view class="list-item" wx:for="{{recordList}}" wx:key="index" data-orderno="{{item.orderNo}}" data-wechatstatus="{{item.wechatStatus}}" bind:tap="onDetail">
             <view class="item-top">
               <view class="item-mid">订单编号：{{ item.orderNo }}</view>
-              <text class="{{ item.wechatStatus == 'WAIT_PAY' || item.wechatStatus == 'WAIT_USE' || item.wechatStatus == 'REFUNDING' ? 'red' : '' }}">{{ item.statusName }}</text>
+              <text class="{{ item.wechatStatus == 'WAIT_PAY' ? 'red' : item.wechatStatus == 'CLOSED' ? 'cancel' : '' }}">{{ item.statusName }}</text>
             </view>
             <view class="item-content" wx:for="{{item.studentPaymentOrderDetails}}" wx:key="studentIndex">
               <image class='goods-icon' src="{{item.goodsUrl}}" mode="" />

project.private.config.json

@@ -9,29 +9,22 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/orders/order-result",
-          "pathName": "pages/orders/order-result",
-          "query": "orderNo=1888139694953324546",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
           "name": "pages/buyerInformation/index",
           "pathName": "pages/buyerInformation/index",
-          "query": "",
+          "query": "userBeneficiaryId=",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "pages/login/login",
-          "pathName": "pages/login/login",
-          "query": "",
+          "name": "pages/orders/order-result",
+          "pathName": "pages/orders/order-result",
+          "query": "orderNo=1888139694953324546",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "pages/orders/orders",
-          "pathName": "pages/orders/orders",
+          "name": "pages/login/login",
+          "pathName": "pages/login/login",
           "query": "",
           "launchMode": "default",
           "scene": null