diff --git a/api/company.js b/api/company.js new file mode 100644 index 0000000..5a9972b --- /dev/null +++ b/api/company.js @@ -0,0 +1,16 @@ +import oahttp from "@/utils/oahttp.js"; + +/** + * 我的公司 + */ +export const companyMine = (data) => oahttp.get('/company/mine', data) + +/** + * 公司列表 + */ +export const companyIndex = (data) => oahttp.get('/company/index', data) + +/** + * 公司详情 + */ +export const companyView = (data) => oahttp.get('/company/view', data) diff --git a/api/pay.js b/api/pay.js index 42eebc0..c94a661 100644 --- a/api/pay.js +++ b/api/pay.js @@ -24,3 +24,8 @@ export const wechatJsConfig = (data) => oahttp.get('/wechat/jsConfig', data) * 支付状态 */ export const payStatus = (data) => oahttp.get('/pay/payStatus', data) + +/** + * 充值记录 + */ +export const rechargeLists = (data) => oahttp.get('/recharge/lists', data) \ No newline at end of file diff --git a/components/company/company.vue b/components/company/company.vue new file mode 100644 index 0000000..a83c9de --- /dev/null +++ b/components/company/company.vue @@ -0,0 +1,358 @@ + + + + + \ No newline at end of file diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue index 03f6c60..f2b30a9 100644 --- a/pages/oaMy/oaMy.vue +++ b/pages/oaMy/oaMy.vue @@ -36,7 +36,8 @@ - {{oaUserInfo.user_money||'0.00'}} + {{oaUserInfo.user_money||'0.00'}} + **** 账户余额(元) - 0.00 + {{oaUserInfo.income||'0.00'}} + **** 收益金额(元) @@ -97,6 +99,11 @@ this.getOaUserInfo() }, onShow() {}, + computed:{ + eyeType(){ + return this.$store.state.config.eyeType; + } + }, methods: { ...mapActions(['getWxLogin']), login() { diff --git a/static/img/contract/company.png b/static/img/contract/company.png new file mode 100644 index 0000000..ede278d Binary files /dev/null and b/static/img/contract/company.png differ diff --git a/static/img/contract/pdf.png b/static/img/contract/pdf.png new file mode 100644 index 0000000..3618887 Binary files /dev/null and b/static/img/contract/pdf.png differ diff --git a/static/server/server.js b/static/server/server.js index d526d9b..0e4e20c 100644 --- a/static/server/server.js +++ b/static/server/server.js @@ -203,7 +203,7 @@ export const oaHomeData = [ icon: prefix + 'oa/wcsq@2x.png' }, { - text: '合同签订', + text: '合同管理', icon: prefix + 'oa/cgsq@2x.png', url: '/subpkg/contract/contract' }, @@ -217,7 +217,8 @@ export const oaHomeData = [ }, { text: '财务管理', - icon: prefix + 'oa/gengduo@2x.png' + icon: prefix + 'oa/gengduo@2x.png', + url: '/subpkg/finance/finance' }, // { // text: 'gong', diff --git a/store/getters.js b/store/getters.js index d6106c3..ab80a0f 100644 --- a/store/getters.js +++ b/store/getters.js @@ -2,6 +2,7 @@ export default { token: state => state.app.token, isLogin: state => !!state.app.token, userInfo: state => state.app.userInfo || {}, + eyeType: state => state.config.eyeType || true, }; // export default { // token: state => 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJrYWlmYS5jcm1lYi5uZXQiLCJhdWQiOiJrYWlmYS5jcm1lYi5uZXQiLCJpYXQiOjE1NzcwODM1MzQsIm5iZiI6MTU3NzA4MzUzNCwiZXhwIjoxNTc3MDk0MzM0LCJqdGkiOnsiaWQiOjExMCwidHlwZSI6InVzZXIifX0.U-i1pbdRjyXI1gr79Uq2XBPZ89T8f5Ai9jwrR8woTwE', diff --git a/store/modules/config.js b/store/modules/config.js new file mode 100644 index 0000000..a95be6d --- /dev/null +++ b/store/modules/config.js @@ -0,0 +1,21 @@ +import Cache from '@/utils/cache'; +const state = { + eyeType: Cache.get('eyeType') || true, +}; + +const mutations = { + SET_EYE_TYPE(state){ + state.eyeType=!state.eyeType; + Cache.set('eyeType', state.eyeType); + } +}; + +const actions = { + +}; + +export default { + state, + mutations, + actions +}; diff --git a/store/modules/index.js b/store/modules/index.js index 1c3a43a..1963883 100644 --- a/store/modules/index.js +++ b/store/modules/index.js @@ -8,6 +8,8 @@ // | Author: CRMEB Team // +---------------------------------------------------------------------- import app from "./app"; +import config from "./config" export default { - app + app, + config }; diff --git a/subpkg/companyInfo/companyInfo.vue b/subpkg/companyInfo/companyInfo.vue new file mode 100644 index 0000000..7ade5c4 --- /dev/null +++ b/subpkg/companyInfo/companyInfo.vue @@ -0,0 +1,176 @@ + + + + + \ No newline at end of file diff --git a/subpkg/companySign/companySign.vue b/subpkg/companySign/companySign.vue new file mode 100644 index 0000000..f6e6010 --- /dev/null +++ b/subpkg/companySign/companySign.vue @@ -0,0 +1,33 @@ + + + + + diff --git a/subpkg/finance/finance.vue b/subpkg/finance/finance.vue index ce77ef8..5f09432 100644 --- a/subpkg/finance/finance.vue +++ b/subpkg/finance/finance.vue @@ -13,23 +13,27 @@ - 账户总金额(元) + 账户总金额(元) - {{userInfo.user_money||0.00}}元 + {{userInfo.user_money||0.00}}元 + ****元 - 可提现金额0.00元 + 可提现金额{{userInfo.user_money||0.00}}元 + 可提现金额****元 账户余额(元) - 0.00 + {{userInfo.user_money||0.00}} + **** 收益金额(元) - 0.00 + {{userInfo.income||0.00}} + **** @@ -38,8 +42,8 @@ - 日账单 - 月账单 + 日账单 + 月账单 @@ -58,6 +62,7 @@ + @@ -69,7 +74,7 @@ export default { return { userInfo:{}, billTypeList:['日账单','月账单'], - current: 0 + current: 0, } }, onLoad() { @@ -81,6 +86,11 @@ export default { }) }, onShow() {}, + computed:{ + eyeType(){ + return this.$store.state.config.eyeType; + } + }, methods: { naviTo(url) { url ? @@ -88,6 +98,12 @@ export default { url: url }) : Toast('暂未开放') }, + updateEye(){ + this.$store.commit('SET_EYE_TYPE') + }, + changeBillType(type){ + this.current = type; + } }, onPullDownRefresh() { uni.stopPullDownRefresh() diff --git a/uni_modules/uni-section/changelog.md b/uni_modules/uni-section/changelog.md new file mode 100644 index 0000000..738f2b3 --- /dev/null +++ b/uni_modules/uni-section/changelog.md @@ -0,0 +1,2 @@ +## 0.0.1(2022-07-22) +- 初始化 diff --git a/uni_modules/uni-section/components/uni-section/uni-section.vue b/uni_modules/uni-section/components/uni-section/uni-section.vue new file mode 100644 index 0000000..9a52e0b --- /dev/null +++ b/uni_modules/uni-section/components/uni-section/uni-section.vue @@ -0,0 +1,167 @@ + + + + diff --git a/uni_modules/uni-section/package.json b/uni_modules/uni-section/package.json new file mode 100644 index 0000000..0a31fb5 --- /dev/null +++ b/uni_modules/uni-section/package.json @@ -0,0 +1,87 @@ +{ + "id": "uni-section", + "displayName": "uni-section 标题栏", + "version": "0.0.1", + "description": "标题栏组件", + "keywords": [ + "uni-ui", + "uniui", + "标题栏" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "" + }, + "directories": { + "example": "../../temps/example_temps" + }, + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ], + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui" + }, + "uni_modules": { + "dependencies": [ + "uni-scss" + ], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} \ No newline at end of file diff --git a/uni_modules/uni-section/readme.md b/uni_modules/uni-section/readme.md new file mode 100644 index 0000000..d47faab --- /dev/null +++ b/uni_modules/uni-section/readme.md @@ -0,0 +1,8 @@ +## Section 标题栏 +> **组件名:uni-section** +> 代码块: `uSection` + +uni-section 组件主要用于文章、列表详情等标题展示 + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-section) +#### 如使用过程中有任何问题,或者您对uni-ui有一些好的建议,欢迎加入 uni-ui 交流群:871950839