Skip to content

C
CFFP-HB
Commit 897d5a66 by yuzhenWang
Options

Merge branch 'feature-20250625wyz-修改申请加盟' into 'uat' 

Feature 20250625wyz 修改申请加盟

See merge request !36
parents 270fef94 6f6e8320
Showing with 136 additions and 40 deletions
App.vue
......@@ -64,26 +64,12 @@
// #endif
interceptor();
initApp();
// 检测设备类型
const systemInfo = uni.getSystemInfoSync()
const isIOS = systemInfo.platform === 'ios'
const isAndroid = systemInfo.platform === 'android'
const isIPad = systemInfo.model.toLowerCase().includes('ipad')
// 添加类名到body
if (isIOS) {
document.body.classList.add('ios-device')
}
if (isAndroid) {
document.body.classList.add('android-device')
}
if (isIPad) {
document.body.classList.add('ipad-device')
}
},
onShow: function(options) {
console.log('App Show', options);
// 每次进应用显示时检查用户状态
this.checkUserStatus();
// App平台从options获取参数
// #ifdef APP-PLUS
if(options && options.query) {
......@@ -95,6 +81,48 @@
console.log('App Hide')
},
methods: {
// 检查用户状态的方法
async checkUserStatus() {
// 只有已登录用户才需要检查
if(uni.getStorageSync('loginType') == 'codelogin' && uni.getStorageSync('cffp_userId')) {
try {
const res = await api.queryInfo({userId: uni.getStorageSync('cffp_userId')});
if(!res['success']) {
// 用户已注销，清除缓存
this.clearLoginState();
// 如果不是在白名单页面，跳转到登录页
const pages = getCurrentPages();
if(pages.length > 0) {
const currentRoute = pages[pages.length - 1].route;
const whiteList = [
'/components/login/login',
'/pages/invitationRegister/invitationlogin',
'/pages/courselist/courselist',
'/pages/courseDetail/courseDetail',
'/pages/orderDetail/orderDetail',
'/pages/orderStatus/orderStatus',
'/pages/index/index'
] // 根据需要调整
if(!whiteList.includes(currentRoute)) {
uni.redirectTo({
url: '/components/login/login'
});
}
}
}
} catch (err) {
console.error('检查用户状态失败:', err);
}
}
},
// 清除登录状态
clearLoginState() {
uni.clearStorageSync();
uni.setStorageSync('loginType', 'visitor');
// 可以在这里添加其他需要清除的状态
},
// 处理外部链接参数
handleExternalUrlParams() {
// #ifdef H5
......
environments/environment.ts
......@@ -41,7 +41,7 @@ const config = {
stage,
prod
}
let env = 'dev';
let env = 'prod';
let baseURL = config[env].base_url;
let apiURL = config[env].api_url;
......
manifest.json
......@@ -141,9 +141,9 @@
"appid" : "wx53a601e27aaf7897",
"setting" : {
"urlCheck" : false,
"es6" : false,
"postcss" : false,
"minified" : false
"es6" : true,
"postcss" : true,
"minified" : true
},
"usingComponents" : true,
"permission" : {}
......
pages/index/index.vue
......@@ -340,19 +340,18 @@
}
},
init() {
let loginType = uni.getStorageSync('loginType')
if(loginType == 'codelogin'){
this.querySystemMessage()
}else {
uni.removeTabBarBadge({ index: 3 });
}
if (uni.getStorageSync('isLogin')) {
let loginType = uni.getStorageSync('loginType')
if (loginType == "visitor") {
this.loginornot = false
}else{
this.loginornot = true;
}
if(loginType == 'codelogin'){
this.querySystemMessage()
}else {
uni.removeTabBarBadge({ index: 3 });
}
this.queryAreaCenterInfo();
} else {
......
pages/invitationRegister/invitationRegister.vue
......@@ -22,7 +22,7 @@
data() {
return {
areaName: companyInfo.companyName,
imgSrc:'../../static/yd_Logo.png',
imgSrc:'../../static/logo2.png',
//imgSrc: '../../static/cffp_logo.png',
invitationName:'',
shareId:'',
......
pages/inviteJoin/inviteJoin.vue
......@@ -160,7 +160,7 @@
data() {
return {
companyType:companyInfo.companyType,
ydLogoShare: `${shareURL}/static/yd_LogoShare.png`,
ydLogoShare: `${shareURL}/static/logo2.png`,
dataForm: {
applyType: '1', //申请类型邀请加盟传 1 申请加盟传 2
operatStep: '1', // 99:最后一步,1:第一步,2:为第二步该obj 为第一步
......@@ -196,6 +196,8 @@
//this.getqueryOrgList()
if(this.companyType == '1'){
this.ydLogoShare = `${shareURL}/static/cffp_logo.jpg`;
}else {
this.ydLogoShare = `${shareURL}/static/logo2.png`;
}
let dataForm = uni.getStorageSync('userinfodataForm')
this.realName = dataForm.realName;
......
pages/personalCenter/personalCenter.vue
......@@ -97,7 +97,6 @@
export default {
data() {
return {
showMyName:'',
msgTotal:0,
messageInfo:[],
......@@ -159,13 +158,13 @@
{title:'申请加盟',icon:'icon-hezuo',link:'/pages/application-process/basic-info',isOpen:true,isShow:true},
{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/myTeamIncubate',isOpen:true,isShow:true,identity: true},
{title:'育成团队',icon:'icon-yuchengguanxi',link:'/pages/personalCenter/myTeamIncubate',isOpen:true,isShow:true,identity: true},
],
},
{id:'02',categoryName:'帮助',
children:[
{title:'帮助中心',icon:'icon-wenhao1',link:'/pages/personalCenter/helpCenter',isOpen:true,isShow:true,islogin:true},
{title:'咨询客服',icon:'icon-kefu',link:'',isOpen:true,isShow:true,islogin:true,kefu:true},
{title:'咨询客服',icon:'icon-kefu1',link:'',isOpen:true,isShow:true,islogin:true,kefu:true},
],
},
],
......
static/font1/demo_index.html
......@@ -55,6 +55,18 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe117;</span>
<div class="name">育成关系</div>
<div class="code-name">&amp;#xe117;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe645;</span>
<div class="name">客服</div>
<div class="code-name">&amp;#xe645;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe116;</span>
<div class="name">客服</div>
<div class="code-name">&amp;#xe116;</div>
......@@ -270,9 +282,9 @@
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=1750649292857') format('woff2'),
url('iconfont.woff?t=1750649292857') format('woff'),
url('iconfont.ttf?t=1750649292857') format('truetype');
src: url('iconfont.woff2?t=1750822970160') format('woff2'),
url('iconfont.woff?t=1750822970160') format('woff'),
url('iconfont.ttf?t=1750822970160') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
......@@ -299,6 +311,24 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icon-yuchengguanxi"></span>
<div class="name">
育成关系
</div>
<div class="code-name">.icon-yuchengguanxi
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-kefu1"></span>
<div class="name">
客服
</div>
<div class="code-name">.icon-kefu1
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-kefu"></span>
<div class="name">
客服
......@@ -624,6 +654,22 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-yuchengguanxi"></use>
</svg>
<div class="name">育成关系</div>
<div class="code-name">#icon-yuchengguanxi</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-kefu1"></use>
</svg>
<div class="name">客服</div>
<div class="code-name">#icon-kefu1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-kefu"></use>
</svg>
<div class="name">客服</div>
......
static/font1/iconfont.css
@font-face {
font-family: "iconfont"; /* Project id 4933433 */
src: url('iconfont.woff2?t=1750649292857') format('woff2'),
url('iconfont.woff?t=1750649292857') format('woff'),
url('iconfont.ttf?t=1750649292857') format('truetype');
src: url('iconfont.woff2?t=1750822970160') format('woff2'),
url('iconfont.woff?t=1750822970160') format('woff'),
url('iconfont.ttf?t=1750822970160') format('truetype');
}
.iconfont {
......@@ -13,6 +13,14 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-yuchengguanxi:before {
content: "\e117";
}
.icon-kefu1:before {
content: "\e645";
}
.icon-kefu:before {
content: "\e116";
}
......
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,20 @@
"description": "",
"glyphs": [
{
"icon_id": "6835940",
"name": "育成关系",
"font_class": "yuchengguanxi",
"unicode": "e117",
"unicode_decimal": 57623
},
{
"icon_id": "11239039",
"name": "客服",
"font_class": "kefu1",
"unicode": "e645",
"unicode_decimal": 58949
},
{
"icon_id": "518189",
"name": "客服",
"font_class": "kefu",
......
util/router.js
......@@ -8,7 +8,7 @@ const whiteList = [
'/pages/orderDetail/orderDetail',
'/pages/courseDetail/courseDetail',
'/pages/courselist/courselist',
'/pages/personalCenter/helpCenter?type=1',
'/pages/personalCenter/helpCenter',
'/pages/index/index'
]
export default function initApp(){
......
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