Skip to content

Z
zhichan
Commit 1c5d1ca2 by 刘泽奇
Options

123

parent b41072b0
Showing with 47 additions and 41 deletions
igirl-channel-web/app/front/entry/index.ejs
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="keywords" content="PAAS 开放平台"> <meta name="keywords" content="PAAS 开放平台">
<meta name="baidu-site-verification" content="lATAxZAm8y" /> <meta name="baidu-site-verification" content="lATAxZAm8y" />
<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
<meta name="viewport" content="width=device-width, initial-scale=0.8, maximum-scale=0.8, user-scalable=1"> <meta name="viewport" content="width=device-width, initial-scale=0.8, maximum-scale=0.8, user-scalable=1">
<title id="idtitle"></title> <title id="idtitle"></title>
<!-- <%=app?app.name:'应用未启用'%> --> <!-- <%=app?app.name:'应用未启用'%> -->
...@@ -104,6 +104,7 @@ ...@@ -104,6 +104,7 @@
<script src="/js/cropper/index.js"></script> <script src="/js/cropper/index.js"></script>
<script src="/js/vue/base64.js"></script> <script src="/js/vue/base64.js"></script>
<script src="/js/common.js"></script> <script src="/js/common.js"></script>
<script src="https://cdn.staticfile.org/jquery-cookie/1.4.1/jquery.cookie.min.js"></script>
<script type="module" src="/js/index.js"></script> <script type="module" src="/js/index.js"></script>
</body> </body>
......
igirl-channel-web/app/front/entry/public/js/index.js
//axios.get("/vue/comp/base").then(function(res){ //axios.get("/vue/comp/base").then(function(res){
basecomp.forEach(function (comp) { basecomp.forEach(function (comp) {
try { try {
var obj = eval("(" + comp + ")"); var obj = eval("(" + comp + ")");
...@@ -8,7 +7,6 @@ basecomp.forEach(function (comp) { ...@@ -8,7 +7,6 @@ basecomp.forEach(function (comp) {
console.log(e); console.log(e);
} }
}); });
console.log("load base component finished..."); console.log("load base component finished...");
function buildPromise(compath) { function buildPromise(compath) {
return Promise.resolve(new Promise(function (resolve, reject) { return Promise.resolve(new Promise(function (resolve, reject) {
...@@ -77,6 +75,8 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -77,6 +75,8 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
if (to.path == "/" && location.hostname == "tm.plus.jdcloud.com") { if (to.path == "/" && location.hostname == "tm.plus.jdcloud.com") {
router.replace({ path: '/jd/jdtrademark' }); router.replace({ path: '/jd/jdtrademark' });
} }
console.log(to, from);
next(); next();
}); });
Vue.use(window['vue-cropper']); Vue.use(window['vue-cropper']);
......
igirl-channel-web/app/front/vues/pages/jdtrademark/jdtrademark.js
...@@ -196,6 +196,9 @@ ...@@ -196,6 +196,9 @@
}); });
}, },
jumpJdProductDetails(code){ jumpJdProductDetails(code){
console.log(this.$root.channelName);
switch (this.$root.channelName) { switch (this.$root.channelName) {
case "jd": case "jd":
if (code.channelItemCode) { if (code.channelItemCode) {
......
igirl-channel-web/app/front/vues/pages/login/login.js
...@@ -279,26 +279,23 @@ ...@@ -279,26 +279,23 @@
}; };
that.$refs.form2.validate(valid => { that.$refs.form2.validate(valid => {
if (valid) { if (valid) {
that.$root.postReq("/web/userCtl/login", { u: obj }).then(function (d) { var userInfo = that.$root.copyParams(obj, "userPinByLgoin", "/auth/accessAuth/springBoard");
console.log(userInfo, 'mmmmmmmmmmmmmmmmmmmmmm');
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", userInfo).then((d) => {
if (d.status == 0) { if (d.status == 0) {
that.$root.refreshLoginState(() => { $.cookie('channelUserId', this.$root.channelUserId);
console.log("....................................................................................innner"); this.$root.channelUserId = decodeURIComponent(d.data.channelUserId);
var afto = localStorage.getItem("afterLogin"); $.cookie('channelUserId', d.data.channelUserId);
if (afto) { $.cookie('userName', d.data.userName);
that.$root.pushx(JSON.parse(afto)); console.log("返回信息", d)
localStorage.removeItem("afterLogin"); } else if (d.status == 2010) {
that.$root.removetab("/login"); console.log(d.msg);
} else { } else if (d.status == 2060) {
location.reload(); console.log(d.msg);
}
});
} else { } else {
that.$message({ console.log(d.msg);
type: 'error',
message: '用户名或密码错误，请重试.'
});
} }
}) });
} }
}); });
}, },
......
igirl-channel-web/app/front/vues/pages/register/register.html
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<el-form-item prop="password"> <el-form-item prop="password">
<el-input type="password" v-model="form4.password" placeholder="请设置6-18位密码，区分大小写"></el-input> <el-input type="password" v-model="form4.password" placeholder="请设置6-18位密码，区分大小写"></el-input>
</el-form-item> </el-form-item>
<el-form-item style="margin-bottom:8px;"> <el-button style="margin-bottom:8px;">
<el-button type="primary" class="login-content-button" @click="submitregister">注册</el-button> <el-button type="primary" class="login-content-button" @click="submitregister">注册</el-button>
</el-form-item> </el-form-item>
<div style="font-size:12px;color:#828282">点击“登录”即表示同意 <div style="font-size:12px;color:#828282">点击“登录”即表示同意
......
igirl-channel-web/app/front/vues/pages/register/register.js
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
} }
} }
if (rule.field == "code") { if (rule.field == "code") {
if (that.rcode != value) { if (that.form1.code.length != 6) {
return callback(new Error("输入验证码有误，请重新输入")); return callback(new Error("输入验证码有误，请重新输入"));
} }
} }
...@@ -161,7 +161,18 @@ ...@@ -161,7 +161,18 @@
this.resetall(); this.resetall();
}, },
obtaincode1(){ obtaincode1(){
let obj = this.$root.copyParams({ mobile: this.form1.mobile }, "getVerifyCode", "/auth/accessAuth/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
if (d.status == 0) {
console.log("返回信息", d);
} else {
console.log(d.msg);
}
});
/*
this.fetchVcode(this.form1.mobile) this.fetchVcode(this.form1.mobile)
*/
}, },
obtaincode2(){ obtaincode2(){
var that = this; var that = this;
...@@ -253,30 +264,24 @@ ...@@ -253,30 +264,24 @@
var obj = { var obj = {
mobile: that.form1.mobile, mobile: that.form1.mobile,
password: that.form1.password, password: that.form1.password,
vcode: that.form1.code,
}; };
that.$refs.form1.validate(valid => { that.$refs.form1.validate(valid => {
if (valid) { if (valid) {
that.$root.postReq("/web/userCtl/loginByMobile", { u: obj }).then(function (d) { var userInfo = that.$root.copyParams(obj, "userPinByRegister", "/auth/accessAuth/springBoard");
console.log(userInfo, 'mmmmmmmmmmmmmmmmmmmmmm');
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", userInfo).then((d) => {
if (d.status == 0) { if (d.status == 0) {
console.log("..................................................helllo.................................."); this.$root.channelUserId = d.data.channelUserId;
that.$root.refreshLoginState(() => { console.log("返回信息", d)
console.log("....................................................................................innner"); } else if (d.status == 2030) {
var afto = localStorage.getItem("afterLogin"); console.log(d.msg);
if (afto) { } else if (d.status == 2060) {
that.$root.pushx(JSON.parse(afto)); console.log(d.msg);
localStorage.removeItem("afterLogin"); } else {
that.$root.removetab("/login"); console.log(d.msg);
} else {
location.reload();
that.$root.pushx({
title: "首页",
name: "/"
})
}
});
} }
}) });
} else { } else {
console.log('输入有误') console.log('输入有误')
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment