Commit 52d7f2a9 authored by IvyXia123's avatar IvyXia123

20190924

parent 9a34eb31
...@@ -368,11 +368,12 @@ export default { ...@@ -368,11 +368,12 @@ export default {
salesType: invite ? invite.split("-")[1] : "null", salesType: invite ? invite.split("-")[1] : "null",
salesID: invite ? Number(invite.split("-")[2]) : 0 salesID: invite ? Number(invite.split("-")[2]) : 0
}); });
if (window.location.href.indexOf("gdt_vid") > -1) {
json.gdt_vid = this.$route.query.gdt_vid; if(localStorage.getItem("gdt_vid") != 'undefined'){
json.gdt_vid = localStorage.getItem("gdt_vid")
} }
if (window.location.href.indexOf("cct_user_id") > -1) { if(localStorage.getItem("cct_user_id") != 'undefined'){
json.cct_user_id = this.$route.query.cct_user_id; json.cct_user_id = localStorage.getItem("cct_user_id")
} }
if (window.location.href.indexOf("group_order_id") > -1) { if (window.location.href.indexOf("group_order_id") > -1) {
json.group_order_id = this.$route.query.group_order_id; json.group_order_id = this.$route.query.group_order_id;
......
...@@ -360,9 +360,9 @@ ...@@ -360,9 +360,9 @@
goodsID: this.shopId, goodsID: this.shopId,
salesType: invite ? invite.split("-")[1] : "null", salesType: invite ? invite.split("-")[1] : "null",
salesID: invite ? Number(invite.split("-")[2]) : 0, salesID: invite ? Number(invite.split("-")[2]) : 0,
gdt_vid: query.gdt_vid, gdt_vid: comment.getUrlParam().gdt_vid,
cct_user_id: query.cct_user_id, cct_user_id: comment.getUrlParam().cct_user_id,
redeem_code: this.$route.query.redeem_code redeem_code: comment.getUrlParam().redeem_code,
}); });
// debugger // debugger
this.$router.push({ this.$router.push({
...@@ -549,9 +549,9 @@ ...@@ -549,9 +549,9 @@
courseName: "", courseName: "",
salesType: invite ? invite.split("-")[1] : "null", salesType: invite ? invite.split("-")[1] : "null",
salesID: invite ? Number(invite.split("-")[2]) : 0, salesID: invite ? Number(invite.split("-")[2]) : 0,
gdt_vid: this.$route.query.gdt_vid, gdt_vid: comment.getUrlParam().gdt_vid,
cct_user_id: this.$route.query.cct_user_id, cct_user_id: comment.getUrlParam().cct_user_id,
redeem_code: this.$route.query.redeem_code redeem_code: comment.getUrlParam().redeem_code,
}); });
if (this.groupDetail.goods_type === 2) { if (this.groupDetail.goods_type === 2) {
if (localStorage.getItem("cc_token")) { if (localStorage.getItem("cc_token")) {
......
...@@ -303,11 +303,13 @@ export default { ...@@ -303,11 +303,13 @@ export default {
}; };
}, },
mounted() { mounted() {
console.log(comment.getUrlParam().gdt_vid, 989898)
this.getDetail(); this.getDetail();
Toast.loading({ Toast.loading({
mask: true, mask: true,
message: '' message: ''
}); });
// document.body.addEventListener('focusout', () => { //软键盘关闭事件 // document.body.addEventListener('focusout', () => { //软键盘关闭事件
// document.documentElement.scrollTop = 0 // document.documentElement.scrollTop = 0
// document.body.scrollTop = 0 // document.body.scrollTop = 0
...@@ -341,6 +343,7 @@ export default { ...@@ -341,6 +343,7 @@ export default {
// this. // this.
}, },
goToBuyPage() { goToBuyPage() {
console.log(comment.getUrlParam().gdt_vid, 2222)
if(this.groupDetail.is_real){ if(this.groupDetail.is_real){
let query = { shopId: this.shopId, invite_code: this.invite_code }; let query = { shopId: this.shopId, invite_code: this.invite_code };
let invite = this.invite_code; let invite = this.invite_code;
...@@ -352,9 +355,9 @@ export default { ...@@ -352,9 +355,9 @@ export default {
goodsID: this.shopId, goodsID: this.shopId,
salesType: invite ? invite.split("-")[1] : "null", salesType: invite ? invite.split("-")[1] : "null",
salesID: invite ? Number(invite.split("-")[2]) : 0, salesID: invite ? Number(invite.split("-")[2]) : 0,
gdt_vid: this.$route.query.gdt_vid, gdt_vid: comment.getUrlParam().gdt_vid,
cct_user_id: this.$route.query.cct_user_id, cct_user_id: comment.getUrlParam().cct_user_id,
redeem_code: this.$route.query.redeem_code redeem_code: comment.getUrlParam().redeem_code,
}); });
if (this.groupId) { if (this.groupId) {
...@@ -371,6 +374,7 @@ export default { ...@@ -371,6 +374,7 @@ export default {
query: { query: {
shopId: this.shopId, shopId: this.shopId,
invite_code: this.invite_code, invite_code: this.invite_code,
gdt_vid: comment.getUrlParam().gdt_vid,
type: "" type: ""
} }
}); });
...@@ -399,9 +403,9 @@ export default { ...@@ -399,9 +403,9 @@ export default {
goodsID: this.shopId, goodsID: this.shopId,
salesType: invite ? invite.split("-")[1] : "null", salesType: invite ? invite.split("-")[1] : "null",
salesID: invite ? Number(invite.split("-")[2]) : 0, salesID: invite ? Number(invite.split("-")[2]) : 0,
gdt_vid: query.gdt_vid, gdt_vid: localStorage.getItem("gdt_vid"),
cct_user_id: query.cct_user_id, cct_user_id: localStorage.getItem("cct_user_id"),
redeem_code: this.$route.query.redeem_code, redeem_code: localStorage.getItem("redeem_code"),
}); });
// debugger // debugger
...@@ -437,15 +441,16 @@ export default { ...@@ -437,15 +441,16 @@ export default {
goodsID:this.shopId.toString(), goodsID:this.shopId.toString(),
salesType:invite?invite.split('-')[1]:'null', salesType:invite?invite.split('-')[1]:'null',
salesID:invite?Number(invite.split('-')[2]):0, salesID:invite?Number(invite.split('-')[2]):0,
gdt_vid: this.$route.query.gdt_vid, gdt_vid: localStorage.getItem("gdt_vid"),
cct_user_id: this.$route.query.cct_user_id, cct_user_id: localStorage.getItem("cct_user_id"),
redeem_code: this.$route.query.redeem_code redeem_code: localStorage.getItem("redeem_code"),
}); });
if(window.location.href.indexOf('gdt_vid')>-1){
json.gdt_vid = this.$route.query.gdt_vid if(localStorage.getItem("gdt_vid") != 'undefined'){
json.gdt_vid = localStorage.getItem("gdt_vid")
} }
if(window.location.href.indexOf('cct_user_id')>-1){ if(localStorage.getItem("cct_user_id") != 'undefined'){
json.cct_user_id = this.$route.query.cct_user_id json.cct_user_id = localStorage.getItem("cct_user_id")
} }
this.orderFlag = false; this.orderFlag = false;
payApi(json).then(res=>{ payApi(json).then(res=>{
...@@ -724,7 +729,6 @@ export default { ...@@ -724,7 +729,6 @@ export default {
this.onShare(1); this.onShare(1);
this.handleInviteCode(); this.handleInviteCode();
} }
console.log(sessionStorage.getItem('clickTag'), 979876896)
if(sessionStorage.getItem('clickTag')){ if(sessionStorage.getItem('clickTag')){
console.log(JSON.parse(localStorage.getItem("userDesc"))) console.log(JSON.parse(localStorage.getItem("userDesc")))
if (!JSON.parse(localStorage.getItem("userDesc")).mobile || JSON.parse(localStorage.getItem("userDesc")).mobile === "") { if (!JSON.parse(localStorage.getItem("userDesc")).mobile || JSON.parse(localStorage.getItem("userDesc")).mobile === "") {
......
...@@ -208,7 +208,6 @@ ...@@ -208,7 +208,6 @@
//console.log(window.sessionStorage.query); //console.log(window.sessionStorage.query);
getUserDetailApi() getUserDetailApi()
.then(res => { .then(res => {
alert("获取头像")
console.log(res) console.log(res)
this.avatarActive = res.avatar this.avatarActive = res.avatar
this.nicknameActive = res.nickname this.nicknameActive = res.nickname
...@@ -356,6 +355,7 @@ ...@@ -356,6 +355,7 @@
this.lastTime = Date.parse(new Date()); this.lastTime = Date.parse(new Date());
clearInterval(this.$store.state.timeout); clearInterval(this.$store.state.timeout);
this.userDetail = JSON.parse(localStorage.getItem("userDesc")); this.userDetail = JSON.parse(localStorage.getItem("userDesc"));
console.log(this.userDetail, 2323)
this.nickname = this.userDetail.nickname; this.nickname = this.userDetail.nickname;
if (this.nickname.length >= 6) { if (this.nickname.length >= 6) {
this.nickname = this.nickname.slice(0, 4) + "..."; this.nickname = this.nickname.slice(0, 4) + "...";
...@@ -476,7 +476,6 @@ ...@@ -476,7 +476,6 @@
ctx.arc(357, 173, 60, 0, 2 * Math.PI); ctx.arc(357, 173, 60, 0, 2 * Math.PI);
ctx.clip(); ctx.clip();
ctx.drawImage(this, 297, 113, 120, 120); ctx.drawImage(this, 297, 113, 120, 120);
alert("生成图片")
let dataURL = canvas.toDataURL("image/jpg", 1.0); let dataURL = canvas.toDataURL("image/jpg", 1.0);
that.canvasData = dataURL; that.canvasData = dataURL;
}; };
......
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