diff --git a/main.js b/main.js index 52dbb93..dd738d2 100644 --- a/main.js +++ b/main.js @@ -3,8 +3,10 @@ import store from './store' import uView from '@/uni_modules/uview-ui' import taskCard from "@/components/taskCard/taskCard.vue" +import company from "@/components/company/company.vue" Vue.use(uView) Vue.use(taskCard) +Vue.use(company) // #ifndef VUE3 import Vue from 'vue' Vue.config.productionTip = false diff --git a/manifest.json b/manifest.json index 391d1c6..d2175d6 100644 --- a/manifest.json +++ b/manifest.json @@ -25,6 +25,7 @@ /* android打包配置 */ "android" : { "permissions" : [ + "", "", "", "", diff --git a/pages.json b/pages.json index e3f705b..1bef6fb 100644 --- a/pages.json +++ b/pages.json @@ -170,6 +170,24 @@ "enablePullDownRefresh": false } + } + ,{ + "path" : "companyInfo/companyInfo", + "style" : + { + "navigationBarTitleText": "公司信息", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "companySign/companySign", + "style" : + { + "navigationBarTitleText": "签约公司详情", + "enablePullDownRefresh": false + } + } ] }], diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index 80baabc..e18b049 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -5,10 +5,11 @@ + - + {{ myOaInfo.nickname }} {{ myOaInfo.mobile }} @@ -112,11 +113,11 @@ oaHomeData: oaHomeData, src: 'https://cdn.uviewui.com/uview/album/1.jpg', assessData: [{ - num: '8', - name: '岗位任务' + num: '0', + name: '任务' }, { - num: '8', + num: '0', name: '已完成' }, { @@ -124,7 +125,7 @@ name: '未完成' }, { - num: '100%', + num: '0%', name: '完成率' }, ], diff --git a/pages/oaManager/oaManager.vue b/pages/oaManager/oaManager.vue index 4c8203c..820c625 100644 --- a/pages/oaManager/oaManager.vue +++ b/pages/oaManager/oaManager.vue @@ -9,7 +9,8 @@ - + + 拨打电话 @@ -59,33 +60,60 @@ + \ No newline at end of file diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue index dacc860..af68491 100644 --- a/pages/oaMy/oaMy.vue +++ b/pages/oaMy/oaMy.vue @@ -4,8 +4,9 @@ + - + 产品技术部 去登陆 @@ -35,17 +36,16 @@ - 1000 + {{oaUserInfo.user_money||'0.00'}} 可提现金额 - - - 0 + - 0 + 0.00 充值金额 @@ -63,7 +63,8 @@ - 退出登录 + 退出登录 + 去登录 @@ -99,11 +100,9 @@ methods: { ...mapActions(['getWxLogin']), login() { - // #ifndef H5 || APP - // #endif - // #ifdef MP-WEIXIN || MP - this.getWxLogin() - // #endif + uni.navigateTo({ + url:'/pages/oaLogin/oaLogin' + }) }, logout(){ let that = this; @@ -185,7 +184,7 @@ .personage { // position: relative; - padding: 42.11rpx 28.07rpx 28.07rpx 28.07rpx; + padding: 42.11rpx 0 28.07rpx 0; border-radius: 12px; // background-color: #fff; color: #fff; @@ -223,6 +222,7 @@ height: 170.18rpx; border-radius: 12px; background-color: rgba(#fff, 0.18); + justify-content: space-around; .cent_item { font-size: 24.56rpx; diff --git a/static/server/server.js b/static/server/server.js index d700c35..d526d9b 100644 --- a/static/server/server.js +++ b/static/server/server.js @@ -191,7 +191,7 @@ export const oaHomeData = [ { text: '公司信息', icon: prefix + 'oa/qjsq@2x.png', - // url: '/pages/views/leave_request' + url: '/subpkg/companyInfo/companyInfo' }, { text: '人员管理', diff --git a/subpkg/contract/contract.vue b/subpkg/contract/contract.vue index 588123f..d42ff58 100644 --- a/subpkg/contract/contract.vue +++ b/subpkg/contract/contract.vue @@ -49,6 +49,12 @@ onShow() { this.initContractList() }, + onReady() { + uni.setNavigationBarColor({ + frontColor: '#ffffff', + backgroundColor: '#3175f9' + }) + }, methods: { naviTo(url) { url ? diff --git a/subpkg/contractDetail/contractDetail.vue b/subpkg/contractDetail/contractDetail.vue index fe312d6..7fb71ca 100644 --- a/subpkg/contractDetail/contractDetail.vue +++ b/subpkg/contractDetail/contractDetail.vue @@ -1,87 +1,6 @@