Merge remote-tracking branch 'origin/develop' into develop

src/components/common/FJUpload.vue

@@ -24,7 +24,7 @@
         <div class="file_img"></div>
         <div class="file_detail">
           <div class="file_name">
-            <span style="color: #6f6f6f；width:200px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">
+            <span style="color: #6f6f6f;width:200px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">
               {{ item.name.indexOf('-')!==-1?item.name.slice(0,item.name.indexOf('-')) + item.name.slice(item.name.indexOf('.')) :item.name }}
             </span>
           </div>

src/views/courselibrary/CoursewareManage.vue

@@ -192,10 +192,11 @@
               <a-radio-group v-model:value="valueE1">
                 <div class="bc_box">
                   <div class="bc_boxl">
-                    <div class="ol_checkbox">
+                    <div class="ol_checkbox" @click="expectOnline">
                       <a-radio
                         v-model:checked="checked"
                         :value="1"
+                        disabled="true"
                         @click="bs_hShow"
                       >
                         线上
@@ -1815,7 +1816,7 @@
                 style="width: 440px; height: 40px; border-radius: 8px"
                 placeholder="请输入详细地点"
               />
-              <div class="inp_num">
+              <div class="inp_num" style="right:164px;">
                 <span style="color: #c7cbd2">{{ xjkkinputV2.length }}/50</span>
               </div>
             </div>
@@ -4286,6 +4287,11 @@ export default defineComponent({
         state.valueE1 = "";
       }
     };
+    // 弹框提示敬请期待
+    const expectOnline = () => {
+      message.destroy()
+      message.success("功能正在开发中，敬请期待。")
+    }
     //新建面授课
     const createft = () => {
       if (!state.xzinputV1) {
@@ -5402,6 +5408,7 @@ export default defineComponent({
       of_exit,
       hideShow,
       bs_hShow,
+      expectOnline,
       createft,
       ft_exit,
       ft_exit_1,
@@ -5847,7 +5854,8 @@ export default defineComponent({
 
 .createschooltime {
   z-index: 999;
-  width: 679px;
+  width: 879px;
+  height: 740px;
   background: #ffffff;
   box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
   position: absolute;
@@ -5867,7 +5875,7 @@ export default defineComponent({
 
   .cst_main {
     width: 100%;
-    max-height: 600px;
+    max-height: 700px;
     overflow-y: auto;
     position: relative;
 

src/views/courselibrary/courseModal.vue

@@ -114,7 +114,18 @@
                   <span style="margin-right: 14px">封面图</span>
                 </div>
                 <div class="item_inp">
-                  <a-select
+                  <div style="width:440px;height:70px;display: flex;justify-content: flex-start;align-items: center;">
+                      <img
+                        v-for="(item, index) in optionsUrl" 
+                        :key="index"
+                        class="choiceoptionurl"
+                        :style="item.value==feng_mian_1?'border:3px solid rgb(78, 166, 255);':''"
+                        :src="item.value"
+                        :alt="item.label"
+                        @click="choicePic(item.value)"
+                      />
+                  </div>
+                  <!-- <a-select
                     :getPopupContainer="
                       (triggerNode) => {
                         return triggerNode.parentNode || document.body;
@@ -127,11 +138,12 @@
                     :options="optionsUrl"
                     allowClear
                     showSearch
-                  />
+                  /> -->
                   <img
                     class="i_upload_img"
                     v-if="feng_mian_1"
                     :src="feng_mian_1"
+                    style="width:220px;height:120px;border-radius: 8px;"
                     alt="avatar"
                   />
                   <div class="i_bottom">
@@ -168,26 +180,6 @@
                   </div>
                 </div>
               </div>
-              <div class="mbl_items">
-                <div class="item_nam">
-                  <span style="margin-right: 14px">课程价值</span>
-                </div>
-                <div class="item_inp">
-                  <div class="i1_input">
-                    <a-input
-                      v-model:value="qdms_inputV3"
-                      maxlength="200"
-                      style="width: 440px; height: 40px; border-radius: 8px"
-                      placeholder="请输入课程价值"
-                    />
-                    <div class="inp_num">
-                      <span style="color: #c7cbd2">
-                        {{ qdms_inputV3.length }}/200
-                      </span>
-                    </div>
-                  </div>
-                </div>
-              </div>
               <div class="mbl_items">
                 <div class="item_nam">
                   <div class="asterisk_icon">
@@ -217,6 +209,26 @@
                   </div>
                 </div>
               </div>
+              <div class="mbl_items">
+                <div class="item_nam" style="margin-bottom:110px;">
+                  <span style="margin-right: 14px">课程价值</span>
+                </div>
+                <div class="item_inp">
+                  <div class="i1_input">
+                    <a-textarea
+                      v-model:value="qdms_inputV3"
+                      maxlength="200"
+                      style="width: 440px; height: 140px; border-radius: 8px"
+                      placeholder="请输入课程价值"
+                    />
+                    <div class="inp_num" style="top:110px;">
+                      <span style="color: #c7cbd2;">
+                        {{ qdms_inputV3.length }}/200
+                      </span>
+                    </div>
+                  </div>
+                </div>
+              </div>
               <div class="mbl_items">
                 <div class="item_nam">
                   <span style="margin-right: 14px">场景</span>
@@ -248,7 +260,7 @@
                   <a-input
                     v-model:value="tags_val_single"
                     style="width: 440px; height: 40px; border-radius: 8px"
-                    placeholder="请输入按回车键创建成功"
+                    placeholder="请输入内容标签按回车键添加内容标签，可添加多个内容标签。"
                     @pressEnter="handleTagChange"
                   />
                   <div class="tag-content">
@@ -266,7 +278,7 @@
             </div>
             <div class="mb_right">
               <div class="mbl_items">
-                <div class="item_nam">
+                <div class="item_nam" style="margin-top:5px;">
                   <div class="asterisk_icon">
                     <img
                       src="@/assets/images/coursewareManage/asterisk.png"
@@ -510,6 +522,11 @@ export default defineComponent({
     });
     //  富文本 eeeeeeeeeeeeee
 
+    // 点击图片选择图片
+    const choicePic = (value) => {
+      state.feng_mian_1 = value;
+    }
+
     //获取分类、场景、封面图、-----------字典配置-------------------------------
     const optionsUrl = ref([]);
     const options2 = ref([]);
@@ -749,6 +766,7 @@ export default defineComponent({
       toolbarConfig,
       editorConfig,
       handleCreated,
+      choicePic
     };
   },
 });
@@ -1151,5 +1169,12 @@ export default defineComponent({
   .statusJuJue {
     margin-bottom: 20px;
   }
+
+  .choiceoptionurl {
+    width:60px;
+    height:60px;
+    margin-right: 10px;
+    border-radius: 8px;
+  }
 }
 </style>