From bd00247c73e38c378d368977d306604d2c9e9149 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 17 四月 2024 18:24:27 +0800
Subject: [PATCH] 代码合并
---
packageBookService/pages/bookServices/detail/index.js | 1
packageDomain/pages/resourceDetails/myAudio/index.wxss | 6 +
packageDomain/pages/resourceDetails/myAudio/index.wxml | 197 +++++++++++++++++++++++++++++++++++++++++--------
3 files changed, 169 insertions(+), 35 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index fcedbe7..7cadc31 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -793,7 +793,6 @@
loading: false,
openLearnids: result,
});
- console.log('浜戝涔�', list);
}
console.log(list, '浜戝缈�789');
} else {
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.wxml b/packageDomain/pages/resourceDetails/myAudio/index.wxml
index c2401a1..394c188 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.wxml
+++ b/packageDomain/pages/resourceDetails/myAudio/index.wxml
@@ -1,18 +1,25 @@
<import src="index.skeleton.wxml" />
<template is="skeleton" wx:if="{{loading}}" />
-
<view wx:if="{{!hidden}}">
<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" />
+ <t-icon
+ name="chevron-left"
+ size="30"
+ data-name="{{item}}"
+ bind:click="goBack"
+ />
</view>
<view class="navbar-title">璧勬簮璇︽儏-闊抽</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>
<!-- 瑙嗛鎾斁鐨勬寜閽� -->
@@ -24,17 +31,33 @@
</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" />
@@ -47,19 +70,50 @@
<view class="duration-time color"> {{myAudioDuration}} </view>
</view>
-
<!-- bind:tap="onSpeed" -->
<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>
@@ -69,20 +123,41 @@
<!-- 鏍囬 -->
<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-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
+ 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>
@@ -95,9 +170,16 @@
<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>
@@ -105,9 +187,19 @@
<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>
@@ -120,35 +212,74 @@
<!-- 璁扮瑪璁� -->
<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>
<view class="buttonBox"></view>
</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>
\ No newline at end of file
+</view>
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.wxss b/packageDomain/pages/resourceDetails/myAudio/index.wxss
index 0898ca9..0af6100 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.wxss
+++ b/packageDomain/pages/resourceDetails/myAudio/index.wxss
@@ -369,7 +369,11 @@
}
.tabs--t-tabs__scroll--split::after {
- height: 0 !important;
+ height: 0rpx !important;
+}
+
+.t-tabs__scroll::after {
+ height: 0rpx !important;
}
.buttonBox {
--
Gitblit v1.9.1