Skip to content

C
CFFP-HB
Commit de2a5c14 by yuzhenWang
Options

解决冲突未发生产

parents 0096be2e a5333080
Showing with 464 additions and 299 deletions
pages/personalCenter/personalCenter.vue
......@@ -4,26 +4,29 @@
<!-- <FloatingButton ></FloatingButton> -->
<view class="myHeader">
<view class="left" @click="userinfo()">
<view
class="avatar"
:style="{backgroundImage: 'url(' + (customerBasicInfo.headPicture || companyLogo) + ')'}"
>
<view class="avatar"
:style="{backgroundImage: 'url(' + (customerBasicInfo.headPicture || companyLogo) + ')'}">
</view>
<view class="headerInfo">
<view class="headerTop">
<view class="" style="margin-right: 15rpx;">
<view class="myName" v-if="loginType == 'codelogin'">
{{showMyName || '点头像完善信息'}}
<text v-if="customerBasicInfo.partnerType" class="typePartner">{{customerBasicInfo.partnerType}}</text>
<text v-if="customerBasicInfo.partnerType"
class="typePartner">{{customerBasicInfo.partnerType}}</text>
</view>
<view class="myName" v-if="loginType == 'visitor'">游客</view>
</view>
<!-- &&customerBasicInfo.parentName 我的上级：{{customerBasicInfo.parentName}} -->
<view class="desBox" v-if="loginType == 'codelogin'">
<!-- 上级的显示 -->
<text class="desTxt" v-if="customerBasicInfo.parentRealName&&customerBasicInfo.parentNickName">我的上级：{{customerBasicInfo.parentRealName}}({{customerBasicInfo.parentNickName}})</text>
<text v-else-if="customerBasicInfo.parentRealName">我的上级：{{customerBasicInfo.parentRealName}} </text>
<text v-else-if="!customerBasicInfo.parentRealName&&customerBasicInfo.parentNickName">我的上级：{{customerBasicInfo.parentNickName}}</text>
<text class="desTxt"
v-if="customerBasicInfo.parentRealName&&customerBasicInfo.parentNickName">我的上级：{{customerBasicInfo.parentRealName}}({{customerBasicInfo.parentNickName}})</text>
<text v-else-if="customerBasicInfo.parentRealName">我的上级：{{customerBasicInfo.parentRealName}}
</text>
<text
v-else-if="!customerBasicInfo.parentRealName&&customerBasicInfo.parentNickName">我的上级：{{customerBasicInfo.parentNickName}}</text>
</view>
</view>
</view>
......@@ -33,7 +36,7 @@
<view class="iconfont icon-shezhi " style="font-size: 40rpx;color: #fff;"></view>
</view>
</view>
<view class="myContent">
<view class="myContent" :style="{ paddingBottom: tabBarPadding + 'px' }">
<view class="infoBody" @click="jumpToSystemMsg()">
<view class="">
<view v-if="messageInfo.length>0">
......@@ -44,27 +47,29 @@
</view>
</view>
<view class="msgBox">
<view class="magNum" v-if="msgTotal>0" >
<view class="magNum" v-if="msgTotal>0">
{{msgTotal}}
</view>
<view class="iconfont icon-youjiantou iconColor"></view>
</view>
</view>
<!-- 不是合伙人的角色可以看名片 v-if="customerBasicInfo.userIdentity&&customerBasicInfo.userIdentity!=='PARTNER'" -->
<!-- <view class="infoBody" v-if="customerBasicInfo.userIdentity&&customerBasicInfo.userIdentity!=='PARTNER'" style="margin-top: 10rpx;" @click="businessCard()">
<view class="infoBody" v-if="customerBasicInfo.userIdentity&&customerBasicInfo.userIdentity!=='PARTNER'"
style="margin-top: 10rpx;" @click="businessCard()">
<view class="">
我的名片
</view>
<view class="">
<view class="iconfont icon-youjiantou iconColor"></view>
</view>
</view> -->
</view>
<view class="kuaiBox" v-for="item in mainMenuLists" :key="item.id">
<view class="kuaiTit">
{{item.categoryName}}
</view>
<view class="kuaiCon">
<view class="kuaiItem" v-for="menuItem in item.children.filter(v=>v.isShow)" :key="menuItem.title" @click="goDetail(menuItem)">
<view class="kuaiItem" v-for="menuItem in item.children.filter(v=>v.isShow)" :key="menuItem.title"
@click="goDetail(menuItem)">
<view class="imgbox">
<view class="iconfont iconSize" :class="`${menuItem.icon}`"></view>
</view>
......@@ -76,25 +81,22 @@
</view>
</view>
<view class="shareBtn" :class="{'shareBottom':shareBtnBottom}" @click="gotoPoster">
<view class="shareBtn" @click="gotoPoster">
<view class="shareBox">
分享给好友
</view>
</view>
</view>
<!-- 使用封装后的弹窗组件 -->
<join-popup
ref="joinPopup"
@confirm="gotoApply"
></join-popup>
<join-popup ref="joinPopup" @confirm="gotoApply"></join-popup>
<uni-popup ref="applyPopup" type="center" background-color="#fff">
<view class="applyBox">
<view style="text-align: right;" @click="$refs.applyPopup.close()">
<view class="iconfont icon-chahao" ></view>
<view class="iconfont icon-chahao"></view>
</view>
<view class="applyCon">
<view style="text-align: center;" >
<view class="iconfont icon-dianzan" ></view>
<view style="text-align: center;">
<view class="iconfont icon-dianzan"></view>
</view>
<view class="title">
......@@ -106,59 +108,47 @@
</view>
<view class="" v-if="partnerStatistic.reachPeopleNum>0">
<view class="">
<text class="iconfont icon-a-tuandui3 leftIcon" ></text>
<text class="iconfont icon-a-tuandui3 leftIcon"></text>
<text>团队有效人数</text>
<text
v-if="partnerStatistic.totalPeopleNum<partnerStatistic.reachPeopleNum"
class="iconfont icon-weiwancheng rightIcon"
></text>
<text
v-else
class="iconfont icon-duihao2 rightIcon"
></text>
<text v-if="partnerStatistic.totalPeopleNum<partnerStatistic.reachPeopleNum"
class="iconfont icon-weiwancheng rightIcon"></text>
<text v-else class="iconfont icon-duihao2 rightIcon"></text>
</view>
<view class="num">
<text >{{partnerStatistic.totalPeopleNum}} / {{partnerStatistic.reachPeopleNum}}</text>
<text>{{partnerStatistic.totalPeopleNum}} / {{partnerStatistic.reachPeopleNum}}</text>
<text v-if="partnerStatistic.peopleNum>0">（相差{{partnerStatistic.peopleNum}}人）</text>
</view>
</view>
<view class="" v-if="partnerStatistic.reachSingeSaleNum>0">
<view class="" >
<text class="iconfont icon-xiaoshoue leftIcon" ></text>
<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>
<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>
<text>{{partnerStatistic.totalSingeSaleNum.toFixed(2)}}元 /
{{partnerStatistic.reachSingeSaleNum.toFixed(2)}}元</text>
</view>
</view>
<view class="" v-if="partnerStatistic.reachSaleNum>0">
<view class="">
<text class="iconfont icon-ddailirenshu leftIcon" ></text>
<text class="iconfont icon-ddailirenshu leftIcon"></text>
<text>团队标准销售累计金额</text>
<!-- <text class="iconfont icon-weiwancheng rightIcon" ></text> -->
<text
v-if="partnerStatistic.totalSaleNum<partnerStatistic.reachSaleNum"
class="iconfont icon-weiwancheng rightIcon"
></text>
<text
v-else
class="iconfont icon-duihao2 rightIcon"
></text>
<text v-if="partnerStatistic.totalSaleNum<partnerStatistic.reachSaleNum"
class="iconfont icon-weiwancheng rightIcon"></text>
<text v-else class="iconfont icon-duihao2 rightIcon"></text>
</view>
<view class="num">
<text >{{partnerStatistic.totalSaleNum.toFixed(2)}}元 / {{partnerStatistic.reachSaleNum.toFixed(2)}}元</text>
<text v-if="partnerStatistic.saleNum>0">（相差{{partnerStatistic.saleNum.toFixed(2)}}元）</text>
<text>{{partnerStatistic.totalSaleNum.toFixed(2)}}元 /
{{partnerStatistic.reachSaleNum.toFixed(2)}}元</text>
<text
v-if="partnerStatistic.saleNum>0">（相差{{partnerStatistic.saleNum.toFixed(2)}}元）</text>
</view>
</view>
......@@ -168,17 +158,10 @@
</view>
</uni-popup>
<!-- 不是新锐合伙人提示 -->
<partner-tip-popup
ref="PartnerTipPopup"
content="您还未升级为新锐合伙人，团队成员销售成功您不能拿到收益。购买产品升级为新锐合伙人 "
joinText="暂不升级，继续邀请"
continueText="购买产品，立即升级"
btnType="vertical"
:tipIcon="true"
@join="jumpPage('2')"
@continue="jumpPage('1')"
/>
<restrictedTip ref="restrictedTip"/>
<partner-tip-popup ref="PartnerTipPopup" content="您还未升级为新锐合伙人，团队成员销售成功您不能拿到收益。购买产品升级为新锐合伙人 "
joinText="暂不升级，继续邀请" continueText="购买产品，立即升级" btnType="vertical" :tipIcon="true" @join="jumpPage('2')"
@continue="jumpPage('1')" />
<restrictedTip ref="restrictedTip" />
</view>
</template>
......@@ -188,7 +171,7 @@
import common from "../../common/common";
import tabBar from '../../components/tabBar/tabBar.vue';
import api from "@/api/api";
import {companyInfo} from "@/environments/environment";
import { companyInfo } from "@/environments/environment";
import FloatingButton from '@/components/FloatingButton/FloatingButton.vue';
import JoinPopup from '@/components/commonPopup/JoinPopup.vue';
import PartnerTipPopup from "@/components/commonPopup/PartnerTipPopup.vue";
......@@ -197,71 +180,207 @@
export default {
data() {
return {
showMyName:'',
msgTotal:0,
messageInfo:[],
companyType : companyInfo.companyType,
companyLogo : '../../static/suplogo.png',
showMyName: '',
msgTotal: 0,
messageInfo: [],
companyType: companyInfo.companyType,
companyLogo: '../../static/suplogo.png',
userId: uni.getStorageSync('cffp_userId'),
loginType : uni.getStorageSync('loginType'),
inviteEqrode:'',
currentPage:'personalCenter',
customerBasicInfo:{},
loginType: uni.getStorageSync('loginType'),
inviteEqrode: '',
currentPage: 'personalCenter',
customerBasicInfo: {},
loginornot: true,
settingItem:{title:'系统设置',icon:'setting',link:'/pages/personalCenter/system/settings',isOpen:true,isShow:true},
mainMenuLists:[
{id:'00',categoryName:'交易',
children:[
{title:'成交订单',icon:'icon-dingdan',link:'/pages/saleCourseLists/saleCourseLists',isOpen:true,isShow:true},
{title:'佣金',icon:'icon-yongjin',link:'/pages/pointsExchange/pointsExchange',isOpen:true,isShow:true,identity: true},
{title:'我的售后',icon:'icon-shouhoufuwu',link:'/pages/afterSales/afterSales',isOpen:true,isShow:true},
{title:'分享数据',icon:'icon-shujufenxi',link:'/pages/myShare/myShare',isOpen:true,isShow:true},
tabBarPadding: 100,
settingItem: {
title: '系统设置',
icon: 'setting',
link: '/pages/personalCenter/system/settings',
isOpen: true,
isShow: true
},
mainMenuLists: [{
id: '00',
categoryName: '交易',
children: [{
title: '成交订单',
icon: 'icon-dingdan',
link: '/pages/saleCourseLists/saleCourseLists',
isOpen: true,
isShow: true
},
{
title: '佣金',
icon: 'icon-yongjin',
link: '/pages/pointsExchange/pointsExchange',
isOpen: true,
isShow: true,
identity: true
},
{
title: '我的售后',
icon: 'icon-shouhoufuwu',
link: '/pages/afterSales/afterSales',
isOpen: true,
isShow: true
},
{
title: '分享数据',
icon: 'icon-shujufenxi',
link: '/pages/myShare/myShare',
isOpen: true,
isShow: true
},
],
},
{id:'01',categoryName:'团队',
children:[
{key:'applyFranchise',title:'申请加盟',icon:'icon-hezuo',link:'/myPackageA/applyFranchise/applyFranchise?',isOpen:true,isShow:true,isApply:true},
{key:'06',title:'邀请加盟',icon:'icon-yaoqing',link:'/pages/inviteJoin/inviteJoin',isOpen:true,isShow:true,identity: true},
// {title:'我的团队',icon:'icon-tuandui',link:'/pages/personalCenter/myTeam',isOpen:true,isShow:true,identity: true},
{title:'我的团队',icon:'icon-tuandui',link:'/myPackageA/myTeam/myTeam',isOpen:true,isShow:true,identity: true},
{
id: '01',
categoryName: '团队',
children: [{
title: '申请加盟',
icon: 'icon-hezuo',
link: '/myPackageA/applyFranchise/applyFranchise?',
isOpen: true,
isShow: true,
isApply: true
},
{
key: '06',
title: '邀请加盟',
icon: 'icon-yaoqing',
link: '/pages/inviteJoin/inviteJoin',
isOpen: true,
isShow: true,
identity: true
},
{
title: '我的团队',
icon: 'icon-tuandui',
link: '/myPackageA/myTeam/myTeam',
isOpen: true,
isShow: true,
identity: true
},
// {title:'育成团队',icon:'icon-yuchengguanxi',link:'/pages/personalCenter/myTeamIncubate',isOpen:true,isShow:true,identity: true},
],
},{id:'03',categoryName:'学习研讨',
children:[
{key:'company-intro',title:'公司介绍',icon:'icon-gongsi',link:'/pages/personalCenter/detail',isOpen:true,isShow:true,identity:true,type:1},
{key:'policies',title:'制度',icon:'icon-xiaoshoue',link:'/pages/personalCenter/detail',isOpen:true,isShow:false,identity: true,type:4},
{key:'products',title:'产品分析',icon:'icon-shujufenxi',link:'/pages/personalCenter/detail',isOpen:true,isShow:false,identity: true,type:3},
{key:'cases',title:'案例分享',icon:'icon-shiyongjiaocheng',link:'/pages/personalCenter/detail',isOpen:true,isShow:false,identity: true,type:2},
{key:'commission',title:'持牌人佣金',icon:'icon-dingdan',link:'/myPackageA/product-list/product-commission',isOpen:true,isShow:false,identity: true},
],
},{id:'04',categoryName:'海外资产配置',
children:[
{title:'积分明细',icon:'icon-yongjin',link:'/pages/personalCenter/helpCenter',isOpen:false,isShow:true,islogin:true}
}, {
id: '03',
categoryName: '学习研讨',
children: [{
key: 'company-intro',
title: '公司介绍',
icon: 'icon-gongsi',
link: '/pages/personalCenter/detail',
isOpen: true,
isShow: true,
identity: true,
type: 1
},
{
key: 'policies',
title: '制度',
icon: 'icon-xiaoshoue',
link: '/pages/personalCenter/detail',
isOpen: true,
isShow: false,
identity: true,
type: 4
},
{
key: 'products',
title: '产品分析',
icon: 'icon-shujufenxi',
link: '/pages/personalCenter/detail',
isOpen: true,
isShow: false,
identity: true,
type: 3
},
{
key: 'cases',
title: '案例分享',
icon: 'icon-shiyongjiaocheng',
link: '/pages/personalCenter/detail',
isOpen: true,
isShow: false,
identity: true,
type: 2
},
{
key: 'commission',
title: '持牌人佣金',
icon: 'icon-dingdan',
link: '/myPackageA/product-list/product-commission',
isOpen: true,
isShow: false,
identity: true
},
],
}, {
id: '04',
categoryName: '海外资产配置',
children: [{
title: '积分明细',
icon: 'icon-yongjin',
link: '/pages/personalCenter/helpCenter',
isOpen: false,
isShow: true,
islogin: true
}],
},
{
id: '02',
categoryName: '帮助',
children: [{
title: '帮助中心',
icon: 'icon-wenhao1',
link: '/pages/personalCenter/helpCenter',
isOpen: true,
isShow: true,
islogin: true
},
{
title: '咨询客服',
icon: 'icon-kefu1',
link: '',
isOpen: true,
isShow: true,
islogin: true,
kefu: true
},
{id:'02',categoryName:'帮助',
children:[
{title:'帮助中心',icon:'icon-wenhao1',link:'/pages/personalCenter/helpCenter',isOpen:true,isShow:true,islogin:true},
{title:'咨询客服',icon:'icon-kefu1',link:'',isOpen:true,isShow:true,islogin:true,kefu:true},
],
},
],
minorMenuLists:[
minorMenuLists: [
// {title:'我的邀请码',icon:'shareEcode',link:'',isOpen:true,isShow:true},
{title:'我的卡包',icon:'card',link:'',isOpen:true,isShow:false},
{ title: '我的卡包', icon: 'card', link: '', isOpen: true, isShow: false },
// {title:'我的认证',icon:'myCertify',link:'/pages/myCertify/myCertify',isOpen:true,isShow:true},
{title:'申请修改公司周边',icon:'setting',link:'',isOpen:true,isShow:false},
{title:'我的消息',icon:'message',link:'/pages/systemMsg/system_msg',isOpen:true,isShow:true,islogin:true},
{title:'系统设置',icon:'setting',link:'/pages/personalCenter/system/settings',isOpen:true,isShow:true}
{ title: '申请修改公司周边', icon: 'setting', link: '', isOpen: true, isShow: false },
{
title: '我的消息',
icon: 'message',
link: '/pages/systemMsg/system_msg',
isOpen: true,
isShow: true,
islogin: true
},
{
title: '系统设置',
icon: 'setting',
link: '/pages/personalCenter/system/settings',
isOpen: true,
isShow: true
}
],
partnerStatistic:{}, //申请加盟统计
userInfo:{} ,//用户信息,
shareBtnBottom:false,
productItem:{}
partnerStatistic: {}, //申请加盟统计
userInfo: {}, //用户信息,
shareBtnBottom: false,
productItem: {}
}
},
components:{
components: {
tabBar,
JoinPopup,
PartnerTipPopup,
......@@ -269,23 +388,23 @@
},
onShow() {
this.loginType = uni.getStorageSync('loginType')
if(this.companyType == '1'){
this.companyLogo='../../static/myteam/Group1633.png';
}else if(this.companyType == '2'){
this.companyLogo='../../static/suplogo.png';
if (this.companyType == '1') {
this.companyLogo = '../../static/myteam/Group1633.png';
} else if (this.companyType == '2') {
this.companyLogo = '../../static/suplogo.png';
}
if(!this.loginType|| this.loginType == "visitor"){
if (!this.loginType || this.loginType == "visitor") {
this.loginornot = false
}else{
} else {
this.loginornot = true;
}
if(this.loginType == 'codelogin'){
if (this.loginType == 'codelogin') {
this.querySystemMessage()
this.queryInfo();
this.courseList()
}else {
} else {
this.messageInfo = []
uni.removeTabBarBadge({ index: 3 });
this.msgTotal = 0
......@@ -294,17 +413,17 @@
uni.$on("handClick", res => {
this.customerBasicInfo = res.data
let name = this.customerBasicInfo.realName || this.customerBasicInfo.nickName
if(name && name.length>4){
this.showMyName =name.substring(0, 4) + '...'
}else {
if (name && name.length > 4) {
this.showMyName = name.substring(0, 4) + '...'
} else {
this.showMyName = name
}
// 移除监听事件
uni.$off('handClick');
});
if(uni.getStorageSync('cffp_userInfo')){
if (uni.getStorageSync('cffp_userInfo')) {
this.userInfo = JSON.parse(uni.getStorageSync('cffp_userInfo'))
if(this.userInfo){
if (this.userInfo) {
const levelCode = this.userInfo.levelCode || '';
const dealerId = this.userInfo.dealerId || '';
// 2. 找到“申请加盟”菜单项（通过 key）
......@@ -316,13 +435,11 @@
// 3. 更新标题和显示状态
applyItem.title = levelCode === '' ? '申请加盟' : '晋升目标';
applyItem.isShow = !dealerId && levelCode!='P3'; // 没有 dealerId 才显示
applyItem.isShow = !dealerId && levelCode != 'P3'; // 没有 dealerId 才显示
}
}
// #ifdef H5
const systemInfo = uni.getSystemInfoSync();
this.shareBtnBottom = systemInfo.platform === 'ios'
// console.log('this.shareBtnBottom',this.shareBtnBottom);
initJssdkShare(() => {
setWechatShare();
}, window.location.href);
......@@ -334,36 +451,36 @@
api.courseList().then(res => {
if (res['success']) {
let cffpCourseInfos = res['data']['data'];
if(cffpCourseInfos.length>0){
cffpCourseInfos.forEach(item=>{
if (cffpCourseInfos.length > 0) {
cffpCourseInfos.forEach(item => {
if(item.productCode&&item.productCode=='ZNTJ'){
if (item.productCode && item.productCode == 'ZNTJ') {
this.productItem = item
uni.setStorageSync('productItem',this.productItem );
uni.setStorageSync('productItem', this.productItem);
}
})
}
}
})
},
gotoPoster(){
if(!uni.getStorageSync('loginType') || uni.getStorageSync('loginType')=='visitor'){
uni.setStorageSync('loginType','visitor')
uni.setStorageSync('islogin','1')
gotoPoster() {
if (!uni.getStorageSync('loginType') || uni.getStorageSync('loginType') == 'visitor') {
uni.setStorageSync('loginType', 'visitor')
uni.setStorageSync('islogin', '1')
}
uni.navigateTo({
url:'/myPackageA/poster/poster?from=personalCenter'
url: '/myPackageA/poster/poster?from=personalCenter'
})
},
jumpPage(type){
jumpPage(type) {
if(type=='1'){
if (type == '1') {
uni.navigateTo({
url:'/pages/inviteJoin/inviteJoin'
url: '/pages/inviteJoin/inviteJoin'
})
}else {
} else {
let productItem = {}
if(uni.getStorageSync('productItem')){
if (uni.getStorageSync('productItem')) {
productItem = JSON.parse(JSON.stringify(uni.getStorageSync('productItem')))
}
uni.navigateTo({
......@@ -372,21 +489,21 @@
}
},
getPartnerStatistic(){
if(this.userId){
api.partnerStatisticsGrade({userId:uni.getStorageSync('cffp_userId')}).then((res)=>{
if(res['success']){
getPartnerStatistic() {
if (this.userId) {
api.partnerStatisticsGrade({ userId: uni.getStorageSync('cffp_userId') }).then((res) => {
if (res['success']) {
this.partnerStatistic = res['data']
for (let key in this.partnerStatistic) {
if(key!='peopleNum' && key!='reachPeopleNum'&& key!='totalPeopleNum'){
if(key){
if (key != 'peopleNum' && key != 'reachPeopleNum' && key != 'totalPeopleNum') {
if (key) {
this.partnerStatistic[key] = Number(this.partnerStatistic[key].toFixed(2))
}
}
}
this.$refs.applyPopup.open()
}else {
} else {
uni.showToast({
title: res['message'],
duration: 2000,
......@@ -396,30 +513,30 @@
})
}
},
gotoApply(){
gotoApply() {
uni.navigateTo({
url: '/myPackageA/applyFranchise/applyFranchise'
})
this.$refs.joinPopup.close()
},
querySystemMessage(){
if(this.userId){
api.querySystemMessage({systemType:1,userId:uni.getStorageSync('cffp_userId')}).then((res)=>{
if(res['success']&&res['data']['dataList']&&res['data']['dataList'].length>0){
querySystemMessage() {
if (this.userId) {
api.querySystemMessage({ systemType: 1, userId: uni.getStorageSync('cffp_userId') }).then((res) => {
if (res['success'] && res['data']['dataList'] && res['data']['dataList'].length > 0) {
this.messageInfo = res['data']['dataList'];
this.msgTotal = res['data']['dataList'].filter(item=>{
this.msgTotal = res['data']['dataList'].filter(item => {
return item.isRead == 0
}).length
if(this.msgTotal>0){
if (this.msgTotal > 0) {
uni.setTabBarBadge({
index: 3,
text: this.msgTotal.toString()
});
}else {
} else {
uni.removeTabBarBadge({ index: 3 });
}
}else {
} else {
this.messageInfo = []
uni.removeTabBarBadge({ index: 3 });
this.msgTotal = 0
......@@ -427,7 +544,7 @@
})
}
},
jumpToSystemMsg(){
jumpToSystemMsg() {
dataHandling.pocessTracking(
'查看',
`用户查看个人消息`,
......@@ -437,7 +554,7 @@
'pages/personalCenter/personalCenter'
)
uni.navigateTo({
url:'../systemMsg/system_msg'
url: '../systemMsg/system_msg'
})
// if(this.userId&& this.messageInfo.length>0){
// uni.navigateTo({
......@@ -445,26 +562,26 @@
// })
// }
},
close(){
close() {
this.bootpage = false
},
isLogin(){
isLogin() {
uni.navigateTo({
url: '/myPackageA/login/login?from=personalCenter'
})
try {
uni.setStorageSync('loginType','visitor');
uni.setStorageSync('loginType', 'visitor');
} catch (e) {
}
return false
},
// 菜单跳转页面
goDetail(item){
if(uni.getStorageSync('cffp_userInfo')){
goDetail(item) {
if (uni.getStorageSync('cffp_userInfo')) {
this.userInfo = JSON.parse(uni.getStorageSync('cffp_userInfo'))
}
if(item.isApply&&(!uni.getStorageSync('loginType')||uni.getStorageSync('loginType')=='visitor')){
if (item.isApply && (!uni.getStorageSync('loginType') || uni.getStorageSync('loginType') == 'visitor')) {
dataHandling.pocessTracking(
'申请加盟',
`用户在未登录时点击了申请加盟`,
......@@ -479,7 +596,7 @@
});
return
}
if(item.kefu){
if (item.kefu) {
// 现在还没转化成小程序，暂时放在这
// #ifdef MP-WEIXIN
console.log('MP-WEIXIN====')
......@@ -497,7 +614,8 @@
},
corpId: 'ww43cac1cf9dd6a3d0', // 客服会话按钮打开后，在微信客服会话按钮处理的事件类型
showMessageCard: true,
sendMessageTitle: (uni.getStorageSync('hoservice_mobileNo')?(uni.getStorageSync('hoservice_mobileNo')+"，") :"" ) + "进入个人中心-->咨询客服",
sendMessageTitle: (uni.getStorageSync('hoservice_mobileNo') ? (uni.getStorageSync(
'hoservice_mobileNo') + "，") : "") + "进入个人中心-->咨询客服",
sendMessagePath: `/pages/index/mySelf.html`,
//sendMessageImg: cardItem.value['list'][0]['itemImg']
});
......@@ -512,14 +630,14 @@
'我的',
'pages/personalCenter/personalCenter'
)
if (uni.getStorageSync('mpCffp') == '1'){
if (uni.getStorageSync('mpCffp') == '1') {
let d = {
corpId: 'ww43cac1cf9dd6a3d0',//企业微信ID
url: 'https://work.weixin.qq.com/kfid/kfc08c55f4170e7fc9e',//企业微信客户接入链接
corpId: 'ww43cac1cf9dd6a3d0', //企业微信ID
url: 'https://work.weixin.qq.com/kfid/kfc08c55f4170e7fc9e', //企业微信客户接入链接
}
let p = Object.keys(d).reduce((p, k, i) => p + `${i ? '&' : '?'}${k}=${d[k]}`, '');
wx.miniProgram.reLaunch({ url: `/pages/index/homePage${p}` });//触发小程序刷新页面获取appId
}else{
wx.miniProgram.reLaunch({ url: `/pages/index/homePage${p}` }); //触发小程序刷新页面获取appId
} else {
window.open('https://work.weixin.qq.com/kfid/kfc08c55f4170e7fc9e')
}
// #endif
......@@ -527,7 +645,7 @@
}
if(item.isApply&&this.customerBasicInfo.partnerType){
if (item.isApply && this.customerBasicInfo.partnerType) {
dataHandling.pocessTracking(
'申请加盟',
`用户已成为合伙人查看了团队统计差`,
......@@ -536,7 +654,7 @@
'我的',
'pages/personalCenter/personalCenter'
)
if(this.customerBasicInfo.userIsActive == 2){
if (this.customerBasicInfo.userIsActive == 2) {
this.$refs.restrictedTip.open()
return
}
......@@ -544,12 +662,13 @@
return
}
//当为见习合伙人的时候，弹出框提示
if(item.key == '06'&& this.userInfo.levelCode == 'P1' && uni.getStorageSync('loginType') == 'codelogin'&& this.userInfo.userIsActive == 1){
if (item.key == '06' && this.userInfo.levelCode == 'P1' && uni.getStorageSync('loginType') ==
'codelogin' && this.userInfo.userIsActive == 1) {
this.$refs.PartnerTipPopup.open()
return
}
// 说明不需要登录就可以进
if(item.isLogin){
if (item.isLogin) {
dataHandling.pocessTracking(
'查看',
`用户点击了${item.title}模块`,
......@@ -563,22 +682,22 @@
});
return
}
if(!this.loginornot&& !item.islogin){
if (!this.loginornot && !item.islogin) {
this.isLogin()
return
}
if(item.isShow && item.isOpen){
if(item.title==='我的邀请码'){
if (item.isShow && item.isOpen) {
if (item.title === '我的邀请码') {
this.$refs.popup1.open('bottom');
}else{
} else {
this.ckidentity(item)
}
}else{
common.errorDialog(2,'该模块正在开发中，敬请期待！','提示');
} else {
common.errorDialog(2, '该模块正在开发中，敬请期待！', '提示');
}
},
ckidentity(item){
if(item.identity == true && this.customerBasicInfo.partnerType ==null){
ckidentity(item) {
if (item.identity == true && this.customerBasicInfo.partnerType == null) {
dataHandling.pocessTracking(
'查看',
`用户在未加盟时点击了${item.title}模块`,
......@@ -589,23 +708,25 @@
)
this.$refs.joinPopup.open()
return false
}else if(item.title == '邀请加盟'){
} else if (item.title == '邀请加盟') {
uni.navigateTo({
url: `${item.link}?levelCode=` + this.customerBasicInfo.levelCode
});
}else{
} else {
const urlObj = JSON.parse(JSON.stringify(item))
if(urlObj.type){
urlObj.link = `${urlObj.link}?type=${urlObj.type}&from=personalCenter&partnerType=${this.customerBasicInfo.partnerType}`
}else{
urlObj.link = `${urlObj.link}?from=personalCenter&partnerType=${this.customerBasicInfo.partnerType}`
if (urlObj.type) {
urlObj.link =
`${urlObj.link}?type=${urlObj.type}&from=personalCenter&partnerType=${this.customerBasicInfo.partnerType}`
} else {
urlObj.link =
`${urlObj.link}?from=personalCenter&partnerType=${this.customerBasicInfo.partnerType}`
}
if(item.isTab){
if (item.isTab) {
uni.switchTab({
url:`../../${urlObj.link}`
url: `../../${urlObj.link}`
})
}else{
} else {
uni.navigateTo({
url: urlObj.link
});
......@@ -614,8 +735,8 @@
}
},
userinfo(){
if(this.loginornot === true){
userinfo() {
if (this.loginornot === true) {
dataHandling.pocessTracking(
'个人信息',
`用户在我的点击个人资料`,
......@@ -625,33 +746,34 @@
'pages/personalCenter/personalCenter'
)
uni.navigateTo({
url:`/pages/personalCenter/user-information?customerBasicInfo=` + JSON.stringify(this.customerBasicInfo)
url: `/pages/personalCenter/user-information?customerBasicInfo=` + JSON.stringify(this
.customerBasicInfo)
})
}else {
} else {
this.isLogin()
}
},
// 弹窗
errorDialog(type,content){
common.errorDialog(type,content);
errorDialog(type, content) {
common.errorDialog(type, content);
return false;
},
closePopup(){
closePopup() {
this.$refs.popup1.close()
},
copy(){
copy() {
uni.setClipboardData({
data: this.inviteEqrode,
success: function () {
success: function() {
console.log('success');
}
});
},
setSpecificMenuIsShow(mainMenus,permKeys){
setSpecificMenuIsShow(mainMenus, permKeys) {
// 找到id=03的主菜单
const targetMenu = mainMenus.find(menu => menu.id === '03');
if(permKeys){
if (permKeys) {
// 提取权限数组中的key
const validKeys = permKeys.map(item => item.key);
......@@ -660,12 +782,12 @@
targetMenu.children.forEach(subMenu => {
if (subMenu.key && validKeys.includes(subMenu.key)) {
subMenu.isShow = true;
}else{
} else {
subMenu.isShow = false;
}
});
}
}else{
} else {
if (targetMenu && targetMenu.children) {
// 只遍历该菜单的children
targetMenu.children.forEach(subMenu => {
......@@ -680,37 +802,42 @@
return mainMenus;
},
// 查询个人资料
queryInfo(){
api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{
if(res['success']){
queryInfo() {
api.queryInfo({ userId: uni.getStorageSync('cffp_userId') }).then(res => {
if (res['success']) {
this.customerBasicInfo = res['data'];
// id=03的权限设置
// 执行处理
const result = this.setSpecificMenuIsShow(this.mainMenuLists, this.customerBasicInfo.accessPermission);
const result = this.setSpecificMenuIsShow(this.mainMenuLists, this.customerBasicInfo
.accessPermission);
// 输出结果（仅展示id=03的children验证效果）
// console.log('处理后的"学习研讨"子菜单：',
// JSON.stringify(result.find(menu => menu.id === '03')?.children, null, 2));
// this.customerBasicInfo.userIdentity = 'DISTRIBUTOR'
let name = this.customerBasicInfo.realName || this.customerBasicInfo.nickName
if(name && name.length>4){
if (name && name.length > 4) {
this.showMyName = name.substring(0, 4) + '...'
}else {
} else {
this.showMyName = name
}
if(this.customerBasicInfo.parentRealName&&this.customerBasicInfo.parentNickName && this.customerBasicInfo.parentNickName.length>3){
this.customerBasicInfo.parentNickName = this.customerBasicInfo.parentNickName.substring(0, 3) + '..'
if (this.customerBasicInfo.parentRealName && this.customerBasicInfo.parentNickName && this
.customerBasicInfo.parentNickName.length > 3) {
this.customerBasicInfo.parentNickName = this.customerBasicInfo.parentNickName
.substring(0, 3) + '..'
}
if(this.customerBasicInfo.parentRealName&&this.customerBasicInfo.parentNickName&& this.customerBasicInfo.parentRealName.length>3){
this.customerBasicInfo.parentRealName = this.customerBasicInfo.parentRealName.substring(0, 3) + '..'
if (this.customerBasicInfo.parentRealName && this.customerBasicInfo.parentNickName && this
.customerBasicInfo.parentRealName.length > 3) {
this.customerBasicInfo.parentRealName = this.customerBasicInfo.parentRealName
.substring(0, 3) + '..'
}
this.inviteEqrode = this.customerBasicInfo.invitationCode;
uni.setStorageSync('user_mobile', res.data.mobile)
console.log('this.mainMenuLists',this.mainMenuLists);
}else {
console.log('this.mainMenuLists', this.mainMenuLists);
} else {
uni.setStorageSync('loginType','visitor')
uni.setStorageSync('loginType', 'visitor')
this.showMyName = ''
this.loginType = 'visitor'
......@@ -719,8 +846,8 @@
},
// 我的名片页面
businessCard(){
if(!uni.getStorageSync('loginType')||uni.getStorageSync('loginType')=='visitor'){
businessCard() {
if (!uni.getStorageSync('loginType') || uni.getStorageSync('loginType') == 'visitor') {
this.isLogin()
return
}
......@@ -728,15 +855,15 @@
// 和后端协商一致，先查询名片状态，在做出相应反应
api.getBusinessCard(
userId
).then(res =>{
if(res['success']){
).then(res => {
if (res['success']) {
let cardStatus = res.data.data.cardStatus
if(cardStatus=='1'){
if (cardStatus == '1') {
//未申请名片
uni.navigateTo({
url:'/myPackageA/noBusinessCard/noBusinessCard'
url: '/myPackageA/noBusinessCard/noBusinessCard'
});
}else if(cardStatus=='2'){
} else if (cardStatus == '2') {
// 名片审核中
uni.showModal({
title: '提示',
......@@ -744,13 +871,13 @@
showCancel: false,
confirmText: '我知道了'
});
}else {
} else {
//申请的名片已经审核通过
uni.navigateTo({
url:'/myPackageA/businessCard/businessCard'
url: '/myPackageA/businessCard/businessCard'
});
}
}else {
} else {
uni.showToast({
title: res['message'],
duration: 2000,
......@@ -772,20 +899,24 @@
</script>
<style lang="scss" scoped>
::v-deep .uni-popup .uni-popup__wrapper{
::v-deep .uni-popup .uni-popup__wrapper {
margin: 0 !important;
border-radius: 30rpx;
}
.container{
box-sizing:border-box;
min-height: 100vh; /* 使用视口高度 */
.container {
box-sizing: border-box;
min-height: 100vh;
/* 使用视口高度 */
height: auto !important;
height: 100vh;
.iconColor{
.iconColor {
color: rgba(51, 51, 51, 1);
font-size: 28rpx;
}
.myHeader{
.myHeader {
box-sizing: border-box;
width: 100%;
height: 250rpx;
......@@ -793,12 +924,14 @@
display: flex;
align-items: center;
justify-content: space-between;
.left{
.left {
margin-left: 50rpx;
flex: 1;
display: flex;
align-items: center;
.avatar{
.avatar {
flex-grow: 0;
width: 130rpx;
height: 130rpx;
......@@ -813,7 +946,8 @@
-webkit-transform: translateZ(0);
backface-visibility: hidden;
-webkit-backface-visibility: hidden;
image{
image {
width: 100%;
height: 100%;
object-fit: cover;
......@@ -824,7 +958,7 @@
}
}
.headerInfo{
.headerInfo {
box-sizing: border-box;
margin-left: 20rpx;
display: flex;
......@@ -833,12 +967,15 @@
color: rgba(51, 51, 51, 1);
flex-direction: column;
justify-content: flex-start;
.headerTop{
color:#fff;
.myName{
.headerTop {
color: #fff;
.myName {
display: flex;
align-items: center;
.typePartner{
.typePartner {
margin-left: 15rpx;
padding: 5rpx 10rpx;
background-color: #fff;
......@@ -851,7 +988,7 @@
}
.desBox{
.desBox {
border-radius: 8rpx;
padding: 0 2rpx;
font-size: 24rpx;
......@@ -864,16 +1001,20 @@
text-overflow: ellipsis;
white-space: nowrap !important;
flex-shrink: 1;
.desTxt{
width: 350rpx; /* 根据需要调整 */
display: inline-block; /* 或者 block */
.desTxt {
width: 350rpx;
/* 根据需要调整 */
display: inline-block;
/* 或者 block */
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap !important;
flex-shrink: 1;
}
}
.nickName{
.nickName {
font-size: 27rpx;
font-weight: normal;
color: rgba(102, 102, 102, 1);
......@@ -882,16 +1023,17 @@
}
}
.right{
.right {
width: 100rpx;
margin-top: -20rpx;
}
}
.myContent{
box-sizing:border-box;
.myContent {
box-sizing: border-box;
padding: 20rpx;
.infoBody{
.infoBody {
box-sizing: border-box;
background: #fff;
width: 100%;
......@@ -901,16 +1043,18 @@
align-items: center;
justify-content: space-between;
font-size: 28rpx;
.msgBox{
.msgBox {
display: flex;
align-items: center;
.magNum{
.magNum {
background-color: #f43530;
width: 40rpx;
height: 40rpx;
min-width: 35rpx;
padding: 0 5rpx; /* 为多位数留空间 */
padding: 0 5rpx;
/* 为多位数留空间 */
box-sizing: border-box;
border-radius: 50%;
color: #fff;
......@@ -922,24 +1066,29 @@
}
}
.kuaiBox{
.kuaiBox {
box-sizing: border-box;
background: #fff;
width: 100%;
padding: 10rpx 20rpx;
border-radius: 8rpx;
margin-top: 20rpx;
.kuaiTit{
.kuaiTit {
font-size: 30rpx;
}
.kuaiCon {
margin-top: 30rpx;
display: flex;
align-items: center;
justify-content: flex-start; /* 保持 flex-start */
justify-content: flex-start;
/* 保持 flex-start */
flex-wrap: wrap;
width: 100%;
gap: 20rpx; /* 替代 margin-right */
gap: 20rpx;
/* 替代 margin-right */
}
.kuaiItem {
......@@ -949,7 +1098,8 @@
margin-bottom: 40rpx;
font-size: 26rpx;
// width: calc(25% - 20rpx); /* 4个子项，每个占25%宽度减去边距 */
width: calc(25% - 15rpx); /* 调整计算方式 */
width: calc(25% - 15rpx);
/* 调整计算方式 */
// margin-right: 20rpx; /* 设置右边距 */
}
......@@ -966,16 +1116,19 @@
font-size: 40rpx;
}
}
.kuaiBox:last-child{
.kuaiBox:last-child {
margin-bottom: 100rpx;
}
.shareBtn{
.shareBtn {
width: 100%;
display: flex;
align-items: center;
justify-content: center;
padding: 50rpx 0rpx;
.shareBox{
.shareBox {
background-color: #20269B;
color: #fff;
font-size: 30rpx;
......@@ -985,11 +1138,13 @@
padding: 20rpx 30rpx;
}
}
.shareBottom{
.shareBottom {
padding-bottom: 150rpx;
}
}
.joinContent{
.joinContent {
width: 500rpx;
border-radius: 30rpx;
background-color: #ffff;
......@@ -998,7 +1153,8 @@
display: flex;
align-items: center;
flex-direction: column;
.joinHeader{
.joinHeader {
width: 60rpx;
height: 60rpx;
border-radius: 50%;
......@@ -1008,15 +1164,18 @@
justify-content: center;
margin-bottom: 20rpx;
}
.joinCon{
.joinCon {
// padding: 20rpx 0;
.one{
.one {
font-size: 30rpx;
color: rgba(38, 41, 44, 1);
font-weight: 600;
text-align: center;
}
.two{
.two {
color: rgba(145, 144, 148, 1);
font-size: 26rpx;
text-align: center;
......@@ -1024,16 +1183,19 @@
margin-bottom: 20rpx;
}
}
.desBox{
.desBox {
display: flex;
flex-direction: column;
margin-bottom: 20rpx;
view{
view {
font-size: 28rpx;
margin-bottom: 10rpx;
}
}
.joinFotter{
.joinFotter {
width: 100%;
color: #fff;
display: flex;
......@@ -1046,53 +1208,63 @@
font-size: 28rpx;
}
}
.applyBox{
.applyBox {
width: 500rpx;
border-radius: 30rpx;
background-color: #ffff;
padding: 30rpx;
box-sizing: border-box;
.icon-chahao{
.icon-chahao {
color: #272536;
font-size: 28rpx;
}
.applyCon{
.applyCon {
display: flex;
// align-items: center;
flex-direction: column;
.icon-dianzan{
.icon-dianzan {
color: #FF8D1A;
font-size: 60rpx;
}
.title{
.title {
font-size: 35rpx;
font-weight: 600;
margin: 20rpx 0;
}
.applycontent{
.applycontent {
color: #20269B;
font-size: 28rpx;
.subtit{
.subtit {
font-size: 30rpx;
margin-bottom: 10rpx;
}
.num{
.num {
font-size: 26rpx;
color: #333333;
margin: 10rpx 0;
}
.leftIcon{
.leftIcon {
color: #20269B;
font-size: 26rpx;
margin-right: 5rpx;
}
.rightIcon{
.rightIcon {
margin-left: 5rpx;
font-size: 26rpx;
color: #F43530;
}
.icon-duihao2{
.icon-duihao2 {
color: #41C740;
}
}
......@@ -1101,15 +1273,12 @@
}
}
/* 新增：iPad mini 和 iPad Air 竖屏的媒体查询 */
/* iPad mini 竖屏 */
@media only screen
and (min-device-width: 768px)
and (max-device-width: 1024px)
and (orientation: portrait)
and (-webkit-min-device-pixel-ratio: 1) {
@media only screen and (min-device-width: 768px) and (max-device-width: 1024px) and (orientation: portrait) and (-webkit-min-device-pixel-ratio: 1) {
.container {
.myContent .shareBtn{
.myContent {
padding-bottom: 120rpx;
}
}
......@@ -1117,13 +1286,9 @@
}
/* iPad Air 竖屏 */
@media only screen
and (min-device-width: 820px)
and (max-device-width: 1180px)
and (orientation: portrait)
and (-webkit-min-device-pixel-ratio: 1) {
@media only screen and (min-device-width: 820px) and (max-device-width: 1180px) and (orientation: portrait) and (-webkit-min-device-pixel-ratio: 1) {
.container {
.myContent .shareBtn{
.myContent {
padding-bottom: 120rpx !important;
}
}
......
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