update

src/components/JumpMethod/index.vue

@@ -1,6 +1,8 @@
 <script setup>
 import {onMounted, reactive} from 'vue';
 import Api from "../../api/index.js";
+import XSelect from "../XSelect/index.vue";
+import UploadAvatar from "../upload/UploadAvatar.vue";
 
 const group = reactive([]);
 
@@ -17,6 +19,16 @@ onMounted(() => {
         group.push(...data);
     })
 })
+
+const getSingle = async () => {
+    const {data} = await Api.admin.getSingleList();
+    return {
+        data: data.list.map(v => ({
+            id: v.id,
+            name: v.title
+        }))
+    }
+}
 </script>
 
 <template>
@@ -33,6 +45,27 @@ onMounted(() => {
     <a-form-item label="url路径" v-if="[1,3,4].includes(form.type)">
         <a-input v-model:model-value="form.url" placeholder="请输入url路径"></a-input>
     </a-form-item>
+
+    <a-form-item v-if="form.type === 2" label="富文本内容">
+        <XSelect
+            v-model:model-value="form.single_id"
+            :init="true"
+            :api="getSingle"
+            placeholder="请选择二级分类">
+        </XSelect>
+    </a-form-item>
+
+    <a-form-item v-if="form.type === 5" label="弹窗内容">
+        <a-radio-group v-model:model-value="form.pop_type">
+            <a-radio :value="1">图片</a-radio>
+            <a-radio :value="2">视频</a-radio>
+        </a-radio-group>
+    </a-form-item>
+
+    <a-form-item v-if="form.type === 5">
+        <UploadAvatar v-if="form.pop_type===1" v-model:files="form.pop_images"></UploadAvatar>
+        <UploadAvatar v-else v-model:files="form.pop_video" :multiple="false"></UploadAvatar>
+    </a-form-item>
 </template>
 
 <style scoped lang="scss">

src/components/XSelect/index.vue

@@ -1,7 +1,7 @@
 <script setup>
-import {reactive} from "vue";
+import {onMounted, reactive} from "vue";
 
-const {api, fieldName, apiPo} = defineProps({
+const {api, fieldName, apiPo, init} = defineProps({
     api: {
         type: Function,
         default: async () => {
@@ -15,6 +15,10 @@ const {api, fieldName, apiPo} = defineProps({
     fieldName: {
         type: Object,
         default: {value: 'id', label: 'name'},
+    },
+    init: {
+        type: Boolean,
+        default: false,
     }
 });
 const list = reactive([]);
@@ -27,6 +31,13 @@ const popupChange = async (visible) => {
         });
     }
 }
+
+onMounted(() => {
+    if (init) api && api(apiPo).then(({data}) => {
+        list.length = 0;
+        list.push(...data);
+    });
+});
 </script>
 
 <template>

src/components/upload/UploadAvatar.vue

@@ -2,7 +2,7 @@
 import XImage from "../XImage/Index.vue";
 import Api from "../../api/index.js";
 
-const {size, api} = defineProps({
+const {size, api, multiple} = defineProps({
     size: {
         type: String,
         default: '60px'
@@ -10,14 +10,23 @@ const {size, api} = defineProps({
     api: {
         type: Function,
         default: Api.system.uploadFile,
+    },
+    multiple: {
+        type: Boolean,
+        default: true,
     }
 });
 const files = defineModel('files');
 const emits = defineEmits(['success']);
 
 const beforeUpload = (file) => {
-    api(file).then(({data}) => {
+    api && api(file).then(({data}) => {
+        console.log(files.value);
+        if (!multiple) {
+            files.value = [data];
+        } else {
             files.value.push(data);
+        }
         emits('success', data);
     });
     return false;
@@ -26,7 +35,8 @@ const beforeUpload = (file) => {
 
 <template>
     <div class="flex flex-wrap gap-[15px]">
-        <a-upload :style="{width: size,height: size}" @before-upload="beforeUpload" multiple>
+        <a-upload v-if="!(!multiple && files.length >= 1)" :style="{width: size,height: size}"
+                  @before-upload="beforeUpload" :multiple="multiple">
             <template #upload-button>
                 <div class="upload-button test">
                     <IconPlus/>

src/pages/manage/pages/manage-expert-management/components/EditBanner.vue

@@ -20,11 +20,20 @@ const visible = ref(false);
 watch(
     () => visible.value,
     (val) => {
-        if (val) Object.assign(form, detail);
+        if (val) {
+            Object.assign(form, detail);
+            if (form.single_id === 0) form.single_id = null;
+            if (form.pop_type === 0) form.pop_type = 1;
+        }
     }
 )
 const form = reactive({
     file: null,
+    files: [],
+    pop_images: [],
+    pop_video: [],
+    single_id: null,
+    pop_type: 1,
     type: 0,
 });
 

src/pages/manage/pages/manage-expert-management/components/EditPlatformNews.vue

@@ -16,6 +16,11 @@ const form = reactive({
     title: null,
     content: null,
     type: null,
+    files: [],
+    pop_images: [],
+    pop_video: [],
+    single_id: null,
+    pop_type: 1,
     url: null,
     id: null,
 });

src/pages/manage/pages/manage-expert-management/components/tabs/components/AddBasicTeaching.vue

@@ -4,6 +4,7 @@ import {reactive, ref, watch} from 'vue';
 import XSelect from "../../../../../../../components/XSelect/index.vue";
 import Api from "../../../../../../../api/index.js";
 import {Message} from "@arco-design/web-vue";
+import UploadAvatar from "../../../../../../../components/upload/UploadAvatar.vue";
 
 const emits = defineEmits(['success']);
 const {pid, detail} = defineProps({
@@ -20,6 +21,11 @@ const visible = ref(false);
 
 const form = reactive({
     type: null,
+    files: [],
+    pop_images: [],
+    pop_video: [],
+    single_id: null,
+    pop_type: 1,
     title: null,
     category_id: null,
     content: null,
@@ -28,7 +34,11 @@ const form = reactive({
 watch(
     () => visible.value,
     (val) => {
-        if (val) Object.assign(form, detail);
+        if (val) {
+            Object.assign(form, detail);
+            if (form.single_id === 0) form.single_id = null;
+            if (form.pop_type === 0) form.pop_type = 1;
+        }
     }
 )
 
@@ -58,7 +68,7 @@ const success = async () => {
 
     <a-modal
         @ok="success"
-        title="新增常见问题"
+        :title="`${detail.id ? '编辑' : '新增'}基础教学`"
         title-align="start"
         v-model:visible="visible">
         <a-form
@@ -67,11 +77,18 @@ const success = async () => {
             <a-form-item label="二级分类">
                 <XSelect
                     v-model:model-value="form.category_id"
+                    :init="true"
                     :api="Api.admin.getArticleCategoryList2"
                     :api-po="{pid}"
                     placeholder="请选择二级分类">
                 </XSelect>
             </a-form-item>
+            <a-form-item label="封面">
+                <UploadAvatar
+                    :multiple="false"
+                    v-model:files="form.files">
+                </UploadAvatar>
+            </a-form-item>
             <a-form-item label="标题">
                 <a-input v-model:model-value="form.title" placeholder="请输入标题"></a-input>
             </a-form-item>

src/pages/manage/pages/manage-expert-management/components/tabs/components/AddFrequentlyQuestions.vue

@@ -56,7 +56,7 @@ const success = async () => {
 
     <a-modal
         @ok="success"
-        title="新增常见问题"
+        title="新增"
         title-align="start"
         v-model:visible="visible">
         <a-form
@@ -65,6 +65,7 @@ const success = async () => {
             <a-form-item label="二级分类">
                 <XSelect
                     v-model:model-value="form.category_id"
+                    :init="true"
                     :api="Api.admin.getArticleCategoryList2"
                     :api-po="{pid}"
                     placeholder="请选择二级分类">

src/pages/manage/pages/manage-expert-management/components/tabs/components/AddSecondaryClassificationManagement.vue

@@ -13,6 +13,10 @@ const {maxClass, pid, detail} = defineProps({
     detail: {
         type: Object,
         default: {},
+    },
+    maxClass: {
+        type: Number,
+        default: 1,
     }
 });
 
@@ -30,8 +34,7 @@ watch(
 )
 
 const getData = async () => {
-    return new Promise((resolve) => {
+    return Promise.resolve({
-        resolve({
         data: [
             {
                 id: 1,
@@ -42,7 +45,6 @@ const getData = async () => {
                 name: '基础教学',
             },
         ]
-        });
     })
 }
 
@@ -86,11 +88,13 @@ const success = async () => {
             :model="form">
             <a-form-item label="一级分类">
                 <XSelect
+                    :init="true"
                     :default-value="maxClass"
                     :api="getData"
                     placeholder="请选择二级分类"
                     :disabled="true">
                 </XSelect>
+                {{ maxClass }}
             </a-form-item>
             <a-form-item label="二级分类名称">
                 <a-input v-model:model-value="form.name" placeholder="请输入二级分类名称"></a-input>

src/pages/merchant/pages/task-center/components/new-task-5.vue

@@ -40,8 +40,8 @@ const success = () => {
                 <a-input-number v-model:model-value="po.retention_time" placeholder="请输入保留时间" :min="1"
                                 :max="60"></a-input-number>
                 <a-radio-group v-model:model-value="po.retention_type" type="button" class="ml-[10px] flex-shrink-0">
-                    <a-radio :value="0">分钟</a-radio>
+                    <a-radio :value="1">分钟</a-radio>
-                    <a-radio :value="1">小时</a-radio>
+                    <a-radio :value="2">小时</a-radio>
                 </a-radio-group>
             </a-form-item>
 
@@ -49,8 +49,8 @@ const success = () => {
                 <a-input-number v-model:model-value="po.check_time" placeholder="请输入保留时间" :min="1"
                                 :max="60"></a-input-number>
                 <a-radio-group v-model:model-value="po.check_type" type="button" class="ml-[10px] flex-shrink-0">
-                    <a-radio :value="0">分钟</a-radio>
+                    <a-radio :value="1">分钟</a-radio>
-                    <a-radio :value="1">小时</a-radio>
+                    <a-radio :value="2">小时</a-radio>
                 </a-radio-group>
             </a-form-item>
 
@@ -71,8 +71,8 @@ const success = () => {
                             <a-input v-model:model-value="po.back_time" placeholder="请说入时间"></a-input>
                             <a-radio-group v-model:model-value="po.back_type" type="button"
                                            class="ml-[10px] flex-shrink-0">
-                                <a-radio :value="0">分钟</a-radio>
+                                <a-radio :value="1">分钟</a-radio>
-                                <a-radio :value="1">小时</a-radio>
+                                <a-radio :value="2">小时</a-radio>
                             </a-radio-group>
                         </a-form-item>
                     </a-form>