Skip to content

H
h5-base
Commit a5a39a67 authored by wangwei's avatar wangwei
Browse files
Options

神策登录接口调整

parent ea00a311
Hide whitespace changes
Inline Side-by-side
Showing with 426 additions and 38 deletions
src/components/buy/activity.vue
View file @ a5a39a67
......@@ -40,7 +40,7 @@
<script>
import QRCode from 'qrcodejs2'
import { Indicator } from 'mint-ui';
import {getwechatParam,getGoodsDetailApi,getGroupDetailApi,getStatusWechatApi,getUserDetailApi,getInviteResultApi,getInviteListApi} from "../../service/api";
import {getwechatParam,getGoodsDetailApi,getGroupDetailApi,getStatusWechatApi,getInviteResultApi,getInviteListApi} from "../../service/api";
import refBg from '../../assets/refBg.png'
import moreUrl from '../../assets/moreIcon.png'
import refIcon from '../../assets/refIcon.png'
......@@ -157,8 +157,7 @@
if(!this.invite_code){
this.invite_code = 'CC-USER'
}
getUserDetailApi().then(res=>{
this.user_id=res.user_id;
this.user_id=JSON.parse(localStorage.getItem('userDesc')).user_id;
let invite_code = this.invite_code.split('-');
if(invite_code.length > 2 && invite_code[1] === 'TEACHER'){
invite_code[1] = 'USER'
......@@ -200,7 +199,6 @@
}
})
});
},500)
}else{
......
src/components/buy/activityInvite.vue
View file @ a5a39a67
......@@ -10,7 +10,7 @@
</div>
</div>
<img :src="dataURL" class="cvs-img" id="cvs-img"/>
<div class="inviteBtn" id="inviteBtn">
<div class="content-text">
<h3>长按保存海报 或发送给好友</h3>
......@@ -49,7 +49,7 @@
import { swiper, swiperSlide } from 'vue-awesome-swiper'
import QRCode from 'qrcodejs2'
import { Indicator } from 'mint-ui';
import {getwechatParam,getGoodsDetailApi,getGroupDetailApi,getStatusWechatApi,getUserDetailApi} from "../../service/api";
import {getwechatParam,getGoodsDetailApi,getGroupDetailApi,getStatusWechatApi} from "../../service/api";
import refBg from '../../assets/refBg.png'
import moreUrl from '../../assets/moreIcon.png'
import refIcon from '../../assets/refIcon.png'
......@@ -154,8 +154,7 @@
if(!this.invite_code){
this.invite_code = 'CC-USER'
}
getUserDetailApi().then(res=>{
this.user_id=res.user_id;
this.user_id=JSON.parse(localStorage.getItem('userDesc')).user_id;
let _that = this;
let invite_code = this.invite_code.split('-');
if(invite_code.length > 2 && invite_code[1] === 'TEACHER'){
......@@ -163,14 +162,15 @@
}
let code = `${invite_code[0]}-${invite_code[1]}`;
let URL = `${process.env.BUY_URL}shopId=${this.shopId}&invite_code=${code}-${this.user_id}`;
if(this.groupId && this.groupId !== 'null'){
URL += `&groupId=${this.groupId}`
}
this.onNewShare(URL);
this.toDataURLBase64(res.avatar.replace('http://','https://'), function (avatar) {
this.toDataURLBase64(JSON.parse(localStorage.getItem('userDesc')).avatar.replace('http://','https://'), function (avatar) {
_that.avatar = avatar
});
_that.qrcode(URL);
this.refVisible = true;
this.$nextTick(()=>{
......@@ -204,14 +204,13 @@
}).catch(res=>{alert(res);console.log()});
}
})
},500)
}else{
}
})
});
}else{
let query = {retUrl:this.$route.fullPath,is_new_user_url:'1'};
this.$router.push({name:'author',query:query})
......
src/components/buy/buy.vue
View file @ a5a39a67
......@@ -65,7 +65,7 @@
<script>
import { Toast, MessageBox } from 'mint-ui'
import {getUserAdressApi,getGoodsDetailApi,payApi,getwechatParam,getStatusWechatApi,getCouponListApi,getUserDetailApi} from "../../service/api";
import {getUserAdressApi,getGoodsDetailApi,payApi,getwechatParam,getStatusWechatApi,getCouponListApi} from "../../service/api";
import addAddress from './address'
import youHuiUrl from '../../assets/shop/youHui.png'
import saleDiv from './sale'
......@@ -235,8 +235,7 @@
this.addressPop = true
},
initPage(){
getUserDetailApi().then(res=>{
if(!res.mobile|| res.mobile === ''){
if(!JSON.parse(localStorage.getItem('userDesc')).mobile|| JSON.parse(localStorage.getItem('userDesc')).mobile === ''){
this.$router.push({name:'bindMobile',query:{retUrl:this.$route.fullPath}})
}else{
getwechatParam({api_list:'chooseWXPay'}).then(res=>{
......@@ -285,7 +284,6 @@
});
this.orderFlag = true
}
});
}
}
}
......
src/components/buy/index.vue
View file @ a5a39a67
......@@ -121,7 +121,7 @@
import { swiper, swiperSlide } from 'vue-awesome-swiper'
import QRCode from 'qrcodejs2'
import { Indicator } from 'mint-ui';
import {getwechatParam,getGoodsDetailApi,getGroupDetailApi,getStatusWechatApi,getUserDetailApi} from "../../service/api";
import {getwechatParam,getGoodsDetailApi,getGroupDetailApi,getStatusWechatApi} from "../../service/api";
import refBg from '../../assets/refBg.png'
import moreUrl from '../../assets/moreIcon.png'
import weChatIcon from '../../assets/wechatIcon.png'
......@@ -361,8 +361,7 @@
this.invite_code_f = false
}
}
getUserDetailApi().then(res=>{
this.user_id=res.user_id;
this.user_id=JSON.parse(localStorage.getItem('userDesc')).user_id;
if(window.location.href.indexOf('shopId')>-1){
this.shopId = this.$route.query.shopId;
getGoodsDetailApi(this.shopId).then(res=>{
......@@ -427,7 +426,6 @@
}
})
}
});
},
showTeacher(){
this.popType = false;
......
src/components/index.vue
View file @ a5a39a67
......@@ -76,7 +76,7 @@
import guidePage from './guide/index'
import 'swiper/dist/css/swiper.css'
import { swiper, swiperSlide } from 'vue-awesome-swiper'
import {getBannerListApi,getUserDetailApi,getUserLessonApi,getTeacherApi,getNewApi,getRedirectApi} from "../service/api";
import {getBannerListApi,getUserLessonApi,getTeacherApi,getNewApi,getRedirectApi} from "../service/api";
import {IndexImage} from "../util/imgUrl";
import bottomTab from './public/bottomTab';
import { Toast } from 'mint-ui';
......@@ -157,10 +157,7 @@
window.location.href = res
}
});
getUserDetailApi().then(res=>{
this.user_id=res.user_id;
// this.$sa.login(this.user_id)
});
this.user_id=JSON.parse(localStorage.getItem('userDesc')).user_id;
getBannerListApi().then(res=>{
this.bannerList = res.list
});
......
src/components/mine.vue
View file @ a5a39a67
......@@ -23,7 +23,6 @@
<script>
import bottomTab from './public/bottomTab';
import {mineImage} from "../util/imgUrl";
import {getUserDetailApi} from "../service/api";
import { Toast } from 'mint-ui';
export default {
name: "mine",
......@@ -41,9 +40,7 @@
},
methods:{
initPage(){
getUserDetailApi().then(res=>{
this.userDetail = res
})
this.userDetail = JSON.parse(localStorage.getItem('userDesc'))
},
clearBoth(){
this.$sa.track('buttonClick',{
......
src/components/newLesson/share.vue 0 → 100644
View file @ a5a39a67
<template>
<div class="share-page">
<div class="share-block">
<div class="bg-title" :style="{backgroundImage:`url('${shareBg}')`}">
</div>
<div class="bg-desc">
</div>
<img :src="dataURL" class="cvs-img" id="cvs-img"/>
<div class="content" v-if="userDetail" :style="{backgroundImage:`url('${shareConBg}')`}" ref="imageWrapper" id="capture">
<div class="main-content">
<div class="head-block">
<img :src="userDetail.avatar"/>
</div>
<div class="content-title" :style="{backgroundImage:`url('${shareTitle}')`}">
{{userDetail.nickname}}
</div>
<div class="main-text">
<div class="title">累计学习</div>
<div v-if="watchDetail" class="day">
{{watchDetail.total_day}} <span>Days</span>
</div>
</div>
<div class="main-desc">
<span>
继续坚持
</span>
<br>
学无涯 行必知
</div>
</div>
<div class="main-content-desc">
<img :src="share_code_bg">
<div id="qrcode" class="qrcode"></div>
</div>
</div>
<div class="share-btn">
<img :src="shareBtn" @click="showShare()"/>
</div>
</div>
<img :src="share_close" class="share_close" @click="$emit('closeShare')"/>
<div class="tips" v-if="shareVisible" @click="shareVisible=false">
<img :src="share_tips">
</div>
</div>
</template>
<script>
import shareBg from '../../assets/newLesson/shareBg.png'
import shareConBg from '../../assets/newLesson/shareConBg.png'
import shareTitle from '../../assets/newLesson/shareTitle.png'
import shareBtn from '../../assets/newLesson/share_button.png'
import share_close from '../../assets/newLesson/share_close.png'
import QRCode from 'qrcodejs2'
import html2canvas from 'html2canvas'
import {getwechatParam,getUserWatchApi,getShortApi,subUserLessonApi} from "../../service/api";
import share_code_bg from '../../assets/newLesson/share-code-bg.png'
import share_tips from '../../assets/Bitmap@2x.png'
export default {
name: "share",
data(){
return {
shareVisible:false,
shareBg:shareBg,
share_close:share_close,
share_tips:share_tips,
shareConBg:shareConBg,
shareTitle:shareTitle,
shareBtn:shareBtn,
userDetail:null,
dataURL:null,
watchDetail:null,
share_code_bg:share_code_bg
}
},
mounted(){
this.initPage()
},
methods:{
showShare(){
this.shareVisible = true;
let lessonDetail = JSON.parse(localStorage.getItem('lessonDetail'));
let nowTime = Date.parse(new Date());
let json = {
page_type:0,
page_id:4,
stay_time:0,
};
subUserLessonApi(this.$route.query.elementId,this.$route.query.category_id,this.$route.query.periods_id,json).then(res=>{
lessonDetail.total_watch_time = res;
lessonDetail.nowTime = nowTime;
localStorage.setItem('lessonDetail',JSON.stringify(lessonDetail));
});
},
initPage(){
this.userDetail = JSON.parse(localStorage.getItem('userDesc'));
this.toDataURLBase64(res.avatar.replace('http://','https://'), (avatar) =>{
this.userDetail.avatar = avatar;
getUserWatchApi().then(res=>{
this.watchDetail = res;
this.refshow()
})
});
},
enableShare: function(option) {
getwechatParam({
api_list: 'onMenuShareAppMessage,onMenuShareTimeline',
url:window.location.href.split('#')[0]
}).then(wechatRes => {
console.log('enableShare', wechatRes)
wx.config({
debug: false,
appId: wechatRes.appId,
timestamp: parseInt(wechatRes.timestamp),
nonceStr: wechatRes.nonceStr,
signature: wechatRes.signature,
jsApiList: wechatRes.jsApiList
});
wx.ready(function() {
wx.onMenuShareTimeline({
title: option.product_title, // 分享标题
desc: option.desc,// 分享描述
link: option.shareUrl, // 分享链接
imgUrl: option.shareIcon || 'https://cdn.singsingenglish.com/singsing/recommend/logo-refer.png', // 分享图标
success: function() {
console.log('分享成功');
},
cancel: function() {
console.log('分享失败')
}
});
wx.onMenuShareAppMessage({
title: option.product_title, // 分享标题
desc: option.desc,// 分享描述
link: option.shareUrl, // 分享链接
imgUrl: option.shareIcon || 'https://cdn.singsingenglish.com/singsing/recommend/logo-refer.png', // 分享图标
success: function() {
},
cancel: function() {
}
});
})
})
},
onShare(URL) {
this.enableShare({
product_title: `每天10分钟，英语开口唱【SingsingEnglish】`, // 分享标题
desc: `我家宝宝正在【唱唱启蒙英语】学唱童谣，已累计学习 ${this.watchDetail.total_day} 天`,//
shareIcon:'https://cdn.singsingenglish.com/logo/logo.jpg',
shareUrl:URL
})
},
toDataURLBase64 (src, callback) {
let xhttp = new XMLHttpRequest();
xhttp.onload = function () {
let fileReader = new FileReader();
fileReader.onloadend = function () {
callback(fileReader.result)
};
fileReader.readAsDataURL(xhttp.response)
};
xhttp.responseType = 'blob';
xhttp.open('GET', src, true);
xhttp.send()
},
refshow(){
let URL = process.env.API_URL+'#/shareGoods?userID='+ this.userDetail.user_id;
this.onShare(URL);
getShortApi({url:URL}).then(res=>{
this.qrcode(res.url);
this.$nextTick(()=>{
let {
width,
} = document.getElementById('capture').getClientRects()[0];
document.getElementById('capture').style.width = width + 'px';
let {
height1,
width1
} = document.getElementById('capture').getClientRects()[0];
html2canvas(document.getElementById('capture'),{
async: true,
timeout: 500,
scrollX:1,
scale: 3,
width: width1,
height: height1,
letterRendering: true,
}).then((canvas) => {
let dataURL = canvas.toDataURL("image/jpg");
this.dataURL = dataURL;
}).catch(res=>{alert(res);console.log()});
})
})
},
getOffsetRect(ele){
var box=ele.getBoundingClientRect();
var body=document.body,
docElem=document.documentElement;
//获取页面的scrollTop,scrollLeft(兼容性写法)
var scrollTop=window.pageYOffset||docElem.scrollTop||body.scrollTop,
scrollLeft=window.pageXOffset||docElem.scrollLeft||body.scrollLeft;
var clientTop=docElem.clientTop||body.clientTop,
clientLeft=docElem.clientLeft||body.clientLeft;
var top=box.top+scrollTop-clientTop,
left=box.left+scrollLeft-clientLeft;
return {
//Math.round 兼容火狐浏览器bug
top:Math.round(top),
left:Math.round(left)
}
},
qrcode(data){
if(this.QRCodeB){
this.QRCodeB.makeCode(data)
}else{
this.QRCodeB = new QRCode('qrcode', {
width: 70,
height: 70, // 高度
text: data, // 二维码内容
image: ''
});
}
},
}
}
</script>
<style scoped lang="less">
@import "../../util/public";
.share-page{
position: fixed;
background: #EEEEEE;
top: 0;
left: 0;
bottom: 0;
right: 0;
z-index: 10;
.share-block{
position: absolute;
border-radius: 8*@toVw;
top: 20*@toVw;
left: 20*@toVw;
right: 20*@toVw;
bottom: 20*@toVw;
overflow: auto;
.bg-title{
position: absolute;
top: 0;
left: 0;
right: 0;
height: 60*@toVw;
background-size: 100% 100%;
z-index: -1;
}
.bg-desc{
position: absolute;
top: 58*@toVw;
left: 0;
right: 0;
bottom: 0;
background: white;
z-index: -1;
border-radius: 0 0 8*@toVw 8*@toVw;
}
#cvs-img{
position: absolute;
width: 291*@toVw;
top: 21*@toVw;
left: 23*@toVw;
z-index: 1;
}
.content{
width: 291*@toVw;
height: (422-53)*@toVw;
padding-top: 53*@toVw;
margin-top: 20*@toVw;
background-size: 100% 100%;
}
.main-content{
width: 261*@toVw;
height: 263*@toVw;
background: white;
border-radius: 8*@toVw;
position: relative;
.main-text{
padding-top: 100*@toVw;
width: 215*@toVw;
text-align: center;
margin: auto;
border-bottom: 1*@toVw solid #EEEEEE;
.title{
font-size:16*@toVw;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(51,51,51,1);
}
.day{
font-size:48px;
margin: 5*@toVw 0;
font-family:PingFang-SC-Bold;
font-weight:bold;
color:rgba(105,192,255,1);
span{
font-size:20px;
font-family:PingFang-SC-Bold;
font-weight:bold;
color:rgba(105,192,255,1);
}
}
}
.main-desc{
margin-top: 10*@toVw;
text-align: center;
font-size:12px;
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(0,0,0,1);
span{
font-size:16px;
font-family:PingFang-SC-Medium;
font-weight:500;
display: inline-block;
margin: 0 0 5*@toVw 0;
}
}
.head-block{
position: absolute;
height: 85*@toVw;
width: 85*@toVw;
text-align: center;
border-radius: 200*@toVw;
left: 50%;
margin-left: -40*@toVw;
background: white;
top: -38*@toVw;
img{
border-radius: 200*@toVw;
width: 64*@toVw;
margin-top: 7*@toVw;
height: 64*@toVw;
}
}
.content-title{
width: 225*@toVw;
height: 54*@toVw;
line-height: 50*@toVw;
color: white;
font-size: 20*@toVw;
text-align: center;
background-size: 100% 100%;
position: absolute;
top: 25*@toVw;
left: 50%;
margin-left: -112.5*@toVw;
}
}
.share-btn{
margin-top: 22*@toVw;
text-align: center;
img{
width: 240*@toVw;
}
}
.main-content-desc{
width: 261*@toVw;
height: 82*@toVw;
background: white;
border-radius: 8*@toVw;
margin-top: 10*@toVw;
position: relative;
img{
width: 100%;
}
.qrcode{
position: absolute;
top: 5*@toVw;
right: 5*@toVw;
}
}
}
.share_close{
position: fixed;
width: 20*@toVw;
top: 19*@toVw;
right: 13*@toVw;
}
.tips{
background: rgba(0,0,0,0.5);
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 99999999;
text-align: right;
img{
width: 80%;
}
}
}
</style>
src/components/share.vue
View file @ a5a39a67
......@@ -4,7 +4,6 @@
<script>
import {share} from "../util/imgUrl";
import {getUserWatchApi,getUserDetailApi} from "../service/api";
export default {
name: "share",
data(){
......
src/router/index.js
View file @ a5a39a67
......@@ -86,7 +86,7 @@ const router =new Router({
name: 'buyDetail',
component: e=>require(['@/components/buy/index'],e),
meta:{
skip_login:true,
skip_login:false,
noNew:true,
deep:10
}
......@@ -218,22 +218,22 @@ router.beforeEach((to,from,next)=> {
let token = common.getUrlParam().token || to.query.token;
store.dispatch('setToken',token);
getUserDetailApi().then(res=>{
localStorage.setItem('userId',res.user_id);
localStorage.setItem('userDesc',JSON.stringify(res));
sa.login(res.user_id);
goOn()
});
goOn()
// 通过cookie获取token
}else if(localStorage.getItem('cc_token')) {
store.dispatch('setToken', localStorage.getItem('cc_token'));
if(localStorage.getItem('userId')){
sa.login(localStorage.getItem('userId'));
if(localStorage.getItem('userDesc')){
sa.login(JSON.parse(localStorage.getItem('userDesc')).user_id);
goOn()
}else{
getUserDetailApi().then(res=>{
localStorage.setItem('userId',res.user_id);
localStorage.setItem('userDesc',JSON.stringify(res));
sa.login(res.user_id);
goOn()
});
}
goOn()
// 无需token登录页面
}else if(to.meta.skip_login){
goOn()
......
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