修改

miniprogram/pages/index/index.ts

@@ -51,6 +51,7 @@ Page({
     interval: 5000,
     duration: 500,
     popupShow: false,
+    videoHeight: '255px',
     list: [] as any,
     isOverSaled: false, // 是否所有商品都没有库存
     selected: {} as any,
@@ -75,6 +76,10 @@ Page({
    */
   onLoad() {
     // this.onInit()
+    const wxWindowInfo = wx.getWindowInfo()
+    this.setData({
+      videoHeight: wxWindowInfo.windowWidth / 16 * 9 + 'px'
+    })
   },
   onReady() {
     const that = this
@@ -98,55 +103,57 @@ Page({
   onBannerPlay() {
     const bannerVideo = wx.createVideoContext('bannerVideo')
     const titleVideo = wx.createVideoContext('titleVideo')
-    const liuVideo = wx.createVideoContext('liuVideo')
+    // 
     this.setData({
       bannerPlay: true
     }, () => {
-      titleVideo.stop()
       bannerVideo.play()
-      liuVideo.stop()
+      titleVideo.pause()
+      // liuVideo.stop()
     })
   },
   onBannerVideoPlay() {
     const titleVideo = wx.createVideoContext('titleVideo')
-    titleVideo.stop()
-    const liuVideo = wx.createVideoContext('liuVideo')
-    liuVideo.stop()
+    titleVideo.pause()
+    // const liuVideo = wx.createVideoContext('liuVideo')
+    // liuVideo.stop()
   },
   onTitlePlay() {
     const bannerVideo = wx.createVideoContext('bannerVideo')
-    bannerVideo.stop()
-    const liuVideo = wx.createVideoContext('liuVideo')
-    liuVideo.stop()
+    bannerVideo.pause()
+    // const liuVideo = wx.createVideoContext('liuVideo')
+    // liuVideo.stop()
   },
   onTItleVideoPlay() {
     const bannerVideo = wx.createVideoContext('bannerVideo')
     const titleVideo = wx.createVideoContext('titleVideo')
-    const liuVideo = wx.createVideoContext('liuVideo')
+    // const liuVideo = wx.createVideoContext('liuVideo')
+    
     this.setData({
       titleControls: true
     }, () => {
       titleVideo.play()
-      bannerVideo.stop()
-      liuVideo.stop()
+      bannerVideo.pause()
+      // liuVideo.stop()
     })
   },
   onLiuPlay() {
     const bannerVideo = wx.createVideoContext('bannerVideo')
-    bannerVideo.stop()
+    bannerVideo.pause()
     const titleVideo = wx.createVideoContext('titleVideo')
-    titleVideo.stop()
+    titleVideo.pause()
   },
   onLiuVideoPlay() {
     const bannerVideo = wx.createVideoContext('bannerVideo')
     const titleVideo = wx.createVideoContext('titleVideo')
-    const liuVideo = wx.createVideoContext('liuVideo')
+    // const liuVideo = wx.createVideoContext('liuVideo')
+    bannerVideo.pause()
+    titleVideo.pause()
     this.setData({
       liuControls: true
     }, () => {
-      liuVideo.play()
-      bannerVideo.stop()
-      titleVideo.stop()
+      // liuVideo.play()
+     
     })
   },
   /**

miniprogram/pages/index/index.wxml

@@ -7,15 +7,16 @@
       <swiper-item>
         <view class="swiper-item swiper-video">
         <block wx:if="{{bannerImageloaded}}">
-          <image class="bg" src="https://oss.dayaedu.com/ktyq/1733452072181.png"></image>
-          <video object-fit="fill" bindplay="onBannerPlay" picture-in-picture-mode="[]" id="bannerVideo" src="https://oss.dayaedu.com/ktyq/17334057618630fc77dba.mp4"></video>
+          <image class="bg" src="https://oss.dayaedu.com/ktyq/1733727669132.png"></image>
+          <video style="height: {{videoHeight}};" object-fit="contain" bindplay="onBannerVideoPlay" picture-in-picture-mode="[]" id="bannerVideo" src="https://oss.dayaedu.com/ktyq/17337413498130cfedaf1.mp4"></video>
+          <!-- poster="https://oss.dayaedu.com/ktyq/1733727669132.png" -->
           <!-- https://oss.dayaedu.com/ktyq/17334015356119a704b08.mp4 100M -->
           <!-- https://oss.dayaedu.com/ktyq/1733405365311b760c974.mp4 30M -->
           <!-- https://oss.dayaedu.com/ktyq/17334057618630fc77dba.mp4 60M -->
         </block>
           <block wx:if="{{ !bannerPlay }}">
-            <image bindload="onBannerVideoLoad" src="https://oss.dayaedu.com/ktyq/1733452072181.png"></image>
-            <image bind:tap="onBannerPlay" src="./images/icon-video.png" class="icon-video"></image>
+            <image bindload="onBannerVideoLoad" src="https://oss.dayaedu.com/ktyq/1733727669132.png"></image>
+            <image catch:tap="onBannerPlay" src="./images/icon-video.png" class="icon-video"></image>
           </block>
         </view>
       </swiper-item>
@@ -70,7 +71,7 @@
             <view class="topSection">
               <view class="content1">音乐数字课堂已赢得超过100万名注册师生的喜爱与赞誉，成为学生乐器学习旅程中的得力伙伴，更是一路陪伴他们从初探音乐世界走向精通乐器。为学生带来极佳的学习体验。</view>
               <view class="titleVideoSection">
-                <video object-fit="fill" 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>
+                <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>
                 <image wx:if="{{!titleControls}}" bind:tap="onTItleVideoPlay" src="./images/icon-video.png" class="icon-video"></image>
               </view>
               <view class="content2">实践知真章，合作学校仅用两节课便完成母亲节主题演奏</view>

miniprogram/pages/orders/order-result.less

@@ -6,6 +6,16 @@ page {
   background: #F4F4F4;
 }
 
+.container {
+  display: flex;
+  flex-direction: column;
+}
+.record-list {
+  flex: 1;
+  overflow-y: scroll;
+  box-sizing: border-box;
+}
+
 .order-status {
   margin: 24rpx 26rpx 0;
   background-color: #FFFFFF;
@@ -199,7 +209,7 @@ page {
   border-radius: 12rpx;
   font-size: 26rpx;
   border: 2rpx solid #F2F2F2;
-  padding: 16rpx 24rpx;
+  padding: 16rpx 12rpx;
   text-align: left;
   margin: 30rpx 20rpx;
   text {
@@ -207,8 +217,11 @@ page {
     font-weight: bold;
   }
   &.used {
+    // padding: 16rpx 12rpx;
     color: #777;
-    border-color: #E9E6E3;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
   }
 
   .free {
@@ -296,6 +309,23 @@ page {
   }
 }
 
+.downloadApp {
+  background: linear-gradient( 90deg, #544F4A 0%, #302F2B 100%);
+  border-radius: 26rpx;
+  padding: 4rpx 12rpx;
+  font-weight: 600;
+  font-size: 22rpx;
+  color: #FBEAC9;
+  line-height: 32rpx;
+  display: inline-block;
+}
+.download-task {
+  padding: 0 24rpx 24rpx;
+  image {
+    width: 100%;
+  }
+}
+
 .order-time {
   margin: 24rpx 26rpx 0;
   border-radius: 20rpx;
@@ -348,6 +378,11 @@ page {
   }
 }
 
+.scroll-brank {
+  height: 184rpx;
+  width: 100%;
+}
+
 .order-btn {
   position: fixed;
   bottom: 0;
@@ -355,6 +390,7 @@ page {
   width: 100%;
   background-color: #FFFFFF;
   padding: 20rpx 32rpx 58rpx 40rpx;
+  box-shadow: inset 0rpx 2rpx 0rpx 0rpx #F0F0F0;
   display: flex;
   justify-content: space-between;
   box-sizing: border-box;
@@ -408,7 +444,7 @@ page {
     background: linear-gradient( 90deg, #544F4A 0%, #302F2B 100%);
     border-radius: 78rpx;
     padding: 22rpx 84rpx;
-    font-weight: 500;
+    font-weight: 600;
     font-size: 32rpx;
     color: #FBEAC9;
     line-height: 44rpx;
@@ -418,5 +454,13 @@ page {
       opacity: 0.7;
     }
   }
+  .refoundWaiteUse {
+    margin-right: 28rpx;
+    border: 2rpx solid #DCDCDC;
+    background: #fff;
+    border-radius: 78rpx;
+    color: #333333;
+    
+  }
 }
 

miniprogram/pages/orders/order-result.ts

@@ -45,7 +45,7 @@ Page({
     timerCount: 0,
     timer: null as any,
     goodsInfo: {} as any,
-    tabIdx: 0, // 当前是从哪个tab来的
+    // tabIdx: 0, // 当前是从哪个tab来的
     orderNo: "" as string,
     showCanvas: false, // 是否显示二维码
     canvasImg: "" as string,
@@ -60,7 +60,7 @@ Page({
     if (options.orderNo) {
       this.setData({
         orderNo: options.orderNo,
-        tabIdx: options.tabIdx
+        // tabIdx: options.tabIdx
       });
     }
   },
@@ -324,6 +324,11 @@ Page({
       }
     })
   },
+  onDownloadApp() {
+    wx.navigateTo({
+      url: '../download/download'
+    })
+  },
   onShareAppMessage() {
     return {
       title: '音乐数字AI',

miniprogram/pages/orders/order-result.wxml

@@ -2,7 +2,7 @@
 <view class="container">
   <navigation-bar title="{{ statusList[status].title }}"></navigation-bar>
 
-  <scroll-view class="record-list" type="list" scroll-y bindscrolltolower="loadMore">
+  <scroll-view class="record-list" type="list" scroll-y >
     <!-- <view class="order-status" wx:if="{{statusList[status]}}">
       <view class="status">
         <image src="{{ statusList[status].logo }}"></image>
@@ -49,7 +49,8 @@
         ，<text class="free">当天激活</text><text class="free blod">赠{{ goodsInfo.giftLongTime }}</text>
       </block>
       </view>
-        <view class="qrcode-text used" wx:else>登录<text>「音乐数字课堂」</text>APP，开启AI学练之旅～</view>
+        <view class="qrcode-text used" wx:else><view>下载<text>「音乐数字课堂」</text>APP，畅享音乐之旅</view><view class="downloadApp" bind:tap="onDownloadApp">下载APP</view>
+        </view>
       <view class="qrcode-line"></view>
       <view class="qrcode-section">
         
@@ -67,6 +68,10 @@
           </view>
         </view>
       </view>
+
+      <view class="download-task" wx:if="{{ goodsInfo.wechatStatus == 'WAIT_USE' }}">
+        <image mode="widthFix" src="https://oss.dayaedu.com/ktyq/1733725573779.png"></image>
+      </view>
     </view>
 
     <view class="order-time" wx:if="{{ goodsInfo.wechatStatus == 'REFUNDED' || goodsInfo.wechatStatus == 'REFUNDING' }}">
@@ -83,12 +88,17 @@
         <view class="value">{{ goodsInfo.refundStyleStr }}</view>
       </view>
     </view>
+
+    <view class="scroll-brank"></view>
   </scroll-view>
 
   <canvas class='my_draw_canvas only_canvas' data-type="image" canvas-id='canvasCode' id="canvasCode"></canvas>
 
   <view class="order-btn" wx:if="{{ goodsInfo.wechatStatus != 'WAIT_PAY' }}">
-    <button type="primary" bind:tap="useRefound" wx:if="{{ goodsInfo.wechatStatus == 'WAIT_USE' && tabIdx == 5 }}">申请退款</button>
+    <block  wx:if="{{ goodsInfo.wechatStatus == 'WAIT_USE' }}">
+      <button type="primary" class="refoundWaiteUse" bind:tap="useRefound">申请退款</button>
+      <button type="primary" bind:tap="onSubmit">再次购买</button>
+    </block>
     <block wx:else>
       <button type="primary" bind:tap="cancelRefound" wx:if="{{ goodsInfo.wechatStatus == 'REFUNDING' }}" disabled="{{cancelRefoundStatus}}">取消退款</button>
       <button type="primary" wx:else bind:tap="onSubmit">再次购买</button>