Merge branch 'dev' into 'master'

添加密码

See merge request !46

src/views/home/navMenu.vue

@@ -109,6 +109,11 @@
             placeholder="请输入内容"
             placeholder="请输入内容"
             v-model="editForm.content"></el-input>
             v-model="editForm.content"></el-input>
         </el-form-item>
         </el-form-item>
+        <el-form-item label="密码">
+          <el-input
+            placeholder="请输入密码"
+            v-model="editForm.password"></el-input>
+        </el-form-item>
       </el-form>
       </el-form>
       <span slot="footer">
       <span slot="footer">
         <el-button @click="omVisible = false">取消</el-button>
         <el-button @click="omVisible = false">取消</el-button>
@@ -330,7 +335,8 @@ export default {
       confimPwd: '',
       confimPwd: '',
       omVisible: false,
       omVisible: false,
       editForm: {
       editForm: {
-        content: ''
+        content: '',
+        password: '',
       }
       }
     }
     }
   },
   },
@@ -411,6 +417,9 @@ export default {
       if (!this.editForm.content) {
       if (!this.editForm.content) {
         return this.$message.warning('请输入内容')
         return this.$message.warning('请输入内容')
       }
       }
+      if (!this.editForm.password) {
+        return this.$message.warning('请输入密码')
+      }
       try {
       try {
         const res = await post('sys/announcement/get/tool', {
         const res = await post('sys/announcement/get/tool', {
           ...this.editForm
           ...this.editForm