Merge branch 'develop'

src/layout/components/Header/index.vue

@@ -8,7 +8,7 @@
       >
         <div class="logo" v-if="navMode === 'horizontal'">
           <img :src="websiteConfig.logo" alt="" />
-          <h2 v-show="!collapsed" class="title">{{ '内容管理' }}</h2>
+          <h2 v-show="!collapsed" class="title">{{ 'MECMP' }}</h2>
         </div>
         <!-- v-model:collapsed="collapsed" -->
         <AsideMenu v-model:location="getMenuLocation" :inverted="getInverted" mode="horizontal" />

src/layout/components/Logo/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="logo">
     <img :src="websiteConfig.logo" alt="" :class="{ 'mr-2': !collapsed }" />
-    <h2 v-show="!collapsed" class="title">{{ '内容管理' }}</h2>
+    <h2 v-show="!collapsed" class="title">{{ 'MECMP' }}</h2>
   </div>
 </template>
 

src/views/login/index.vue

@@ -222,7 +222,7 @@ const handleSubmit = (e: any) => {
     width: 1038px;
     height: 516px;
     background: #e8f2fe;
-    border-radius: 15px 73px 15px 73px;
+    border-radius: 18px 73px 18px 73px;
     border: 4px solid #ffffff;
     // margin: 10% auto 0;
   }

src/views/music-library/music-sheet/component/music-list.tsx

@@ -132,7 +132,7 @@ export default defineComponent({
             return (
                 <NDescriptions labelPlacement="left" column={1}>
                   <NDescriptionsItem label="属性">{getMapValueByKey(row.sourceType, new Map(Object.entries(musicSheetSourceType)))}</NDescriptionsItem>
-                  <NDescriptionsItem label="所属人">{getOwnerName(row.musicSheetExtend, row.sourceType) ? getOwnerName(row.musicSheetExtend, row.sourceType) : "--"}</NDescriptionsItem>
+                  <NDescriptionsItem label="所属人">{getOwnerName(row.musicSheetExtend, row.sourceType)}</NDescriptionsItem>
                 </NDescriptions>
             )
           }

src/views/music-library/music-sheet/modal/musicPreView.tsx

@@ -20,7 +20,7 @@ export default defineComponent({
     const apiUrls = {
       'dev': 'https://dev.kt.colexiu.com',
       'test': 'https://test.lexiaoya.cn',
-      'online': 'https://kt.colexiu.com'
+      'online': 'https://mec.colexiu.com'
     }
 
     const environment = location.origin.includes('//dev') ? 'dev' : location.origin.includes('//test') ? 'test' : location.origin.includes('//online') ? 'online' : 'dev'

src/views/music-library/musicUtil.ts

@@ -19,6 +19,8 @@ export const getOwnerName = (musicSheetExtend: any, sourceType: string) => {
       let typeName = getMapValueByKey(musicSheetExtend.clientType, new Map(Object.entries(clientType)));
       typeName = typeName ? '-' + typeName : '';
       ownerName += ' (' + appName + typeName + ')'
+    }else if(sourceType == 'PLATFORM'){
+      return "--"
     }
   }
   return ownerName;

src/views/system-manage/employee-manage/index.tsx

@@ -153,7 +153,7 @@ export default defineComponent({
           try {
             await resetPassword({
               userId: row.id,
-              password: 'nrpt' + row.phone.substr(7),
+              password: 'mecmp' + row.phone.substr(7),
               clientType: row.clientType
             })
             message.success('重置成功')