From d71ed79914076dbf7d9a1613402d6dba54f74482 Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期一, 23 十二月 2024 14:20:47 +0800
Subject: [PATCH] 11111
---
packageCourse/pages/teachClass/index.wxml | 4 ++--
packageCourse/pages/studentClass/index.js | 12 +++++++-----
packageCourse/components/baseClass/index.js | 2 +-
packageCourse/components/teaching/index.wxml | 4 +---
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/packageCourse/components/baseClass/index.js b/packageCourse/components/baseClass/index.js
index 43b9f53..6b5c3fe 100644
--- a/packageCourse/components/baseClass/index.js
+++ b/packageCourse/components/baseClass/index.js
@@ -37,7 +37,7 @@
if (data) {
this.setData({
userData: JSON.parse(data),
- defaultCmsPath: this.properties.bookRefCode
+ defaultCmsPath: this.properties.bookRefCode != 'null' ? 'jsek_digitalTextbooks' : 'defaultGoodsStore3'
})
}
this.getData()
diff --git a/packageCourse/components/teaching/index.wxml b/packageCourse/components/teaching/index.wxml
index 7d11dd6..fdf4bd0 100644
--- a/packageCourse/components/teaching/index.wxml
+++ b/packageCourse/components/teaching/index.wxml
@@ -10,9 +10,7 @@
<view class="questionInfo">
<view class="questionCount">
<text style="color: #ff6d00">{{ item.subList.length }}</text>
- <text> /</text>
- <text style="color: #67c23a"> {{ currentClass.memberCount }}</text>
- <text style="margin-left: 20rpx;color: #999;font-size:24rpx">(宸茬瓟/鍏ㄩ儴)</text>
+ <text style="margin-left: 20rpx;color: #999;font-size:24rpx">(宸茬瓟浜烘暟)</text>
</view>
<view class="questionDate">
{{item.updateDate}}
diff --git a/packageCourse/pages/studentClass/index.js b/packageCourse/pages/studentClass/index.js
index 7ad0e99..e18f442 100644
--- a/packageCourse/pages/studentClass/index.js
+++ b/packageCourse/pages/studentClass/index.js
@@ -169,12 +169,12 @@
},
// 鑾峰彇鏁欐潗璇︽儏
- async getBookDetail(shopId) {
+ async getBookDetail(shopId, path) {
let query = {
- path: 'jsek_digitalTextbooks',
+ path,
queryType: '*',
productId: String(shopId),
- storeInfo: 'jsek_digitalTextbooks',
+ storeInfo: path,
coverSize: {
height: 300,
width: 210
@@ -194,7 +194,9 @@
classId,
item
} = e.currentTarget.dataset
- const bookData = await this.getBookDetail(item.linkProductDto?.product?.id)
+ const bookRefCode = item.linkProductDto?.product?.refCode
+ const path = bookRefCode ? 'jsek_digitalTextbooks' : 'defaultGoodsStore3'
+ const bookData = await this.getBookDetail(item.linkProductDto?.product?.id, path)
if (item.userState == 'WaitValid' || item.userState == 'Reject') {
wx.showToast({
title: item.userState == 'WaitValid' ? '瀹℃牳涓�' : '鏈�氳繃',
@@ -204,7 +206,7 @@
return false
}
wx.navigateTo({
- url: '/packageCourse/pages/teachClass/index?classId=' + classId + '&bookId=' + bookData.id + '&author=' + bookData.author + '&isbn=' + bookData.isbn + '&rootCmsItemId=' + bookData.rootCmsItemId,
+ url: '/packageCourse/pages/teachClass/index?classId=' + classId + '&bookId=' + bookData.id + '&author=' + bookData.author + '&isbn=' + bookData.isbn + '&rootCmsItemId=' + bookData.rootCmsItemId + '&bookRefCode=' + bookRefCode,
})
},
diff --git a/packageCourse/pages/teachClass/index.wxml b/packageCourse/pages/teachClass/index.wxml
index 0ff42df..689dbb9 100644
--- a/packageCourse/pages/teachClass/index.wxml
+++ b/packageCourse/pages/teachClass/index.wxml
@@ -10,7 +10,7 @@
<studentManage classId="{{classId}}" bookRefCode="{{defaultCmsPath}}" />
</view>
<!-- 鏁欏浜掑姩 -->
- <view class="teachBox" wx:if="{{tabVal == 'teach'&& userData.role == 'Teacher'}}">
+ <view class="teachBox" wx:if="{{tabVal == 'teach'}}">
<Teach classId="{{classId}}" bookId="{{bookId}}" rootCmsItemId="{{rootCmsItemId}}" />
</view>
</view>
@@ -23,7 +23,7 @@
<t-icon class="tabIcon" name="file-setting" size="24px" />
<text class="text">瀛︾敓绠＄悊</text>
</view>
- <view wx:if="{{ userData.role == 'Teacher'}}" class="{{tabVal == 'teach'?'tab-pubItem activeTab':'tab-pubItem'}}" data-str="teach" bindtap="tabActive">
+ <view class="{{tabVal == 'teach'?'tab-pubItem activeTab':'tab-pubItem'}}" data-str="teach" bindtap="tabActive">
<t-icon class="tabIcon" name="system-setting" size="24px" />
<text class="text">鏁欏浜掑姩</text>
</view>
--
Gitblit v1.9.1