Commit d4ceea17 by Sweet Zhang

修复pdf打不开的问题,修改帮助中心描述,修改申请加盟的显示与隐藏问题

parent 265dd74d
...@@ -228,11 +228,6 @@ const loadDocument = async () => { ...@@ -228,11 +228,6 @@ const loadDocument = async () => {
useWorkerFlag = true; useWorkerFlag = true;
// #endif // #endif
// #ifndef H5
pdfjsLib.GlobalWorkerOptions.workerSrc = undefined;
useWorkerFlag = false;
// #endif
const doc = await pdfjsLib.getDocument({ const doc = await pdfjsLib.getDocument({
url: props.pdfInfo.url, url: props.pdfInfo.url,
cMapUrl: 'https://cdn.jsdelivr.net/npm/pdfjs-dist@2.11.338/cmaps/', cMapUrl: 'https://cdn.jsdelivr.net/npm/pdfjs-dist@2.11.338/cmaps/',
...@@ -289,9 +284,12 @@ const loadPage = async (pageNum: number) => { ...@@ -289,9 +284,12 @@ const loadPage = async (pageNum: number) => {
const targetPhysicalWidth = 1600; const targetPhysicalWidth = 1600;
const scale = Math.min(5.0, Math.max(1.0, targetPhysicalWidth / originalViewport.width)); const scale = Math.min(5.0, Math.max(1.0, targetPhysicalWidth / originalViewport.width));
const renderViewport = page.getViewport({ scale }); const renderViewport = page.getViewport({ scale });
const canvas = document.createElement('canvas'); const canvas = document.createElement('canvas');
const ctx = canvas.getContext('2d')!; const ctx = canvas.getContext('2d');
if (!ctx) {
console.error('Failed to get 2D context for canvas.');
return;
}
canvas.width = renderViewport.width; canvas.width = renderViewport.width;
canvas.height = renderViewport.height; canvas.height = renderViewport.height;
await page.render({ canvasContext: ctx, viewport: renderViewport }).promise; await page.render({ canvasContext: ctx, viewport: renderViewport }).promise;
......
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
}, },
{id:'01',categoryName:'团队', {id:'01',categoryName:'团队',
children:[ children:[
{title:'申请加盟',icon:'icon-hezuo',link:'/myPackageA/applyFranchise/applyFranchise?',isOpen:true,isShow:true,isApply:true}, {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}, {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},
...@@ -304,6 +304,20 @@ ...@@ -304,6 +304,20 @@
}); });
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(this.userInfo){
const levelCode = this.userInfo.levelCode || '';
const dealerId = this.userInfo.dealerId || '';
// 2. 找到“申请加盟”菜单项(通过 key)
const team = this.mainMenuLists.find(item => item.id === '01');
if (!team) return;
const applyItem = team.children.find(child => child.key === 'applyFranchise');
if (!applyItem) return;
// 3. 更新标题和显示状态
applyItem.title = levelCode === '' ? '申请加盟' : '晋升目标';
applyItem.isShow = !dealerId; // 没有 dealerId 才显示
}
} }
// #ifdef H5 // #ifdef H5
const systemInfo = uni.getSystemInfoSync(); const systemInfo = uni.getSystemInfoSync();
......
...@@ -23,10 +23,8 @@ export default [ ...@@ -23,10 +23,8 @@ export default [
"Q": "合伙人晋升条件", "Q": "合伙人晋升条件",
"A": [ "A": [
"见习合伙人:完成加盟申请", "见习合伙人:完成加盟申请",
"新锐合伙人:个人标准销售额≥799元", "新锐合伙人:个人标准销售额≥198元",
"资深合伙人:个人标准销售额≥799元 + 团队有效人数≥5人 + 团队标准销售额≥5万元", "资深合伙人:个人标准销售额≥198元 + 团队有效人数≥5人 + 团队标准销售额≥5万元",
"精英合伙人:个人标准销售额≥799元 + 团队有效人数≥10人 + 团队标准销售额≥15万元",
"营业部部长:个人标准销售额≥799元 + 团队有效人数≥20人 + 团队标准销售额≥50万元"
], ],
"isActive": 1, "isActive": 1,
"isMore": true "isMore": true
...@@ -70,8 +68,6 @@ export default [ ...@@ -70,8 +68,6 @@ export default [
"A": [ "A": [
"见习合伙人:自购或分享产品,他人购买后可获得销售收入", "见习合伙人:自购或分享产品,他人购买后可获得销售收入",
"更高级别合伙人:可额外获得团队订单的一级/二级管理津贴", "更高级别合伙人:可额外获得团队订单的一级/二级管理津贴",
"营业部部长:可享受部长津贴",
"育成营业部部长:可享受育成津贴",
"(以上收益可叠加)" "(以上收益可叠加)"
], ],
"isActive": 1, "isActive": 1,
......
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