Skip to content

C
CFFP-HB
Commit 64b32d7c by yuzhenWang
Options

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

发布生产合并代码

See merge request !37
parents 7e2ce587 6f6e8320
Showing with 421 additions and 333 deletions
App.vue
...@@ -64,26 +64,12 @@ ...@@ -64,26 +64,12 @@
// #endif // #endif
interceptor(); interceptor();
initApp(); 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) { onShow: function(options) {
console.log('App Show', options); console.log('App Show', options);
// 每次进应用显示时检查用户状态
this.checkUserStatus();
// App平台从options获取参数 // App平台从options获取参数
// #ifdef APP-PLUS // #ifdef APP-PLUS
if(options && options.query) { if(options && options.query) {
...@@ -95,6 +81,48 @@ ...@@ -95,6 +81,48 @@
console.log('App Hide') console.log('App Hide')
}, },
methods: { 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() { handleExternalUrlParams() {
// #ifdef H5 // #ifdef H5
......
environments/environment.ts
...@@ -41,7 +41,7 @@ const config = { ...@@ -41,7 +41,7 @@ const config = {
stage, stage,
prod prod
} }
let env = 'dev'; let env = 'prod';
let baseURL = config[env].base_url; let baseURL = config[env].base_url;
let apiURL = config[env].api_url; let apiURL = config[env].api_url;
......
manifest.json
...@@ -141,9 +141,9 @@ ...@@ -141,9 +141,9 @@
"appid" : "wx53a601e27aaf7897", "appid" : "wx53a601e27aaf7897",
"setting" : { "setting" : {
"urlCheck" : false, "urlCheck" : false,
"es6" : false, "es6" : true,
"postcss" : false, "postcss" : true,
"minified" : false "minified" : true
}, },
"usingComponents" : true, "usingComponents" : true,
"permission" : {} "permission" : {}
......
pages.json
...@@ -526,34 +526,26 @@ ...@@ -526,34 +526,26 @@
"height": "100rpx", "height": "100rpx",
"list": [{ // 最少2个、最多5个 tab "list": [{ // 最少2个、最多5个 tab
"pagePath": "pages/index/index", // 页面路径，必须在 pages 中先定义 "pagePath": "pages/index/index", // 页面路径，必须在 pages 中先定义
"iconPath": "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNzQ4MzU1MDA5NTgyIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI0NjAiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PHBhdGggZD0iTTk4NS42IDUwNi4zOTk5OTk5OWwtNDQ4LTQ0Ny45OTk5OTk5OWMtMTIuOC02LjQtMzguNC02LjQtNTEuMiAwbC00NDggNDQ3Ljk5OTk5OTk5Yy02LjQgMTIuOC0xMi44IDQ0LjggMCA1MS4yMDAwMDAwMSAxMi44IDYuNCAzOC40IDYuNCA1MS4yIDBMNTEyIDEyOC44bDQyMi40IDQyOC44YzYuNCA2LjQgMTkuMiA2LjQgMjUuNiA2LjM5OTk5OTk5IDYuNCAwIDE5LjIgMCAyNS42LTEyLjc5OTk5OTk5IDEyLjgtMTIuOCAxMi44LTMyIDAtNDQuODAwMDAwMDF6TTgzMiA2NDAuNzk5OTk5OTljLTE5LjIgMC0zMiAxMi44LTMyIDMyLjAwMDAwMDAxVjkxNmgtNTc2di0yMzYuODAwMDAwMDFjMC0xOS4yLTEyLjgtMzItMzItMzEuOTk5OTk5OTlzLTMyIDEyLjgtMzIgMjUuNnYyNzUuMTk5OTk5OTljMCAxOS4yIDEyLjggMzIgMzIgMzIuMDAwMDAwMDFoNjQwYzE5LjIgMCAzMi0xMi44IDMyLTI1LjZ2LTI3NS4yMDAwMDAwMWMwLTE5LjItMTIuOC0zOC40LTMyLTM4LjR6IiBmaWxsPSIjMzMzMzMzIiBwLWlkPSIyNDYxIj48L3BhdGg+PHBhdGggZD0iTTcwNCA1NzAuNGMwLTE5LjItNi40LTMyLTI1LjYtMzguNC0xOS4yLTYuNC0zOC40IDYuNC0zOC40IDI1LjYtMTIuOCA1Ny42LTY0IDEwMi40LTEyOCAxMDIuMzk5OTk5OTlzLTExNS4yLTM4LjQtMTI4LTEwMi4zOTk5OTk5OWMtNi40LTE5LjItMTkuMi0yNS42LTM4LjQtMjUuNi0xMi44IDAtMjUuNiAxOS4yLTI1LjYgMzEuOTk5OTk5OTlDMzM5LjIgNjU5Ljk5OTk5OTk5IDQyMi40IDcyNCA1MTIgNzI0czE3Mi44LTY0IDE5Mi0xNTMuNnoiIGZpbGw9IiMzMzMzMzMiIHAtaWQ9IjI0NjIiPjwvcGF0aD48L3N2Zz4=", "iconPath": "static/images/home.png",// 图片路径，icon 大小限制为40kb，建议尺寸为 81px * 81px
// "iconPath": "static/tabbar/home.png", // 图片路径，icon 大小限制为40kb，建议尺寸为 81px * 81px "selectedIconPath": "static/images/selectHome.png",
// "selectedIconPath": "static/tabbar/home_active.png", // 选中时的图片路径
"selectedIconPath": "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNzQ4MzU1NjMzMTkxIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI5NDQiIGlkPSJteF9uXzE3NDgzNTU2MzMxOTIiIHdpZHRoPSI2NCIgaGVpZ2h0PSI2NCIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxwYXRoIGQ9Ik05ODUuNiA1MDYuMzk5OTk5OTlsLTQ0OC00NDcuOTk5OTk5OTljLTEyLjgtNi40LTM4LjQtNi40LTUxLjIgMGwtNDQ4IDQ0Ny45OTk5OTk5OWMtNi40IDEyLjgtMTIuOCA0NC44IDAgNTEuMjAwMDAwMDEgMTIuOCA2LjQgMzguNCA2LjQgNTEuMiAwTDUxMiAxMjguOGw0MjIuNCA0MjguOGM2LjQgNi40IDE5LjIgNi40IDI1LjYgNi4zOTk5OTk5OSA2LjQgMCAxOS4yIDAgMjUuNi0xMi43OTk5OTk5OSAxMi44LTEyLjggMTIuOC0zMiAwLTQ0LjgwMDAwMDAxek04MzIgNjQwLjc5OTk5OTk5Yy0xOS4yIDAtMzIgMTIuOC0zMiAzMi4wMDAwMDAwMVY5MTZoLTU3NnYtMjM2LjgwMDAwMDAxYzAtMTkuMi0xMi44LTMyLTMyLTMxLjk5OTk5OTk5cy0zMiAxMi44LTMyIDI1LjZ2Mjc1LjE5OTk5OTk5YzAgMTkuMiAxMi44IDMyIDMyIDMyLjAwMDAwMDAxaDY0MGMxOS4yIDAgMzItMTIuOCAzMi0yNS42di0yNzUuMjAwMDAwMDFjMC0xOS4yLTEyLjgtMzguNC0zMi0zOC40eiIgZmlsbD0iIzIwMjc5QiIgcC1pZD0iMjk0NSI+PC9wYXRoPjxwYXRoIGQ9Ik03MDQgNTcwLjRjMC0xOS4yLTYuNC0zMi0yNS42LTM4LjQtMTkuMi02LjQtMzguNCA2LjQtMzguNCAyNS42LTEyLjggNTcuNi02NCAxMDIuNC0xMjggMTAyLjM5OTk5OTk5cy0xMTUuMi0zOC40LTEyOC0xMDIuMzk5OTk5OTljLTYuNC0xOS4yLTE5LjItMjUuNi0zOC40LTI1LjYtMTIuOCAwLTI1LjYgMTkuMi0yNS42IDMxLjk5OTk5OTk5QzMzOS4yIDY1OS45OTk5OTk5OSA0MjIuNCA3MjQgNTEyIDcyNHMxNzIuOC02NCAxOTItMTUzLjZ6IiBmaWxsPSIjMjAyNzlCIiBwLWlkPSIyOTQ2Ij48L3BhdGg+PC9zdmc+",
"text": "首页" // tab 上按钮文字 "text": "首页" // tab 上按钮文字
}, },
{ // 最少2个、最多5个 tab { // 最少2个、最多5个 tab
"pagePath": "pages/product/product", // 页面路径，必须在 pages 中先定义 "pagePath": "pages/product/product", // 页面路径，必须在 pages 中先定义
// "iconPath": "static/tabbar/sfp.png", // 图片路径，icon 大小限制为40kb，建议尺寸为 81px * 81px "iconPath": "static/images/tools.png",// 图片路径，icon 大小限制为40kb，建议尺寸为 81px * 81px
"iconPath": "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNzQ4MzU2MDQ5ODg3IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjM5MjUiIHdpZHRoPSI2NCIgaGVpZ2h0PSI2NCIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxwYXRoIGQ9Ik04MTIuOCAyNzQuN1YxNTUuNWMwLTUwLjUtNDEuMS05MS41LTkxLjctOTEuNUgzMDIuOWMtNTAuNiAwLTkxLjcgNDEuMS05MS43IDkxLjV2MTE5LjJINjR2MjM5LjRoNTkuN3YzODNjMCAzNC44IDI2LjcgNjIuOSA1OS43IDYyLjloNjU3LjFjMzMgMCA1OS43LTI4LjEgNTkuNy02Mi45di0zODNIOTYwVjI3NC43SDgxMi44ek0yNzUuMiAxNTUuNWMwLTE1LjMgMTIuNC0yNy43IDI3LjctMjcuN0g3MjFjMTUuMyAwIDI3LjcgMTIuNCAyNy43IDI3Ljd2MTE5LjJIMjc1LjJWMTU1LjV6IG01NjEuMSA3NDAuN0gxODcuN1Y1MTQuMUgzOTN2ODhjMCAzMi44IDI2LjYgNTkuNCA1OS41IDU5LjRoMTE5YzMyLjkgMCA1OS41LTI2LjUgNTkuNS01OS40di04OGgyMDUuM3YzODIuMXpNODk2IDQzMy40djE2LjhINjMxVjQyNGMwLTExLTMtMjEuMy04LjItMzAuMS0xMC4zLTE3LjUtMjkuNC0yOS4yLTUxLjMtMjkuMmgtMTE5Yy0yMS44IDAtNDAuOSAxMS43LTUxLjMgMjkuMi01LjIgOC44LTguMiAxOS4xLTguMiAzMC4xdjI2LjJIMTI4VjMzOC42aDc2OHY5NC44eiIgZmlsbD0iIzM3MzgzOCIgcC1pZD0iMzkyNiI+PC9wYXRoPjwvc3ZnPg==", "selectedIconPath": "static/images/selectTools.png",
// "selectedIconPath": "static/tabbar/sfp_active.png", // 选中时的图片路径
"selectedIconPath": "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNzQ4MzU2MDQ5ODg3IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjM5MjUiIHdpZHRoPSI2NCIgaGVpZ2h0PSI2NCIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxwYXRoIGQ9Ik04MTIuOCAyNzQuN1YxNTUuNWMwLTUwLjUtNDEuMS05MS41LTkxLjctOTEuNUgzMDIuOWMtNTAuNiAwLTkxLjcgNDEuMS05MS43IDkxLjV2MTE5LjJINjR2MjM5LjRoNTkuN3YzODNjMCAzNC44IDI2LjcgNjIuOSA1OS43IDYyLjloNjU3LjFjMzMgMCA1OS43LTI4LjEgNTkuNy02Mi45di0zODNIOTYwVjI3NC43SDgxMi44ek0yNzUuMiAxNTUuNWMwLTE1LjMgMTIuNC0yNy43IDI3LjctMjcuN0g3MjFjMTUuMyAwIDI3LjcgMTIuNCAyNy43IDI3Ljd2MTE5LjJIMjc1LjJWMTU1LjV6IG01NjEuMSA3NDAuN0gxODcuN1Y1MTQuMUgzOTN2ODhjMCAzMi44IDI2LjYgNTkuNCA1OS41IDU5LjRoMTE5YzMyLjkgMCA1OS41LTI2LjUgNTkuNS01OS40di04OGgyMDUuM3YzODIuMXpNODk2IDQzMy40djE2LjhINjMxVjQyNGMwLTExLTMtMjEuMy04LjItMzAuMS0xMC4zLTE3LjUtMjkuNC0yOS4yLTUxLjMtMjkuMmgtMTE5Yy0yMS44IDAtNDAuOSAxMS43LTUxLjMgMjkuMi01LjIgOC44LTguMiAxOS4xLTguMiAzMC4xdjI2LjJIMTI4VjMzOC42aDc2OHY5NC44eiIgZmlsbD0iIzIwMjc5YiIgcC1pZD0iMzkyNiI+PC9wYXRoPjwvc3ZnPg==",
"text": "金融工具" // tab 上按钮文字 "text": "金融工具" // tab 上按钮文字
}, },
{ // 最少2个、最多5个 tab { // 最少2个、最多5个 tab
"pagePath": "pages/courselist/courselist", // 页面路径，必须在 pages 中先定义 "pagePath": "pages/courselist/courselist", // 页面路径，必须在 pages 中先定义
// "iconPath": "static/tabbar/cffp.png", // 图片路径，icon 大小限制为40kb，建议尺寸为 81px * 81px "text": "产品中心" ,// tab 上按钮文字
"iconPath": "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNzQ4MzU2MzA4Njg5IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjQyNzAiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iNjQiIGhlaWdodD0iNjQiPjxwYXRoIGQ9Ik03ODguNzA3NTU1NTUgMzguNTYzMDgxNDhhODguNzE2MzI1OTIgODguNzE2MzI1OTIgMCAwIDEgODguMTA5NTExMTIgNzcuNzkzNjU5MjdsNjAuNTYwMTE4NTEgNDg0LjM1OTU4NTE3aC04OS40NDQ1MDM3TDc4OC43MDc1NTU1NSAxMjcuMjc5NDA3NDFIMjM1LjI5MjQ0NDQ1bC05Ni4xMTk0NjY2NyA3NjkuMzE5ODIyMjJoNDMyLjA1MjE0ODE0Vjk4NS4zMTU1NTU1NWgtNDMyLjA1MjE0ODE0YTg4LjcxNjMyNTkyIDg4LjcxNjMyNTkyIDAgMCAxLTg4LjEwOTUxMTExLTk5Ljc2MDM1NTU1bDk2LjExOTQ2NjY2LTc2OS4zMTk4MjIyMmE4OC43MTYzMjU5MiA4OC43MTYzMjU5MiAwIDAgMSA4OC4xMDk1MTExMi03Ny42NzIyOTYzaDU1My40MTUxMTExeiBtMjUuNzI4OTQ4MTUgNjQxLjUyNDYyMjIyYTE0LjgwNjI4MTQ4IDE0LjgwNjI4MTQ4IDAgMCAxIDYuNjc0OTYyOTcgNi42NzQ5NjI5N2wzNS40Mzc5ODUxOCA3MS44NDY4NzQwOGExNC44MDYyODE0OCAxNC44MDYyODE0OCAwIDAgMCAxMS4xNjUzOTI2IDguMTMxMzE4NWw3OS4yNTAwMTQ4IDExLjUyOTQ4MTVhMTQuODA2MjgxNDggMTQuODA2MjgxNDggMCAwIDEgOC4yNTI2ODE1IDI1LjI0MzQ5NjI4bC01Ny40MDQ2ODE1IDU1Ljk0ODMyNTk0YTE0LjgwNjI4MTQ4IDE0LjgwNjI4MTQ4IDAgMCAwLTQuMjQ3NzAzNyAxMy4xMDcybDEzLjQ3MTI4ODkgNzkuMDA3Mjg4ODhhMTQuODA2MjgxNDggMTQuODA2MjgxNDggMCAwIDEtMjEuNDgxMjQ0NDUgMTUuNTM0NDU5MjZsLTcwLjg3NTk3MDM3LTM3LjI1ODQyOTYzYTE0LjgwNjI4MTQ4IDE0LjgwNjI4MTQ4IDAgMCAwLTEzLjgzNTM3Nzc4IDBMNzI5Ljk2Nzg4MTQ4IDk2Ny4xMTExMTExMWExNC44MDYyODE0OCAxNC44MDYyODE0OCAwIDAgMS0yMS40ODEyNDQ0NS0xNS41MzQ0NTkyNmwxMy40NzEyODg4OS03OS4wMDcyODg4OGExNC44MDYyODE0OCAxNC44MDYyODE0OCAwIDAgMC00LjI0NzcwMzctMTMuMTA3MmwtNTcuNDA0NjgxNDctNTUuOTQ4MzI1OTRhMTQuODA2MjgxNDggMTQuODA2MjgxNDggMCAwIDEgOC4yNTI2ODE0Ny0yNS4yNDM0OTYyOGw3OS4yNTAwMTQ4MS0xMS41Mjk0ODE1YTE0LjgwNjI4MTQ4IDE0LjgwNjI4MTQ4IDAgMCAwIDExLjE2NTM5MjYtOC4xMzEzMTg1bDM1LjQzNzk4NTE5LTcxLjg0Njg3NDA4YTE0LjgwNjI4MTQ4IDE0LjgwNjI4MTQ4IDAgMCAxIDE5Ljc4MjE2Mjk2LTYuNjc0OTYyOTd6TTM2NC4wNTg1NDgxNSAyNzUuMzQyMjIyMjJhMTQ3Ljk0MTQ1MTg1IDE0Ny45NDE0NTE4NSAwIDAgMCAyOTUuODgyOTAzNyAwSDc0OC42NTc3Nzc3OGEyMzYuNjU3Nzc3NzggMjM2LjY1Nzc3Nzc4IDAgMSAxLTQ3My40MzY5MTg1MyAwSDM2My45MzcxODUxOHoiIGZpbGw9IiMzMzMzMzMiIHAtaWQ9IjQyNzEiPjwvcGF0aD48L3N2Zz4=", "iconPath": "static/images/product.png",// 图片路径，icon 大小限制为40kb，建议尺寸为 81px * 81px
// "selectedIconPath": "static/tabbar/cffp_active.png", // 选中时的图片路径 "selectedIconPath": "static/images/selectProduct.png"
"selectedIconPath": "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNzQ4MzU2MzA4Njg5IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjQyNzAiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iNjQiIGhlaWdodD0iNjQiPjxwYXRoIGQ9Ik03ODguNzA3NTU1NTUgMzguNTYzMDgxNDhhODguNzE2MzI1OTIgODguNzE2MzI1OTIgMCAwIDEgODguMTA5NTExMTIgNzcuNzkzNjU5MjdsNjAuNTYwMTE4NTEgNDg0LjM1OTU4NTE3aC04OS40NDQ1MDM3TDc4OC43MDc1NTU1NSAxMjcuMjc5NDA3NDFIMjM1LjI5MjQ0NDQ1bC05Ni4xMTk0NjY2NyA3NjkuMzE5ODIyMjJoNDMyLjA1MjE0ODE0Vjk4NS4zMTU1NTU1NWgtNDMyLjA1MjE0ODE0YTg4LjcxNjMyNTkyIDg4LjcxNjMyNTkyIDAgMCAxLTg4LjEwOTUxMTExLTk5Ljc2MDM1NTU1bDk2LjExOTQ2NjY2LTc2OS4zMTk4MjIyMmE4OC43MTYzMjU5MiA4OC43MTYzMjU5MiAwIDAgMSA4OC4xMDk1MTExMi03Ny42NzIyOTYzaDU1My40MTUxMTExeiBtMjUuNzI4OTQ4MTUgNjQxLjUyNDYyMjIyYTE0LjgwNjI4MTQ4IDE0LjgwNjI4MTQ4IDAgMCAxIDYuNjc0OTYyOTcgNi42NzQ5NjI5N2wzNS40Mzc5ODUxOCA3MS44NDY4NzQwOGExNC44MDYyODE0OCAxNC44MDYyODE0OCAwIDAgMCAxMS4xNjUzOTI2IDguMTMxMzE4NWw3OS4yNTAwMTQ4IDExLjUyOTQ4MTVhMTQuODA2MjgxNDggMTQuODA2MjgxNDggMCAwIDEgOC4yNTI2ODE1IDI1LjI0MzQ5NjI4bC01Ny40MDQ2ODE1IDU1Ljk0ODMyNTk0YTE0LjgwNjI4MTQ4IDE0LjgwNjI4MTQ4IDAgMCAwLTQuMjQ3NzAzNyAxMy4xMDcybDEzLjQ3MTI4ODkgNzkuMDA3Mjg4ODhhMTQuODA2MjgxNDggMTQuODA2MjgxNDggMCAwIDEtMjEuNDgxMjQ0NDUgMTUuNTM0NDU5MjZsLTcwLjg3NTk3MDM3LTM3LjI1ODQyOTYzYTE0LjgwNjI4MTQ4IDE0LjgwNjI4MTQ4IDAgMCAwLTEzLjgzNTM3Nzc4IDBMNzI5Ljk2Nzg4MTQ4IDk2Ny4xMTExMTExMWExNC44MDYyODE0OCAxNC44MDYyODE0OCAwIDAgMS0yMS40ODEyNDQ0NS0xNS41MzQ0NTkyNmwxMy40NzEyODg4OS03OS4wMDcyODg4OGExNC44MDYyODE0OCAxNC44MDYyODE0OCAwIDAgMC00LjI0NzcwMzctMTMuMTA3MmwtNTcuNDA0NjgxNDctNTUuOTQ4MzI1OTRhMTQuODA2MjgxNDggMTQuODA2MjgxNDggMCAwIDEgOC4yNTI2ODE0Ny0yNS4yNDM0OTYyOGw3OS4yNTAwMTQ4MS0xMS41Mjk0ODE1YTE0LjgwNjI4MTQ4IDE0LjgwNjI4MTQ4IDAgMCAwIDExLjE2NTM5MjYtOC4xMzEzMTg1bDM1LjQzNzk4NTE5LTcxLjg0Njg3NDA4YTE0LjgwNjI4MTQ4IDE0LjgwNjI4MTQ4IDAgMCAxIDE5Ljc4MjE2Mjk2LTYuNjc0OTYyOTd6TTM2NC4wNTg1NDgxNSAyNzUuMzQyMjIyMjJhMTQ3Ljk0MTQ1MTg1IDE0Ny45NDE0NTE4NSAwIDAgMCAyOTUuODgyOTAzNyAwSDc0OC42NTc3Nzc3OGEyMzYuNjU3Nzc3NzggMjM2LjY1Nzc3Nzc4IDAgMSAxLTQ3My40MzY5MTg1MyAwSDM2My45MzcxODUxOHoiIGZpbGw9IiMyMDI3OWIiIHAtaWQ9IjQyNzEiPjwvcGF0aD48L3N2Zz4=",
"text": "产品中心" // tab 上按钮文字
}, { }, {
"pagePath": "pages/personalCenter/personalCenter", "pagePath": "pages/personalCenter/personalCenter",
// "iconPath": "static/tabbar/my.png", "text": "我的",
"iconPath": "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNzQ4MzU2NDgwOTc5IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjQ0NzMiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iNjQiIGhlaWdodD0iNjQiPjxwYXRoIGQ9Ik02NTYuODM5MTExMTEgNDc5LjIzMmM2My42MDE3Nzc3OC00NC44Mjg0NDQ0NSAxMDEuNjAzNTU1NTUtMTE3Ljc2IDEwMS45NDQ4ODg4OS0xOTUuNTg0LTMuMTg1Nzc3NzgtMTM2Ljc2MDg4ODg5LTExNi42MjIyMjIyMi0yNDUuMzA0ODg4ODktMjUzLjQ5Njg4ODg5LTI0Mi4yMzI4ODg4OS0xMzIuNTUxMTExMTEgMi45NTgyMjIyMi0yMzkuMjc0NjY2NjcgMTA5LjY4MTc3Nzc4LTI0Mi4yMzI4ODg4OSAyNDIuMjMyODg4ODkgMC4zNDEzMzMzMyA3Ny44MjQgMzguMjI5MzMzMzMgMTUwLjc1NTU1NTU1IDEwMS45NDQ4ODg4OSAxOTUuNTg0LTE1Ni44OTk1NTU1NSA1Ny4zNDQtMjYxLjY4ODg4ODg5IDIwNi4wNTE1NTU1NS0yNjIuOTQwNDQ0NDQgMzcyLjk2MzU1NTU1IDEuMDI0IDc0LjQxMDY2NjY3IDYyLjEyMjY2NjY3IDEzNC4wMzAyMjIyMiAxMzYuNTMzMzMzMzMgMTMzLjAwNjIyMjIzaDU0NC43NjhjNzQuNDEwNjY2NjcgMC45MTAyMjIyMiAxMzUuNTA5MzMzMzMtNTguNTk1NTU1NTUgMTM2LjUzMzMzMzMzLTEzMy4wMDYyMjIyMy0xLjQ3OTExMTExLTE2Ni45MTItMTA2LjI2ODQ0NDQ1LTMxNS42MTk1NTU1NS0yNjMuMDU0MjIyMjItMzcyLjk2MzU1NTU1ek0zMzcuMjM3MzMzMzMgMjgzLjc2MTc3Nzc4Yy0yLjM4OTMzMzMzLTk1LjkxNDY2NjY3IDczLjM4NjY2NjY3LTE3NS41NTkxMTExMSAxNjkuMzAxMzMzMzQtMTc3Ljk0ODQ0NDQ1IDk1LjkxNDY2NjY3LTIuMzg5MzMzMzMgMTc1LjU1OTExMTExIDczLjM4NjY2NjY3IDE3Ny45NDg0NDQ0NCAxNjkuMzAxMzMzMzRTNjExLjEwMDQ0NDQ1IDQ1MC41NiA1MTUuMTg1Nzc3NzggNDUyLjk0OTMzMzMzSDUxMC44NjIyMjIyMmMtOTQuNTQ5MzMzMzMgMS4xMzc3Nzc3OC0xNzIuMjU5NTU1NTUtNzQuNjM4MjIyMjItMTczLjYyNDg4ODg5LTE2OS4xODc1NTU1NXogbTQ0Ni4wMDg4ODg4OSA2MjguOTYzNTU1NTVIMjM4LjQ3ODIyMjIyYy0zMy43OTIgMC41Njg4ODg4OS02MS42Njc1NTU1NS0yNi4zOTY0NDQ0NS02Mi4yMzY0NDQ0NC02MC4zMDIyMjIyMnYtMC4yMjc1NTU1NmM1LjAwNjIyMjIyLTE4NC43NzUxMTExMSAxNTguOTQ3NTU1NTUtMzMwLjUyNDQ0NDQ1IDM0My44MzY0NDQ0NC0zMjUuNTE4MjIyMjIgMTc3LjcyMDg4ODg5IDQuODkyNDQ0NDUgMzIwLjYyNTc3Nzc4IDE0Ny43OTczMzMzMyAzMjUuNTE4MjIyMjMgMzI1LjUxODIyMjIyLTAuNDU1MTExMTEgMzMuNzkyLTI4LjIxNjg4ODg5IDYwLjg3MTExMTExLTYyLjAwODg4ODkgNjAuNDE2LTAuMjI3NTU1NTUgMC4xMTM3Nzc3OC0wLjIyNzU1NTU1IDAuMTEzNzc3NzgtMC4zNDEzMzMzMyAwLjExMzc3Nzc4eiIgZmlsbD0iIzMzMzMzMyIgcC1pZD0iNDQ3NCI+PC9wYXRoPjwvc3ZnPg==", "iconPath": "static/images/personal.png",// 图片路径，icon 大小限制为40kb，建议尺寸为 81px * 81px
// "selectedIconPath": "static/tabbar/my_active.png", "selectedIconPath": "static/images/selectPersonal.png"
"selectedIconPath": "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNzQ4MzU2NDgwOTc5IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjQ0NzMiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iNjQiIGhlaWdodD0iNjQiPjxwYXRoIGQ9Ik02NTYuODM5MTExMTEgNDc5LjIzMmM2My42MDE3Nzc3OC00NC44Mjg0NDQ0NSAxMDEuNjAzNTU1NTUtMTE3Ljc2IDEwMS45NDQ4ODg4OS0xOTUuNTg0LTMuMTg1Nzc3NzgtMTM2Ljc2MDg4ODg5LTExNi42MjIyMjIyMi0yNDUuMzA0ODg4ODktMjUzLjQ5Njg4ODg5LTI0Mi4yMzI4ODg4OS0xMzIuNTUxMTExMTEgMi45NTgyMjIyMi0yMzkuMjc0NjY2NjcgMTA5LjY4MTc3Nzc4LTI0Mi4yMzI4ODg4OSAyNDIuMjMyODg4ODkgMC4zNDEzMzMzMyA3Ny44MjQgMzguMjI5MzMzMzMgMTUwLjc1NTU1NTU1IDEwMS45NDQ4ODg4OSAxOTUuNTg0LTE1Ni44OTk1NTU1NSA1Ny4zNDQtMjYxLjY4ODg4ODg5IDIwNi4wNTE1NTU1NS0yNjIuOTQwNDQ0NDQgMzcyLjk2MzU1NTU1IDEuMDI0IDc0LjQxMDY2NjY3IDYyLjEyMjY2NjY3IDEzNC4wMzAyMjIyMiAxMzYuNTMzMzMzMzMgMTMzLjAwNjIyMjIzaDU0NC43NjhjNzQuNDEwNjY2NjcgMC45MTAyMjIyMiAxMzUuNTA5MzMzMzMtNTguNTk1NTU1NTUgMTM2LjUzMzMzMzMzLTEzMy4wMDYyMjIyMy0xLjQ3OTExMTExLTE2Ni45MTItMTA2LjI2ODQ0NDQ1LTMxNS42MTk1NTU1NS0yNjMuMDU0MjIyMjItMzcyLjk2MzU1NTU1ek0zMzcuMjM3MzMzMzMgMjgzLjc2MTc3Nzc4Yy0yLjM4OTMzMzMzLTk1LjkxNDY2NjY3IDczLjM4NjY2NjY3LTE3NS41NTkxMTExMSAxNjkuMzAxMzMzMzQtMTc3Ljk0ODQ0NDQ1IDk1LjkxNDY2NjY3LTIuMzg5MzMzMzMgMTc1LjU1OTExMTExIDczLjM4NjY2NjY3IDE3Ny45NDg0NDQ0NCAxNjkuMzAxMzMzMzRTNjExLjEwMDQ0NDQ1IDQ1MC41NiA1MTUuMTg1Nzc3NzggNDUyLjk0OTMzMzMzSDUxMC44NjIyMjIyMmMtOTQuNTQ5MzMzMzMgMS4xMzc3Nzc3OC0xNzIuMjU5NTU1NTUtNzQuNjM4MjIyMjItMTczLjYyNDg4ODg5LTE2OS4xODc1NTU1NXogbTQ0Ni4wMDg4ODg4OSA2MjguOTYzNTU1NTVIMjM4LjQ3ODIyMjIyYy0zMy43OTIgMC41Njg4ODg4OS02MS42Njc1NTU1NS0yNi4zOTY0NDQ0NS02Mi4yMzY0NDQ0NC02MC4zMDIyMjIyMnYtMC4yMjc1NTU1NmM1LjAwNjIyMjIyLTE4NC43NzUxMTExMSAxNTguOTQ3NTU1NTUtMzMwLjUyNDQ0NDQ1IDM0My44MzY0NDQ0NC0zMjUuNTE4MjIyMjIgMTc3LjcyMDg4ODg5IDQuODkyNDQ0NDUgMzIwLjYyNTc3Nzc4IDE0Ny43OTczMzMzMyAzMjUuNTE4MjIyMjMgMzI1LjUxODIyMjIyLTAuNDU1MTExMTEgMzMuNzkyLTI4LjIxNjg4ODg5IDYwLjg3MTExMTExLTYyLjAwODg4ODkgNjAuNDE2LTAuMjI3NTU1NTUgMC4xMTM3Nzc3OC0wLjIyNzU1NTU1IDAuMTEzNzc3NzgtMC4zNDEzMzMzMyAwLjExMzc3Nzc4eiIgZmlsbD0iIzIwMjc5YiIgcC1pZD0iNDQ3NCI+PC9wYXRoPjwvc3ZnPg==",
"text": "我的"
} }
] ]
}, },
......
pages/index/index.vue
...@@ -340,19 +340,18 @@ ...@@ -340,19 +340,18 @@
} }
}, },
init() { init() {
let loginType = uni.getStorageSync('loginType')
if(loginType == 'codelogin'){
this.querySystemMessage()
}else {
uni.removeTabBarBadge({ index: 3 });
}
if (uni.getStorageSync('isLogin')) { if (uni.getStorageSync('isLogin')) {
let loginType = uni.getStorageSync('loginType')
if (loginType == "visitor") { if (loginType == "visitor") {
this.loginornot = false this.loginornot = false
}else{ }else{
this.loginornot = true; this.loginornot = true;
}
if(loginType == 'codelogin'){
this.querySystemMessage()
}else {
uni.removeTabBarBadge({ index: 3 });
} }
this.queryAreaCenterInfo(); this.queryAreaCenterInfo();
} else { } else {
......
pages/invitationRegister/invitationRegister.vue
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
data() { data() {
return { return {
areaName: companyInfo.companyName, areaName: companyInfo.companyName,
imgSrc:'../../static/yd_Logo.png', imgSrc:'../../static/logo2.png',
//imgSrc: '../../static/cffp_logo.png', //imgSrc: '../../static/cffp_logo.png',
invitationName:'', invitationName:'',
shareId:'', shareId:'',
......
pages/inviteJoin/inviteJoin.vue
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
data() { data() {
return { return {
companyType:companyInfo.companyType, companyType:companyInfo.companyType,
ydLogoShare: `${shareURL}/static/yd_LogoShare.png`, ydLogoShare: `${shareURL}/static/logo2.png`,
dataForm: { dataForm: {
applyType: '1', //申请类型邀请加盟传 1 申请加盟传 2 applyType: '1', //申请类型邀请加盟传 1 申请加盟传 2
operatStep: '1', // 99:最后一步,1:第一步,2:为第二步该obj 为第一步 operatStep: '1', // 99:最后一步,1:第一步,2:为第二步该obj 为第一步
...@@ -196,6 +196,8 @@ ...@@ -196,6 +196,8 @@
//this.getqueryOrgList() //this.getqueryOrgList()
if(this.companyType == '1'){ if(this.companyType == '1'){
this.ydLogoShare = `${shareURL}/static/cffp_logo.jpg`; this.ydLogoShare = `${shareURL}/static/cffp_logo.jpg`;
}else {
this.ydLogoShare = `${shareURL}/static/logo2.png`;
} }
let dataForm = uni.getStorageSync('userinfodataForm') let dataForm = uni.getStorageSync('userinfodataForm')
this.realName = dataForm.realName; this.realName = dataForm.realName;
......
pages/personalCenter/personalCenter.vue
...@@ -97,7 +97,6 @@ ...@@ -97,7 +97,6 @@
export default { export default {
data() { data() {
return { return {
showMyName:'', showMyName:'',
msgTotal:0, msgTotal:0,
messageInfo:[], messageInfo:[],
...@@ -159,13 +158,13 @@ ...@@ -159,13 +158,13 @@
{title:'申请加盟',icon:'icon-hezuo',link:'/pages/application-process/basic-info',isOpen:true,isShow:true}, {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-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:'/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:'帮助', {id:'02',categoryName:'帮助',
children:[ children:[
{title:'帮助中心',icon:'icon-wenhao1',link:'/pages/personalCenter/helpCenter',isOpen:true,isShow:true,islogin:true}, {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 @@ ...@@ -55,6 +55,18 @@
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib"> <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> <span class="icon iconfont">&#xe116;</span>
<div class="name">客服</div> <div class="name">客服</div>
<div class="code-name">&amp;#xe116;</div> <div class="code-name">&amp;#xe116;</div>
...@@ -270,9 +282,9 @@ ...@@ -270,9 +282,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=1750649292857') format('woff2'), src: url('iconfont.woff2?t=1750822970160') format('woff2'),
url('iconfont.woff?t=1750649292857') format('woff'), url('iconfont.woff?t=1750822970160') format('woff'),
url('iconfont.ttf?t=1750649292857') format('truetype'); url('iconfont.ttf?t=1750822970160') format('truetype');
} }
</code></pre> </code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3> <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
...@@ -299,6 +311,24 @@ ...@@ -299,6 +311,24 @@
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib"> <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> <span class="icon iconfont icon-kefu"></span>
<div class="name"> <div class="name">
客服 客服
...@@ -624,6 +654,22 @@ ...@@ -624,6 +654,22 @@
<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-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> <use xlink:href="#icon-kefu"></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=1750649292857') format('woff2'), src: url('iconfont.woff2?t=1750822970160') format('woff2'),
url('iconfont.woff?t=1750649292857') format('woff'), url('iconfont.woff?t=1750822970160') format('woff'),
url('iconfont.ttf?t=1750649292857') format('truetype'); url('iconfont.ttf?t=1750822970160') format('truetype');
} }
.iconfont { .iconfont {
...@@ -13,6 +13,14 @@ ...@@ -13,6 +13,14 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-yuchengguanxi:before {
content: "\e117";
}
.icon-kefu1:before {
content: "\e645";
}
.icon-kefu:before { .icon-kefu:before {
content: "\e116"; 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 @@ ...@@ -6,6 +6,20 @@
"description": "", "description": "",
"glyphs": [ "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", "icon_id": "518189",
"name": "客服", "name": "客服",
"font_class": "kefu", "font_class": "kefu",
......
util/router.js
...@@ -8,7 +8,7 @@ const whiteList = [ ...@@ -8,7 +8,7 @@ const whiteList = [
'/pages/orderDetail/orderDetail', '/pages/orderDetail/orderDetail',
'/pages/courseDetail/courseDetail', '/pages/courseDetail/courseDetail',
'/pages/courselist/courselist', '/pages/courselist/courselist',
'/pages/personalCenter/helpCenter?type=1', '/pages/personalCenter/helpCenter',
'/pages/index/index' '/pages/index/index'
] ]
export default function initApp(){ export default function initApp(){
......
util/uploaderFile.ts
import { apiURL } from "../environments/environment"; // import { apiURL } from "../environments/environment";
/** // /**
* 优化后的图片上传方法（支持压缩 + 进度条） // * 优化后的图片上传方法（支持压缩 + 进度条）
* @param {Object} params - 上传参数（同原版） // * @param {Object} params - 上传参数（同原版）
* @returns {Promise} 返回上传结果 // * @returns {Promise} 返回上传结果
*/ // */
export function CommonUpload(params) { // export function CommonUpload(params) {
return new Promise((resolve, reject) => { // return new Promise((resolve, reject) => {
// 1️⃣ 检查权限（仅APP端需要） // // 1️⃣ 检查权限（仅APP端需要）
// #ifdef APP-PLUS // // #ifdef APP-PLUS
const imageCamera = uni.getStorageSync('imageCamera'); // const imageCamera = uni.getStorageSync('imageCamera');
if (!imageCamera || imageCamera !== '1') { // if (!imageCamera || imageCamera !== '1') {
uni.showModal({ // uni.showModal({
title: '权限说明', // title: '权限说明',
content: '我们需要访问您的相机和相册，以便您拍摄或上传图片。', // content: '我们需要访问您的相机和相册，以便您拍摄或上传图片。',
confirmText: '同意', // confirmText: '同意',
cancelText: '拒绝', // cancelText: '拒绝',
success: (res) => { // success: (res) => {
if (res.confirm) { // if (res.confirm) {
uni.setStorageSync('imageCamera', '1'); // uni.setStorageSync('imageCamera', '1');
startUpload(params, resolve, reject); // 同意后开始上传 // startUpload(params, resolve, reject); // 同意后开始上传
} else { // } else {
reject(new Error('用户拒绝了权限')); // reject(new Error('用户拒绝了权限'));
} // }
} // }
}); // });
} else { // } else {
startUpload(params, resolve, reject); // 已有权限，直接上传 // startUpload(params, resolve, reject); // 已有权限，直接上传
} // }
// #endif // // #endif
// 2️⃣ H5 端直接上传（无需权限） // // 2️⃣ H5 端直接上传（无需权限）
// #ifdef H5 // // #ifdef H5
startUpload(params, resolve, reject); // startUpload(params, resolve, reject);
// #endif // // #endif
}); // });
} // }
/** // /**
* 核心上传逻辑（选择图片 → 压缩 → 上传） // * 核心上传逻辑（选择图片 → 压缩 → 上传）
* @param {Object} params - 上传参数 // * @param {Object} params - 上传参数
* @param {Function} resolve - Promise resolve // * @param {Function} resolve - Promise resolve
* @param {Function} reject - Promise reject // * @param {Function} reject - Promise reject
*/ // */
function startUpload(params, resolve, reject) { // function startUpload(params, resolve, reject) {
uni.chooseImage({ // uni.chooseImage({
count: 1, // count: 1,
sizeType: ['compressed'], // sizeType: ['compressed'],
sourceType: ['album', 'camera'], // sourceType: ['album', 'camera'],
success: (chooseRes) => { // success: (chooseRes) => {
const tempFilePath = chooseRes.tempFilePaths[0]; // const tempFilePath = chooseRes.tempFilePaths[0];
uni.showLoading({ title: '处理中...', mask: true }); // uni.showLoading({ title: '处理中...', mask: true });
// #ifdef MP-WEIXIN // // #ifdef MP-WEIXIN
uni.compressImage({ // uni.compressImage({
src: tempFilePath, // src: tempFilePath,
quality: 70, // quality: 70,
success: (compressRes) => { // success: (compressRes) => {
uploadFile(compressRes.tempFilePath, params, resolve, reject); // uploadFile(compressRes.tempFilePath, params, resolve, reject);
}, // },
fail: (err) => { // fail: (err) => {
uni.hideLoading(); // uni.hideLoading();
reject(new Error('压缩失败: ' + JSON.stringify(err))); // reject(new Error('压缩失败: ' + JSON.stringify(err)));
}, // },
}); // });
// #endif // // #endif
// #ifdef H5 || APP-PLUS // // #ifdef H5 || APP-PLUS
uploadFile(tempFilePath, params, resolve, reject); // 或者用 canvas 压缩 // uploadFile(tempFilePath, params, resolve, reject); // 或者用 canvas 压缩
// #endif // // #endif
}, // },
fail: (err) => { // fail: (err) => {
reject(new Error('选择图片失败: ' + JSON.stringify(err))); // reject(new Error('选择图片失败: ' + JSON.stringify(err)));
}, // },
}); // });
} // }
/** // /**
* 执行上传操作（带进度条） // * 执行上传操作（带进度条）
* @param {String} filePath - 压缩后的图片路径 // * @param {String} filePath - 压缩后的图片路径
* @param {Object} params - 上传参数 // * @param {Object} params - 上传参数
* @param {Function} resolve - Promise resolve // * @param {Function} resolve - Promise resolve
* @param {Function} reject - Promise reject // * @param {Function} reject - Promise reject
*/ // */
function uploadFile(filePath, params, resolve, reject) { // function uploadFile(filePath, params, resolve, reject) {
// 1. 替换原 loading 提示 // // 1. 替换原 loading 提示
uni.showLoading({ title: '上传中...', mask: true }); // uni.showLoading({ title: '上传中...', mask: true });
// 2. 创建上传任务（可监听进度） // // 2. 创建上传任务（可监听进度）
const uploadTask = uni.uploadFile({ // const uploadTask = uni.uploadFile({
url: `${apiURL}/file/upload`, // url: `${apiURL}/file/upload`,
filePath: filePath, // filePath: filePath,
name: 'file', // name: 'file',
formData: { requestVO: JSON.stringify(params) }, // formData: { requestVO: JSON.stringify(params) },
header: { 'X-Authorization': uni.getStorageSync('uni-token') || '' }, // header: { 'X-Authorization': uni.getStorageSync('uni-token') || '' },
success: (res) => { // success: (res) => {
uni.hideLoading(); // uni.hideLoading();
try { // try {
const data = JSON.parse(res.data); // const data = JSON.parse(res.data);
if (data.success) { // if (data.success) {
resolve(data); // 上传成功 // resolve(data); // 上传成功
} else { // } else {
reject(new Error(data.message || '上传失败')); // reject(new Error(data.message || '上传失败'));
} // }
} catch (e) { // } catch (e) {
reject(new Error('解析服务器响应失败')); // reject(new Error('解析服务器响应失败'));
} // }
}, // },
fail: (err) => { // fail: (err) => {
uni.hideLoading(); // uni.hideLoading();
reject(new Error('上传失败: ' + JSON.stringify(err))); // reject(new Error('上传失败: ' + JSON.stringify(err)));
} // }
}); // });
// 3. 监听上传进度（可选，适合大文件） // // 3. 监听上传进度（可选，适合大文件）
uploadTask.onProgressUpdate((progress) => { // uploadTask.onProgressUpdate((progress) => {
console.log(`上传进度: ${progress.progress}%`); // console.log(`上传进度: ${progress.progress}%`);
// 可以在这里更新 UI，比如： // // 可以在这里更新 UI，比如：
// uni.showToast({ title: `上传中 ${progress.progress}%`, icon: 'none' }); // // uni.showToast({ title: `上传中 ${progress.progress}%`, icon: 'none' });
}); // });
}
// //import request from "./request";
// //import authorizeUtils from "./authorizeUtils";
// import { apiURL } from "../environments/environment";
// // 上传图片事件
// export function CommonUpload(psrams) {
// let requestVO = psrams
// // @ts-ignore
// return new Promise((resolve, reject) => {
// // #ifdef APP-PLUS
// let imageCamera = uni.getStorageSync('imageCamera');
// if(!imageCamera || imageCamera != '1'){
// uni.showModal({
// title: '权限说明',
// content: '我们需要访问您的相机和相册，以便您拍摄或上传图片。',
// confirmText: '同意',
// cancelText: '拒绝',
// success: function (res) {
// if (res.confirm) {
// uni.setStorageSync('imageCamera', '1');
// uni.chooseImage({
// count: 1, //默认9
// sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
// sourceType: ['album','camera'], //从相册选择
// success: function(res) {
// uni.showLoading({title: '加载中', mask: true});
// uni.uploadFile({
// url: `${apiURL}/file/upload`, // 后端api接口
// filePath: res.tempFilePaths[0], // uni.chooseImage函数调用后获取的本地文件路劲
// name: 'file', //后端通过'file'获取上传的文件对象
// formData: { requestVO: JSON.stringify(requestVO)},//后台所需除图片外的参数可以写在这里面 ，单张多张都可
// header: {'X-Authorization': uni.getStorageSync('uni-token') ? uni.getStorageSync('uni-token') : ''},
// success: (res) => {
// resolve(JSON.parse(res.data));
// uni.hideLoading();
// },
// fail:(err) =>{
// uni.showModal({content:'上传失败', showCancel: false})
// uni.hideLoading();
// }
// });
// }
// });
// }
// }
// })
// }else{
// uni.chooseImage({
// count: 1, //默认9
// sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
// sourceType: ['album','camera'], //从相册选择
// success: function(res) {
// uni.showLoading({title: '加载中', mask: true});
// uni.uploadFile({
// url: `${apiURL}/file/upload`, // 后端api接口
// filePath: res.tempFilePaths[0], // uni.chooseImage函数调用后获取的本地文件路劲
// name: 'file', //后端通过'file'获取上传的文件对象
// formData: { requestVO: JSON.stringify(requestVO)},//后台所需除图片外的参数可以写在这里面 ，单张多张都可
// header: {'X-Authorization': uni.getStorageSync('uni-token') ? uni.getStorageSync('uni-token') : ''},
// success: (res) => {
// resolve(JSON.parse(res.data));
// uni.hideLoading();
// },
// fail:(err) =>{
// uni.showModal({content:'上传失败', showCancel: false})
// uni.hideLoading();
// }
// });
// }
// });
// }
// // #endif
// // #ifdef H5
// uni.chooseImage({
// count: 1, //默认9
// sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
// sourceType: ['album','camera'], //从相册选择
// success: function(res) {
// uni.showLoading({title: '加载中', mask: true});
// uni.uploadFile({
// url: `${apiURL}/file/upload`, // 后端api接口
// filePath: res.tempFilePaths[0], // uni.chooseImage函数调用后获取的本地文件路劲
// name: 'file', //后端通过'file'获取上传的文件对象
// formData: { requestVO: JSON.stringify(requestVO)},//后台所需除图片外的参数可以写在这里面 ，单张多张都可
// header: {'X-Authorization': uni.getStorageSync('uni-token') ? uni.getStorageSync('uni-token') : ''},
// success: (res) => {
// resolve(JSON.parse(res.data));
// uni.hideLoading();
// },
// fail:(err) =>{
// uni.showModal({content:'上传失败', showCancel: false})
// uni.hideLoading();
// }
// });
// }
// });
// // #endif
// })
// } // }
import request from "./request";
import authorizeUtils from "./authorizeUtils";
import { apiURL } from "../environments/environment";
// 上传图片事件
export function CommonUpload(psrams) {
let requestVO = psrams
// @ts-ignore
return new Promise((resolve, reject) => {
// #ifdef APP-PLUS
let imageCamera = uni.getStorageSync('imageCamera');
if(!imageCamera || imageCamera != '1'){
uni.showModal({
title: '权限说明',
content: '我们需要访问您的相机和相册，以便您拍摄或上传图片。',
confirmText: '同意',
cancelText: '拒绝',
success: function (res) {
if (res.confirm) {
uni.setStorageSync('imageCamera', '1');
uni.chooseImage({
count: 1, //默认9
sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
sourceType: ['album','camera'], //从相册选择
success: function(res) {
uni.showLoading({title: '加载中', mask: true});
uni.uploadFile({
url: `${apiURL}/file/upload`, // 后端api接口
filePath: res.tempFilePaths[0], // uni.chooseImage函数调用后获取的本地文件路劲
name: 'file', //后端通过'file'获取上传的文件对象
formData: { requestVO: JSON.stringify(requestVO)},//后台所需除图片外的参数可以写在这里面 ，单张多张都可
header: {'X-Authorization': uni.getStorageSync('uni-token') ? uni.getStorageSync('uni-token') : ''},
success: (res) => {
resolve(JSON.parse(res.data));
uni.hideLoading();
},
fail:(err) =>{
uni.showModal({content:'上传失败', showCancel: false})
uni.hideLoading();
}
});
}
});
}
}
})
}else{
uni.chooseImage({
count: 1, //默认9
sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
sourceType: ['album','camera'], //从相册选择
success: function(res) {
uni.showLoading({title: '加载中', mask: true});
uni.uploadFile({
url: `${apiURL}/file/upload`, // 后端api接口
filePath: res.tempFilePaths[0], // uni.chooseImage函数调用后获取的本地文件路劲
name: 'file', //后端通过'file'获取上传的文件对象
formData: { requestVO: JSON.stringify(requestVO)},//后台所需除图片外的参数可以写在这里面 ，单张多张都可
header: {'X-Authorization': uni.getStorageSync('uni-token') ? uni.getStorageSync('uni-token') : ''},
success: (res) => {
resolve(JSON.parse(res.data));
uni.hideLoading();
},
fail:(err) =>{
uni.showModal({content:'上传失败', showCancel: false})
uni.hideLoading();
}
});
}
});
}
// #endif
// #ifdef H5
uni.chooseImage({
count: 1, //默认9
sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
sourceType: ['album','camera'], //从相册选择
success: function(res) {
uni.showLoading({title: '加载中', mask: true});
uni.uploadFile({
url: `${apiURL}/file/upload`, // 后端api接口
filePath: res.tempFilePaths[0], // uni.chooseImage函数调用后获取的本地文件路劲
name: 'file', //后端通过'file'获取上传的文件对象
formData: { requestVO: JSON.stringify(requestVO)},//后台所需除图片外的参数可以写在这里面 ，单张多张都可
header: {'X-Authorization': uni.getStorageSync('uni-token') ? uni.getStorageSync('uni-token') : ''},
success: (res) => {
resolve(JSON.parse(res.data));
uni.hideLoading();
},
fail:(err) =>{
uni.showModal({content:'上传失败', showCancel: false})
uni.hideLoading();
}
});
}
});
// #endif
})
}
// //图片放大 //图片放大
// export function ckbigImg(params) { export function ckbigImg(params) {
// wx.previewImage({ wx.previewImage({
// urls: [params], //需要预览的图片http链接列表，多张的时候，url直接写在后面就行了 urls: [params], //需要预览的图片http链接列表，多张的时候，url直接写在后面就行了
// current: '', // 当前显示图片的http链接，默认是第一个 current: '', // 当前显示图片的http链接，默认是第一个
// success: function(res) {}, success: function(res) {},
// fail: function(res) {}, fail: function(res) {},
// complete: function(res) {}, complete: function(res) {},
// }) })
// } }
// // 这个方法用来上传文件 // 这个方法用来上传文件
// export function uploadFilepdf(params) { export function uploadFilepdf(params) {
// let requestVO = params let requestVO = params
// // @ts-ignore // @ts-ignore
// return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
// uni.chooseFile({ uni.chooseFile({
// count: 1, //默认100 count: 1, //默认100
// extension: ['.pdf', '.doc'], extension: ['.pdf', '.doc'],
// success: function(res) { success: function(res) {
// var str = res.tempFiles[0].name; //截取后4位 var str = res.tempFiles[0].name; //截取后4位
// let a = str.substring(str.length - 3); let a = str.substring(str.length - 3);
// if(a !== 'pdf') { if(a !== 'pdf') {
// uni.showToast({ uni.showToast({
// title: '上传文件格式不正确！', title: '上传文件格式不正确！',
// duration: 2000, duration: 2000,
// icon: 'none' icon: 'none'
// }); });
// return return
// } }
// var name = res.tempFiles[0].name var name = res.tempFiles[0].name
// uni.showLoading({ uni.showLoading({
// title: '加载中', title: '加载中',
// mask: true mask: true
// }); });
// uni.uploadFile({ uni.uploadFile({
// url: `${apiURL}/file/upload`, // 后端api接口 url: `${apiURL}/file/upload`, // 后端api接口
// filePath: res.tempFilePaths[0], // uni.chooseImage函数调用后获取的本地文件路劲 filePath: res.tempFilePaths[0], // uni.chooseImage函数调用后获取的本地文件路劲
// name: 'file', //后端通过'file'获取上传的文件对象 name: 'file', //后端通过'file'获取上传的文件对象
// formData: { formData: {
// requestVO: JSON.stringify(requestVO) requestVO: JSON.stringify(requestVO)
// }, },
// header: { header: {
// 'X-Authorization': uni.getStorageSync('uni-token') ? uni.getStorageSync('uni-token') : '' 'X-Authorization': uni.getStorageSync('uni-token') ? uni.getStorageSync('uni-token') : ''
// }, },
// success: (res) => { success: (res) => {
// let data = JSON.parse(res.data) let data = JSON.parse(res.data)
// if(data.success == true){ if(data.success == true){
// data.name = name data.name = name
// resolve(data) resolve(data)
// } else { } else {
// uni.showToast({ uni.showToast({
// title: '上传失败', title: '上传失败',
// duration: 2000, duration: 2000,
// icon: 'none' icon: 'none'
// }); });
// } }
// uni.hideLoading(); uni.hideLoading();
// } }
// }); });
// } }
// }); });
// }) })
// } }
\ No newline at end of file \ No newline at end of file
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