From f86bd75868eb9b0e81d5cb43d6e76c08a0da3083 Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期一, 15 四月 2024 16:55:49 +0800
Subject: [PATCH] 音频bug3

---
 packagePersonal/pages/aboutUs/index.js                 |    2 
 packageDomain/pages/resourceDetails/myVideo/index.wxml |    2 
 pages/cart/index.js                                    |   11 ++-
 assets/js/config.js                                    |    8 +-
 packageDomain/pages/resourceDetails/myAudio/index.js   |   62 ++++++++++++--------
 pages/retrievalPage/index.wxml                         |    9 ++
 packageDomain/pages/resourceDetails/myVideo/index.wxss |    4 
 packageDomain/pages/resourceDetails/myAudio/index.wxss |    4 
 pages/retrievalPage/index.js                           |   14 ++--
 packageDomain/pages/resourceDetails/myAudio/index.wxml |   12 ++--
 pages/retrievalPage/index.wxss                         |   11 +++
 pages/cart/index.wxss                                  |    2 
 12 files changed, 85 insertions(+), 56 deletions(-)

diff --git a/assets/js/config.js b/assets/js/config.js
index 458bd1a..c98d8ff 100644
--- a/assets/js/config.js
+++ b/assets/js/config.js
@@ -1,7 +1,7 @@
-// export const requestCtx = "http://182.92.203.7:3001"; // 璇锋眰鍦板潃
-// export const appId = 27;
-export const requestCtx = "https://jsek.bnuic.com"; // 璇锋眰鍦板潃
-export const appId = 3;
+export const requestCtx = "http://182.92.203.7:3001"; // 璇锋眰鍦板潃
+export const appId = 27;
+// export const requestCtx = "https://jsek.bnuic.com"; // 璇锋眰鍦板潃
+// export const appId = 3;
 // export const epubUrl = "http://182.92.203.7:3007/epubReadMobile/";
 export const epubUrl = "https://jsek.bnuic.com/epubReadMobile/#/";
 export const pdfUrl = "http://182.92.203.7:3007/pdfRead/";
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index 8bb7be9..e3ad275 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -233,6 +233,7 @@
     wx.navigateBack();
   },
   resourceDetailsData() {
+    let datas = ''
     let query = {
       path: '*',
       queryType: '*',
@@ -240,6 +241,7 @@
       cmsPath: this.data.parentProductLinkPath,
       itemFields: {
         SysType: 'CmsFolder',
+        // 璧勬簮绫诲瀷锛岃瘯璇绘枃浠讹紝鏄惁鍏佽涓嬭浇绛夊弬鏁�
         selectType: [],
         freeFile: [],
         file: [],
@@ -256,45 +258,53 @@
         size: 999
       }
     }
-
     app.MG.store.getProductDetail(query).then(res => {
-      let selectedId = -1; // 鍒濆鍖栭�変腑椤圭储寮�
-      let showDataUrl = '';
-      let titleName = '';
-
       res.datas.cmsDatas[0].datas.forEach((item, index) => {
         if (item.selectType === "audio" || item.learnSelectType === "audio") {
-          this.data.threeLeveData.push(item);
-        }
+          this.data.threeLeveData.push(item)
+          this.setData({
+            threeLeveData: this.data.threeLeveData
+          })
 
-        if (this.data.productLinkPath == item.productLinkPath) {
-          selectedId = index;
         }
-      });
+        this.data.threeLeveData.forEach((items, index) => { // 淇敼姝ゅ娣诲姞index鍙傛暟
+          if (this.data.productLinkPath == items.productLinkPath) {
+            datas = items
+            let selectedIndex = index; // 瀛樺偍閫変腑椤圭殑绱㈠紩
+            this.setData({
+              selectedId: selectedIndex // 璁剧疆閫変腑椤圭殑绱㈠紩
+            });
+          }
 
-      if (selectedId !== -1) {
-        let datas = this.data.threeLeveData[selectedId];
+        });
         if (this.data.formPath == 'jsek_cloudLearning') {
-          showDataUrl = app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + datas.protectedFile + '&token=' + wx.getStorageSync(app.config.tokenKey);
+          // 杩欓噷澶勭悊浜戝涔犵殑
+          this.setData({
+            showData: app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + datas.protectedFile + '&token=' + wx.getStorageSync(app.config.tokenKey),
+            titleName: datas.name
+          })
+          this.pubulicPlayFun()
         } else {
-          showDataUrl = app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.file;
+          this.setData({
+            showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.file,
+            titleName: datas.name
+          })
+          this.pubulicPlayFun()
         }
-        titleName = datas.name;
-      }
 
-      this.setData({
-        threeLeveData: this.data.threeLeveData,
-        selectedId: selectedId,
-        showData: showDataUrl,
-        titleName: titleName,
-        loading: false,
-        hidden: false
-      });
-      this.pubulicPlayFun();
+      })
+      this.data.threeLeveData.forEach((item) => {})
+      setTimeout(() => {
+        this.setData({
+          loading: false,
+          hidden: false
+        })
+      }, 3000)
 
-    });
+    })
   },
 
+
   onVideo(e) {
     this.setData({
       myAudioCurrent: '00:00',
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.wxml b/packageDomain/pages/resourceDetails/myAudio/index.wxml
index e981640..888f8c4 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.wxml
+++ b/packageDomain/pages/resourceDetails/myAudio/index.wxml
@@ -15,7 +15,7 @@
   </view>
 
   <view class="audioPlayerBox">
-    <view class="audioBackground" style="background-image: url('https://jsek.bnuic.com/website/image/video-bg.png');">
+    <view class="audioBackground" style="background-image: url('https://jsek.bnuic.com/home/image/video-bg.png');">
       <image src="/static/images/resourceDetailsMyAudio/cd.png" alt="" />
     </view>
     <!-- 瑙嗛鎾斁鐨勬寜閽� -->
@@ -56,10 +56,10 @@
             <t-icon style="margin-top: 10rpx" wx:else name="caret-down-small" size="14" bind:click="onIconTap" />
           </view>
           <view class="multipleBox" wx:if="{{showDropdown}}">
-            <view wx:if="{{speed != 0.5}}" style="margin: 5rpx 0" bind:tap="smallSpeed">x0.5</view>
-            <view wx:if="{{speed != 1}}" style="margin: 5rpx 0" bind:tap="smallSpeeDmultiple">x1</view>
-            <view wx:if="{{speed != 1.5}}" style="margin: 5rpx 0" bind:tap="centreSpeed">x1.5</view>
-            <view wx:if="{{speed != 2}}" style="margin: 5rpx 0" bind:tap="bigSpeed">x2</view>
+            <view style="margin: 10rpx 0;" wx:if="{{speed != 0.5}}" bind:tap="smallSpeed">x0.5</view>
+            <view style="margin: 10rpx 0;" wx:if="{{speed != 1}}" bind:tap="smallSpeeDmultiple">x1</view>
+            <view style="margin: 10rpx 0;" wx:if="{{speed != 1.5}}" bind:tap="centreSpeed">x1.5</view>
+            <view style="margin: 10rpx 0;" wx:if="{{speed != 2}}" bind:tap="bigSpeed">x2</view>
           </view>
         </view>
       </view>
@@ -69,7 +69,7 @@
   <!-- 鏍囬 -->
   <view class="titleBox">{{titleName}}</view>
   <view class="contentBox">
-    <t-tabs defaultValue="{{0}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" t-class-content="custom-panel">
+    <t-tabs defaultValue="{{0}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" t-class-content="custom-panel" split="{{false}}">
       <!-- 璧勬簮鍒楄〃 -->
       <t-tab-panel label="璧勬簮鍒楄〃" value="0" style="{{tabPanelstyle}}" style="width: 750rpx">
         <view class="wrapper">
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.wxss b/packageDomain/pages/resourceDetails/myAudio/index.wxss
index 1ad09d2..9b401a3 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.wxss
+++ b/packageDomain/pages/resourceDetails/myAudio/index.wxss
@@ -358,9 +358,9 @@
   height: 100%;
 }
 
-.tabs--t-tabs__scroll--split::after {
+/* .tabs--t-tabs__scroll--split::after {
   height: 0px !important;
-}
+} */
 
 .buttonBox {
   position: absolute;
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.wxml b/packageDomain/pages/resourceDetails/myVideo/index.wxml
index e5f0517..f9f6e73 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.wxml
+++ b/packageDomain/pages/resourceDetails/myVideo/index.wxml
@@ -25,7 +25,7 @@
   <!-- 鏍囬 -->
   <view class="titleBox">{{titleName}}</view>
   <view class="contentBox">
-    <t-tabs defaultValue="{{0}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" t-class-content="custom-panel">
+    <t-tabs defaultValue="{{0}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" t-class-content="custom-panel" split="{{false}}">
       <!-- 璧勬簮鍒楄〃 -->
       <t-tab-panel label="璧勬簮鍒楄〃" value="0" style="{{tabPanelstyle}}" style="width: 750rpx;">
         <view class="wrapper">
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.wxss b/packageDomain/pages/resourceDetails/myVideo/index.wxss
index e0d274d..84f2340 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.wxss
+++ b/packageDomain/pages/resourceDetails/myVideo/index.wxss
@@ -317,9 +317,9 @@
   margin-top: 120rpx;
 }
 
-.tabs--t-tabs__scroll--split::after {
+/* .tabs--t-tabs__scroll--split::after {
   height: 0px !important;
-}
+} */
 
 .buttonBox {
   position: absolute;
diff --git a/packagePersonal/pages/aboutUs/index.js b/packagePersonal/pages/aboutUs/index.js
index 3a6e4dc..1900b12 100644
--- a/packagePersonal/pages/aboutUs/index.js
+++ b/packagePersonal/pages/aboutUs/index.js
@@ -126,7 +126,7 @@
         width: 750
       },
     }).then(res => {
-      console.log(res);
+      // console.log(res.datas[0].content);
 
       this.setData({
         aboutText: res.datas[0].content,
diff --git a/pages/cart/index.js b/pages/cart/index.js
index 7e40e8d..9f187c7 100644
--- a/pages/cart/index.js
+++ b/pages/cart/index.js
@@ -114,10 +114,13 @@
           onDisabled: false
         })
       }
-      this.setData({
-        loading: false,
-        hidden: false,
-      })
+      setTimeout(() => {
+        this.setData({
+          loading: false,
+          hidden: false,
+        })
+      }, 600)
+
     });
     wx.stopPullDownRefresh()
 
diff --git a/pages/cart/index.wxss b/pages/cart/index.wxss
index b343c4d..0b2b1df 100644
--- a/pages/cart/index.wxss
+++ b/pages/cart/index.wxss
@@ -187,7 +187,7 @@
 }
 
 .t-button--default {
-  background-color: #FF6C00 !important;
+  /* background-color: #FF6C00 !important; */
 }
 
 .noDataBox {
diff --git a/pages/retrievalPage/index.js b/pages/retrievalPage/index.js
index 331b16f..659db87 100644
--- a/pages/retrievalPage/index.js
+++ b/pages/retrievalPage/index.js
@@ -67,6 +67,8 @@
       }
     }
     this.onTabsChange(event)
+
+
   },
 
   /**
@@ -133,11 +135,8 @@
   //鏍囩鐨勫垏鎹�
   onTabsChange(event) {
     const value = event.detail.value
-    // if (this.data.bookData <= 0 || this.data.courseData <= 0 || this.data.digitalTextbooksData <= 0 || this.data.seminarData <= 0 || this.data.biblioClassificationData <= 0 || this.data.bookFairData <= 0) {
-    //   this.setData({
-    //     isMore: true
-    //   })
-    // }
+    console.log(value);
+
     if (value === '0') {
       this.setData({
         tabValue: value,
@@ -919,5 +918,8 @@
         }, 100)
       }
     }
-  }
+  },
+  onTabsClick(event) {
+    console.log(`Click tab, tab-panel value is ${event.detail.value}.`);
+  },
 })
\ No newline at end of file
diff --git a/pages/retrievalPage/index.wxml b/pages/retrievalPage/index.wxml
index d36cab3..f64404d 100644
--- a/pages/retrievalPage/index.wxml
+++ b/pages/retrievalPage/index.wxml
@@ -26,7 +26,14 @@
   <view class="tabsBox">
     <!-- sticky="true" -->
     <t-tabs defaultValue="{{0}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" t-class-content="custom-panel">
+
+
+
       <t-tab-panel label="鍥句功({{bookTotal}})" value="0">
+
+
+
+
         <view wx:if="{{bookData.length <= 0}}" class="noDataBox">
           <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
         </view>
@@ -81,9 +88,7 @@
                 </view>
               </view>
             </view>
-
           </view>
-
           <view wx:if="{{courseData.length != 0}}" class="bottom-box">
             <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
             <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
diff --git a/pages/retrievalPage/index.wxss b/pages/retrievalPage/index.wxss
index d3b828c..de5b9b6 100644
--- a/pages/retrievalPage/index.wxss
+++ b/pages/retrievalPage/index.wxss
@@ -375,4 +375,13 @@
 .t-search__input-box--square {
   border-radius: var(--td-search-square-radius, var(--td-radius-default, 36rpx)) !important;
   height: 72rpx;
-}
\ No newline at end of file
+}
+
+.t-search__input-box .t-input__keyword {
+  font-size: var(--td-search-font-size, var(--td-font-size-m, 28rpx)) !important;
+}
+
+/* element.style {
+  -webkit-transform: translateX(38.9921875px) !important;
+  transform: translateX(38.9921875px) !important;
+} */
\ No newline at end of file

--
Gitblit v1.9.1