From 4bc1c36faeec2f90e5acfa836732e49fe0b245e9 Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期五, 12 四月 2024 20:47:03 +0800
Subject: [PATCH] 云学习11
---
packageBookService/pages/bookServices/detail/index.wxml | 290 ++++++------------------------------
pages/bookExhibitionList/index.wxss | 6
packageDomain/pages/resourceDetails/myAudio/index.js | 60 ++++---
pages/retrievalPage/index.wxss | 10
packagePersonal/pages/aboutUs/index.wxss | 12 +
packagePersonal/pages/aboutUs/index.wxml | 11 +
packageDomain/pages/resourceDetails/myVideo/index.wxml | 13 -
packageBookService/pages/bookServices/detail/components/tree/index.js | 2
static/images/resourceDetails/jibiji／icon@2x.png | 0
pages/bibliographyList/index.wxss | 5
packageBookService/pages/bookServices/detail/index.js | 7
packageDomain/pages/resourceDetails/myVideo/index.wxss | 15 +
packageDomain/pages/resourceDetails/myAudio/index.wxss | 15 +
packageDomain/pages/resourceDetails/myAudio/index.wxml | 3
14 files changed, 154 insertions(+), 295 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index e172a35..00e10a7 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -514,7 +514,7 @@
title: "娣诲姞鎴愬姛",
});
item.isShopCar = false
-
+ this.triggerEvent("updateCloudLearning")
}
}
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 152b211..58289fc 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -1398,16 +1398,23 @@
},
updateShoppingCartHidden() {
+
const isSHow = this.data.shoppingCartGetId.some(
(item) => item == data.saleMethod[0].Id
);
return !isSHow;
},
+ //鍒锋柊璐墿杞﹀浘鏍�
updateCloudLearning() {
+ this.getBookInfo()
+ this.getShoppingCartProductGet()
const checkData = this.data.cmsDatas.find(
(item) => item.refCode == "jsek_cloudLearning"
);
this.getResourceData(checkData);
+
+
+
},
// 閬嶅巻鏍戠粨鏋勮浆鎹负鏁扮粍鏂规硶
handleTreeData(array) {
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index 86bf948..d04e4cc 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -7,55 +7,30 @@
<view style="width: 100%; height: {{barHeight}}px; "></view>
<view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
<view>
- <t-icon
- name="chevron-left"
- size="30"
- data-name="{{item}}"
- bind:click="goBack"
- />
+ <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
</view>
<view class="navbar-title">{{options.name}}</view>
</view>
<t-toast id="t-toast" />
- <scroll-view
- scroll-y="{{true}}"
- class="book"
- bindscrolltolower="onReachBottom"
- >
+ <scroll-view scroll-y="{{true}}" class="book" bindscrolltolower="onReachBottom">
<!-- 鍥句功璇︽儏 -->
<view class="book-box">
<view class="book-detail" id="book-detail">
<view class="detail-left">
<view class="book-img">
- <image
- loading=""
- src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}"
- mode="aspectFit"
- aria-label="{{bookDetail.name}}"
- />
+ <image loading="" src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}" mode="aspectFit" aria-label="{{bookDetail.name}}" />
</view>
<view class="book-use">
<view class="collect" bind:tap="setCollect">
<view>
- <image
- loading=""
- src="/static/images/bookService/detail/collect.png"
- wx:if="{{!bookDetail.isFavourite}}"
- />
- <image
- loading=""
- src="/static/images/bookService/detail/collecting.png"
- wx:if="{{bookDetail.isFavourite}}"
- />
+ <image loading="" src="/static/images/bookService/detail/collect.png" wx:if="{{!bookDetail.isFavourite}}" />
+ <image loading="" src="/static/images/bookService/detail/collecting.png" wx:if="{{bookDetail.isFavourite}}" />
</view>
<view class="use-title">鏀惰棌</view>
</view>
<view class="suggest" bind:tap="suggestBtn">
<view>
- <image
- loading=""
- src="/static/images/bookService/detail/suggest.png"
- />
+ <image loading="" src="/static/images/bookService/detail/suggest.png" />
</view>
<view class="use-title">鎴戣寤鸿</view>
</view>
@@ -80,19 +55,12 @@
<view class="li-title">鍑虹増鏃堕棿锛�</view>
<view class="li-content">{{bookDetail.publicationDate}}</view>
</view>
- <view
- class="message-li"
- wx:if="{{bookClass.length}}"
- style="height: 80rpx"
- >
+ <view class="message-li" wx:if="{{bookClass.length}}" style="height: 80rpx">
<view class="li-title">鍥句功鍒嗙被锛�</view>
<view class="class-name showTow">{{bookClass}}</view>
</view>
</view>
- <image
- src="/static/images/bookService/detail/square.png"
- class="right-background"
- />
+ <image src="/static/images/bookService/detail/square.png" class="right-background" />
</view>
</view>
<!-- 閿�鍞俊鎭� -->
@@ -101,17 +69,12 @@
<!-- 鐢靛瓙涔﹀敭浠� -->
<view class="electron-price" wx:if="{{bookDetail.price}}">
<view>
- <image
- src="/static/images/bookService/detail/electon-price.png"
- />
+ <image src="/static/images/bookService/detail/electon-price.png" />
</view>
<view class="price">
- <view class="price-text"
- >{{bookDetail.price == '0.00' ? '鍏嶈垂' : '楼'+
- bookDetail.price}}</view
- >
- <view class="price-old" wx:if="{{bookDetail.oldPrice != '0.00'}}"
- >楼{{bookDetail.oldPrice}}
+ <view class="price-text">{{bookDetail.price == '0.00' ? '鍏嶈垂' : '楼'+
+ bookDetail.price}}</view>
+ <view class="price-old" wx:if="{{bookDetail.oldPrice != '0.00'}}">楼{{bookDetail.oldPrice}}
</view>
</view>
<view> </view>
@@ -121,68 +84,26 @@
<view>
<image src="/static/images/bookService/detail/paper-price.png" />
</view>
- <view class="price"
- >{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' :
- '楼'+bookDetail.paperPrice}}</view
- >
+ <view class="price">{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' :
+ '楼'+bookDetail.paperPrice}}</view>
</view>
</view>
<!-- 缃戝簵 -->
<view class="book-web">
- <image
- src="/static/images/bookService/detail/jd.png"
- wx:if="{{bookDetail.JDLink}}"
- bind:tap="goShop"
- data-link="{{bookDetail.JDLink}}"
- data-type="jd"
- />
- <image
- class="tmall-image"
- src="/static/images/bookService/detail/tmall.png"
- bind:tap="goShop"
- data-link="{{bookDetail.tmallLink}}"
- wx:if="{{bookDetail.tmallLink}}"
- />
- <image
- src="/static/images/bookService/detail/dangdang.png"
- bind:tap="goShop"
- data-link="{{bookDetail.dangdangLink}}"
- wx:if="{{bookDetail.dangdangLink}}"
- />
- <image
- src="/static/images/bookService/detail/weidian.png"
- bind:tap="goShop"
- data-link="{{bookDetail.weidianLink}}"
- wx:if="{{bookDetail.weidianLink}}"
- />
+ <image src="/static/images/bookService/detail/jd.png" wx:if="{{bookDetail.JDLink}}" bind:tap="goShop" data-link="{{bookDetail.JDLink}}" data-type="jd" />
+ <image class="tmall-image" src="/static/images/bookService/detail/tmall.png" bind:tap="goShop" data-link="{{bookDetail.tmallLink}}" wx:if="{{bookDetail.tmallLink}}" />
+ <image src="/static/images/bookService/detail/dangdang.png" bind:tap="goShop" data-link="{{bookDetail.dangdangLink}}" wx:if="{{bookDetail.dangdangLink}}" />
+ <image src="/static/images/bookService/detail/weidian.png" bind:tap="goShop" data-link="{{bookDetail.weidianLink}}" wx:if="{{bookDetail.weidianLink}}" />
</view>
</view>
</view>
<view class="book-resource">
<movable-area class="movable-area">
- <t-tabs
- value="{{tabValue}}"
- bind:change="onTabsChange"
- t-class="custom-tabs"
- t-class-content="custom-panel"
- class="tab-class"
- >
- <t-tab-panel
- label="鍥句功绠�浠�"
- icon="{{ tabValue == 'brief' ? briefIconClick : briefIcon}}"
- value="brief"
- style="{{tabPanelstyle}}"
- >
- <book-brief
- content="{{bookDetail.content}}"
- authorIntroduction="{{bookDetail.authorIntroduction}}"
- wx:if="{{bookDetail.content || bookDetail.authorIntroduction}}"
- ></book-brief>
- <view
- wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction}}"
- class="noData"
- >
+ <t-tabs value="{{tabValue}}" bind:change="onTabsChange" t-class="custom-tabs" t-class-content="custom-panel" class="tab-class">
+ <t-tab-panel label="鍥句功绠�浠�" icon="{{ tabValue == 'brief' ? briefIconClick : briefIcon}}" value="brief" style="{{tabPanelstyle}}">
+ <book-brief content="{{bookDetail.content}}" authorIntroduction="{{bookDetail.authorIntroduction}}" wx:if="{{bookDetail.content || bookDetail.authorIntroduction}}"></book-brief>
+ <view wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
</t-tab-panel>
@@ -193,34 +114,10 @@
style="{{tabPanelstyle}}"
>
</t-tab-panel> -->
- <t-tab-panel
- label="鏁欏璧勬簮"
- icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}"
- value="jsek_teachingResources"
- class="{{loading ? 'loading': ''}}"
- >
- <view
- wx:if="{{!loading && teach.length && !noResources && applyState}}"
- >
- <teach-resource
- applyState="{{applyState}}"
- rejectCause="{{rejectCause}}"
- deadline="{{deadline}}"
- bind:applyResource="applyResource"
- applyResourceLoading="{{applyResourceLoading}}"
- ></teach-resource>
- <tree
- id="teach-tree"
- openIds="{{openTeachids}}"
- bookInfo="{{bookDetail}}"
- treeList="{{teach}}"
- tab="{{tabValue}}"
- applyState="{{applyState}}"
- bind:downloadTeach="downloadTeach"
- bind:handleTree="handleTree"
- openTeachids="{{openTeachids}}"
- wx:if="{{teach.length}}"
- ></tree>
+ <t-tab-panel label="鏁欏璧勬簮" icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}" value="jsek_teachingResources" class="{{loading ? 'loading': ''}}">
+ <view wx:if="{{!loading && teach.length && !noResources && applyState}}">
+ <teach-resource applyState="{{applyState}}" rejectCause="{{rejectCause}}" deadline="{{deadline}}" bind:applyResource="applyResource" applyResourceLoading="{{applyResourceLoading}}"></teach-resource>
+ <tree id="teach-tree" openIds="{{openTeachids}}" bookInfo="{{bookDetail}}" treeList="{{teach}}" tab="{{tabValue}}" applyState="{{applyState}}" bind:downloadTeach="downloadTeach" bind:handleTree="handleTree" openTeachids="{{openTeachids}}" wx:if="{{teach.length}}" isShoppingCart="isShoppingCart" bind:updateCloudLearning="updateCloudLearning"></tree>
</view>
<!-- <t-loading
theme="circular"
@@ -229,100 +126,47 @@
loading="{{loading }}"
/> -->
<view wx:if="{{loading}}" style="width: 100%; height: min-content">
+<<<<<<< Updated upstream
<t-skeleton
row-col="{{rowCol}}"
theme="paragraph"
animation="gradient"
loading="{{loading}}"
></t-skeleton>
+=======
+ <t-skeleton row-col="{{[1,1,2,1,1,2]}}" theme="paragraph" animation="gradient" loading="{{loading}}"></t-skeleton>
+>>>>>>> Stashed changes
</view>
<view wx:if="{{noResources}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
</t-tab-panel>
- <t-tab-panel
- label="浜戝涔�"
- icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}"
- value="jsek_cloudLearning"
- style="{{tabPanelstyle}}"
- >
+ <t-tab-panel label="浜戝涔�" icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}" value="jsek_cloudLearning" style="{{tabPanelstyle}}">
<view wx:if="{{!loading && learn.length}}">
- <learn-resource
- bind:getFreeResource="getFreeResource"
- bind:allAddShoppiingCar="allAddShoppiingCar"
- id="learn-resource"
- buyResourceData="{{buyResourceData}}"
- bookId="{{bookDetail.id}}"
- isshowDrawBtn="{{isshowDrawBtn}}"
- ></learn-resource>
+ <learn-resource bind:getFreeResource="getFreeResource" bind:allAddShoppiingCar="allAddShoppiingCar" id="learn-resource" buyResourceData="{{buyResourceData}}" bookId="{{bookDetail.id}}" isshowDrawBtn="{{isshowDrawBtn}}"></learn-resource>
- <tree
- id="tree"
- openIds="{{openLearnids}}"
- bookInfo="{{bookDetail}}"
- tab="{{tabValue}}"
- treeList="{{learn}}"
- buyIds="{{buyIdList}}"
- openLearnids="{{openLearnids}}"
- bind:updateShoppingCartHidden="updateShoppingCartHidden"
- bind:updateCloudLearning="updateCloudLearning"
- ></tree>
+ <tree id="tree" openIds="{{openLearnids}}" bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}" bind:updateShoppingCartHidden="updateShoppingCartHidden" bind:updateCloudLearning="updateCloudLearning"></tree>
</view>
<view wx:if="{{noResources}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
</t-tab-panel>
- <t-tab-panel
- label="浜戞祴璇�"
- icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}"
- value="questionBank"
- style="{{tabPanelstyle}}"
- >
+ <t-tab-panel label="浜戞祴璇�" icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}" value="questionBank" style="{{tabPanelstyle}}">
<view wx:if="{{!loading}}">
- <test-resource
- id="test-resource"
- list="{{test}}"
- bookInfo="{{bookDetail}}"
- mockData="{{mockData}}"
- bind:buyMock="buyMock"
- ></test-resource>
+ <test-resource id="test-resource" list="{{test}}" bookInfo="{{bookDetail}}" mockData="{{mockData}}" bind:buyMock="buyMock"></test-resource>
</view>
</t-tab-panel>
- <t-tab-panel
- label="浜戠瑪璁�"
- icon="{{tabValue == 'jsek_note' ? noteClickIcon: noteIcon}}"
- value="jsek_note"
- style="{{tabPanelstyle}}"
- >
+ <t-tab-panel label="浜戠瑪璁�" icon="{{tabValue == 'jsek_note' ? noteClickIcon: noteIcon}}" value="jsek_note" style="{{tabPanelstyle}}">
<note bookInfo="{{bookDetail}}" id="note" class="note-list"></note>
</t-tab-panel>
- <t-tab-panel
- label="鐩稿叧鍥句功"
- icon="{{tabValue == 'related_books' ? linkClickIcon: linkIcon}}"
- value="related_books"
- style="{{tabPanelstyle}}"
- >
- <related-books
- relatedBookData="{{relatedBookData}}"
- relatedBookLoading="{{relatedBookLoading}}"
- noRelatedBookData="{{noRelatedBookData}}"
- bind:goBookDetails="goBookDetails"
- ></related-books>
+ <t-tab-panel label="鐩稿叧鍥句功" icon="{{tabValue == 'related_books' ? linkClickIcon: linkIcon}}" value="related_books" style="{{tabPanelstyle}}">
+ <related-books relatedBookData="{{relatedBookData}}" relatedBookLoading="{{relatedBookLoading}}" noRelatedBookData="{{noRelatedBookData}}" bind:goBookDetails="goBookDetails"></related-books>
</t-tab-panel>
</t-tabs>
- <movable-view
- class="movable-view"
- :x="{{x}}"
- :y="{{y}}"
- direction="all"
- >
+ <movable-view class="movable-view" :x="{{x}}" :y="{{y}}" direction="all">
<view class="applyBox" bindtap="goApply">
<view class="box">
- <t-image
- src="/static/images/home/yangshuForm1.png"
- mode="heightFix"
- class="img"
- />
+ <t-image src="/static/images/home/yangshuForm1.png" mode="heightFix" class="img" />
<view class="num" wx:if="{{num > 0}}">{{num}}</view>
</view>
</view>
@@ -331,73 +175,37 @@
</view>
</scroll-view>
<!-- 鎴戣寤鸿寮圭獥 -->
- <suggest
- class="suggest-component"
- id="suggest-component"
- bookIcon="{{bookDetail.icon}}"
- bookName="{{bookDetail.name}}"
- ></suggest>
+ <suggest class="suggest-component" id="suggest-component" bookIcon="{{bookDetail.icon}}" bookName="{{bookDetail.name}}"></suggest>
<!-- 鏁欏璧勬簮涓嬭浇鎻愮ず寮圭獥 -->
- <t-dialog
- class="teachDownloadDialog"
- visible="{{isShowTeachDownload}}"
- title="鎻愮ず"
- content="璇峰墠寰�PC绔笅杞�"
- confirm-btn="{{ confirmBtn }}"
- bind:confirm="closeTeachDownload"
- />
+ <t-dialog class="teachDownloadDialog" visible="{{isShowTeachDownload}}" title="鎻愮ず" content="璇峰墠寰�PC绔笅杞�" confirm-btn="{{ confirmBtn }}" bind:confirm="closeTeachDownload" />
<!-- 璐拱鎸夐挳 -->
<view class="box-bottom">
<view class="bottom-btn" bind:tap="appplyElectronicBook">
<view>
- <t-image
- loading=""
- src="/static/images/bookService/detail/ebook.png"
- ></t-image>
+ <t-image loading="" src="/static/images/bookService/detail/ebook.png"></t-image>
</view>
<view class="btn-text">鐢靛瓙鏍蜂功鐢宠</view>
</view>
<view class="bottom-btn" bind:tap="appplyPaperBook">
<view>
- <t-image
- src="/static/images/bookService/detail/paper-book.png"
- ></t-image>
+ <t-image src="/static/images/bookService/detail/paper-book.png"></t-image>
</view>
<view class="btn-text">绾歌川鏍蜂功鐢宠</view>
</view>
- <view
- class="{{!bookBuy && bookDetail.isSell ? 'bottom-btn tryRead' : 'bottom-btn try'}}"
- bind:tap="goRead"
- wx:if="{{!bookBuy}}"
- >
+ <view class="{{!bookBuy && bookDetail.isSell ? 'bottom-btn tryRead' : 'bottom-btn try'}}" bind:tap="goRead" wx:if="{{!bookBuy}}">
<view>
<t-image src="/static/images/bookService/detail/shidu.png"></t-image>
</view>
<view class="btn-text">璇曡</view>
</view>
- <view
- class="shopCar shopCarColor"
- bind:tap="addBookShopcCar"
- wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}"
- >鍔犲叆璐墿杞�</view
- >
- <view
- class="buy buyColor"
- bind:tap="buyBtn"
- wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}"
- >绔嬪嵆璐拱</view
- >
- <view
- class="buy receiveColor"
- bind:tap="buyBtn"
- wx:if="{{!bookBuy && bookDetail.price == '0.00' && bookDetail.isSell == '1'}}"
- >鍏嶈垂棰嗗彇</view
- >
+ <view class="shopCar shopCarColor" bind:tap="addBookShopcCar" wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}">鍔犲叆璐墿杞�</view>
+ <view class="buy buyColor" bind:tap="buyBtn" wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}">绔嬪嵆璐拱</view>
+ <view class="buy receiveColor" bind:tap="buyBtn" wx:if="{{!bookBuy && bookDetail.price == '0.00' && bookDetail.isSell == '1'}}">鍏嶈垂棰嗗彇</view>
<view class="buy read" bind:tap="goRead" wx:if="{{bookBuy}}">绔嬪嵆鏌ョ湅</view>
</view>
</view>
<!-- <view class="loading" wx:if="{{pageLoading}}">
<t-loading loading="{{pageLoading}}" size="40"></t-loading>
-</view> -->
+</view> -->
\ No newline at end of file
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index 0221d5a..10f021b 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -159,9 +159,9 @@
// showData: '',
// });
// 鍋滄闊抽鎾斁
- myAudio.stop();
+ // myAudio.stop();
// 閿�姣� InnerAudioContext 瀹炰緥
- myAudio.destroy();
+ // myAudio.destroy();
},
count(timeStr) {
const data = {
@@ -233,6 +233,7 @@
wx.navigateBack();
},
resourceDetailsData() {
+ let datas = ''
let query = {
path: '*',
queryType: '*',
@@ -264,29 +265,33 @@
this.setData({
threeLeveData: this.data.threeLeveData
})
- this.data.threeLeveData.forEach((items, index) => { // 淇敼姝ゅ娣诲姞index鍙傛暟
- if (this.data.productLinkPath == items.productLinkPath) {
- if (this.data.formPath == 'jsek_cloudLearning') {
- // 杩欓噷澶勭悊浜戝涔犵殑
- this.setData({
- showData: app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + items.protectedFile + '&token=' + wx.getStorageSync(app.config.tokenKey),
- titleName: items.name
- })
- this.pubulicPlayFun()
- } else {
- this.setData({
- showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + items.file,
- titleName: items.name
- })
- this.pubulicPlayFun()
- }
- let selectedIndex = index; // 瀛樺偍閫変腑椤圭殑绱㈠紩
- this.setData({
- selectedId: selectedIndex // 璁剧疆閫変腑椤圭殑绱㈠紩
- });
- }
- });
+
}
+ this.data.threeLeveData.forEach((items, index) => { // 淇敼姝ゅ娣诲姞index鍙傛暟
+ if (this.data.productLinkPath == items.productLinkPath) {
+ datas = items
+ let selectedIndex = index; // 瀛樺偍閫変腑椤圭殑绱㈠紩
+ this.setData({
+ selectedId: selectedIndex // 璁剧疆閫変腑椤圭殑绱㈠紩
+ });
+ }
+
+ });
+ if (this.data.formPath == 'jsek_cloudLearning') {
+ // 杩欓噷澶勭悊浜戝涔犵殑
+ this.setData({
+ showData: app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + datas.protectedFile + '&token=' + wx.getStorageSync(app.config.tokenKey),
+ titleName: datas.name
+ })
+ this.pubulicPlayFun()
+ } else {
+ this.setData({
+ showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.file,
+ titleName: datas.name
+ })
+ this.pubulicPlayFun()
+ }
+
})
this.data.threeLeveData.forEach((item) => {})
this.setData({
@@ -591,15 +596,14 @@
// 鍦╫nCanplay閲岃幏鍙栧苟璁剧疆闊抽鏃堕暱鍜屾挱鏀捐繘搴�
myAudio.onCanplay(() => {
myAudio.duration; //蹇呴』鍐欙紝涓嶇劧鑾峰彇涓嶅埌
- this.setData({
- myAudioDuration: this.format(myAudio.duration),
- })
setTimeout(() => {
+
this.setData({
myAudioDuration: this.format(myAudio.duration),
myAudioCurrent: this.format(myAudio.currentTime)
});
+
}, 100);
});
@@ -613,7 +617,7 @@
//杩涘害鏉″彉鍖�
myAudio.onTimeUpdate(() => {
- console.log(this.format(myAudio.duration));
+ // console.log(this.format(myAudio.duration));
this.setData({
myAudioPos: myAudio.currentTime / myAudio.duration * 100,
myAudioCurrent: this.format(myAudio.currentTime),
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.wxml b/packageDomain/pages/resourceDetails/myAudio/index.wxml
index 9d7e4d2..30884ce 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.wxml
+++ b/packageDomain/pages/resourceDetails/myAudio/index.wxml
@@ -112,9 +112,10 @@
<!-- 璁扮瑪璁� -->
<view class="takeNotes" data-key="showCloseBtn" bind:tap="showDialog">
<view class="takeNotesLining">
- <image src="/static/images/resourceDetails/jibijii.png" mode="" /> 璁扮瑪璁�
+ <image src="/static/images/resourceDetails/jibiji锛廼con@2x.png" mode="" /> 璁扮瑪璁�
</view>
</view>
+ <view class="buttonBox"></view>
</view>
<!-- 璁扮瑪璁板脊绐� -->
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.wxss b/packageDomain/pages/resourceDetails/myAudio/index.wxss
index 6fcff98..0088f1e 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.wxss
+++ b/packageDomain/pages/resourceDetails/myAudio/index.wxss
@@ -49,7 +49,7 @@
top: 0rpx;
right: 0;
width: 353rpx;
- border-bottom: 1rpx solid #e7e7e7;
+ /* border-bottom: 1rpx solid #e7e7e7; */
}
.takeNotes image {
@@ -356,4 +356,17 @@
.pauseCircleBox image {
width: 100%;
height: 100%;
+}
+
+.tabs--t-tabs__scroll--split::after {
+ height: 0px !important;
+}
+
+.buttonBox {
+ position: absolute;
+ top: 95rpx;
+ width: 100%;
+ background-color: #e7e7e7;
+ height: 1px;
+ z-index: 999;
}
\ No newline at end of file
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.wxml b/packageDomain/pages/resourceDetails/myVideo/index.wxml
index 2ca24a1..e5f0517 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.wxml
+++ b/packageDomain/pages/resourceDetails/myVideo/index.wxml
@@ -72,9 +72,10 @@
<!-- 璁扮瑪璁� -->
<view class="takeNotes" data-key="showCloseBtn" bind:tap="showDialog">
<view class="takeNotesLining">
- <image src="/static/images/resourceDetails/jibijii.png" mode="" /> 璁扮瑪璁�
+ <image src="/static/images/resourceDetails/jibiji锛廼con@2x.png" mode="" /> 璁扮瑪璁�
</view>
</view>
+ <view class="buttonBox"></view>
</view>
@@ -90,26 +91,16 @@
<t-input value="{{submitTitle}}" style="{{inputStyle}}" data-value="{{false}}" bind:enter="changeTitle" bind:blur="changeTitle" maxlength="{{50}}" bind:change="inputChange"></t-input>
</view>
</view>
-
-
-
-
<view slot='content'>
<view class="textarea-example">
<text class="textarea-example__label">鍐呭:</text>
<t-textarea value="{{textvalue}}" t-class="external-class" placeholder="璇疯緭鍏ユ枃瀛�" bordered maxlength="500" disableDefaultPadding="{{true}}" indicator style="{{inputStyle}}" bind:change="textareaChange" />
</view>
-
-
<view class="submit-btn">
<t-button theme="primary" size="large" block bind:tap="confirmSuggest">鎻愪氦</t-button>
</view>
</view>
-
-
-
</view>
<t-icon t-class="close-btn" name="close-circle" size="32" color="#fff" bind:tap="closeDialog" />
</t-popup>
-
</view>
\ No newline at end of file
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.wxss b/packageDomain/pages/resourceDetails/myVideo/index.wxss
index 1a1096e..5240778 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.wxss
+++ b/packageDomain/pages/resourceDetails/myVideo/index.wxss
@@ -77,7 +77,7 @@
top: 0rpx;
right: 0;
width: 353rpx;
- border-bottom: 1rpx solid #e7e7e7;
+ /* border-bottom: 1rpx solid #e7e7e7; */
}
.takeNotes image {
@@ -315,4 +315,17 @@
.noData {
margin-top: 120rpx;
+}
+
+.tabs--t-tabs__scroll--split::after {
+ height: 0px !important;
+}
+
+.buttonBox {
+ position: absolute;
+ top: 95rpx;
+ width: 100%;
+ background-color: #e7e7e7;
+ height: 1px;
+ z-index: 999;
}
\ No newline at end of file
diff --git a/packagePersonal/pages/aboutUs/index.wxml b/packagePersonal/pages/aboutUs/index.wxml
index 5431f5c..4dbe5a2 100644
--- a/packagePersonal/pages/aboutUs/index.wxml
+++ b/packagePersonal/pages/aboutUs/index.wxml
@@ -5,12 +5,17 @@
<view class="aboutUsBox" hidden="{{hidden}}">
<view class="titleBox">
<view style="width: 100%; height: {{barHeight}}px; "></view>
- <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
+ <view class="nacigationBar" style="width: 90%; height: {{navBarHeight}}px;">
<view>
<t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
</view>
- <view wx:if="{{types == 'jsek_aboutUs'}}" class="navbar-title">鍏充簬鎴戜滑</view>
- <view wx:else class="navbar-title">鑱旂郴鎴戜滑</view>
+
+
+ <view class="titleTextBox">
+ <view wx:if="{{types == 'jsek_aboutUs'}}" class="navbar-title">鍏充簬鎴戜滑</view>
+ <view wx:else class="navbar-title">鑱旂郴鎴戜滑</view>
+ </view>
+
</view>
</view>
diff --git a/packagePersonal/pages/aboutUs/index.wxss b/packagePersonal/pages/aboutUs/index.wxss
index 537098c..6786ef7 100644
--- a/packagePersonal/pages/aboutUs/index.wxss
+++ b/packagePersonal/pages/aboutUs/index.wxss
@@ -6,17 +6,18 @@
background-color: #fff;
display: flex;
align-items: center;
+ margin-bottom: 50rpx;
}
.navbar-title {
- white-space: nowrap;
- /* overflow: hidden; */
+ /* white-space: nowrap;
+
text-overflow: ellipsis;
color: #0F1214;
margin-bottom: 5rpx;
font-weight: bold;
font-size: 36rpx;
- color: #0F1214;
+ color: #0F1214; */
}
image {
@@ -82,4 +83,9 @@
.richTextBox table {
border-width: 2px !important;
+}
+
+.titleTextBox {
+ margin: 0 auto;
+
}
\ No newline at end of file
diff --git a/pages/bibliographyList/index.wxss b/pages/bibliographyList/index.wxss
index e878ff2..cacb4ca 100644
--- a/pages/bibliographyList/index.wxss
+++ b/pages/bibliographyList/index.wxss
@@ -212,4 +212,9 @@
/* border: 1rpx #000 solid; */
background-color: #ccc;
/* width: 100%; */
+}
+
+.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
diff --git a/pages/bookExhibitionList/index.wxss b/pages/bookExhibitionList/index.wxss
index 502a04a..3244fa5 100644
--- a/pages/bookExhibitionList/index.wxss
+++ b/pages/bookExhibitionList/index.wxss
@@ -269,4 +269,10 @@
margin-top: 100rpx;
display: flex;
justify-content: center;
+}
+
+.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
diff --git a/pages/retrievalPage/index.wxss b/pages/retrievalPage/index.wxss
index c1bd3fd..d3b828c 100644
--- a/pages/retrievalPage/index.wxss
+++ b/pages/retrievalPage/index.wxss
@@ -266,11 +266,6 @@
/* margin-top: 300rpx; */
}
-
-
-
-
-
/* 涓撻 */
.listBox {
padding: 20rpx 0;
@@ -375,4 +370,9 @@
.scrollViewBox {
height: calc(100vh - 326rpx);
/* width: calc(100vw - 60rpx); */
+}
+
+.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
diff --git "a/static/images/resourceDetails/jibiji\357\274\217icon@2x.png" "b/static/images/resourceDetails/jibiji\357\274\217icon@2x.png"
new file mode 100644
index 0000000..1c68abb
--- /dev/null
+++ "b/static/images/resourceDetails/jibiji\357\274\217icon@2x.png"
Binary files differ
--
Gitblit v1.9.1