Merge pull request #294 from EightyDollars/dev_shawn

修改森空岛以及公招控件页面，增加文字说明
ArkMowers · Sep 18, 2023 · 9924f79 · 9924f79
2 parents 19f113d + 86400bb
commit 9924f79
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/arknights_mower/templates/conf.yml b/arknights_mower/templates/conf.yml
@@ -85,3 +85,9 @@ rogue:
   refresh_trader_with_dice: false
 screenshot: 200
 mail_subject: "[Mower通知]"
+skland_enable: false
+skland_info: []
+recruit_enable: true
+recruit_only_4: false
+recruit_robot: true
+recruitment_time: false
diff --git a/ui/src/components/Recruit.vue b/ui/src/components/Recruit.vue
@@ -19,13 +19,14 @@ const recruit_3 = computed({
 })
 
 const recruit_4 = ref('900')
+
 </script>
 
 <template>
   <n-card>
     <template #header>
       <n-checkbox v-model:checked="recruit_enable">
-        <div class="card-title">公共招募</div>
+        <div class="card-title">公开招募</div>
       </n-checkbox>
     </template>
     <n-table :single-line="false" size="small" class="big-table">
@@ -63,9 +64,16 @@ const recruit_4 = ref('900')
         <td>
           <n-radio-group name="recruit_robot" v-model:value="recruit_robot">
             <n-space justify="start">
-              <n-radio :value="true">招募</n-radio>
-              <n-radio :value="false">不招</n-radio>
+              <n-radio :value="true">邮件通知</n-radio>
+              <help-text>
+                <div>碰到标签中包含支援机械时会发送邮件进行通知，不会自动选择</div>
+              </help-text>
+              <n-radio :value="false">忽略标签</n-radio>
+              <help-text>
+                <div>忽略支援机械标签，刷新标签或者选择其他的干员</div>
+              </help-text>
             </n-space>
+
           </n-radio-group>
         </td>
       </tr>
@@ -100,7 +108,7 @@ h4 {
 
 .big-table {
   margin-top: 10px;
-  width: 360px;
+  width: 400px;
 
   th {
     text-align: center;
@@ -122,4 +130,4 @@ h4 {
 .final {
   margin: 16px 0 0;
 }
-</style>
+</style>
diff --git a/ui/src/components/SKLand.vue b/ui/src/components/SKLand.vue
@@ -29,7 +29,8 @@ function add_account(){
       <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 v-model:value="value.account" type="text" placeholder="账号"/>
+          <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>
@@ -45,5 +46,8 @@ function add_account(){
   font-weight: 500;
   font-size: 18px;
 }
+
+
+
 </style>