From 338ad19ee45b5380a0d8433cbbce2a727a576dfa Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期五, 19 四月 2024 17:34:36 +0800
Subject: [PATCH] bug2
---
packageBookService/pages/bookServices/list/index.wxml | 116 +---------
packageDomain/pages/resourceDetails/myVideo/index.json | 3
packageBookService/pages/bookServices/detail/buyResource/index.js | 9
packageBookService/pages/bookServices/detail/index.wxss | 9
packageDomain/pages/resourceDetails/myVideo/index.js | 11
pages/bookExhibitionList/index.js | 83 +++----
pages/bookExhibitionList/index.wxml | 2
packageDomain/pages/resourceDetails/myAudio/index.js | 18 +
pages/retrievalPage/index.wxss | 5
packageBookService/pages/bookServices/detail/components/tree/index.wxss | 8
packageDomain/pages/resourceDetails/document/index.js | 4
packageDomain/pages/resourceDetails/myVideo/index.wxml | 22 -
packageBookService/pages/bookServices/detail/components/tree/index.js | 6
packageBookService/pages/bookServices/list/index.js | 4
packageBookService/pages/bookServices/detail/buyResource/index.wxml | 60 ++---
packageBookService/pages/bookServices/detail/index.js | 4
packageDomain/pages/resourceDetails/myVideo/index.wxss | 9
packageDomain/pages/resourceDetails/myAudio/index.wxss | 11
packageDomain/pages/resourceDetails/myAudio/index.wxml | 200 +++--------------
packageDomain/pages/resourceDetails/myAudio/index.json | 3
pages/bookExhibitionDetails/index.wxss | 18 -
21 files changed, 205 insertions(+), 400 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/buyResource/index.js b/packageBookService/pages/bookServices/detail/buyResource/index.js
index 7d889d3..8c61ce1 100644
--- a/packageBookService/pages/bookServices/detail/buyResource/index.js
+++ b/packageBookService/pages/bookServices/detail/buyResource/index.js
@@ -10,7 +10,7 @@
learn: [],
openLearnids: [],
bookId: "",
- loading: false,
+ loading: true,
shoppingList: [],
shoppingCartGetId: [],
methodId: [],
@@ -18,7 +18,8 @@
superior: false,
checkAllState: true,
productLinkPath: '',
- refCode: ''
+ refCode: '',
+ haider: false
},
/**
@@ -118,6 +119,7 @@
return this.setData({
noResources: true,
loading: false,
+ haider: true
});
}
//鏁欏璧勬簮 浜戝涔�
@@ -134,6 +136,7 @@
this.setData({
teach: list,
loading: false,
+ haider: true
});
this.findChildIds(this.data.teach, (this.data.openTeachids = []));
} else if (type.refCode == "jsek_cloudLearning") {
@@ -146,6 +149,7 @@
learn: list,
loading: false,
openLearnids: result,
+ haider: true
});
}
console.log(list, '浜戝缈�');
@@ -157,6 +161,7 @@
this.setData({
test: res.datas.cmsDatas[0].datas,
loading: false,
+ haider: true
});
} else {
console.log("鍏朵粬");
diff --git a/packageBookService/pages/bookServices/detail/buyResource/index.wxml b/packageBookService/pages/bookServices/detail/buyResource/index.wxml
index e0e86d6..2be7a77 100644
--- a/packageBookService/pages/bookServices/detail/buyResource/index.wxml
+++ b/packageBookService/pages/bookServices/detail/buyResource/index.wxml
@@ -3,48 +3,34 @@
<import src="index.skeleton.wxml" />
<template is="skeleton" wx:if="{{loading}}" />
-<!--瀵艰埅鍖哄煙 -->
-<view style="width: 100%; height: {{barHeight}}px; "></view>
-<view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
- <view class="flex">
- <view>
- <t-icon
- name="chevron-left"
- size="30"
- data-name="{{item}}"
- bind:click="goBack"
- />
+<view wx:if="{{haider}}">
+
+ <!--瀵艰埅鍖哄煙 -->
+ <view style="width: 100%; height: {{barHeight}}px; "></view>
+ <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
+ <view class="flex">
+ <view>
+ <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
+ </view>
+ <view class="navbar-title">璧勬簮璐拱</view>
</view>
- <view class="navbar-title">璧勬簮璐拱</view>
+ <view bind:tap="checkAll"> {{checkAllState ? '鍏ㄩ��' : '鍙栨秷'}} </view>
</view>
- <view bind:tap="checkAll"> {{checkAllState ? '鍏ㄩ��' : '鍙栨秷'}} </view>
-</view>
-<!-- 鍐呭 -->
+ <!-- 鍐呭 -->
-<view class="buy-resource" wx:if="{{!loading}}">
- <tree
- id="tree"
- paymentPage="{{paymentPage}}"
- superior="{{superior}}"
- treeList="{{learn}}"
- learnList="{{learn}}"
- tab="{{'jsek_cloudLearning'}}"
- isShowCheck="{{true}}"
- openIds="{{openLearnids}}"
- checkAllState="{{checkAllState}}"
- bind:changeCheckAll="changeCheckAll"
- bind:changeListChecked="changeListChecked"
- bind:changeResourceChecked="changeResourceChecked"
- />
-</view>
+ <view class="buy-resource" wx:if="{{!loading}}">
+ <tree id="tree" paymentPage="{{paymentPage}}" superior="{{superior}}" treeList="{{learn}}" learnList="{{learn}}" tab="{{'jsek_cloudLearning'}}" isShowCheck="{{true}}" openIds="{{openLearnids}}" checkAllState="{{checkAllState}}" bind:changeCheckAll="changeCheckAll" bind:changeListChecked="changeListChecked" bind:changeResourceChecked="changeResourceChecked" />
+ </view>
-<!-- <view class="noData" wx:if="{{loading}}">
+ <!-- <view class="noData" wx:if="{{loading}}">
<t-loading size="60rpx" loading="{{loading}}" />
</view> -->
-<view class="page-bottom">
- <t-button theme="primary" size="large" class="btn-buy" bindtap="batchPurchase"
- >鎵归噺璐拱</t-button
- >
-</view>
+ <view class="page-bottom" style="margin-bottom: 20rpx;">
+ <t-button theme="primary" size="large" class="btn-buy" bindtap="batchPurchase">鎵归噺璐拱</t-button>
+ </view>
+
+
+
+</view>
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index 9c1880c..77b7035 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -168,8 +168,10 @@
if (item.selectType == "document" || item.selectType == "pdf") {
- const fileLink =
- app.config.requestCtx + "/file/api/ApiDownload?md5=" + item.file;
+ console.log(item, 'item789');
+ // freeFile
+ const fileLink = item.file ?
+ app.config.requestCtx + "/file/api/ApiDownload?md5=" + item.file : app.config.requestCtx + "/file/api/ApiDownload?md5=" + item.freeFile
console.log(fileLink, "fileLink");
//鎻愮ず鍔犺浇涓�
util.showLoading();
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxss b/packageBookService/pages/bookServices/detail/components/tree/index.wxss
index 95901fe..9dbaa1b 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,
@@ -101,4 +101,8 @@
.list-icon {
width: 32rpx;
height: 18rpx;
-}
\ No newline at end of file
+}
+
+/* .t-collapse-panel__content {
+ padding: var(--td-collapse-content-padding, 0rpx) !important;
+} */
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index bddc6e9..ff204b8 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -1772,6 +1772,10 @@
}
wx.setStorageSync("bookPathList", JSON.stringify(bookPathList));
+ this.setData({
+ learn: [],
+ teach: []
+ })
this.onLoad({
id: e.detail.id,
name: e.detail.name,
diff --git a/packageBookService/pages/bookServices/detail/index.wxss b/packageBookService/pages/bookServices/detail/index.wxss
index fe27640..c1e615d 100644
--- a/packageBookService/pages/bookServices/detail/index.wxss
+++ b/packageBookService/pages/bookServices/detail/index.wxss
@@ -14,12 +14,13 @@
}
.navbar-title {
- widows: 100vw;
+ /* widows: 100vw; */
display: flex;
justify-content: center;
color: #0F1214;
font-size: 36rpx;
+ z-index: -99;
}
.navbar-title text {
@@ -412,7 +413,7 @@
background-repeat: no-repeat;
background-size: 45% 45%;
/* background-position: 65% 50%; */
- background-position: right center;
+ background-position: 50% center;
background-image: url(https://jsek.bnuic.com/home/image/click-icon.png);
}
@@ -458,4 +459,8 @@
.t-tabs__scroll {
overflow-x: auto;
+}
+
+.t-collapse-panel__content {
+ padding: 0rpx !important;
}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/list/index.js b/packageBookService/pages/bookServices/list/index.js
index a8abbc8..6cdf707 100644
--- a/packageBookService/pages/bookServices/list/index.js
+++ b/packageBookService/pages/bookServices/list/index.js
@@ -493,6 +493,8 @@
},
// 浜岀骇鍒嗙被鍒囨崲
onChangeSecond(e) {
+
+ console.log(789);
const pathList = [];
for (let index = 0; index < e.detail.value.length; index++) {
const element = e.detail.value[index];
@@ -510,6 +512,8 @@
},
//
onConfirmSecond() {
+
+
this.getBookList(this.data.path);
},
// 閲嶇偣椤圭洰鏀瑰彉
diff --git a/packageBookService/pages/bookServices/list/index.wxml b/packageBookService/pages/bookServices/list/index.wxml
index 06d409f..4f1c0b6 100644
--- a/packageBookService/pages/bookServices/list/index.wxml
+++ b/packageBookService/pages/bookServices/list/index.wxml
@@ -3,78 +3,24 @@
<import src="index.skeleton.wxml" />
<template is="skeleton" wx:if="{{loading}}" />
-<page-meta
- page-style="{{showDropdown ? 'overflow: hidden;' : ''}}"
- wx:if="{{!loading}}"
->
+<page-meta page-style="{{showDropdown ? 'overflow: hidden;' : ''}}" wx:if="{{!loading}}">
<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>
- <t-search
- model:value="{{searchValue}}"
- shape="round"
- placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��"
- class="navBar-search"
- style="width: 464rpx"
- bind:submit="searchBook"
- />
+ <t-search model:value="{{searchValue}}" shape="round" placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��" class="navBar-search" style="width: 464rpx" bind:submit="searchBook" />
</view>
<view class="bookServices-list">
<view class="list-header">
<view class="header-scroll">
<t-dropdown-menu style="width: 1200rpx">
- <t-dropdown-item
- disabled="{{disabledStair}}"
- optionsColumns="2"
- options="{{stairList.options}}"
- value="{{stairList.value}}"
- bindchange="onChangeStair"
- />
- <t-dropdown-item
- disabled="{{disabledSecondList}}"
- label="浜岀骇"
- bind:open="openDropdown"
- bind:close="closeDropdown"
- options="{{secondList.options}}"
- optionsColumns="2"
- multiple
- value="{{secondList.value}}"
- bind:confirm="onConfirmSecond"
- bind:change="onChangeSecond"
- />
- <t-dropdown-item
- label="閲嶇偣椤圭洰"
- disabled="{{disabledProject}}"
- options="{{majorProjectList.options}}"
- optionsColumns="2"
- multiple
- defaultValue="{{majorProjectList.value}}"
- bind:confirm="changeMajorProject"
- bind:reset="resetMajorProject"
- />
- <t-dropdown-item
- label="鏂板舰鎬佹暀鏉�"
- disabled="{{disabledNewForms}}"
- options="{{newTextBook.options}}"
- optionsColumns="2"
- multiple
- defaultValue="{{newTextBook.value}}"
- bind:confirm="changeNewText"
- bind:reset="resetNewText"
- />
- <t-dropdown-item
- options="{{sortList.options}}"
- value="{{sortList.value}}"
- bindchange="onSortChange"
- />
+ <t-dropdown-item disabled="{{disabledStair}}" optionsColumns="2" options="{{stairList.options}}" value="{{stairList.value}}" bindchange="onChangeStair" />
+ <t-dropdown-item disabled="{{disabledSecondList}}" label="浜岀骇" bind:open="openDropdown" bind:close="closeDropdown" options="{{secondList.options}}" optionsColumns="2" multiple value="{{secondList.value}}" bind:confirm="onConfirmSecond" bind:change="onChangeSecond" />
+ <t-dropdown-item label="閲嶇偣椤圭洰" disabled="{{disabledProject}}" options="{{majorProjectList.options}}" optionsColumns="2" multiple defaultValue="{{majorProjectList.value}}" bind:confirm="changeMajorProject" bind:reset="resetMajorProject" />
+ <t-dropdown-item label="鏂板舰鎬佹暀鏉�" disabled="{{disabledNewForms}}" options="{{newTextBook.options}}" optionsColumns="2" multiple defaultValue="{{newTextBook.value}}" bind:confirm="changeNewText" bind:reset="resetNewText" />
+ <t-dropdown-item options="{{sortList.options}}" value="{{sortList.value}}" bindchange="onSortChange" />
</t-dropdown-menu>
</view>
<!-- <view class="header-sort">
@@ -83,28 +29,10 @@
</t-dropdown-menu>
</view> -->
</view>
- <scroll-view
- scroll-y="{{true}}"
- scroll-into-view="{{backTop}}"
- refresher-enabled="{{true}}"
- lower-threshold="{{200}}"
- refresher-threshold="{{80}}"
- refresher-default-style="none"
- refresher-triggered="{{triggered}}"
- bindrefresherrefresh="onPullDownRefresh"
- bindrefresherpulling="{{refresh.onPulling}}"
- class="list-container"
- bindrefresherrefresh="onPullDownRefresh"
- bindscrolltolower="onReachBottom"
- >
+ <scroll-view scroll-y="{{true}}" scroll-into-view="{{backTop}}" refresher-enabled="{{true}}" lower-threshold="{{200}}" refresher-threshold="{{80}}" refresher-default-style="none" refresher-triggered="{{triggered}}" bindrefresherrefresh="onPullDownRefresh" bindrefresherpulling="{{refresh.onPulling}}" class="list-container" bindrefresherrefresh="onPullDownRefresh" bindscrolltolower="onReachBottom">
<view slot="refresher" class="refresh-container">
<view class="loading">
- <t-loading
- theme="circular"
- size="40rpx"
- text="姝ｅ湪鍒锋柊..."
- class="wrapper"
- />
+ <t-loading theme="circular" size="40rpx" text="姝ｅ湪鍒锋柊..." class="wrapper" />
</view>
</view>
<view class="assort-title" id="assort-title">
@@ -113,19 +41,9 @@
</view>
<view class="page-content">
<view class="book-list" wx:if="{{!loaidng}}">
- <view
- class="book-box"
- wx:for="{{bookList}}"
- wx:key="id"
- bind:tap="goDetail"
- data-book="{{item}}"
- >
+ <view class="book-box" wx:for="{{bookList}}" wx:key="id" bind:tap="goDetail" data-book="{{item}}">
<view class="book-img">
- <image
- src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}"
- aria-label="{item.name{}}"
- mode="aspectFit"
- />
+ <image src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}" aria-label="{item.name{}}" mode="aspectFit" />
</view>
<view class="book-name book-color">{{ item.name}}</view>
<view class="book-author book-color">{{item.author}}</view>
@@ -136,15 +54,9 @@
</view>
</view>
<view class="bottom-box" wx:if="{{bookList.length}}">
- <t-loading
- theme="circular"
- size="40rpx"
- class="wrapper"
- wx:if="{{isMore == true}}"
- loading="{{isMore}}"
- />
+ <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" loading="{{isMore}}" />
<text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
</view>
</scroll-view>
</view>
-</page-meta>
+</page-meta>
\ No newline at end of file
diff --git a/packageDomain/pages/resourceDetails/document/index.js b/packageDomain/pages/resourceDetails/document/index.js
index 03bc46d..e31b22c 100644
--- a/packageDomain/pages/resourceDetails/document/index.js
+++ b/packageDomain/pages/resourceDetails/document/index.js
@@ -249,9 +249,11 @@
//鍒氳繘鏉ョ殑鏃跺�欒皟鐢�
handleTeachData(item) {
//鍥剧墖
+ console.log(item, 'item11111');
if (item.selectType == 'picture') {
this.setData({
- showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file,
+
+ showData: item.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.freeFile,
})
}
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index b42f0f1..7000199 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -87,6 +87,17 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
+
+ wx.setNavigationBarTitle({
+
+ title: '璧勬簮璇︽儏-闊抽'
+
+ });
+
+
+
+
+
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
@@ -97,11 +108,16 @@
bookId: options.bookId,
bookName: options.bookName,
cmsId: options.cmsId,
- parentName: options.parentName,
parentProductLinkPath: options.parentProductLinkPath,
productLinkPath: options.productLinkPath,
formPath: options.formPath
})
+
+ if (options.parentName !== "鏁欏璧勬簮" && options.parentName !== "浜戝涔�") {
+ this.setData({
+ parentName: options.parentName,
+ })
+ }
this.resourceDetailsData()
this.getNoteList()
console.log(options, 'options');
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.json b/packageDomain/pages/resourceDetails/myAudio/index.json
index 0d44262..4f6c89d 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.json
+++ b/packageDomain/pages/resourceDetails/myAudio/index.json
@@ -17,6 +17,5 @@
"t-dropdown-menu": "tdesign-miniprogram/dropdown-menu/dropdown-menu",
"t-dropdown-item": "tdesign-miniprogram/dropdown-item/dropdown-item",
"t-empty": "tdesign-miniprogram/empty/empty"
- },
- "navigationStyle": "custom"
+ }
}
\ No newline at end of file
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.wxml b/packageDomain/pages/resourceDetails/myAudio/index.wxml
index 394c188..8f3ea4f 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.wxml
+++ b/packageDomain/pages/resourceDetails/myAudio/index.wxml
@@ -2,7 +2,7 @@
<template is="skeleton" wx:if="{{loading}}" />
<view wx:if="{{!hidden}}">
- <view style="width: 100%; height: {{barHeight}}px; "></view>
+ <!-- <view style="width: 100%; height: {{barHeight}}px; "></view>
<view class="nacigationBar" style="width: 100%; height: {{navBarHeight}}px;">
<view>
<t-icon
@@ -13,13 +13,10 @@
/>
</view>
<view class="navbar-title">璧勬簮璇︽儏-闊抽</view>
- </view>
+ </view> -->
<view class="audioPlayerBox">
- <view
- class="audioBackground"
- style="background-image: url('https://jsek.bnuic.com/home/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>
<!-- 瑙嗛鎾斁鐨勬寜閽� -->
@@ -31,33 +28,17 @@
</view> -->
<!-- 鏆傚仠鎾斁 -->
- <view
- class="audioIconBox color"
- style="margin-left: 30rpx; margin-right: 10rpx"
- >
+ <view class="audioIconBox color" style="margin-left: 30rpx; margin-right: 10rpx">
<view wx:if="{{isplay}}" bind:tap="play" class="pauseCircleBox">
<!-- <t-icon name="play-circle-stroke" size="24" /> -->
- <image
- src="/static/images/resourceDetailsMyAudio/play@2x.png"
- mode=""
- />
+ <image src="/static/images/resourceDetailsMyAudio/play@2x.png" mode="" />
</view>
<view wx:if="{{!isplay}}" bind:tap="stop" class="pauseCircleBox">
<!-- <t-icon name="pause-circle-stroke" size="24" /> -->
- <image
- src="/static/images/resourceDetailsMyAudio/zanting@2x.png"
- mode=""
- />
+ <image src="/static/images/resourceDetailsMyAudio/zanting@2x.png" mode="" />
</view>
</view>
- <slider
- style="width: 300rpx"
- activeColor="#FF6C00"
- class="mp-slider-bar"
- block-size="16"
- value="{{myAudioPos}}"
- bindchange="hanle_slider_change"
- ></slider>
+ <slider style="width: 300rpx" activeColor="#FF6C00" class="mp-slider-bar" block-size="16" value="{{myAudioPos}}" bindchange="hanle_slider_change"></slider>
<!-- 鍙冲垏鎹� -->
<!-- <view class="rightSwitchBox color" bind:tap="onRightSwitch">
<t-icon name="next" size="24" />
@@ -74,46 +55,14 @@
<view class="publicBtn color">
<view class="publicText" bind:tap="toggleDropdown">
<view> {{"x "+speed}} </view>
- <t-icon
- style="margin-top: 10rpx"
- wx:if="{{showDropdown}}"
- name="caret-up-small"
- size="14"
- bind:click="onIconTap"
- />
- <t-icon
- style="margin-top: 10rpx"
- wx:else
- name="caret-down-small"
- size="14"
- bind:click="onIconTap"
- />
+ <t-icon style="margin-top: 10rpx" wx:if="{{showDropdown}}" name="caret-up-small" size="14" bind:click="onIconTap" />
+ <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
- 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 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>
@@ -123,43 +72,21 @@
<!-- 鏍囬 -->
<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"
- split="{{false}}"
- >
+ <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"
- >
+ <t-tab-panel label="璧勬簮鍒楄〃" value="0" style="{{tabPanelstyle}}" style="width: 750rpx">
<view class="wrapper">
- <t-collapse value="{{activeValues}}" bind:change="handleChange">
+ <!-- <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>
+ </t-collapse> -->
+ <view class="outsideDetailsName">
+ <view class="titleBox" > {{parentName}}</view>
+ <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>
</view>
</t-tab-panel>
<!-- 绗旇灞曠ず -->
@@ -170,16 +97,9 @@
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
- <t-collapse-panel
- value="{{item.id}}"
- expandIcon
- wx:for="{{noteList}}"
- >
+ <t-collapse-panel value="{{item.id}}" expandIcon wx:for="{{noteList}}">
<view slot="header" class="collapse-header">
- <t-image
- class="note-icon"
- src="/static/images/bookService/detail/note-icon.png"
- ></t-image>
+ <t-image class="note-icon" src="/static/images/bookService/detail/note-icon.png"></t-image>
<view class="header-name">{{item.name}}</view>
</view>
<view>
@@ -187,19 +107,9 @@
<view class="note-bottom">
<view class="note-time">{{item.createDate}}</view>
<view class="bottom-btn">
- <t-image
- src="/static/images/bookService/detail/compliceHover.png"
- class="complice"
- bind:tap="editNote"
- data-note="{{item}}"
- ></t-image>
+ <t-image src="/static/images/bookService/detail/compliceHover.png" class="complice" bind:tap="editNote" data-note="{{item}}"></t-image>
<view></view>
- <t-image
- src="/static/images/bookService/detail/deleteHover.png"
- class="delete"
- bind:tap="deleteNote"
- data-id="{{item.id}}"
- ></t-image>
+ <t-image src="/static/images/bookService/detail/deleteHover.png" class="delete" bind:tap="deleteNote" data-id="{{item.id}}"></t-image>
</view>
</view>
</view>
@@ -212,10 +122,7 @@
<!-- 璁扮瑪璁� -->
<view class="takeNotes" data-key="showCloseBtn" bind:tap="showDialog">
<view class="takeNotesLining">
- <image
- src="/static/images/resourceDetails/jibiji锛廼con@2x.png"
- mode=""
- />
+ <image src="/static/images/resourceDetails/jibiji锛廼con@2x.png" mode="" />
璁扮瑪璁�
</view>
</view>
@@ -223,63 +130,28 @@
</view>
<!-- 璁扮瑪璁板脊绐� -->
- <t-popup
- visible="{{dialogKey}}"
- bind:visible-change="onVisibleChange"
- placement="center"
- >
+ <t-popup visible="{{dialogKey}}" bind:visible-change="onVisibleChange" placement="center">
<view class="popup">
<view slot="title">
<view class="title-text" wx:if="{{!flag}}">
<text class="note-title">{{submitTitle}}</text>
- <t-image
- src="/static/images/bookService/detail/edit.png"
- class="edit-icon"
- bind:tap="changeTitle"
- data-value="{{true}}"
- ></t-image>
+ <t-image src="/static/images/bookService/detail/edit.png" class="edit-icon" bind:tap="changeTitle" data-value="{{true}}"></t-image>
</view>
<view wx:else>
- <t-input
- value="{{submitTitle}}"
- style="{{inputStyle}}"
- data-value="{{false}}"
- bind:enter="changeTitle"
- bind:blur="changeTitle"
- maxlength="{{50}}"
- bind:change="inputChange"
- ></t-input>
+ <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"
- />
+ <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
- >
+ <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-icon t-class="close-btn" name="close-circle" size="32" color="#fff" bind:tap="closeDialog" />
</t-popup>
-</view>
+</view>
\ No newline at end of file
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.wxss b/packageDomain/pages/resourceDetails/myAudio/index.wxss
index a49d20e..0629cd2 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.wxss
+++ b/packageDomain/pages/resourceDetails/myAudio/index.wxss
@@ -120,10 +120,14 @@
}
.outsideDetailsName {
- overflow-y: scroll;
+ /* overflow-y: scroll;
+
+ height: 100vh; */
overflow-x: hidden;
- height: 35vh;
+ padding-right: 30rpx;
}
+
+
.detailsName {
margin: 30rpx;
@@ -402,5 +406,6 @@
.wrapper {
overflow-y: scroll;
- height: 45vh;
+ overflow-x: hidden;
+ height: 50vh;
}
\ No newline at end of file
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index c972ff8..b9898fc 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.js
+++ b/packageDomain/pages/resourceDetails/myVideo/index.js
@@ -59,6 +59,11 @@
*/
onLoad(options) {
+ wx.setNavigationBarTitle({
+
+ title: '璧勬簮璇︽儏-闊抽'
+
+ });
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
@@ -70,12 +75,16 @@
bookId: options.bookId,
bookName: options.bookName,
cmsId: options.cmsId,
- parentName: options.parentName,
parentProductLinkPath: options.parentProductLinkPath,
productLinkPath: options.productLinkPath,
formPath: options.formPath,
flag: false
})
+ if (options.parentName !== "鏁欏璧勬簮" && options.parentName !== "浜戝涔�") {
+ this.setData({
+ parentName: options.parentName,
+ })
+ }
console.log(options, 'options');
this.resourceDetailsData()
this.getNoteList()
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.json b/packageDomain/pages/resourceDetails/myVideo/index.json
index fa11de1..4e94a62 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.json
+++ b/packageDomain/pages/resourceDetails/myVideo/index.json
@@ -14,6 +14,5 @@
"t-loading": "tdesign-miniprogram/loading/loading",
"t-popup": "tdesign-miniprogram/popup/popup",
"t-empty": "tdesign-miniprogram/empty/empty"
- },
- "navigationStyle": "custom"
+ }
}
\ No newline at end of file
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.wxml b/packageDomain/pages/resourceDetails/myVideo/index.wxml
index 6e66bdd..f229663 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.wxml
+++ b/packageDomain/pages/resourceDetails/myVideo/index.wxml
@@ -2,13 +2,13 @@
<template is="skeleton" wx:if="{{loading}}" />
<view wx:if="{{!hidden}}">
- <view style="width: 100%; height: {{barHeight}}px; "></view>
+ <!-- <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="navbar-title">璧勬簮璇︽儏-瑙嗛</view>
- </view>
+ </view> -->
<!-- 瑙嗛 -->
<view class="videoBox" wx:if="{{videoChange}}">
<!-- autoplay='false' 鏄惁鑷姩鎾斁 -->
@@ -29,17 +29,15 @@
<!-- 璧勬簮鍒楄〃 -->
<t-tab-panel label="璧勬簮鍒楄〃" value="0" style="{{tabPanelstyle}}" style="width: 750rpx;">
<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 class="outsideDetailsName">
+ <view class="titleBox">{{parentName}}</view>
+ <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>
-
- </t-collapse-panel>
- </t-collapse>
+ </view>
+
</view>
</t-tab-panel>
<!-- 绗旇灞曠ず -->
@@ -47,7 +45,7 @@
<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 6196df7..ca32596 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.wxss
+++ b/packageDomain/pages/resourceDetails/myVideo/index.wxss
@@ -337,12 +337,11 @@
}
.outsideDetailsName {
- overflow-y: scroll;
overflow-x: hidden;
- height: 35vh;
}
-/* .wrapper {
+.wrapper {
overflow-y: scroll;
- height: 45vh;
-} */
\ No newline at end of file
+ overflow-x: hidden;
+ height: 50vh;
+}
\ No newline at end of file
diff --git a/pages/bookExhibitionDetails/index.wxss b/pages/bookExhibitionDetails/index.wxss
index 8bac510..fc3d12d 100644
--- a/pages/bookExhibitionDetails/index.wxss
+++ b/pages/bookExhibitionDetails/index.wxss
@@ -7,7 +7,6 @@
display: flex;
align-items: center;
width: 100%;
-
}
.navbar-title {
@@ -18,26 +17,24 @@
font-size: 40rpx;
font-weight: bold;
margin-bottom: 5rpx; */
-
-
- /*
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- color: #0F1214;
+ /* color: #0F1214;
font-size: 40rpx;
font-weight: bold; */
+ width: 310rpx;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ -o-text-overflow: ellipsis;
margin: 0 auto;
+ margin-left: 150rpx;
}
.titleBox {
-
font-weight: 800;
font-size: 45rpx;
display: flex;
justify-content: center;
padding: 10rpx 30rpx;
-
}
.informationBox {
@@ -60,7 +57,6 @@
min-width: 690rpx;
height: 270rpx;
margin: 0 30rpx;
-
}
image {
diff --git a/pages/bookExhibitionList/index.js b/pages/bookExhibitionList/index.js
index e3b7d50..37a8d66 100644
--- a/pages/bookExhibitionList/index.js
+++ b/pages/bookExhibitionList/index.js
@@ -91,8 +91,7 @@
*/
onLoad(options) {
- console.log(this.data.keynoteDisabled, 'keynoteDisabled');
- // console.log(this.data.filteredItems, 88888);
+
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
@@ -109,7 +108,7 @@
}))
if (this.data.filteredItems = []) {
- console.log(11111);
+
// singleSelectOptions.push({
// label: '鏆傛棤鏁版嵁',
// value: 'disabled',
@@ -123,7 +122,7 @@
- console.log(this.data.bookExhibitionList.length, 'this.data.bookExhibitionList.length');
+
// 鏇存柊鏁版嵁
this.setData({
'multipleSelect.options': singleSelectOptions,
@@ -175,9 +174,7 @@
// },
onScrollToLower() {
- console.log(789);
- console.log(this.data.bookExhibitionList.length);
- console.log(this.data.totalSize);
+
if (this.data.bookExhibitionList.length < this.data.totalSize) {
this.setData({
isMore: true,
@@ -192,7 +189,7 @@
this.setData({
isMore: false
})
- console.log('300');
+
}, 300)
}
},
@@ -200,10 +197,9 @@
* 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
*/
onReachBottom() {
- // console.log(this.data.page.size);
- // console.log(this.data.total);
+
if (this.data.page.size >= this.data.total) {
- console.log('宸插姞杞藉畬鎵�鏈夋暟鎹�');
+
Toast({
context: this,
selector: '#t-toast',
@@ -244,7 +240,7 @@
'Name*': this.data.keyword,
'||subtitle*': this.data.keyword
}
- // console.log(this.data.keynoteValue);
+
let sort = {};
const sortOptions = {
@@ -267,7 +263,7 @@
sort = sortOptions[this.data.product.value] || {};
- console.log(sort);
+
app.MG.store.getProductList({
storeInfo: 'jsek_bookFair',
@@ -294,11 +290,11 @@
}
item.subtitleName = item.subtitle + item.name
})
- console.log(res, 'item');
+
this.data.total = res.total
// list.push(res.datas)
- console.log(res.datas.length);
+
if (res.datas.length == 0) {
@@ -308,18 +304,17 @@
}
const list = [...res.datas]
- console.log(res);
+
this.setData({
bookExhibitionList: list,
totalSize: res.total
})
- // 鍒ゆ柇鏁版嵁闀垮害
- console.log(list.length, 'list.length');
+
//鍙栨秷
wx.hideLoading()
- // console.log(this.data.bookExhibitionList, '鏁版嵁');
+
this.setData({
loading: false,
@@ -335,7 +330,7 @@
loading: true,
hidden: true,
})
- // console.log(newPrice, 'newPrice');
+
let parms = {
refCodes: ['bookClassification']
}
@@ -346,7 +341,7 @@
this.setData({
filteredItems: item.child || [] // 濡傛灉瀛樺湪瀛愰」鍒欒祴鍊硷紝鍚﹀垯璧嬪�间负绌烘暟缁�
});
- // console.log(this.data.filteredItems);
+
}
})
@@ -365,28 +360,17 @@
// 鎬诲垎绫�
// 鎬诲垎绫�
onChange(e) {
- // e.stopImmediatePropagation();
-
-
-
-
-
-
-
-
-
-
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');
+
+
+ // const bookExhibitionListsubsidiary = []
+ // this.setData({
+ // bookExhibitionListsubsidiary: this.data.bookExhibitionList
+ // })
+
if (newPrice) {
this.setData({
@@ -398,7 +382,7 @@
keynoteDisabled: true
})
}
- console.log(newValue);
+
this.setData({
'product.value': newValue,
'product.price': newPrice, // 灏嗛�変腑鐨� price 鍊间繚瀛樺湪鏁版嵁涓�
@@ -413,6 +397,12 @@
this.bookExhibitionGet(newValue)
this.onLoad()
}
+
+
+
+
+
+
// e.stopImmediatePropagation()
},
@@ -429,7 +419,7 @@
} = event.detail;
// 纭鎿嶄綔鐨勫鐞嗛�昏緫
- console.log('纭鎿嶄綔锛岄�変腑鐨勫�间负锛�', value);
+
this.data.keynoteValue = value
this.bookExhibitionGet()
},
@@ -461,13 +451,12 @@
},
onSwapLeft() {
this.data.nameSort = 'Desc'
- // console.log('sssssss');
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鍙傛暟
});
@@ -478,7 +467,7 @@
this.setData({
keyword: e.detail.value
})
- console.log(this.data.keyword, 'keyword');
+
this.bookExhibitionGet()
},
goBack() {
@@ -488,10 +477,10 @@
this.setData({
'product.value': e.detail.value,
});
- console.log(e.detail.value, 'e.detail.value');
+
this.bookExhibitionGet()
},
onOpend() {
- console.log(7555);
+
}
})
\ No newline at end of file
diff --git a/pages/bookExhibitionList/index.wxml b/pages/bookExhibitionList/index.wxml
index 01ede90..e68147d 100644
--- a/pages/bookExhibitionList/index.wxml
+++ b/pages/bookExhibitionList/index.wxml
@@ -28,9 +28,7 @@
<view class="outsideMenuBox">
<view class="menuBox">
<t-dropdown-menu>
-
<!-- show-overlay="{{false}}" -->
-
<!-- <t-dropdown-item options="{{product.options}}" value="{{product.value}}" bindchange="onChange" /> -->
<t-dropdown-item options="{{product.options}}" value="{{product.value}}" bindchange="onChange" />
diff --git a/pages/retrievalPage/index.wxss b/pages/retrievalPage/index.wxss
index bbe819e..da4f78d 100644
--- a/pages/retrievalPage/index.wxss
+++ b/pages/retrievalPage/index.wxss
@@ -384,12 +384,13 @@
} */
.t-tabs .t-tabs__item--active {
+ /* min-width: 210rpx; */
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%;
+ background-position: 83% center;
+ background-size: 45% 70%;
/* 灏嗚儗鏅浘鐗囦綅缃缃负闈犲彸 */
}
--
Gitblit v1.9.1