Skip to content

Z
zhichan
Commit 9920b13c by 刘泽奇
Options

123

parent bf571b0a
Showing with 113 additions and 199 deletions
igirl-channel-web/app/front/entry/public/js/index.js
...@@ -295,6 +295,9 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -295,6 +295,9 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
$.removeCookie("channelUserId"); $.removeCookie("channelUserId");
this.$root.user_Name = ""; this.$root.user_Name = "";
this.$root.channelUserId = ''; this.$root.channelUserId = '';
this.$router.push({
path: `/${_this.$root.channelName}/jdtrademark`
});
this.$message("您已退出"); this.$message("您已退出");
} else { } else {
console.log(d.msg); console.log(d.msg);
...@@ -550,46 +553,16 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => { ...@@ -550,46 +553,16 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
getReq(path, data) { getReq(path, data) {
var self = this; var self = this;
return axios.get(path, { params: data, "headers": { "codepath": this.codePath } }).then(function (r) { return axios.get(path, { params: data, "headers": { "codepath": this.codePath } }).then(function (r) {
if (r && r.data && r.data.status == -99) {
self.$store.state.currentUser = null;
self.hideMask();
self.hideMenu();
self.$router.push("/");
self.$message({
message: '扫码成为合伙人',
type: 'warning'
});
self.showLogin();
return null; return r.data ? r.data : null;;
} else {
if (r.data && r.data.bizmsg && r.data.bizmsg != "empty") {
self.$message({
message: r.data.bizmsg,
type: 'warning'
});
}
return r.data ? r.data : null;;
}
}); });
}, },
postReq(path, data) { postReq(path, data) {
return axios.post(path, data, { "headers": { 'codepath': this.codePath } }).then(function (r) { return axios.post(path, data, { "headers": { 'codepath': this.codePath } }).then(function (r) {
if (r && r.data && r.data.status == -99) {
self.$store.state.currentUser = null; return r.data ? r.data : null;
self.hideMask();
self.hideMenu();
self.$router.push("/");
self.$message({
message: '扫码成为合伙人',
type: 'warning'
});
self.showLogin();
return null;
} else {
return r.data ? r.data : null;
}
}); });
}, },
}, },
......
igirl-channel-web/app/front/vues/pages/bwselftmreg/bwselftmreg.js
...@@ -1398,12 +1398,16 @@ ...@@ -1398,12 +1398,16 @@
that.$root.loading = false; that.$root.loading = false;
console.log(`///////////////////////////////`, d); console.log(`///////////////////////////////`, d);
if (d.status == 0) { if (d.status == 0) {
location.href = d.data.payUrl; that.$router.push({
path: `/${that.$root.channelName}/orderpay`,
query: { orderNo: d.data.orderNo }
});
} else { } else {
console.log(d, "subTmOrder.........."); console.log(d, "subTmOrder..........");
that.$message.warning(d.msg); that.$message.warning(d.msg);
} }
}).catch(function (e) { }).catch(function (e) {
console.log(e, "llllllllllllllllllllllllllllllllll");
that.$root.loading = false; that.$root.loading = false;
that.$message.warning("操作失败"); that.$message.warning("操作失败");
}); });
...@@ -1432,7 +1436,11 @@ ...@@ -1432,7 +1436,11 @@
that.$root.loading = false; that.$root.loading = false;
console.log(`///////////////////////////////`, d); console.log(`///////////////////////////////`, d);
if (d.status == 0) { if (d.status == 0) {
location.href = d.data.payUrl; console.log(d);
that.$router.push({
path: `/${that.$root.channelName}/orderpay`,
query: {}
})
} else { } else {
console.log(d, "subTmOrder.........."); console.log(d, "subTmOrder..........");
that.$message.warning(d.msg); that.$message.warning(d.msg);
......
igirl-channel-web/app/front/vues/pages/jdtrademark/jdtrademark.js
...@@ -244,6 +244,7 @@ ...@@ -244,6 +244,7 @@
} }
break; break;
case "bw": case "bw":
if (code.channelItemCode) { if (code.channelItemCode) {
switch (code.itemCode) { switch (code.itemCode) {
case "zzsbzc": case "zzsbzc":
......
igirl-channel-web/app/front/vues/pages/nowbuy/nowbuy.html
...@@ -55,9 +55,7 @@ ...@@ -55,9 +55,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
</div> </div>
</div> </div>
<div class="nowbuy-footer-warpper"> <div class="nowbuy-footer-warpper">
<div class="nowbuy-footer"> <div class="nowbuy-footer">
......
igirl-channel-web/app/front/vues/pages/nowbuy/nowbuy.js
...@@ -42,12 +42,6 @@ ...@@ -42,12 +42,6 @@
num: null, num: null,
params: { params: {
itemCode: "", itemCode: "",
order_appendinfo: {
level: "",
area_list: [],
department_list: [],
type_list: []
},
apply: { apply: {
orderType: "zzdd", orderType: "zzdd",
contacts: "", contacts: "",
...@@ -80,22 +74,30 @@ ...@@ -80,22 +74,30 @@
methods: { methods: {
goOrder(){ goOrder(){
this.params.tm.totalSum = this.tableData[0].countPrice; this.params.tm.totalSum = this.tableData[0].countPrice;
this.params.tm.salesNum = Number(this.$route.query.num); this.params.tm.quantity = Number(this.$route.query.num);
this.apply.orderType = "zzdd"; this.apply.orderType = "zzdd";
this.params.apply = this.apply; this.params.apply = this.apply;
this.params.itemCode = this.tableData[0].code; this.params.itemCode = this.tableData[0].sdsId;
this.$root.postReq("/web/orderCtl/createOtherOrder", this.params).then((d) => { if (this.$root.channelUserId && this.$root.channelUserId != "") {
this.params.channelUser = {
"channelUserId": this.$root.channelUserId
};
}
var obj = this.$root.copyParams(this.params, "subOtherOrder", "/action/tmOrder/springBoard", 'yes', 'yes');
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
console.log("---------submitOrder-------"); console.log("---------submitOrder-------");
if (this.$store.state.currentUser == null) { if (this.$root.channelUserId == null) {
this.$message.warning("未登录"); this.$message.warning("未登录");
return return
} }
if (d.code == 1) { if (d.status == 0) {
this.$root.pushx({ console.log(d);
title: "订单支付", this.$router.push({
name: "/orderpay", path: `/${this.$root.channelName}/orderpay`,
params: { orderNum: d.data.code } query: {
}); orderNo: d.data.orderNo
}
})
} else { } else {
this.$message.warning(d.msg); this.$message.warning(d.msg);
} }
...@@ -106,8 +108,8 @@ ...@@ -106,8 +108,8 @@
getProduct(){ getProduct(){
var data = { ...this.$route.query }; var data = { ...this.$route.query };
this.tableData.push(data); this.tableData.push(data);
console.log(data,'!!!!!!!!!!!!!!!1'); console.log(data, '!!!!!!!!!!!!!!!1');
}, },
tiaozhuan(code) { tiaozhuan(code) {
switch (code) { switch (code) {
......
igirl-channel-web/app/front/vues/pages/orderpay/orderpay.html
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
</div> </div>
<div style="font-size:13px;color:#828282;margin-top:10px;"> <div style="font-size:13px;color:#828282;margin-top:10px;">
支付编号： 支付编号：
<span style="color:#2F2F2F;margin-right: 10px;">{{orderInfo.code}}</span> <span style="color:#2F2F2F;margin-right: 10px;">{{orderInfo.orderNo}}</span>
服务项目： 服务项目：
<span style="color:#2F2F2F;margin-right: 10px;">{{orderInfo.sveItemName}}</span> <span style="color:#2F2F2F;margin-right: 10px;">{{orderInfo.channelItemName}}</span>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
......
igirl-channel-web/app/front/vues/pages/orderpay/orderpay.js
...@@ -31,118 +31,34 @@ ...@@ -31,118 +31,34 @@
currentPay1: false, currentPay1: false,
currentPay2: false, currentPay2: false,
currentPay3: false, currentPay3: false,
d: {}
} }
}, },
mounted: function () { mounted: function () {
this.imgHeight = 'min-height:' + (document.documentElement.clientHeight - 221) + "px;"; this.imgHeight = 'min-height:' + (document.documentElement.clientHeight - 221) + "px;";
var currentUser = this.currentUser;
if (currentUser) {
var roles = currentUser.roles;
if (roles) {
this.roleList = roles.split(",");
}
}
if (this.roleList && this.roleList.length > 0) {
for (var i = 0; i < this.roleList.length; i++) {
if (this.roleList[i] == "bizemp") {
this.isBizemp = true;
}
}
}
this.orderNum = this.$router.history.current.query.orderNum;
var that = this; var that = this;
this.$root.getReq("/web/orderCtl/getItemTmOrderDetail", { var obj = this.$root.copyParams("", "getOssConfig", "/action/tmTools/springBoard");
orderNum: this.orderNum this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
}).then(function (d) {
if (d.code == 1) {
that.orderInfo = d.data;
that.closePayConfirm();
that.getPayQrCode();
}
});
this.$root.postReq("/web/uploadCtl/getOssConfig", "").then(function (d) {
that.d["key"] = "key"; that.d["key"] = "key";
that.d["Bucket"] = d.Bucket; that.d["Bucket"] = d.data.Bucket;
that.d["OSSAccessKeyId"] = d.OSSAccessKeyId; that.d["OSSAccessKeyId"] = d.data.OSSAccessKeyId;
that.d["Signature"] = d.Signature; that.d["Signature"] = d.data.Signature;
that.d["policy"] = d.policy; that.d["policy"] = d.data.policy;
that.d["success_action_status"] = d.success_action_status; that.d["success_action_status"] = d.data.success_action_status;
that.action = d.url; that.action = d.data.url;
});
this.$root.postReq("/web/moneyaccountCtl/findAllOfflineAccount", {}).then(function (d) {
if (d && d.code == 1) {
that.accounts = d.data;
if (that.accounts && that.accounts.length > 0) {
that.account_index = 0;
that.accountinfo = that.accounts[0];
that.account_id = that.accountinfo.id;
}
} else {
that.$message.warning("获取账户信息失败");
}
}).catch(function (e) {
console.log(e);
that.$message.warning("获取账户信息失败");
}); });
/*接受pay.js界面传的参数*/ this.getPayQrCode();
this.poliyLevel = this.$router.history.current.query.poliyLevel;
this.address = this.$router.history.current.query.address;
this.Department = this.$router.history.current.query.Department;
this.industry = this.$router.history.current.query.industry;
this.email = this.$router.history.current.query.email;
this.period = this.$router.history.current.query.period;
if (this.$store.state.currentUser) {
this.userName = this.$store.state.currentUser.userName;
this.userId = this.$store.state.currentUser.id;
console.log(this.userName, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxuser");
}
if (this.$store.state.currentCompany) {
this.currentCompany = this.$store.state.currentCompany.name;
console.log(this.$store.state.currentCompany, "BeginTimexxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxcurrentCompany");
};
this.Subscribe();
}, },
created: function () { created: function () {
}, },
methods: { methods: {
afterpayjump() { afterpayjump() {
var that = this; this.$router.push({
this.$root.getReq("/wxop/pushmsgWxop/getQr", {}).then(function (r) { path: `/${that.$root.channelName}/paysuccess`,
console.log("rrrrrrr"); query: {
console.log(r); totalSum: this.orderInfo.totalSum,
if (r && r.code == 1 && r.data) { orderNo: this.orderInfo.orderNo
that.$root.pushx({
title: "支付成功",
name: "/paysuccess",
params: {
orderNum: that.orderNum
}
});
} else {
if (that.isBizemp) {
that.$root.pushx({
title: "我的订单",
name: "/myordermag"
});
} else {
that.$root.pushx({
title: "我的订单",
name: "/myorder"
});
}
}
}).catch(e => {
if (that.isBizemp) {
that.$root.pushx({
title: "我的订单",
name: "/myordermag"
});
} else {
that.$root.pushx({
title: "我的订单",
name: "/myorder"
});
} }
}); });
}, },
...@@ -267,31 +183,37 @@ ...@@ -267,31 +183,37 @@
}, },
getPayQrCode: function () { getPayQrCode: function () {
var self = this; var self = this;
/*
if (!this.orderInfo || !this.orderInfo.code) { if (!this.orderInfo || !this.orderInfo.code) {
this.$message.warning(`获取支付码失败，订单信息有误`); this.$message.warning(`获取支付码失败，订单信息有误`);
return; return;
} }
self.loading = true; */
self.$root.postReq("/web/orderCtl/getQrCodeTl", { self.$root.loading = true;
code: this.orderInfo.code, let obj = self.$root.copyParams({ "opType": this.payType, "orderNo": this.$route.query.orderNo }, "getTlPayQrCode", '/action/tmOrder/springBoard');
company_id: this.orderInfo.company_id, self.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(d => {
op_type: this.payType self.$root.loading = false;
}).then(d => { console.log(d, "getQrCode........................", d.data);
console.log(d, "getQrCode........................"); if (d && d.status == 0) {
if (d && d.code == 1) {
var data = d.data; var data = d.data;
self.qrcode = "http://bigdata.gongsibao.com/api/qc?detailLink=" + encodeURIComponent(data.payinfo); this.orderInfo = d.data.order;
self.orderInfo.wxPayOrderCode = data.wxPayOrderCode; if (data.trxstatus == "0000") {
self.orderInfo.aliPayOrderCode = data.aliPayOrderCode; self.qrcode = "http://bigdata.gongsibao.com/api/qc?detailLink=" + encodeURIComponent(data.payinfo);
self.time = new Date().getTime(); self.orderInfo.wxPayOrderCode = data.trxid;
self.checkOrderStatus(); self.orderInfo.aliPayOrderCode = data.trxid;
self.time = new Date().getTime();
self.checkOrderStatus();
} else {
self.$message.warning("请刷新重试");
}
} else { } else {
console.log(d, "bbbbbbbbbbbbbbbbbbbbbbbbbbbb", d.msg);
self.$message.warning(d.msg); self.$message.warning(d.msg);
} }
self.loading = false;
}).catch(e => { }).catch(e => {
console.log(e);
self.$message.warning(`获取支付码失败`); self.$message.warning(`获取支付码失败`);
self.loading = false; self.$root.loading = false;
}); });
}, },
closePayConfirm() { closePayConfirm() {
...@@ -304,30 +226,28 @@ ...@@ -304,30 +226,28 @@
var startTime = Number(this.time); var startTime = Number(this.time);
setTimeout(function () { setTimeout(function () {
var inth = setInterval(function () { var inth = setInterval(function () {
self.$root.postReq("/web/orderCtl/findItemByCodeTl", { console.log(self.orderInfo, ".............................");
orderCode: self.orderInfo.code, var obj = self.$root.copyParams({
orderCode: self.orderInfo.orderNo,
orderNo: self.orderInfo.orderNo,
wxPayOrderCode: self.orderInfo.wxPayOrderCode, wxPayOrderCode: self.orderInfo.wxPayOrderCode,
aliPayOrderCode: self.orderInfo.aliPayOrderCode, aliPayOrderCode: self.orderInfo.aliPayOrderCode,
company_id: self.orderInfo.company_id,
sub_type: self.orderInfo.subType,
op_type: self.payType op_type: self.payType
}).then(d => { }, "checkPayStatusTl", "/action/tmOrder/springBoard");
if (d && d.code == 1 && d.data && d.data.orderPayStatus == "yfk") { self.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(d => {
console.log(d);
if (d && d.status == 0 && d.data && d.data.orderPayStatus == "yfk") {
self.orderInfo = d.data; self.orderInfo = d.data;
window.clearInterval(inth); window.clearInterval(inth);
self.$message.success("付款成功"); self.$message.success("付款成功");
self.afterpayjump(); self.$message.success("支付成功");
/**if (self.isBizemp) { self.$router.push({
self.$root.pushx({ path: `/${self.$root.channelName}/paysuccess`,
title: "我的订单", query: {
name: "/myordermag" totalSum: d.data.totalSum,
}); orderNo: d.data.code
} else { }
self.$root.pushx({ });
title: "我的订单",
name: "/myorder"
});
} */
return; return;
} else { } else {
var passTime = (new Date().getTime() - startTime) / 1000; var passTime = (new Date().getTime() - startTime) / 1000;
...@@ -355,7 +275,7 @@ ...@@ -355,7 +275,7 @@
"username": this.userName, "username": this.userName,
"period": this.period, "period": this.period,
"money": this.money, "money": this.money,
"pid": this.orderInfo.code "pid": this.orderInfo.orderNo
}).then(d => { }).then(d => {
console.log(this.cities, "this.cities----------------------"); console.log(this.cities, "this.cities----------------------");
console.log(this.currentCompany, "this.currentCompany----------------------"); console.log(this.currentCompany, "this.currentCompany----------------------");
......
igirl-channel-web/app/front/vues/pages/paysuccess/paysuccess.html
...@@ -4,14 +4,14 @@ ...@@ -4,14 +4,14 @@
<div class="common-paysuccess-img"> <img src="/imgs/paysuccess.png" alt=""> </div> <div class="common-paysuccess-img"> <img src="/imgs/paysuccess.png" alt=""> </div>
<div> <div>
<h1>支付成功</h1> <h1>支付成功</h1>
<p>您已成功支付 <span>¥798.00元</span> <span>订单编号：11114012410250810824</span></p> <p>您已成功支付 <span>¥{{totalSum}}元</span> <span>订单编号：{{orderNo}}</span></p>
<p>我们会尽快给您审核订单信息，提交到商标局！材料信息如有问题我们客服会及时与您联系。</p> <p>我们会尽快给您审核订单信息，提交到商标局！材料信息如有问题我们客服会及时与您联系。</p>
</div> </div>
</div> </div>
<div class="common-paysuccess-footer"> <div class="common-paysuccess-footer">
<el-button>在下一单</el-button> <el-button @click="again">再下一单</el-button>
<el-button>查看订单详情</el-button> <el-button @click="">查看订单详情</el-button>
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file
igirl-channel-web/app/front/vues/pages/paysuccess/paysuccess.js
...@@ -3,20 +3,31 @@ ...@@ -3,20 +3,31 @@
data: function() { data: function() {
return { return {
ldms: [], ldms: [],
phone:'', phone: '',
orderIndent:'' orderIndent: '',
totalSum: "",
orderNo: ""
} }
}, },
mounted: function() { mounted: function() {
this.$root.getChannelPath(); this.$root.getChannelPath();
}, },
created: function() { created: function() {
this.totalSum = this.$route.query.totalSum;
this.orderNo = this.$route.query.orderNo;
}, },
methods: { methods: {
again(){
this.$router.push({
path:`/${this.$root.channelName}/jdtrademark`,
query:{
}
})
},
push(){ push(){
var obj = this.$root.copyParams({"buyerMoblie":this.phone,"channelServiceNo":this.orderIndent},"pushFqBusiness","/action/tmOrder/springBoard",); var obj = this.$root.copyParams({ "buyerMoblie": this.phone, "channelServiceNo": this.orderIndent }, "pushFqBusiness", "/action/tmOrder/springBoard");
this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d)=>{ this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
console.log(d.data); console.log(d.data);
console.log(d.msg); console.log(d.msg);
}); });
......
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