Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

ys_vue/src/views/Home.vue

@@ -252,7 +252,7 @@
             </el-form-item>
           </el-form>
           <div slot="footer" class="dialog-footer">
-            <el-button @click.native="editPassWord = false">取消</el-button>
+            <el-button @click.native="editInformation = false">取消</el-button>
             <el-button type="primary" @click.native="editInfo" :loading="editLoading2">提交</el-button>
           </div>
         </el-dialog>