shmily1213 пре 1 месец
родитељ
комит
f8c19a58d5

+ 19 - 4
src/components/ie-button/ie-button.vue

@@ -1,6 +1,6 @@
 <template>
   <button class="ie-button"
-    :class="['ie-button', `ie-button-${type}`, `ie-button-${size}`, customClass, { 'is-disabled': disabled || loading, 'has-shadow': hasShadow }]"
+    :class="['ie-button', `ie-button-${type}`, `ie-button-${size}`, customClass, { 'is-disabled': disabled, 'is-loading': loading, 'has-shadow': hasShadow }]"
     :disabled="disabled" hover-class="button-hover" :style="getStyle" @click="handleClick">
     <uv-loading-icon v-if="loading" color="#FFFFFF" size="16"></uv-loading-icon>
     <slot></slot>
@@ -36,6 +36,9 @@ const getStyle = computed(() => {
 });
 const emit = defineEmits(['click']);
 const handleClick = () => {
+  if (props.disabled || props.loading) {
+    return;
+  }
   emit('click');
 }
 </script>
@@ -89,10 +92,22 @@ const handleClick = () => {
 }
 
 .is-disabled {
-  opacity: 0.8;
+  background: #f7f7f7;
+  color: rgba(0, 0, 0, 0.3);
+  box-shadow: none;
 }
 
-.button-hover:not(.is-disabled) {
+.is-loading {
   @apply opacity-80;
 }
-</style>
+
+.button-hover:not(.is-disabled):not(.is-loading) {
+  // background: linear-gradient(to right, #2a8dde, #007ae5);
+  @apply opacity-80;
+}
+
+// .is-disabled:hover {
+//   background: #f7f7f7;
+//   color: rgba(0, 0, 0, 0.3);
+//   box-shadow: none;
+// }</style>

+ 1 - 1
src/pagesMain/pages/index/index.vue

@@ -96,7 +96,7 @@ onPageScroll((e) => {
     scrollTop.value = e.scrollTop;
   }
 });
-onLoad(() => {
+onMounted(() => {
   checkProvinceInfo();
   if (userStore.isLogin) {
     checkInfo();

+ 0 - 0
src/uni_modules/mp-html/README.md → src/pagesStudy/components/mp-html/README.md


+ 0 - 0
src/uni_modules/mp-html/changelog.md → src/pagesStudy/components/mp-html/changelog.md


+ 0 - 0
src/uni_modules/mp-html/components/mp-html/latex/index.js → src/pagesStudy/components/mp-html/components/mp-html/latex/index.js


+ 0 - 0
src/uni_modules/mp-html/components/mp-html/latex/katex.min.js → src/pagesStudy/components/mp-html/components/mp-html/latex/katex.min.js


+ 0 - 0
src/uni_modules/mp-html/components/mp-html/mp-html.vue → src/pagesStudy/components/mp-html/components/mp-html/mp-html.vue


+ 0 - 0
src/uni_modules/mp-html/components/mp-html/node/node.vue → src/pagesStudy/components/mp-html/components/mp-html/node/node.vue


+ 0 - 0
src/uni_modules/mp-html/components/mp-html/parser.js → src/pagesStudy/components/mp-html/components/mp-html/parser.js


+ 0 - 0
src/uni_modules/mp-html/package.json → src/pagesStudy/components/mp-html/package.json


+ 0 - 0
src/uni_modules/mp-html/static/app-plus/mp-html/js/handler.js → src/pagesStudy/components/mp-html/static/app-plus/mp-html/js/handler.js


+ 0 - 0
src/uni_modules/mp-html/static/app-plus/mp-html/js/uni.webview.min.js → src/pagesStudy/components/mp-html/static/app-plus/mp-html/js/uni.webview.min.js


+ 0 - 0
src/uni_modules/mp-html/static/app-plus/mp-html/local.html → src/pagesStudy/components/mp-html/static/app-plus/mp-html/local.html


+ 1 - 0
src/pagesStudy/components/question-book-item.vue

@@ -64,6 +64,7 @@ import EyeIcon from '@/pagesSystem/static/image/icon/icon-eye.png';
 import EyeOffIcon from '@/pagesSystem/static/image/icon/icon-eye-off.png';
 import { EnumQuestionType } from '@/common/enum';
 import type { Study } from '@/types';
+import MpHtml from './mp-html/components/mp-html/mp-html.vue';
 
 
 const props = defineProps({

+ 1 - 0
src/pagesStudy/pages/exam-start/components/question-options.vue

@@ -49,6 +49,7 @@ import { EnumQuestionType, EnumReviewMode } from '@/common/enum';
 import { useExam } from '@/composables/useExam';
 import { Study, Transfer } from '@/types';
 import { EXAM_DATA, EXAM_PAGE_OPTIONS, EXAM_AUTO_SUBMIT } from '@/types/injectionSymbols';
+import MpHtml from '@/pagesStudy/components/mp-html/components/mp-html/mp-html.vue';
 
 const examPageOptions = inject(EXAM_PAGE_OPTIONS) || {} as Transfer.ExamAnalysisPageOptions;
 const examData = inject(EXAM_DATA) || {} as ReturnType<typeof useExam>;

+ 1 - 0
src/pagesStudy/pages/exam-start/components/question-parse.vue

@@ -18,6 +18,7 @@ import { EnumQuestionType, EnumReviewMode } from '@/common/enum';
 import { useExam, decodeHtmlEntities } from '@/composables/useExam';
 import { Study, Transfer } from '@/types';
 import { EXAM_DATA, EXAM_PAGE_OPTIONS } from '@/types/injectionSymbols';
+import MpHtml from '@/pagesStudy/components/mp-html/components/mp-html/mp-html.vue';
 
 const examPageOptions = inject(EXAM_PAGE_OPTIONS) || {} as Transfer.ExamAnalysisPageOptions;
 const examData = inject(EXAM_DATA) || {} as ReturnType<typeof useExam>;

+ 1 - 0
src/pagesStudy/pages/exam-start/components/question-title.vue

@@ -20,6 +20,7 @@ import { EnumPaperType, EnumQuestionType } from '@/common/enum';
 import { useExam } from '@/composables/useExam';
 import { Study, Transfer } from '@/types';
 import { EXAM_DATA, EXAM_PAGE_OPTIONS } from '@/types/injectionSymbols';
+import MpHtml from '@/pagesStudy/components/mp-html/components/mp-html/mp-html.vue';
 
 const examPageOptions = inject(EXAM_PAGE_OPTIONS) || {} as Transfer.ExamAnalysisPageOptions;
 const examData = inject(EXAM_DATA) || {} as ReturnType<typeof useExam>;