修改样式

miniprogram/pages/address/address-detail.less

@@ -19,7 +19,7 @@
 
 
 .pop-btn-list {
-  padding: 24rpx 32rpx 58rpx;
+  padding: 12rpx 32rpx 50rpx;
   box-shadow: inset 0rpx 2rpx 0rpx 0rpx #F0F0F0;
   background-color: #fff;
 

miniprogram/pages/address/address-detail.ts

@@ -256,7 +256,16 @@ Page({
           title: '保存成功',
           icon: 'none'
         })
-        prevPage?.setData({ backParams: this.data.id });
+        prevPage?.setData({
+          backParams: {
+            receiveAddress: this.data.id,
+            receiveAddressInfo: {
+              addressDetail: this.data.id ? (addressForm.provinceName || '') + (addressForm.cityName || '') + (addressForm.regionName || '') + addressForm.detailAddress : '',
+              name: addressForm?.name,
+              phoneNumber: addressForm?.phoneNumber
+            }
+          }
+        });
       } else {
         const { data } = await api_userReceiveAddressSave({
           ...params
@@ -266,9 +275,17 @@ Page({
           icon: 'none'
         })
 
-        prevPage?.setData({ backParams: data.data });
+        prevPage?.setData({
+          backParams: {
+            receiveAddress: data.data,
+            receiveAddressInfo: {
+              addressDetail: data.data ? (addressForm.provinceName || '') + (addressForm.cityName || '') + (addressForm.regionName || '') + addressForm.detailAddress : '',
+              name: addressForm?.name,
+              phoneNumber: addressForm?.phoneNumber
+            }
+          }
+        });
       }
-      // this.onCloseAddress()
 
       setTimeout(() => {
         this.setData({

miniprogram/pages/address/index.less

@@ -4,6 +4,8 @@
   display: flex;
   flex-direction: column;
   background: #F5F6F7;
+
+  --popup-round-border-radius: 20rpx !important;
 }
 
 .record-list {
@@ -14,7 +16,7 @@
 
 
 .address-list {
-  padding: 24rpx 26rpx 0;
+  padding: 24rpx 26rpx;
 }
 
 .address-item {
@@ -24,6 +26,10 @@
   border: 2rpx solid #fff;
   margin-bottom: 22rpx;
 
+  &:last-child {
+    margin-bottom: 0;
+  }
+
   // &.active {
   //   border: 2rpx solid rgba(254, 36, 81, 0.7);
   //   background: #FFF4F6;
@@ -60,6 +66,16 @@
       color: #333;
       line-height: 36rpx;
       font-weight: bold;
+      display: flex;
+      align-items: center;
+
+      .username {
+        max-width: 200rpx;
+        white-space: nowrap;
+        overflow: hidden;
+        display: block;
+        text-overflow: ellipsis;
+      }
 
       text {
         padding-right: 12rpx;
@@ -97,24 +113,24 @@
 
 
 .dialog-section {
-  width: 552rpx;
-  background: linear-gradient(180deg, #FFDEE7 0%, #FFFFFF 19%, #FFFFFF 100%);
-  border-radius: 32rpx;
-  padding: 40rpx;
+  width: 532rpx;
+  // background: linear-gradient(180deg, #FFDEE7 0%, #FFFFFF 19%, #FFFFFF 100%);
+  // border-radius: 20rpx;
   box-sizing: border-box;
 
-  .dialog-title {
-    text-align: center;
-    font-weight: 600;
-    font-size: 36rpx;
-    color: #000000;
-    line-height: 50rpx;
-  }
+  // .dialog-title {
+  //   text-align: center;
+  //   font-weight: 600;
+  //   font-size: 36rpx;
+  //   color: #000000;
+  //   line-height: 50rpx;
+  // }
 
   .dialog-content {
-    padding: 40rpx 0 50rpx;
+    padding: 48rpx 0;
     font-size: 32rpx;
-    color: #777777;
+    color: #131415;
+    font-weight: 600;
     line-height: 44rpx;
     text-align: center;
   }
@@ -122,23 +138,19 @@
   .dialog-btn-group {
     display: flex;
     align-items: center;
+    border-top: 2rpx solid #F2F2F2;
 
     .btn {
       flex: 1;
       text-align: center;
-      line-height: 68rpx;
-      background: #F4F4F5;
-      border-radius: 36rpx;
+      line-height: 80rpx;
       font-size: 28rpx;
-      color: #131415;
+      color: #777777;
     }
 
     .del-btn {
-      margin-left: 32rpx;
-      background: linear-gradient(270deg, #FF204B 0%, #FE5B71 100%);
-      border-radius: 36rpx;
-      border: 2rpx solid #FE2451;
-      color: #FFFFFF;
+      border-left: 2rpx solid #F2F2F2;
+      color: #FE4600;
     }
   }
 }
@@ -155,8 +167,8 @@
   color: #999999;
 
   image {
-    width: 436rpx;
-    height: 364rpx;
+    width: 384rpx;
+    height: 198rpx;
   }
 
   .empty-text {
@@ -169,7 +181,7 @@
 }
 
 .pop-btn-list {
-  padding: 24rpx 32rpx 58rpx;
+  padding: 12rpx 32rpx 50rpx;
   box-shadow: inset 0rpx 2rpx 0rpx 0rpx #F0F0F0;
   background-color: #fff;
 

miniprogram/pages/address/index.ts

@@ -33,7 +33,7 @@ Page({
   onShow() {
     if (this.data.backParams) {
       this.setData({
-        id: this.data.backParams,
+        id: this.data.backParams?.receiveAddress,
         backParams: null,
         addressList: []
       }, () => {

miniprogram/pages/address/index.wxml

@@ -4,27 +4,27 @@
   <scroll-view class="record-list" type="list" scroll-y>
     <view class="address-list">
       <view class="empty-box" wx:if="{{ addressList.length <= 0 }}">
-        <image src="https://oss.dayaedu.com/ktyq/1731839238916.png"></image>
+        <image src="https://oss.dayaedu.com/ktyq/1739864764800.png"></image>
         <view class="empty-text">暂无收货地址</view>
       </view>
-      <view wx:for="{{ addressList }}" wx:key="index">
-        <view class="address-item" bind:tap="onSelectAddress" data-id="{{ item.id }}">
-          <view class="item-users">
-            <image src="./image/icon-checked.png" wx:if="{{ item.id === id }}" class="iconChecked"></image>
-            <view class="item-user">
-              <text>{{ item.name }}</text>
-              <text>{{ item.phoneNumber }}</text>
-            </view>
-          </view>
-          <view class="detailAddress">
-            {{ item.provinceName }}{{ item.cityName }}{{ item.regionName }}{{ item.detailAddress }}
-          </view>
-          <view class="item-btn-group">
-            <button class="btn del-btn" catch:tap="onRemoveAddress" data-id="{{ item.id }}">删除</button>
-            <button class="btn update-btn" catch:tap="onUpdateAddress" data-id="{{ item.id }}">修改</button>
+
+      <view wx:for="{{ addressList }}" wx:key="index" class="address-item" bind:tap="onSelectAddress" data-id="{{ item.id }}">
+        <view class="item-users">
+          <image src="./image/icon-checked.png" wx:if="{{ item.id === id }}" class="iconChecked"></image>
+          <view class="item-user">
+            <text class="username">{{ item.name }}</text>
+            <text>{{ item.phoneNumber }}</text>
           </view>
         </view>
+        <view class="detailAddress">
+          {{ item.provinceName }}{{ item.cityName }}{{ item.regionName }}{{ item.detailAddress }}
+        </view>
+        <view class="item-btn-group">
+          <button class="btn del-btn" catch:tap="onRemoveAddress" data-id="{{ item.id }}">删除</button>
+          <button class="btn update-btn" catch:tap="onUpdateAddress" data-id="{{ item.id }}">修改</button>
+        </view>
       </view>
+
     </view>
   </scroll-view>
 
@@ -35,13 +35,13 @@
 
   <van-popup round lock-scroll="{{true}}" z-index="{{102}}" show="{{showDialog}}">
     <view class="dialog-section">
-      <view class="dialog-title">删除地址</view>
+      <!-- <view class="dialog-title">删除地址</view> -->
 
-      <view class="dialog-content">确认要删除该收货地址吗？</view>
+      <view class="dialog-content">确认删除该地址吗？</view>
 
       <view class="dialog-btn-group">
         <view class="btn" bind:tap="onDialogClose">取消</view>
-        <view class="btn del-btn" bind:tap="onDialogConfirm">确认</view>
+        <view class="btn del-btn" bind:tap="onDialogConfirm">删除</view>
       </view>
     </view>
   </van-popup>

miniprogram/pages/buyerInformation/index.less

@@ -89,7 +89,7 @@
 
 .btnGroup {
   // box-shadow: inset 0rpx 2rpx 0rpx 0rpx #F0F0F0;
-  padding: 22rpx 32rpx 56rpx;
+  padding: 12rpx 32rpx 50rpx;
   background-color: #fff;
 
   button {
@@ -102,6 +102,7 @@
     box-shadow: 0rpx 14rpx 14rpx 0rpx rgba(0, 0, 0, 0.18);
     border-radius: 30rpx;
     border: 8rpx solid #FFFFFF;
+    box-sizing: border-box;
   }
 }
 
@@ -194,6 +195,10 @@ toolbar-confirm {
   font-weight: 400;
   color: #999999;
   position: relative;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
 
   .empty_loading {
     align-items: center;
@@ -209,7 +214,7 @@ toolbar-confirm {
   }
 
   image {
-    width: 224rpx;
+    width: 324rpx;
   }
 
   .empty-text {
@@ -217,6 +222,6 @@ toolbar-confirm {
     color: #AAA;
     line-height: 40rpx;
     text-align: center;
-    padding-top: 36rpx;
+    padding-top: 16rpx;
   }
 }

miniprogram/pages/buyerInformation/index.ts

@@ -112,38 +112,6 @@ Page({
     this.getAreas()
     this.getSchools()
   },
-
-  async getUserDetail() {
-    try {
-      const information = wx.getStorageSync('buyerInfomation')
-      const users = information ? JSON.parse(information) : null
-      if (users) {
-        this.setData({
-          phone: users.phone,
-          name: users.name,
-          gender: users.gender,
-          schoolAreaId: users.schoolAreaId,
-          schoolAreaName: users.schoolAreaName,
-          currentGradeClassTxt: users.currentGradeClassTxt,
-          currentClass: users.currentClass,
-          currentGradeNum: users.currentGradeNum,
-          cityCode: users.cityCode,
-          cityName: users.cityName,
-          provinceCode: users.provinceCode,
-          provinceName: users.provinceName,
-          regionCode: users.regionCode,
-          regionName: users.regionName,
-
-          schoolAreaIndex: users.schoolAreaIndex || 0,
-          gradeClassIndexs: users.gradeClassIndexs || [0, 0]
-        }, () => {
-          this.getSchoolAreaDetail()
-        })
-      }
-    } catch {
-      // 
-    }
-  },
   onBack() {
     // 如果有购买人编号，返回时则不缓存数据
     if (!this.data.userBeneficiaryId) {
@@ -285,14 +253,29 @@ Page({
       })
 
       let tempSchoolId = ''
+      let areaIndex = 0
       if (tempList.length > 0) {
-        const first = tempList[0]
-        tempSchoolId = first.value || ''
+        const childIndex = tempList.findIndex((item: any) => this.data.schoolAreaId === item.value)
+        console.log(childIndex, 'childIndex')
+
+        if (childIndex !== -1) {
+          const first = tempList[childIndex]
+          tempSchoolId = first.value || ''
+          areaIndex = childIndex
+        } else {
+          const first = tempList[0]
+          tempSchoolId = first.value || ''
+          areaIndex = 0
+        }
       }
 
       this.setData({
+        schoolAreaIndex: areaIndex,
         schoolAreaList: tempList,
         tempChangeSchoolAreaId: tempSchoolId
+      }, () => {
+        const schoolArea = this.selectComponent('#schoolArea')
+        schoolArea?.setIndexes([areaIndex])
       })
     } catch {
       // 
@@ -540,11 +523,7 @@ Page({
     })
   },
   onSearch() {
-    this.setData({
-      schoolAreaIndex: 0
-    }, () => {
-      this.getSchools(this.data.searchName);
-    })
+    this.getSchools(this.data.searchName);
   },
   onSearchChange(e: any) {
     this.setData({
@@ -760,7 +739,7 @@ Page({
           title: '保存成功',
           icon: 'none'
         })
-        prevPage?.setData({ backParams: { userBeneficiaryId: data.data.id, name: params.name, phone: params.phone, schoolInfo: (params.provinceName || '') + (params.cityName || '') + (params.regionName || '') + params.schoolAreaName  + params.currentGradeTxt + params.currentClassTxt } });
+        prevPage?.setData({ backParams: { userBeneficiaryId: data.data.id, name: params.name, phone: params.phone, schoolInfo: (params.provinceName || '') + (params.cityName || '') + (params.regionName || '') + params.schoolAreaName + params.currentGradeTxt + params.currentClassTxt } });
       }
 
       this.onSetCatch(params)

miniprogram/pages/buyerInformation/index.wxml

@@ -59,13 +59,13 @@
         <view slot="action" class="searchBtn" bind:tap="onSearch">搜索</view>
       </van-search>
     </view>
-    <van-picker loading="{{ schoolLoading }}" wx:if="{{ !showSchoolAfterLeave && schoolAreaList.length > 0 }}" columns="{{ schoolAreaList }}" bind:change="onChangeSchool" visible-item-count="4" default-index="{{ schoolAreaIndex }}">
+    <van-picker id="schoolArea" loading="{{ schoolLoading }}" wx:if="{{ !showSchoolAfterLeave && schoolAreaList.length > 0 }}" columns="{{ schoolAreaList }}" bind:change="onChangeSchool" visible-item-count="4" 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>
+      <image mode="widthFix" src="https://oss.dayaedu.com/ktyq/1739864764800.png"></image>
       <view class="empty-text">暂无数据</view>
     </view>
   </van-popup>

miniprogram/pages/download/download.ts

@@ -87,9 +87,9 @@ Page({
    */
   onShareAppMessage() {
     return {
-      title: '器乐数字AI工具',
+      title: '翼时代器乐数字Ai',
       path: '/pages/index/index',
-      imageUrl: 'https://oss.dayaedu.com/ktyq/1733312164991.png'
+      imageUrl: 'https://oss.dayaedu.com/ktyq/1739865626350.png'
     }
   }
 })

miniprogram/pages/index/index.json

@@ -7,7 +7,6 @@
     "van-search": "@vant/weapp/search/index",
     "van-field": "@vant/weapp/field/index",
     "van-loading": "@vant/weapp/loading/index",
-    "van-action-sheet": "@vant/weapp/action-sheet/index",
     "service": "/components/service/service"
   }
 }

miniprogram/pages/index/index.less

@@ -173,7 +173,7 @@
   width: 100%;
   background-color: #FFFFFF;
   box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0, 0, 0, 0.5);
-  padding: 20rpx 64rpx 58rpx;
+  padding: 12rpx 64rpx 50rpx;
   display: flex;
   align-items: center;
   box-sizing: border-box;
@@ -190,6 +190,7 @@
     box-shadow: 0rpx 14rpx 14rpx 0rpx rgba(0, 0, 0, 0.18);
     border-radius: 30rpx;
     border: 8rpx solid #FFFFFF;
+    // box-sizing: border-box;
 
     +.orders {
       margin-right: 0;
@@ -205,7 +206,7 @@
       font-weight: 600;
       font-size: 32rpx;
       color: #FEFFCA;
-      line-height: 44rpx;
+      line-height: 46rpx;
       text-align: center;
     }
   }
@@ -417,341 +418,3 @@
     padding-bottom: 0;
   }
 }
-
-.popupBottom {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  background: #ffffff;
-  border-top: 2rpx solid #F0F0F0;
-  padding: 0 32rpx 58rpx;
-}
-
-.current-item {
-  font-size: 24rpx;
-  color: #999999;
-  line-height: 40rpx;
-  padding: 12rpx 12rpx 20rpx;
-
-  .current-select-text {
-    padding-top: 10rpx;
-    font-size: 26rpx;
-    line-height: 36rpx;
-  }
-
-  text {
-    color: #ff0047;
-    // font-weight: bold;
-  }
-
-  font-family: DINAlternate,
-  DINAlternate;
-
-  .current-top {
-    display: flex;
-    align-items: flex-end;
-    line-height: 42rpx;
-  }
-
-  .line {
-    color: #D2D2D2;
-    padding: 0 12rpx;
-  }
-
-  .prices {
-    display: flex;
-    align-items: flex-end;
-    padding-left: 8rpx;
-    font-weight: bold;
-  }
-
-  .stuff {
-    padding-right: 2rpx;
-    font-size: 36rpx;
-  }
-
-  .priceZ {
-    font-size: 60rpx;
-    line-height: 1;
-  }
-
-  .priceF {
-    font-size: 36rpx;
-  }
-}
-
-/* components/buyerInformation/index.wxss */
-.icon-close-pop {
-  position: absolute;
-  z-index: 2;
-  top: 28rpx;
-  left: 20rpx;
-  padding: 20rpx;
-  width: 36rpx;
-  height: 36rpx;
-}
-
-.container-pop {
-  background: linear-gradient(180deg, #FFDEE7 0%, #FFFFFF 12%, #FFFFFF 100%);
-  border-radius: 32rpx 32rpx 0rpx 0rpx;
-  height: 86vh;
-  display: flex;
-  flex-direction: column;
-}
-
-
-.pop-address-title {
-  position: relative;
-  z-index: 1;
-  text-align: center;
-  padding-top: 40rpx;
-  padding-bottom: 20rpx;
-  font-weight: 600;
-  font-size: 36rpx;
-  color: #131415;
-  line-height: 50rpx;
-}
-
-
-.section {
-  margin: 24rpx 0;
-  // background: linear-gradient(180deg, #E3F9FF 0%, #FFFFFF 9%, #FFFFFF 100%);
-  border-radius: 18rpx;
-  overflow-x: hidden;
-  overflow-y: auto;
-
-  flex: 1 auto;
-
-
-  .section-content {
-    // background: linear-gradient(180deg, #E3F9FF 0%, #FFFFFF 9%, #FFFFFF 100%);
-    border-radius: 12rpx;
-    overflow: hidden;
-  }
-
-  .section-title {
-    width: 236rpx;
-    height: 46rpx;
-    margin: 20rpx 0 18rpx 28rpx;
-  }
-
-
-  .van-cell {
-    padding: 40rpx !important;
-    font-size: 30rpx !important;
-    line-height: 42rpx;
-    background-color: transparent !important;
-
-    .van-field__label {
-      color: #666666;
-    }
-
-    .van-icon-arrow {
-      color: #BBBBBB;
-      // font-weight: 600;
-    }
-  }
-
-
-  // .gender-section {
-  //   display: flex;
-
-  //   .gender-item {
-  //     margin-left: 24rpx;
-  //     background: rgba(28, 172, 241, 0.11);
-  //     border-radius: 12rpx;
-  //     font-weight: 500;
-  //     font-size: 28rpx;
-  //     color: #1CACF1;
-  //     width: 104rpx;
-  //     line-height: 48rpx;
-  //     text-align: center;
-
-  //     &.active {
-  //       background: #1CACF1;
-  //       color: #FFFFFF;
-  //     }
-  //   }
-  // }
-}
-
-.pop-btn-group {
-  padding: 24rpx 32rpx 58rpx;
-
-  .submit-btn {
-    width: 100% !important;
-    margin: 0 !important;
-    padding: 0 !important;
-    line-height: 88rpx;
-    background: linear-gradient(270deg, #FF204B 0%, #FE5B71 100%);
-    border-radius: 88rpx;
-    font-weight: 500;
-    font-size: 32rpx;
-    color: #fff;
-  }
-}
-
-
-.van-picker__toolbar,
-.toolbar-top {
-  margin: 0 40rpx !important;
-  padding: 0 14rpx !important;
-  border-bottom: 2rpx solid #F2F2F2;
-  height: auto !important;
-  line-height: normal !important;
-}
-
-.van-picker__cancel,
-.van-picker__confirm,
-.toolbar-cancel,
-toolbar-confirm {
-  font-size: 32rpx !important;
-  padding: 28rpx 0 !important;
-  color: #777777 !important;
-}
-
-.van-picker__confirm,
-.toolbar-confirm {
-  color: #FE2451 !important;
-}
-
-.toolbar-top {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.select-school {
-  .van-cell {
-    padding: 32rpx 40rpx;
-    font-size: 32rpx;
-
-    .van-icon-arrow {
-      color: #BBBBBB;
-      // font-weight: 600;
-    }
-  }
-}
-
-.searchList {
-  .icon-search {
-    width: 32rpx;
-    height: 32rpx;
-    margin: auto 10rpx auto auto;
-  }
-
-  .van-search {
-    margin: 0 26rpx 0 !important;
-    padding: 0 !important;
-    height: 70rpx !important;
-    background: #F6F6F6 !important;
-    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: linear-gradient(270deg, #FF204B 0%, #FE5B71 100%);
-    font-weight: 500;
-    font-size: 28rpx;
-    color: #FFFFFF;
-    line-height: 40rpx;
-    border-radius: 40rpx;
-    margin-right: 6rpx;
-  }
-}
-
-.van-action-sheet__description {
-  font-size: 32rpx !important;
-  color: #777777 !important;
-  line-height: 44rpx !important;
-  padding: 28 0rpx !important;
-  margin: 0 26rpx !important;
-}
-
-
-.one-gender,
-.two-gender {
-  font-weight: 600;
-  padding: 24rpx 0 !important;
-  font-size: 32rpx !important;
-  margin: 0 40rpx 16rpx !important;
-  width: calc(100% - 80rpx) !important;
-  color: #000000 !important;
-  line-height: 44rpx !important;
-}
-
-.one-gender {
-  margin-top: 24rpx !important;
-}
-
-.two-gender {
-  margin-bottom: 24rpx !important;
-}
-
-.van-action-sheet__gap {
-  height: 2rpx !important;
-  margin: 0 40rpx !important;
-}
-
-.cancel-gender {
-  font-weight: 400 !important;
-  color: #AAAAAA !important;
-}
-
-.van-picker-column__item--selected {
-  font-weight: 600;
-  font-size: 32rpx;
-  color: #000 !important;
-}
-
-.empty-box {
-  padding-top: 44rpx;
-  padding-bottom: 48rpx;
-  box-sizing: border-box;
-  text-align: center;
-  font-size: 32rpx;
-  font-family: PingFangSC-Regular, PingFang SC;
-  font-weight: 400;
-  color: #999999;
-  position: relative;
-
-  .empty_loading {
-    align-items: center;
-    background-color: var(--picker-loading-mask-color, hsla(0, 0%, 100%, .9));
-    bottom: 0;
-    display: flex;
-    justify-content: center;
-    left: 0;
-    position: absolute;
-    right: 0;
-    top: 0;
-    z-index: 4;
-  }
-
-  image {
-    width: 364rpx;
-    height: 190rpx;
-  }
-
-  .empty-text {
-    font-size: 28rpx;
-    color: #777777;
-    line-height: 40rpx;
-    text-align: center;
-    padding-top: 36rpx;
-  }
-}

miniprogram/pages/index/index.ts

@@ -1,43 +1,4 @@
 // index.ts
-import { api_schoolAreaDetail, api_schoolAreaList, api_sysAreaQueryAllProvince, api_userBeneficiarySave, api_userBeneficiaryUpdate } from "../../api/new";
-import { GRADE_ENUM } from '../../utils/util'
-
-const classList: any = [];
-for (let i = 1; i <= 40; i++) {
-  classList.push({ text: i + '班', value: i });
-}
-
-/** 获取年级 */
-const getGradeList = (gradeYear?: string, instrumentCode?: string) => {
-  let tempList: any = [];
-  const five = [
-    { text: '一年级', value: 1, instrumentCode },
-    { text: '二年级', value: 2, instrumentCode },
-    { text: '三年级', value: 3, instrumentCode },
-    { text: '四年级', value: 4, instrumentCode },
-    { text: '五年级', value: 5, instrumentCode }
-  ];
-  const one = [{ text: '六年级', value: 6, instrumentCode }];
-  const three = [
-    { text: '七年级', value: 7, instrumentCode },
-    { text: '八年级', value: 8, instrumentCode },
-    { text: '九年级', value: 9, instrumentCode }
-  ];
-  if (gradeYear === 'FIVE_YEAR_SYSTEM') {
-    tempList.push(...[...five]);
-  } else if (gradeYear === 'SIX_YEAR_SYSTEM') {
-    tempList.push(...[...five, ...one]);
-  } else if (gradeYear === 'THREE_YEAR_SYSTEM') {
-    tempList.push(...[...three]);
-  } else if (gradeYear === 'FORE_YEAR_SYSTEM') {
-    tempList.push(...[...one, ...three]);
-  } else {
-    tempList.push(...[...five, ...one, ...three]);
-  }
-  return tempList;
-};
-
-
 // 获取应用实例
 const app = getApp<IAppOption>()
 // pages/orders/orders.ts
@@ -52,24 +13,7 @@ Page({
       'https://oss.dayaedu.com/ktyq/1739523574402.png',
       'https://oss.dayaedu.com/ktyq/1739523583463.png'
     ],
-    current: 0,
-    popupShow: false,
-
-
-
-
-    showService: false,
-    isFromPreviewImage: false,
-    showBuyer: false, // 收益人
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad() {
-    // this.onInit()
   },
-
   isLogin() {
     // 判断是否登录
     if (!app.globalData.isLogin) {
@@ -100,78 +44,18 @@ Page({
       url: '../select-goods/index',
     })
   },
-  /** 客服 */
-  onService() {
-    this.setData({
-      showService: true
-    })
-  },
-  changePop(event: { detail: any }) {
-    this.setData({
-      showService: event.detail
-    })
-  },
-  onBuyShop() {
-    // 判断是否登录
-    if (!this.isLogin()) {
-      return
-    }
-    this.setData({
-      popupShow: true
-    })
-  },
-  onClose() {
-    this.setData({
-      popupShow: false,
-      currentIndex: 1,
-      userBeneficiaryId: '',
-      userBeneficiaryInfo: {
-        name: '',
-        phoneNumber: '',
-        schoolInfo: ''
-      }
-    })
-  },
-
-  onPreivewGoodsImg(e: { currentTarget: { dataset: any } }) {
-    wx.previewImage({
-      current: e.currentTarget.dataset.src,
-      urls: this.data.goodsImgList,
-      success: () => {
-        this.setData({
-          isFromPreviewImage: true
-        })
-      }
-    })
-  },
-  onPreivewGoods(e: { currentTarget: { dataset: any } }) {
-    wx.previewImage({
-      current: e.currentTarget.dataset.src,
-      urls: [e.currentTarget.dataset.src],
-      success: () => {
-        this.setData({
-          isFromPreviewImage: true
-        })
-      }
-    })
-  },
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-  },
   onShareAppMessage() {
     return {
       title: '翼时代器乐数字Ai',
       path: '/pages/index/index',
-      imageUrl: 'https://oss.dayaedu.com/ktyq/1733312164991.png'
+      imageUrl: 'https://oss.dayaedu.com/ktyq/1739865626350.png'
     }
   },
   onShareTimeline() {
     return {
-      title: '器乐数字AI工具',
+      title: '翼时代器乐数字Ai',
       path: '/pages/index/index',
-      imageUrl: 'https://oss.dayaedu.com/ktyq/1733312164991.png'
+      imageUrl: 'https://oss.dayaedu.com/ktyq/1739865626350.png'
     }
   }
 })

miniprogram/pages/index/index.wxml

@@ -24,19 +24,6 @@
           <text>申请加入</text>
         </view>
       </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> -->
-          
-          <!-- <view class="popup-container">
-                
-              </view> -->
-        </view>
-      </van-popup>
     </view>
   </scroll-view>
 </view>

miniprogram/pages/login/login.ts

@@ -144,9 +144,9 @@ Page({
    */
   onShareAppMessage() {
     return {
-      title: '器乐数字AI工具',
+      title: '翼时代器乐数字Ai',
       path: '/pages/index/index',
-      imageUrl: 'https://oss.dayaedu.com/ktyq/1733312164991.png'
+      imageUrl: 'https://oss.dayaedu.com/ktyq/1739865626350.png'
     }
   }
 })

miniprogram/pages/orders/order-detail.less

@@ -98,16 +98,17 @@ page {
 
   .addBuyer-left {
     display: flex;
+    flex: 1;
   }
 
+
   .users {
     display: flex;
     font-weight: 600;
     font-size: 32rpx;
     color: #131415;
     line-height: 44rpx;
-
-    width: 540rpx;
+    width: 600rpx;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -132,7 +133,10 @@ page {
   }
 
   .selected {
+    width: 100%;
+
     .users {
+      display: block;
       font-weight: 400;
       font-size: 28rpx;
       color: #131415;
@@ -147,6 +151,7 @@ page {
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
+        display: block;
       }
     }
   }
@@ -504,7 +509,18 @@ page {
         line-height: 42rpx;
         display: flex;
         align-items: center;
-        padding-left: 16rpx;
+
+        &.cell-line {
+          margin-left: 16rpx;
+
+          &::before {
+            content: '';
+            width: 2rpx;
+            height: 22rpx;
+            background: #DCDCDC;
+            margin-right: 16rpx;
+          }
+        }
       }
     }
   }
@@ -573,7 +589,7 @@ page {
   .more {
     display: flex;
     justify-content: space-between;
-    padding: 20rpx 32rpx 58rpx 32rpx;
+    padding: 12rpx 32rpx 50rpx 32rpx;
   }
 
   .price-section {
@@ -631,6 +647,7 @@ page {
     color: #FE4600;
 
     text {
+      padding-left: 6rpx;
       font-weight: bold;
     }
   }

miniprogram/pages/orders/order-detail.ts

@@ -50,9 +50,9 @@ Page({
     this.queryPayType()
     this.getAddress()
     if (options.orderInfo) {
-      console.log('goods', options)
+      // console.log('goods', options)
       const goods = JSON.parse(decodeURIComponent(options.orderInfo));
-      console.log(goods, 'goods', options)
+      // console.log(goods, 'goods', options)
       const infos = {
         allSalePrice: 0,
         allOriginPrice: 0,
@@ -183,7 +183,9 @@ Page({
         url: `../address/index?receiveAddress=${this.data.receiveAddress}`,
       })
     } else {
-
+      wx.navigateTo({
+        url: `../address/address-detail`,
+      })
     }
   },
   onPayError(message?: string) {
@@ -336,7 +338,7 @@ Page({
   },
   /** 客服 */
   onService() {
-    console.log("showService")
+    // console.log("showService")
     this.setData({
       showService: true
     })
@@ -351,7 +353,7 @@ Page({
    */
   onShow() {
     if (this.data.backParams) {
-      // console.log(this.data.backParams, 'backParams'); // { key: 'value' }
+      console.log(this.data.backParams, 'backParams'); // { key: 'value' }
       const backParams: any = this.data.backParams || {};
       this.setData({
         receiveAddress: backParams.receiveAddress,
@@ -388,9 +390,9 @@ Page({
    */
   onShareAppMessage() {
     return {
-      title: '器乐数字AI工具',
+      title: '翼时代器乐数字Ai',
       path: '/pages/index/index',
-      imageUrl: 'https://oss.dayaedu.com/ktyq/1733312164991.png'
+      imageUrl: 'https://oss.dayaedu.com/ktyq/1739865626350.png'
     }
   }
 })

miniprogram/pages/orders/order-detail.wxml

@@ -62,11 +62,11 @@
         </view>
       </view>
 
-      <view class="buyUsers">
+      <view class="buyUsers" wx:if="{{ userBeneficiaryId && goodsInfo.orderNo }}">
         <view class="users">
-          <text>{{ goodsInfo.userBeneficiaryInfo.name }}</text>{{ goodsInfo.userBeneficiaryInfo.phoneNumber }}
+          <text>{{ userBeneficiaryInfo.name }}</text>{{ userBeneficiaryInfo.phoneNumber }}
         </view>
-        <view class="detail">{{goodsInfo.userBeneficiaryInfo.schoolInfo}}</view>
+        <view class="detail">{{userBeneficiaryInfo.schoolInfo}}</view>
 
         <image class="buyuser_img" mode="widthFix" src="./images/buyuser.png"></image>
       </view>
@@ -88,7 +88,7 @@
               <text class="priceF">.{{ goodsInfo.decimalPart }}</text>
             </view>
           </view>
-          <view class="discountPrice">共减 <text>¥{{ goodsInfo.allDiscountPrice }}</text></view>
+          <view class="discountPrice">共减<text>¥{{ goodsInfo.allDiscountPrice }}</text></view>
         </view>
         <button type="primary" bind:tap="onSubmit">{{ goodsInfo.orderNo ? '继续支付' : '立即支付' }}</button>
       </view>
@@ -102,11 +102,11 @@
   <view class="order-item">
     <view class="title">订单编号</view>
     <view class="value">{{ goodsInfo.orderNo }}
-      <view class="copy" bind:tap="onCopy" data-orderno="{{goodsInfo.orderNo}}">复制</view>
+      <view class="copy cell-line" bind:tap="onCopy" data-orderno="{{goodsInfo.orderNo}}">复制</view>
     </view>
   </view>
   <view class="order-item">
-    <view class="title line">下单时间</view>
+    <view class="title">下单时间</view>
     <view class="value">{{ goodsInfo.createTime }}</view>
   </view>
 </template>

miniprogram/pages/orders/order-result.ts

@@ -183,9 +183,9 @@ Page({
   },
   onShareAppMessage() {
     return {
-      title: '器乐数字AI工具',
+      title: '翼时代器乐数字Ai',
       path: '/pages/index/index',
-      imageUrl: 'https://oss.dayaedu.com/ktyq/1733312164991.png'
+      imageUrl: 'https://oss.dayaedu.com/ktyq/1739865626350.png'
     }
   }
 })

miniprogram/pages/orders/order-result.wxml

@@ -4,13 +4,6 @@
 
   <scroll-view class="record-list" type="list" scroll-y>
     <view class="scroll-container">
-      <!-- <view class="order-status" wx:if="{{statusList[status]}}">
-        <view class="status">
-          <image src="{{ statusList[status].logo }}"></image>
-          <text>{{ statusList[status].title }}</text>
-        </view>
-        <view class="tips" wx:if="{{ statusList[status].content }}">{{ statusList[status].content }}</view>
-      </view> -->
       <!-- 添加地址 -->
       <view wx:if="{{ goodsInfo.addresses.id }}" class="addBuyer">
         <view class="addBuyer-left">

miniprogram/pages/orders/orders.less

@@ -4,11 +4,17 @@
   display: flex;
   flex-direction: column;
   background: #F4F4F4;
-}
-
-.container {
-  display: flex;
-  flex-direction: column;
+  position: relative;
+
+  &::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 286rpx;
+    background: linear-gradient(180deg, #FDEC00 0%, #FAD400 100%);
+  }
 }
 
 .record-content {
@@ -17,6 +23,7 @@
   width: 100%;
   flex: 1;
   overflow-y: auto;
+  position: relative;
 }
 
 .record-tab {
@@ -26,33 +33,31 @@
   padding: 28rpx 24rpx 16rpx;
 
   >view {
-      font-size: 32rpx;
-      font-family: PingFangSC-Regular, PingFang SC;
-      font-weight: 500;
-      color: rgba(0, 0, 0, 0.4);
-      padding: 0 34rpx;
+    font-size: 32rpx;
+    font-family: PingFangSC-Regular, PingFang SC;
+    color: rgba(0, 0, 0, 0.5);
+    padding: 0 34rpx;
 
-      &.active {
-          font-size: 32rpx;
-          font-family: PingFangSC-Semibold, PingFang SC;
-          font-weight: 600;
-          color: #131415;
-          position: relative;
-          z-index: 2;
-
-          &::before {
-              content: "";
-              position: absolute;
-              left: 50%;
-              margin-left: -24rpx;
-              bottom: -8rpx;
-              z-index: -1;
-              width: 48rpx;
-              height: 8rpx;
-              background: linear-gradient( 90deg, #FF3C3C 0%, rgba(255,118,155,0.5) 100%);
-              border-radius: 72rpx 72rpx 0rpx 0rpx;
-          }
+    &.active {
+      font-size: 32rpx;
+      font-family: PingFangSC-Semibold, PingFang SC;
+      font-weight: 600;
+      color: #131415;
+      position: relative;
+      z-index: 2;
+
+      &::before {
+        content: "";
+        position: absolute;
+        left: 50%;
+        margin-left: -19rpx;
+        bottom: -16rpx;
+        z-index: -1;
+        width: 34rpx;
+        height: 4rpx;
+        background: #534E49;
       }
+    }
   }
 }
 
@@ -60,6 +65,7 @@
   flex: 1;
   overflow-y: scroll;
   box-sizing: border-box;
+  background: #F4F4F4 !important;
 }
 
 .list-item-group {
@@ -69,42 +75,47 @@
 .list-item {
   background: #FFFFFF;
   border-radius: 20rpx;
-  margin: 24rpx 26rpx 0;
-  padding: 28rpx 24rpx 32rpx;
+  margin: 26rpx 26rpx 0;
+  padding: 24rpx;
 
   .item-top {
     display: flex;
     justify-content: space-between;
     font-size: 28rpx;
     line-height: 48rpx;
-    padding-bottom: 24rpx;
-    
+    padding-bottom: 26rpx;
+
     .item-mid {
-      color: #131415;
+      color: #999999;
+    }
+
+    >text {
+      color: #777;
     }
 
-    > text {
-      color: #777777;
+    .cancel {
+      color: #777;
     }
 
     .red {
-      color: #FE2451;
+      color: #FE4600;
     }
   }
 
   .item-content {
     display: flex;
+
     &+.item-content {
-      padding-top: 40rpx;
+      padding-top: 26rpx;
     }
-  
+
 
     .goods-icon {
-      width: 160rpx;
-      height: 160rpx;
-      margin-right: 24rpx;
+      width: 140rpx;
+      height: 140rpx;
+      margin-right: 20rpx;
       flex-shrink: 0;
-      border-radius: 6px;
+      border-radius: 11rpx;
       overflow: hidden;
     }
 
@@ -118,27 +129,29 @@
       display: flex;
       justify-content: space-between;
       padding-top: 4rpx;
+
       .goods-name {
         flex: 1 auto;
         white-space: nowrap;
         overflow: hidden;
         font-weight: 600;
         font-size: 30rpx;
-        color: #131415;
+        color: #333;
         line-height: 50rpx;
         text-overflow: ellipsis;
         max-width: 280rpx;
       }
-  
+
       .goods-price {
         flex-shrink: 0;
         font-family: DINAlternate, DINAlternate;
         font-weight: bold;
         font-size: 28rpx;
-        color: #131415;
+        color: #333333;
         line-height: 48rpx;
-         text {
-          font-size: 32rpx;
+
+        text {
+          font-size: 36rpx;
           padding-left: 4rpx;
         }
       }
@@ -149,6 +162,7 @@
       justify-content: space-between;
       align-items: center;
       padding-top: 12rpx;
+
       .goods-card {
         background: #FEEDF0;
         border-radius: 6rpx;
@@ -157,9 +171,10 @@
         line-height: 40rpx;
         padding: 0 12rpx;
       }
+
       .goods-num {
         font-size: 26rpx;
-        color: #777777;
+        color: #AAAAAA;
         line-height: 36rpx;
       }
     }
@@ -168,91 +183,83 @@
 
   .item-footer {
     padding-top: 24rpx;
+    margin-top: 24rpx;
     display: flex;
-    justify-content: space-between;
-    align-items: center;
+    flex-direction: column;
+    justify-content: flex-end;
+    align-items: flex-end;
+    border-top: 2rpx solid #F2F2F2;
 
     .order-price {
-      // font-weight: 600;
-      // font-size: 28rpx;
-      // color: #131415;
-      // line-height: 48rpx;
-
-      // .price-first {
-      //   font-weight: bold;
-      //   color: #FE2451;
-      //   font-size: 28rpx;
-      // }
-      // .price {
-      //   font-family: DINAlternate, DINAlternate;
-      //   font-weight: bold;
-      //   font-size: 36rpx;
-      //   color: #FE2451;
-      //   line-height: 48rpx;
-      // }
-      
-        display: flex;
-        align-items: flex-end;
-    
-        .desc {
-          font-size: 24rpx;
-          color: #999;
-          line-height: 40rpx;
-          flex-shrink: 0;
+      display: flex;
+      align-items: flex-end;
+
+      .desc {
+        font-size: 24rpx;
+        color: #999;
+        line-height: 40rpx;
+        flex-shrink: 0;
+      }
+
+      .currentPrice {
+        font-weight: bold;
+        font-family: DINAlternate, DINAlternate;
+        // display: flex;
+        // align-items: center;
+        color: #333;
+
+        .before {
+          font-size: 28rpx;
+          color: #131415;
+          font-weight: 400;
         }
-    
-        .currentPrice {
-          font-weight: bold;
-          color: #FE2451;
-          font-family: DINAlternate, DINAlternate;
-          display: flex;
-          // align-items: flex-end;
-    
-          .stuff {
-            font-size: 28rpx;
-            padding: 2rpx 4rpx 0;
-          }
-    
-          .priceZ {
-            font-size: 40rpx;
-            line-height: 1;
-          }
-    
-          .priceF {
-            font-size: 32rpx;
-          }
+
+        .stuff {
+          font-size: 28rpx;
+          padding: 2rpx 4rpx 0;
         }
-    
-        .line {
-          margin: 0 12rpx 8rpx;
-          background-color: #D2D2D2;
-          width: 2rpx;
-          height: 20rpx;
+
+        .priceZ {
+          font-size: 36rpx;
+          line-height: 1;
         }
-    
-        .discountPrice {
-          padding-bottom: 2rpx;
-          font-size: 24rpx;
-          color: #FE2451;
+
+        // .priceF {
+        //   font-size: 32rpx;
+        // }
+      }
+
+      // .line {
+      //   margin: 0 12rpx 8rpx;
+      //   background-color: #D2D2D2;
+      //   width: 2rpx;
+      //   height: 20rpx;
+      // }
+
+      .discountPrice {
+        font-size: 28rpx;
+        color: #FE4600;
+        font-weight: bold;
+        padding-left: 8rpx;
+        padding-right: 12rpx;
+
+        text {
+          font-size: 36rpx;
+          line-height: 1;
         }
+      }
     }
 
     button {
-      margin: 0;
-      border-radius: 36rpx;
-      background-color: #FFFFFF;
-      border: 2rpx solid #DCDCDC;
-      font-weight: 500;
-      font-size: 28rpx;
-      color: #333333;
+      margin: 24rpx 0 0;
+      background: linear-gradient(90deg, #544F4A 0%, #302F2B 100%);
+      border-radius: 26rpx;
+      font-weight: 600;
+      font-size: 24rpx;
+      color: #FEFFCA;
       width: auto;
-      padding: 14rpx 32rpx;
-      line-height: 40rpx;
-    }
-    .sure {
-      background: #FE2451;
-      border-color: #FE2451;
-      color: #FFFFFF;
+      padding: 0 22rpx;
+      line-height: 52rpx;
     }
   }
 }
@@ -331,8 +338,8 @@
   color: #999999;
 
   image {
-    width: 436rpx;
-    height: 364rpx;
+    width: 384rpx;
+    height: 198rpx;
   }
 
   .empty-text {

miniprogram/pages/orders/orders.ts

@@ -108,7 +108,7 @@ Page({
           studentPaymentOrderDetails.forEach((student: any) => {
             student.originalPrice = formatPrice(student.originalPrice, 'ALL');
             student.typeName = this.formatPeriod(student.activationCodeInfo?.times || 1, student.activationCodeInfo?.type);
-
+            student.salePrice = formatPrice(student.paymentCashAmount || 0, 'ALL')
             // 总的日常价
             originalPrice += Number(student.originalPrice || 0)
           })
@@ -159,12 +159,12 @@ Page({
       return ''
     }
     const template: any = {
-      DAY: "天",
-      MONTH: "个月",
-      YEAR: "年"
+      DAY: "天卡",
+      MONTH: "月卡",
+      YEAR: "年卡"
     }
     if (type === "YEAR" && num >= 99) {
-      return '永久'
+      return '永久卡'
     }
     return num + template[type]
   },
@@ -215,12 +215,13 @@ Page({
         params.push({
           pic: item.goodsUrl,
           name: item.goodsName,
+          period: item.activationCodeInfo?.type,
+          num: item.activationCodeInfo?.times,
           originalPrice: item.originalPrice,
           salePrice: item.paymentCashAmount,
           goodsType: item.goodsType, // INSTRUMENTS
         })
       })
-
       let info = JSON.stringify({
         ...params
       });
@@ -346,9 +347,9 @@ Page({
   },
   onShareAppMessage() {
     return {
-      title: '器乐数字AI工具',
+      title: '翼时代器乐数字Ai',
       path: '/pages/index/index',
-      imageUrl: 'https://oss.dayaedu.com/ktyq/1733312164991.png'
+      imageUrl: 'https://oss.dayaedu.com/ktyq/1739865626350.png'
     }
   }
 })

miniprogram/pages/orders/orders.wxml

@@ -14,51 +14,49 @@
           <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="" />
               <view class="goods-desc">
                 <view class="goodsInfo">
                   <view class="goods-name">{{item.goodsName}}</view>
-                  <view class="goods-price">¥<text>{{item.originalPrice}}</text></view>
+                  <view class="goods-price">¥<text>{{item.salePrice}}</text></view>
                 </view>
                 <view class="goods-type">
                   <view>
                     <view class="goods-card" wx:if="{{ item.typeName }}">{{item.typeName}}</view>
                   </view>
-                  <view class="goods-num">x1</view>
+                  <view class="goods-num">优惠前 ¥{{ item.originalPrice }}</view>
                 </view>
               </view>
             </view>
             <view class="item-footer">
               <view class="order-price">
-                <!-- 共计<text class="price-first">¥ </text><text class="price">{{item.amount}}</text> -->
-                <view class="desc">共计</view>
+                <view class="desc">共{{ item.studentPaymentOrderDetails.length }}件，共减</view>
+                <view class="discountPrice">¥<text>{{ item.discountPrice }}</text></view>
                 <view class="currentPrice">
+                  <text class="before">应付:</text>
                   <text class="stuff">¥</text>
-                  <text class="priceZ">{{ item.integerPart }}</text>
-                  <text class="priceF">.{{ item.decimalPart }}</text>
+                  <text class="priceZ">{{ item.integerPart }}.{{ item.decimalPart }}</text>
+                  <!-- <text class="priceF"></text> -->
                 </view>
-                <text class="line"></text>
-                <text class="discountPrice">优惠 ¥{{ item.discountPrice }}</text>
               </view>
 
               <button class="sure" type="primary" wx:if="{{ item.wechatStatus == 'WAIT_PAY' }}" catch:tap="onPay" data-id="{{item.id}}">继续支付</button>
-              <button type="primary" wx:else catch:tap="onDetail" data-wechatstatus="{{item.wechatStatus}}" data-id="{{item.id}}" data-orderno="{{item.orderNo}}">查看订单</button>
             </view>
           </view>
         </view>
       </block>
       <block wx:else>
         <view class="empty-box">
-          <image src="https://oss.dayaedu.com/ktyq/1731839238916.png"></image>
+          <image src="https://oss.dayaedu.com/ktyq/1739864764800.png"></image>
           <view class="empty-text">暂无订单</view>
         </view>
       </block>
     </scroll-view>
 
-    <view class="bottom-section">
+    <!-- <view class="bottom-section">
       <view class="orders" bind:tap="onOne">
         <image src="./images/icon-home.png" />
         <text>首页</text>
@@ -67,7 +65,7 @@
         <image src="./images/icon-order-active.png" />
         <text>订单</text>
       </view>
-    </view>
+    </view> -->
 
   </view>
   <!-- 申请退款 -->

miniprogram/pages/protocol/register.ts

@@ -78,9 +78,9 @@ Page({
    */
   onShareAppMessage() {
     return {
-      title: '器乐数字AI工具',
+      title: '翼时代器乐数字Ai',
       path: '/pages/index/index',
-      imageUrl: 'https://oss.dayaedu.com/ktyq/1733312164991.png'
+      imageUrl: 'https://oss.dayaedu.com/ktyq/1739865626350.png'
     }
   }
 })

miniprogram/pages/select-goods/index.less

@@ -1,4 +1,9 @@
 /* pages/select-goods/index.wxss */
+.weui-navigation-bar {
+  position: relative;
+  z-index: 1;
+}
+
 .container {
   position: relative;
   height: 100vh;
@@ -23,8 +28,8 @@
   z-index: 1;
   background: #FFFFFF;
   border-radius: 32rpx 32rpx 0rpx 0rpx;
-  margin-top: -100rpx;
-  padding-top: 100rpx;
+  margin-top: -120rpx;
+  padding-top: 120rpx;
   flex: 1 auto;
   display: flex;
   flex-direction: column;
@@ -250,7 +255,8 @@
   }
 
   .goodsItem {
-    background: rgba(255, 255, 255, 0.7);
+    background: #F4F4F5;
+    border-color: #F4F4F5;
     border-radius: 12rpx;
     border: 4rpx solid rgba(255, 255, 255, 0.7);
     padding: 10rpx;
@@ -268,8 +274,15 @@
     }
 
     &.nosale {
-      background: #F4F4F5;
+      background: #F8F8F8;
+      border-color: #F8F8F8;
       color: #B1B1B1;
+
+      .infos {
+        .price {
+          color: rgba(254, 70, 0, 0.6)
+        }
+      }
     }
 
     .goodImg {
@@ -313,6 +326,10 @@
     border: 4rpx solid #f8f8f8;
     margin-bottom: 24rpx;
 
+    &:last-child {
+      margin-bottom: 0;
+    }
+
     &.selected {
       border: 4rpx solid #FE4600;
     }
@@ -331,9 +348,15 @@
     }
 
     .instrment-info {
+      .name {
+        font-weight: bold;
+        font-size: 28rpx;
+        color: #000;
+      }
       .prices {
         display: flex;
         align-items: flex-end;
+        padding-top: 4rpx;
 
         .currentPrice {
           font-weight: bold;
@@ -343,17 +366,18 @@
           align-items: flex-end;
 
           .stuff {
-            font-size: 32rpx;
+            font-size: 28rpx;
             padding: 0 4rpx;
           }
 
           .priceZ {
-            font-size: 48rpx;
-            line-height: 1;
+            font-size: 44rpx;
+            line-height: 1.1;
           }
 
           .priceF {
-            font-size: 32rpx;
+            font-size: 28rpx;
+            line-height: 1.3;
           }
         }
 
@@ -368,14 +392,17 @@
           padding-bottom: 2rpx;
           font-size: 24rpx;
           color: #AAAAAA;
+          font-weight: bold !important;
+          text {
+            padding-right: 4rpx;
+            font-weight: 400 !important;
+          }
         }
       }
     }
   }
 }
 
-
-
 .btnGroup {
   button {
     width: 100%;
@@ -390,6 +417,7 @@
     border-radius: 30rpx;
     border: 8rpx solid #FFFFFF;
     font-size: 36rpx;
+    box-sizing: border-box;
   }
 
   .btn-prices {
@@ -413,7 +441,7 @@
 
 .popupBottom {
   box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0, 0, 0, 0.5);
-  padding: 24rpx 24rpx 58rpx;
+  padding: 24rpx 24rpx 50rpx;
 }
 
 .select-buyer {
@@ -522,7 +550,7 @@
   background: linear-gradient(180deg, rgba(254, 248, 241, 0.4) 0%, rgba(251, 233, 205, 0.4) 100%);
   border-radius: 10rpx;
   border: 2rpx solid rgba(251, 233, 206, 1);
-  margin: 26rpx 0 24rpx;
+  margin: 26rpx 0 16rpx;
   padding: 10rpx 22rpx;
   font-size: 24rpx;
   color: rgba(80, 47, 0, 1);

miniprogram/pages/select-goods/index.wxml

@@ -1,6 +1,6 @@
 <!--pages/select-goods/index.wxml-->
 <view class="container">
-  <navigation-bar title=" " background="transparent" back="{{ false }}"></navigation-bar>
+  <navigation-bar title=" " background="transparent"></navigation-bar>
   <view class="top-bar"></view>
 
 
@@ -18,10 +18,10 @@
           <text class="priceF">.{{ formatSelectGood.decimalPart }}</text>
         </view>
         <text class="line"></text>
-        <text class="discountPrice">优惠 ¥{{ formatSelectGood.discountPrice }}</text>
+        <text class="discountPrice">优惠前 ¥{{ formatSelectGood.discountPrice }}</text>
       </view>
 
-      <image class="img_back" bind:tap="onBack" src="./images/icon-back.png"></image>
+      <!-- <image class="img_back" bind:tap="onBack" src="./images/icon-back.png"></image> -->
     </view>
   </view>
   <view class="section-block">
@@ -65,7 +65,7 @@
                     <text class="priceF">.{{ item.decimalPart }}</text>
                   </view>
                   <text class="line"></text>
-                  <text class="discountPrice">优惠前 ¥{{ item.originalPrice }}</text>
+                  <text class="discountPrice"><text>优惠前</text>¥{{ item.originalPrice }}</text>
                 </view>
               </view>
             </view>

project.config.json

@@ -42,5 +42,5 @@
     "ignore": [],
     "include": []
   },
-  "appid": "wxf0323888ac4e31d5"
+  "appid": "wx524b61f5bec60655"
 }