修改问题

miniprogram/custom-tab-bar/index.less

@@ -6,7 +6,9 @@
   width: 100%;
   background-color: #FFFFFF;
   box-shadow: inset 0rpx 2rpx 0rpx 0rpx #F0F0F0;
-  padding: 20rpx 32rpx 58rpx 32rpx;
+  padding: 24rpx 32rpx 24rpx 32rpx;
+  padding-bottom: calc(env(safe-area-inset-bottom) + 24rpx);
+  /* 新版 iOS */
   display: flex;
   align-items: center;
   box-sizing: border-box;
@@ -16,7 +18,6 @@
     display: flex;
     align-items: center;
     margin-right: 40rpx;
-    padding: 8rpx 0 16rpx;
 
     &.active {
       text {

miniprogram/custom-tab-bar/index.ts

@@ -12,26 +12,32 @@ Component({
    * 组件的初始数据
    */
   data: {
+    showBar: true, // 是否显示底部按钮
     selected: 0,
-    paths: ['pages/index/index', 'pages/orders/orders']
+    color: "#AAAAAA",
+    selectedColor: "#131415",
+    list: [{
+      pagePath: "/pages/index/index",
+      iconPath: "./images/icon-home.png",
+      selectedIconPath: "./images/icon-home-active.png",
+      text: "首页"
+    }, {
+      pagePath: "/pages/orders/orders",
+      iconPath: "./images/icon-order.png",
+      selectedIconPath: "./images/icon-order-active.png",
+      text: "订单"
+    }]
   },
-
   /**
    * 组件的方法列表
    */
   methods: {
     switchTab(e: any) {
       const data = e.currentTarget.dataset
-      // const url = data.path
-      // wx.switchTab({url})
-      // this.setData({
-      //   selected: data.index
-      // })
-      console.log(e, 'data', data, this.data.paths[Number(data.id)])
-      const path = this.data.paths[Number(data.id)]
-      wx.switchTab({ path })
+      const url = data.path
+      wx.switchTab({ url })
       this.setData({
-        selected: data.id
+        selected: data.index
       })
     }
   }

miniprogram/custom-tab-bar/index.wxml

@@ -1,13 +1,7 @@
 <!--custom-tab-bar/index.wxml-->
-<view class="bottom-section">
-  <view class="orders {{ selected === 0 ? 'active' : '' }}" bind:tap="switchTab" data-id="0">
-    <image wx:if="{{ selected === 0 }}" src="./images/icon-home-active.png" />
-    <image wx:else src="./images/icon-home.png" />
-    <text>首页</text>
-  </view>
-  <view class="orders {{ selected === 1 ? 'active' : '' }}" bind:tap="switchTab" data-id="1">
-    <image wx:if="{{ selected === 1 }}" src="./images/icon-order-active.png" />
-    <image wx:else src="./images/icon-order.png" />
-    <text>订单</text>
+<view class="bottom-section" wx:if="{{ showBar }}">
+  <view class="orders" bind:tap="switchTab" wx:for="{{list}}" wx:key="index" data-path="{{item.pagePath}}" data-index="{{index}}">
+    <image  src="{{ selected === index ? item.selectedIconPath : item.iconPath }}" />
+    <text style="color: {{selected === index ? selectedColor : color}}">{{item.text}}</text>
   </view>
 </view>

miniprogram/pages/address/index.json

@@ -7,8 +7,5 @@
     "van-popup": "@vant/weapp/popup/index",
     "van-area": "@vant/weapp/area/index"
   },
-  "disableScroll": true,
-  "window": {
-    "resize": true
-  }
+  "disableScroll": true
 }

miniprogram/pages/index/index.json

@@ -9,5 +9,6 @@
     "van-loading": "@vant/weapp/loading/index",
     "van-action-sheet": "@vant/weapp/action-sheet/index",
     "service": "/components/service/service"
-  }
+  },
+  "disableScroll": true
 }

miniprogram/pages/index/index.less

@@ -24,7 +24,7 @@
   }
 
   .swiper-item {
-    transition: all 0.15s ease;
+    transition: all 0.4s ease;
     /* 调整过渡动画的时长和缓动函数，影响淡入淡出和缩放的速度 */
     transform-origin: center center;
     /* 明确缩放的中心点位置 */
@@ -36,7 +36,7 @@
     height: 1142rpx;
 
     &.current {
-      transition: all 0.2s ease;
+      transition: all 0.35s ease;
       max-width: 100%;
       max-height: 100%;
     }
@@ -321,9 +321,13 @@ page {
   }
 }
 
-.goodsSection {
+// .goodsSection {
   // margin-bottom: 156rpx;
-  padding-bottom: 154rpx;
+  // padding-bottom: 154rpx;
+// }
+.well {
+  height: 74rpx;
+  padding-bottom: calc(env(safe-area-inset-bottom) + 24rpx);
 }
 
 .goodsIntro {
@@ -436,24 +440,20 @@ page {
   flex-direction: column;
 
   .popup-container {
-    // position: fixed;
-    // bottom: 0;
-    // left: 0;
-    // right: 0;
-    // z-index: 10;
     width: 100%;
     background: #FFFFFF;
     border-radius: 32rpx 32rpx 0rpx 0rpx;
-    // padding: 40rpx 0 0;
     box-sizing: border-box;
-    // flex: 1;
-    max-height: 86vh;
+    flex: 1 auto;
+    overflow-y: auto;
+    overscroll-behavior: none;
 
     .popup-scroll {
-      overflow-x: hidden;
-      overflow-y: scroll;
+      // overflow-x: hidden;
+      // overflow-y: scroll;
       border-radius: 32rpx 32rpx 0rpx 0rpx;
       flex: 1 auto;
+      // 
     }
 
     .top-vip-img {
@@ -614,10 +614,10 @@ page {
 }
 
 .popupBottom {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
+  // position: fixed;
+  // bottom: 0;
+  // left: 0;
+  // right: 0;
   background: #ffffff;
   border-top: 2rpx solid #F0F0F0;
   padding: 0 32rpx 58rpx;
@@ -720,8 +720,8 @@ page {
   margin: 24rpx 0;
   // background: linear-gradient(180deg, #E3F9FF 0%, #FFFFFF 9%, #FFFFFF 100%);
   border-radius: 18rpx;
-  overflow-x: hidden;
-  overflow-y: auto;
+  // overflow-x: hidden;
+  // overflow-y: auto;
 
   flex: 1 auto;
 

miniprogram/pages/index/index.ts

@@ -155,19 +155,14 @@ Page({
     showClass: false,
     showClassAfterLeave: false, // 离开后
     buyerLoading: false,
-    currentIndex: 0,
+    // currentIndex: 0,
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad(options: any) {
-    // this.onInit()
-    if(options.currentIndex) {
-      this.setData({
-        currentIndex: options.currentIndex
-      })
-    }
+  onLoad() {
+    this.onControllTabBar(false)
   },
   /**
    * 获取基础信息
@@ -252,8 +247,14 @@ Page({
   },
   /** 切换swiper */
   onSwiperChange(e: any) {
-    console.log(e, 'e')
-    return false
+    const current = e.detail.current
+    this.onControllTabBar(current === 0 ? false : true)
+  },
+  /** 显示或隐藏tabbar */
+  onControllTabBar(status: boolean) {
+    this.getTabBar().setData({
+      showBar: status
+    })
   },
   // 选择
   onSelectGoods(e: any) {
@@ -392,14 +393,16 @@ Page({
     if (!this.isLogin()) {
       return
     }
+    this.onControllTabBar(false)
     this.setData({
       popupShow: true
     })
   },
   onClose() {
+    this.onControllTabBar(true)
     this.setData({
       popupShow: false,
-      currentIndex: 1,
+      // currentIndex: 1,
       userBeneficiaryId: '',
       userBeneficiaryInfo: {
         name: '',
@@ -457,14 +460,13 @@ Page({
       });
       info = encodeURIComponent(info);
 
-      console.log(params, "params")
       wx.navigateTo({
         url: `../orders/order-detail?orderInfo=${info}&userBeneficiaryId=${that.data.userBeneficiaryId}`,
         success: () => {
           that.setData({
-            popupShow: false,
-            currentIndex: 1,
+            popupShow: false
           })
+          that.onControllTabBar(true)
         }
       })
     }, 500)()
@@ -506,6 +508,10 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
+    // console.log(this.getTabBar())
+    this.getTabBar().setData({
+      selected: 0
+    })
     if (!this.data.isFromPreviewImage) {
       this.onInit()
     } else {
@@ -944,7 +950,7 @@ Page({
   },
   /** 确定选择学校 */
   onSubmitSchool() {
-    if(this.data.tempChangeSchoolAreaId === this.data.schoolAreaId) {
+    if (this.data.tempChangeSchoolAreaId === this.data.schoolAreaId) {
       this.setData({
         showSchool: false
       })

miniprogram/pages/index/index.wxml

@@ -1,6 +1,6 @@
-<swiper current="{{ currentIndex }}" indicator-dots="{{false}}" vertical="true" class="firstConainer">
+<swiper current="{{ currentIndex }}" indicator-dots="{{false}}" vertical="true" class="firstConainer" bindchange="onSwiperChange">
   <!--  || !showBuyer || !showGender || showArea || showSchool || showGradeClass || showClass -->
-  <swiper-item wx:if="{{ !popupShow }}">
+  <swiper-item>
     <view class="pageContainer firstPageContainer">
       <navigation-bar title="器乐数字AI工具" back="{{false}}"></navigation-bar>
       <swiper indicator-dots="{{false}}" class="fistSwiperSection" previous-margin="78rpx" next-margin="78rpx" bindchange="onFirstChange">
@@ -20,7 +20,7 @@
   <swiper-item>
     <view class="pageContainer">
       <!--index.wxml-->
-      <scroll-view class="scrollarea" bounces="false" scroll-y="{{popupShow ? false : true}}" type="list">
+      <scroll-view class="scrollarea" bounces="false" scroll-y type="list">
         <view class="container">
           <!-- <view class="topShadow"></view> -->
           <view class="slider-count">{{current + 1}}/{{imgList.length}}</view>
@@ -75,6 +75,8 @@
             </view>
           </view>
 
+          <view class="well"></view>
+
           <!-- <view class="bottom-section">
             <view class="orders active">
               <image src="./images/icon-home-active.png" />
@@ -87,164 +89,159 @@
           </view> -->
 
 
-          <van-popup show="{{ popupShow }}" safe-area-inset-bottom="{{false}}" lock-scroll="{{true}}" bind:close="onClose" position="bottom" round z-index="101">
-            <view class="popup-section">
-              <image bind:tap="onClose" src="./images/icon-close-1.png" class="iconClose"></image>
-              <!-- wx:if="{{popupShow}}" -->
-              <!-- <view class="popup-mask" bind:tap="onClose"></view> -->
-              <scroll-view class="popup-container" bounces="false" scroll-y="true" type="list">
-
-                <view class="popup-scroll">
-                  <image src="https://oss.dayaedu.com/ktyq/1739242193106.png" mode="widthFix" class="top-vip-img"></image>
-                  <!-- 添加权益人 -->
-                  <view class="addBuyer" bind:tap="onSelectBuyer">
-                    <view class="addBuyer-left">
-                      <image src="./images/icon-man.png" class="icon-man"></image>
-                      <view class="info" wx:if="{{ userBeneficiaryId }}">
-                        <view class="users">
-                          <text>{{ userBeneficiaryInfo.name }}</text>
-                          <text>{{ userBeneficiaryInfo.phoneNumber }}</text>
-                        </view>
-                        <view class="address">{{ userBeneficiaryInfo.schoolInfo }}</view>
-                      </view>
-                      <view class="info" wx:else>
-                        <view class="users">
-                          <text>请填写享用者的个人信息</text>
-                        </view>
-                      </view>
-                    </view>
-                    <image src="./images/icon-arrow-right.png" class="arrow-right"></image>
-                  </view>
-
-                  <view class="goodsInfo">
-                    <view class="desc">会员有效期</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 }}">{{ item.typeName }}
-                        <image wx:if="{{ item.stockNum <= 0 }}" src="./images/nosale.png"></image>
-                      </view>
-                    </view>
-                  </view>
-
-                  <view class="goodsInfo">
-                    <view class="desc">乐器搭配<text>(非必选)</text></view>
-                    <view class="goodsList">
-                      <view wx:for="{{ instrumentList }}" wx:key="index" class="goodsItem {{ item.id == selectInstrumentId ? 'selected' : '' }}" bind:tap="onSelectInstrument" data-id="{{ item.id }}">
-                        {{ item.name }}<text>¥{{ item.showSalePrice }}</text>
-                      </view>
-                    </view>
-                  </view>
-                </view>
-                <view style="padding-bottom: 300rpx;"></view>
-                <view class="popupBottom">
-                  <!-- 有选择商品的时候 -->
-                  <view class="current-item" wx:if="{{!isOverSaled && selected.id}}">
-                    <!-- <view class="current-item-text">您已选择：</view> -->
-                    <view class="current-top">
-                      共计 <view class="prices"><text class="stuff">¥</text>
-                        <text class="priceZ">{{ formatSelectGood.integerPart || 0 }}</text>
-                        <text class="priceF">.{{ formatSelectGood.decimalPart || '00' }}</text>
-                      </view>
-                      <block wx:if="{{  formatSelectGood.originalPrice > formatSelectGood.salePrice }}">
-                        <text class="line">|</text>原价 ¥{{ formatSelectGood.showOriginalPrice }}
-                      </block>
-
-                      <block wx:if="{{ formatSelectGood.originalPrice > formatSelectGood.salePrice }}">
-                        <text class="line">|</text>
-                        <text>优惠 ¥{{ formatSelectGood.discountPrice }}</text>
-                      </block>
-                    </view>
-
-                    <view class="current-select-text">已选：会员有效期{{ formatSelectGood.typeName }}</view>
-                  </view>
-                  <view class="btnGroup">
-                    <button type="primary" catch:tap="onSubmit">立即享受专属权益</button>
-                  </view>
-                </view>
-              </scroll-view>
-              <!-- <view class="popup-container">
-                
-              </view> -->
-            </view>
-          </van-popup>
+
         </view>
 
-        <!-- <service popShow="{{ showService }}" bind:changePop="changePop"></service> -->
-        <van-popup show="{{ showBuyer }}" safe-area-inset-bottom="{{false}}" lock-scroll="{{true}}" bind:close="onCloseBuyer" position="bottom" round z-index="101">
-          <image src="./images/icon-back.png" class="icon-close-pop" bind:tap="onCloseBuyer" />
-          <view class="container-pop">
-            <view class="pop-address-title">享用者信息</view>
-            <!-- <view class="section">
-             
-            </view> -->
-            <scroll-view class="section" bounces="false" scroll-y="true" type="list">
-              <view class="section-content">
-                <van-field label="姓名" model:value="{{ name }}" maxlength="14" placeholder="请填写享用者姓名" />
-                <van-field label="电话号码" model:value="{{ phone }}" maxlength="11" type="number" placeholder="请填写电话号码" />
-                <van-field label="性别" placeholder="请选择性别" value="{{ gender ? (gender === '1' ? '男' : '女') : '' }}" is-link readonly bind:tap="onCheckedGender"></van-field>
+      </scroll-view>
 
-                <van-field label="学校地区" value="{{ provinceName ? provinceName + '/' + cityName +  (regionName ? ('/' + regionName) : '') : '' }}" bind:tap="onShowAreaList" placeholder="请选择学校地区" is-link readonly />
 
-                <van-field model:value="{{ schoolAreaName }}" label="所在学校" placeholder="请选择所在学校" is-link readonly bind:tap="onSelectSchool" />
-                <van-field value="{{ currentGradeTxt }}" label="所在年级" placeholder="请选择所在年级" is-link readonly bind:tap="onSelectGradeClass" />
-                <van-field value="{{ currentClassTxt }}" label="所在班级" placeholder="请选择所在年级" is-link readonly bind:tap="onSelectClass" />
+    </view>
+  </swiper-item>
+</swiper>
+
+<van-popup show="{{ popupShow }}" safe-area-inset-bottom="{{false}}" lock-scroll="{{true}}" bind:close="onClose" position="bottom" round z-index="101" bind:close="onClose">
+  <view class="popup-section">
+    <image bind:tap="onClose" src="./images/icon-close-1.png" class="iconClose"></image>
+    <scroll-view class="popup-container" bounces="{{ false }}" enhanced scroll-y type="list">
+      <!-- <view class="popup-container"> -->
+      <view class="popup-scroll">
+        <image src="https://oss.dayaedu.com/ktyq/1739242193106.png" mode="widthFix" class="top-vip-img"></image>
+        <!-- 添加权益人 -->
+        <view class="addBuyer" bind:tap="onSelectBuyer">
+          <view class="addBuyer-left">
+            <image src="./images/icon-man.png" class="icon-man"></image>
+            <view class="info" wx:if="{{ userBeneficiaryId }}">
+              <view class="users">
+                <text>{{ userBeneficiaryInfo.name }}</text>
+                <text>{{ userBeneficiaryInfo.phoneNumber }}</text>
+              </view>
+              <view class="address">{{ userBeneficiaryInfo.schoolInfo }}</view>
+            </view>
+            <view class="info" wx:else>
+              <view class="users">
+                <text>请填写享用者的个人信息</text>
               </view>
-            </scroll-view>
+            </view>
+          </view>
+          <image src="./images/icon-arrow-right.png" class="arrow-right"></image>
+        </view>
 
+        <view class="goodsInfo">
+          <view class="desc">会员有效期</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 }}">{{ item.typeName }}
+              <image wx:if="{{ item.stockNum <= 0 }}" src="./images/nosale.png"></image>
+            </view>
+          </view>
+        </view>
 
-            <view class="pop-btn-group">
-              <button disabled="{{ buyerLoading }}" class="submit-btn" bind:tap="onSubmitBuyer">保存信息</button>
+        <view class="goodsInfo">
+          <view class="desc">乐器搭配<text>(非必选)</text></view>
+          <view class="goodsList">
+            <view wx:for="{{ instrumentList }}" wx:key="index" class="goodsItem {{ item.id == selectInstrumentId ? 'selected' : '' }}" bind:tap="onSelectInstrument" data-id="{{ item.id }}">
+              {{ item.name }}<text>¥{{ item.showSalePrice }}</text>
             </view>
           </view>
-        </van-popup>
+        </view>
+      </view>
+      <!-- </view> -->
+    </scroll-view>
+    <view class="popupBottom">
+      <view class="current-item" wx:if="{{!isOverSaled && selected.id}}">
+        <view class="current-top">
+          共计 <view class="prices"><text class="stuff">¥</text>
+            <text class="priceZ">{{ formatSelectGood.integerPart || 0 }}</text>
+            <text class="priceF">.{{ formatSelectGood.decimalPart || '00' }}</text>
+          </view>
+          <block wx:if="{{  formatSelectGood.originalPrice > formatSelectGood.salePrice }}">
+            <text class="line">|</text>原价 ¥{{ formatSelectGood.showOriginalPrice }}
+          </block>
+
+          <block wx:if="{{ formatSelectGood.originalPrice > formatSelectGood.salePrice }}">
+            <text class="line">|</text>
+            <text>优惠 ¥{{ formatSelectGood.discountPrice }}</text>
+          </block>
+        </view>
 
-        <!-- 性别 -->
-        <van-action-sheet z-index="109" show="{{ showGender }}" actions="{{ genderList }}" description="选择性别" cancel-text="取消" bind:close="onCloseGender" bind:cancel="onCloseGender" bind:select="onSelectGender" />
+        <view class="current-select-text">已选：会员有效期{{ formatSelectGood.typeName }}</view>
+      </view>
+      <view class="btnGroup">
+        <button type="primary" catch:tap="onSubmit">立即享受专属权益</button>
+      </view>
+    </view>
+  </view>
+</van-popup>
 
-        <!-- 地区 -->
-        <van-popup round="{{true}}" lock-scroll="{{true}}" z-index="{{103}}" show="{{showArea}}" position="bottom" safe-area-inset-bottom="{{false}}" bind:close="onCloseAreaList" bind:after-leave="onAreaAfterLeave" bind:before-enter="onAreaBeforeEnter">
-          <van-area wx:if="{{ !showAreaAfterLeave }}" id='area1' areaList="{{areaList}}" visible-item-count="8" item-height="46" value="{{ regionCode || cityCode }}" bind:cancel="onCloseAreaList" bind:confirm="submitArea" />
-        </van-popup>
 
-        <!-- 学校 -->
-        <van-popup round="{{true}}" lock-scroll="{{true}}" z-index="{{102}}" show="{{showSchool}}" position="bottom" safe-area-inset-bottom="{{false}}" bind:close="onCloseSchool" bind:after-leave="onSchoolAfterLeave" bind:before-enter="onSchoolBeforeEnter">
-          <view class="toolbar-top">
-            <view class="toolbar-cancel" bind:tap="onCloseSchool">取消</view>
-            <view class="toolbar-confirm" bind:tap="onSubmitSchool">确认</view>
-          </view>
-          <view class="select-school">
-            <van-field border="{{ false }}" value="{{ provinceName ? provinceName + ' ' + cityName + ' ' + regionName : '' }}" bind:tap="onShowAreaList" placeholder="请选择学校地区" is-link readonly />
-          </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">
-              <image slot="left-icon" src="./images/icon-search.png" class="icon-search" />
-              <view slot="action" class="searchBtn" bind:tap="onSearch">搜索</view>
-            </van-search>
-          </view>
-          <van-picker id="schoolArea" loading="{{ schoolLoading }}" wx:if="{{ !showSchoolAfterLeave && schoolAreaList.length > 0 }}" columns="{{ schoolAreaList }}" bind:change="onChangeSchool" visible-item-count="6" default-index="{{ schoolAreaIndex }}">
-          </van-picker>
-          <view class="empty-box" wx:if="{{ schoolAreaList.length <= 0 }}">
-            <view class="empty_loading" wx:if="{{ schoolLoading }}">
-              <van-loading color="#1989fa" />
-            </view>
-            <image mode="widthFix" src="https://oss.dayaedu.com/ktyq/1731839238916.png"></image>
-            <view class="empty-text">暂无数据</view>
-          </view>
-        </van-popup>
-
-
-        <!-- 年级 -->
-        <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="6" 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="6" show-toolbar default-index="{{ classIndex }}" bind:cancel="onCloseClass" bind:confirm="onSubmitClass">
-          </van-picker>
-        </van-popup>
-      </scroll-view>
+<van-popup show="{{ showBuyer }}" safe-area-inset-bottom="{{false}}" lock-scroll="{{true}}" bind:close="onCloseBuyer" position="bottom" round z-index="101">
+  <image src="./images/icon-back.png" class="icon-close-pop" bind:tap="onCloseBuyer" />
+  <view class="container-pop">
+    <view class="pop-address-title">享用者信息</view>
+    <!-- <view class="section">
+             
+            </view> -->
+    <scroll-view class="section" bounces="{{ false }}" enhanced scroll-y type="list">
+      <view class="section-content">
+        <van-field label="姓名" model:value="{{ name }}" maxlength="14" placeholder="请填写享用者姓名" />
+        <van-field label="电话号码" model:value="{{ phone }}" maxlength="11" type="number" placeholder="请填写电话号码" />
+        <van-field label="性别" placeholder="请选择性别" value="{{ gender ? (gender === '1' ? '男' : '女') : '' }}" is-link readonly bind:tap="onCheckedGender"></van-field>
 
+        <van-field label="学校地区" value="{{ provinceName ? provinceName + '/' + cityName +  (regionName ? ('/' + regionName) : '') : '' }}" bind:tap="onShowAreaList" placeholder="请选择学校地区" is-link readonly />
 
+        <van-field model:value="{{ schoolAreaName }}" label="所在学校" placeholder="请选择所在学校" is-link readonly bind:tap="onSelectSchool" />
+        <van-field value="{{ currentGradeTxt }}" label="所在年级" placeholder="请选择所在年级" is-link readonly bind:tap="onSelectGradeClass" />
+        <van-field value="{{ currentClassTxt }}" label="所在班级" placeholder="请选择所在年级" is-link readonly bind:tap="onSelectClass" />
+      </view>
+    </scroll-view>
+
+    <view class="pop-btn-group">
+      <button disabled="{{ buyerLoading }}" class="submit-btn" bind:tap="onSubmitBuyer">保存信息</button>
     </view>
-  </swiper-item>
-</swiper>
+  </view>
+</van-popup>
+
+<!-- 性别 -->
+<van-action-sheet z-index="109" show="{{ showGender }}" actions="{{ genderList }}" description="选择性别" cancel-text="取消" bind:close="onCloseGender" bind:cancel="onCloseGender" bind:select="onSelectGender" />
+
+<!-- 地区 -->
+<van-popup round="{{true}}" lock-scroll="{{true}}" z-index="{{103}}" show="{{showArea}}" position="bottom" safe-area-inset-bottom="{{false}}" bind:close="onCloseAreaList" bind:after-leave="onAreaAfterLeave" bind:before-enter="onAreaBeforeEnter">
+  <van-area wx:if="{{ !showAreaAfterLeave }}" id='area1' areaList="{{areaList}}" visible-item-count="8" item-height="46" value="{{ regionCode || cityCode }}" bind:cancel="onCloseAreaList" bind:confirm="submitArea" />
+</van-popup>
+
+<!-- 学校 -->
+<van-popup round="{{true}}" lock-scroll="{{true}}" z-index="{{102}}" show="{{showSchool}}" position="bottom" safe-area-inset-bottom="{{false}}" bind:close="onCloseSchool" bind:after-leave="onSchoolAfterLeave" bind:before-enter="onSchoolBeforeEnter">
+  <view class="toolbar-top">
+    <view class="toolbar-cancel" bind:tap="onCloseSchool">取消</view>
+    <view class="toolbar-confirm" bind:tap="onSubmitSchool">确认</view>
+  </view>
+  <view class="select-school">
+    <van-field border="{{ false }}" value="{{ provinceName ? provinceName + ' ' + cityName + ' ' + regionName : '' }}" bind:tap="onShowAreaList" placeholder="请选择学校地区" is-link readonly />
+  </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">
+      <image slot="left-icon" src="./images/icon-search.png" class="icon-search" />
+      <view slot="action" class="searchBtn" bind:tap="onSearch">搜索</view>
+    </van-search>
+  </view>
+  <van-picker id="schoolArea" loading="{{ schoolLoading }}" wx:if="{{ !showSchoolAfterLeave && schoolAreaList.length > 0 }}" columns="{{ schoolAreaList }}" bind:change="onChangeSchool" visible-item-count="6" default-index="{{ schoolAreaIndex }}">
+  </van-picker>
+  <view class="empty-box" wx:if="{{ schoolAreaList.length <= 0 }}">
+    <view class="empty_loading" wx:if="{{ schoolLoading }}">
+      <van-loading color="#1989fa" />
+    </view>
+    <image mode="widthFix" src="https://oss.dayaedu.com/ktyq/1731839238916.png"></image>
+    <view class="empty-text">暂无数据</view>
+  </view>
+</van-popup>
+
+
+<!-- 年级 -->
+<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="6" 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="6" show-toolbar default-index="{{ classIndex }}" bind:cancel="onCloseClass" bind:confirm="onSubmitClass">
+  </van-picker>
+</van-popup>

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-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/orders.less

@@ -259,7 +259,8 @@
   box-shadow: inset 0rpx 2rpx 0rpx 0rpx #F0F0F0;
   // padding: 20rpx 32rpx 58rpx 32rpx;
   padding: 24rpx 32rpx 24rpx 32rpx;
-  padding-bottom: calc(env(safe-area-inset-bottom) + 24rpx); /* 新版 iOS */
+  padding-bottom: calc(env(safe-area-inset-bottom) + 24rpx);
+  /* 新版 iOS */
   display: flex;
   align-items: center;
   box-sizing: border-box;
@@ -336,4 +337,9 @@
     text-align: center;
     padding-top: 24rpx;
   }
+}
+
+.well {
+  height: 68rpx;
+  padding-bottom: calc(env(safe-area-inset-bottom) + 24rpx);
 }

miniprogram/pages/orders/orders.ts

@@ -55,6 +55,9 @@ Page({
   onLoad() {
   },
   onShow() {
+    this.getTabBar().setData({
+      selected: 1
+    })
     this.setData({
       page: 1,
       maxPage: 1,

miniprogram/pages/orders/orders.wxml

@@ -1,6 +1,6 @@
 <!--pages/orders/orders.wxml-->
 <view class="container">
-  <navigation-bar title="订单列表"></navigation-bar>
+  <navigation-bar back="{{ false }}" title="订单列表"></navigation-bar>
 
   <view class="record-content">
     <view class="record-tab">
@@ -61,17 +61,7 @@
       </block>
     </scroll-view>
 
-    <view class="bottom-section">
-      <view class="orders" bind:tap="onOne">
-        <image src="./images/icon-home.png" />
-        <text>首页</text>
-      </view>
-      <view class="orders active">
-        <image src="./images/icon-order-active.png" />
-        <text>订单</text>
-      </view>
-    </view>
-
+    <view class="well"></view>
   </view>
   <!-- 申请退款 -->
   <!-- <apply-refound refoundStatus="{{ refoundStatus }}" goodsInfo="{{goodsInfo}}" bind:changeRefoundStatus="changeRefoundStatus" bind:onConfirm="onRefoundComfirm"></apply-refound> -->