From 6df96b3e7a7da1985ee875e84711e9f15c5fbff0 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 24 十二月 2024 18:25:02 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageBookService/pages/psychologyAnswer/testdata/index.js | 46 +++----
packageCourse/pages/course/detail/index.js | 21 +++
packageCourse/pages/teachClass/index.wxml | 4
packageCourse/pages/course/detail/index.wxml | 252 +++++++++++++++++++++++++++++++++++------
packageCourse/pages/studentClass/index.js | 12 +
pages/cart/index.js | 2
packageBookService/pages/bookServices/examination/examination.js | 2
packageCourse/pages/course/index.js | 4
packageCourse/pages/course/index.wxss | 2
packageCourse/components/baseClass/index.js | 2
packageCourse/components/teaching/index.wxml | 4
packageBookService/pages/psychologyAnswer/questionList/index.wxml | 2
12 files changed, 271 insertions(+), 82 deletions(-)
diff --git a/packageBookService/pages/bookServices/examination/examination.js b/packageBookService/pages/bookServices/examination/examination.js
index 357ec3c..320d1a5 100644
--- a/packageBookService/pages/bookServices/examination/examination.js
+++ b/packageBookService/pages/bookServices/examination/examination.js
@@ -2460,7 +2460,7 @@
// 鍋氬畬浜嗕笖鍔犲叆浜嗙彮绾э紝鎻愪氦鍒癿essage
if (this.data.classList.length && this.data.joinGroup) {
this.data.classList.forEach(item => {
- if (item.linkProductDto.product.id == this.data.bookId)
+ if (item.linkProductDto.product.id == this.data.bookId && item.topicId)
this.newTopicMessage(item.topicId)
})
this.setinteractionInfo()
diff --git a/packageBookService/pages/psychologyAnswer/questionList/index.wxml b/packageBookService/pages/psychologyAnswer/questionList/index.wxml
index 8f7932a..d7fc744 100644
--- a/packageBookService/pages/psychologyAnswer/questionList/index.wxml
+++ b/packageBookService/pages/psychologyAnswer/questionList/index.wxml
@@ -19,7 +19,7 @@
</view>
</view>
<!-- 浠呮枃瀛� -->
- <view class="title-content text-space" wx:elif="{{item.stemStyle == 'Txt' && item.questionType != 'completion'}}">{{item.stem.stemTxt}}(绛旀浠呰嚜宸卞彲瑙�)</view>
+ <view class="title-content text-space" wx:elif="{{item.stemStyle == 'Txt' && item.questionType != 'completion'}}">{{item.stem.stemTxt}}</view>
<!-- 浠呭浘鐗� -->
<view wx:elif="{{item.stemStyle == 'Image'}}" class="title-content">
<image src="{{item.stem.stemImage}}" mode="aspectFit" />
diff --git a/packageBookService/pages/psychologyAnswer/testdata/index.js b/packageBookService/pages/psychologyAnswer/testdata/index.js
index 485404a..480f4af 100644
--- a/packageBookService/pages/psychologyAnswer/testdata/index.js
+++ b/packageBookService/pages/psychologyAnswer/testdata/index.js
@@ -1,7 +1,7 @@
var localData = {
"list": [{
"name": "娴嬫祴浣犵殑鐢熸椿鍝佽川",
- "title": "璇蜂粩缁嗛槄璇讳互涓嬮棶棰橈紝鍑綘鐨勭涓�鎰熻鍥炵瓟銆傝閫夋嫨涓庝綘鐩哥鐨勭瓟妗堬紝鍗充娇浣犳劅鍒颁笉澶‘瀹氾紝涔熻鍥炵瓟姣忎釜闂銆�",
+ "title": "璇蜂粩缁嗛槄璇讳互涓嬮棶棰橈紝鍑綘鐨勭涓�鎰熻鍥炵瓟銆傝閫夋嫨涓庝綘鐩哥鐨勭瓟妗堬紝鍗充娇浣犳劅鍒颁笉澶‘瀹氾紝涔熻鍥炵瓟姣忎釜闂銆�(绛旀浠呰嚜宸卞彲瑙�)",
"fromType": "json",
"scoreRules": [],
"scoreData": [{
@@ -45,8 +45,7 @@
}
]
],
- "list": [
- {
+ "list": [{
"analysisCon": "鐣�",
"id": "0C85D525",
"optionIndex": 0,
@@ -649,7 +648,7 @@
},
{
"name": "韬綋鐥囩姸闂嵎",
- "title": "涓嬮潰鏄笌蹇冪悊鍥犵礌鐩稿叧鐨勮韩浣撶棁鐘跺垪琛紝璇锋牴鎹嚜宸变笂涓�鍛ㄧ殑鎯呭喌锛屽湪鐩稿簲鐨勪綅缃笂鐢诲湀锛岀湅鐪嬪伐浣滈噺涓庤韩浣撶棁鐘朵箣闂存槸鍚﹀瓨鍦ㄨ仈绯汇��",
+ "title": "涓嬮潰鏄笌蹇冪悊鍥犵礌鐩稿叧鐨勮韩浣撶棁鐘跺垪琛紝璇锋牴鎹嚜宸变笂涓�鍛ㄧ殑鎯呭喌锛屽湪鐩稿簲鐨勪綅缃笂鐢诲湀锛岀湅鐪嬪伐浣滈噺涓庤韩浣撶棁鐘朵箣闂存槸鍚﹀瓨鍦ㄨ仈绯汇��(绛旀浠呰嚜宸卞彲瑙�)",
"fromType": "json",
"scoreRules": [],
"scoreData": [{
@@ -1662,7 +1661,7 @@
},
{
"name": "涓�鑸嚜鎴戞晥鑳芥劅閲忚〃",
- "title": "<p>涓�鑸嚜鎴戞晥鑳芥劅閲忚〃锛坓eneral self-efficacyscale锛孏SES锛夋渶鏃╃殑寰锋枃鐗堟槸鐢辨煆鏋楄嚜鐢卞ぇ瀛︾殑涓村簥鍜屽仴搴峰績鐞嗗瀹舵柦鐡︽辰锛圫chwarzer锛夋暀鎺堝強鍏跺悓浜嬩簬1981骞寸紪鍒跺畬鎴愮殑锛屽紑濮嬪叡鏈�20涓」鐩紝鍚庢潵鏀硅繘涓�10涓」鐩�傜洰鍓嶈閲忚〃鍦ㄥ浗闄呬笂琚箍娉涗娇鐢ㄣ�傝閲忚〃鐨勪腑鏂囩増鏈�鏃╃敱寮犲缓鏂板拰鏂界摝娉戒簬1995骞村湪涓浗棣欐腐涓�骞寸骇澶у鐢熶腑浣跨敤銆備腑鏂囩増鏈凡琚瘉鏄庡叿鏈夎壇濂界殑淇″害鍜屾晥搴︺��</p><p>浠ヤ笅10涓彞瀛愰兘鏄叧浜庝綘骞虫椂瀵硅嚜宸辩殑涓�鑸湅娉曪紝璇蜂綘鏍规嵁鑷繁鐨勫疄闄呮儏鍐碉紝閫夋嫨鍚堥�傜殑閫夐」銆傗��1鈥濊〃绀哄畬鍏ㄤ笉姝ｇ‘銆傗��2鈥濊〃绀烘湁鐐规纭紝鈥�3鈥濊〃绀哄鏁版纭紝鈥�4鈥濊〃绀哄畬鍏ㄦ纭�傜瓟妗堟病鏈夊閿欎箣鍒嗭紝瀵规瘡涓�涓彞瀛愭棤椤诲鑰冭檻銆�</p>",
+ "title": "<p>浠ヤ笅10涓彞瀛愰兘鏄叧浜庝綘骞虫椂瀵硅嚜宸辩殑涓�鑸湅娉曪紝璇蜂綘鏍规嵁鑷繁鐨勫疄闄呮儏鍐碉紝閫夋嫨鍚堥�傜殑閫夐」銆傗��1鈥濊〃绀哄畬鍏ㄤ笉姝ｇ‘銆傗��2鈥濊〃绀烘湁鐐规纭紝鈥�3鈥濊〃绀哄鏁版纭紝鈥�4鈥濊〃绀哄畬鍏ㄦ纭�傜瓟妗堟病鏈夊閿欎箣鍒嗭紝瀵规瘡涓�涓彞瀛愭棤椤诲鑰冭檻銆�(绛旀浠呰嚜宸卞彲瑙�)</p>",
"fromType": "json",
"scoreRules": [],
"scoreData": [{
@@ -1825,7 +1824,7 @@
},
{
"name": "瀛︿範鍔ㄥ姏鑷垜璇婃柇娴嬭瘯",
- "title": "杩欎釜閲忚〃涓昏涓轰簡甯姪浣犱簡瑙ｈ嚜宸卞湪瀛︿範鍔ㄦ満銆佸涔犲叴瓒ｃ�佸涔犵洰鏍囦笂鏄惁瀛樺湪鍥版壈锛屽叡20涓鐩�傝浣犳牴鎹嚜宸辩殑鎯呭喌锛屽疄浜嬫眰鏄湴瀵规瘡涓鐩仛鈥滄槸鈥濇垨鈥滃惁鈥濈殑鍥炵瓟銆�",
+ "title": "杩欎釜閲忚〃涓昏涓轰簡甯姪浣犱簡瑙ｈ嚜宸卞湪瀛︿範鍔ㄦ満銆佸涔犲叴瓒ｃ�佸涔犵洰鏍囦笂鏄惁瀛樺湪鍥版壈锛屽叡20涓鐩�傝浣犳牴鎹嚜宸辩殑鎯呭喌锛屽疄浜嬫眰鏄湴瀵规瘡涓鐩仛鈥滄槸鈥濇垨鈥滃惁鈥濈殑鍥炵瓟銆�(绛旀浠呰嚜宸卞彲瑙�)",
"fromType": "json",
"scoreRules": [],
"scoreData": [{
@@ -2113,7 +2112,7 @@
},
{
"name": "浜洪檯鍏崇郴缁煎悎璇婃柇琛�",
- "title": "鏈噺琛ㄥ叡28涓棶棰橈紝姣忎釜闂鍋氣�滄槸鈥濇垨鈥滃惁鈥濆洖绛斻�傝浣犺鐪熷畬鎴愶紝鐒跺悗鍙傜収璁″垎鍙婂垎鏋愭柟娉曪紝瀵规祴璇曠粨鏋滃仛鍑鸿В閲娿��",
+ "title": "鏈噺琛ㄥ叡28涓棶棰橈紝姣忎釜闂鍋氣�滄槸鈥濇垨鈥滃惁鈥濆洖绛斻�傝浣犺鐪熷畬鎴愶紝鐒跺悗鍙傜収璁″垎鍙婂垎鏋愭柟娉曪紝瀵规祴璇曠粨鏋滃仛鍑鸿В閲娿��(绛旀浠呰嚜宸卞彲瑙�)",
"fromType": "json",
"scoreRules": [],
"scoreData": [{
@@ -2497,7 +2496,7 @@
},
{
"name": "濠氬Щ绋冲畾鎬ф祴璇�",
- "title": "<p>浣犻�夋嫨濂界粓韬即渚ｄ簡鍚楋紵浣犳槸鎬庢牱鐪嬪緟濠氬Щ鐨勫憿锛熶笅闈㈢殑濠氬Щ绋冲畾鎬ф祴璇曞彲浠ュ府浣犳洿濂藉湴棰勬祴鏈潵濠氬Щ鐨勭ǔ瀹氭�с��</p><p>璇蜂粩缁嗛槄璇绘瘡閬撻锛岄�夋嫨绗﹀悎浣犵殑绛旀銆�</p>",
+ "title": "<p>浣犻�夋嫨濂界粓韬即渚ｄ簡鍚楋紵浣犳槸鎬庢牱鐪嬪緟濠氬Щ鐨勫憿锛熶笅闈㈢殑濠氬Щ绋冲畾鎬ф祴璇曞彲浠ュ府浣犳洿濂藉湴棰勬祴鏈潵濠氬Щ鐨勭ǔ瀹氭�с��</p><p>璇蜂粩缁嗛槄璇绘瘡閬撻锛岄�夋嫨绗﹀悎浣犵殑绛旀銆�(绛旀浠呰嚜宸卞彲瑙�)</p>",
"fromType": "json",
"scoreRules": [{
"index": "",
@@ -2664,7 +2663,7 @@
},
{
"name": "浣犵殑鎭嬬埍蹇冪悊鏄惁鎴愮啛锛�",
- "title": "璇疯鐪熼槄璇讳互涓嬪悇椤癸紝鏍规嵁鑷繁鐨勭湡瀹炴儏鍐典綔绛斻��",
+ "title": "璇疯鐪熼槄璇讳互涓嬪悇椤癸紝鏍规嵁鑷繁鐨勭湡瀹炴儏鍐典綔绛斻��(绛旀浠呰嚜宸卞彲瑙�)",
"fromType": "json",
"scoreRules": [],
"scoreData": [{
@@ -2702,8 +2701,7 @@
}
]
}],
- "list": [
- {
+ "list": [{
"analysisCon": "鐣�",
"id": "3P1E1B001",
"optionStyle": "Txt",
@@ -3093,7 +3091,7 @@
},
{
"name": "鍘嬪姏蹇冪悊娴嬭瘯",
- "title": "璇峰洖鎯充竴涓嬭嚜宸卞湪杩囧幓涓�涓湀鍐呮槸鍚﹀嚭鐜拌繃涓嬭堪鎯呭喌銆�",
+ "title": "璇峰洖鎯充竴涓嬭嚜宸卞湪杩囧幓涓�涓湀鍐呮槸鍚﹀嚭鐜拌繃涓嬭堪鎯呭喌銆�(绛旀浠呰嚜宸卞彲瑙�)",
"fromType": "json",
"scoreRules": [],
"scoreData": [{
@@ -3350,7 +3348,7 @@
},
{
"name": "鎶戦儊鑷瘎閲忚〃锛圫DS锛�",
- "title": "涓嬮潰鏈�20鏉℃枃瀛楋紝璇蜂粩缁嗛槄璇绘瘡涓�鏉★紝鎶婃剰鎬濆紕鏄庣櫧鍚庢牴鎹偍鏈�杩戜竴鏄熸湡鐨勬儏鍐甸�夋嫨閫傚綋鐨勯�夐」銆傗�淎鈥濊〃绀烘病鏈夋垨寰堝皯鏃堕棿鏈夛紝鈥淏鈥濊〃绀哄皬閮ㄥ垎鏃堕棿鏈夛紝鈥淐鈥濊〃绀虹浉褰撳鏃堕棿鏈夛紝鈥淒鈥濊〃绀虹粷澶ч儴鍒嗘椂闂撮兘鏈夈��",
+ "title": "涓嬮潰鏈�20鏉℃枃瀛楋紝璇蜂粩缁嗛槄璇绘瘡涓�鏉★紝鎶婃剰鎬濆紕鏄庣櫧鍚庢牴鎹偍鏈�杩戜竴鏄熸湡鐨勬儏鍐甸�夋嫨閫傚綋鐨勯�夐」銆傗�淎鈥濊〃绀烘病鏈夋垨寰堝皯鏃堕棿鏈夛紝鈥淏鈥濊〃绀哄皬閮ㄥ垎鏃堕棿鏈夛紝鈥淐鈥濊〃绀虹浉褰撳鏃堕棿鏈夛紝鈥淒鈥濊〃绀虹粷澶ч儴鍒嗘椂闂撮兘鏈夈��(绛旀浠呰嚜宸卞彲瑙�)",
"fromType": "json",
"scoreRules": [],
"scoreData": [{
@@ -3391,43 +3389,43 @@
}],
"optionList": [
[{
- "txt": "",
+ "txt": "娌℃湁鎴栧緢灏戞椂闂存湁",
"value": "A",
"score": 1
},
{
- "txt": "",
+ "txt": "灏忛儴鍒嗘椂闂存湁",
"value": "B",
"score": 2
},
{
- "txt": "",
+ "txt": "鐩稿綋澶氭椂闂存湁",
"value": "C",
"score": 3
},
{
- "txt": "",
+ "txt": "缁濆ぇ閮ㄥ垎鏃堕棿閮芥湁 ",
"value": "D",
"score": 4
}
],
[{
- "txt": "",
+ "txt": "娌℃湁鎴栧緢灏戞椂闂存湁",
"value": "A",
"score": 4
},
{
- "txt": "",
+ "txt": "灏忛儴鍒嗘椂闂存湁",
"value": "B",
"score": 3
},
{
- "txt": "",
+ "txt": "鐩稿綋澶氭椂闂存湁",
"value": "C",
"score": 2
},
{
- "txt": "",
+ "txt": "缁濆ぇ閮ㄥ垎鏃堕棿閮芥湁",
"value": "D",
"score": 1
}
@@ -3677,7 +3675,7 @@
},
{
"name": "浜嗚В浣犵殑鑱屼笟鍖栫▼搴�",
- "title": "鑱屼笟鍖栨寚涓�绉嶅伐浣滅姸鎬佺殑鏍囧噯鍖栥�佽鑼冨寲鍜屽埗搴﹀寲锛屽嵆鍦ㄥ悎閫傜殑鏃堕棿銆佸湴鐐圭敤鍚堥�傜殑鏂瑰紡瀹屾垚宸ヤ綔銆傝亴涓氬寲浣撶幇浜嗕竴涓汉鑳藉噯纭湴鎵紨濂借嚜宸辩殑鑱屼笟瑙掕壊锛屽敖鑱屽敖璐ｅ湴瀹屾垚鑷繁鐨勫伐浣溿�備綔涓轰竴鍚嶅嵆灏嗚蛋杩涜亴鍦虹殑澶у鐢燂紝浣犵殑鑱屼笟鍖栫▼搴︽湁澶氶珮鍛紵璇峰畬鎴愪笅鍒楁祴璇曘��",
+ "title": "鑱屼笟鍖栨寚涓�绉嶅伐浣滅姸鎬佺殑鏍囧噯鍖栥�佽鑼冨寲鍜屽埗搴﹀寲锛屽嵆鍦ㄥ悎閫傜殑鏃堕棿銆佸湴鐐圭敤鍚堥�傜殑鏂瑰紡瀹屾垚宸ヤ綔銆傝亴涓氬寲浣撶幇浜嗕竴涓汉鑳藉噯纭湴鎵紨濂借嚜宸辩殑鑱屼笟瑙掕壊锛屽敖鑱屽敖璐ｅ湴瀹屾垚鑷繁鐨勫伐浣溿�備綔涓轰竴鍚嶅嵆灏嗚蛋杩涜亴鍦虹殑澶у鐢燂紝浣犵殑鑱屼笟鍖栫▼搴︽湁澶氶珮鍛紵璇峰畬鎴愪笅鍒楁祴璇曘��(绛旀浠呰嚜宸卞彲瑙�)",
"fromType": "json",
"scoreRules": [],
"scoreData": [{
@@ -4036,7 +4034,7 @@
},
{
"name": "鑱屼笟鑳藉姏娴嬭瘯",
- "title": "鏍规嵁浣犵殑瀹為檯鎯呭喌锛屽涓嬮潰姣忕娲诲姩鍋氬嚭璇勫畾銆�",
+ "title": "鏍规嵁浣犵殑瀹為檯鎯呭喌锛屽涓嬮潰姣忕娲诲姩鍋氬嚭璇勫畾銆�(绛旀浠呰嚜宸卞彲瑙�)",
"fromType": "json",
"scoreRules": [],
"scoreData": [{
@@ -5170,7 +5168,7 @@
},
{
"name": "濞佸粔鏂垱閫犲姏鍊惧悜閲忚〃",
- "title": "<p>杩欐槸涓�浠藉府鍔╀綘浜嗚В鑷繁鍒涢�犲姏鐨勮〃鍗曘�傚鏋滀綘鍙戠幇涓嬪垪鏌愪簺鍙ュ瓙鎻忚堪鐨勬儏褰㈠緢閫傚悎浣狅紝灏遍�夋嫨鈥滃畬鍏ㄧ鍚堚�濓紝璁�3鍒嗭紱濡傛灉鏌愪簺鍙ュ瓙鍙槸鍦ㄩ儴鍒嗘椂鍊欓�傚悎浣狅紝鍒欓�夋嫨鈥滈儴鍒嗙鍚堚�濓紝璁�2鍒嗭紱濡傛灉鏌愪簺鍙ュ瓙瀵逛綘鏉ヨ鏍规湰鏄笉鍙兘鐨勶紝鍒欓�夋嫨鈥滃畬鍏ㄤ笉绗︹�濓紝璁�1鍒嗐��</p><p>娉ㄦ剰浜嬮」锛氭瘡涓�棰橀兘瑕佸仛锛屼笉瑕佽姳澶鏃堕棿鍘绘�濊�冿紱鎵�鏈夐鐩兘娌℃湁姝ｇ‘绛旀锛屽嚟浣犺瀹屾瘡涓�鍙ョ殑绗竴鍗拌薄浣滅瓟锛涜櫧鐒舵病鏈夋椂闂撮檺鍒讹紝浣嗗敖鍙兘浠ヨ緝蹇殑閫熷害瀹屾垚锛岃秺蹇秺濂斤紱鍑嚜宸辩殑鐪熷疄鎰熷彈浣滅瓟銆�</p>",
+ "title": "<p>杩欐槸涓�浠藉府鍔╀綘浜嗚В鑷繁鍒涢�犲姏鐨勮〃鍗曘�傛瘡涓�棰橀兘瑕佸仛锛屼笉瑕佽姳澶鏃堕棿鍘绘�濊�冿紱鎵�鏈夐鐩兘娌℃湁姝ｇ‘绛旀锛屽嚟浣犺瀹屾瘡涓�鍙ョ殑绗竴鍗拌薄浣滅瓟锛涜櫧鐒舵病鏈夋椂闂撮檺鍒讹紝浣嗗敖鍙兘浠ヨ緝蹇殑閫熷害瀹屾垚锛岃秺蹇秺濂斤紱鍑嚜宸辩殑鐪熷疄鎰熷彈浣滅瓟銆�(绛旀浠呰嚜宸卞彲瑙�)</p>",
"fromType": "json",
"scoreRules": [],
"scoreData": [{
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/course/detail/index.js b/packageCourse/pages/course/detail/index.js
index bdb935c..0e7815d 100644
--- a/packageCourse/pages/course/detail/index.js
+++ b/packageCourse/pages/course/detail/index.js
@@ -15,6 +15,7 @@
startTime: '',
endTime: '',
className: '',
+ isShow: "",
count: null,
classList: [],
searchKey: '',
@@ -179,13 +180,15 @@
// 鎵撳紑閫夋嫨鏃ユ湡
openDateStart() {
this.setData({
- visibleStart: true
+ visibleStart: true,
+ isShow: 'none',
})
},
openDateEnd() {
this.setData({
- visibleEnd: true
+ visibleEnd: true,
+ isShow: 'none'
})
},
@@ -197,6 +200,7 @@
const dateStr = moment(value).format('YYYY-MM-DD')
this.setData({
startTime: dateStr,
+ isShow: ''
});
},
@@ -207,6 +211,7 @@
const dateStr = moment(value).format('YYYY-MM-DD')
this.setData({
endTime: dateStr,
+ isShow: ''
});
},
@@ -219,6 +224,8 @@
// 鐢宠鎻愪氦鐝骇
submitClass() {
+ const bTime = moment(this.data.startTime).valueOf()
+ const eTime = moment(this.data.endTime).valueOf()
if (!this.data.className) {
wx.showToast({
title: '璇峰～鍐欒绋嬪悕绉�',
@@ -238,6 +245,14 @@
if (!this.data.startTime || !this.data.endTime) {
wx.showToast({
title: '璇烽�夋嫨鐝骇鏈夋晥鏈�',
+ duration: 1000,
+ icon: 'none',
+ })
+ return false
+ }
+ if (bTime && eTime && eTime < bTime) {
+ wx.showToast({
+ title: '璇烽�夋嫨鐝纭殑鐝骇鏈夋晥鏈�',
duration: 1000,
icon: 'none',
})
@@ -273,7 +288,7 @@
wx.showToast({
title: '鐢宠寮�鐝嚭閿�',
duration: 1000,
- icon: 'err',
+ icon: 'none',
})
this.setData({
visible: false
diff --git a/packageCourse/pages/course/detail/index.wxml b/packageCourse/pages/course/detail/index.wxml
index b7ca226..341b1b2 100644
--- a/packageCourse/pages/course/detail/index.wxml
+++ b/packageCourse/pages/course/detail/index.wxml
@@ -6,9 +6,30 @@
<view wx:if="{{!courseLoading}}">
<view class="ID-State">
<text class="ID">ID: {{detail.id}}</text>
- <t-tag class="margin-16" size='large' wx:if="{{detail.applyState == 'WaitAudit'}}" variant="light" theme="warning">瀹℃牳涓�</t-tag>
- <t-tag class="margin-16" size='large' wx:if="{{detail.applyState == 'Reject'}}" variant="light" theme="danger">鏈�氳繃</t-tag>
- <t-tag class="margin-16" size='large' wx:if="{{detail.applyState == 'Normal'}}" variant="light" theme="success">浣跨敤涓�</t-tag>
+ <t-tag
+ class="margin-16"
+ size="large"
+ wx:if="{{detail.applyState == 'WaitAudit'}}"
+ variant="light"
+ theme="warning"
+ >瀹℃牳涓�</t-tag
+ >
+ <t-tag
+ class="margin-16"
+ size="large"
+ wx:if="{{detail.applyState == 'Reject'}}"
+ variant="light"
+ theme="danger"
+ >鏈�氳繃</t-tag
+ >
+ <t-tag
+ class="margin-16"
+ size="large"
+ wx:if="{{detail.applyState == 'Normal'}}"
+ variant="light"
+ theme="success"
+ >浣跨敤涓�</t-tag
+ >
</view>
<view class="statics">
<view class="classCout">
@@ -29,8 +50,18 @@
<text>浣滆�咃細{{bookData.author}}</text>
<text>ISBN锛歿{bookData.isbn}}</text>
</view>
- <image wx:if="{{bookData.icon}}" class="bookIcon" src="{{bookData.icon}}" mode="" />
- <image wx:else class="bookIcon" src="/static/images/default-book-img.png" mode="" />
+ <image
+ wx:if="{{bookData.icon}}"
+ class="bookIcon"
+ src="{{bookData.icon}}"
+ mode=""
+ />
+ <image
+ wx:else
+ class="bookIcon"
+ src="/static/images/default-book-img.png"
+ mode=""
+ />
</view>
</view>
</view>
@@ -47,39 +78,123 @@
<!-- 鐝骇绠＄悊 -->
<view class="classBox" wx:else>
<view class="header">
- <t-search style="flex:1" value="{{searchKey}}" bind:clear="changeHandle" bind:submit="changeHandle" placeholder="鎼滅储鐝骇鍚嶇О" clearable />
- <t-button bindtap="newClass" size="small" style="margin-left: 15rpx;">寮�鐝�</t-button>
+ <t-search
+ style="flex: 1"
+ value="{{searchKey}}"
+ bind:clear="changeHandle"
+ bind:submit="changeHandle"
+ placeholder="鎼滅储鐝骇鍚嶇О"
+ clearable
+ />
+ <t-button bindtap="newClass" size="small" style="margin-left: 15rpx"
+ >寮�鐝�</t-button
+ >
</view>
- <view class="contentList" wx:if="{{classList.length > 0 && !classLoading}}">
- <scroll-view class="scroll" class="content" bind:scroll="onPageScroll" model:scroll-top="{{setScrollValue}}" scroll-y refresher-enabled="{{true}}" lower-threshold="{{80}}" refresher-threshold="{{80}}" refresher-default-style="none" refresher-triggered="{{triggered}}" bindrefresherpulling="{{refresh.onPulling}}" bindrefresherrefresh="onPullDownRefresh" bindscrolltolower="onReachBottom">
+ <view
+ class="contentList"
+ wx:if="{{classList.length > 0 && !classLoading}}"
+ >
+ <scroll-view
+ class="scroll"
+ class="content"
+ bind:scroll="onPageScroll"
+ model:scroll-top="{{setScrollValue}}"
+ scroll-y
+ refresher-enabled="{{true}}"
+ lower-threshold="{{80}}"
+ refresher-threshold="{{80}}"
+ refresher-default-style="none"
+ refresher-triggered="{{triggered}}"
+ bindrefresherpulling="{{refresh.onPulling}}"
+ bindrefresherrefresh="onPullDownRefresh"
+ bindscrolltolower="onReachBottom"
+ >
<view slot="refresher" class="refresh-container">
<view class="loading">
- <t-loading theme="circular" size="40rpx" text="姝ｅ湪鍒锋柊..." class="wrapper" />
+ <t-loading
+ theme="circular"
+ size="40rpx"
+ text="姝ｅ湪鍒锋柊..."
+ class="wrapper"
+ />
</view>
</view>
- <view class="listClass" wx:for="{{classList}}" wx:key="index" data-class-id="{{item.id}}" data-item="{{item}}" bindtap="todetail">
+ <view
+ class="listClass"
+ wx:for="{{classList}}"
+ wx:key="index"
+ data-class-id="{{item.id}}"
+ data-item="{{item}}"
+ bindtap="todetail"
+ >
<view class="titleBox">
<text class="className">{{item.name}}</text>
- <text class="classId" style="color: #999; font-size: 12px;"> ID: {{item.id}}</text>
+ <text class="classId" style="color: #999; font-size: 12px">
+ ID: {{item.id}}</text
+ >
</view>
<view class="infoBox">
- <text class="classTag" wx:if="{{item.applyState == 'WaitAudit'}}" style="color: #ef9f29">鐘舵��: 瀹℃牳涓�</text>
- <text class="classTag" wx:if="{{item.applyState == 'Normal'}}" style="color: #1dbd11">鐘舵��: 杩涜涓�</text>
- <text class="classTag" wx:if="{{item.applyState == 'Reject'}}" style="color: red">鐘舵��: 鏈�氳繃</text>
- <t-icon bindtap="delClass" data-del-id="{{item.id}}" class="delete" wx:if="{{item.applyState == 'Reject'}}" name="delete" color="red" size='18px' />
+ <text
+ class="classTag"
+ wx:if="{{item.applyState == 'WaitAudit'}}"
+ style="color: #ef9f29"
+ >鐘舵��: 瀹℃牳涓�</text
+ >
+ <text
+ class="classTag"
+ wx:if="{{item.applyState == 'Normal'}}"
+ style="color: #1dbd11"
+ >鐘舵��: 杩涜涓�</text
+ >
+ <text
+ class="classTag"
+ wx:if="{{item.applyState == 'Reject'}}"
+ style="color: red"
+ >鐘舵��: 鏈�氳繃</text
+ >
+ <t-icon
+ bindtap="delClass"
+ data-del-id="{{item.id}}"
+ class="delete"
+ wx:if="{{item.applyState == 'Reject'}}"
+ name="delete"
+ color="red"
+ size="18px"
+ />
<view wx:if="{{item.applyState == 'Reject'}}" class="reason">
<text> 鎷掔粷鍘熷洜锛�</text>
- <t-tag style="margin-left: 0;" bind:tap="showDialog" data-item="{{item}}" class="margin-16 replay" theme="danger">鐐瑰嚮鏌ョ湅</t-tag>
+ <t-tag
+ style="margin-left: 0"
+ bind:tap="showDialog"
+ data-item="{{item}}"
+ class="margin-16 replay"
+ theme="danger"
+ >鐐瑰嚮鏌ョ湅</t-tag
+ >
</view>
<!-- <text class="classTag" wx:if="{{item.applyState == 'Reject'}}" style="color: red">鎷掔粷鍘熷洜锛歿{ item.reason != '' ? item.reason : '-' }}</text> -->
- <text class="classTag">鐝骇浜烘暟: {{ item.memberCount }} / {{ item.maxUserCount }}</text>
- <text class="classTag">鏈夋晥鏈燂細{{ item.beginDate }} - {{ item.endDate }}</text>
+ <text class="classTag"
+ >鐝骇浜烘暟: {{ item.memberCount }} / {{ item.maxUserCount
+ }}</text
+ >
+ <text class="classTag"
+ >鏈夋晥鏈燂細{{ item.beginDate }} - {{ item.endDate }}</text
+ >
</view>
</view>
<view class="bottom-loading" wx:if="{{bottomLoading}}">
- <t-loading theme="circular" size="40rpx" text="鍔犺浇涓�..." class="wrapper" />
+ <t-loading
+ theme="circular"
+ size="40rpx"
+ text="鍔犺浇涓�..."
+ class="wrapper"
+ />
</view>
- <view class="bottom-loading" style="color: #ccc;font-size: 28rpx;" wx:if="{{isMoreData}}">
+ <view
+ class="bottom-loading"
+ style="color: #ccc; font-size: 28rpx"
+ wx:if="{{isMoreData}}"
+ >
<text>娌℃湁鏇村浜�</text>
</view>
</scroll-view>
@@ -101,51 +216,112 @@
<view class="classInfo">
<view class="c-name">
<text>鐝骇鍚嶇О</text>
- <t-input value="{{className}}" bindchange="onCourseNameInput" borderless clearable placeholder="璇疯緭鍏ョ彮绾у悕绉�" />
+ <t-input
+ value="{{className}}"
+ bindchange="onCourseNameInput"
+ borderless
+ clearable
+ placeholder="璇疯緭鍏ョ彮绾у悕绉�"
+ />
</view>
<view class="c-desc">
<text>鐝骇浜烘暟</text>
- <t-input value="{{count}}" bindchange="onCourseDescInput" borderless placeholder="璇疯緭鍏ョ彮绾т汉鏁�" />
+ <t-input
+ value="{{count}}"
+ type="number"
+ bindchange="onCourseDescInput"
+ borderless
+ placeholder="璇疯緭鍏ョ彮绾т汉鏁�"
+ />
</view>
<view class="c-date">
<text>鐝骇鏈夋晥鏈�</text>
<view class="dateBox">
<view>
- <t-input value="{{startTime}}" readonly borderless bindtap="openDateStart" placeholder="璇烽�夋嫨寮�濮嬫椂闂�" />
- <t-calendar visible="{{visibleStart}}" bind:confirm="handleConfirmStart" />
+ <t-input
+ style="display:{{isShow}}"
+ value="{{startTime}}"
+ readonly
+ borderless
+ bindtap="openDateStart"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�"
+ />
+ <t-calendar
+ visible="{{visibleStart}}"
+ bind:confirm="handleConfirmStart"
+ />
</view>
<view>~</view>
<view>
- <t-input value="{{endTime}}" readonly borderless bindtap="openDateEnd" placeholder="璇烽�夋嫨缁撴潫鏃堕棿" />
- <t-calendar visible="{{visibleEnd}}" bind:confirm="handleConfirmEnd" />
+ <t-input
+ value="{{endTime}}"
+ style="display:{{isShow}}"
+ readonly
+ borderless
+ bindtap="openDateEnd"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿"
+ />
+ <t-calendar
+ visible="{{visibleEnd}}"
+ bind:confirm="handleConfirmEnd"
+ />
</view>
</view>
</view>
</view>
<view class="classSubmit">
- <t-button style="padding: 0 25px; margin:0 15px;" size="small" bindtap="cancle" variant="outline">鍙栨秷</t-button>
- <t-button style="padding: 0 25px; margin:0;" size="small" bindtap="submitClass">纭</t-button>
+ <t-button
+ style="padding: 0 25px; margin: 0 15px"
+ size="small"
+ bindtap="cancle"
+ variant="outline"
+ >鍙栨秷</t-button
+ >
+ <t-button
+ style="padding: 0 25px; margin: 0"
+ size="small"
+ bindtap="submitClass"
+ >纭</t-button
+ >
</view>
</view>
</t-popup>
- <t-dialog visible="{{showContentOnly}}" bind:confirm="closeDialog" close-on-overlay-click>
- <view slot="content" class="reasonContent">
- {{reason}}
- </view>
- <view slot="confirm-btn" style="width: 100%;">
- <t-button style="color: #ff6d00;border-top: 1px solid #eee ;" variant="text" bindtap="closeDialog" size="large" block t-class="external-class">鐭ラ亾浜�</t-button>
+ <t-dialog
+ visible="{{showContentOnly}}"
+ bind:confirm="closeDialog"
+ close-on-overlay-click
+ >
+ <view slot="content" class="reasonContent"> {{reason}} </view>
+ <view slot="confirm-btn" style="width: 100%">
+ <t-button
+ style="color: #ff6d00; border-top: 1px solid #eee"
+ variant="text"
+ bindtap="closeDialog"
+ size="large"
+ block
+ t-class="external-class"
+ >鐭ラ亾浜�</t-button
+ >
</view>
</t-dialog>
</view>
</view>
<view class="tabbar-bottom">
- <view class="{{tabVal == 'base'?'tab-pubItem activeTab':'tab-pubItem'}}" data-str="base" bindtap="tabActive">
+ <view
+ class="{{tabVal == 'base'?'tab-pubItem activeTab':'tab-pubItem'}}"
+ data-str="base"
+ bindtap="tabActive"
+ >
<t-icon class="tabIcon" name="home" size="24px" />
<text class="text">鍩烘湰淇℃伅</text>
</view>
- <view class="{{tabVal == 'class'?'tab-pubItem activeTab':'tab-pubItem'}}" data-str="class" bindtap="tabActive">
+ <view
+ class="{{tabVal == 'class'?'tab-pubItem activeTab':'tab-pubItem'}}"
+ data-str="class"
+ bindtap="tabActive"
+ >
<t-icon class="tabIcon" name="file-setting" size="24px" />
<text class="text">鐝骇绠＄悊</text>
</view>
</view>
-</view>
\ No newline at end of file
+</view>
diff --git a/packageCourse/pages/course/index.js b/packageCourse/pages/course/index.js
index 2579567..9a0a0c8 100644
--- a/packageCourse/pages/course/index.js
+++ b/packageCourse/pages/course/index.js
@@ -289,8 +289,8 @@
app.MG.edu
.updateCourse({
courseId: this.data.currentCourse.id,
- name: this.data.currentCourse.name,
- description: this.data.currentCourse.desc
+ name: this.data.courseName,
+ description: this.data.courseDesc,
})
.then((res) => {
app.MG.edu
diff --git a/packageCourse/pages/course/index.wxss b/packageCourse/pages/course/index.wxss
index dc113a7..326ee90 100644
--- a/packageCourse/pages/course/index.wxss
+++ b/packageCourse/pages/course/index.wxss
@@ -363,4 +363,4 @@
display: flex;
justify-content: flex-end;
align-items: center;
-}
\ No newline at end of file
+}
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>
diff --git a/pages/cart/index.js b/pages/cart/index.js
index b36954d..889a690 100644
--- a/pages/cart/index.js
+++ b/pages/cart/index.js
@@ -131,7 +131,7 @@
if (item.saleMethod.type == 'createProductItemSaleMethod' || item.saleMethod.type == 'createProductFolderSaleMethod') {
if (item.linkCmsItems[0].refCode == 'questionBank') {
- item.type = '浜戞祴璇�'
+ item.typeTxt = '浜戞祴璇�'
item.productType = '鍥句功鏈嶅姟-浜戞祴璇�'
} else {
item.typeTxt = '浜戝涔�'
--
Gitblit v1.9.1