dusenyao 2 سال پیش
والد
کامیت
5660ac306d

+ 1 - 1
.env.development

@@ -4,4 +4,4 @@ ENV = 'development'
 # base api
 # base api
 VUE_APP_BASE_API = '/api'
 VUE_APP_BASE_API = '/api'
 
 
-VUE_APP_PDF = '/pdf'
+VUE_APP_FILE = '/pdf'

+ 1 - 1
.env.production

@@ -4,4 +4,4 @@ ENV = 'production'
 # base api
 # base api
 VUE_APP_BASE_API = ''
 VUE_APP_BASE_API = ''
 
 
-VUE_APP_PDF = ''
+VUE_APP_FILE = ''

+ 2 - 11
.eslintrc.js

@@ -215,13 +215,7 @@ module.exports = {
     'template-curly-spacing': [2, 'never'],
     'template-curly-spacing': [2, 'never'],
     'wrap-iife': [2, 'any'],
     'wrap-iife': [2, 'any'],
     'yield-star-spacing': [2, 'both'],
     'yield-star-spacing': [2, 'both'],
-    'object-curly-spacing': [
-      2,
-      'always',
-      {
-        objectsInObjects: false
-      }
-    ],
+    'object-curly-spacing': [2, 'always'],
     'no-alert': process.env.NODE_ENV === 'production' ? 1 : 0,
     'no-alert': process.env.NODE_ENV === 'production' ? 1 : 0,
     'no-array-constructor': 2,
     'no-array-constructor': 2,
     'no-bitwise': 1,
     'no-bitwise': 1,
@@ -245,7 +239,6 @@ module.exports = {
     'no-label-var': 2,
     'no-label-var': 2,
     'no-lone-blocks': 2,
     'no-lone-blocks': 2,
     'no-lonely-if': 2,
     'no-lonely-if': 2,
-    'no-loop-func': 1,
     'linebreak-style': [0, 'windows'],
     'linebreak-style': [0, 'windows'],
     'no-multi-str': 2,
     'no-multi-str': 2,
     'no-nested-ternary': 0,
     'no-nested-ternary': 0,
@@ -262,7 +255,6 @@ module.exports = {
     'no-ternary': 0,
     'no-ternary': 0,
     'no-throw-literal': 2,
     'no-throw-literal': 2,
     'no-undef-init': 2,
     'no-undef-init': 2,
-    'no-underscore-dangle': 1,
     'no-use-before-define': 2,
     'no-use-before-define': 2,
     'no-useless-call': 2,
     'no-useless-call': 2,
     'no-void': 2,
     'no-void': 2,
@@ -303,8 +295,7 @@ module.exports = {
     strict: 2,
     strict: 2,
     'vars-on-top': 2,
     'vars-on-top': 2,
     'wrap-regex': 0,
     'wrap-regex': 0,
-    yoda: [2, 'never'],
-    'prefer-const': 1
+    yoda: [2, 'never']
   },
   },
 
 
   // jest 测试配置
   // jest 测试配置

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 315 - 111
package-lock.json


+ 16 - 16
package.json

@@ -16,29 +16,29 @@
     "ailp-book-question-ui": "file:../ailp-book-question-ui-0.1.1.tgz",
     "ailp-book-question-ui": "file:../ailp-book-question-ui-0.1.1.tgz",
     "awe-dnd": "^0.3.4",
     "awe-dnd": "^0.3.4",
     "axios": "^0.27.2",
     "axios": "^0.27.2",
-    "book-ui": "file:../book-ui-0.3.10.tgz",
-    "core-js": "^3.24.0",
-    "dayjs": "^1.11.4",
-    "element-ui": "^2.15.9",
+    "book-ui": "file:../book-ui-0.3.15.tgz",
+    "core-js": "^3.25.2",
+    "dayjs": "^1.11.5",
+    "element-ui": "^2.15.10",
     "gcls-book-question-ui": "file:../gcls-book-question-ui-0.1.0.tgz",
     "gcls-book-question-ui": "file:../gcls-book-question-ui-0.1.0.tgz",
-    "jquery": "^3.6.0",
+    "jquery": "^3.6.1",
     "js-base64": "^3.7.2",
     "js-base64": "^3.7.2",
     "js-cookie": "^3.0.1",
     "js-cookie": "^3.0.1",
     "jsplumb": "^2.15.6",
     "jsplumb": "^2.15.6",
     "md5": "^2.3.0",
     "md5": "^2.3.0",
     "normalize.css": "^8.0.1",
     "normalize.css": "^8.0.1",
     "nprogress": "^0.2.0",
     "nprogress": "^0.2.0",
-    "vue": "^2.7.8",
+    "vue": "^2.7.10",
     "vue-i18n": "^8.27.2",
     "vue-i18n": "^8.27.2",
     "vue-pdf": "^4.3.0",
     "vue-pdf": "^4.3.0",
-    "vue-router": "^3.5.4",
+    "vue-router": "^3.6.5",
     "vue-video-player": "^5.0.2",
     "vue-video-player": "^5.0.2",
     "vuex": "^3.6.2"
     "vuex": "^3.6.2"
   },
   },
   "devDependencies": {
   "devDependencies": {
-    "@babel/core": "^7.18.9",
-    "@babel/eslint-parser": "^7.18.9",
-    "@rushstack/eslint-patch": "^1.1.4",
+    "@babel/core": "^7.19.1",
+    "@babel/eslint-parser": "^7.19.1",
+    "@rushstack/eslint-patch": "^1.2.0",
     "@vue/cli-plugin-babel": "~5.0.8",
     "@vue/cli-plugin-babel": "~5.0.8",
     "@vue/cli-plugin-eslint": "~5.0.8",
     "@vue/cli-plugin-eslint": "~5.0.8",
     "@vue/cli-plugin-router": "~5.0.8",
     "@vue/cli-plugin-router": "~5.0.8",
@@ -53,15 +53,15 @@
     "compression-webpack-plugin": "^6.1.1",
     "compression-webpack-plugin": "^6.1.1",
     "eslint": "^7.32.0",
     "eslint": "^7.32.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-vue": "^9.3.0",
+    "eslint-plugin-vue": "^9.5.1",
     "html-webpack-plugin": "^5.5.0",
     "html-webpack-plugin": "^5.5.0",
-    "postcss": "^8.4.14",
+    "postcss": "^8.4.16",
     "postcss-html": "^1.5.0",
     "postcss-html": "^1.5.0",
     "prettier": "2.7.1",
     "prettier": "2.7.1",
-    "sass": "^1.54.0",
+    "sass": "^1.55.0",
     "sass-loader": "^10.3.0",
     "sass-loader": "^10.3.0",
     "script-ext-html-webpack-plugin": "^2.1.5",
     "script-ext-html-webpack-plugin": "^2.1.5",
-    "stylelint": "14.9.1",
+    "stylelint": "14.12.1",
     "stylelint-config-prettier": "^9.0.3",
     "stylelint-config-prettier": "^9.0.3",
     "stylelint-config-recess-order": "^3.0.0",
     "stylelint-config-recess-order": "^3.0.0",
     "stylelint-config-recommended-vue": "^1.4.0",
     "stylelint-config-recommended-vue": "^1.4.0",
@@ -71,8 +71,8 @@
     "svg-sprite-loader": "^6.0.11",
     "svg-sprite-loader": "^6.0.11",
     "svgo": "^2.8.0",
     "svgo": "^2.8.0",
     "vue-loader": "^15.10.0",
     "vue-loader": "^15.10.0",
-    "vue-template-compiler": "^2.7.8",
-    "vue-demi": "^0.13.5"
+    "vue-template-compiler": "^2.7.10",
+    "vue-demi": "^0.13.11"
   },
   },
   "browserslist": [
   "browserslist": [
     "> 1%",
     "> 1%",

+ 0 - 1
src/components/payment/Payment.vue

@@ -306,7 +306,6 @@ export default {
       box-sizing: border-box;
       box-sizing: border-box;
       flex: 1;
       flex: 1;
       height: 55px;
       height: 55px;
-      padding: 0;
       padding: 0 24px;
       padding: 0 24px;
       border: none;
       border: none;
       outline: none;
       outline: none;

+ 1 - 6
src/locales/lang/ZH.js

@@ -702,10 +702,5 @@ export default {
   Key696: '优惠码无效',
   Key696: '优惠码无效',
   Key697: '优惠码已被使用',
   Key697: '优惠码已被使用',
   Key698: '设置手机号',
   Key698: '设置手机号',
-  Key699: '手机号格式不正确',
-  Key700: '屏幕共享',
-  Key701: '结束共享',
-  Key702: '白板',
-  Key703: '群组讨论',
-  Key704: '课件推送'
+  Key699: '手机号格式不正确'
 };
 };

+ 4 - 10
src/views/course_details/index.vue

@@ -251,13 +251,7 @@
           </div>
           </div>
         </div>
         </div>
 
 
-        <el-dialog
-          class="orderDialog"
-          :title="$t('Key52')"
-          :visible="auditShow"
-          width="720px"
-          :before-close="closeaudit"
-        >
+        <el-dialog class="orderDialog" :visible="auditShow" width="720px" :before-close="closeaudit">
           <audit :goods-id="goods_id" :data="CourseData" :goods-type="goods_type" @auditedSuccess="auditedSuccess" />
           <audit :goods-id="goods_id" :data="CourseData" :goods-type="goods_type" @auditedSuccess="auditedSuccess" />
         </el-dialog>
         </el-dialog>
       </div>
       </div>
@@ -352,7 +346,7 @@ export default {
       this.is_buy = is_buy === 'true';
       this.is_buy = is_buy === 'true';
     });
     });
     GetCourseInfoBox({ id: this.goods_id })
     GetCourseInfoBox({ id: this.goods_id })
-      .then(res => {
+      .then((res) => {
         this.CourseData = res;
         this.CourseData = res;
         this.isData = 'id' in res;
         this.isData = 'id' in res;
         this.getBackTime();
         this.getBackTime();
@@ -413,7 +407,7 @@ export default {
         });
         });
       } else {
       } else {
         let goods_person_name_desc = '';
         let goods_person_name_desc = '';
-        this.CourseData.teacher_list.forEach(item => {
+        this.CourseData.teacher_list.forEach((item) => {
           goods_person_name_desc += item.teacher_name;
           goods_person_name_desc += item.teacher_name;
         });
         });
 
 
@@ -445,7 +439,7 @@ export default {
 
 
     getMyGoodsBuyInfo(goods_id_list) {
     getMyGoodsBuyInfo(goods_id_list) {
       GetMyGoodsBuyInfo({ goods_type: 101, goods_id_list }).then(({ goods_id_list_buy }) => {
       GetMyGoodsBuyInfo({ goods_type: 101, goods_id_list }).then(({ goods_id_list_buy }) => {
-        this.CourseData.book_list.forEach(book => {
+        this.CourseData.book_list.forEach((book) => {
           this.$set(book, 'is_buy', goods_id_list_buy.includes(book.book_id));
           this.$set(book, 'is_buy', goods_id_list_buy.includes(book.book_id));
         });
         });
       });
       });

+ 5 - 4
src/views/teacher/create_course/step_table/NewTask.vue

@@ -149,8 +149,9 @@
           <!-- 任务模式 课件 -->
           <!-- 任务模式 课件 -->
           <div v-else-if="form.teaching_type === 11" class="task-template">
           <div v-else-if="form.teaching_type === 11" class="task-template">
             <el-form :model="courseForm" label-width="100px" label-position="left">
             <el-form :model="courseForm" label-width="100px" label-position="left">
-              <el-form-item :label="$t('Key312')">
-                <el-button @click="dialogVisible = true"> <i class="el-icon-plus"></i> {{ $t('Key373') }} </el-button>
+              <!-- TODO 多语言 等待翻译 -->
+              <el-form-item label="教材任务">
+                <el-button @click="dialogVisible = true"> <i class="el-icon-plus"></i> 添加教材 </el-button>
                 <div>
                 <div>
                   <el-tag
                   <el-tag
                     v-for="(item, i) in courseForm.coursewareInfo"
                     v-for="(item, i) in courseForm.coursewareInfo"
@@ -184,9 +185,9 @@
           <!-- 任务模式 基础 -->
           <!-- 任务模式 基础 -->
           <div v-else-if="form.teaching_type === 12" class="task-template">
           <div v-else-if="form.teaching_type === 12" class="task-template">
             <el-form :model="basicForm" label-width="100px" label-position="left">
             <el-form :model="basicForm" label-width="100px" label-position="left">
-              <el-form-item :label="$t('Key374')">
+              <el-form-item :label="$t('Key152')">
                 <el-upload action="no" :http-request="upload" multiple :show-file-list="false" accept="*">
                 <el-upload action="no" :http-request="upload" multiple :show-file-list="false" accept="*">
-                  <el-button><svg-icon icon-class="upload" /> {{ $t('Key374') }}</el-button>
+                  <el-button><svg-icon icon-class="upload" /> {{ $t('Key152') }}</el-button>
                 </el-upload>
                 </el-upload>
                 <el-tag
                 <el-tag
                   v-for="(item, i) in basicForm.file_info_list"
                   v-for="(item, i) in basicForm.file_info_list"

+ 0 - 3
src/views/teacher/create_course/step_table/SelectBook.vue

@@ -135,9 +135,6 @@ export default {
     },
     },
     nextStep() {
     nextStep() {
       GetCourseBookInfo_Brief({ course_id: this.id }).then(({ book_count }) => {
       GetCourseBookInfo_Brief({ course_id: this.id }).then(({ book_count }) => {
-        if (book_count <= 0) {
-          return this.$message.warning('请至少选择一本教材');
-        }
         this.$router.push({
         this.$router.push({
           path: `/create_course_step_table/create_task/${this.id}?is_template=${this.is_template}`
           path: `/create_course_step_table/create_task/${this.id}?is_template=${this.is_template}`
         });
         });

+ 2 - 2
vue.config.js

@@ -26,12 +26,12 @@ if (NODE_ENV === 'development') {
         [`^${process.env.VUE_APP_BASE_API}`]: ''
         [`^${process.env.VUE_APP_BASE_API}`]: ''
       }
       }
     },
     },
-    [process.env.VUE_APP_PDF]: {
+    [process.env.VUE_APP_FILE]: {
       // target: 'https://file-cs.helxsoft.cn',
       // target: 'https://file-cs.helxsoft.cn',
       target: 'https://file-kf.helxsoft.cn/',
       target: 'https://file-kf.helxsoft.cn/',
       changeOrigin: true,
       changeOrigin: true,
       pathRewrite: {
       pathRewrite: {
-        [`^${process.env.VUE_APP_PDF}`]: ''
+        [`^${process.env.VUE_APP_FILE}`]: ''
       }
       }
     }
     }
   };
   };

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است