From 46484b9bea431054820dd30b33f0255aff366ee7 Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期三, 17 四月 2024 18:07:38 +0800
Subject: [PATCH] 2024417bug
---
packageBookService/pages/bookServices/detail/buyResource/index.js | 2
pages/study/index.wxml | 4
pages/bookExhibitionList/index.wxss | 7
packageBookService/pages/bookServices/detail/index.wxss | 6
pages/bookExhibitionList/index.js | 161 ++++++-----
pages/bookExhibitionList/index.wxml | 17 +
packageDomain/pages/resourceDetails/myAudio/index.js | 53 ++
pages/retrievalPage/index.wxss | 11
packageBookService/pages/bookServices/detail/components/tree/index.wxss | 2
packageBookService/pages/bookServices/detail/components/tree/index.wxml | 278 +++----------------
packageDomain/pages/resourceDetails/myVideo/index.wxml | 8
pages/cart/paymentPage/index.js | 1
pages/bibliographyList/index.wxss | 10
packageBookService/pages/bookServices/detail/index.js | 1
packageDomain/pages/resourceDetails/myVideo/index.wxss | 28 +
packageDomain/pages/resourceDetails/myAudio/index.wxss | 46 ++
pages/home/home.wxml | 2
packageDomain/pages/resourceDetails/myAudio/index.wxml | 23 +
pages/bookExhibitionDetails/index.wxml | 85 +++--
pages/bookExhibitionDetails/index.wxss | 41 ++
20 files changed, 384 insertions(+), 402 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/buyResource/index.js b/packageBookService/pages/bookServices/detail/buyResource/index.js
index 8ec26df..7d889d3 100644
--- a/packageBookService/pages/bookServices/detail/buyResource/index.js
+++ b/packageBookService/pages/bookServices/detail/buyResource/index.js
@@ -148,6 +148,7 @@
openLearnids: result,
});
}
+ console.log(list, '浜戝缈�');
} else {
// 鏃犳暟鎹�
}
@@ -197,6 +198,7 @@
jsek_resourceBrief: [],
jsek_link: [],
accessType: [],
+ learnSelectType: [],
},
pading: {
start: 0,
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxml b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
index e835dc0..2c8365c 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
@@ -1,94 +1,29 @@
<view class="tree">
<t-collapse default-value="{{openIds}}" catchchange="handleChange">
- <view
- wx:for="{{treeList}}"
- wx:for-item="item"
- wx:for-index="index"
- wx:key="id"
- wx:if="{{item.sysType== 'CmsItem' }}"
- >
- <view
- class="listItems"
- wx:if="{{item.childrenFolderCount <= 0 && item.sysType == 'CmsItem'}}"
- >
+ <view wx:for="{{treeList}}" wx:for-item="item" wx:for-index="index" wx:key="id" wx:if="{{item.sysType== 'CmsItem' }}">
+ <view class="listItems" wx:if="{{item.childrenFolderCount <= 0 && item.sysType == 'CmsItem'}}">
<view class="itemsInfo" data-item="{{item}}" data-index="{{index}}">
- <view
- class="contentBox"
- bind:tap="goPlayer"
- data-item="{{item}}"
- data-parent="{{''}}"
- >
+ <view class="contentBox" bind:tap="goPlayer" data-item="{{item}}" data-parent="{{''}}">
<!-- 鏁欏璧勬簮 浜戝涔� 鍥炬爣 -->
<view class="box-image" style="width: 100%">
- <view
- class="checkBox"
- wx:if="{{isShowCheck}}"
- catchtap="catchTap"
- >
+ <view class="checkBox" wx:if="{{isShowCheck}}" catchtap="catchTap">
<!-- checked="{{citem.checked}}" -->
<!-- <t-checkbox icon="rectangle" checked="{{citem.checked}}" disabled="{{citem.selectType=='webpage' || citem.isDownload != 1 || citem.fileMap[citem.file].protectType == 'Private'}}" catch:change="checkResource" data-item="{{citem}}" /> -->
- <t-checkbox
- disabled="{{!citem.saleMethod[0].Id}}"
- icon="rectangle"
- checked="{{item.checked}}"
- data-item="{{item}}"
- data-parent="{{item}}"
- catch:change="checkResource"
- />
+ <t-checkbox disabled="{{!citem.saleMethod[0].Id}}" icon="rectangle" checked="{{item.checked}}" data-item="{{item}}" data-parent="{{item}}" catch:change="checkResource" />
</view>
<!-- 鏁欏璧勬簮鍥炬爣 -->
<view class="teach-icon">
- <image
- wx:if="{{item.selectType == 'audio' || item.learnSelectType == 'audio'}}"
- src="/static/images/bookService/detail/audioIcon.png"
- mode="aspectFill"
- />
- <image
- wx:elif="{{item.selectType == 'video' || item.learnSelectType == 'video'}}"
- src="/static/images/bookService/detail/video.png"
- mode="aspectFill"
- />
- <image
- wx:elif="{{item.selectType == 'pdf'}}"
- src="/static/images/bookService/detail/pdf.png"
- mode="aspectFill"
- />
- <image
- wx:elif="{{item.selectType == 'webpage'}}"
- src="/static/images/bookService/detail/net.png"
- mode="aspectFill"
- />
- <image
- wx:elif="{{item.selectType == 'picture'}}"
- src="/static/images/bookService/detail/picture.png"
- mode="aspectFill"
- />
- <image
- wx:elif="{{item.selectType == 'zip'}}"
- src="/static/images/bookService/detail/zip.png"
- mode="aspectFill"
- />
- <image
- wx:elif="{{ item.fileMap[item.file].extension == 'doc' || item.fileMap[item.file].extension == 'docx'}}"
- src="/static/images/bookService/detail/word.png"
- mode="aspectFill"
- />
- <image
- wx:elif="{{ item.fileMap[item.file].extension == 'xlsx' || item.fileMap[item.file].extension == 'xlsx'}}"
- src="/static/images/bookService/detail/excel.png"
- mode="aspectFill"
- />
- <image
- wx:elif="{{ item.fileMap[item.file].extension == 'ppt' || item.fileMap[item.file].extension == 'pptx'}}"
- src="/static/images/bookService/detail/PPT.png"
- mode="aspectFill"
- />
+ <image wx:if="{{item.selectType == 'audio' || item.learnSelectType == 'audio'}}" src="/static/images/bookService/detail/audioIcon.png" mode="aspectFill" />
+ <image wx:elif="{{item.selectType == 'video' || item.learnSelectType == 'video'}}" src="/static/images/bookService/detail/video.png" mode="aspectFill" />
+ <image wx:elif="{{item.selectType == 'pdf'}}" src="/static/images/bookService/detail/pdf.png" mode="aspectFill" />
+ <image wx:elif="{{item.selectType == 'webpage'}}" src="/static/images/bookService/detail/net.png" mode="aspectFill" />
+ <image wx:elif="{{item.selectType == 'picture'}}" src="/static/images/bookService/detail/picture.png" mode="aspectFill" />
+ <image wx:elif="{{item.selectType == 'zip'}}" src="/static/images/bookService/detail/zip.png" mode="aspectFill" />
+ <image wx:elif="{{ item.fileMap[item.file].extension == 'doc' || item.fileMap[item.file].extension == 'docx'}}" src="/static/images/bookService/detail/word.png" mode="aspectFill" />
+ <image wx:elif="{{ item.fileMap[item.file].extension == 'xlsx' || item.fileMap[item.file].extension == 'xlsx'}}" src="/static/images/bookService/detail/excel.png" mode="aspectFill" />
+ <image wx:elif="{{ item.fileMap[item.file].extension == 'ppt' || item.fileMap[item.file].extension == 'pptx'}}" src="/static/images/bookService/detail/PPT.png" mode="aspectFill" />
<!-- 璧勬簮鏃犳枃浠跺唴瀹瑰浘鏍� -->
- <image
- wx:else
- src="/static/images/bookService/detail/word.png"
- mode=""
- />
+ <image wx:else src="/static/images/bookService/detail/word.png" mode="" />
</view>
<!-- 浜戝涔犲浘鏍� -->
<view> </view>
@@ -108,48 +43,20 @@
</view>
<view wx:if="{{tab == 'jsek_cloudLearning'}}">
<!-- 浜戝涔犺瘯鐪嬪浘鏍� -->
- <image
- src="/static/images/bookService/detail/shikan.png"
- class="testSee"
- wx:if="{{!item.isbuy ? false : item.freeFile ? true : false}}"
- ></image>
+ <image src="/static/images/bookService/detail/shikan.png" class="testSee" wx:if="{{!item.isbuy ? false : item.freeFile ? true : false}}"></image>
<!-- 浜戝涔犲姞鍏ヨ喘鐗╄溅鍥炬爣 -->
- <image
- src="/static/images/bookService/detail/cart@2x.png"
- wx:if="{{item.isShopCar}}"
- class="shopCar"
- data-item="{{item}}"
- catch:tap="onCloudShoppingCart"
- ></image>
+ <image src="/static/images/bookService/detail/cart@2x.png" wx:if="{{item.isShopCar}}" class="shopCar" data-item="{{item}}" catch:tap="onCloudShoppingCart"></image>
<!-- 浜戝涔犺喘涔板浘鏍� -->
- <image
- src="/static/images/bookService/detail/need-buy.png"
- class="need-buy"
- wx:if="{{item.isbuy }}"
- ></image>
+ <image src="/static/images/bookService/detail/need-buy.png" class="need-buy" wx:if="{{item.isbuy }}"></image>
</view>
</view>
</view>
</view>
</view>
- <t-collapse-panel
- wx:for="{{treeList}}"
- wx:for-item="item"
- wx:for-index="index"
- wx:key="id"
- value="{{item.id}}"
- wx:if="{{item.sysType == 'CmsFolder' }}"
- >
+ <t-collapse-panel wx:for="{{treeList}}" wx:for-item="item" wx:for-index="index" wx:key="id" value="{{item.id}}" wx:if="{{item.sysType == 'CmsFolder' }}">
<view slot="header" class="header-title">
<view class="title-checkBox" catchtap="catchTap">
- <t-checkbox
- style="align-items: center"
- icon="rectangle"
- checked="{{item.checked}}"
- data-item="{{item}}"
- catchchange="checkResourceTitle"
- wx:if="{{isShowCheck}}"
- />
+ <t-checkbox style="align-items: center" icon="rectangle" checked="{{item.checked}}" data-item="{{item}}" catchchange="checkResourceTitle" wx:if="{{isShowCheck}}" />
<!-- 绔犺妭鍚� -->
<view class="title-box">
<view class="title-name">{{item.name}} </view>
@@ -159,115 +66,40 @@
</view>
</view>
</view>
- <view
- class="list"
- wx:for="{{item.children}}"
- wx:for-item="citem"
- wx:for-index="cindex"
- wx:key="cindex"
- >
+ <view class="list" wx:for="{{item.children}}" wx:for-item="citem" wx:for-index="cindex" wx:key="cindex">
<!-- // 鍒ゆ柇 鏃犲瓙椤� 涓斾负鍟嗗搧item 鐩存帴鏄剧ず -->
- <view
- class="listItems"
- wx:if="{{citem.childrenFolderCount <= 0 && citem.sysType == 'CmsItem'}}"
- >
+ <view class="listItems" wx:if="{{citem.childrenFolderCount <= 0 && citem.sysType == 'CmsItem'}}">
<view class="itemsInfo" data-item="{{citem}}" data-index="{{cindex}}">
- <view
- class="contentBox"
- bind:tap="goPlayer"
- data-item="{{citem}}"
- data-parent="{{item}}"
- >
+ <view class="contentBox" bind:tap="goPlayer" data-item="{{citem}}" data-parent="{{item}}">
<!-- 鏁欏璧勬簮 浜戝涔� 鍥炬爣 -->
- <view
- class="box-image"
- style="{{ tab == 'jsek_teachingResources' ? 'width: 350rpx;' : 'width: 450rpx;'}}"
- >
- <view
- class="checkBox"
- wx:if="{{isShowCheck}}"
- catchtap="catchTap"
- >
+ <view class="box-image" style="{{ tab == 'jsek_teachingResources' ? 'width: 350rpx;' : 'width: 450rpx;'}}">
+ <view class="checkBox" wx:if="{{isShowCheck}}" catchtap="catchTap">
<!-- checked="{{citem.checked}}" -->
<!-- <t-checkbox icon="rectangle" checked="{{citem.checked}}" disabled="{{citem.selectType=='webpage' || citem.isDownload != 1 || citem.fileMap[citem.file].protectType == 'Private'}}" catch:change="checkResource" data-item="{{citem}}" /> -->
- <t-checkbox
- disabled="{{!citem.saleMethod[0].Id}}"
- icon="rectangle"
- checked="{{citem.checked}}"
- data-item="{{citem}}"
- data-parent="{{item}}"
- catch:change="checkResource"
- />
+ <t-checkbox disabled="{{!citem.saleMethod[0].Id}}" icon="rectangle" checked="{{citem.checked}}" data-item="{{citem}}" data-parent="{{item}}" catch:change="checkResource" />
</view>
<!-- 鏁欏璧勬簮鍥炬爣 -->
<view class="teach-icon">
- <image
- wx:if="{{citem.selectType == 'audio' || citem.learnSelectType == 'audio'}}"
- src="/static/images/bookService/detail/audioIcon.png"
- mode="aspectFill"
- />
- <image
- wx:elif="{{citem.selectType == 'video' || citem.learnSelectType == 'video'}}"
- src="/static/images/bookService/detail/video.png"
- mode="aspectFill"
- />
- <image
- wx:elif="{{citem.selectType == 'pdf'}}"
- src="/static/images/bookService/detail/pdf.png"
- mode="aspectFill"
- />
- <image
- wx:elif="{{citem.selectType == 'webpage'}}"
- src="/static/images/bookService/detail/net.png"
- mode="aspectFill"
- />
- <image
- wx:elif="{{citem.selectType == 'picture'}}"
- src="/static/images/bookService/detail/picture.png"
- mode="aspectFill"
- />
- <image
- wx:elif="{{citem.selectType == 'zip'}}"
- src="/static/images/bookService/detail/zip.png"
- mode="aspectFill"
- />
- <image
- wx:elif="{{ citem.fileMap[citem.file].extension == 'doc' || citem.fileMap[citem.file].extension == 'docx'}}"
- src="/static/images/bookService/detail/word.png"
- mode="aspectFill"
- />
- <image
- wx:elif="{{ citem.fileMap[citem.file].extension == 'xlsx' || citem.fileMap[citem.file].extension == 'xlsx'}}"
- src="/static/images/bookService/detail/excel.png"
- mode="aspectFill"
- />
- <image
- wx:elif="{{ citem.fileMap[citem.file].extension == 'ppt' || citem.fileMap[citem.file].extension == 'pptx'}}"
- src="/static/images/bookService/detail/PPT.png"
- mode="aspectFill"
- />
+ <image wx:if="{{citem.selectType == 'audio' || citem.learnSelectType == 'audio'}}" src="/static/images/bookService/detail/audioIcon.png" mode="aspectFill" />
+ <image wx:elif="{{citem.selectType == 'video' || citem.learnSelectType == 'video'}}" src="/static/images/bookService/detail/video.png" mode="aspectFill" />
+ <image wx:elif="{{citem.selectType == 'pdf'}}" src="/static/images/bookService/detail/pdf.png" mode="aspectFill" />
+ <image wx:elif="{{citem.selectType == 'webpage'}}" src="/static/images/bookService/detail/net.png" mode="aspectFill" />
+ <image wx:elif="{{citem.selectType == 'picture'}}" src="/static/images/bookService/detail/picture.png" mode="aspectFill" />
+ <image wx:elif="{{citem.selectType == 'zip'}}" src="/static/images/bookService/detail/zip.png" mode="aspectFill" />
+ <image wx:elif="{{ citem.fileMap[citem.file].extension == 'doc' || citem.fileMap[citem.file].extension == 'docx'}}" src="/static/images/bookService/detail/word.png" mode="aspectFill" />
+ <image wx:elif="{{ citem.fileMap[citem.file].extension == 'xlsx' || citem.fileMap[citem.file].extension == 'xlsx'}}" src="/static/images/bookService/detail/excel.png" mode="aspectFill" />
+ <image wx:elif="{{ citem.fileMap[citem.file].extension == 'ppt' || citem.fileMap[citem.file].extension == 'pptx'}}" src="/static/images/bookService/detail/PPT.png" mode="aspectFill" />
<!-- 璧勬簮鏃犳枃浠跺唴瀹瑰浘鏍� -->
- <image
- wx:else
- src="/static/images/bookService/detail/word.png"
- mode=""
- />
+ <image wx:else src="/static/images/bookService/detail/word.png" mode="" />
</view>
<!-- 浜戝涔犲浘鏍� -->
<view> </view>
<!-- 鍚嶇О -->
- <text
- class="name"
- style="{{ tab == 'jsek_teachingResources' ? 'width: 300rpx;' : 'width: 400rpx;'}}"
- >{{citem.name || '-'}}</text
- >
+ <text class="name" style="{{ tab == 'jsek_teachingResources' ? 'width: 300rpx;' : 'width: 400rpx;'}}">{{citem.name || '-'}}</text>
</view>
<!-- 鏁欏璧勬簮绫诲瀷 -->
<view class="teachClass"> {{citem.resourceClass}} </view>
- <view
- class="teach-btn"
- wx:if="{{tab == 'jsek_teachingResources'}}"
- >
+ <view class="teach-btn" wx:if="{{tab == 'jsek_teachingResources'}}">
<!-- 涓嬭浇鎸夐挳 -->
<!-- <image
src="/static/images/bookService/detail/download-icon.png"
@@ -278,41 +110,17 @@
</view>
<view wx:if="{{tab == 'jsek_cloudLearning'}}">
<!-- 浜戝涔犺瘯鐪嬪浘鏍� -->
- <image
- src="/static/images/bookService/detail/shikan.png"
- class="testSee"
- wx:if="{{!citem.isbuy ? false : citem.freeFile ? true : false}}"
- ></image>
+ <image src="/static/images/bookService/detail/shikan.png" class="testSee" wx:if="{{!citem.isbuy ? false : citem.freeFile ? true : false}}"></image>
<!-- 浜戝涔犲姞鍏ヨ喘鐗╄溅鍥炬爣 -->
- <image
- src="/static/images/bookService/detail/cart@2x.png"
- wx:if="{{citem.isShopCar}}"
- class="shopCar"
- data-item="{{citem}}"
- catch:tap="onCloudShoppingCart"
- ></image>
+ <image src="/static/images/bookService/detail/cart@2x.png" wx:if="{{citem.isShopCar}}" class="shopCar" data-item="{{citem}}" catch:tap="onCloudShoppingCart"></image>
<!-- 浜戝涔犺喘涔板浘鏍� -->
- <image
- src="/static/images/bookService/detail/need-buy.png"
- class="need-buy"
- wx:if="{{citem.isbuy }}"
- ></image>
+ <image src="/static/images/bookService/detail/need-buy.png" class="need-buy" wx:if="{{citem.isbuy }}"></image>
</view>
</view>
</view>
</view>
<!-- // 鍒ゆ柇 涓嶆槸鍟嗗搧 鏈夊瓙椤� 閫掑綊缁勪欢 -->
- <tree
- wx:if="{{ citem.sysType == 'CmsFolder' }}"
- isShowCheck="{{isShowCheck}}"
- bookInfo="{{bookInfo}}"
- treeList="{{[citem]}}"
- learnList="{{learnList}}"
- itemId="{{itemId}}"
- tab="{{tab}}"
- buyIds="{{buyIds}}"
- openIds="{{openIds}}"
- ></tree>
+ <tree wx:if="{{ citem.sysType == 'CmsFolder' }}" isShowCheck="{{isShowCheck}}" bookInfo="{{bookInfo}}" treeList="{{[citem]}}" learnList="{{learnList}}" itemId="{{itemId}}" tab="{{tab}}" buyIds="{{buyIds}}" openIds="{{openIds}}"></tree>
</view>
<!-- 鏆傛棤鏁版嵁 -->
<view wx:if="{{!item.children || !item.children.length}}" class="noData">
@@ -329,4 +137,4 @@
</view>
<web-view wx:if="{{webpageSrc}}" src="{{webpageSrc}}"></web-view>
-<!-- <button bind:tap="sadd"> 65498</button> -->
+<!-- <button bind:tap="sadd"> 65498</button> -->
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxss b/packageBookService/pages/bookServices/detail/components/tree/index.wxss
index 64c43c0..95901fe 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.wxss
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxss
@@ -83,7 +83,7 @@
.teach-btn {
display: flex;
- align-items: center;
+ align-items: center ;
}
.testSee,
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index a48be21..fcedbe7 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -795,6 +795,7 @@
});
console.log('浜戝涔�', list);
}
+ console.log(list, '浜戝缈�789');
} else {
// 鏃犳暟鎹�
}
diff --git a/packageBookService/pages/bookServices/detail/index.wxss b/packageBookService/pages/bookServices/detail/index.wxss
index e87ac75..fe27640 100644
--- a/packageBookService/pages/bookServices/detail/index.wxss
+++ b/packageBookService/pages/bookServices/detail/index.wxss
@@ -410,9 +410,11 @@
.t-tabs .t-tabs__item--active {
background-repeat: no-repeat;
- background-size: 30% 40%;
- background-position: 65% 50%;
+ background-size: 45% 45%;
+ /* background-position: 65% 50%; */
+ background-position: right center;
background-image: url(https://jsek.bnuic.com/home/image/click-icon.png);
+
}
.t-tabs__item--evenly {
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index f8a4e1d..60b7fc6 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -59,6 +59,7 @@
// 杞寲鏃堕棿
format(time) {
+
let minute = Math.floor(time / 60);
let second = Math.floor(time % 60);
minute = minute < 10 ? ("0" + minute) : minute;
@@ -139,6 +140,9 @@
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+ *
+ * 閫�鍑洪〉闈㈡椂鍊欒皟鐢ㄧ殑
+ *
*/
onUnload() {
// this.setData({
@@ -152,12 +156,14 @@
// myAudio.src = ''
// myAudio.destroy()
- // this.setData({
- // myAudioPos: '',
- // isplay: false, //鏄惁榛樿鎾斁,
- // myAudioCurrent: '00:00', // 褰撳墠鎾斁杩涘害
- // showData: '',
- // });
+ this.setData({
+ // myAudioPos: '',
+ isplay: false, //鏄惁榛樿鎾斁,
+ myAudioCurrent: '00:00', // 褰撳墠鎾斁杩涘害
+ showData: '',
+ speed: 1.0,
+ });
+ myAudio.playbackRate = this.data.speed;
// 鍋滄闊抽鎾斁
myAudio.stop();
// 閿�姣� InnerAudioContext 瀹炰緥
@@ -266,10 +272,8 @@
if (item.selectType === "audio" || item.learnSelectType === "audio") {
this.data.threeLeveData.push(item);
}
-
-
});
- console.log(this.data.threeLeveData);
+ // console.log(this.data.threeLeveData);
this.data.threeLeveData.forEach((items, indexs) => {
if (this.data.productLinkPath == items.productLinkPath) {
selectedId = indexs;
@@ -302,11 +306,14 @@
},
onVideo(e) {
+ // myAudio.destroy();
+
this.setData({
myAudioCurrent: '00:00',
myAudioPos: '',
isplay: false
})
+
const item = e.currentTarget.dataset.item
if (this.data.showData != '') {
this.setData({
@@ -325,10 +332,15 @@
this.pubulicPlayFun()
} else {
+ console.log(item.file, 'item.file');
+ console.log(item.freeFile, 'item.freeFile');
+
this.setData({
showData: item.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.freeFile
})
this.pubulicPlayFun()
+ console.log(this.data.showData, 'showData');
+
}
}
}
@@ -592,21 +604,34 @@
},
// 鎾斁鍏叡浠ｇ爜
pubulicPlayFun() {
+
+ // debugger
+ console.log(myAudio.src, 'myAudio.src');
+ console.log(this.data.showData, 'this.data.showData');
+ this.setData({
+ speed: 1.0,
+ })
+ myAudio.playbackRate = this.data.speed;
+
myAudio.src = this.data.showData
+
// console.log(myAudio.src);
// 鍦╫nCanplay閲岃幏鍙栧苟璁剧疆闊抽鏃堕暱鍜屾挱鏀捐繘搴�
myAudio.onCanplay(() => {
+
+
+
myAudio.duration; //蹇呴』鍐欙紝涓嶇劧鑾峰彇涓嶅埌
-
setTimeout(() => {
-
this.setData({
myAudioDuration: this.format(myAudio.duration),
myAudioCurrent: this.format(myAudio.currentTime)
});
-
}, 100);
});
+
+ console.log(this.data.myAudioDuration);
+ console.log(this.data.myAudioCurrent);
// 鎾斁瀹屾垚澶勭悊锛屾寜閽彉涓�涓�
myAudio.onEnded((res) => {
@@ -625,6 +650,10 @@
myAudioDuration: this.format(myAudio.duration),
});
})
+ console.log(this.data.myAudioCurrent);
+ console.log(this.data.myAudioDuration);
+ console.log(this.data.myAudioPos);
+
myAudio.play();
},
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.wxml b/packageDomain/pages/resourceDetails/myAudio/index.wxml
index 888f8c4..c2401a1 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.wxml
+++ b/packageDomain/pages/resourceDetails/myAudio/index.wxml
@@ -2,12 +2,9 @@
<template is="skeleton" wx:if="{{loading}}" />
-
-
-
<view wx:if="{{!hidden}}">
<view style="width: 100%; height: {{barHeight}}px; "></view>
- <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
+ <view class="nacigationBar" style="width: 100%; height: {{navBarHeight}}px;">
<view>
<t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
</view>
@@ -44,9 +41,12 @@
</view> -->
<!-- 鏃堕棿 -->
- <view class="current-time color">{{myAudioCurrent}} </view>
- <view class="color" style="margin: 0 10rpx">/</view>
- <view class="duration-time color"> {{myAudioDuration}} </view>
+ <view class="timeBox">
+ <view class="current-time color">{{myAudioCurrent}} </view>
+ <view class="color" style="margin: 0 10rpx">/</view>
+ <view class="duration-time color"> {{myAudioDuration}} </view>
+ </view>
+
<!-- bind:tap="onSpeed" -->
<view class="publicBtn color">
@@ -75,9 +75,14 @@
<view class="wrapper">
<t-collapse value="{{activeValues}}" bind:change="handleChange">
<t-collapse-panel header="{{parentName}}" value="{{0}}" expandIcon>
- <view class="detailsName" wx:for="{{threeLeveData}}" wx:key="index" wx:for-item="item" wx:for-index="index" bind:tap="onVideo" data-item="{{item}}" data-index="{{index}}">
- <view style="color: {{selectedId == index ? '#ff6c00' : '#000'}}">{{item.name}}</view>
+ <view class="outsideDetailsName">
+
+ <view class="detailsName" wx:for="{{threeLeveData}}" wx:key="index" wx:for-item="item" wx:for-index="index" bind:tap="onVideo" data-item="{{item}}" data-index="{{index}}">
+ <view style="color: {{selectedId == index ? '#ff6c00' : '#000'}} ">{{item.name}}</view>
+ </view>
+
</view>
+
</t-collapse-panel>
</t-collapse>
</view>
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.wxss b/packageDomain/pages/resourceDetails/myAudio/index.wxss
index 9b401a3..0898ca9 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.wxss
+++ b/packageDomain/pages/resourceDetails/myAudio/index.wxss
@@ -8,12 +8,13 @@
}
.navbar-title {
- white-space: nowrap;
+ /* white-space: nowrap;
text-overflow: ellipsis;
color: #0F1214;
font-size: 40rpx;
font-weight: bold;
- margin-bottom: 5rpx;
+ margin-bottom: 5rpx; */
+ margin: 0 auto;
}
@@ -118,20 +119,28 @@
justify-content: center;
}
+.outsideDetailsName {
+ overflow-y: scroll;
+ height: 35vh;
+}
+
.detailsName {
margin: 30rpx;
width: 90%;
min-height: 60rpx;
display: flex;
align-items: center;
- padding-left: 20rpx;
- background-color: #FFF6F0
+ padding: 20rpx;
+ background-color: #FFF6F0;
+ line-height: 50rpx;
+
+
}
.detailsName:hover {
background-color: #fff0e6;
width: 90%;
- height: 60rpx;
+ min-height: 60rpx;
color: #ff6c00;
}
@@ -304,6 +313,7 @@
.bigFunctionBox {
background: #000000;
opacity: 0.6;
+ width: 100%;
}
.mp-slider-bar {
@@ -358,9 +368,9 @@
height: 100%;
}
-/* .tabs--t-tabs__scroll--split::after {
- height: 0px !important;
-} */
+.tabs--t-tabs__scroll--split::after {
+ height: 0 !important;
+}
.buttonBox {
position: absolute;
@@ -369,4 +379,24 @@
background-color: #e7e7e7;
height: 1px;
z-index: 999;
+}
+
+.current-time {
+ width: 82rpx;
+}
+
+.duration-time {
+ width: 82rpx;
+}
+
+.timeBox {
+ width: 210rpx;
+ display: flex;
+ flex-direction: row;
+
+}
+
+.wrapper {
+ overflow-y: scroll;
+ height: 45vh;
}
\ No newline at end of file
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.wxml b/packageDomain/pages/resourceDetails/myVideo/index.wxml
index f9f6e73..6e66bdd 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.wxml
+++ b/packageDomain/pages/resourceDetails/myVideo/index.wxml
@@ -3,7 +3,7 @@
<view wx:if="{{!hidden}}">
<view style="width: 100%; height: {{barHeight}}px; "></view>
- <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
+ <view class="nacigationBar" style="width: 100%; height: {{navBarHeight}}px;">
<view>
<t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
</view>
@@ -31,9 +31,13 @@
<view class="wrapper">
<t-collapse value="{{activeValues}}" bind:change="handleChange">
<t-collapse-panel header="{{parentName}}" value="{{0}}" expandIcon>
+ <view class="outsideDetailsName" >
+
<view class="detailsName" wx:for="{{threeLeveData}}" wx:key="index" wx:for-item="item" wx:for-index="index" bind:tap="onVideo" data-item="{{item}}" data-index="{{index}}">
<view style="color: {{selectedId == index ? '#ff6c00' : '#000'}}">{{item.name}}</view>
</view>
+ </view>
+
</t-collapse-panel>
</t-collapse>
</view>
@@ -42,6 +46,8 @@
<t-tab-panel label="绗旇" value="1" style="{{tabPanelstyle}}">
<view class="wrapper">
+
+
<view wx:if="{{!noteList.length}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.wxss b/packageDomain/pages/resourceDetails/myVideo/index.wxss
index 84f2340..15a3407 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.wxss
+++ b/packageDomain/pages/resourceDetails/myVideo/index.wxss
@@ -9,13 +9,14 @@
}
.navbar-title {
- white-space: nowrap;
+ /* white-space: nowrap; */
/* overflow: hidden; */
- text-overflow: ellipsis;
+ /* text-overflow: ellipsis;
color: #0F1214;
font-size: 40rpx;
font-weight: bold;
- margin-bottom: 5rpx;
+ margin-bottom: 5rpx; */
+ margin: 0 auto;
}
.videoBox {
@@ -162,14 +163,15 @@
display: flex;
align-items: center;
- padding-left: 20rpx;
- background-color: #FFF6F0
+ padding: 20rpx;
+ background-color: #FFF6F0;
+ line-height: 50rpx;
}
.detailsName:hover {
background-color: #fff0e6;
width: 90%;
- height: 60rpx;
+ min-height: 60rpx;
color: #ff6c00;
}
@@ -317,9 +319,9 @@
margin-top: 120rpx;
}
-/* .tabs--t-tabs__scroll--split::after {
+.tabs--t-tabs__scroll--split::after {
height: 0px !important;
-} */
+}
.buttonBox {
position: absolute;
@@ -328,4 +330,14 @@
background-color: #e7e7e7;
height: 1px;
z-index: 999;
+}
+
+.outsideDetailsName {
+ overflow-y: scroll;
+ height: 35vh;
+}
+
+.wrapper {
+ overflow-y: scroll;
+ height: 45vh;
}
\ No newline at end of file
diff --git a/pages/bibliographyList/index.wxss b/pages/bibliographyList/index.wxss
index cacb4ca..6fcb8e4 100644
--- a/pages/bibliographyList/index.wxss
+++ b/pages/bibliographyList/index.wxss
@@ -217,4 +217,14 @@
.t-search__input-box--square {
border-radius: var(--td-search-square-radius, var(--td-radius-default, 36rpx)) !important;
height: 72rpx;
+}
+
+.t-tabs .t-tabs__item--active {
+ background-repeat: no-repeat;
+ /* background-size: 100% 100%;
+ background-position: 100% 100%; */
+ background-image: url(https://jsek.bnuic.com/home/image/click-icon.png);
+ background-position: right center;
+ background-size: 40% 90%;
+ /* 灏嗚儗鏅浘鐗囦綅缃缃负闈犲彸 */
}
\ No newline at end of file
diff --git a/pages/bookExhibitionDetails/index.wxml b/pages/bookExhibitionDetails/index.wxml
index 1a3528d..9ec1f8a 100644
--- a/pages/bookExhibitionDetails/index.wxml
+++ b/pages/bookExhibitionDetails/index.wxml
@@ -3,46 +3,53 @@
<template is="skeleton" wx:if="{{loading}}" />
-<view hidden="{{hidden}}">
- <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" />
- </view>
-
- <view class="navbar-title">{{subtitleName}}</view>
-
- </view>
-
- <view class="headBox">
- <view class="titleBox">{{bookName}}</view>
- <view class="informationBox">
- <text class="informationNameBox">鍙戝竷浜�:{{bookCreator}}</text>
- <text class="informationTimeBox">鍙戝竷鏃ユ湡锛歿{bookBeginDate}}</text>
-
- </view>
- </view>
-
-
-
- <image class="partingBox" src="/static/images/bookExhibitionDetails/Parting.png" mode="aspectFill" />
- <view class="bannerBox">
- <image src="{{bookImage}}" mode="aspectFit" />
- </view>
-
-
- <view class="textContent">
- <rich-text nodes="{{bookContent}}"></rich-text>
-
- <!-- <text>{{bookContent}}</text> -->
- </view>
- <view class="outsideBooksBox">
- <view class="booksBox" wx:for="{{bookExhibitionList}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="onBookDetails">
- <view class="outsideBooksImageBox">
- <image class="booksImageBox" src="{{item.icon}}" mode="" />
+<view hidden="{{hidden}}" class="centerBox">
+ <view class="tltiBox">
+ <view style="width: 100%; height: {{barHeight}}px; "></view>
+ <view class="nacigationBar" style="width: 100%; height: {{navBarHeight}}px;">
+ <view>
+ <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
</view>
- <view class="booksTextBox"> <text>{{item.name}}</text></view>
- <view class="boosAuthor">{{item.author}}</view>
+
+ <view class="navbar-title">{{subtitleName}}</view>
+
</view>
</view>
+
+ <view class="outsideHeadBox">
+
+
+ <view class="headBox">
+ <view class="titleBox">{{bookName}}</view>
+ <view class="informationBox">
+ <text class="informationNameBox">鍙戝竷浜�:{{bookCreator}}</text>
+ <text class="informationTimeBox">鍙戝竷鏃ユ湡锛歿{bookBeginDate}}</text>
+
+ </view>
+ </view>
+
+
+
+ <image class="partingBox" src="/static/images/bookExhibitionDetails/Parting.png" mode="aspectFill" />
+ <view class="bannerBox">
+ <image src="{{bookImage}}" mode="aspectFit" />
+ </view>
+
+
+ <view class="textContent">
+ <rich-text nodes="{{bookContent}}"></rich-text>
+
+ <!-- <text>{{bookContent}}</text> -->
+ </view>
+ <view class="outsideBooksBox">
+ <view class="booksBox" wx:for="{{bookExhibitionList}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="onBookDetails">
+ <view class="outsideBooksImageBox">
+ <image src="{{item.icon}}" mode="aspectFit" />
+ </view>
+ <view class="booksTextBox"> <text>{{item.name}}</text></view>
+ <view class="boosAuthor">{{item.author}}</view>
+ </view>
+ </view>
+
+ </view>
</view>
\ No newline at end of file
diff --git a/pages/bookExhibitionDetails/index.wxss b/pages/bookExhibitionDetails/index.wxss
index 33654c0..5c4f291 100644
--- a/pages/bookExhibitionDetails/index.wxss
+++ b/pages/bookExhibitionDetails/index.wxss
@@ -6,26 +6,28 @@
background-color: #fff;
display: flex;
align-items: center;
+ width: 100%;
}
.navbar-title {
- white-space: nowrap;
+ /* white-space: nowrap; */
/* overflow: hidden; */
- text-overflow: ellipsis;
+ /* text-overflow: ellipsis;
color: #0F1214;
font-size: 40rpx;
font-weight: bold;
- margin-bottom: 5rpx;
+ margin-bottom: 5rpx; */
-
+ /*
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
color: #0F1214;
font-size: 40rpx;
- font-weight: bold;
+ font-weight: bold; */
+ margin: 0 auto;
}
.titleBox {
@@ -89,16 +91,20 @@
box-sizing: border-box;
}
-.booksImageBox {
- width: 240rpx;
- height: 300rpx;
- margin: 30rpx;
-}
+
.outsideBooksImageBox {
background: #F5F5F5;
width: 100%;
margin: 0 auto;
+ width: 240rpx;
+ height: 300rpx;
+ margin: 30rpx;
+}
+
+.outsideBooksImageBox image {
+ width: 100%;
+ height: 100%;
}
.booksTextBox {
@@ -124,4 +130,19 @@
font-size: 22rpx;
color: #949494;
margin: 30rpx 25rpx;
+}
+
+.tltiBox {
+ position: fixed;
+ top: 0;
+ background-color: #fff;
+ width: 100%;
+}
+
+.centerBox {
+ position: relative;
+}
+
+.outsideHeadBox {
+ margin-top: 200rpx;
}
\ No newline at end of file
diff --git a/pages/bookExhibitionList/index.js b/pages/bookExhibitionList/index.js
index ee39108..64570f8 100644
--- a/pages/bookExhibitionList/index.js
+++ b/pages/bookExhibitionList/index.js
@@ -8,6 +8,22 @@
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
+ product: {
+ value: 'all',
+ options: [{
+ value: 'all',
+ label: '鍏ㄩ儴浜у搧',
+ },
+ {
+ value: 'new',
+ label: '鏈�鏂颁骇鍝�',
+ },
+ {
+ value: 'hot',
+ label: '鏈�鐏骇鍝�',
+ },
+ ],
+ },
loading: true,
hidden: true,
totalSize: '',
@@ -29,32 +45,32 @@
sorter: {
value: 'default',
},
- product: {
- value: '*',
- options: [{
- value: '*',
- label: '鎬诲垎绫�',
- },
- {
- value: 'jsek_bFHigherEducation',
- //閲嶇偣椤圭洰
- price: 'jsek_higherEducation',
- label: '楂樼瓑鏁欒偛',
- },
- {
- value: 'jsek_bFVocationalEducation',
- //閲嶇偣椤圭洰
- price: 'jsek_vocationalEducation',
- label: '鑱屼笟鏁欒偛',
- },
- {
- value: 'jsek_bFTeacherEducation',
- //閲嶇偣椤圭洰
- price: 'jsek_teacherEducation',
- label: '鏁欏笀鏁欒偛',
- },
- ],
- },
+ // product: {
+ // value: '*',
+ // options: [{
+ // value: '*',
+ // label: '鎬诲垎绫�',
+ // },
+ // {
+ // value: 'jsek_bFHigherEducation',
+ // //閲嶇偣椤圭洰
+ // price: 'jsek_higherEducation',
+ // label: '楂樼瓑鏁欒偛',
+ // },
+ // {
+ // value: 'jsek_bFVocationalEducation',
+ // //閲嶇偣椤圭洰
+ // price: 'jsek_vocationalEducation',
+ // label: '鑱屼笟鏁欒偛',
+ // },
+ // {
+ // value: 'jsek_bFTeacherEducation',
+ // //閲嶇偣椤圭洰
+ // price: 'jsek_teacherEducation',
+ // label: '鏁欏笀鏁欒偛',
+ // },
+ // ],
+ // },
multipleSelect: {
value: [],
options: [],
@@ -360,49 +376,52 @@
},
-
-
- // 鎬诲垎绫�
- // 鎬诲垎绫�
onChange(e) {
-
- this.data.page.size = 16 //鏇存敼鏄剧ず鐨勫��
- const newValue = e.detail.value;
- const selectedOption = this.data.product.options.find(option => option.value === newValue);
- const newPrice = selectedOption ? selectedOption.price : null;
- const bookExhibitionListsubsidiary = []
- this.setData({
- bookExhibitionListsubsidiary: this.data.bookExhibitionList
- })
- console.log(bookExhibitionListsubsidiary, 'bookExhibitionListsubsidiary');
- console.log(newValue, 'newValue');
- console.log(newPrice, 'newPrice');
-
- if (newPrice) {
- this.setData({
- keynoteDisabled: false
- })
- }
- if (!newPrice) {
- this.setData({
- keynoteDisabled: true
- })
- }
- this.setData({
- 'product.value': newValue,
- 'product.price': newPrice, // 灏嗛�変腑鐨� price 鍊间繚瀛樺湪鏁版嵁涓�
- });
- this.bookExhibitionGet(newValue);
- this.keyProjectsGet(newPrice);
- // 璋冪敤鏇存柊椤甸潰鏁版嵁鐨勫嚱鏁帮紝浼犲叆鏂扮殑 value 鍜� price 鍊�
-
- if (this.data.keynoteValue) {
- //濡傛灉鏈夋暟鎹氨娓呯┖骞跺埛鏂伴〉闈�
- this.data.keynoteValue = []
- this.bookExhibitionGet(newValue)
- this.onLoad()
- }
+ console.log(e);
},
+
+ // 鎬诲垎绫�
+ // 鎬诲垎绫�
+ // onChange(e) {
+
+ // this.data.page.size = 16 //鏇存敼鏄剧ず鐨勫��
+ // const newValue = e.detail.value;
+ // const selectedOption = this.data.product.options.find(option => option.value === newValue);
+ // const newPrice = selectedOption ? selectedOption.price : null;
+ // const bookExhibitionListsubsidiary = []
+ // this.setData({
+ // bookExhibitionListsubsidiary: this.data.bookExhibitionList
+ // })
+ // console.log(bookExhibitionListsubsidiary, 'bookExhibitionListsubsidiary');
+ // console.log(newValue, 'newValue');
+ // console.log(newPrice, 'newPrice');
+
+ // if (newPrice) {
+ // this.setData({
+ // keynoteDisabled: false
+ // })
+ // }
+ // if (!newPrice) {
+ // this.setData({
+ // keynoteDisabled: true
+ // })
+ // }
+ // console.log(newValue);
+ // this.setData({
+ // 'product.value': newValue,
+ // 'product.price': newPrice, // 灏嗛�変腑鐨� price 鍊间繚瀛樺湪鏁版嵁涓�
+ // });
+ // this.bookExhibitionGet(newValue);
+ // this.keyProjectsGet(newPrice);
+ // // 璋冪敤鏇存柊椤甸潰鏁版嵁鐨勫嚱鏁帮紝浼犲叆鏂扮殑 value 鍜� price 鍊�
+
+ // if (this.data.keynoteValue) {
+ // //濡傛灉鏈夋暟鎹氨娓呯┖骞跺埛鏂伴〉闈�
+ // this.data.keynoteValue = []
+ // this.bookExhibitionGet(newValue)
+ // this.onLoad()
+ // }
+ // },
// 閲嶇偣椤圭洰
handleMultipleSelect(e) {
@@ -429,8 +448,6 @@
// 閲嶇疆鎿嶄綔鐨勫鐞嗛�昏緫
this.data.keynoteValue = []
-
-
this.bookExhibitionGet()
},
onSwapRight() {
@@ -457,12 +474,14 @@
this.bookExhibitionGet()
},
onBookExhibitionDetails: function (event) {
+ console.log(456);
const item = event.currentTarget.dataset.item;
console.log(item);
wx.navigateTo({
url: '/pages/bookExhibitionDetails/index?id=' + item.id + '&bookName=' + item.name + '&subtitleName=' + item.subtitleName // 鍋囪璺宠浆鍒拌鎯呴〉闈紝骞朵紶閫掍簡id鍙傛暟
});
},
+
// 鎼滅储妗�
onSearchSubmit(e) {
this.setData({
@@ -481,5 +500,7 @@
console.log(e.detail.value, 'e.detail.value');
this.bookExhibitionGet()
},
-
+ onTest() {
+ console.log(7555);
+ }
})
\ No newline at end of file
diff --git a/pages/bookExhibitionList/index.wxml b/pages/bookExhibitionList/index.wxml
index 283d5bf..ee3b7ab 100644
--- a/pages/bookExhibitionList/index.wxml
+++ b/pages/bookExhibitionList/index.wxml
@@ -28,8 +28,14 @@
<view class="outsideMenuBox">
<view class="menuBox">
<t-dropdown-menu>
+
+
+ <!-- <t-dropdown-item options="{{product.options}}" value="{{product.value}}" bindchange="onChange" /> -->
<t-dropdown-item options="{{product.options}}" value="{{product.value}}" bindchange="onChange" />
- <t-dropdown-item multiple="{{false}}" class="{{keynoteDisabled ? 'disableds' : ' '}}" disabled="{{keynoteDisabled}}" label=" 閲嶇偣椤圭洰" options="{{multipleSelect.options}}" value="{{multipleSelect.value}}" bindchange="handleMultipleSelect" multiple bind:confirm="handleConfirm" bind:reset="handleReset" show-overlay="{{true}}">
+
+
+ <!-- disabled="{{keynoteDisabled}}" -->
+ <t-dropdown-item label=" 閲嶇偣椤圭洰" options="{{multipleSelect.options}}" value="{{multipleSelect.value}}" bindchange="handleMultipleSelect" multiple bind:confirm="handleConfirm" bind:reset="handleReset">
</t-dropdown-item>
<t-dropdown-item options="{{sorter.options}}" default-value="{{sorter.value}}" bindchange="onSort" />
@@ -60,10 +66,17 @@
<scroll-view scroll-y="{{true}}" class="scrollViewBox" bindscrolltolower="onScrollToLower">
<view class="outside">
+
+
+ <!-- <button bind:tap="onTest">鐐逛竴涓�</button> -->
+
+
+
+
<view wx:if="{{!bookExhibitionList.length }}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
- <view class="contentBox" wx:for="{{bookExhibitionList}}" wx:key="index" wx:for-item="item" wx:for-index="index" bindtap="onBookExhibitionDetails" data-item="{{item}}">
+ <view class="contentBox" wx:for="{{bookExhibitionList}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="onBookExhibitionDetails">
<view class="imageBox">
<image wx:if="{{item.icon}}" src="{{item.icon}}" mode="aspectFit" />
<image wx:else src="/static/images/bookExhibitionList/banner.png" mode="aspectFit" />
diff --git a/pages/bookExhibitionList/index.wxss b/pages/bookExhibitionList/index.wxss
index 3244fa5..6eb61f8 100644
--- a/pages/bookExhibitionList/index.wxss
+++ b/pages/bookExhibitionList/index.wxss
@@ -53,6 +53,7 @@
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
margin: 20rpx;
+ margin-left: 30rpx;
}
@@ -135,7 +136,10 @@
.menuBox {
display: flex;
- height: 75rpx;
+ /* height: 75rpx; */
+ margin-top: 10rpx;
+ align-items: center;
+
}
.assembleContent {
@@ -255,6 +259,7 @@
height: calc(100vh - 300rpx);
/* width: calc(100vw - 60rpx); */
/* height: 700rpx; */
+
}
diff --git a/pages/cart/paymentPage/index.js b/pages/cart/paymentPage/index.js
index 06298eb..ef5df32 100644
--- a/pages/cart/paymentPage/index.js
+++ b/pages/cart/paymentPage/index.js
@@ -185,6 +185,7 @@
app.MG.store.makeWeChatPay(resOrderNum).then(payRes => {
console.log(payRes, 'payRes');
const payVal = JSON.parse(payRes);
+ console.log(payVal);
wx.requestPayment({
"appId": payVal.appId,
"timeStamp": payVal.timeStamp,
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index 204d392..a5b37b2 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -34,7 +34,7 @@
<view class="icon">
<image src="/static/images/home/zhuantitaolun2.png" mode="aspectFit" class="iconImage" />
</view>
- <view data-info="{{'zhuantitaolun'}}" bindtap="onMoreGuide" class="flex">
+ <view data-info="{{'zhuantitaolun'}}" bindtap="onMoreGuide" class="flex" style="align-items: center;">
<text class="more">鏇村</text>
<t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
</view>
diff --git a/pages/retrievalPage/index.wxss b/pages/retrievalPage/index.wxss
index de5b9b6..af3bb18 100644
--- a/pages/retrievalPage/index.wxss
+++ b/pages/retrievalPage/index.wxss
@@ -384,4 +384,13 @@
/* element.style {
-webkit-transform: translateX(38.9921875px) !important;
transform: translateX(38.9921875px) !important;
-} */
\ No newline at end of file
+} */
+.t-tabs .t-tabs__item--active {
+ background-repeat: no-repeat;
+ /* background-size: 100% 100%;
+ background-position: 100% 100%; */
+ background-image: url(https://jsek.bnuic.com/home/image/click-icon.png);
+ background-position: right center;
+ background-size: 50% 90%;
+ /* 灏嗚儗鏅浘鐗囦綅缃缃负闈犲彸 */
+}
\ No newline at end of file
diff --git a/pages/study/index.wxml b/pages/study/index.wxml
index 7b6bce7..30c5a1c 100644
--- a/pages/study/index.wxml
+++ b/pages/study/index.wxml
@@ -29,8 +29,8 @@
<view wx:if="{{active == '0'}}" class="listBox">
<view class="content-item" wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index">
<view class="book-img" bind:tap="goBookDetails" data-book="{{item}}">
- <t-image src="{{item.product.icon}}" width="105" height="145" aria-label="{{item.product.name}}" wx:if="{{item.product.icon}}" />
- <t-image src="/static/images/default-book-img.png" width="105" height="145" aria-label="{{item.product.name}}" wx:else />
+ <t-image src="{{item.product.icon}}" width="105" height="145" aria-label="{{item.product.name}}" wx:if="{{item.product.icon}}" mode="aspectFit" />
+ <t-image src="/static/images/default-book-img.png" width="105" height="145" aria-label="{{item.product.name}}" wx:else mode="aspectFit" />
</view>
<view class="body-info" data-book="{{item}}" bindtap="goBookDetails">
<view class="name">{{item.product.name}}</view>
--
Gitblit v1.9.1