Bladeren bron

添加进入直播间按钮

dusenyao 3 jaren geleden
bovenliggende
commit
1013a16877
7 gewijzigde bestanden met toevoegingen van 42 en 25 verwijderingen
  1. 3 0
      src/main.js
  2. 0 9
      src/styles/index.scss
  3. 4 7
      src/utils/i18n.js
  4. 12 0
      src/utils/mixin.js
  5. 3 4
      src/views/login/index.vue
  6. 15 2
      src/views/main/TaskList.vue
  7. 5 3
      vue.config.js

+ 3 - 0
src/main.js

@@ -31,6 +31,7 @@ import '@/styles/index.scss'; // global css
 import 'normalize.css/normalize.css';
 
 import i18n from '@/utils/i18n';
+import mixin from '@/utils/mixin';
 import '@/permission'; // 权限控制
 
 Vue.use(ElementUI);
@@ -40,6 +41,8 @@ Vue.use(BookUI);
 Vue.use(VideoPlayer);
 Vue.use(VueDND);
 
+Vue.mixin(mixin);
+
 Vue.config.productionTip = false;
 
 new Vue({

+ 0 - 9
src/styles/index.scss

@@ -54,15 +54,6 @@ a:hover {
   cursor: pointer;
 }
 
-a:focus,
-a:active {
-  outline: none;
-}
-
-div:focus {
-  outline: none;
-}
-
 // 课件视频播放样式
 .video-js:hover .vjs-big-play-button {
   background: none;

+ 4 - 7
src/utils/i18n.js

@@ -50,13 +50,10 @@ export async function setI18nLang(language_type) {
 export function updateWordPack(Parameter) {
   Parameter.language_type = i18n.locale;
 
-  GetWordPack(Parameter).then(data => {
-    let localWord = i18n.messages[data.language_type];
-    if (localWord === undefined) {
-      localWord = {};
-    }
-    let wordPack = Object.assign(localWord, data.word_pack);
-    i18n.setLocaleMessage(data.language_type, wordPack);
+  GetWordPack(Parameter).then(({ language_type, word_pack }) => {
+    let localWord = i18n.messages[language_type];
+    if (localWord === undefined) localWord = {};
+    i18n.setLocaleMessage(language_type, Object.assign(localWord, word_pack));
     // localStorage.setItem('i18n-message', JSON.stringify(i18n.messages));
   });
 }

+ 12 - 0
src/utils/mixin.js

@@ -0,0 +1,12 @@
+import { updateWordPack } from '@/utils/i18n';
+
+/**
+ * 全局混入
+ */
+export default {
+  methods: {
+    updateWordPack(Parameter) {
+      updateWordPack(Parameter);
+    }
+  }
+};

+ 3 - 4
src/views/login/index.vue

@@ -10,7 +10,7 @@
     >
       <div class="title-container">
         <h3 class="title">
-          {{ $t('login') }}
+          {{ $t('Key539') }}
         </h3>
       </div>
 
@@ -62,7 +62,6 @@
 </template>
 
 <script>
-import { updateWordPack } from '@/utils/i18n';
 import { getConfigInformation } from '@/utils/index';
 
 export default {
@@ -105,9 +104,9 @@ export default {
   },
   created() {
     this.getConfig();
-    updateWordPack({
+    this.updateWordPack({
       word_key_list: [
-        'login',
+        'Key539',
         'password',
         'username',
         'Learn_TLogin',

+ 15 - 2
src/views/main/TaskList.vue

@@ -9,7 +9,7 @@
       <div class="notice">
         <div class="notice-title">
           <svg-icon icon-class="task-notification" class-name="svg-normal" />
-          <span>通知</span>
+          <span>{{ $t('Key291') }}</span>
           <span class="notice-title-link" @click="goPersonal">全部 <i class="el-icon-arrow-right" /></span>
         </div>
         <!-- 通知列表 -->
@@ -77,7 +77,12 @@
           >
             <div class="task-item-top">
               <svg-icon icon-class="arrival" :style="{ color: colorMatching[i % 7].main }" />
-              <span class="cs-item-name">{{ cs_item_name }} - {{ name }}</span>
+              <span class="cs-item-name">
+                {{ cs_item_name }} - {{ name }}
+                <span v-if="teaching_type === 10" class="enter-live" @click.stop="taskLink(teaching_type, id)">
+                  进入直播间 >
+                </span>
+              </span>
               <span
                 class="task-button"
                 :style="{ 'background-color': buttonColorList[j % 3] }"
@@ -145,6 +150,9 @@ export default {
     }).then(({ message_list }) => {
       this.message_list = message_list;
     });
+    this.updateWordPack({
+      word_key_list: ['Key291']
+    });
   },
   mounted() {
     this.init();
@@ -406,6 +414,11 @@ export default {
             .cs-item-name {
               flex: 1;
               margin-left: 10px;
+
+              .enter-live {
+                margin-left: 12px;
+                color: #808080;
+              }
             }
 
             .task-button {

+ 5 - 3
vue.config.js

@@ -18,17 +18,19 @@ let proxy = {};
 if (NODE_ENV === 'development') {
   proxy = {
     [process.env.VUE_APP_BASE_API]: {
-      target: 'http://gcls.helxsoft.cn/',
+      // target: 'https://gcls.utschool.cn/',
+      target: 'https://gcls.helxsoft.cn/',
       changeOrigin: true,
       pathRewrite: {
-        ['^' + process.env.VUE_APP_BASE_API]: ''
+        [`^${process.env.VUE_APP_BASE_API}`]: ''
       }
     },
     [process.env.VUE_APP_PDF]: {
+      // target: 'https://file-cs.helxsoft.cn',
       target: 'https://file-kf.helxsoft.cn/',
       changeOrigin: true,
       pathRewrite: {
-        ['^' + process.env.VUE_APP_PDF]: ''
+        [`^${process.env.VUE_APP_PDF}`]: ''
       }
     }
   };