Skip to content

C
CFFP-HB
Commit d4b1592b by yuzhenWang
Options

Merge branch 'feature-20250731wyz-修改bug' into 'dev' 

已经发布生产合并代码

See merge request !65
parents 6d76b847 7b892437
Showing with 252 additions and 71 deletions
App.vue
...@@ -64,49 +64,8 @@ ...@@ -64,49 +64,8 @@
onShow: function(options) { onShow: function(options) {
console.log('App Show', options); console.log('App Show', options);
// 从家办商城跳转到cffp
// #ifdef MP-WEIXIN
// 获取当前页面栈（适用于小程序）
const pages = getCurrentPages();
if (pages.length > 0) {
const currentPage = pages[pages.length - 1];
const urlParams = currentPage.options || {};
console.log('微信小程序 URL 参数:', urlParams);
this.saveUrlParams(urlParams);
}
// #endif
if(this.dataToken){
// 添加iOS平台检测
const isIOS = navigator.platform.match(/(iPhone|iPod|iPad)/i);
const params = {
loginType:'5',
authToken: isIOS ? this.dataToken : this.dataToken.replace(/\%/g, ' ')
// authToken:this.dataToken.replace(/\%/g, ' ')
// authToken:'zuihuibi eyJhbGciOiJIUzUxMiJ9.eyJVc2VySWQiOjEyODMsImNyZWF0ZWQiOjE3NTQ2NDk1MDA5NzIsImV4cCI6MTc1NzI0MTUwMH0.udjBlMY4FswgBU7zv9jD-zK8ANGR1KKXk_DiJEQkwhiC9DYwxAc7wAp6BWIKY_oiNr58QJqDtBAJ85bGOcCpeQ'
}
api.loginVerification(params).then((res)=>{
if(res['success']){
uni.setStorageSync('isLogin','1');
uni.setStorageSync('loginType','codelogin');
uni.setStorageSync('cffp_userId', res.data.userId);
uni.setStorageSync('uni-token', res.data['token']);
// this.checkUserStatus();
}else{
uni.showToast({
title: res['message'],
duration: 2000,
icon: 'none'
})
}
})
return
}else {
// 每次进应用显示时检查用户状态 // 每次进应用显示时检查用户状态
this.checkUserStatus(); this.checkUserStatus();
}
// App平台从options获取参数 // App平台从options获取参数
// #ifdef APP-PLUS // #ifdef APP-PLUS
if(options && options.query) { if(options && options.query) {
...@@ -264,11 +223,12 @@ ...@@ -264,11 +223,12 @@
try { try {
//家办商城跳转登录状态下 //家办商城跳转登录状态下
if(params.dataToken){ if(params.dataToken){
this.dataToken = params.dataToken // this.dataToken = params.dataToken
uni.setStorageSync('loginType','codelogin'); uni.setStorageSync('dataToken',params.dataToken);
} }
//家办商城跳转未登录状态下 //家办商城跳转未登录状态下
if(params.noLogin){ if(params.noLogin){
uni.removeStorageSync('dataToken')
uni.setStorageSync('loginType','visitor'); uni.setStorageSync('loginType','visitor');
} }
if(params.addSystemType){ if(params.addSystemType){
......
myPackageA/commission/withdrawalRecord.vue
<template> <template>
<view class=""> <view class="container">
111111 <!-- #ifdef APP -->
<view class="backArrow">
<text class="iconfont icon-youjiantou zuojiantou" style="left: 5rpx;" @click="goBack()"></text>
<text style="font-size: 30rpx;">提现记录</text>
</view>
<!-- #endif -->
<view class="backArrow">
<text class="iconfont icon-youjiantou zuojiantou" style="left: 5rpx;" @click="goBack()"></text>
<text style="font-size: 30rpx;">提现记录</text>
</view>
</view> </view>
</template> </template>
<script> <script>
</script> </script>
<style> <style lang="scss" scoped>
.container{
.backArrow{
box-sizing: border-box;
display: flex;
height: 100rpx;
justify-content: space-between;
align-items: center;
position: relative;
width: 100%;
margin-bottom: 10rpx;
text:nth-child(2){
width: 100%;
text-align: center;
position: absolute;
}
}
}
</style> </style>
\ No newline at end of file
myPackageA/myTeam/myTeam.vue
...@@ -92,6 +92,8 @@ ...@@ -92,6 +92,8 @@
<text class="title">{{item.title}}</text> <text class="title">{{item.title}}</text>
</view> </view>
</view> </view>
<!-- 之前的做法 -->
<view v-if="currentBtn == '1'&&myTeamList.length>0"> <view v-if="currentBtn == '1'&&myTeamList.length>0">
<view class="content-sam-box" v-for="(pointItem,index) in myTeamList" :key="index"> <view class="content-sam-box" v-for="(pointItem,index) in myTeamList" :key="index">
<span class="content-box-title cell">{{pointItem.parentName}}</span> <span class="content-box-title cell">{{pointItem.parentName}}</span>
......
pages.json
...@@ -552,7 +552,7 @@ ...@@ -552,7 +552,7 @@
},{ },{
"path": "commission/withdrawalRecord", "path": "commission/withdrawalRecord",
"style": { "style": {
"navigationBarTitleText": "我的团队" "navigationBarTitleText": "提现记录"
} }
} }
......
pages/index/index.vue
...@@ -258,7 +258,8 @@ ...@@ -258,7 +258,8 @@
queryName: '', queryName: '',
loginType : uni.getStorageSync('loginType'), loginType : uni.getStorageSync('loginType'),
userInfo:{} ,//用户信息, userInfo:{} ,//用户信息,
productItem:{} productItem:{},
dataToken:''
} }
}, },
components: { components: {
...@@ -274,6 +275,7 @@ ...@@ -274,6 +275,7 @@
onShow() { onShow() {
this.loginType = uni.getStorageSync('loginType') this.loginType = uni.getStorageSync('loginType')
this.init(); this.init();
this.showSearch = false; this.showSearch = false;
this.$nextTick(() => { this.$nextTick(() => {
...@@ -289,7 +291,13 @@ ...@@ -289,7 +291,13 @@
}, },
onLoad(options) { onLoad(options) {
console.log('options',options);
// if(options.dataToken){
// this.dataToken = options.dataToken
// }
if(uni.getStorageSync('dataToken')){
this.dataToken = uni.getStorageSync('dataToken')
}
if(options.sharePoster){ if(options.sharePoster){
dataHandling.pocessTracking( dataHandling.pocessTracking(
'进入', '进入',
...@@ -304,12 +312,12 @@ ...@@ -304,12 +312,12 @@
} }
//如果用户在其他的地方快捷登录,没有返回到首页,执行此监听方法 //如果用户在其他的地方快捷登录,没有返回到首页,执行此监听方法
uni.$on('loginUpdate',()=>{ uni.$on('loginUpdate',()=>{
console.log('111111');
this.queryAreaCenterInfo(); this.queryAreaCenterInfo();
}) })
}, },
beforeDestroy() { beforeDestroy() {
this.dataToken = ''
// 清除事件监听 // 清除事件监听
uni.$off('loginUpdate', this.queryAreaCenterInfo); uni.$off('loginUpdate', this.queryAreaCenterInfo);
}, },
...@@ -348,7 +356,7 @@ ...@@ -348,7 +356,7 @@
const cffp_userInfo = { const cffp_userInfo = {
...res.data ...res.data
} }
this.userInfo = cffp_userInfo
uni.setStorageSync('cffp_userInfo', JSON.stringify(cffp_userInfo)); uni.setStorageSync('cffp_userInfo', JSON.stringify(cffp_userInfo));
uni.setStorageSync('user_mobile', res.data.mobile) uni.setStorageSync('user_mobile', res.data.mobile)
if(cffp_userInfo.partnerType){ if(cffp_userInfo.partnerType){
...@@ -439,8 +447,14 @@ ...@@ -439,8 +447,14 @@
} }
}, },
init() { init() {
console.log('this.dataToken',this.dataToken);
// 从家办商城跳转过来
if(this.dataToken){
this.reLogin()
return
}
console.log('1111');
let loginType = uni.getStorageSync('loginType') let loginType = uni.getStorageSync('loginType')
console.log('loginType',loginType);
if(loginType == 'codelogin'){ if(loginType == 'codelogin'){
this.querySystemMessage() this.querySystemMessage()
this.queryInfo() this.queryInfo()
...@@ -586,6 +600,9 @@ ...@@ -586,6 +600,9 @@
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'))
} }
if(uni.getStorageSync('loginType')){
this.loginType = uni.getStorageSync('loginType')
}
if(featureItem.isApply && (!this.loginType||this.loginType=='visitor')){ if(featureItem.isApply && (!this.loginType||this.loginType=='visitor')){
dataHandling.pocessTracking( dataHandling.pocessTracking(
'点击', '点击',
...@@ -595,12 +612,6 @@ ...@@ -595,12 +612,6 @@
'首页', '首页',
'pages/index/index' 'pages/index/index'
) )
// const urlObj = JSON.parse(JSON.stringify(featureItem))
// let poster = JSON.parse(JSON.stringify(uni.getStorageSync('sharePosterObj')))
// if(poster.sharePoster){
// urlObj.link =`${urlObj.link}?partnerType=${this.cffpUserInfo.partnerType}`
// }
uni.navigateTo({url: `${featureItem.link}`}); uni.navigateTo({url: `${featureItem.link}`});
...@@ -740,6 +751,43 @@ ...@@ -740,6 +751,43 @@
} }
}) })
}, },
reLogin(){
uni.showLoading({
title: '加载中...'
});
// 添加iOS平台检测
const isIOS = navigator.platform.match(/(iPhone|iPod|iPad)/i);
const params = {
loginType:'5',
authToken: this.dataToken
}
api.loginVerification(params).then((res)=>{
if(res['success']){
uni.setStorageSync('isLogin','1');
uni.setStorageSync('loginType','codelogin');
uni.setStorageSync('cffp_userId', res.data.userId);
uni.setStorageSync('uni-token', res.data['token']);
this.userId = res.data.userId
this.querySystemMessage()
this.queryInfo()
this.courseList()
this.initShare();
this.getOneProduct()
this.queryAreaCenterInfo()
this.dataToken = ''
uni.removeStorageSync('dataToken')
}else{
uni.showToast({
title: res['message'],
duration: 2000,
icon: 'none'
})
}
})
uni.hideLoading()
}
}, },
} }
</script> </script>
......
pages/personalCenter/personalCenter.vue
...@@ -206,8 +206,8 @@ ...@@ -206,8 +206,8 @@
children:[ children:[
{title:'申请加盟',icon:'icon-hezuo',link:'/myPackageA/applyFranchise/applyFranchise?',isOpen:true,isShow:true,isApply:true}, {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}, {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:'/pages/personalCenter/myTeam',isOpen:true,isShow:true,identity: true},
{title:'我的团队',icon:'icon-tuandui',link:'/myPackageA/myTeam/myTeam',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}, {title:'育成团队',icon:'icon-yuchengguanxi',link:'/pages/personalCenter/myTeamIncubate',isOpen:true,isShow:true,identity: true},
], ],
}, },
......
pages/pointsExchange/pointsExchange.vue
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
</view> </view>
<view class="bottom"> <view class="bottom">
<view class="bottomItem" v-for="score in scoreList " :key="score.id"> <view class="bottomItem" v-for="score in scoreList " :key="score.id">
<view class="one"> <!-- @click="gotoRecord(score.id)" -->
<view class="one" >
<view style="font-size:28rpx;color: rgba(199, 199, 199, 1);"> <view style="font-size:28rpx;color: rgba(199, 199, 199, 1);">
{{score.name}} {{score.name}}
</view> </view>
...@@ -341,18 +342,25 @@ ...@@ -341,18 +342,25 @@
}) })
} }
}, },
toRecord(){ // toRecord(){
// uni.navigateTo({
// url:'/pages/exchangeRecord/exchangeRecord'
// })
// },
viewDropLists(){
uni.navigateTo({ uni.navigateTo({
url:'/pages/exchangeRecord/exchangeRecord' url:'/pages/dropLists/dropLists'
}) })
}, },
viewDropLists(){ gotoRecord(id){
if(id=='2'){
uni.navigateTo({ uni.navigateTo({
url:'/pages/dropLists/dropLists' url:'/myPackageA/commission/withdrawalRecord'
}) })
} }
} }
} }
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
static/font1/demo_index.html
...@@ -55,6 +55,30 @@ ...@@ -55,6 +55,30 @@
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib"> <li class="dib">
<span class="icon iconfont">&#xe334;</span>
<div class="name">微信</div>
<div class="code-name">&amp;#xe334;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe336;</span>
<div class="name">修改</div>
<div class="code-name">&amp;#xe336;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe335;</span>
<div class="name">路径</div>
<div class="code-name">&amp;#xe335;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe337;</span>
<div class="name">筛选</div>
<div class="code-name">&amp;#xe337;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe333;</span> <span class="icon iconfont">&#xe333;</span>
<div class="name">加号</div> <div class="name">加号</div>
<div class="code-name">&amp;#xe333;</div> <div class="code-name">&amp;#xe333;</div>
...@@ -402,9 +426,9 @@ ...@@ -402,9 +426,9 @@
<pre><code class="language-css" <pre><code class="language-css"
>@font-face { >@font-face {
font-family: 'iconfont'; font-family: 'iconfont';
src: url('iconfont.woff2?t=1754967710345') format('woff2'), src: url('iconfont.woff2?t=1754993772709') format('woff2'),
url('iconfont.woff?t=1754967710345') format('woff'), url('iconfont.woff?t=1754993772709') format('woff'),
url('iconfont.ttf?t=1754967710345') format('truetype'); url('iconfont.ttf?t=1754993772709') format('truetype');
} }
</code></pre> </code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3> <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
...@@ -431,6 +455,42 @@ ...@@ -431,6 +455,42 @@
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib"> <li class="dib">
<span class="icon iconfont icon-weixin1"></span>
<div class="name">
微信
</div>
<div class="code-name">.icon-weixin1
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-xiugai"></span>
<div class="name">
修改
</div>
<div class="code-name">.icon-xiugai
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-lujing"></span>
<div class="name">
路径
</div>
<div class="code-name">.icon-lujing
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-shaixuan"></span>
<div class="name">
筛选
</div>
<div class="code-name">.icon-shaixuan
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-jiahao"></span> <span class="icon iconfont icon-jiahao"></span>
<div class="name"> <div class="name">
加号 加号
...@@ -954,6 +1014,38 @@ ...@@ -954,6 +1014,38 @@
<li class="dib"> <li class="dib">
<svg class="icon svg-icon" aria-hidden="true"> <svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-weixin1"></use>
</svg>
<div class="name">微信</div>
<div class="code-name">#icon-weixin1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-xiugai"></use>
</svg>
<div class="name">修改</div>
<div class="code-name">#icon-xiugai</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-lujing"></use>
</svg>
<div class="name">路径</div>
<div class="code-name">#icon-lujing</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-shaixuan"></use>
</svg>
<div class="name">筛选</div>
<div class="code-name">#icon-shaixuan</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-jiahao"></use> <use xlink:href="#icon-jiahao"></use>
</svg> </svg>
<div class="name">加号</div> <div class="name">加号</div>
......
static/font1/iconfont.css
@font-face { @font-face {
font-family: "iconfont"; /* Project id 4933433 */ font-family: "iconfont"; /* Project id 4933433 */
src: url('iconfont.woff2?t=1754967710345') format('woff2'), src: url('iconfont.woff2?t=1754993772709') format('woff2'),
url('iconfont.woff?t=1754967710345') format('woff'), url('iconfont.woff?t=1754993772709') format('woff'),
url('iconfont.ttf?t=1754967710345') format('truetype'); url('iconfont.ttf?t=1754993772709') format('truetype');
} }
.iconfont { .iconfont {
...@@ -13,6 +13,22 @@ ...@@ -13,6 +13,22 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-weixin1:before {
content: "\e334";
}
.icon-xiugai:before {
content: "\e336";
}
.icon-lujing:before {
content: "\e335";
}
.icon-shaixuan:before {
content: "\e337";
}
.icon-jiahao:before { .icon-jiahao:before {
content: "\e333"; content: "\e333";
} }
......
static/font1/iconfont.js
This source diff could not be displayed because it is too large. You can view the blob instead.
static/font1/iconfont.json
...@@ -6,6 +6,34 @@ ...@@ -6,6 +6,34 @@
"description": "", "description": "",
"glyphs": [ "glyphs": [
{ {
"icon_id": "859693",
"name": "微信",
"font_class": "weixin1",
"unicode": "e334",
"unicode_decimal": 58164
},
{
"icon_id": "2076418",
"name": "修改",
"font_class": "xiugai",
"unicode": "e336",
"unicode_decimal": 58166
},
{
"icon_id": "23806771",
"name": "路径",
"font_class": "lujing",
"unicode": "e335",
"unicode_decimal": 58165
},
{
"icon_id": "29657597",
"name": "筛选",
"font_class": "shaixuan",
"unicode": "e337",
"unicode_decimal": 58167
},
{
"icon_id": "7192356", "icon_id": "7192356",
"name": "加号", "name": "加号",
"font_class": "jiahao", "font_class": "jiahao",
......
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