Commit b12b7af0 authored by wangwei's avatar wangwei

Merge branch 'dev2' into star

# Conflicts:
#	src/components/buy/activityInvite.vue
parents 242b83fb 2a8a4568
...@@ -362,10 +362,10 @@ ...@@ -362,10 +362,10 @@
} }
}) })
} }
}, },
getInviteResult(){ getInviteResult(){
getInviteResultApi().then(res=>{ let id=this.$route.query.shopId;
getInviteResultApi({},id).then(res=>{
this.earnings = res.earnings; this.earnings = res.earnings;
this.userNum = res.user_num; this.userNum = res.user_num;
}); });
...@@ -375,8 +375,8 @@ ...@@ -375,8 +375,8 @@
page: 1, page: 1,
limit: 4 limit: 4
} }
getInviteListApi(json).then(res=>{ let id=this.$route.query.shopId;
console.log(res) getInviteListApi(json,id).then(res=>{
this.inviteList = res.list this.inviteList = res.list
}); });
} }
......
<template xmlns:v-clipboard="http://www.w3.org/1999/xhtml"> <template>
<div class="group-index" ref="index" v-if="groupDetail" style="background-color: #fda813;"> <div class="group-index" ref="index" v-if="groupDetail" style="background-color: #59c1f1;">
<div> <div>
<div class="img-cvs" id="capture" ref="imageWrapper" v-if="groupDetail.share_desc.refImg && groupDetail.share_desc.refImg.length > 0"> <div class="img-cvs" id="capture" ref="imageWrapper" v-if="groupDetail.share_desc.refImg && groupDetail.share_desc.refImg.length > 0">
<div v-if="avatar && QRCodeB" id="avatarImg"> <div v-if="avatar && QRCodeB" id="avatarImg">
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</div> </div>
</div> </div>
<img :src="dataURL" class="cvs-img" id="cvs-img"/> <img :src="dataURL" class="cvs-img" id="cvs-img"/>
<div class="inviteBtn" id="inviteBtn"> <div class="inviteBtn" id="inviteBtn">
<div class="content-text"> <div class="content-text">
<h3>长按保存海报 或发送给好友</h3> <h3>长按保存海报 或发送给好友</h3>
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
} }
let code = `${invite_code[0]}-${invite_code[1]}`; let code = `${invite_code[0]}-${invite_code[1]}`;
let URL = `${process.env.BUY_URL}shopId=${this.shopId}&invite_code=${code}-${this.user_id}`; let URL = `${process.env.BUY_URL}shopId=${this.shopId}&invite_code=${code}-${this.user_id}`;
if(this.groupId && this.groupId !== 'null'){ if(this.groupId && this.groupId !== 'null'){
URL += `&groupId=${this.groupId}` URL += `&groupId=${this.groupId}`
} }
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
}).catch(res=>{alert(res);console.log()}); }).catch(res=>{alert(res);console.log()});
} }
}) })
},500) },500)
}else{ }else{
...@@ -478,7 +478,10 @@ ...@@ -478,7 +478,10 @@
text-align: left; text-align: left;
font-size: 14 * @toVw; font-size: 14 * @toVw;
color: #fff; color: #fff;
background: url('../../assets/activity/red-bg.png') no-repeat center; // background: url('../../assets/activity/red-bg.png') no-repeat center;
background: #f5c10c;
border-radius: 25 * @toVw;
box-shadow: 2px 2px 2px #888888;
background-size: cover; background-size: cover;
box-sizing: border-box; box-sizing: border-box;
padding: 2px 58/2*@toVw; padding: 2px 58/2*@toVw;
......
...@@ -219,6 +219,7 @@ ...@@ -219,6 +219,7 @@
height1, height1,
width1 width1
} = document.getElementById('capture').getClientRects()[0]; } = document.getElementById('capture').getClientRects()[0];
console.log(height1)
html2canvas(document.getElementById('capture'),{ html2canvas(document.getElementById('capture'),{
async: true, async: true,
timeout: 500, timeout: 500,
......
...@@ -124,13 +124,13 @@ export const getGoodsListApi = function (json) { ...@@ -124,13 +124,13 @@ export const getGoodsListApi = function (json) {
}; };
//获取邀请战绩收益 //获取邀请战绩收益
const getInviteResultUrl = `${_baseUrl}api/client/user/invite/earnings`; const getInviteResultUrl = `${_baseUrl}api/client/user/invite/earnings`;
export const getInviteResultApi = function (json) { export const getInviteResultApi = function (json,id) {
return Vue.prototype.$fetch(getInviteResultUrl,json) return Vue.prototype.$fetch(`${getInviteResultUrl}/${id}`,json)
}; };
//获取邀请战绩用户列表 //获取邀请战绩用户列表
const getInviteListUrl = `${_baseUrl}api/client/user/invite/list`; const getInviteListUrl = `${_baseUrl}api/client/user/invite/list`;
export const getInviteListApi = function (json) { export const getInviteListApi = function (json,id) {
return Vue.prototype.$fetch(getInviteListUrl,json) return Vue.prototype.$fetch(`${getInviteListUrl}/${id}`,json)
}; };
// 发送验证码 // 发送验证码
const sendMobileCodeUrl = `${_baseUrl}api/client/mobile/code`; const sendMobileCodeUrl = `${_baseUrl}api/client/mobile/code`;
......
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