Merge remote-tracking branch 'origin/feature-ui-fix' into feature-ui-fix

jero-web/src/components/jero/JImageUpload.vue

@@ -172,9 +172,15 @@ export default {
             }
             return file
           })
+        } else {
+          // this.handleDelete(info.file)
+          this.fileList = []
+          this.$message.error(`上传失败`)
+          return
         }
         // this.$message.success(`${info.file.name} 上传成功!`);
       } else if (info.file.status === 'error') {
+
         this.$message.error(`${info.file.name} 上传失败.`)
       } else if (info.file.status === 'removed') {
         this.handleDelete(info.file)

jero-web/src/components/tools/UserPassword.vue

@@ -15,21 +15,30 @@
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="旧密码">
-          <a-input type="password" placeholder="请输入旧密码" v-decorator="[ 'oldpassword', validatorRules.oldpassword]" />
+          <a-input :type="passwordType1" placeholder="请输入旧密码" v-decorator="[ 'oldpassword', validatorRules.oldpassword]" >
+            <a-icon title="显示密码" @click="passwordType1='text'" slot="suffix" v-if="passwordType1==='password'" type="eye" :style="{ color: '#B3B7C2',fontSize:'20px' }"/>
+            <a-icon title="隐藏密码" @click="passwordType1='password'" slot="suffix" v-else type="eye-invisible" :style="{ color: '#B3B7C2',fontSize:'20px' }"/>
+          </a-input>
         </a-form-item>
 
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="新密码">
-          <a-input type="password" placeholder="请输入新密码" :maxLength="20" v-decorator="[ 'password', validatorRules.password]" />
+          <a-input :type="passwordType2" placeholder="请输入新密码" :maxLength="20" v-decorator="[ 'password', validatorRules.password]" >
+            <a-icon title="显示密码" @click="passwordType2='text'" slot="suffix" v-if="passwordType2==='password'" type="eye" :style="{ color: '#B3B7C2',fontSize:'20px' }"/>
+            <a-icon title="隐藏密码" @click="passwordType2='password'" slot="suffix" v-else type="eye-invisible" :style="{ color: '#B3B7C2',fontSize:'20px' }"/>
+          </a-input>
         </a-form-item>
 
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="确认新密码">
-          <a-input type="password" @blur="handleConfirmBlur" placeholder="请确认新密码" :maxLength="20" v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
+          <a-input :type="passwordType3" @blur="handleConfirmBlur" placeholder="请确认新密码" :maxLength="20" v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]">
+            <a-icon title="显示密码" @click="passwordType3='text'" slot="suffix" v-if="passwordType3==='password'" type="eye" :style="{ color: '#B3B7C2',fontSize:'20px' }"/>
+            <a-icon title="隐藏密码" @click="passwordType3='password'" slot="suffix" v-else type="eye-invisible" :style="{ color: '#B3B7C2',fontSize:'20px' }"/>
+          </a-input>
         </a-form-item>
 
       </a-form>
@@ -40,11 +49,15 @@
 <script>
 
 import { postAction } from '@/api/manage'
+import { mapActions } from 'vuex'
 
 export default {
   name: 'UserPassword',
   data () {
     return {
+      passwordType1: 'password',
+      passwordType2: 'password',
+      passwordType3: 'password',
       title: '修改密码',
       modalWidth: 800,
       visible: false,
@@ -86,6 +99,7 @@ export default {
     }
   },
   methods: {
+    ...mapActions(['Logout']),
     show (uname) {
       if (!uname) {
         this.$message.warning('当前系统无登录用户!')
@@ -117,6 +131,9 @@ export default {
               console.log(res)
               that.$message.success(res.message)
               that.close()
+              that.Logout().then(()=>{
+                window.location.replace('/user/login')
+              })
             } else {
               that.$message.warning(res.message)
             }

jero-web/src/views/system/modules/UserModal.vue

@@ -521,7 +521,7 @@ export default {
 
   .drawer-bootom-button {
     position: absolute;
-    bottom: -8px;
+    bottom: 0px;
     width: 100%;
     border-top: 1px solid #e8e8e8;
     padding: 10px 16px;
@@ -530,4 +530,7 @@ export default {
     background: #fff;
     border-radius: 0 0 2px 2px;
   }
+  .ant-form {
+    padding-bottom: 25px;
+  }
 </style>