From efb1b7dd9e79111b435cb0815483f2c4ad9f0bb7 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Mon, 28 Aug 2023 18:24:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 34 +- components/task/taskItem.vue | 4 +- main.js | 1 + pages.json | 640 +++++++++--------- pages/moreFun/moreFun.vue | 67 ++ pages/oaHome/oaHome.vue | 41 +- pages/oaLogin/oaLogin.vue | 2 +- pages/oaMy/oaMy.vue | 29 +- .../updatePassword.vue} | 0 static/server/server.js | 62 +- subpkg/contract/contract.vue | 7 +- subpkg/otherTask/otherTask.vue | 74 ++ subpkg/topUp/topUp.vue | 2 +- 13 files changed, 564 insertions(+), 399 deletions(-) create mode 100644 pages/moreFun/moreFun.vue rename pages/{updatePasswprd/updatePasswprd.vue => updatePassword/updatePassword.vue} (100%) create mode 100644 subpkg/otherTask/otherTask.vue diff --git a/App.vue b/App.vue index 640bc25..0f1d128 100644 --- a/App.vue +++ b/App.vue @@ -7,15 +7,15 @@ onLaunch: async function() { console.log('App Launch') this.$store.dispatch('initConfig'); - try { - if (!this.$store.state.app.token) uni.redirectTo({ - url: '/pages/oaLogin/oaLogin' - }) - } catch (e) { - uni.redirectTo({ - url: '/pages/oaLogin/oaLogin' - }) - } + try { + if (!this.$store.state.app.token) uni.reLaunch({ + url: '/pages/oaLogin/oaLogin' + }) + } catch (e) { + uni.reLaunch({ + url: '/pages/oaLogin/oaLogin' + }) + } }, onShow: function() { const audioContext = uni.createInnerAudioContext() @@ -38,14 +38,14 @@ } }) // 版本更新 - // Updater.update({ - // title: '发现新版本', - // content: '1. 我们更新了新的UI设计\n2. 我们更新了新的UI设计\n3. 我们更新了新的UI设计\n4. 我们更新了新的UI设计\n', - // versionName: '1.3.6', - // downUrl: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/__UNI__B5B1EDD__20230816174515.apk', - // force: false, // 是否强制更新 - // quiet: true // 是否静默更新 - // }) + Updater.update({ + title: '发现新版本', + content: '1. 我们更新了新的UI设计\n2. 我们更新了新的UI设计\n3. 我们更新了新的UI设计\n4. 我们更新了新的UI设计\n', + versionName: '1.3.6', + downUrl: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/__UNI__B5B1EDD__20230816174515.apk', + force: false, // 是否强制更新 + quiet: false // 是否静默更新 + }) // #endif console.log('App Show') }, diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue index 8607430..3cf4f85 100644 --- a/components/task/taskItem.vue +++ b/components/task/taskItem.vue @@ -149,7 +149,9 @@ this.navTo(`/subpkg/property/vehicle?task_id=${this.$props.datas?.id}`) } else if(this.$props.datas.type == 33){ this.navTo(`/subpkg/blockTransaction/blockTransaction?task_id=${this.$props.datas?.id}`) - } else if(this.$props.datas.type == 35){ + }else if(this.$props.datas.type == 34){ + this.navTo(`/subpkg/otherTask/otherTask?task_id=${this.$props.datas?.id}`) + }else if(this.$props.datas.type == 35){ this.navTo(`/subpkg/buyShare/buyShare?task_id=${this.$props.datas?.id}`) } else this.navTo(''); diff --git a/main.js b/main.js index 87658df..9f7ad40 100644 --- a/main.js +++ b/main.js @@ -15,6 +15,7 @@ Vue.use(company) // initRouter() + // #ifndef VUE3 import Vue from 'vue' Vue.config.productionTip = false diff --git a/pages.json b/pages.json index b00445a..f7d0c08 100644 --- a/pages.json +++ b/pages.json @@ -134,7 +134,7 @@ } }, { - "path": "pages/updatePasswprd/updatePasswprd", + "path": "pages/updatePassword/updatePassword", "style": { "navigationBarTitleText": "修改密码", "enablePullDownRefresh": false, @@ -159,6 +159,15 @@ "disableScroll": true, "navigationStyle": "custom" } + }, { + "path": "pages/moreFun/moreFun", + "style": { + "navigationBarTitleText": "更多功能", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + } ], "subPackages": [{ @@ -229,333 +238,340 @@ "root": "subpkg", "name": "subpkg", "pages": [{ - "path": "personnel/personnel", - "style": { - "navigationBarTitleText": "人员管理", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + "path": "personnel/personnel", + "style": { + "navigationBarTitleText": "人员管理", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "finance/finance", - "style": { - "navigationBarTitleText": "财务管理", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "finance/finance", + "style": { + "navigationBarTitleText": "财务管理", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "topUp/topUp", - "style": { - "navigationBarTitleText": "账户充值", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white", - "app-plus": { - "titleNView": { - "buttons": [{ - "color": "#fff", - "text": "充值记录", - "fontSize": "15", - "width": "90" - }] - } + }, { + "path": "topUp/topUp", + "style": { + "navigationBarTitleText": "账户充值", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white", + "app-plus": { + "titleNView": { + "buttons": [{ + "color": "#fff", + "text": "充值记录", + "fontSize": "15", + "width": "90" + }] } } + } - }, { - "path": "contract/contract", - "style": { - "navigationBarTitleText": "合同管理", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0022C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "contract/contract", + "style": { + "navigationBarTitleText": "合同管理", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0022C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "contractDetail/contractDetail", - "style": { - "navigationBarTitleText": "合同详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "contractDetail/contractDetail", + "style": { + "navigationBarTitleText": "合同详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "pdfView/pdfView", - "style": { - "navigationBarTitleText": "合同内容", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "pdfView/pdfView", + "style": { + "navigationBarTitleText": "合同内容", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "companyInfo/companyInfo", - "style": { - "navigationBarTitleText": "公司信息", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "companyInfo/companyInfo", + "style": { + "navigationBarTitleText": "公司信息", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "companySign/companySign", - "style": { - "navigationBarTitleText": "签约公司详情", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "companySign/companySign", + "style": { + "navigationBarTitleText": "签约公司详情", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "personnelDetails/personnelDetails", - "style": { - "navigationBarTitleText": "人员详细信息", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "personnelDetails/personnelDetails", + "style": { + "navigationBarTitleText": "人员详细信息", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "orderDetail/orderDetail", - "style": { - "navigationBarTitleText": "流水详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } + }, { + "path": "orderDetail/orderDetail", + "style": { + "navigationBarTitleText": "流水详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } - }, { - "path": "withdrawDeposit/withdrawDeposit", - "style": { - "navigationBarTitleText": "提现余额", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white", - "app-plus": { - "titleNView": { - "buttons": [{ - "color": "#fff", - "text": "提现记录", - "fontSize": "15", - "width": "90" - }] - } + }, { + "path": "withdrawDeposit/withdrawDeposit", + "style": { + "navigationBarTitleText": "提现余额", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white", + "app-plus": { + "titleNView": { + "buttons": [{ + "color": "#fff", + "text": "提现记录", + "fontSize": "15", + "width": "90" + }] } } - }, { - "path": "withdrawList/withdrawList", - "style": { - "navigationBarTitleText": "提现记录", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - - }, { - "path": "noticeList/noticeList", - "style": { - "navigationBarTitleText": "公告列表", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - - }, { - "path": "topUpList/topUpList", - "style": { - "navigationBarTitleText": "充值记录", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - - }, { - "path": "companyAdmin/companyAdmin", - "style": { - "navigationBarTitleText": "公司管理", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - - }, { - "path": "newPersonnel/newPersonnel", - "style": { - "navigationBarTitleText": "新增人员", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - - }, { - "path": "archives/archives", - "style": { - "navigationBarTitleText": "档案管理", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - - }, { - "path": "newArchives/newArchives", - "style": { - "navigationBarTitleText": "信息登记", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - - }, { - "path": "updateArchives/updateArchives", - "style": { - "navigationBarTitleText": "信息更新", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - - }, { - "path": "fixedAssets/fixedAssets", - "style": { - "navigationBarTitleText": "固定资产", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - - }, { - "path": "taskAdmin/taskAdmin", - "style": { - "navigationBarTitleText": "任务管理", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - - }, { - "path": "archivesDetail/archivesDetail", - "style": { - "navigationBarTitleText": "档案详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - - }, { - "path": "captain/captain", - "style": { - "navigationBarTitleText": "队长列表", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - - }, { - "path": "companyFinance/companyFinance", - "style": { - "navigationBarTitleText": "公司财务", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - - }, { - "path": "companyUnsign/companyUnsign", - "style": { - "navigationBarTitleText": "未签约公司列表", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - - }, { - "path": "submit/submit", - "style": { - "navigationBarTitleText": "提交审核", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - - }, { - "path": "dispatching/dispatching", - "style": { - "navigationBarTitleText": "任务:宣传配送", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - - }, { - "path": "blockTransaction/blockTransaction", - "style": { - "navigationBarTitleText": "任务:片区交易", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - - }, { - "path": "fileTask/fileTask", - "style": { - "navigationBarTitleText": "已更新商机", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - - }, { - "path": "property/index", - "style": { - "navigationBarTitleText": "资产管理", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - - }, { - "path": "property/chosseCompany", - "style": { - "navigationBarTitleText": "选择公司", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - - }, { - "path": "property/vehicle", - "style": { - "navigationBarTitleText": "三轮车游走", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - - }, { - "path": "property/vehicle_a", - "style": { - "navigationBarTitleText": "三轮车详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - } - , { - "path": "buyShare/buyShare", - "style": { - "navigationBarTitleText": "任务:入股任务", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#0122C7", - "navigationBarTextStyle": "white" - } - + }, { + "path": "withdrawList/withdrawList", + "style": { + "navigationBarTitleText": "提现记录", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" } - ] + + }, { + "path": "noticeList/noticeList", + "style": { + "navigationBarTitleText": "公告列表", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "topUpList/topUpList", + "style": { + "navigationBarTitleText": "充值记录", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "companyAdmin/companyAdmin", + "style": { + "navigationBarTitleText": "公司管理", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "newPersonnel/newPersonnel", + "style": { + "navigationBarTitleText": "新增人员", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "archives/archives", + "style": { + "navigationBarTitleText": "档案管理", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "newArchives/newArchives", + "style": { + "navigationBarTitleText": "信息登记", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "updateArchives/updateArchives", + "style": { + "navigationBarTitleText": "信息更新", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "fixedAssets/fixedAssets", + "style": { + "navigationBarTitleText": "固定资产", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "taskAdmin/taskAdmin", + "style": { + "navigationBarTitleText": "任务管理", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "archivesDetail/archivesDetail", + "style": { + "navigationBarTitleText": "档案详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "captain/captain", + "style": { + "navigationBarTitleText": "队长列表", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "companyFinance/companyFinance", + "style": { + "navigationBarTitleText": "公司财务", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "companyUnsign/companyUnsign", + "style": { + "navigationBarTitleText": "未签约公司列表", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "submit/submit", + "style": { + "navigationBarTitleText": "提交审核", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "dispatching/dispatching", + "style": { + "navigationBarTitleText": "任务:宣传配送", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "blockTransaction/blockTransaction", + "style": { + "navigationBarTitleText": "任务:片区交易", + "enablePullDownRefresh": true, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "fileTask/fileTask", + "style": { + "navigationBarTitleText": "已更新商机", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "property/index", + "style": { + "navigationBarTitleText": "资产管理", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "property/chosseCompany", + "style": { + "navigationBarTitleText": "选择公司", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "property/vehicle", + "style": { + "navigationBarTitleText": "三轮车游走", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "property/vehicle_a", + "style": { + "navigationBarTitleText": "三轮车详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "buyShare/buyShare", + "style": { + "navigationBarTitleText": "任务:入股任务", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }, { + "path": "otherTask/otherTask", + "style": { + "navigationBarTitleText": "任务:其他任务", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#0122C7", + "navigationBarTextStyle": "white" + } + + }] }], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/moreFun/moreFun.vue b/pages/moreFun/moreFun.vue new file mode 100644 index 0000000..e714254 --- /dev/null +++ b/pages/moreFun/moreFun.vue @@ -0,0 +1,67 @@ + + + + + diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index d23d38b..c85f88f 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -95,8 +95,8 @@ - - + + - {{ item.text }} + {{ item.name }} @@ -217,7 +217,7 @@ export default { is_captain: 0, notArr: [], orderList: [], - oaHomeData: [], + // oaHomeData: [], src: "https://cdn.uviewui.com/uview/album/1.jpg", assessData: [{ num: "0", @@ -256,7 +256,6 @@ export default { this.is_captain = JSON.parse(uni.getStorageSync("USER_INFO")).is_captain this.options.data = bj; //#ifdef APP-PLUS - let that = this; jpushModule.addNotificationListener(function (result) { if (!that.notArr.includes(result.messageID)) { @@ -275,26 +274,30 @@ export default { this.getApproveList(); this.initUserInfo(); this.showToask(); - this.initOaHomeDada(); + // this.initOaHomeDada(); this.getOrderList(); }, - computed: {}, + computed: { + oaHomeData(){ + const route = getCurrentPages()[0]?.route; + let arr = []; + this.$store.state.config?.config?.menu?.forEach((item)=>{ + if(item.paths.includes(route)){ + arr=item.children; + } + }) + if(arr.length>=8){ + arr = arr.slice(0, 7); + let obj = this.$store.state.config?.config?.menu?.find(item=>item.paths.includes('/pages/moreFun/moreFun')); + arr.push(obj); + } + return arr; + } + }, methods: { test () { this.$refs.globalPopup.showPopu(); }, - // test() { - // wx.chooseMessageFile({ - // count: 1, //限制选择的文件数量 - // type: 'all', //非图片和视频的文件,不选默认为all - // //type:'video',//视频 - // //type:'image',//图片 - // success(res) { - // const tempFilePaths = res.tempFiles - // console.log(res); - // } - // }) - // }, async getOrderList () { console.log("列表") let id = JSON.parse(uni.getStorageSync("USER_INFO")).id || ""; diff --git a/pages/oaLogin/oaLogin.vue b/pages/oaLogin/oaLogin.vue index f894c66..a10dc62 100644 --- a/pages/oaLogin/oaLogin.vue +++ b/pages/oaLogin/oaLogin.vue @@ -132,7 +132,7 @@ } }) } else uni.navigateTo({ - url: '/pages/updatePasswprd/updatePasswprd' + url: '/pages/updatePassword/updatePassword' }); }, initTerminal() { diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue index ef5f039..d8ee1cc 100644 --- a/pages/oaMy/oaMy.vue +++ b/pages/oaMy/oaMy.vue @@ -49,7 +49,7 @@ - + @@ -95,7 +95,7 @@ options: { data: '', }, - myOaData: myOaData, + // myOaData: [], src: 'https://cdn.uviewui.com/uview/album/1.jpg', modelShow: false } @@ -122,7 +122,17 @@ } } }; - } + }, + myOaData(){ + const route = getCurrentPages()[0]?.route; + let arr = []; + this.$store.state.config?.config?.menu?.forEach((item)=>{ + if(item.paths.includes(route)){ + arr=item.children; + } + }) + return arr; + } }, watch:{ modelShow: function(n,o){ @@ -167,16 +177,9 @@ success() { uni.hideLoading() }, - fail () { - uni.switchTab({ - url: url, - success() { - uni.hideLoading() - }, - fail() { - uni.hideLoading() - } - }); + fail (e) { + uni.hideLoading() + console.log(e); }, }) }else Toast('暂未开放') diff --git a/pages/updatePasswprd/updatePasswprd.vue b/pages/updatePassword/updatePassword.vue similarity index 100% rename from pages/updatePasswprd/updatePasswprd.vue rename to pages/updatePassword/updatePassword.vue diff --git a/static/server/server.js b/static/server/server.js index 5cf4fca..282381e 100644 --- a/static/server/server.js +++ b/static/server/server.js @@ -188,96 +188,96 @@ export const quickLink = [{ // oaHOme快速入口数据 export const oaHomeData = [{ - text: '公司信息', + name: '公司信息', icon: '../../static/img/home/GSXX.png', - url: '/subpkg/companyInfo/companyInfo', + paths: '/subpkg/companyInfo/companyInfo', admin: true }, { - text: '人员管理', + name: '人员管理', icon: '../../static/img/home/RYGL.png', - url: '/subpkg/personnel/personnel', + paths: '/subpkg/personnel/personnel', admin: true }, { - text: '固定资产', + name: '固定资产', icon: '../../static/img/home/GDZC.png', - url: '/subpkg/property/index', + paths: '/subpkg/property/index', admin: true }, { - text: '合同管理', + name: '合同管理', icon: '../../static/img/home/HTGL.png', - url: '/subpkg/contract/contract' + paths: '/subpkg/contract/contract' }, // { - // text: '公司管理', + // name: '公司管理', // icon: '../../static/img/home/GSXX.png', - // url: '/subpkg/companyAdmin/companyAdmin', + // paths: '/subpkg/companyAdmin/companyAdmin', // admin: true // }, { - text: '任务管理', + name: '任务管理', icon: '../../static/img/home/RWGL.png', - url: '/subpkg/taskAdmin/taskAdmin', + paths: '/subpkg/taskAdmin/taskAdmin', }, { - text: '档案管理', + name: '档案管理', icon: '../../static/img/home/DAGL.png', - url: '/subpkg/captain/captain', + paths: '/subpkg/captain/captain', admin: true }, { - text: '档案管理', + name: '档案管理', icon: '../../static/img/home/DAGL.png', - url: '/subpkg/archives/archives', + paths: '/subpkg/archives/archives', captain: true }, // { - // text: '片区经理', + // name: '片区经理', // icon: '../../static/img/home/GRCW.png', - // url: '/pages/oaManager/oaManager', + // paths: '/pages/oaManager/oaManager', // admin: true // }, { - text: '个人财务', + name: '个人财务', icon: '../../static/img/home/GRCW.png', - url: '/subpkg/finance/finance' + paths: '/subpkg/finance/finance' }, { - text: '待取驿站', + name: '待取驿站', icon: '../../static/img/home/YZ.png', - url: '/pages/logistics/post', + paths: '/pages/logistics/post', // captain: true }, // { - // text: '出差申请', + // name: '出差申请', // icon: prefix + 'oa/ccsq@2x.png' // }, // { - // text: '外出申请', + // name: '外出申请', // icon: prefix + 'oa/wcsq@2x.png' // }, // { - // text: '采购申请', + // name: '采购申请', // icon: prefix + 'oa/cgsq@2x.png' // }, // { - // text: '物品维修', + // name: '物品维修', // icon: prefix + 'oa/bxsq@2x.png' // }, // { - // text: '用章申请', + // name: '用章申请', // icon: prefix + 'oa/yzsq@2x.png' // }, // { - // text: '报销申请', + // name: '报销申请', // icon: prefix + 'oa/gengduo@2x.png' // }, { - text: '更多', + name: '更多', icon: prefix + 'oa/wpwx@2x.png', - url: '/pages/views/application' + paths: '/pages/views/application' } ] @@ -396,7 +396,7 @@ export const myOaData = [ { name: '安全设置', icon: '../../static/icons/setting.png', - url: '/pages/updatePasswprd/updatePasswprd' + url: '/pages/updatePassword/updatePassword' }, // { // name: '管理后台', diff --git a/subpkg/contract/contract.vue b/subpkg/contract/contract.vue index 25fbd3f..340c46d 100644 --- a/subpkg/contract/contract.vue +++ b/subpkg/contract/contract.vue @@ -10,10 +10,9 @@ --> - + - + 电子合同 @@ -250,7 +249,7 @@ .personnel_list { padding: 28rpx 0; - margin-bottom: 130rpx; + // margin-bottom: 130rpx; .cards { margin: 0 auto; diff --git a/subpkg/otherTask/otherTask.vue b/subpkg/otherTask/otherTask.vue new file mode 100644 index 0000000..2560bd9 --- /dev/null +++ b/subpkg/otherTask/otherTask.vue @@ -0,0 +1,74 @@ + + + + + \ No newline at end of file diff --git a/subpkg/topUp/topUp.vue b/subpkg/topUp/topUp.vue index 2d00eb7..da6a8aa 100644 --- a/subpkg/topUp/topUp.vue +++ b/subpkg/topUp/topUp.vue @@ -13,7 +13,7 @@ 充值金额 - {{3000}} + 3000元 {{item}}