Merge branch 'dev'

* dev:
  cxw-010203

src/request/index.js

@@ -21,6 +21,7 @@ function filterRequestData(obj) {
     }
     return o;
 }
+axios.defaults.withCredentials = true;
 //创建axios的实例
 const httpService = axios.create({
     baseURL: 'http://cloud.sws010.com',// TODO:具体的配置可以根据项目情况而来
@@ -34,7 +35,7 @@ httpService.interceptors.request.use(config => {
     // if(localStorage.getItem('token')){//判断浏览器中的cookie中是否存在项目的token
     //     config.headers.token = localStorage.getItem('token')
     // }\
-    config.withCredentials = true;
+    // config.withCredentials = true;
     const rqParams = filterRequestData(config.params);
     const rqData = filterRequestData(config.data);
     // post 'Content-Type' === 'application/x-www-form-urlencoded'

src/views/Login/loginForm/index.vue

@@ -14,14 +14,17 @@
             </a-form-model-item>
             <a-form-model-item label="密码" prop="sPwd">
                 <a-input v-model="form.sPwd" :type="pwdType" placeholder="请输入密码" autocomplete="off">
-                    <span slot="suffix" class="iconfont icon-zhengyan-21 login-eye" v-if="pwdType==='password'" @click="changePwdType"></span>
+                    <span slot="suffix" class="iconfont icon-zhengyan-21 login-eye" v-if="pwdType === 'password'"
+                        @click="changePwdType"></span>
                     <span slot="suffix" class="iconfont icon-in_biyan login-eye" v-else @click="changePwdType"></span>
                 </a-input>
             </a-form-model-item>
             <a-form-model-item label="验证码" prop="sVerifycode">
                 <a-input v-model="form.sVerifycode" placeholder="请输入验证码" autocomplete="off">
-                    <a-button slot="addonAfter" style="width: 100px" @click="getCode" v-if="!codeImg" :loading="btnLoading">获取验证码</a-button>
-                    <img style="width: 6rem; height: 2rem;cursor: pointer;" slot="addonAfter" :src="codeImg" @click="getCode" v-else>
+                    <a-button slot="addonAfter" style="width: 100px" @click="getCode" v-if="!codeImg"
+                        :loading="btnLoading">获取验证码</a-button>
+                    <img style="width: 6rem; height: 2rem;cursor: pointer;" slot="addonAfter" :src="codeImg"
+                        @click="getCode" v-else>
                 </a-input>
             </a-form-model-item>
         </a-form-model>
@@ -160,20 +163,24 @@ export default {
     margin: 0 auto;
     margin-top: 80px;
 }
+
 .login-eye {
     font-size: 16px;
     color: #3373cc;
     cursor: pointer;
 }
+
 .login-d1 {
     width: 380px;
     display: flex;
     justify-content: space-between;
     margin: 0 auto;
+
     .stn {
         cursor: pointer;
     }
 }
+
 .login-footer {
     position: absolute;
     width: 354px;