mkm/OfficeApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完成账户充值页面

Browse Source
This commit is contained in:
weipengfei 2023-07-19 11:48:36 +08:00
parent 2a60bdd38f
commit a2a130490a
8 changed files with 100 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/app.js
View File

@ -49,7 +49,8 @@ module.exports = {
//#endif
},
// 回话密钥名称 请勿修改此配置
TOKENNAME: 'X-Token',
// TOKENNAME: 'X-Token',
TOKENNAME: 'token',
// 缓存时间 0 永久
EXPIRE: 0,
};

29
manifest.json
View File

@ -1,6 +1,6 @@
{
"name" : "nk-oa",
"appid" : "__UNI__7F12D2D",
"appid" : "__UNI__3A527D1",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
@ -17,26 +17,29 @@
"delay" : 0
},
/* 模块配置 */
"modules" : {},
"modules" : {
"Payment" : {}
},
/* 应用发布信息 */
"distribute" : {
/* android打包配置 */
"android" : {
"permissions" : [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
]
},
@ -46,8 +49,8 @@
"sdkConfigs" : {
"payment" : {
"weixin" : {
"__platform__" : [ "ios", "android" ],
"appid" : "",
"__platform__" : [ "android" ],
"appid" : "__UNI__3A527D1",
"UniversalLinks" : ""
}
}

69
pages.json
View File

@ -23,7 +23,7 @@
{
"path": "pages/oaTask/oaTask",
"style": {
"navigationBarTitleText": "新建任务"
"navigationBarTitleText": "今日任务"
}
},
{
@ -31,24 +31,20 @@
"style": {
"navigationBarTitleText": "我的"
}
}, {
"path": "pages/oaLogin/oaLogin",
"style": {
"navigationBarTitleText": "登录"
}
}, {
"path": "pages/oaManager/oaManager",
"style": {
"navigationBarTitleText": "片区经理"
}
}
,{
"path" : "pages/oaLogin/oaLogin",
"style" :
{
"navigationBarTitleText": "登录"
}
}
,{
"path" : "pages/oaManager/oaManager",
"style" :
{
"navigationBarTitleText": "片区经理"
}
}
],
],
"subPackages": [{
"root": "pages/views",
"name": "views",
@ -100,9 +96,7 @@
"enablePullDownRefresh": false
}
}
, {
}, {
"path": "leave_request",
"style": {
"navigationBarTitleText": "请假申请",
@ -111,6 +105,37 @@
}
]
}, {
"root": "subpkg",
"name": "subpkg",
"pages": [
{
"path": "personnel/personnel",
"style": {
"navigationBarTitleText": "人员管理",
"enablePullDownRefresh": false
}
}
,{
"path" : "finance/finance",
"style" :
{
"navigationBarTitleText": "财务管理",
"enablePullDownRefresh": false
}
}
,{
"path" : "topUp/topUp",
"style" :
{
"navigationBarTitleText": "账户充值",
"enablePullDownRefresh": false
}
}
]
}],
"globalStyle": {
"navigationBarTextStyle": "black",
@ -156,4 +181,4 @@
]
},
"uniIdRouter": {}
}
}

2
pages/oaHome/oaHome.vue
View File

@ -213,7 +213,7 @@
navTo(url) {
url ?
uni.navigateTo({
url: url
url: url,
}) : Toast('暂未开放')
},
backlogDetails() {

8
pages/oaMy/oaMy.vue
View File

@ -30,20 +30,20 @@
</view>
<view class="assess">
<view class="ass_cent flex_a_c_j_sb">
<view class="cent_item">
<view class="cent_item" @click="naviTo('/subpkg/finance/finance')">
<!-- <view class="num">{{ oaUserInfo.achievements_money }}</view> -->
<view class="num">1000</view>
<view class="name">绩效考核</view>
<view class="name">可提现金额</view>
</view>
<view class="cent_item">
<!-- <view class="num">{{ oaUserInfo.department_money }}</view> -->
<view class="num">0</view>
<view class="name">部门奖金</view>
<view class="name">冻结金额</view>
</view>
<view class="cent_item" @click="test">
<!-- <view class="num">{{ oaUserInfo.company_money }}</view> -->
<view class="num">0</view>
<view class="name">公司奖金</view>
<view class="name">充值金额</view>
</view>
</view>
</view>

18
pages/oaTask/oaTask.vue
View File

@ -25,7 +25,10 @@
<!-- 新建任务 -->
<view class="new_task" @click="goNewTask">+新建任务</view>
<!-- 事件列表 -->
<view class="eventList_box" v-for="item in eventData" :key="item.id">
<view class="task_list">
<taskCard class="task_card" v-for="item in 10" :key="item"></taskCard>
</view>
<!-- <view class="eventList_box" v-for="item in eventData" :key="item.id">
<view class="head_box">
<text class="title">{{item.title}}</text>
<text class="status" :class="item.status=='驳回'?'another_color':''">{{item.flow_name}}</text>
@ -47,7 +50,7 @@
<text v-if="item.is_bug==2">任务性质:临时任务</text>
</view>
<view class="end_time">预计结束时间:{{item.end_time}}</view>
</view>
</view> -->
<u-loadmore :status="status" :loading-text="loadingText" :loadmore-text="loadmoreText" :nomore-text="nomoreText" />
<!-- <tabbar></tabbar> -->
</view>
@ -273,6 +276,17 @@
border-radius: 30rpx;
background-color: $theme-oa-color;
}
.task_list{
display: flex;
justify-content: space-between;
align-items: center;
flex-direction: column;
padding-top: 21rpx;
.task_card{
margin-bottom: 21rpx;
}
}
.eventList_box {
margin: 0 auto;

3
static/server/server.js
View File

@ -195,7 +195,8 @@ export const oaHomeData = [
},
{
text: '人员管理',
icon: prefix + 'oa/ccsq@2x.png'
icon: prefix + 'oa/ccsq@2x.png',
url: '/subpkg/personnel/personnel'
},
{
text: '固定资产',

22
utils/oahttp.js
View File

@ -22,17 +22,18 @@ function baseRequestTwo(url, method, data, {
let Url = HTTP_REQUEST_URL_THREE,
header = HEADER;
// if (!noAuth) {
// //登录过期自动登录
// if (!store.state.app.token) {
// toLogin();
// return Promise.reject({
// msg: '未登录'
// });
// }
// }
if (!noAuth) {
//登录过期自动登录
if (!store.state.app.token) {
toLogin();
return Promise.reject({
msg: '未登录'
});
}
}
if (store.state.app.token) header[TOKENNAME] = 'Bearer ' + store.state.app.token;
// if (store.state.app.token) header[TOKENNAME] = 'Bearer ' + store.state.app.token;
if (store.state.app.token) header[TOKENNAME] = store.state.app.token;
// header[TOKENNAME] = 'Bearer sdjflidshjgfkbdasgjmasbgvhauuiavhkesvndkaesbvkjsdbv';
return new Promise((reslove, reject) => {
// uni.showLoading({
@ -44,6 +45,7 @@ function baseRequestTwo(url, method, data, {
method: method || 'GET',
header: header,
data: data || {},
params: method == 'GET' ? data : {},
success: (res) => {
// uni.hideLoading()
if (noVerify)