Skip to content

Z
zhichan
Commit 538168e7 by 刘泽奇
Options

123

parent 6161f905
Showing with 57 additions and 79 deletions
igirl-channel-jdweb/app/front/entry/public/js/index.js
...@@ -167,6 +167,7 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -167,6 +167,7 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
}); });
$("#app").css("visibility", 'visible'); $("#app").css("visibility", 'visible');
this.loading = false; this.loading = false;
this.channelName = location.hash.split('/')[1];
}, },
updated() { updated() {
...@@ -183,8 +184,6 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -183,8 +184,6 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
}, 500); }, 500);
var self = this; var self = this;
if (!this.currentUser) { if (!this.currentUser) {
this.logins.push({ "icon": "el-icon-location-outline", "title": "登录", "type": "text", key: "login", "isOnGrid": true }); this.logins.push({ "icon": "el-icon-location-outline", "title": "登录", "type": "text", key: "login", "isOnGrid": true });
...@@ -199,7 +198,6 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -199,7 +198,6 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
getChannelPath() { getChannelPath() {
var from = this.$route.path; var from = this.$route.path;
var path = from.split('/')[1]; var path = from.split('/')[1];
this.channelName = path;
return path; return path;
}, },
......
igirl-channel-jdweb/app/front/vues/pages/OAjdcompany/OAjdcompany.js
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
template: '${tmpl}', template: '${tmpl}',
data: function() { data: function() {
return { return {
listPath: { path: '/1688/jdindentlist', query: {} }, listPath: { path: `/${this.$root.channelName}/jdindentlist`, query: {} },
currentStep:1, currentStep:1,
companyData:[], companyData:[],
} }
......
igirl-channel-jdweb/app/front/vues/pages/OAjddetails/OAjddetails.js
...@@ -318,7 +318,7 @@ ...@@ -318,7 +318,7 @@
show: false, show: false,
}, },
listPath: { listPath: {
path: '/1688/jdindentlist', path: `/${this.$root.channelName}/jdindentlist`,
query: { query: {
channelUserId: this.$route.query.channelUserId, channelUserId: this.$route.query.channelUserId,
deliveryOrderNo: this.deliveryOrderNo, deliveryOrderNo: this.deliveryOrderNo,
......
igirl-channel-jdweb/app/front/vues/pages/OAjdlist/OAjdlist.js
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
this.currentOrderType = row.itemName; this.currentOrderType = row.itemName;
this.deliveryStatus = row.deliveryStatus; this.deliveryStatus = row.deliveryStatus;
this.$router.push({ this.$router.push({
path: "/1688/jdindentdetail", path: `/${this.$root.channelName}/jdindentdetail`,
query: { query: {
deliveryOrderNo: row.deliveryOrderNo, deliveryOrderNo: row.deliveryOrderNo,
channelUserId: this.$route.query.channelUserId, channelUserId: this.$route.query.channelUserId,
...@@ -341,7 +341,7 @@ ...@@ -341,7 +341,7 @@
goScheme(index, row){ goScheme(index, row){
console.log(index, row); console.log(index, row);
this.$router.push({ this.$router.push({
path: '/1688/jdregscheme', path: `/${this.$root.channelName}/jdregscheme`,
query: { query: {
channelUserId: this.$route.query.channelUserId, channelUserId: this.$route.query.channelUserId,
deliveryOrderNo: row.deliveryOrderNo, deliveryOrderNo: row.deliveryOrderNo,
...@@ -350,7 +350,7 @@ ...@@ -350,7 +350,7 @@
}, },
goSelftmreg(index, row){ goSelftmreg(index, row){
this.$router.push({ this.$router.push({
path: '/1688/selftmreg', path:`/${this.$root.channelName}/selftmreg`,
query: { query: {
channelUserId: this.$route.query.channelUserId, channelUserId: this.$route.query.channelUserId,
deliveryOrderNo: row.deliveryOrderNo, deliveryOrderNo: row.deliveryOrderNo,
......
igirl-channel-jdweb/app/front/vues/pages/companydetail/companydetail.js
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
template: '${tmpl}', template: '${tmpl}',
data: function() { data: function() {
return { return {
listPath: { path: '/1688/jdindentlist', query: {} }, listPath: { path: `/${this.$root.channelName}/jdindentlist`, query: {} },
currentStep:1, currentStep:1,
companyData:[], companyData:[],
} }
......
igirl-channel-jdweb/app/front/vues/pages/icorder/icorder.js
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
return { return {
name: '', name: '',
path:{ path:{
path:"/jd/jdicbc" path:`/${this.$root.channelName}/jdicbc`
}, },
company: {}, company: {},
input: '', input: '',
......
igirl-channel-jdweb/app/front/vues/pages/jdbycnoticetm/jdbycnoticetm.js
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
console.log(url); console.log(url);
this.$root.pushx({ this.$root.pushx({
title:"", title:"",
name: "/1688/bycnoticeindex", name: `/${this.$root.channelName}/bycnoticeindex`,
params: { noticetype: this.noticetype, noticenumber: this.noticenumber } params: { noticetype: this.noticetype, noticenumber: this.noticenumber }
}); });
}else{ }else{
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
console.log(base); console.log(base);
console.log(url);this.$root.pushx({ console.log(url);this.$root.pushx({
title:"", title:"",
name: "/1688/bycnoticeindex", name: `/${this.$root.channelName}/bycnoticeindex`,
params: { noticetype: "TMZCSQ", noticenumber: row.notice_issue } params: { noticetype: "TMZCSQ", noticenumber: row.notice_issue }
}); });
} }
......
igirl-channel-jdweb/app/front/vues/pages/jdbycquerytm/jdbycquerytm.js
...@@ -1485,7 +1485,7 @@ ...@@ -1485,7 +1485,7 @@
window.open(url); window.open(url);
*/ */
let routeData = this.$router.resolve({ let routeData = this.$router.resolve({
path: "/jd/jdbycnoticetm", path: `/${this.$root.channelName}/jdbycnoticetm`,
query: { query: {
name: 'lei', name: 'lei',
age: 18, age: 18,
......
igirl-channel-jdweb/app/front/vues/pages/jdicbc/jdicbc.js
...@@ -363,7 +363,7 @@ ...@@ -363,7 +363,7 @@
sitcity: 1, sitcity: 1,
}; };
this.$router.push({ this.$router.push({
path: "/1688/icorder", path: `/${this.$root.channelName}/icorder`,
query: { obj: JSON.stringify(obj) } query: { obj: JSON.stringify(obj) }
}); });
} }
......
igirl-channel-jdweb/app/front/vues/pages/jdindentdetail/jdindentdetail.js
...@@ -318,7 +318,7 @@ ...@@ -318,7 +318,7 @@
show: false, show: false,
}, },
listPath: { listPath: {
path: '/1688/jdindentlist', path: `/${this.$root.channelName}/jdindentlist`,
query: { query: {
channelUserId: this.$route.query.channelUserId, channelUserId: this.$route.query.channelUserId,
deliveryOrderNo: this.deliveryOrderNo, deliveryOrderNo: this.deliveryOrderNo,
......
igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.js
...@@ -511,7 +511,7 @@ ...@@ -511,7 +511,7 @@
this.currentOrderType = row.itemName; this.currentOrderType = row.itemName;
this.deliveryStatus = row.deliveryStatus; this.deliveryStatus = row.deliveryStatus;
this.$router.push({ this.$router.push({
path: "/1688/jdindentdetail", path: `/${this.$root.channelName}/jdindentdetail`,
query: { query: {
deliveryOrderNo: row.deliveryOrderNo, deliveryOrderNo: row.deliveryOrderNo,
channelUserId: this.$route.query.channelUserId, channelUserId: this.$route.query.channelUserId,
...@@ -564,7 +564,7 @@ ...@@ -564,7 +564,7 @@
goScheme(index, row){ goScheme(index, row){
console.log(index, row); console.log(index, row);
this.$router.push({ this.$router.push({
path: '/1688/jdregscheme', path: `/${this.$root.channelName}/jdregscheme`,
query: { query: {
channelUserId: this.$route.query.channelUserId, channelUserId: this.$route.query.channelUserId,
deliveryOrderNo: row.deliveryOrderNo, deliveryOrderNo: row.deliveryOrderNo,
...@@ -573,7 +573,7 @@ ...@@ -573,7 +573,7 @@
}, },
goSelftmreg(index, row){ goSelftmreg(index, row){
this.$router.push({ this.$router.push({
path: '/1688/selftmreg', path: `/${this.$root.channelName}/selftmreg`,
query: { query: {
channelUserId: this.$route.query.channelUserId, channelUserId: this.$route.query.channelUserId,
deliveryOrderNo: row.deliveryOrderNo, deliveryOrderNo: row.deliveryOrderNo,
......
igirl-channel-jdweb/app/front/vues/pages/jdregscheme/jdregscheme.js
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
if (d.status == 0) { if (d.status == 0) {
this.$router.push({ this.$router.push({
path: "/1688/jdindentlist", path: `/${this.$root.channelName}/jdindentlist`,
query: { query: {
deliveryOrderNo: this.deliveryOrderNo, deliveryOrderNo: this.deliveryOrderNo,
channelUserId: this.$route.query.channelUserId, channelUserId: this.$route.query.channelUserId,
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
type: 'success' type: 'success'
}); });
this.$router.push({ this.$router.push({
path: "/1688/jdindentlist", path: `/${this.$root.channelName}/jdindentlist`,
query: { query: {
deliveryOrderNo: this.deliveryOrderNo, deliveryOrderNo: this.deliveryOrderNo,
channelUserId: this.$route.query.channelUserId, channelUserId: this.$route.query.channelUserId,
......
igirl-channel-jdweb/app/front/vues/pages/jdtrademark/jdtrademark.js
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
}, },
goSearch(){ goSearch(){
this.$router.push({ this.$router.push({
path: "/jd/jdbycquerytm", path: `/${this.$root.channelName}/jdbycquerytm`,
query: { query: {
checkedNcl: JSON.stringify(this.checkedType), checkedNcl: JSON.stringify(this.checkedType),
tminput: this.searchValue, tminput: this.searchValue,
......
igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.js
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
}; };
return { return {
listPath: { listPath: {
path: '/jd/jdtrademark', path: `/${this.$root.channelName}/jdtrademark`,
query: { query: {
channelUserId: this.$route.query.channelUserId, channelUserId: this.$route.query.channelUserId,
deliveryOrderNo: this.deliveryOrderNo, deliveryOrderNo: this.deliveryOrderNo,
...@@ -379,9 +379,7 @@ ...@@ -379,9 +379,7 @@
}, },
mounted: function() { mounted: function() {
this.$root.getChannelPath();
var that = this; var that = this;
that.toTop();
console.log(this.tm_form_type); console.log(this.tm_form_type);
var obj = this.$root.copyParams("", "getOssConfig", "/action/tmTools/springBoard"); var obj = this.$root.copyParams("", "getOssConfig", "/action/tmTools/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) { this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
...@@ -1132,7 +1130,12 @@ ...@@ -1132,7 +1130,12 @@
this.showConfrim = false; this.showConfrim = false;
}, },
submitForm(formName, agree) { submitForm(formName, agree) {
/** this.step++; */
console.log(document.documentElement.scrollTop, "llllllllllllllllllllll");
/*
*/
var that = this; var that = this;
if (this.nclOne.length > 0) { if (this.nclOne.length > 0) {
console.log(this.nclOne, ",,,,,,,,,,,,,,,,,,,,,,,,"); console.log(this.nclOne, ",,,,,,,,,,,,,,,,,,,,,,,,");
...@@ -1157,10 +1160,16 @@ ...@@ -1157,10 +1160,16 @@
} }
}); });
} }
if (this.form.tmFormType == "4") {
if (!this.form.tmName || !this.form.colorizedPicUrl) { if (!this.form.colorizedPicUrl) {
this.$message.warning("请完善信息"); this.$message.warning("请完善信息");
return false; return;
}
} else {
if (!this.form.tmName || !this.form.colorizedPicUrl) {
this.$message.warning("请完善信息");
return;
}
} }
if (formName == "form" || formName == "apply") { if (formName == "form" || formName == "apply") {
if (formName == "apply") { if (formName == "apply") {
...@@ -1196,42 +1205,24 @@ ...@@ -1196,42 +1205,24 @@
this.savehistory(); this.savehistory();
console.log(this.$root.channelName, "///////////////"); console.log(this.$root.channelName, "///////////////");
if (this.$root.channelName == "jd") { if (this.$root.channelName == "jd") {
var obj = { tm: this.form, apply: this.apply, nclones: this.nclOne, itemCode: this.itemCode };
if (!this.currentUser) {
obj["step"] = this.step;
localStorage.setItem("afterLogin", JSON.stringify({
title: "自主商标注册",
name: "/selftmreg",
params: { itemCode: this.itemCode, orderParams: obj }
}));
this.$root.pushx({
title: "登录",
name: "/login"
});
return false;
}
/**提报接口 */ /**提报接口 */
that.$root.postReq("/web/orderCtl/createTmOrder", obj).then(function (d) { var obj = {
if (d.code == "1") { tm: that.form,
var order = d.data; apply: that.apply,
that.toTop(); nclones: that.nclOne,
that.$message.warning("订单提交成功"); itemCode: that.itemCode,
that.$root.pushx({ };
title: "订单支付", var jdObj = that.$root.copyParams(obj, "subTmOrder", "/action/tmOrder/springBoard", "yes", "yes");
name: "/orderpay", that.$root.postReq("/web/trademark/tmqueryCtl/doPost", jdObj).then(function (d) {
params: { if (d.status == 0) {
orderNum: order.code console.log(`///////////////////////////////`, d);
}
});
} else { } else {
that.$message.warning(d.msg); console.log(d);
} }
that.$root.hideMask();
}).catch(function (e) { }).catch(function (e) {
that.$message.warning("操作失败"); that.$message.warning("操作失败");
that.$root.hideMask();
}); });
} else if (this.$root.channelName == "1688") { } else if (this.$root.channelName == "1688") {
console.log(this.$route.query.channelOrderNo, ">>>>>>>>>>>>>>>>>>>>>>>"); console.log(this.$route.query.channelOrderNo, ">>>>>>>>>>>>>>>>>>>>>>>");
that.orderSubInfo = { that.orderSubInfo = {
...@@ -1256,7 +1247,7 @@ ...@@ -1256,7 +1247,7 @@
that.toTop(); that.toTop();
console.log(that.orderSubInfo, ",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"); console.log(that.orderSubInfo, ",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,");
that.$router.push({ that.$router.push({
path: "/1688/jdindentlist", path: `/${this.$root.channelName}/jdindentlist`,
query: { query: {
channelUserId: that.$route.query.channelUserId, channelUserId: that.$route.query.channelUserId,
} }
...@@ -1276,23 +1267,6 @@ ...@@ -1276,23 +1267,6 @@
}); });
}) })
} }
/*
if (!this.currentUser) {
obj["step"] = this.step;
localStorage.setItem("afterLogin", JSON.stringify({
title: "自主商标注册",
name: "/selftmreg",
params: { itemCode: this.itemCode, orderParams: obj }
}));
this.$root.pushx({
title: "登录",
name: "/login"
});
return false;
}
*/
} }
...@@ -1386,7 +1360,7 @@ ...@@ -1386,7 +1360,7 @@
this.$refs[flag].d.key = key; this.$refs[flag].d.key = key;
}, },
tobefore(){ tobefore(){
this.toTop(); this.toTop();
this.step = Number(this.step) - 1; this.step = Number(this.step) - 1;
this.step = this.step.toString(); this.step = this.step.toString();
}, },
...@@ -1479,7 +1453,13 @@ ...@@ -1479,7 +1453,13 @@
}, },
toTop(){ toTop(){
$('#app').animate({ scrollTop: 0 }, 10); var scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
if (scrollTop != 0) {
let timer = setInterval(() => {
window.scrollTo(0, scrollTop -= 20);
if (scrollTop <= 0) clearInterval(timer);
}, 0);
};
}, },
checkClick(){ checkClick(){
......
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