diff --git a/api/iClicker.js b/api/iClicker.js new file mode 100644 index 0000000..e0ee4b8 --- /dev/null +++ b/api/iClicker.js @@ -0,0 +1,23 @@ +import request from '@/utils/network/request'; + +/** + * 获取答题器选项 + */ +export function getIClickerData(data, config = {}) { + return request({ + url: '/api/user.ashx?act=studenticlicker', + method: 'GET', + data + }, config) +} + +/** + * 提交答题器数据 + */ +export function submitIClickerData(data, config = {}) { + return request({ + url: '/api/user.ashx?act=studenticlicker', + method: 'POST', + data + }, config) +} diff --git a/assets/images/icons/answer.png b/assets/images/icons/answer.png new file mode 100644 index 0000000..ec6bc23 Binary files /dev/null and b/assets/images/icons/answer.png differ diff --git a/assets/images/logo/start_bg.png b/assets/images/logo/start_bg.png new file mode 100644 index 0000000..2514d0e Binary files /dev/null and b/assets/images/logo/start_bg.png differ diff --git a/assets/styles/content/cover.scss b/assets/styles/content/cover.scss index 28ec139..1a8986e 100644 --- a/assets/styles/content/cover.scss +++ b/assets/styles/content/cover.scss @@ -11,3 +11,4 @@ @import './cover/checkbox.scss'; @import './cover/pagination.scss'; @import './cover/load-more.scss'; +@import './cover/modal.scss'; diff --git a/assets/styles/content/cover/modal.scss b/assets/styles/content/cover/modal.scss new file mode 100644 index 0000000..3de636d --- /dev/null +++ b/assets/styles/content/cover/modal.scss @@ -0,0 +1,13 @@ +.uni-modal { + max-width: 400px!important; +} + +.uni-modal__bd { + max-height: 460px!important; + font-size: $uni-font-size-mini!important; +} + +.uni-modal__ft { + font-size: $uni-font-size-mini!important; + line-height: 66px!important; +} \ No newline at end of file diff --git a/components/ch-empty/ch-empty.vue b/components/ch-empty/ch-empty.vue index fbd7458..d10a2fd 100644 --- a/components/ch-empty/ch-empty.vue +++ b/components/ch-empty/ch-empty.vue @@ -1,11 +1,18 @@ diff --git a/pages/index/index.vue b/pages/index/index.vue index 1cbd2ff..0cfbb48 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -34,8 +34,6 @@ {{ item.name }} - - @@ -48,6 +46,7 @@ import { reactive, toRefs } from 'vue'; import userIndex from '@/assets/images/icons/userIndex_order.png'; import myStudy from '@/assets/images/icons/my_study.png'; import task from '@/assets/images/icons/task.png'; +import answer from '@/assets/images/icons/answer.png'; import { onLoad } from '@dcloudio/uni-app'; import { useUserStore } from '@/store/user.js'; @@ -73,6 +72,12 @@ const data = reactive({ name: '作 业', icon: task, url: '/pages/task/task' + }, + { + id: '004', + name: '答题器', + icon: answer, + url: '/pages/IClicker/IClicker' } ], }) diff --git a/pages/networkPrint/networkPrint.vue b/pages/networkPrint/networkPrint.vue new file mode 100644 index 0000000..2184e59 --- /dev/null +++ b/pages/networkPrint/networkPrint.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/pages/print/print.vue b/pages/print/print.vue index 252b9b4..3927aee 100644 --- a/pages/print/print.vue +++ b/pages/print/print.vue @@ -10,7 +10,7 @@ --> - + @@ -46,7 +46,7 @@ import { getImgData } from '@/api/common.js'; const bluetooth = new Bluetooth(); // #endif - const canvasRef = ref(null); + // const canvasRef = ref(null); const data = reactive({ searching: false, @@ -74,7 +74,7 @@ import { getImgData } from '@/api/common.js'; success: (res) => { questions.value = JSON.parse(res.data) console.log(questions.value) - getImg(); + // getImg(); } }) }) @@ -167,6 +167,7 @@ import { getImgData } from '@/api/common.js'; printAnswerExplain(printerJobs, item.textArr, 'explain') } }) + printerJobs.print('') }) let buffer = printerJobs.buffer(); diff --git a/pages/taskDetails/taskDetails.vue b/pages/taskDetails/taskDetails.vue index 3375219..449fafe 100644 --- a/pages/taskDetails/taskDetails.vue +++ b/pages/taskDetails/taskDetails.vue @@ -67,11 +67,21 @@ onMounted(() => { getTaskInfo(params, { loading: true }).then(info => { task.value = info; if (!info.studentimg) return; - files.value = [{ - name: 'studentimg', - extname: 'image/png', - path: `${info.studentimg}` - }] + const imgArr = info.studentimg.split(',') + console.log(imgArr) + imgArr.forEach(item => { + if (!item) return; + files.value.push({ + name: 'studentimg', + extname: 'image/png', + path: `${config.baseUrl}/${item}` + }) + }) + // files.value = [{ + // name: 'studentimg', + // extname: 'image/png', + // path: `${config.baseUrl}/${info.studentimg}` + // }] }) })