Merge branch 'master' of https://github.com/piexlmax/gin-vue-admin

# Conflicts:
#	QMPlusVuePage/src/view/superAdmin/api/api.vue

QMPlusVuePage/src/api/user.js

@@ -12,36 +12,48 @@ export const login = (data) => {
     })
 }
 
+// @Summary 获取验证码
+// @Produce  application/json
+// @Param data body {username:"string",password:"string"}
+// @Router /base/captcha [post]
+export const captcha = (data) => {
+    return service({
+        url: "/base/captcha",
+        method: 'post',
+        data: data
+    })
+}
+
 // @Summary 用户注册
 // @Produce  application/json
 // @Param data body {username:"string",password:"string"}
 // @Router /base/resige [post]
 export const regist = (data) => {
-    return service({
-        url: "/base/regist",
-        method: 'post',
-        data: data
-    })
-}
-// @Summary 修改密码
-// @Produce  application/json
-// @Param data body {username:"string",password:"string",newPassword:"string"}
-// @Router /user/changePassword [post]
+        return service({
+            url: "/base/regist",
+            method: 'post',
+            data: data
+        })
+    }
+    // @Summary 修改密码
+    // @Produce  application/json
+    // @Param data body {username:"string",password:"string",newPassword:"string"}
+    // @Router /user/changePassword [post]
 export const changePassword = (data) => {
-    return service({
-        url: "/user/changePassword",
-        method: 'post',
-        data: data
-    })
-}
-// @Tags User
-// @Summary 分页获取用户列表
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body modelInterface.PageInfo true "分页获取用户列表"
-// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /user/getUserList [post]
+        return service({
+            url: "/user/changePassword",
+            method: 'post',
+            data: data
+        })
+    }
+    // @Tags User
+    // @Summary 分页获取用户列表
+    // @Security ApiKeyAuth
+    // @accept application/json
+    // @Produce application/json
+    // @Param data body modelInterface.PageInfo true "分页获取用户列表"
+    // @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}"
+    // @Router /user/getUserList [post]
 export const getUserList = (data) => {
     return service({
         url: "/user/getUserList",
@@ -65,20 +77,4 @@ export const setUserAuthority = (data) => {
         method: 'post',
         data: data
     })
-}
-
-// @Tags User
-// @Summary 验证码
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body api.SetUserAuth true "设置用户权限"
-// @Success 200 {string} json "{"success":true,"data":{},"msg":"修改成功"}"
-// @Router /user/setUserAuthority [post]
-export const captcha = (data) => {
-    return service({
-        url: "/base/captcha",
-        method: 'post',
-        data: data
-    })
-}
+}

QMPlusVuePage/src/view/login/login.vue

@@ -16,10 +16,11 @@
             <i :class="'el-input__icon el-icon-' + lock" @click="changeLock" slot="suffix"></i>
           </el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item style="position:relative">
           <el-input
             v-model="loginForm.captcha"
             name="logVerify"
+            placeholder="请输入验证码"
             maxlength="10"
           />
           <img :src="path + picPath" alt="请输入验证码" @click="loginVefify()" class="vPic">
@@ -98,7 +99,6 @@ export default {
       this.lock === 'lock' ? (this.lock = 'unlock') : (this.lock = 'lock')
     },
     loginVefify() {
-      console.log(this.logVerify)
       captcha({}).then(ele=>{
         this.picPath = ele.data.picPath
         this.loginForm.captchaId = ele.data.captchaId
@@ -122,6 +122,7 @@ export default {
   .vPic{
     position: absolute;
     right: 10px;
+    bottom: 0px;   // 适配ie
   }
 }
 </style>

QMPlusVuePage/src/view/superAdmin/api/api.vue

@@ -25,14 +25,15 @@
             <el-tag
               :key="scope.row.methodFiletr"
               :type="scope.row.method|tagTypeFiletr"
-              effect="dark"
-              size="mini"
-            >{{scope.row.method|methodFiletr}}</el-tag>
+               size="mini"
+              effect="dark">
+              {{scope.row.method|methodFiletr}}
+            </el-tag>
             <!-- {{scope.row.method|methodFiletr}} -->
           </div>
         </template>
       </el-table-column>
-
+      
       <el-table-column fixed="right" label="操作" width="200">
         <template slot-scope="scope">
           <el-button @click="editApi(scope.row)" size="small" type="text">编辑</el-button>