Skip to content

Z
zhichan
Commit c54c9f34 by 刘泽奇
Options

123

parent 459d8f60
Showing with 97 additions and 70 deletions
igirl-channel-web/app/front/vues/pages/bwselftmreg/bwselftmreg.js
...@@ -330,24 +330,6 @@ ...@@ -330,24 +330,6 @@
created: function() { created: function() {
var that = this; var that = this;
var itemCode = this.$router.history.current.query.itemCode || 'zzsbzc'; var itemCode = this.$router.history.current.query.itemCode || 'zzsbzc';
var orderParams = this.$router.history.current.query.orderParams;
if (this.$route.query.channelUserId) {
this.$root.channelUserId = this.$route.query.channelUserId;
console.log(this.$route.query.channelUserId, "11111111111ddd");
}
if (orderParams) {
this.form = orderParams.tm;
this.apply = orderParams.apply;
this.nclOne = orderParams.nclones;
this.step = orderParams.step;
}
if (itemCode != null) {
this.itemCode = itemCode;
} else {
this.$message.warning('code参数错误');
return;
}
var scrollTop = document.documentElement.scrollTop || window.pageYOffset;
this.toTop(); this.toTop();
...@@ -355,16 +337,17 @@ ...@@ -355,16 +337,17 @@
watch: { watch: {
nclOne: { nclOne: {
handler(newVal, oldVal){ handler(newVal, oldVal){
this.form.totalSum = 0; if (!this.$router.history.current.query.orderParams) {
console.log(newVal.length, 1111111111111, oldVal.length); this.form.totalSum = 0;
newVal.map((item, index) => { console.log(newVal.length, 1111111111111, oldVal.length);
if (item.nclThree.length > 10) { newVal.map((item, index) => {
this.form.totalSum += Number((item.nclThree.length - 10) * (this.dataList.publicExpense / 10) + this.dataList.proPrice) if (item.nclThree.length > 10) {
} else { this.form.totalSum += Number((item.nclThree.length - 10) * (this.dataList.publicExpense / 10) + this.dataList.proPrice)
this.form.totalSum += Number(this.dataList.proPrice); } else {
} this.form.totalSum += Number(this.dataList.proPrice);
}); }
});
}
}, },
deep: true deep: true
} }
...@@ -373,6 +356,7 @@ ...@@ -373,6 +356,7 @@
this.titleName = this.$route.query.dqName || '商标注册服务'; this.titleName = this.$route.query.dqName || '商标注册服务';
this.listPath.path = this.$route.query.dqPath ? `/${this.$root.channelName}` + this.$route.query.dqPath : `/${this.$root.channelName}/jdtrademark`; this.listPath.path = this.$route.query.dqPath ? `/${this.$root.channelName}` + this.$route.query.dqPath : `/${this.$root.channelName}/jdtrademark`;
this.$root.selfFooterShow = false; this.$root.selfFooterShow = false;
this.getCache();
this.getItemCode(); this.getItemCode();
this.getOss(); this.getOss();
this.noLoginMask(); this.noLoginMask();
...@@ -386,6 +370,16 @@ ...@@ -386,6 +370,16 @@
*/ */
}, },
methods: { methods: {
getCache(){
var orderParams = this.$router.history.current.query.orderParams;
if (orderParams && localStorage.bwSubHistory) {
this.form = orderParams.tm;
this.apply = orderParams.apply;
this.nclOne = orderParams.nclones;
this.step = orderParams.step;
localStorage.removeItem('bwSubHistory');
}
},
goGsbLogin(){ goGsbLogin(){
this.toLogin = false; this.toLogin = false;
location.href = `https://www.gongsibao.com/user.php?redirect=${encodeURIComponent('https://zcchannelweb.gongsibao.com/gsbhome?state=selftmreg')}`; location.href = `https://www.gongsibao.com/user.php?redirect=${encodeURIComponent('https://zcchannelweb.gongsibao.com/gsbhome?state=selftmreg')}`;
...@@ -1185,7 +1179,7 @@ ...@@ -1185,7 +1179,7 @@
}, },
submitForm(formName, agree) { submitForm(formName, agree) {
console.log(agree,"mmmmmmmmmmmmmmmmmmmmmmmmmmmmmm"); console.log(agree, "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmm");
var that = this; var that = this;
if (this.nclOne.length > 0) { if (this.nclOne.length > 0) {
console.log(this.nclOne, ",,,,,,,,,,,,,,,,,,,,,,,,"); console.log(this.nclOne, ",,,,,,,,,,,,,,,,,,,,,,,,");
...@@ -1199,7 +1193,7 @@ ...@@ -1199,7 +1193,7 @@
this.$message.warning("请完善信息"); this.$message.warning("请完善信息");
console.log("]]]]]]]]]]]]]]]]]]]]]]]]]]]]]"); console.log("]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
return return
}else{ } else {
this.showConfrim = false; this.showConfrim = false;
} }
} else { } else {
...@@ -1207,7 +1201,7 @@ ...@@ -1207,7 +1201,7 @@
this.$message.warning("请完善信息"); this.$message.warning("请完善信息");
return return
console.log('ttttttttttttttttttttttttttt'); console.log('ttttttttttttttttttttttttttt');
}else{ } else {
this.showConfrim = false; this.showConfrim = false;
} }
} }
...@@ -1374,39 +1368,64 @@ ...@@ -1374,39 +1368,64 @@
}); });
break; break;
case 'bw': case 'bw':
var obj = {
tm: that.form, if ($.cookie('userpin') && $.cookie('userpin') != '') {
apply: that.apply, var obj = {
nclones: that.nclOne, tm: that.form,
itemCode: that.dataList.channelItemCode, apply: that.apply,
channelUser: { nclones: that.nclOne,
channelUserId: that.$route.query.channelUserId itemCode: that.dataList.channelItemCode,
}, channelUser: {
channelOrder: { channelUserId: that.$route.query.channelUserId
quantity: 1, },
payStatus: "dfk" channelOrder: {
} quantity: 1,
}; payStatus: "dfk"
obj.tm.tmFormType = that.form.tmFormType.toString(); }
this.$root.loading = true; };
var jdObj = that.$root.copyParams(obj, "subTmOrder", "/action/tmOrder/springBoard", "yes", "yes"); obj.tm.tmFormType = that.form.tmFormType.toString();
that.$root.postReq("/web/trademark/tmqueryCtl/doPost", jdObj).then(function (d) { this.$root.loading = true;
that.$root.loading = false; var jdObj = that.$root.copyParams(obj, "subTmOrder", "/action/tmOrder/springBoard", "yes", "yes");
console.log(`///////////////////////////////`, d); that.$root.postReq("/web/trademark/tmqueryCtl/doPost", jdObj).then(function (d) {
if (d.status == 0) { that.$root.loading = false;
that.$router.push({ console.log(`///////////////////////////////`, d);
path: `/${that.$root.channelName}/orderpay`, if (d.status == 0) {
query: { orderNo: d.data.orderNo } that.$router.push({
}); path: `/${that.$root.channelName}/orderpay`,
} else { query: { orderNo: d.data.orderNo }
console.log(d, "subTmOrder.........."); });
that.$message.warning(d.msg); } else {
} console.log(d, "subTmOrder..........");
}).catch(function (e) { that.$message.warning(d.msg);
console.log(e, "llllllllllllllllllllllllllllllllll"); }
that.$root.loading = false; }).catch(function (e) {
that.$message.warning("操作失败"); console.log(e, "llllllllllllllllllllllllllllllllll");
}); that.$root.loading = false;
that.$message.warning("操作失败");
});
} else {
var obj = {
tm: that.form,
apply: that.apply,
nclones: that.nclOne,
itemCode: that.dataList.channelItemCode,
channelUser: {
channelUserId: that.$route.query.channelUserId
},
channelOrder: {
quantity: 1,
payStatus: "dfk"
}
};
obj.step = that.step;
localStorage.bwSubHistory = JSON.stringify(obj);
that.$message.warning("登录后重试");
that.$router.push({
path: `/${that.$root.channelName}/login`,
});
}
break; break;
default: default:
...@@ -1641,7 +1660,6 @@ ...@@ -1641,7 +1660,6 @@
if (scrollTop != 0) { if (scrollTop != 0) {
let timer = setInterval(() => { let timer = setInterval(() => {
window.scrollTo(0, scrollTop -= 20); window.scrollTo(0, scrollTop -= 20);
console.log(scrollTop);
if (scrollTop <= 0) clearInterval(timer); if (scrollTop <= 0) clearInterval(timer);
}, 0); }, 0);
}; };
......
igirl-channel-web/app/front/vues/pages/jdtrademark/jdtrademark.js
...@@ -269,16 +269,13 @@ ...@@ -269,16 +269,13 @@
if (code.channelItemCode) { if (code.channelItemCode) {
switch (code.itemCode) { switch (code.itemCode) {
case "zzsbzc": case "zzsbzc":
if ($.cookie('userpin') && $.cookie('userpin') != "") {
this.$router.push({ this.$router.push({
path: `/${this.$root.channelName}/bwselftmreg`, query: { path: `/${this.$root.channelName}/bwselftmreg`, query: {
sdsId: code.channelItemCode sdsId: code.channelItemCode
} }
}); });
} else {
this.$message("请登录");
this.$router.push({ path: `/${this.$root.channelName}/login` });
}
/*this.$router.push({ path: "/jd/selftmreg", query: {} });*/ /*this.$router.push({ path: "/jd/selftmreg", query: {} });*/
break; break;
case "fzsbzc": case "fzsbzc":
......
igirl-channel-web/app/front/vues/pages/login/login.js
...@@ -292,6 +292,18 @@ ...@@ -292,6 +292,18 @@
$.cookie('userpin', d.data.userpin); $.cookie('userpin', d.data.userpin);
this.$root.user_Name = d.data.userName; this.$root.user_Name = d.data.userName;
this.$root.channelUserId = d.data.channelUserId; this.$root.channelUserId = d.data.channelUserId;
if (this.$store.state.reqUrl == `/${this.$root.channelName}/bwselftmreg`) {
let { bwSubHistory } = localStorage;
console.log(bwSubHistory, ".................................");
if (bwSubHistory) {
this.$router.push({
path: `${this.$store.state.reqUrl}`,
query: { channelUserId: d.data.channelUserId, sdsId: 'zzsbzc', orderParams: { ...JSON.parse(bwSubHistory) } }
})
}
return;
}
if (!this.$store.state.reqUrl || this.$store.state.reqUrl == '/' || this.$store.state.reqUrl == `/${this.$root.channelName}/register`) { if (!this.$store.state.reqUrl || this.$store.state.reqUrl == '/' || this.$store.state.reqUrl == `/${this.$root.channelName}/register`) {
this.$router.push({ this.$router.push({
path: `/${this.$root.channelName}/jdtrademark`, path: `/${this.$root.channelName}/jdtrademark`,
......
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