Skip to content

C
CFFP-HB
Commit f2e3b509 by yuzhenWang
Options

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

Feature 20250731wyz 修改bug

See merge request !66
parents 9f6abe71 7b892437
Showing with 269 additions and 78 deletions
App.vue
......@@ -20,23 +20,7 @@
}
// 处理外部链接参数
this.handleExternalUrlParams();
// #ifdef APP-PLUS
// uni.downloadFile({
// url: '/cffpUpdate/__UNI__ED34740.wgt',
// success: (downloadResult) => {
// if (downloadResult.statusCode === 200) {
// plus.runtime.install(downloadResult.tempFilePath, {
// force: true
// }, function() {
// console.log('install success...');
// plus.runtime.restart();
// }, function(e) {
// console.error('install fail...');
// });
// }
// }
// });
// #endif
// #ifdef APP-PLUS
plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
uni.getSystemInfo({
......@@ -80,36 +64,8 @@
onShow: function(options) {
console.log('App Show', options);
if(this.dataToken){
const params = {
loginType:'5',
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();
}
// App平台从options获取参数
// #ifdef APP-PLUS
if(options && options.query) {
......@@ -265,17 +221,16 @@
// 使用uni.setStorageSync存储到本地
try {
// #ifdef H5
//家办商城跳转登录状态下
if(params.dataToken){
this.dataToken = params.dataToken
// this.dataToken = params.dataToken
uni.setStorageSync('dataToken',params.dataToken);
}
// #endif
// #ifdef MP-WEIXIN
if(params.dataToken){
this.dataToken = uni.getStorageSync('hoservice_token')
//家办商城跳转未登录状态下
if(params.noLogin){
uni.removeStorageSync('dataToken')
uni.setStorageSync('loginType','visitor');
}
// #endif
if(params.addSystemType){
uni.setStorageSync('addSystemType', params.addSystemType);
}
......
myPackageA/commission/withdrawalRecord.vue 0 → 100644
<template>
<view class="container">
<!-- #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>
</template>
<script>
</script>
<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>
\ No newline at end of file
myPackageA/myTeam/myTeam.vue
......@@ -92,6 +92,8 @@
<text class="title">{{item.title}}</text>
</view>
</view>
<!-- 之前的做法 -->
<view v-if="currentBtn == '1'&&myTeamList.length>0">
<view class="content-sam-box" v-for="(pointItem,index) in myTeamList" :key="index">
<span class="content-box-title cell">{{pointItem.parentName}}</span>
......
pages.json
......@@ -549,7 +549,13 @@
"style": {
"navigationBarTitleText": "我的团队"
}
},{
"path": "commission/withdrawalRecord",
"style": {
"navigationBarTitleText": "提现记录"
}
}
]
},{
"root": "officialWebsite",
......
pages/index/index.vue
......@@ -258,7 +258,8 @@
queryName: '',
loginType : uni.getStorageSync('loginType'),
userInfo:{} ,//用户信息,
productItem:{}
productItem:{},
dataToken:''
}
},
components: {
......@@ -274,6 +275,7 @@
onShow() {
this.loginType = uni.getStorageSync('loginType')
this.init();
this.showSearch = false;
this.$nextTick(() => {
......@@ -289,11 +291,13 @@
},
onLoad(options) {
// 从家办商城跳进来
console.log('options',options);
// if(options.dataToken){
// uni.setStorageSync('uni-token',options.dataToken)
// this.dataToken = options.dataToken
// }
if(uni.getStorageSync('dataToken')){
this.dataToken = uni.getStorageSync('dataToken')
}
if(options.sharePoster){
dataHandling.pocessTracking(
'进入',
......@@ -303,7 +307,6 @@
'首页',
'pages/index/index'
)
// https://mdev.anjibao.cn/cffp/pages/index/index?invitationCode=SOYAMU&inviteUserId=72323&sharePoster=1
let sharePosterObj = {invitationCode:options.invitationCode,inviteUserId:options.inviteUserId,sharePoster:1}
uni.setStorageSync('sharePosterObj',sharePosterObj)
}
......@@ -314,6 +317,7 @@
},
beforeDestroy() {
this.dataToken = ''
// 清除事件监听
uni.$off('loginUpdate', this.queryAreaCenterInfo);
},
......@@ -352,7 +356,7 @@
const cffp_userInfo = {
...res.data
}
this.userInfo = cffp_userInfo
uni.setStorageSync('cffp_userInfo', JSON.stringify(cffp_userInfo));
uni.setStorageSync('user_mobile', res.data.mobile)
if(cffp_userInfo.partnerType){
......@@ -443,6 +447,13 @@
}
},
init() {
console.log('this.dataToken',this.dataToken);
// 从家办商城跳转过来
if(this.dataToken){
this.reLogin()
return
}
console.log('1111');
let loginType = uni.getStorageSync('loginType')
if(loginType == 'codelogin'){
this.querySystemMessage()
......@@ -451,6 +462,7 @@
this.initShare();
this.getOneProduct()
this.queryAreaCenterInfo()
return
}else {
// 未登录
this.featureLists =[
......@@ -588,6 +600,9 @@
if(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')){
dataHandling.pocessTracking(
'点击',
......@@ -597,12 +612,6 @@
'首页',
'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}`});
......@@ -742,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>
......
pages/pointsExchange/pointsExchange.vue
......@@ -24,7 +24,8 @@
</view>
<view class="bottom">
<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);">
{{score.name}}
</view>
......@@ -341,15 +342,22 @@
})
}
},
toRecord(){
uni.navigateTo({
url:'/pages/exchangeRecord/exchangeRecord'
})
},
// toRecord(){
// uni.navigateTo({
// url:'/pages/exchangeRecord/exchangeRecord'
// })
// },
viewDropLists(){
uni.navigateTo({
url:'/pages/dropLists/dropLists'
})
},
gotoRecord(id){
if(id=='2'){
uni.navigateTo({
url:'/myPackageA/commission/withdrawalRecord'
})
}
}
}
}
......
static/font1/demo_index.html
......@@ -55,6 +55,30 @@
<ul class="icon_lists dib-box">
<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>
<div class="name">加号</div>
<div class="code-name">&amp;#xe333;</div>
......@@ -402,9 +426,9 @@
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=1754967710345') format('woff2'),
url('iconfont.woff?t=1754967710345') format('woff'),
url('iconfont.ttf?t=1754967710345') format('truetype');
src: url('iconfont.woff2?t=1754993772709') format('woff2'),
url('iconfont.woff?t=1754993772709') format('woff'),
url('iconfont.ttf?t=1754993772709') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
......@@ -431,6 +455,42 @@
<ul class="icon_lists dib-box">
<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>
<div class="name">
加号
......@@ -954,6 +1014,38 @@
<li class="dib">
<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>
</svg>
<div class="name">加号</div>
......
static/font1/iconfont.css
@font-face {
font-family: "iconfont"; /* Project id 4933433 */
src: url('iconfont.woff2?t=1754967710345') format('woff2'),
url('iconfont.woff?t=1754967710345') format('woff'),
url('iconfont.ttf?t=1754967710345') format('truetype');
src: url('iconfont.woff2?t=1754993772709') format('woff2'),
url('iconfont.woff?t=1754993772709') format('woff'),
url('iconfont.ttf?t=1754993772709') format('truetype');
}
.iconfont {
......@@ -13,6 +13,22 @@
-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 {
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 @@
"description": "",
"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",
"name": "加号",
"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