From 91e17af463dbba7f79b608e564262f940324bb99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Mon, 28 Jul 2025 11:22:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=8D=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=97=B6=E5=8F=AF=E4=BB=A5=E5=88=B0=E6=B5=8F=E8=A7=88=E5=99=A8?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=AE=89=E8=A3=85=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 272 ++----------------------- api/oa/contact.js | 44 ++++ api/oa/emailAccount.js | 53 +++++ components/oa/oa-file-upload/index.vue | 52 +++++ pages.json | 8 + pages/workbench/index/index.vue | 119 ++++++----- pages/workbench/sales/sales.vue | 37 ++++ static/images/yingxiao.png | Bin 0 -> 5063 bytes util/update.js | 232 +++++++++++++++++++++ version.md | 5 + 10 files changed, 507 insertions(+), 315 deletions(-) create mode 100644 api/oa/contact.js create mode 100644 api/oa/emailAccount.js create mode 100644 components/oa/oa-file-upload/index.vue create mode 100644 pages/workbench/sales/sales.vue create mode 100644 static/images/yingxiao.png create mode 100644 util/update.js create mode 100644 version.md diff --git a/App.vue b/App.vue index f966503..664e51a 100644 --- a/App.vue +++ b/App.vue @@ -8,6 +8,7 @@ import IMSDK, { import config from "./common/config"; import { getDbDir, toastWithCallback } from "@/util/common.js"; import { conversationSort } from "@/util/imCommon"; +import updateManager from "@/util/update.js"; import { PageEvents, UpdateMessageTypes } from "@/constant"; const openSdk = uni.requireNativePlugin('Tuoyun-OpenIMSDK'); const globalEvent = uni.requireNativePlugin('globalEvent'); @@ -15,11 +16,11 @@ const globalEvent = uni.requireNativePlugin('globalEvent'); export default { onLaunch: function () { console.log("App Launch"); - console.log(openSdk); + console.log(openSdk); this.setGlobalIMlistener(); this.tryLogin(); // #ifdef APP-PLUS - checkUpdate(); // 直接调用独立函数，避免this问题 + updateManager.checkUpdate(); // 直接调用独立函数，避免this问题 // #endif // #ifdef H5 console.error( @@ -45,20 +46,20 @@ export default { onShow: function () { console.log("App Show"); IMSDK.asyncApi(IMSDK.IMMethods.SetAppBackgroundStatus, IMSDK.uuid(), false); - //#ifdef APP-PLUS - // var info = plus.push.getClientInfo() - // plus.push.addEventListener("click", function(msg) { - // console.log("click:" + JSON.stringify(msg)); - // console.log(msg.payload); - // console.log(JSON.stringify(msg)); - // }, false); - // // 监听在线消息事件 - // plus.push.addEventListener("receive", function(msg) { - // //业务代码 - // console.log("recevice:" + JSON.stringify(msg)) - // }, false); - //#endif - + //#ifdef APP-PLUS + // var info = plus.push.getClientInfo() + // plus.push.addEventListener("click", function(msg) { + // console.log("click:" + JSON.stringify(msg)); + // console.log(msg.payload); + // console.log(JSON.stringify(msg)); + // }, false); + // // 监听在线消息事件 + // plus.push.addEventListener("receive", function(msg) { + // //业务代码 + // console.log("recevice:" + JSON.stringify(msg)) + // }, false); + //#endif + }, onHide: function () { @@ -498,245 +499,8 @@ export default { }, }; -function checkUpdate(forceCheck = false) { - const localVersion = plus.runtime.version; - const localWgtVersion = uni.getStorageSync('wgtVersion') || localVersion; - uni.request({ - url: 'http://47.117.71.33:11295/fadapp-update/version.json?t=' + Date.now(), - success: (res) => { - const remoteVersion = res.data.version; - const wgtUrl = res.data.wgtUrl; - // 取本地基座和本地wgt的最大版本 - const currentVersion = compareVersion(localWgtVersion, localVersion) > 0 ? localWgtVersion : localVersion; - console.log('本地基座版本:', localVersion, '本地wgt版本:', localWgtVersion, '当前对比版本:', currentVersion, '远程版本:', remoteVersion); - if (compareVersion(remoteVersion, currentVersion) > 0) { - // 检查版本兼容性 - if (!checkVersionCompatibility(remoteVersion, localVersion)) { - console.warn('版本不兼容，跳过更新'); - uni.showModal({ - title: '版本不兼容', - content: `新版本 ${remoteVersion} 与当前基座版本 ${localVersion} 不兼容，请通过应用商店更新完整版本。`, - showCancel: false, - confirmText: '确定' - }); - return; - } - - // 检查是否已忽略当前版本（除非强制检查） - const ignoredVersion = uni.getStorageSync('ignoredVersion'); - if (!forceCheck && ignoredVersion === remoteVersion) { - console.log('用户已选择忽略此版本:', remoteVersion); - return; - } - - uni.showModal({ - title: '发现新版本', - content: `检测到新版本（${remoteVersion}），是否立即下载并更新？`, - confirmText: '立即更新', - cancelText: '暂不更新', - showCancel: true, - success: (modalRes) => { - if (modalRes.confirm) { - // 检查存储空间 - checkStorageSpace().then(() => { - uni.showLoading({title: '正在下载更新包...'}); - console.log('开始下载wgt包:', wgtUrl); - uni.downloadFile({ - url: wgtUrl, - success: (downloadResult) => { - uni.hideLoading(); - console.log('下载结果:', downloadResult); - if (downloadResult.statusCode === 200) { - console.log('开始安装wgt包:', downloadResult.tempFilePath); - // 检查文件是否存在 - plus.io.resolveLocalFileSystemURL(downloadResult.tempFilePath, (entry) => { - console.log('文件存在，开始安装'); - plus.runtime.install(downloadResult.tempFilePath, {force: true}, function() { - console.log('wgt包安装成功'); - // 更新本地wgt版本号 - uni.setStorageSync('wgtVersion', remoteVersion); - uni.showModal({ - title: '更新完成', - content: '应用需要重启才能生效，是否立即重启？', - success: function (res) { - if (res.confirm) { - plus.runtime.restart(); - } - } - }); - }, function(e) { - console.error('wgt包安装失败:', e); - let errorMsg = '安装失败'; - if (e && e.message) { - errorMsg += ': ' + e.message; - } - if (e && e.code) { - errorMsg += ' (错误代码: ' + e.code + ')'; - } - uni.showModal({ - title: '安装失败', - content: errorMsg + '\n\n可能的原因：\n1. 版本不兼容\n2. 文件损坏\n3. 权限不足\n4. 存储空间不足', - showCancel: false, - confirmText: '确定' - }); - }); - }, (error) => { - console.error('文件不存在:', error); - uni.showModal({ - title: '安装失败', - content: '下载的文件不存在或已损坏', - showCancel: false, - confirmText: '确定' - }); - }); - } else { - console.error('下载失败，状态码:', downloadResult.statusCode); - uni.showModal({ - title: '下载失败', - content: `服务器返回错误，状态码: ${downloadResult.statusCode}`, - showCancel: false, - confirmText: '确定' - }); - } - }, - fail: (error) => { - uni.hideLoading(); - console.error('下载失败:', error); - uni.showModal({ - title: '下载失败', - content: '网络连接异常，请检查网络后重试', - showCancel: false, - confirmText: '确定' - }); - } - }); - }).catch((error) => { - console.error('存储空间检查失败:', error); - uni.showModal({ - title: '存储空间不足', - content: '设备存储空间不足，无法下载更新包', - showCancel: false, - confirmText: '确定' - }); - }); - } else { - // 用户选择暂不更新，询问是否忽略此版本 - uni.showModal({ - title: '忽略更新', - content: `是否忽略版本 ${remoteVersion}？忽略后下次启动时将不再提示此版本更新。`, - confirmText: '忽略此版本', - cancelText: '下次提醒', - success: (ignoreRes) => { - if (ignoreRes.confirm) { - uni.setStorageSync('ignoredVersion', remoteVersion); - uni.showToast({title: '已忽略此版本更新'}); - } - } - }); - } - } - }); - } else { - // uni.showToast({title: '当前已是最新版本'}); - console.log('当前已是最新版本'); - } - }, - fail: (error) => { - console.error('检查更新失败:', error); - uni.showToast({title: '网络异常，请稍后重试'}); - } - }); -} -function extractVersionNum(str) { - // 匹配第一个出现的数字版本号 - const match = str.match(/(\d+\.\d+(?:\.\d+)?)/); - return match ? match[1] : '0.0.0'; -} - -function compareVersion(v1, v2) { - v1 = extractVersionNum(v1).split('.').map(Number); - v2 = extractVersionNum(v2).split('.').map(Number); - for (let i = 0; i < Math.max(v1.length, v2.length); i++) { - const n1 = v1[i] || 0; - const n2 = v2[i] || 0; - if (n1 > n2) return 1; - if (n1 < n2) return -1; - } - return 0; -} - -// 更新管理工具函数 -function clearIgnoredVersion() { - uni.removeStorageSync('ignoredVersion'); - console.log('已清除忽略的版本设置'); -} - -function getIgnoredVersion() { - return uni.getStorageSync('ignoredVersion'); -} - -function setIgnoredVersion(version) { - uni.setStorageSync('ignoredVersion', version); - console.log('已设置忽略版本:', version); -} - -// 检查版本兼容性 -function checkVersionCompatibility(wgtVersion, baseVersion) { - console.log('检查版本兼容性:', { wgtVersion, baseVersion }); - - // 提取主版本号进行比较 - const wgtMajor = extractVersionNum(wgtVersion).split('.')[0]; - const baseMajor = extractVersionNum(baseVersion).split('.')[0]; - - // 主版本号必须匹配 - if (wgtMajor !== baseMajor) { - console.warn('主版本号不匹配:', { wgtMajor, baseMajor }); - return false; - } - - // 检查wgt版本是否高于基座版本 - if (compareVersion(wgtVersion, baseVersion) <= 0) { - console.warn('wgt版本不高于基座版本'); - return false; - } - - return true; -} - -// 检查存储空间 -function checkStorageSpace() { - return new Promise((resolve, reject) => { - // #ifdef APP-PLUS - if (typeof plus !== 'undefined' && plus.io) { - plus.io.requestFileSystem(plus.io.PRIVATE_DOC, (fs) => { - fs.root.getDirectory('temp', { create: true }, (dir) => { - // 简单检查，实际项目中可能需要更复杂的空间检查 - resolve(true); - }, (error) => { - console.error('检查存储空间失败:', error); - reject(error); - }); - }); - } else { - resolve(true); - } - // #endif - - // #ifndef APP-PLUS - resolve(true); - // #endif - }); -} - // 导出更新管理函数供其他页面使用 -uni.$updateManager = { - checkUpdate: (forceCheck = false) => checkUpdate(forceCheck), - clearIgnoredVersion, - getIgnoredVersion, - setIgnoredVersion, - checkVersionCompatibility, - checkStorageSpace -}; +uni.$updateManager = updateManager; diff --git a/pages.json b/pages.json index 73e6566..eddc4fb 100644 --- a/pages.json +++ b/pages.json @@ -349,6 +349,14 @@ "navigationBarTitleText" : "项目详情", "navigationStyle": "default" } + }, + { + "path" : "pages/workbench/sales/sales", + "style" : + { + "navigationBarTitleText" : "线上营销", + "navigationStyle": "default" + } } ], "tabBar": { diff --git a/pages/workbench/index/index.vue b/pages/workbench/index/index.vue index 0c81569..36eebb1 100644 --- a/pages/workbench/index/index.vue +++ b/pages/workbench/index/index.vue @@ -6,34 +6,15 @@ - - - 每日报工 + + + {{ item.text }} - - - 施工进度 - - - - 任务中心 - - - - 项目排产 - - - - 快递信息 - - - - 项目中心 - - - - 库存盘点 - @@ -53,6 +34,52 @@ export default { // 页面加载时调用getUserProfile this.fetchUserProfile(); }, + data() { + return { + entryList: [ + { + text: '每日报工', + icon: '/static/images/baogong.png', + url: '/pages/workbench/reportWork/reportWork', + }, + { + text: '施工进度', + icon: '/static/images/shigong.png', + url: '/pages/workbench/construction/construction', + }, + { + text: '任务中心', + icon: '/static/images/task.png', + url: '/pages/workbench/task/task', + }, + { + text: '项目排产', + icon: '/static/images/paichan.png', + url: '/pages/workbench/reportSchedule/reportSchedule', + }, + { + text: '快递信息', + icon: '/static/images/express.svg', + url: '/pages/workbench/express/express', + }, + { + text: '项目中心', + icon: '/static/images/project.png', + url: '/pages/workbench/project/project', + }, + { + text: '库存盘点', + icon: '/static/images/stock.png', + url: '/pages/workbench/wms/wms', + }, + { + text: '线上营销', + icon: '/static/images/yingxiao.png', + url: '/pages/workbench/sales/sales', + }, + ], + }; + }, methods: { // 获取用户个人信息 async fetchUserProfile() { @@ -66,41 +93,11 @@ export default { console.error('获取用户个人信息失败:', error); } }, - goReportWork() { - uni.navigateTo({ - url: '/pages/workbench/reportWork/reportWork' - }); + handleEntryClick(item) { + if (item.url) { + uni.navigateTo({ url: item.url }); + } }, - goConstruction() { - uni.navigateTo({ - url: '/pages/workbench/construction/construction' - }); - }, - goTask() { - uni.navigateTo({ - url: '/pages/workbench/task/task' - }) - }, - goSchedule() { - uni.navigateTo({ - url: '/pages/workbench/reportSchedule/reportSchedule' - }) - }, - goExpress() { - uni.navigateTo({ - url: '/pages/workbench/express/express' - }) - }, - goProject() { - uni.navigateTo({ - url: '/pages/workbench/project/project' - }) - }, - goStock() { - uni.navigateTo({ - url: '/pages/workbench/wms/wms' - }) - } }, }; diff --git a/pages/workbench/sales/sales.vue b/pages/workbench/sales/sales.vue new file mode 100644 index 0000000..1a49359 --- /dev/null +++ b/pages/workbench/sales/sales.vue @@ -0,0 +1,37 @@ + + + + + diff --git a/static/images/yingxiao.png b/static/images/yingxiao.png new file mode 100644 index 0000000000000000000000000000000000000000..70b04457aac6c439446511b2ca4cf7dc78129d36 GIT binary patch literal 5063 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 z z*uMLPMF5l{HZ&attxF|Wv|aAu0jjDn5T}@_2jpK@8-kj}a(kY&;_Qk2a*I~PJxfCP z&96^pkEI7tSUAM|9Ov2qCCaMSSZl6tC%o$>RE6CcP$;ruRf8Z2ZRLy&{o={ZCIL;9 zd-W}6^Y#zT@?kw7Tpxh5(XRi!FrrJwA>1tWT@8;Tg3#R>< zsPjB#b4p%1Co9P^yXudwsZ>)_gPHC2VSxB78<`9H42j|Kr)Kg8I^5F;SL9bm>mfO! zwQ0e%ImQoBi*BR45=+6%x z6A|M#@pwE~9-mg8vN=bqb!ce z^tWq zE6b8BWLhWucr}ggKd^ZuY|X$u$W}aW=+SZO@1A}W?5|~2zaak`-c?;6FDExWYOd{5 zhH|;|>&#?hFcFS@HUy4h(dU-Y#SQ8ogr zX)3ANU$qgO3f)^JX;l%1z>Ng5u zw`vA>i7a9DtQmSg1*PEDoy~i7m)v}A63#iLDuS%8BO9NMV64un@r{u+f65hSKj>@4 z3wpl2(|P{ETJkSM*b3J$CbNU}Wuqr+RIQTwv)Y#4R{4zB#qgCwsx1R%R>y(;lqgLu zu+kJ@ytgxa;C*9qKu@K~p06vShF?xMito zU>!$1<~-|@W3Aykgm-oLH^9hLljGX+SPc@(YiQ^X(iYKUs_w||21$V?!E9Urg58qpmpZxObjgb>roi+{{U=J BS$_Zk literal 0 HcmV?d00001 diff --git a/util/update.js b/util/update.js new file mode 100644 index 0000000..f2201eb --- /dev/null +++ b/util/update.js @@ -0,0 +1,232 @@ + +// 匹配第一个出现的数字版本号 +function extractVersionNum(str) { + const match = str.match(/(\d+\.\d+(?:\.\d+)?)/); + return match ? match[1] : '0.0.0'; +} + +function compareVersion(v1, v2) { + v1 = extractVersionNum(v1).split('.').map(Number); + v2 = extractVersionNum(v2).split('.').map(Number); + for (let i = 0; i < Math.max(v1.length, v2.length); i++) { + const n1 = v1[i] || 0; + const n2 = v2[i] || 0; + if (n1 > n2) return 1; + if (n1 < n2) return -1; + } + return 0; +} + +function clearIgnoredVersion() { + uni.removeStorageSync('ignoredVersion'); + console.log('已清除忽略的版本设置'); +} + +function getIgnoredVersion() { + return uni.getStorageSync('ignoredVersion'); +} + +function setIgnoredVersion(version) { + uni.setStorageSync('ignoredVersion', version); + console.log('已设置忽略版本:', version); +} + +function checkVersionCompatibility(wgtVersion, baseVersion) { + console.log('检查版本兼容性:', { wgtVersion, baseVersion }); + const wgtMajor = extractVersionNum(wgtVersion).split('.')[0]; + const baseMajor = extractVersionNum(baseVersion).split('.')[0]; + if (wgtMajor !== baseMajor) { + console.warn('主版本号不匹配:', { wgtMajor, baseMajor }); + return false; + } + if (compareVersion(wgtVersion, baseVersion) <= 0) { + console.warn('wgt版本不高于基座版本'); + return false; + } + return true; +} + +function checkStorageSpace() { + return new Promise((resolve, reject) => { + // #ifdef APP-PLUS + if (typeof plus !== 'undefined' && plus.io) { + plus.io.requestFileSystem(plus.io.PRIVATE_DOC, (fs) => { + fs.root.getDirectory('temp', { create: true }, (dir) => { + resolve(true); + }, (error) => { + console.error('检查存储空间失败:', error); + reject(error); + }); + }); + } else { + resolve(true); + } + // #endif + // #ifndef APP-PLUS + resolve(true); + // #endif + }); +} + +function checkUpdate(forceCheck = false) { + const localVersion = plus.runtime.version; + const localWgtVersion = uni.getStorageSync('wgtVersion') || localVersion; + uni.request({ + url: 'http://47.117.71.33:11295/fadapp-update/version.json?t=' + Date.now(), + success: (res) => { + const remoteVersion = res.data.version; + const wgtUrl = res.data.wgtUrl; + const currentVersion = compareVersion(localWgtVersion, localVersion) > 0 ? localWgtVersion : localVersion; + console.log('本地基座版本:', localVersion, '本地wgt版本:', localWgtVersion, '当前对比版本:', currentVersion, '远程版本:', remoteVersion); + if (compareVersion(remoteVersion, currentVersion) > 0) { + if (!checkVersionCompatibility(remoteVersion, localVersion)) { + console.warn('版本不兼容，跳转到浏览器下载新版安装包'); + uni.showModal({ + title: '版本不兼容', + content: `新版本 ${remoteVersion} 与当前基座版本 ${localVersion} 不兼容，请前往官网下载最新安装包。`, + showCancel: true, + confirmText: '去下载', + cancelText: '取消', + success: (res) => { + if (res.confirm) { + const downloadUrl = `http://47.117.71.33:11295/fadapp-update/fad${remoteVersion}.apk`; + // #ifdef APP-PLUS + plus.runtime.openURL(downloadUrl); + // #endif + // #ifndef APP-PLUS + window.open(downloadUrl, '_blank'); + // #endif + } + } + }); + return; + } + const ignoredVersion = uni.getStorageSync('ignoredVersion'); + if (!forceCheck && ignoredVersion === remoteVersion) { + console.log('用户已选择忽略此版本:', remoteVersion); + return; + } + uni.showModal({ + title: '发现新版本', + content: `检测到新版本（${remoteVersion}），是否立即下载并更新？`, + confirmText: '立即更新', + cancelText: '暂不更新', + showCancel: true, + success: (modalRes) => { + if (modalRes.confirm) { + checkStorageSpace().then(() => { + uni.showLoading({title: '正在下载更新包...'}); + console.log('开始下载wgt包:', wgtUrl); + uni.downloadFile({ + url: wgtUrl, + success: (downloadResult) => { + uni.hideLoading(); + console.log('下载结果:', downloadResult); + if (downloadResult.statusCode === 200) { + console.log('开始安装wgt包:', downloadResult.tempFilePath); + plus.io.resolveLocalFileSystemURL(downloadResult.tempFilePath, (entry) => { + console.log('文件存在，开始安装'); + plus.runtime.install(downloadResult.tempFilePath, {force: true}, function() { + console.log('wgt包安装成功'); + uni.setStorageSync('wgtVersion', remoteVersion); + uni.showModal({ + title: '更新完成', + content: '应用需要重启才能生效，是否立即重启？', + success: function (res) { + if (res.confirm) { + plus.runtime.restart(); + } + } + }); + }, function(e) { + console.error('wgt包安装失败:', e); + let errorMsg = '安装失败'; + if (e && e.message) { + errorMsg += ': ' + e.message; + } + if (e && e.code) { + errorMsg += ' (错误代码: ' + e.code + ')'; + } + uni.showModal({ + title: '安装失败', + content: errorMsg + '\n\n可能的原因：\n1. 版本不兼容\n2. 文件损坏\n3. 权限不足\n4. 存储空间不足', + showCancel: false, + confirmText: '确定' + }); + }); + }, (error) => { + console.error('文件不存在:', error); + uni.showModal({ + title: '安装失败', + content: '下载的文件不存在或已损坏', + showCancel: false, + confirmText: '确定' + }); + }); + } else { + console.error('下载失败，状态码:', downloadResult.statusCode); + uni.showModal({ + title: '下载失败', + content: `服务器返回错误，状态码: ${downloadResult.statusCode}`, + showCancel: false, + confirmText: '确定' + }); + } + }, + fail: (error) => { + uni.hideLoading(); + console.error('下载失败:', error); + uni.showModal({ + title: '下载失败', + content: '网络连接异常，请检查网络后重试', + showCancel: false, + confirmText: '确定' + }); + } + }); + }).catch((error) => { + console.error('存储空间检查失败:', error); + uni.showModal({ + title: '存储空间不足', + content: '设备存储空间不足，无法下载更新包', + showCancel: false, + confirmText: '确定' + }); + }); + } else { + uni.showModal({ + title: '忽略更新', + content: `是否忽略版本 ${remoteVersion}？忽略后下次启动时将不再提示此版本更新。`, + confirmText: '忽略此版本', + cancelText: '下次提醒', + success: (ignoreRes) => { + if (ignoreRes.confirm) { + uni.setStorageSync('ignoredVersion', remoteVersion); + uni.showToast({title: '已忽略此版本更新'}); + } + } + }); + } + } + }); + } else { + console.log('当前已是最新版本'); + } + }, + fail: (error) => { + console.error('检查更新失败:', error); + uni.showToast({title: '网络异常，请稍后重试'}); + } + }); +} + +export default { + checkUpdate, + clearIgnoredVersion, + getIgnoredVersion, + setIgnoredVersion, + checkVersionCompatibility, + checkStorageSpace, + compareVersion, + extractVersionNum +}; diff --git a/version.md b/version.md new file mode 100644 index 0000000..6e997dd --- /dev/null +++ b/version.md @@ -0,0 +1,5 @@ +## 4.5.1 ++ 开始记录版本 ++ 增加版本不兼容时可以从浏览器下载安装包的功能 ++ 优化部分页面功能 ++ 增加线上销售页面 \ No newline at end of file