Parcourir la source

Merge branch 'iteration-work' into jenkins

lex il y a 1 an
Parent
commit
eff39ec883
3 fichiers modifiés avec 12 ajouts et 7 suppressions
  1. 1 1
      dev-dist/sw.js
  2. 1 1
      public/version.json
  3. 10 5
      src/views/studentList/modals/comment-work/index.tsx

+ 1 - 1
dev-dist/sw.js

@@ -99,7 +99,7 @@ define(['./workbox-5357ef54'], function (workbox) {
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
-    "revision": "0.mvanbje1bt"
+    "revision": "0.fdlfbk23pr8"
   }], {});
 >>>>>>> iteration-large-version
   workbox.cleanupOutdatedCaches();

+ 1 - 1
public/version.json

@@ -1 +1 @@
-{"version":1708306369409}
+{ "version": 1708306369409 }

+ 10 - 5
src/views/studentList/modals/comment-work/index.tsx

@@ -41,11 +41,16 @@ export default defineComponent({
       commentRemind: true
     });
     const onSubmit = async () => {
-      // const isCommentRemind = storage.get('isCommentRemind');
-      // if (isCommentRemind != 1) {
-      //   state.removeVisiable1 = true;
-      //   return;
-      // }
+      const isCommentRemind = storage.get('isCommentRemind');
+      if (isCommentRemind != 1) {
+        state.removeVisiable1 = true;
+        return;
+      }
+
+      if (!state.comment) {
+        message.error('请输入评语');
+        return;
+      }
       state.btnLoading = true;
       try {
         await api_setComment({