提交 fa83a329 编写于 作者: Yuanzhao.dai's avatar Yuanzhao.dai

数据处理

上级 6ef14288
......@@ -17,5 +17,6 @@
<router-view></router-view>
</div>
<script src="https://unpkg.com/qiniu-js@2.2.0/dist/qiniu.min.js"></script>
<script src="http://pv.sohu.com/cityjson?ie=utf-8"></script>
</body>
</html>
......@@ -2821,14 +2821,12 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
......@@ -2843,20 +2841,17 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"core-util-is": {
"version": "1.0.2",
......@@ -2973,8 +2968,7 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"ini": {
"version": "1.3.5",
......@@ -2986,7 +2980,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
......@@ -3001,7 +2994,6 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
......@@ -3009,14 +3001,12 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
......@@ -3035,7 +3025,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
......@@ -3116,8 +3105,7 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"object-assign": {
"version": "4.1.1",
......@@ -3129,7 +3117,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
......@@ -3251,7 +3238,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
......@@ -4193,6 +4179,11 @@
"resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.0.tgz",
"integrity": "sha1-Gywnmm7s44ChIWi5JIUmWzWx7/s="
},
"js-md5": {
"version": "0.7.3",
"resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz",
"integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ=="
},
"js-tokens": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
......
import fetch from '@/utils/fetch'
import { getBaseUrl } from '@/utils/index'
import { getBaseUrl, getSaasDomain } from '@/utils/index'
module.exports = {
data: function () {
......@@ -153,6 +153,20 @@ module.exports = {
data: para
})
},
// 通用saas-GET请求
saasGET(api, para, callback,str) {
// para.token = para.token || this.token || "343BCABC890349ACAF357FA79122F9FE"
let url = api + this.getUrlPara(para)
url = encodeURI(url);
return fetch({
headers: {
sysCode: 9
},
url: getSaasDomain(url),
method: 'get',
data: para
})
},
// 通用DELETE请求
DELETE(api, para, callback,str) {
......
......@@ -443,7 +443,11 @@ export const ssoLogin = (href, paramMap) => {
initEnvironment();
}
};
export const ssoLogin2 = () => { //单独部署不走saas端登录
console.log("ssoLogin2开始");
//获取用户系统信息
initEnvironment();
};
//单点登录--end
......
......@@ -11,7 +11,7 @@
</div>
<el-form ref="loginForm" :model="loginData" >
<el-form-item label="">
<el-input v-model="loginData.mobile" placeholder="手机号">
<el-input v-model="loginData.mobile" placeholder="手机号" maxlength="11">
<i slot="prefix" class="el-input__icon my-icon mobile-icon"></i>
</el-input>
</el-form-item>
......@@ -41,7 +41,7 @@
</div>
<el-form ref="loginForm" :model="resetPassword" >
<el-form-item label="">
<el-input v-model="resetPassword.mobile" placeholder="手机号">
<el-input v-model="resetPassword.mobile" placeholder="手机号" maxlength="11">
<i slot="prefix" class="el-input__icon my-icon mobile-icon"></i>
</el-input>
</el-form-item>
......@@ -84,6 +84,9 @@
</template>
<script>
import { ssoLogin2, } from '@/utils/utils';
import md5 from 'js-md5';
export default {
name: "login",
data() {
......@@ -97,6 +100,9 @@
timer: null
}
},
created() {
ssoLogin2() //初始化登录信息
},
methods: {
goToLogin() {
this.loginFlag = true
......@@ -133,13 +139,17 @@
},
login() {
let params = {
mobile: $scope.mobile,
mobile: this.loginData.mobile,
OS: localStorage.getItem("OS"),
browser: localStorage.getItem("browser"),
terminalType: localStorage.getItem("terminalType"),
ipAddress: localStorage.getItem("ipAddress"),
password: hex_md5($scope.password).toUpperCase()
password: md5(this.loginData.password).toUpperCase()
}
console.log('params',params)
this.saasGET('web/registers/saasLogin',params).then(({data}) => {
console.log('返回结果', data)
})
}
}
}
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册