Merge branch 'master' of http://182.92.203.7:2001/r/jsek-applet

闫增涛

2024-03-06 3d78ac0ece15f043390a351c70e99b287d0c42e1

Merge branch 'master' of http://182.92.203.7:2001/r/jsek-applet

 pages/aboutUs/index.wxml

@@ -22,9 +22,9 @@


<view class="aboutUs">
  <view class="imageBox">
  <!-- <view class="imageBox">
    <image src="{{swiperList}}" alt="" />
  </view>
  </view> -->
  <view class="aboutText">
    <rich-text nodes="{{aboutText}}"></rich-text>
  </view>

 pages/bookExhibitionList/index.wxml

@@ -5,7 +5,7 @@


<view class="example-search">
  <t-search model:value="{{value}}" placeholder="请输入关键词/书目/ISBN/作者" bind:submit="onSearchSubmit" />
  <t-search model:value="{{value}}" placeholder="请输入书展名称" bind:submit="onSearchSubmit" />
</view>



 pages/bookExhibitionList/index.wxss

@@ -27,6 +27,7 @@


.textBox {
  font-family: PingFang SC, PingFang SC;
  width: 280rpx;
  /* height: 75rpx; */
  font-size: 25rpx;

 pages/home/home.wxml

@@ -157,7 +157,7 @@
      </view>
    </view>
    <view class="listBox3">
      <view wx:if="{{textbookList.length > 0}}" class="listBox3">
      <view wx:if="{{textbookList.length > 0}}">
        <view wx:for="{{textbookList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="textbooksItemBox">
          <view class="listItem flex">
            <view class="specialSubject-img">

 pages/home/home.wxss

@@ -197,7 +197,7 @@

.listBox1,
.listBox2 {
  padding: 50rpx 0;
  padding: 30rpx 0;
}

.listBox1 .listItemBox {
@@ -272,6 +272,10 @@
  box-sizing: border-box;
}

.listBox3 {
  padding: 10rpx 0;
}

.listBox3 .textbooksItemBox {
  margin-bottom: 30rpx;
}

 pages/resourceDetails/index.js

@@ -7,7 +7,12 @@
  data: {
    navBarHeight: '',
    barHeight: '',
    vURL: 'http://wxsnsdy.tc.qq.com/105/20210/snsdyvideodownload?filekey=30280201010421301f0201690402534804102ca905ce620b1241b726bc41dcff44e00204012882540400&bizid=1023&hy=SH&fileparam=302c020101042530230204136ffd93020457e3c4ff02024ef202031e8d7f02030f42400204045a320a0201000400'
    vURL: 'http://wxsnsdy.tc.qq.com/105/20210/snsdyvideodownload?filekey=30280201010421301f0201690402534804102ca905ce620b1241b726bc41dcff44e00204012882540400&bizid=1023&hy=SH&fileparam=302c020101042530230204136ffd93020457e3c4ff02024ef202031e8d7f02030f42400204045a320a0201000400',
    tabPanelstyle: 'display:flex;justify-content:center;align-items:center;',
    activeValues: [0],
    dialogKey: false,
    style: 'border: 2rpx solid rgba(220,220,220,1);border-radius: 12rpx;',

  },

  /**
@@ -72,5 +77,30 @@
   */
  onShareAppMessage() {

  }
  },
  onTabsChange(event) {
    console.log(`Change tab, tab-panel value is ${event.detail.value}.`);
  },

  onTabsClick(event) {
    console.log(`Click tab, tab-panel value is ${event.detail.value}.`);
  }, handleChange(e) {
    this.setData({
      activeValues: e.detail.value,
    });
  },
  onTakeNotes() {
    console.log(1111);
  },
  showDialog(e) {
    const { key } = e.currentTarget.dataset;
    this.setData({ [key]: true, dialogKey: key });
  },

  closeDialog() {

    this.setData({
      dialogKey: false
    });
  },
})

 pages/resourceDetails/index.json

@@ -1,6 +1,14 @@
{
  "component": true,
  "usingComponents": {
    "t-icon": "tdesign-miniprogram/icon/icon"
    "t-icon": "tdesign-miniprogram/icon/icon",
    "t-tabs": "tdesign-miniprogram/tabs/tabs",
    "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
    "t-collapse": "tdesign-miniprogram/collapse/collapse",
    "t-collapse-panel": "tdesign-miniprogram/collapse-panel/collapse-panel",
    "t-button": "tdesign-miniprogram/button/button",
    "t-dialog": "tdesign-miniprogram/dialog/dialog",
    "t-input": "tdesign-miniprogram/input/input"
  },
  "navigationStyle": "custom"
}

 pages/resourceDetails/index.wxml

@@ -7,7 +7,74 @@
</view>



<!-- 视频 等 -->
<view class="videoBox">
  <video src="{{vURL}}" play-btn-position='center' object-fit='fill' controls enable-play-gesture enable-auto-rotation></video>
</view>
</view>

<!-- 标题 -->
<view class="titleBox">基础教育研究背景总体设计</view>

<view class="contentBox">
  <t-tabs defaultValue="{{0}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" t-class-content="custom-panel">
    <!-- 资源列表 -->
    <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="一、背景、意义与总体设计" value="{{0}}" expandIcon>
            <view wx:for="{{3}}">
              <view>第一课</view>
              <view>第二课</view>
              <view>第三课</view>
              <view>第四课</view>
            </view>
          </t-collapse-panel>
        </t-collapse>
      </view>
    </t-tab-panel>
    <!-- 笔记展示 -->
    <t-tab-panel label="笔记" value="1" style="{{tabPanelstyle}}">
      <view class="wrapper">
        <t-collapse value="{{activeValues}}" bind:change="handleChange">
          <t-collapse-panel header="第1第1课时 课程视频" value="{{0}}" expandIcon>
            <view> 此处可自定义内容此处可自定义内容此处可自定义内容此处可自定义内容此处可自定义内容此处可自定义内容此处可自定义内容此处可自定义内容</view>
            <view class="operateBox">
              <view>2023-08-29</view>
              <view class="iconBox">
                <image src="/static/images/resourceDetails/jibijiicon2.png" mode="" />
                <image src="/static/images/resourceDetails/jibijiicon3.png" mode="" />
              </view>
            </view>
          </t-collapse-panel>
        </t-collapse>
      </view>
    </t-tab-panel>
  </t-tabs>

  <!-- 记笔记 -->
  <view class="takeNotes" data-key="showCloseBtn" bind:tap="showDialog">
    <view class="takeNotesLining">
      <image src="/static/images/resourceDetails/jibijii.png" mode="" /> 记笔记
    </view>
  </view>
</view>


<!-- 记笔记弹窗 -->
<t-dialog visible="{{showCloseBtn}}" close-btn bind:confirm="closeDialog" bind:cancel="closeDialog">
  <view slot='title' class="dialogTitleBox">一、道德与品德的关系-有试看
    <image class="titleImageBox" src="/static/images/resourceDetails/edit.png" alt="" />
  </view>
  <view slot='content'>
    <view class="input-example">
      <view class="input-example__label"> 内容 </view>
      <t-input class="inputBox" placeholder="请输入文字" borderless="{{true}}" style="{{style}}" />
    </view>
    <view class="buttonBox">
      <view>
        <t-button style="margin: 20rpx 30rpx;" variant="outline" size="extra-small">取消</t-button>
        <t-button style="margin: 20rpx 30rpx;" theme="primary" size="extra-small">确认</t-button>
      </view>
    </view>
  </view>
</t-dialog>

 pages/resourceDetails/index.wxss

@@ -22,4 +22,117 @@

.videoBox video {
  width: 100vw;
}
}

.titleBox {
  margin: 30rpx;
  border-bottom: 1px #f4f4f4 solid;
  padding-bottom: 20rpx;
  font-weight: bold;
}

.contentBox {
  position: relative;
}

.contentBox .custom-tabs {
  /* margin-bottom: 32rpx; */
  width: 400rpx;
}


.t-tabs__content {
  width: 750rpx !important;
  overflow: auto !important;
}


.custom-panel {
  /* height: 120px; */
  width: 750rpx;
  /* height: 200rpx; */

}

.contentBox .takeNotes {

  position: absolute;
  top: 5rpx;
  right: 0;
  width: 350rpx;
  border-bottom: 1px solid #f4f4f4;

}

.takeNotes image {
  width: 30rpx;
  height: 30rpx;
  margin-top: 10rpx;
  margin-right: 10rpx;
}

.takeNotesLining {
  margin: 25rpx;
  display: flex;
  justify-content: flex-end;
}

.operateBox {
  display: flex;
  align-items: flex-end;
  justify-content: space-between;

}

.iconBox {
  display: flex;
}

.iconBox image {
  width: 26rpx;
  height: 26rpx;
  margin: 0 10rpx;
}

.t-dialog__content {
  padding: 0 !important;
}

.titleImageBox {
  width: 40rpx;
  height: 40rpx;
  margin-left: 20rpx;
}

.dialogTitleBox {
  margin: 30rpx;
  border-bottom: 1px #f4f4f4 solid;
  padding-bottom: 20rpx;
  font-weight: bold;
  display: flex;
  align-items: center;
}

.input-example {
  --td-input-vertical-padding: 24rpx;

  background-color: #fff;
  padding: 32rpx 32rpx 16rpx;
}

.input-example__label {
  color: rgba(0, 0, 0, 0.9);
  font-size: 24rpx;
  line-height: 40rpx;
  margin: 0 8rpx 16rpx;
}

.buttonBox {
  display: flex;
  justify-content: flex-end;

}

/* .inputBox {
  height: 500rpx;
} */

 pages/retrievalPage/index.wxml

@@ -24,7 +24,7 @@

      <view class="bookDataForBox" wx:for="{{bookData}}" wx:key="index" wx:for-item="item" wx:for-index="index">
        <view class="imageBox">
          <image src="{{item.icon}}" mode="" />
          <image src="{{item.icon}}" mode="aspectFill" />
        </view>
        <view class="bookDataNmae">
          {{item.name}}

 static/images/resourceDetails/jibijii.png

 static/images/resourceDetails/jibijiicon2.png

 static/images/resourceDetails/jibijiicon3.png