Skip to content

P
pica.cloud.web-education-admin
提交 fa83a329 编写于 作者: Yuanzhao.dai's avatar Yuanzhao.dai
浏览文件
操作

数据处理

上级 6ef14288
显示空白字符变更
内嵌 并排
正在显示 包含 48 行增加 和 27 行删除
index.html
浏览文件 @ fa83a329
...@@ -17,5 +17,6 @@ ...@@ -17,5 +17,6 @@
<router-view></router-view> <router-view></router-view>
</div> </div>
<script src="https://unpkg.com/qiniu-js@2.2.0/dist/qiniu.min.js"></script> <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> </body>
</html> </html>
package-lock.json
浏览文件 @ fa83a329
...@@ -2821,14 +2821,12 @@ ...@@ -2821,14 +2821,12 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -2843,20 +2841,17 @@ ...@@ -2843,20 +2841,17 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -2973,8 +2968,7 @@ ...@@ -2973,8 +2968,7 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -2986,7 +2980,6 @@ ...@@ -2986,7 +2980,6 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -3001,7 +2994,6 @@ ...@@ -3001,7 +2994,6 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -3009,14 +3001,12 @@ ...@@ -3009,14 +3001,12 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.2.4", "version": "2.2.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.1", "safe-buffer": "^5.1.1",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -3035,7 +3025,6 @@ ...@@ -3035,7 +3025,6 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -3116,8 +3105,7 @@ ...@@ -3116,8 +3105,7 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -3129,7 +3117,6 @@ ...@@ -3129,7 +3117,6 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -3251,7 +3238,6 @@ ...@@ -3251,7 +3238,6 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -4193,6 +4179,11 @@ ...@@ -4193,6 +4179,11 @@
"resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.0.tgz", "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.0.tgz",
"integrity": "sha1-Gywnmm7s44ChIWi5JIUmWzWx7/s=" "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": { "js-tokens": {
"version": "3.0.2", "version": "3.0.2",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
......
package.json
浏览文件 @ fa83a329
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
"fastclick": "^1.0.6", "fastclick": "^1.0.6",
"iscroll": "^5.2.0", "iscroll": "^5.2.0",
"js-cookie": "^2.2.0", "js-cookie": "^2.2.0",
"js-md5": "^0.7.3",
"showdown": "^1.6.4", "showdown": "^1.6.4",
"vue": "^2.1.0", "vue": "^2.1.0",
"vue-router": "^2.1.1", "vue-router": "^2.1.1",
......
src/utils/mixins.js
浏览文件 @ fa83a329
import fetch from '@/utils/fetch' import fetch from '@/utils/fetch'
import { getBaseUrl } from '@/utils/index' import { getBaseUrl, getSaasDomain } from '@/utils/index'
module.exports = { module.exports = {
data: function () { data: function () {
...@@ -153,6 +153,20 @@ module.exports = { ...@@ -153,6 +153,20 @@ module.exports = {
data: para 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请求
DELETE(api, para, callback,str) { DELETE(api, para, callback,str) {
......
src/utils/utils.js
浏览文件 @ fa83a329
...@@ -443,7 +443,11 @@ export const ssoLogin = (href, paramMap) => { ...@@ -443,7 +443,11 @@ export const ssoLogin = (href, paramMap) => {
initEnvironment(); initEnvironment();
} }
}; };
export const ssoLogin2 = () => { //单独部署不走saas端登录
console.log("ssoLogin2开始");
//获取用户系统信息
initEnvironment();
};
//单点登录--end //单点登录--end
......
src/views/login.vue
浏览文件 @ fa83a329
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</div> </div>
<el-form ref="loginForm" :model="loginData" > <el-form ref="loginForm" :model="loginData" >
<el-form-item label=""> <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> <i slot="prefix" class="el-input__icon my-icon mobile-icon"></i>
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</div> </div>
<el-form ref="loginForm" :model="resetPassword" > <el-form ref="loginForm" :model="resetPassword" >
<el-form-item label=""> <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> <i slot="prefix" class="el-input__icon my-icon mobile-icon"></i>
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -84,6 +84,9 @@ ...@@ -84,6 +84,9 @@
</template> </template>
<script> <script>
import { ssoLogin2, } from '@/utils/utils';
import md5 from 'js-md5';
export default { export default {
name: "login", name: "login",
data() { data() {
...@@ -97,6 +100,9 @@ ...@@ -97,6 +100,9 @@
timer: null timer: null
} }
}, },
created() {
ssoLogin2() //初始化登录信息
},
methods: { methods: {
goToLogin() { goToLogin() {
this.loginFlag = true this.loginFlag = true
...@@ -133,13 +139,17 @@ ...@@ -133,13 +139,17 @@
}, },
login() { login() {
let params = { let params = {
mobile: $scope.mobile, mobile: this.loginData.mobile,
OS: localStorage.getItem("OS"), OS: localStorage.getItem("OS"),
browser: localStorage.getItem("browser"), browser: localStorage.getItem("browser"),
terminalType: localStorage.getItem("terminalType"), terminalType: localStorage.getItem("terminalType"),
ipAddress: localStorage.getItem("ipAddress"), 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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或