代码合并

闫增涛

2024-04-17 bd00247c73e38c378d368977d306604d2c9e9149

代码合并

 packageBookService/pages/bookServices/detail/index.js

@@ -793,7 +793,6 @@
                loading: false,
                openLearnids: result,
              });
              console.log('云学习', list);
            }
            console.log(list, '云學習789');
          } else {

 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／icon@2x.png" mode="" /> 记笔记
        <image
          src="/static/images/resourceDetails/jibiji／icon@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>

 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 {