diff --git a/components/ch-empty/ch-empty.scss b/components/ch-empty/ch-empty.scss index e5712a8..5def26d 100644 --- a/components/ch-empty/ch-empty.scss +++ b/components/ch-empty/ch-empty.scss @@ -1,3 +1,7 @@ .ch-empty { - padding: 60rpx 60rpx; + padding: 20rpx 30rpx; +} + +.ch-empty--text { + color: #bbb; } \ No newline at end of file diff --git a/components/ch-empty/ch-empty.vue b/components/ch-empty/ch-empty.vue index 382ed1f..fbd7458 100644 --- a/components/ch-empty/ch-empty.vue +++ b/components/ch-empty/ch-empty.vue @@ -1,6 +1,7 @@ diff --git a/components/ch-icon/ch-icon.scss b/components/ch-icon/ch-icon.scss index e69de29..5a9c827 100644 --- a/components/ch-icon/ch-icon.scss +++ b/components/ch-icon/ch-icon.scss @@ -0,0 +1,3 @@ +.ch-icon { + line-height: 1.5; +} \ No newline at end of file diff --git a/components/ch-icon/ch-icon.vue b/components/ch-icon/ch-icon.vue index c2f491a..0ae16c7 100644 --- a/components/ch-icon/ch-icon.vue +++ b/components/ch-icon/ch-icon.vue @@ -30,6 +30,6 @@ const style = computed(() => { }) - \ No newline at end of file diff --git a/manifest.json b/manifest.json index ac2b0a5..263c0a4 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "smart_campus", "appid" : "__UNI__C183B0D", "description" : "", - "versionName" : "0.0.0.3", + "versionName" : "0.0.0.4", "versionCode" : 100, "transformPx" : false, /* 5+App特有相关 */ diff --git a/pages/index/index.vue b/pages/index/index.vue index 704f428..1cbd2ff 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -34,6 +34,8 @@ {{ item.name }} + + @@ -72,7 +74,7 @@ const data = reactive({ icon: task, url: '/pages/task/task' } - ] + ], }) const { gridList, userInfo } = toRefs(data); diff --git a/pages/print/print.vue b/pages/print/print.vue index f44afba..252b9b4 100644 --- a/pages/print/print.vue +++ b/pages/print/print.vue @@ -5,9 +5,9 @@ 打印 - + @@ -139,6 +139,13 @@ import { getImgData } from '@/api/common.js'; // 发送二进制数据 function print(){ + if (!writeId.value) { + uni.showToast({ + icon: 'none', + title: '请连接打印机' + }) + return; + } const printerJobs = new PrinterJobs(); const quesArr = questions.value.forEach(ques => { diff --git a/pages/questions/questions.vue b/pages/questions/questions.vue index 26b83da..55ab54a 100644 --- a/pages/questions/questions.vue +++ b/pages/questions/questions.vue @@ -118,7 +118,14 @@ function checkChange (e) { } function print () { - + const quesList = checkIds.value.map(id => questionList.value.find(item => item.questionid == id)) + uni.setStorage({ + key: 'questions', + data: JSON.stringify(quesList) + }) + uni.navigateTo({ + url: '/pages/print/print' + }) } function cancel () { diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue index f370341..6b67886 100644 --- a/pages/setting/setting.vue +++ b/pages/setting/setting.vue @@ -43,6 +43,12 @@ function checkAppUpdate () { }) checkUpdate().then(res => { console.log('检查更新结果:', res) + if (res.code === 0) { + uni.showToast({ + icon: 'none', + title: '暂无更新' + }) + } }).catch(error => { console.log("检查更新错误:", error) }).finally(() => {