From aef06b129be7a3a12ac097db8e372b0cb33c6c42 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 02 四月 2024 09:15:19 +0800
Subject: [PATCH] 我的建议，笔记bug修改
---
packageBookService/pages/bookServices/list/index.wxml | 3
packageBookService/pages/bookServices/detail/components/note/note.wxss | 4
packageBookService/pages/bookServices/examination/questionList/index.wxml | 2
packageBookService/pages/bookServices/examination/examination.js | 262 +++++++++++++++-----------------
packageBookService/pages/bookServices/detail/components/note/note.js | 24 +-
packageBookService/pages/bookServices/detail/components/suggest/suggest.wxml | 2
packageBookService/pages/bookServices/list/index.js | 31 +--
packageBookService/pages/bookServices/detail/components/suggest/suggest.wxss | 7
packageBookService/pages/bookServices/detail/index.wxss | 4
packageBookService/pages/bookServices/detail/components/suggest/suggest.js | 2
packageBookService/pages/bookServices/detail/index.js | 103 +++++++-----
11 files changed, 236 insertions(+), 208 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/note/note.js b/packageBookService/pages/bookServices/detail/components/note/note.js
index 5f4fb5e..3d9d9e0 100644
--- a/packageBookService/pages/bookServices/detail/components/note/note.js
+++ b/packageBookService/pages/bookServices/detail/components/note/note.js
@@ -63,7 +63,6 @@
})
},
openDialog() {
- console.log(this.properties.bookInfo.name);
this.setData({
submitTitle: this.properties.bookInfo.name,
showNoteDialog: true
@@ -93,12 +92,14 @@
},
// 寮圭獥纭畾鎸夐挳
confirmSuggest() {
- if (!this.data.submitTitle) {
+ const submitTitle = this.data.submitTitle.trim()
+ const textvalue = this.data.textvalue.trim()
+ if (!submitTitle.length) {
return wx.showToast({
icon: 'error',
title: '璇峰～鍐欑瑪璁版爣棰�',
})
- } else if (!this.data.textvalue) {
+ } else if (!textvalue.length) {
return wx.showToast({
icon: 'error',
title: '璇峰～鍐欑瑪璁板唴瀹�',
@@ -240,13 +241,15 @@
messageIds.push(id)
wx.showModal({
title: '鎻愮ず',
- content: '纭鍒犻櫎璇ョ瑪璁板悧锛�',//editable濡傛灉涓簍rue锛岃繖灏辨槸杈撳叆妗嗙殑鍐呭
- editable: false,//鏄惁鏄剧ず杈撳叆妗�
- placeholderText: '璇疯緭鍏ュ唴瀹瑰惂',//杈撳叆妗嗙殑榛樿鍐呭
+ content: '纭鍒犻櫎璇ョ瑪璁板悧锛�', //editable濡傛灉涓簍rue锛岃繖灏辨槸杈撳叆妗嗙殑鍐呭
+ editable: false, //鏄惁鏄剧ず杈撳叆妗�
+ placeholderText: '璇疯緭鍏ュ唴瀹瑰惂', //杈撳叆妗嗙殑榛樿鍐呭
success: (res) => {
if (res.confirm) {
app.MG.ugc
- .delTopicMessage({ messageIds })
+ .delTopicMessage({
+ messageIds
+ })
.then((res) => {
wx.showToast({
title: '鍒犻櫎鎴愬姛',
@@ -277,7 +280,10 @@
submitTitle: note.name,
noteId: note.id
})
- this.openDialog()
+ console.log(note.name, this.data.submitTitle);
+ this.setData({
+ showNoteDialog: true
+ })
},
// 缂栬緫绗旇鎺ュ彛
updateNote() {
@@ -323,4 +329,4 @@
})
}
}
-})
+})
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/components/note/note.wxss b/packageBookService/pages/bookServices/detail/components/note/note.wxss
index 0c36147..8e0e378 100644
--- a/packageBookService/pages/bookServices/detail/components/note/note.wxss
+++ b/packageBookService/pages/bookServices/detail/components/note/note.wxss
@@ -149,4 +149,8 @@
margin-top: 100rpx;
display: flex;
justify-content: center;
+}
+
+.t-input__placeholder {
+ font-size: 28rpx !important
}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/components/suggest/suggest.js b/packageBookService/pages/bookServices/detail/components/suggest/suggest.js
index aeb70a6..e12a9ac 100644
--- a/packageBookService/pages/bookServices/detail/components/suggest/suggest.js
+++ b/packageBookService/pages/bookServices/detail/components/suggest/suggest.js
@@ -16,7 +16,7 @@
},
data: {
- inputStyle: 'border: 2rpx solid rgba(220,220,220,1);border-radius: 12rpx; padding:16rpx',
+ inputStyle: 'border: 2rpx solid rgba(220,220,220,1);border-radius: 12rpx; padding:16rpx;font-size: 24rpx;',
placeholderstyle: 'font-size:28rpx',
dialogKey: '',
showWithInput: false,
diff --git a/packageBookService/pages/bookServices/detail/components/suggest/suggest.wxml b/packageBookService/pages/bookServices/detail/components/suggest/suggest.wxml
index 83718fb..c122654 100644
--- a/packageBookService/pages/bookServices/detail/components/suggest/suggest.wxml
+++ b/packageBookService/pages/bookServices/detail/components/suggest/suggest.wxml
@@ -29,7 +29,6 @@
</view>
<view class="phone-input">
<t-input
- clearable
value="{{inputvalue}}"
slot="content"
label=""
@@ -39,6 +38,7 @@
maxlength="{{11}}"
class="phone"
style="{{inputStyle}}"
+ placeholder-class="t-input__placeholder input-placeholder"
/>
</view>
<view style="width: 100%">
diff --git a/packageBookService/pages/bookServices/detail/components/suggest/suggest.wxss b/packageBookService/pages/bookServices/detail/components/suggest/suggest.wxss
index af76083..7e38dd5 100644
--- a/packageBookService/pages/bookServices/detail/components/suggest/suggest.wxss
+++ b/packageBookService/pages/bookServices/detail/components/suggest/suggest.wxss
@@ -1,5 +1,10 @@
/* pages/bookServices/detail/components/suggest/suggest.wxss */
-.t-input__placeholder {
+
+
+
+
+.t-input__wrap .t-input__content,
+.t-input__control {
font-size: 28rpx !important;
}
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 9294e5e..94ce20c 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -1010,45 +1010,49 @@
wx.showLoading({
title: '鍔犺浇涓�',
})
- // let role = userStore.userInfo ? userStore.userInfo.role : null
- // if (role) {
- // if (role == 'Teacher') {
- // 鐢宠鏁欏璧勬簮
- let query = {
- topicIdOrRefCode: 'productDownLoad',
- type: 'applyForDownload',
- state: 'WaitAudit',
- cmsTypeRefCode: '',
- newDataListRequest: [],
- name: this.data.bookDetail.name, // name涓虹敵璇风殑涔︽湰鍚嶇О
- content: JSON.stringify([{
- name: this.data.bookDetail.name,
- id: this.data.bookDetail.id,
- // defaultSaleMethodId: bookData.value.defaultSaleMethodId,
- icon: this.data.bookDetail.icon
- }])
- }
- app.MG.ugc.newTopicMessage(query).then(async (res) => {
- if (res) {
- wx.showToast({
- title: '鐢宠宸叉彁浜�',
- duration: 2000,
+ let role = wx.getStorageSync(app.config.userInfoKey).role
+ if (role) {
+ debugger
+ if (role == 'Teacher') {
+ // 鐢宠鏁欏璧勬簮
+ let query = {
+ topicIdOrRefCode: 'productDownLoad',
+ type: 'applyForDownload',
+ state: 'WaitAudit',
+ cmsTypeRefCode: '',
+ newDataListRequest: [],
+ name: this.data.bookDetail.name, // name涓虹敵璇风殑涔︽湰鍚嶇О
+ content: JSON.stringify([{
+ name: this.data.bookDetail.name,
+ id: this.data.bookDetail.id,
+ // defaultSaleMethodId: bookData.value.defaultSaleMethodId,
+ icon: this.data.bookDetail.icon
+ }])
+ }
+ app.MG.ugc.newTopicMessage(query).then(async (res) => {
+ if (res) {
+ wx.showToast({
+ title: '鐢宠宸叉彁浜�',
+ duration: 2000,
+ })
+ }
+ await this.getApplyInfo(this.data.bookDetail.id)
+ })
+ } else {
+ wx.showModal({
+ title: '灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�',
+ content: '璇峰厛杩涜鏁欏笀璁よ瘉锛�',
+ complete: (res) => {
+ if (res.cancel) {}
+ if (res.confirm) {
+ wx.navigateTo({
+ url: '/packageDomain/pages/teacherCertification/index',
+ })
+ }
+ }
})
}
- await this.getApplyInfo(this.data.bookDetail.id)
- })
- // } else {
- // ElMessageBox.confirm('璇峰厛杩涜鏁欏笀璁よ瘉锛�', '灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�', {
- // confirmButtonText: '鍘昏璇�',
- // cancelButtonText: '鍙栨秷',
- // type: 'warning'
- // })
- // .then(() => {
- // isShow.value = true
- // })
- // .catch(() => { })
- // }
- // }
+ }
},
// 鏁欏璧勬簮涓嬭浇鍓嶅線PC鎻愮ずDiialog
closeTeachDownload() {
@@ -1058,10 +1062,27 @@
},
// 涓嬭浇鍔熻兘
downloadTeach(e) {
- this.setData({
- isShowTeachDownload: true
- })
- console.log('zhuan', this.data.isShowTeachDownload);
+ let role = JSON.parse(wx.getStorageSync(app.config.userInfoKey)).role
+ if (role && role == 'Teacher') {
+ this.setData({
+ isShowTeachDownload: true
+ })
+ } else {
+ wx.showModal({
+ title: '灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�',
+ content: '璇峰厛杩涜鏁欏笀璁よ瘉锛�',
+ complete: (res) => {
+ if (res.cancel) {
+
+ }
+ if (res.confirm) {
+ wx.navigateTo({
+ url: '/packageDomain/pages/teacherCertification/index',
+ })
+ }
+ }
+ })
+ }
// const data = e.detail.value
// // const data
// // let role = userStore.userInfo ? userStore.userInfo.role : null
diff --git a/packageBookService/pages/bookServices/detail/index.wxss b/packageBookService/pages/bookServices/detail/index.wxss
index 1f96b4b..d76a433 100644
--- a/packageBookService/pages/bookServices/detail/index.wxss
+++ b/packageBookService/pages/bookServices/detail/index.wxss
@@ -385,4 +385,8 @@
height: 100%;
display: flex;
align-items: center;
+}
+
+.suggest-component .t-input__placeholder {
+ font-size: 28rpx !important;
}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/examination/examination.js b/packageBookService/pages/bookServices/examination/examination.js
index c90f3bc..83953d8 100644
--- a/packageBookService/pages/bookServices/examination/examination.js
+++ b/packageBookService/pages/bookServices/examination/examination.js
@@ -1058,7 +1058,6 @@
this.setData({
collectList: JSON.parse(res[0].value)
})
- // total.value = collectList.value.length
} catch (error) {}
if (this.data.collectList && this.data.collectList.length) {
await this.getCollectDataList()
@@ -1087,12 +1086,6 @@
// 鑾峰彇鏀惰棌澶�
async getCollectDataList() {
let questionArr = []
- // this.setData({
- // cardList: [{
- // catalogName: '鏀惰棌澶�',
- // infoList: []
- // }]
- // })
this.setData({
cardList: [{
catalogName: '鍗曢�夐',
@@ -1116,142 +1109,139 @@
let shortArr = [] // 绠�绛�
let multipleChoiceArr = [] // 澶氶��
let completionArr = [] // 濉┖
- let query = {
- path: '*',
- cmsPath: this.data.rootCmsItemId,
- cmsType: '*',
- productId: this.data.bookId,
- queryType: '*',
- itemIds: this.data.collectList.map((item) => item + ''),
- itemFields: {
- Embedded_QuestionBank_Stem: [],
- Embedded_QuestionBank_AnalysisCon: [],
- Embedded_QuestionBank_Answer: [],
- Embedded_QuestionBank_Option: [],
- Embedded_QuestionBank_QuestionType: [],
- Embedded_QuestionBank_StemStyle: [],
- Embedded_QuestionBank_OptionStyle: [],
- Embedded_QuestionBank_KnowledgePoint: [],
- Embedded_QuestionBank_Difficulty: []
+ for (let qindex = 0; qindex < this.data.collectList.length; qindex++) {
+ const qitem = this.data.collectList[qindex];
+ let query = {
+ path: '*',
+ cmsPath: this.data.rootCmsItemId,
+ cmsType: '*',
+ productId: this.data.bookId,
+ queryType: '*',
+ itemIds: qitem + '',
+ itemFields: {
+ Embedded_QuestionBank_Stem: [],
+ Embedded_QuestionBank_AnalysisCon: [],
+ Embedded_QuestionBank_Answer: [],
+ Embedded_QuestionBank_Option: [],
+ Embedded_QuestionBank_QuestionType: [],
+ Embedded_QuestionBank_StemStyle: [],
+ Embedded_QuestionBank_OptionStyle: [],
+ Embedded_QuestionBank_KnowledgePoint: [],
+ Embedded_QuestionBank_Difficulty: []
+ }
}
- }
- app.MG.store.getProductDetail(query).then((res) => {
- let questionArr = []
- res.datas.cmsDatas[0].datas.forEach((item, index) => {
- const questionObj = {
- number: index + 1, // 棰樺彿
- id: item.id,
- stem: item.Embedded_QuestionBank_QuestionType == 'completion' ?
- JSON.parse(item.Embedded_QuestionBank_Stem)
- .stemTxt.replaceAll('<vacancy>', ',input,')
- .split(',') : JSON.parse(item.Embedded_QuestionBank_Stem), // 棰樺共
- answer: item.Embedded_QuestionBank_Answer, // 绛旀
- option: item.Embedded_QuestionBank_Option ?
- JSON.parse(item.Embedded_QuestionBank_Option) : '', // 閫夋嫨棰橀�夐」
- analysisCon: item.Embedded_QuestionBank_AnalysisCon, // 瑙ｆ瀽
- questionType: item.Embedded_QuestionBank_QuestionType, // 棰樺瀷
- optionStyle: item.Embedded_QuestionBank_OptionStyle, // 閫夐」鏄剧ず绫诲瀷
- stemStyle: item.Embedded_QuestionBank_StemStyle, // 棰樺共鏄剧ず绫诲瀷
- difficulty: item.Embedded_QuestionBank_Difficulty ?
- 4 - item.Embedded_QuestionBank_Difficulty : 0, // 闅惧害绛夌骇
- userAnswer: item.Embedded_QuestionBank_QuestionType == 'completion' ||
- item.Embedded_QuestionBank_QuestionType == 'multipleChoice' ? [] : '',
- isSubmit: false, // 鏌ョ湅瑙ｆ瀽
- isRight: null, // 鏄惁姝ｇ‘
- isComplete: false,
- isCollect: true
- }
- // 澶氶�夊拰濉┖绛旀鑲负鏁扮粍锛岃杞崲JSON鏍煎紡
- if (
- questionObj.questionType == 'completion' ||
- questionObj.questionType == 'multipleChoice'
- ) {
- try {
- questionObj.answer = JSON.parse(questionObj.answer)
- } catch (error) {
- //
+ await app.MG.store.getProductDetail(query).then((res) => {
+ let questionArr = []
+ res.datas.cmsDatas[0].datas.forEach((item, index) => {
+ const questionObj = {
+ number: index + 1, // 棰樺彿
+ id: item.id,
+ stem: item.Embedded_QuestionBank_QuestionType == 'completion' ?
+ JSON.parse(item.Embedded_QuestionBank_Stem)
+ .stemTxt.replaceAll('<vacancy>', ',input,')
+ .split(',') : JSON.parse(item.Embedded_QuestionBank_Stem), // 棰樺共
+ answer: item.Embedded_QuestionBank_Answer, // 绛旀
+ option: item.Embedded_QuestionBank_Option ?
+ JSON.parse(item.Embedded_QuestionBank_Option) : '', // 閫夋嫨棰橀�夐」
+ analysisCon: item.Embedded_QuestionBank_AnalysisCon, // 瑙ｆ瀽
+ questionType: item.Embedded_QuestionBank_QuestionType, // 棰樺瀷
+ optionStyle: item.Embedded_QuestionBank_OptionStyle, // 閫夐」鏄剧ず绫诲瀷
+ stemStyle: item.Embedded_QuestionBank_StemStyle, // 棰樺共鏄剧ず绫诲瀷
+ difficulty: item.Embedded_QuestionBank_Difficulty ?
+ 4 - item.Embedded_QuestionBank_Difficulty : 0, // 闅惧害绛夌骇
+ userAnswer: item.Embedded_QuestionBank_QuestionType == 'completion' ||
+ item.Embedded_QuestionBank_QuestionType == 'multipleChoice' ? [] : '',
+ isSubmit: false, // 鏌ョ湅瑙ｆ瀽
+ isRight: null, // 鏄惁姝ｇ‘
+ isComplete: false,
+ isCollect: true
}
- }
- // 濉┖棰樻敼閫�
- if (questionObj.questionType == 'completion') {
- let index = 0
- for (let i = 0; i < questionObj.stem.length; i++) {
- const item = questionObj.stem[i]
- if (item == 'input') {
- questionObj.stem[i] = {
- num: index,
- data: 'input'
- }
- questionObj.userAnswer[index] = ''
- index++
+ // 澶氶�夊拰濉┖绛旀鑲负鏁扮粍锛岃杞崲JSON鏍煎紡
+ if (
+ questionObj.questionType == 'completion' ||
+ questionObj.questionType == 'multipleChoice'
+ ) {
+ try {
+ questionObj.answer = JSON.parse(questionObj.answer)
+ } catch (error) {
+ //
}
}
- }
- // 鑾峰彇鍥剧墖
- if (questionObj.stemStyle == 'Image' || questionObj.stemStyle == 'TxtAndImage') {
- questionObj.stem.stemImage = getPublicImage(questionObj.stem.stemImage, 150)
- }
- if (questionObj.optionStyle == 'Image' || questionObj.optionStyle == 'TxtAndImage') {
- questionObj.option.forEach(optionItem => {
- if (optionItem.img) optionItem.img = getPublicImage(optionItem.img, 150)
- })
- }
- // 棰樺共瀵屾枃鏈鐞�
- if (questionObj.stemStyle == 'RichText') {
- // questionObj.option.txt = ''
- questionObj.stem.stemTxt = questionObj.stem.stemTxt.replace(/\<img/gi, '<img style="max-width: 300rpx !important;object-fit: contain;" class="stem-rich-img" ').replace(/\<p/gi, '<p class="stem-rich-p"')
+ // 濉┖棰樻敼閫�
+ if (questionObj.questionType == 'completion') {
+ let index = 0
+ for (let i = 0; i < questionObj.stem.length; i++) {
+ const item = questionObj.stem[i]
+ if (item == 'input') {
+ questionObj.stem[i] = {
+ num: index,
+ data: 'input'
+ }
+ questionObj.userAnswer[index] = ''
+ index++
+ }
+ }
+ }
+ // 鑾峰彇鍥剧墖
+ if (questionObj.stemStyle == 'Image' || questionObj.stemStyle == 'TxtAndImage') {
+ questionObj.stem.stemImage = getPublicImage(questionObj.stem.stemImage, 150)
+ }
+ if (questionObj.optionStyle == 'Image' || questionObj.optionStyle == 'TxtAndImage') {
+ questionObj.option.forEach(optionItem => {
+ if (optionItem.img) optionItem.img = getPublicImage(optionItem.img, 150)
+ })
+ }
+ // 棰樺共瀵屾枃鏈鐞�
+ if (questionObj.stemStyle == 'RichText') {
+ // questionObj.option.txt = ''
+ questionObj.stem.stemTxt = questionObj.stem.stemTxt.replace(/\<img/gi, '<img style="max-width: 300rpx !important;object-fit: contain;" class="stem-rich-img" ').replace(/\<p/gi, '<p class="stem-rich-p"')
- }
- // 閫夐」瀵屾枃鏈鐞�
- if (questionObj.optionStyle == 'RichText' && (questionObj.questionType == 'singleChoice' || questionObj.questionType == 'judge' || questionObj.questionType == 'multipleChoice')) {
- questionObj.option.forEach(item => {
- if (item.txt) item.txt = item.txt.replace(/\<img/gi, '<img class="option-rich-img"').replace(/\<p/gi, '<p class="stem-rich-p"')
- })
- }
- if (item.Embedded_QuestionBank_QuestionType == 'judge') {
- questionObj.type = '鍒ゆ柇棰�'
- judgeArr.push(questionObj)
- } else if (item.Embedded_QuestionBank_QuestionType == 'singleChoice') {
- questionObj.type = '鍗曢�夐'
- singleChoiceArr.push(questionObj)
- } else if (item.Embedded_QuestionBank_QuestionType == 'multipleChoice') {
- questionObj.type = '澶氶�夐'
- multipleChoiceArr.push(questionObj)
- } else if (item.Embedded_QuestionBank_QuestionType == 'completion') {
- questionObj.type = '濉┖棰�'
- completionArr.push(questionObj)
- } else if (item.Embedded_QuestionBank_QuestionType == 'shortAnswer') {
- questionObj.type = '绠�绛旈'
- shortArr.push(questionObj)
- }
- // questionArr.push(questionObj)
+ }
+ // 閫夐」瀵屾枃鏈鐞�
+ if (questionObj.optionStyle == 'RichText' && (questionObj.questionType == 'singleChoice' || questionObj.questionType == 'judge' || questionObj.questionType == 'multipleChoice')) {
+ questionObj.option.forEach(item => {
+ if (item.txt) item.txt = item.txt.replace(/\<img/gi, '<img class="option-rich-img"').replace(/\<p/gi, '<p class="stem-rich-p"')
+ })
+ }
+ if (item.Embedded_QuestionBank_QuestionType == 'judge') {
+ questionObj.type = '鍒ゆ柇棰�'
+ judgeArr.push(questionObj)
+ } else if (item.Embedded_QuestionBank_QuestionType == 'singleChoice') {
+ questionObj.type = '鍗曢�夐'
+ singleChoiceArr.push(questionObj)
+ } else if (item.Embedded_QuestionBank_QuestionType == 'multipleChoice') {
+ questionObj.type = '澶氶�夐'
+ multipleChoiceArr.push(questionObj)
+ } else if (item.Embedded_QuestionBank_QuestionType == 'completion') {
+ questionObj.type = '濉┖棰�'
+ completionArr.push(questionObj)
+ } else if (item.Embedded_QuestionBank_QuestionType == 'shortAnswer') {
+ questionObj.type = '绠�绛旈'
+ shortArr.push(questionObj)
+ }
+ })
})
- // this.setData({
- // questionDataList: questionArr,
- // ['cardList[0].infoList']: questionArr,
- // loading: false,
- // })
- this.setData({
- ['cardList[0].infoList']: singleChoiceArr,
- ['cardList[1].infoList']: judgeArr,
- ['cardList[2].infoList']: multipleChoiceArr,
- ['cardList[3].infoList']: completionArr,
- ['cardList[3].infoList']: shortArr,
- })
- const cardList = this.data.cardList
- for (let index = 0; index < cardList.length; index++) {
- const item = cardList[index];
- for (let cindex = 0; cindex < item.infoList.length; cindex++) {
- const citem = item.infoList[cindex]
- citem.number = cindex + 1
- questionArr.push(citem)
- }
+ }
+ this.setData({
+ ['cardList[0].infoList']: singleChoiceArr,
+ ['cardList[1].infoList']: judgeArr,
+ ['cardList[2].infoList']: multipleChoiceArr,
+ ['cardList[3].infoList']: completionArr,
+ ['cardList[3].infoList']: shortArr,
+ })
+ const cardList = this.data.cardList
+ for (let index = 0; index < cardList.length; index++) {
+ const item = cardList[index];
+ for (let cindex = 0; cindex < item.infoList.length; cindex++) {
+ const citem = item.infoList[cindex]
+ citem.number = cindex + 1
+ questionArr.push(citem)
}
- this.setData({
- questionDataList: questionArr,
- cardList: cardList,
- loading: false
- })
+ }
+ this.setData({
+ questionDataList: questionArr,
+ cardList: cardList,
+ loading: false
})
},
// 鎴戠殑閿欓妯″紡涓嬭幏鍙栭敊棰榠d鍒楄〃
diff --git a/packageBookService/pages/bookServices/examination/questionList/index.wxml b/packageBookService/pages/bookServices/examination/questionList/index.wxml
index d84f477..7721615 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.wxml
+++ b/packageBookService/pages/bookServices/examination/questionList/index.wxml
@@ -346,7 +346,7 @@
>{{item.userAnswer}}</view
>
</view>
- <view class="short-answer-mr">
+ <view class="short-answer-mr" style="margin-bottom: 50rpx">
<text
class="short-answer-fz;"
style="color:{{isNight ? '#fff' : '#000'}};font-size:{{sliderValue || 28}}rpx;"
diff --git a/packageBookService/pages/bookServices/list/index.js b/packageBookService/pages/bookServices/list/index.js
index 944f48b..7903f4f 100644
--- a/packageBookService/pages/bookServices/list/index.js
+++ b/packageBookService/pages/bookServices/list/index.js
@@ -262,6 +262,15 @@
},
};
app.MG.store.getStoreChannelList(query).then((res) => {
+ if (!res.datas.length) {
+ this.setData({
+ disabledSecondList: true
+ })
+ } else {
+ this.setData({
+ disabledSecondList: false
+ })
+ }
for (let index = 0; index < res.datas.length; index++) {
const item = res.datas[index];
options.push({
@@ -375,7 +384,6 @@
BaseType: 'DateTime'
}
} else if (this.data.sortList.value == 'time-desc') {
- debugger
sort = {
PublicationDate: 'Desc',
BaseType: 'DateTime'
@@ -438,16 +446,6 @@
this.setData({
noData: true,
})
- if (!this.data.pathList.length) {
- // 鏈�夋嫨浜岀骇鍒嗙被锛屼笖鏃犲浘涔�
- this.setData({
- disabledSecondList: true
- })
- } else {
- this.setData({
- disabledSecondList: false
- })
- }
}
if (this.data.triggered) {
this.setData({
@@ -465,6 +463,7 @@
`${this.data.assortCheck.code}\\${e.detail.value}` :
this.data.assortCheck.code;
console.log(this.data.path);
+
this.setData({
pathList: [],
stairCode: e.detail.value,
@@ -472,17 +471,15 @@
path: path,
'stairList.value': e.detail.value,
});
- this.getBookList(path);
- this.getSecondList(path);
+
if (e.detail.value == '') {
this.setData({
disabledSecondList: true
- })
+ });
} else {
- this.setData({
- disabledSecondList: false
- })
+ this.getSecondList(path);
}
+ this.getBookList(path);
console.log(this.data.disabledSecondList);
},
// 浜岀骇鍒嗙被鍒囨崲
diff --git a/packageBookService/pages/bookServices/list/index.wxml b/packageBookService/pages/bookServices/list/index.wxml
index 347432a..f9a0815 100644
--- a/packageBookService/pages/bookServices/list/index.wxml
+++ b/packageBookService/pages/bookServices/list/index.wxml
@@ -32,7 +32,8 @@
bindchange="onChangeStair"
/>
<t-dropdown-item
- disabled="{{disabledSecondList}}"
+ wx:if="{{disabledSecondList === false}}"
+ disabled="{{false}}"
label="浜岀骇"
bind:open="openDropdown"
bind:close="closeDropdown"
--
Gitblit v1.9.1