Merge pull request #359 from Fuynkio/dev_shawn

小改动
ArkMowers · Oct 28, 2023 · 6ba050d · 6ba050d
2 parents c6f974b + 976c8ce
commit 6ba050d
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 30 deletions.
diff --git a/ui/src/components/MaaWeeklyNew.vue b/ui/src/components/MaaWeeklyNew.vue
@@ -311,9 +311,9 @@ function clear() {
         <li>
           在第一行填入<n-tag closable class="tag-mr">HE-7</n-tag>
 
-          第二行填入<n-tag closable>上次作战</n-tag>
+          第二行填入<n-tag closable>1-7</n-tag>
 
-          则会刷活动关HE-7，若活动未开放，则刷上一关。
+          则会刷活动关HE-7，若活动未开放，则刷1-7。
         </li>
         <li><n-tag closable>12-17标准</n-tag> 表示12-17标准难度。</li>
         <li><n-tag closable>12-17磨难</n-tag> 表示12-17磨难难度。</li>

diff --git a/ui/src/components/SKLand.vue b/ui/src/components/SKLand.vue
@@ -32,31 +32,32 @@ async function test_maa() {
         <div class="card-title">森空岛签到</div>
       </n-checkbox>
     </template>
+    <div v-if="skland_enable">
+      <n-dynamic-input v-model:value="skland_info" :on-create="add_account">
+        <template #create-button-default> 添加森空岛账号 </template>
+        <template #default="{ value }">
+          <div style="display: flex; align-items: center; width: 100%">
+            <n-checkbox v-model:checked="value.isCheck" style="margin-right: 12px" />
+            <n-input
+              style="margin-right: 10px"
+              v-model:value="value.account"
+              type="text"
+              placeholder="账号"
+            />
 
-    <n-dynamic-input v-model:value="skland_info" :on-create="add_account">
-      <template #create-button-default> 添加森空岛账号 </template>
-      <template #default="{ value }">
-        <div style="display: flex; align-items: center; width: 100%">
-          <n-checkbox v-model:checked="value.isCheck" style="margin-right: 12px" />
-          <n-input
-            style="margin-right: 10px"
-            v-model:value="value.account"
-            type="text"
-            placeholder="账号"
-          />
-
-          <n-input
-            v-model:value="value.password"
-            type="password"
-            show-password-on="click"
-            placeholder="密码"
-          />
-        </div>
-      </template>
-    </n-dynamic-input>
-    <div class="misc-container">
-      <n-button @click="test_maa">测试设置</n-button>
-      <div>{{ maa_msg }}</div>
+            <n-input
+              v-model:value="value.password"
+              type="password"
+              show-password-on="click"
+              placeholder="密码"
+            />
+          </div>
+        </template>
+      </n-dynamic-input>
+      <div class="misc-container">
+        <n-button @click="test_maa">测试设置</n-button>
+        <div>{{ maa_msg }}</div>
+      </div>
     </div>
   </n-card>
 </template>

diff --git a/ui/src/pages/Settings.vue b/ui/src/pages/Settings.vue
@@ -441,4 +441,13 @@ ul {
 .n-divider:not(.n-divider--vertical) {
   margin: 14px 0 8px;
 }
+
+/* .results {
+  display: grid;
+  grid-template-rows: masonry;
+  grid-template-columns: repeat(2, 600px);
+  gap: 10px 10px ;
+  justify-content: center;
+} */
+/* 实验性瀑布流（firefox nightly） */
 </style>
diff --git a/ui/src/pages/depot.vue b/ui/src/pages/depot.vue
@@ -2,9 +2,7 @@
   <div>
     <n-card>
       <template #header>
-        <n-checkbox v-model:checked="maa_depot_enable">
-          <div class="card-title">MAA仓库扫描 {{ maa_depot_enable ? '开启' : '关闭' }}</div>
-        </n-checkbox>
+        <Depotpage />
       </template>
 
       <div class="card-container">
@@ -64,7 +62,7 @@ import { useConfigStore } from '@/stores/config'
 const store = useConfigStore()
 
 import { storeToRefs } from 'pinia'
-const { maa_gap, maa_depot_enable } = storeToRefs(store)
+const { maa_gap } = storeToRefs(store)
 
 //模态框
 const showModal = ref(false)