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