新增语言选择功能

src/pages/content-manage/components/DrawerForm.vue

@@ -15,6 +15,13 @@
           </el-select>
         </el-col>
       </el-form-item>
+      <el-form-item label="语言：" prop="language">
+        <el-col :span="12">
+          <el-select v-model="form.language" placeholder="请选择语言" size="small" style="width: 100%" multiple clearable :disabled="isDetails">
+            <el-option v-for="item in langOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
+          </el-select>
+        </el-col>
+      </el-form-item>
       <el-form-item label="标题：" prop="title" style="margin-right:15px;">
         <el-input v-model="form.title" placeholder="请输入标题" size="small" :disabled="isDetails"/>
       </el-form-item>
@@ -27,9 +34,12 @@
       <el-form-item label="备注：" prop="remarks" style="margin-right:15px;">
         <el-input type="textarea" v-model="form.remarks" placeholder="请输入备注" size="small" rows="4" :disabled="isDetails"/>
       </el-form-item>
-      <el-form-item ref="el-form-item-tinymce" v-if="pageType === 1" label="正文：" prop="content" :rules="{required: true, message: '请输入正文', trigger: 'blur'}" style="margin-right:15px;">
+      <el-form-item ref="el-form-item-tinymce" v-if="pageType !== 2" label="正文：" style="margin-right:15px;">
         <Tinymce ref="editor" v-model="form.content" :readonly="isDetails" :height="400" @blur="tinymceBlur" />
       </el-form-item>
+      <!-- <el-form-item ref="el-form-item-tinymce" v-if="pageType !== 2" label="正文：" prop="content" :rules="{required: true, message: '请输入正文', trigger: 'blur'}" style="margin-right:15px;">
+        <Tinymce ref="editor" v-model="form.content" :readonly="isDetails" :height="400" @blur="tinymceBlur" />
+      </el-form-item> -->
     </div>
     <div class="right">
       <el-form-item label="web端图片：" class="file-upload avatar-upload">
@@ -199,7 +209,8 @@ const defaultForm = {
   video_size: '',
   start_time: '',
   hasEndDate: 0,
-  end_time: ''
+  end_time: '',
+  language: ['cn']
 }
 export default {
   props: {
@@ -235,13 +246,20 @@ export default {
         type_id: [
           { required: true, message: '请选择类型', trigger: 'change' }
         ],
+        language: [
+          { required: true, message: '请选择语言', trigger: 'change' }
+        ],
         title: [
           { required: true, message: '请输入标题', trigger: 'blur' }
         ],
         startDate: [
           { required: true, message: '请选择开始时间', trigger: 'change' }
         ]
-      }
+      },
+      langOptions: [
+        { label: '中文', value: 'cn' },
+        { label: '英文', value: 'en' }
+      ]
     }
   },
   computed: {
@@ -300,6 +318,9 @@ export default {
           this.form[key] = details[key]
         }
       })
+      if (this.form.language) {
+        this.form.language = this.form.language.split(',')
+      }
       if (this.form.end_time) {
         this.form.hasEndDate = 1
         this.form.end_time = formatToDate(this.form.end_time)
@@ -412,6 +433,7 @@ export default {
             form.end_time = 0
           }
           delete form.hasEndDate
+          form.language = form.language.join(',')
           this.$emit('drawFormSubmit', form)
         } else {
           return false

src/utils/beforeEnter.js

@@ -7,8 +7,11 @@ export default class BeforeEnter {
 
   async update(to, from, next) {
     const isLogin = store.state.user.isLogin || (await store.dispatch('checkLogin'))
+    console.log(to)
+    console.log(from)
+    console.log(`${webConf.others.loginUrl}?rd=${encodeURIComponent(window.location.href)}`)
     if (!isLogin) {
-      window.location.href = `${webConf.others.loginUrl}?rd=${encodeURIComponent(window.location.href)}`
+      // window.location.href = `${webConf.others.loginUrl}?rd=${encodeURIComponent(window.location.href)}`
       next()
     } else {
       const hasPermissions = store.state.user.permissions && store.state.user.permissions.length > 0