Parcourir la source

Merge branch 'iteration-accompany'

lex il y a 1 an
Parent
commit
42cf8a9ee8

BIN
public/favicon.ico


BIN
src/assets/images/logo.png


BIN
src/views/login/images/login-logo.png


+ 15 - 7
src/views/login/index.vue

@@ -59,7 +59,7 @@
             <n-form-item class="default-color">
               <div class="flex justify-between">
                 <div class="flex-initial">
-                  <n-checkbox v-model:checked="autoLogin">记住密码</n-checkbox>
+                  <n-checkbox v-model:checked="formInline.isCaptcha">记住密码</n-checkbox>
                 </div>
                 <!-- <div class="flex-initial order-last">
                 <a href="javascript:">忘记密码</a>
@@ -125,7 +125,14 @@ let formInline = reactive({
 })
 const formInlineHistory = storage.get('userInfo')
 if (formInlineHistory) {
-  formInline = reactive({ ...JSON.parse(formInlineHistory) })
+  const tempForm = JSON.parse(formInlineHistory)
+  if (tempForm.isCaptcha) {
+    formInline.username = tempForm.username
+    formInline.password = tempForm.password
+  } else {
+    formInline.username = tempForm.username
+  }
+  // formInline = reactive({ ...JSON.parse(formInlineHistory) })
 }
 const rules = {
   username: { required: true, message: '请输入用户名', trigger: 'blur' },
@@ -160,11 +167,12 @@ const handleSubmit = (e: any) => {
         message.destroyAll()
         if (some.code == ResultEnum.SUCCESS) {
           //  判断是否勾选自动登录
-          if (autoLogin) {
-            storage.set('userInfo', JSON.stringify(formInline))
-          } else {
-            storage.remove('userInfo')
-          }
+          // if (autoLogin.value) {
+          //   storage.set('userInfo', JSON.stringify(formInline))
+          // } else {
+          //   storage.remove('userInfo')
+          // }
+          storage.set('userInfo', JSON.stringify(formInline))
 
           // route.query?.redirect ||
           tabsViewStore.closeAllTabs()

+ 1 - 0
src/views/music-library/music-sheet/component/music-list.tsx

@@ -149,6 +149,7 @@ export default defineComponent({
                   type="primary"
                   size="small"
                   text
+                  v-auth="musicSheetApplicationExtend/save1752901206883221506"
                   onClick={() => {
                     state.showUseProject = true
                     state.showUseProjectId = row.id