Skip to content

C
CFFP-HB
Commit 27213859 by yuzhenWang
Options

Merge branch 'wyz01' into 'test' 

优化webview加载速度，修复拉起小程序分享的bug已经发布生产

See merge request !132
parents 421cf90f f30db01f
Showing with 37 additions and 25 deletions
App.vue
...@@ -11,10 +11,14 @@ ...@@ -11,10 +11,14 @@
return { return {
invitationHandled: false ,// 在data中明确定义, invitationHandled: false ,// 在data中明确定义,
dataToken:'', dataToken:'',
loginType:''
} }
}, },
onLaunch: function() { onLaunch: function() {
console.log('App Launch'); console.log('App Launch');
if(uni.getStorageSync('loginType')){
this.loginType = uni.getStorageSync('loginType')
}
if(uni.getStorageSync('dataToken')){ if(uni.getStorageSync('dataToken')){
uni.removeStorageSync('dataToken') uni.removeStorageSync('dataToken')
} }
...@@ -249,11 +253,12 @@ ...@@ -249,11 +253,12 @@
uni.setStorageSync('dataToken',decodeURIComponent(params.dataToken)); uni.setStorageSync('dataToken',decodeURIComponent(params.dataToken));
} }
//家办商城跳转未登录状态下 //家办商城跳转未登录状态下
if(params.noLogin || !params.dataToken){ if(params.mpCffp&&(params.noLogin ||!params.dataToken)){
uni.removeStorageSync('userIsActive') uni.removeStorageSync('userIsActive')
uni.removeStorageSync('dataToken') uni.removeStorageSync('dataToken')
uni.setStorageSync('loginType','visitor'); uni.setStorageSync('loginType','visitor');
} }
if(params.addSystemType){ if(params.addSystemType){
uni.setStorageSync('addSystemType', params.addSystemType); uni.setStorageSync('addSystemType', params.addSystemType);
} }
......
pages/courseDetail/courseDetail.vue
...@@ -482,7 +482,8 @@ ...@@ -482,7 +482,8 @@
// desc: '加入我们开启学习之旅', // desc: '加入我们开启学习之旅',
desc: this.courseInfo.fileSynopsis, desc: this.courseInfo.fileSynopsis,
link: `${shareURL}/pages/lanch/index?fileId=${this.fileId}&coursesharing=1&serialsNo=${nanoid()}&shareCode=${shareCode}&shareUserId=${this.userId}&jumpUrl=${jumptime}&landingPage=courseDetail&miniShare=1`, link: `${shareURL}/pages/lanch/index?fileId=${this.fileId}&coursesharing=1&serialsNo=${nanoid()}&shareCode=${shareCode}&shareUserId=${this.userId}&jumpUrl=${jumptime}&landingPage=courseDetail&miniShare=1`,
imgUrl: this.courseInfo.displayImage, //图片 // imgUrl: this.courseInfo.displayImage, //图片
imgUrl: this.courseInfo.shareImg, //图片
sharePage: 'courseDetail', //分享的哪个页面 sharePage: 'courseDetail', //分享的哪个页面
commonId: shareCode, commonId: shareCode,
userId: this.userId, userId: this.userId,
...@@ -493,7 +494,8 @@ ...@@ -493,7 +494,8 @@
wx.miniProgram.postMessage({ wx.miniProgram.postMessage({
data: { data: {
type: 'share', type: 'share',
shareData: JSON.stringify(shareInfo) shareData: JSON.stringify(shareInfo),
messageId: nanoid() // 唯一消息ID
} }
}) })
...@@ -1091,7 +1093,8 @@ ...@@ -1091,7 +1093,8 @@
// desc: '加入我们开启学习之旅', // desc: '加入我们开启学习之旅',
desc: this.courseInfo.fileSynopsis, desc: this.courseInfo.fileSynopsis,
link: newLink, //分享链接 link: newLink, //分享链接
imgUrl: this.courseInfo.displayImage, //图片 // imgUrl: this.courseInfo.displayImage, //图片
imgUrl: this.courseInfo.shareImg, //图片
} }
console.log('data', data); console.log('data', data);
//安卓机型获取当前页面路径 //安卓机型获取当前页面路径
......
pages/courselist/courselist.vue
...@@ -302,6 +302,7 @@ ...@@ -302,6 +302,7 @@
if (uni.getStorageSync('cffp_userInfo')) { if (uni.getStorageSync('cffp_userInfo')) {
this.userInfo = JSON.parse(uni.getStorageSync('cffp_userInfo')) this.userInfo = JSON.parse(uni.getStorageSync('cffp_userInfo'))
} }
this.shareItem = JSON.parse(JSON.stringify(item))
// return // return
// 未登录去登录 // 未登录去登录
if (uni.getStorageSync('loginType') !== 'codelogin') { if (uni.getStorageSync('loginType') !== 'codelogin') {
...@@ -320,7 +321,7 @@ ...@@ -320,7 +321,7 @@
this.sharelogin = true this.sharelogin = true
return return
} }
this.shareItem = JSON.parse(JSON.stringify(item)) // this.shareItem = JSON.parse(JSON.stringify(item))
// 已登录，未成为合伙人 // 已登录，未成为合伙人
if (this.userInfo && !this.userInfo['partnerType']) { if (this.userInfo && !this.userInfo['partnerType']) {
dataHandling.pocessTracking( dataHandling.pocessTracking(
...@@ -395,7 +396,8 @@ ...@@ -395,7 +396,8 @@
title: this.shareItem.fileTitle, title: this.shareItem.fileTitle,
desc: this.shareItem.fileSynopsis, desc: this.shareItem.fileSynopsis,
link: `${shareURL}/pages/lanch/index?fileId=${this.shareItem.fileId}&coursesharing=1&serialsNo=${nanoid()}&shareCode=${shareCode}&shareUserId=${this.userId}&jumpUrl=${jumptime}&landingPage=courseDetail&miniShare=1`, link: `${shareURL}/pages/lanch/index?fileId=${this.shareItem.fileId}&coursesharing=1&serialsNo=${nanoid()}&shareCode=${shareCode}&shareUserId=${this.userId}&jumpUrl=${jumptime}&landingPage=courseDetail&miniShare=1`,
imgUrl: this.shareItem.displayImage, //图片 // imgUrl: this.shareItem.displayImage, //图片
imgUrl: this.shareItem.shareImg, //图片
commonId: this.shareItem.fileId, commonId: this.shareItem.fileId,
sharePage: 'courseDetail', //分享出去得页面 sharePage: 'courseDetail', //分享出去得页面
userId:this.userId, userId:this.userId,
...@@ -427,7 +429,8 @@ ...@@ -427,7 +429,8 @@
link: shareURL + "/pages/courseDetail/courseDetail?fileId=" + item.fileId + link: shareURL + "/pages/courseDetail/courseDetail?fileId=" + item.fileId +
'&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode + '&shareUserId=' + '&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode + '&shareUserId=' +
this.userId + '&jumpUrl=' + jumptime + "&", //分享链接 this.userId + '&jumpUrl=' + jumptime + "&", //分享链接
imgUrl: item.displayImage, //图片 // imgUrl: item.displayImage, //图片
imgUrl: item.shareImg, //图片
} }
//安卓机型获取当前页面路径 //安卓机型获取当前页面路径
let url = window.location.href.split('#')[0]; let url = window.location.href.split('#')[0];
......
pages/personalCenter/personalCenter.vue
...@@ -109,6 +109,20 @@ ...@@ -109,6 +109,20 @@
<view class="subtit"> <view class="subtit">
晋升下一级目标 晋升下一级目标
</view> </view>
<view class="" >
<view class="">
<text class="iconfont icon-xiaoshoue leftIcon"></text>
<text>购买分销系统内任一产品(含自购)</text>
<!-- <text class="iconfont icon-duihao2 rightIcon" ></text> -->
<text v-if="partnerStatistic.hasCompletedFirstOrder!='1'"
class="iconfont icon-weiwancheng rightIcon"></text>
<text v-else class="iconfont icon-duihao2 rightIcon"></text>
</view>
<!-- <view class="num">
<text>{{partnerStatistic.totalSingeSaleNum.toFixed(2)}}元 /
{{partnerStatistic.reachSingeSaleNum.toFixed(2)}}元</text>
</view> -->
</view>
<view class="" v-if="partnerStatistic.reachPeopleNum>0"> <view class="" v-if="partnerStatistic.reachPeopleNum>0">
<view class=""> <view class="">
<text class="iconfont icon-a-tuandui3 leftIcon"></text> <text class="iconfont icon-a-tuandui3 leftIcon"></text>
...@@ -123,20 +137,7 @@ ...@@ -123,20 +137,7 @@
<text v-if="partnerStatistic.peopleNum>0">（相差{{partnerStatistic.peopleNum}}人）</text> <text v-if="partnerStatistic.peopleNum>0">（相差{{partnerStatistic.peopleNum}}人）</text>
</view> </view>
</view> </view>
<view class="" v-if="partnerStatistic.reachSingeSaleNum>0">
<view class="">
<text class="iconfont icon-xiaoshoue leftIcon"></text>
<text>个人标准销售累计金额</text>
<!-- <text class="iconfont icon-duihao2 rightIcon" ></text> -->
<text v-if="partnerStatistic.totalSingeSaleNum<partnerStatistic.reachSingeSaleNum"
class="iconfont icon-weiwancheng rightIcon"></text>
<text v-else class="iconfont icon-duihao2 rightIcon"></text>
</view>
<view class="num">
<text>{{partnerStatistic.totalSingeSaleNum.toFixed(2)}}元 /
{{partnerStatistic.reachSingeSaleNum.toFixed(2)}}元</text>
</view>
</view>
<view class="" v-if="partnerStatistic.reachSaleNum>0"> <view class="" v-if="partnerStatistic.reachSaleNum>0">
<view class=""> <view class="">
<text class="iconfont icon-ddailirenshu leftIcon"></text> <text class="iconfont icon-ddailirenshu leftIcon"></text>
...@@ -1309,7 +1310,7 @@ ...@@ -1309,7 +1310,7 @@
} }
.applyBox { .applyBox {
width: 500rpx; width: 600rpx;
border-radius: 30rpx; border-radius: 30rpx;
background-color: #ffff; background-color: #ffff;
padding: 30rpx; padding: 30rpx;
......
util/questions.js
...@@ -22,9 +22,9 @@ export default [ ...@@ -22,9 +22,9 @@ export default [
{ {
"Q": "合伙人晋升条件", "Q": "合伙人晋升条件",
"A": [ "A": [
"见习合伙人：完成加盟申请", "见习合伙人：申请加盟成功",
"新锐合伙人：个人标准销售额≥198元", "新锐合伙人：申请加盟成功且购买分销系统内任一产品(含自购)",
"资深合伙人：个人标准销售额≥198元 + 团队有效人数≥5人 + 团队标准销售额≥5万元", "资深合伙人：申请加盟成功且购买分销系统内任一产品(含自购)+团队≥5人+团队标准销售额≥5万",
], ],
"isActive": 1, "isActive": 1,
"isMore": true "isMore": true
......
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