From 67a890445ceac9785ee62877b1e656fa4aeb0d5e Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期三, 08 一月 2025 14:56:12 +0800
Subject: [PATCH] 11
---
packageCourse/pages/course/detail/index.js | 8 ++
packageCourse/components/baseClass/index.wxss | 4 +
packageCourse/pages/course/detail/index.wxml | 4
packageCourse/pages/teachClass/detail/index.wxml | 2
packageCourse/components/teaching/index.js | 101 ++++++++++++++++++---------------
packageCourse/components/baseClass/index.wxml | 4 +
packageCourse/pages/teachClass/detail/index.js | 3 +
7 files changed, 75 insertions(+), 51 deletions(-)
diff --git a/packageCourse/components/baseClass/index.wxml b/packageCourse/components/baseClass/index.wxml
index 2f198cb..cd05b47 100644
--- a/packageCourse/components/baseClass/index.wxml
+++ b/packageCourse/components/baseClass/index.wxml
@@ -43,7 +43,9 @@
<view class="pubCss">
<view class="title">鐝骇閫氱煡</view>
<view class="notice" wx:if="{{noticeList.length > 0}}">
- <view class="notice-title" wx:for="{{noticeList}}" wx:key="index">{{item.name}}</view>
+ <view class="notice-title" wx:for="{{noticeList}}" wx:key="index">
+ <view class="notice-content">{{item.name}}锛歿{item.content}}</view>
+ </view>
</view>
<view class="noData" wx:else>
<empty />
diff --git a/packageCourse/components/baseClass/index.wxss b/packageCourse/components/baseClass/index.wxss
index 300d6cd..d2064cd 100644
--- a/packageCourse/components/baseClass/index.wxss
+++ b/packageCourse/components/baseClass/index.wxss
@@ -101,6 +101,10 @@
font-size: 26rpx;
}
+.notice-content {
+ line-height: 48rpx;
+}
+
.noData {
display: flex;
justify-content: center;
diff --git a/packageCourse/components/teaching/index.js b/packageCourse/components/teaching/index.js
index d6476b8..3d3b478 100644
--- a/packageCourse/components/teaching/index.js
+++ b/packageCourse/components/teaching/index.js
@@ -96,56 +96,63 @@
cmsPath: data.productLinkPath
})
.then((res) => {
- const dataTeach = res.datas.cmsDatas[0]?.datas.find(
- (item) => item.refCode == 'jsek_interaction'
- )
- app.MG.store
- .getProductDetail({
- path: '*',
- queryType: '*',
- productId: this.properties.bookId,
- cmsPath: dataTeach.productLinkPath
- })
- .then((res) => {
- let datas = res.datas.cmsDatas[0] ? res.datas.cmsDatas[0].datas : []
- const dataRes = []
- if (datas?.length > 0) {
- datas.forEach(async (item) => {
- const cmsRes = await app.MG.store
- .getProductDetail({
- path: '*',
- queryType: '*',
- productId: this.properties.bookId,
- cmsPath: item.productLinkPath
+ try {
+ const dataTeach = res.datas.cmsDatas[0]?.datas.find(
+ (item) => item.refCode == 'jsek_interaction'
+ )
+ app.MG.store
+ .getProductDetail({
+ path: '*',
+ queryType: '*',
+ productId: this.properties.bookId,
+ cmsPath: dataTeach.productLinkPath
+ })
+ .then((res) => {
+ let datas = res.datas.cmsDatas[0] ? res.datas.cmsDatas[0].datas : []
+ const dataRes = []
+ if (datas?.length > 0) {
+ datas.forEach(async (item) => {
+ const cmsRes = await app.MG.store
+ .getProductDetail({
+ path: '*',
+ queryType: '*',
+ productId: this.properties.bookId,
+ cmsPath: item.productLinkPath
+ })
+ if (
+ cmsRes.datas.cmsDatas[0].datas &&
+ cmsRes.datas.cmsDatas[0].datas.length > 0
+ ) {
+ cmsRes.datas.cmsDatas[0].datas.forEach((item, i) => {
+ item.subList = []
+ item.updateDate = '-'
+ if (this.data.dataList.length > 0) {
+ this.data.dataList.forEach((mitem) => {
+ if (mitem.name == item.name) {
+ item.updateDate = moment(mitem.updateDate).format(
+ 'YYYY-MM-DD HH:mm:ss'
+ )
+ item.subList.push(mitem)
+ }
+ })
+ }
+ dataRes.push(item)
+ })
+ }
+ const resList = dataRes.sort((a, b) => b.subList.length - a.subList.length)
+ this.setData({
+ cmsDataList: resList,
+ loading: false
})
- if (
- cmsRes.datas.cmsDatas[0].datas &&
- cmsRes.datas.cmsDatas[0].datas.length > 0
- ) {
- cmsRes.datas.cmsDatas[0].datas.forEach((item, i) => {
- item.subList = []
- item.updateDate = '-'
- if (this.data.dataList.length > 0) {
- this.data.dataList.forEach((mitem) => {
- if (mitem.name == item.name) {
- item.updateDate = moment(mitem.updateDate).format(
- 'YYYY-MM-DD HH:mm:ss'
- )
- item.subList.push(mitem)
- }
- })
- }
- dataRes.push(item)
- })
- }
- const resList = dataRes.sort((a, b) => b.subList.length - a.subList.length)
- this.setData({
- cmsDataList: resList,
- loading: false
})
- })
- }
+ }
+ })
+ } catch (error) {
+ this.setData({
+ cmsDataList: [],
+ loading: false
})
+ }
})
} catch (error) {
this.setData({
diff --git a/packageCourse/pages/course/detail/index.js b/packageCourse/pages/course/detail/index.js
index 564f0e7..433de22 100644
--- a/packageCourse/pages/course/detail/index.js
+++ b/packageCourse/pages/course/detail/index.js
@@ -222,6 +222,14 @@
})
},
+ calendarClose() {
+ this.setData({
+ visibleStart: false,
+ visibleEnd: false,
+ isShow: ''
+ })
+ },
+
// 鐢宠鎻愪氦鐝骇
submitClass() {
const bTime = moment(this.data.startTime).valueOf()
diff --git a/packageCourse/pages/course/detail/index.wxml b/packageCourse/pages/course/detail/index.wxml
index 5127d35..17902a7 100644
--- a/packageCourse/pages/course/detail/index.wxml
+++ b/packageCourse/pages/course/detail/index.wxml
@@ -113,12 +113,12 @@
<view class="dateBox">
<view>
<t-input style="display:{{isShow}}" value="{{startTime}}" readonly borderless bindtap="openDateStart" placeholder="璇烽�夋嫨寮�濮嬫椂闂�" />
- <t-calendar visible="{{visibleStart}}" bind:confirm="handleConfirmStart" />
+ <t-calendar visible="{{visibleStart}}" bind:confirm="handleConfirmStart" bind:close="calendarClose"/>
</view>
<view>~</view>
<view>
<t-input value="{{endTime}}" style="display:{{isShow}}" readonly borderless bindtap="openDateEnd" placeholder="璇烽�夋嫨缁撴潫鏃堕棿" />
- <t-calendar visible="{{visibleEnd}}" bind:confirm="handleConfirmEnd" />
+ <t-calendar visible="{{visibleEnd}}" bind:confirm="handleConfirmEnd" bind:close="calendarClose"/>
</view>
</view>
</view>
diff --git a/packageCourse/pages/teachClass/detail/index.js b/packageCourse/pages/teachClass/detail/index.js
index e142417..e8a3ef6 100644
--- a/packageCourse/pages/teachClass/detail/index.js
+++ b/packageCourse/pages/teachClass/detail/index.js
@@ -244,6 +244,9 @@
}
}
item.questionTypeList = item.questionTypeList.filter((item) => item.data.length > 0)
+ if (!item.userName) {
+ item.userName = '-'
+ }
newData.push(item)
}
return newData.filter((item) => item.questionTypeList.length > 0)
diff --git a/packageCourse/pages/teachClass/detail/index.wxml b/packageCourse/pages/teachClass/detail/index.wxml
index cd31e34..63448bd 100644
--- a/packageCourse/pages/teachClass/detail/index.wxml
+++ b/packageCourse/pages/teachClass/detail/index.wxml
@@ -34,7 +34,7 @@
</view>
<view class="block-question">
<view class="block-question-list" wx:for="{{dialogList}}" wx:key="index">
- <view class="block-question-user">绛旈浜猴細{{ item.userNme }}</view>
+ <view class="block-question-user">绛旈浜猴細{{ item.userName }}</view>
<questionDom wx:if="{{item.questionTypeList.length > 0}}" questionList="{{item.questionTypeList}}" noCheckbox="{{false}}" is-preview="{{true}}" />
</view>
</view>
--
Gitblit v1.9.1