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

src/components/drawers/UnlockMode.vue

@@ -55,7 +55,7 @@
                 </a-radio
                 >
               </div>
-              <div style="margin-top: 24px">
+              <div v-if="types!==1" style="margin-top: 24px">
                 <a-radio :value="3"
                 >完成当前阶段所有必修任务解锁下一阶段
                 </a-radio
@@ -90,7 +90,8 @@ const classify = [
   },
 ];
 const props = defineProps({
-  routerInfo: {}
+  routerInfo: {},
+  types: Number
 })
 const routerInfoData = ref({})
 const classifyActive = computed(() => routerInfoData.value.unlockMode === 1 ? 1 : 2)
@@ -101,8 +102,16 @@ const closeDrawer = () => {
   visible.value = false
 };
 
-function selectClassify({type}) {
-  routerInfoData.value.unlockMode = type
+function selectClassify(e) {
+  
+  if(e.type === 1){
+    routerInfoData.value.unlockMode = e.type
+  }
+  // 当为学习路径图时候 直接默认第一个选项 不用选中
+  if(e.type==2 && props.types==1){
+    routerInfoData.value.unlockMode = e.type
+  }
+
 }
 
 const saveUnlock = () => {

src/views/learningpath/LevelAddDetail.vue

@@ -117,13 +117,17 @@
             <div class="rightt">
               <div class="select" style="margin-right:90px;">
                 <span>学习模式：</span>
-                <a-select v-model:value="routerInfo.routerInfo.unlockMode" ref="select" size="small"
+                <span
+                  style="border: 1px solid rgba(0, 0, 0, 0.25);width: 120px;height: 38px; border-radius: 10px;text-align: center;line-height: 38px;">
+                  {{ routerInfo.routerInfo.unlockMode == 1 ? '自由学习模式': routerInfo.routerInfo.unlockMode == 2 || routerInfo.routerInfo.unlockMode == 3 ? '闯关模式': '' }}
+                </span>
+                <!-- <a-select v-model:value="routerInfo.routerInfo.unlockMode" ref="select" size="small"
                           style="width: 150px" disabled>
                   <a-select-option :value="1">自由学习模式</a-select-option>
                   <a-select-option :value="2">闯关模式</a-select-option>
                   <a-select-option :value="3">闯关模式</a-select-option>
-                </a-select>
-                <unlock-mode :routerInfo="routerInfo.routerInfo">
+                </a-select> -->
+                <unlock-mode :routerInfo="routerInfo.routerInfo" :types="types">
                   <a-button type="primary" size="large" style="border-radius: 8px;margin-left: 24px;">切换模式
                   </a-button>
                 </unlock-mode>
@@ -462,6 +466,7 @@ const confirmLoading = ref(false)
 const moveChapterIndex = ref('')
 const activeIndex = ref(0)
 const deleteIndex = ref(0)
+const types = 1 // 1 路径图 2 项目
 
 const courseRef = ref({})
 const formValue = ref({draftTaskList: []})

src/views/projectcenter/TaskAdd.vue

@@ -108,14 +108,18 @@
 							<!-- 2022-11-30注释 后面放开 -->
 							<div class="select" style="margin-right:90px;">
 								<span>学习模式：</span>
+								<span
+									style="border: 1px solid rgba(0, 0, 0, 0.25);width: 120px;height: 38px; border-radius: 10px;text-align: center;line-height: 38px;">
+									{{ unlockMode == 1 ? '自由学习模式': unlockMode == 2 || unlockMode == 3 ? '闯关模式': '' }}
+								</span>
 								<!-- <div class="inputbox"> -->
 									<!-- <input type="text" placeholder="按学习时间解锁" style="padding-left:12px;" /> -->
-									<a-select v-model:value="unlockMode" ref="select" size="small" style="width: 150px"
+									<!-- <a-select v-model:value="unlockMode" ref="select" size="small" style="width: 150px"
 										disabled>
 										<a-select-option :value="1">自由学习模式</a-select-option>
 										<a-select-option :value="2">闯关模式</a-select-option>
 										<a-select-option :value="3">闯关模式</a-select-option>
-									</a-select>
+									</a-select> -->
 									<a-button type="primary" size="large" style="margin-left:10px;border-radius: 10px;"   @click="showModeVisible">切换模式</a-button>
 									<!-- <div class="bottonbox" @click="showModeVisible">
 										<div class="btnText">切换模式</div>