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-20 16:32:30 +08:00
parent 3852df8598
commit 75bf2692d0
13 changed files with 521 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/contract.js Normal file
View File

@ -0,0 +1,12 @@
import oahttp from "@/utils/oahttp.js";
/**
* ºÏͬÁбí
*/
export const contractList = (data) => oahttp.get('/contract/index', data)
/**
* ºÏͬÏêÇé
*/
export const contractView = (data) => oahttp.get('/contract/view', data)

6
api/notice.js Normal file
View File

@ -0,0 +1,6 @@
import oahttp from "@/utils/oahttp.js";
/**
* 公告列表
*/
export const noticeList = (data) => oahttp.get('/article/lists', data)

4
api/pay.js
View File

@ -20,3 +20,7 @@ export const payPrepay = (data) => oahttp.post('/pay/prepay', data)
*/ */
export const wechatJsConfig = (data) => oahttp.get('/wechat/jsConfig', data) export const wechatJsConfig = (data) => oahttp.get('/wechat/jsConfig', data)
/**
* 支付状态
*/
export const payStatus = (data) => oahttp.get('/pay/payStatus', data)

8
babel.config.js Normal file
View File

@ -0,0 +1,8 @@
module.exports = {
presets: [
'@vue/cli-plugin-babel/preset'
],
plugins: [
'@babel/plugin-proposal-optional-chaining'
]
}

2
manifest.json
View File

@ -52,7 +52,7 @@
"payment" : { "payment" : {
"weixin" : { "weixin" : {
"__platform__" : [ "android" ], "__platform__" : [ "android" ],
"appid" : "__UNI__3A527D1", "appid" : "wx9d68c92b550ddd1e",
"UniversalLinks" : "" "UniversalLinks" : ""
} }
}, },

15
pages.json
View File

@ -5,7 +5,10 @@
"path": "pages/oaHome/oaHome", "path": "pages/oaHome/oaHome",
"style": { "style": {
"navigationBarTitleText": "首页", "navigationBarTitleText": "首页",
"enablePullDownRefresh": true "enablePullDownRefresh": true,
"app-plus": {
"titleNView": false
}
} }
}, },
{ {
@ -29,12 +32,18 @@
{ {
"path": "pages/oaMy/oaMy", "path": "pages/oaMy/oaMy",
"style": { "style": {
"navigationBarTitleText": "我的" "navigationBarTitleText": "我的",
"app-plus": {
"titleNView": false
}
} }
}, { }, {
"path": "pages/oaLogin/oaLogin", "path": "pages/oaLogin/oaLogin",
"style": { "style": {
"navigationBarTitleText": "登录" "navigationBarTitleText": "登录",
"app-plus": {
"titleNView": false
}
} }
}, { }, {

27
pages/oaHome/oaHome.vue
View File

@ -1,6 +1,9 @@
<template> <template>
<view class="oa_home" style="oaColor"> <view class="oa_home" style="oaColor">
<image class="header_bg" src="../../static/img/home/head-bg.png"></image> <image class="header_bg" src="../../static/img/home/head-bg.png"></image>
<!-- #ifdef APP-PLUS||H5 -->
<view style="height: var(--status-bar-height);"></view>
<!-- #endif -->
<view class="home_header"> <view class="home_header">
<view class="my_info flex_a_c"> <view class="my_info flex_a_c">
<view class=""> <view class="">
@ -37,8 +40,8 @@
</view> </view>
</view> </view>
<block v-for="(item,index) in ApproveList.slice(0,2)" :key="index"> <block v-for="(item,index) in ApproveList.slice(0,2)" :key="index">
<view class="backlog_item flex_a_c_j_sb" @click="backlogDetails"> <view class="backlog_item flex_a_c_j_sb" @click="clickNotice(item.id)">
<view class="text">{{ item.content }}</view> <view class="text">{{ item.title }}</view>
<i class="iconfont icon-you"><uni-icons type="forward"></uni-icons></i> <i class="iconfont icon-you"><uni-icons type="forward"></uni-icons></i>
</view> </view>
</block> </block>
@ -96,6 +99,7 @@
<script> <script>
import { Toast } from '@/libs/uniApi.js' import { Toast } from '@/libs/uniApi.js'
import { oaHomeData } from '@/static/server/server.js' import { oaHomeData } from '@/static/server/server.js'
import {noticeList} from "@/api/notice.js"
// import tabbar from '../components/tabbar' // import tabbar from '../components/tabbar'
import { getIndexListAPI, getTaskListAPI, getMyTaskListAPI, getApproveListAPI, getUserIndexAPI } from '@/api/oaApi.js' import { getIndexListAPI, getTaskListAPI, getMyTaskListAPI, getApproveListAPI, getUserIndexAPI } from '@/api/oaApi.js'
export default { export default {
@ -149,7 +153,7 @@
onShow() { onShow() {
// this.getUserIndex() // this.getUserIndex()
// this.getIndexList() // this.getIndexList()
// this.getApproveList() this.getApproveList()
this.initUserInfo() this.initUserInfo()
}, },
computed: {}, computed: {},
@ -170,8 +174,12 @@
this.$store.state.app.userInfo ? this.myOaInfo = this.$store.state.app.userInfo : null; this.$store.state.app.userInfo ? this.myOaInfo = this.$store.state.app.userInfo : null;
}, },
async getApproveList() { async getApproveList() {
const res = await getApproveListAPI({ status: 1 }) const res = await noticeList({
this.ApproveList = res.data cid: 1,
sort: 'new',
keyword: '',
})
this.ApproveList = res.data.lists
}, },
async getIndexList() { async getIndexList() {
const { project, task } = await getIndexListAPI() const { project, task } = await getIndexListAPI()
@ -204,8 +212,9 @@
url: url, url: url,
}) : Toast('暂未开放') }) : Toast('暂未开放')
}, },
backlogDetails() { // 点击公告
Toast('点击待办事项') clickNotice(){
Toast('点击公告')
}, },
async getUserIndex() { async getUserIndex() {
const res = await getUserIndexAPI() const res = await getUserIndexAPI()
@ -296,6 +305,10 @@
.text { .text {
font-size: 28.04rpx; font-size: 28.04rpx;
white-space: nowrap; /* 禁止换行 */
overflow: hidden; /* 溢出隐藏 */
text-overflow: ellipsis; /* 使用省略号代表被截断的文本 */
width: 580rpx; /* 设置元素宽度，根据需要进行调整 */
&::before { &::before {
content: '提醒'; content: '提醒';

3
pages/oaLogin/oaLogin.vue
View File

@ -1,6 +1,9 @@
<template> <template>
<view class="login"> <view class="login">
<image class="bg-iamge" src="../../static/img/login/login_back_img.png"></image> <image class="bg-iamge" src="../../static/img/login/login_back_img.png"></image>
<!-- #ifdef APP-PLUS||H5 -->
<view style="height: var(--status-bar-height);"></view>
<!-- #endif -->
<view class="body"> <view class="body">
<view class="title">欢迎进入里海供销平台！</view> <view class="title">欢迎进入里海供销平台！</view>
<view class="login-card"> <view class="login-card">

7
pages/oaMy/oaMy.vue
View File

@ -2,6 +2,9 @@
<view class="my"> <view class="my">
<view class="head_box"> <view class="head_box">
<image class="head_img" src="../../static/img/home/head-bg.png"></image> <image class="head_img" src="../../static/img/home/head-bg.png"></image>
<!-- #ifdef APP-PLUS||H5 -->
<view style="height: var(--status-bar-height);"></view>
<!-- #endif -->
<view v-if="!oaUserInfo" class="my_head"> <view v-if="!oaUserInfo" class="my_head">
<view class="department flex_a_c"> <view class="department flex_a_c">
<view class="section">产品技术部</view> <view class="section">产品技术部</view>
@ -35,12 +38,12 @@
<view class="num">1000</view> <view class="num">1000</view>
<view class="name">可提现金额</view> <view class="name">可提现金额</view>
</view> </view>
<view class="cent_item"> <view class="cent_item" @click="naviTo('/subpkg/finance/finance')">
<!-- <view class="num">{{ oaUserInfo.department_money }}</view> --> <!-- <view class="num">{{ oaUserInfo.department_money }}</view> -->
<view class="num">0</view> <view class="num">0</view>
<view class="name">冻结金额</view> <view class="name">冻结金额</view>
</view> </view>
<view class="cent_item"> <view class="cent_item" @click="naviTo('/subpkg/finance/finance')">
<!-- <view class="num">{{ oaUserInfo.company_money }}</view> --> <!-- <view class="num">{{ oaUserInfo.company_money }}</view> -->
<view class="num">0</view> <view class="num">0</view>
<view class="name">充值金额</view> <view class="name">充值金额</view>

103
subpkg/contract/contract.vue
View File

@ -2,24 +2,25 @@
<view class=""> <view class="">
<view class="tabs"> <view class="tabs">
<view class="left"> <view class="left">
<view class="item active">合同列表</view> <view class="item" :class="changeType==0?'active':''" @click="changeType=0">合同列表</view>
<view class="item">已签订合同</view> <view class="item" :class="changeType==1?'active':''" @click="changeType=1">已签订合同</view>
</view> </view>
<view class="right"> <view class="right">
<text>新增</text> <text>新增</text>
</view> </view>
</view> </view>
<view class="contract_list"> <view class="contract_list">
<view class="item"> <view class="item" v-for="(item,index) in list" :key="item.id">
<view class="top"> <view class="top">
<image src="../../static/img/contract/contract.png"></image> <image src="../../static/img/contract/contract.png"></image>
<view class="text"> <view class="text">
<view class="name"> <view class="name">
<text class="title">合同名称</text> <view class="title">合同名称合同名称合同名称</view>
<text class="number">合同编号5464643423423</text> <view class="number">合同编号{{item.contract_no}}</view>
</view> </view>
<view class="date"> <view class="date">
<text class="time">2023-04-27 至 2024-04-28 </text> <!-- <text class="time">2023-04-27 至 2024-04-28 </text> -->
<text class="time">修改时间:{{item.update_time}}</text>
<text class="expire">365天后到期</text> <text class="expire">365天后到期</text>
</view> </view>
</view> </view>
@ -28,7 +29,7 @@
<view class="bottom"> <view class="bottom">
<view class="left">已签订</view> <view class="left">已签订</view>
<!-- <view class="left red">已到期</view> --> <!-- <view class="left red">已到期</view> -->
<button class="right" @click="naviTo('/subpkg/contractDetail/contractDetail')">详情</button> <button class="right" @click="naviTo('/subpkg/contractDetail/contractDetail?id='+item.id)">详情</button>
</view> </view>
</view> </view>
</view> </view>
@ -36,14 +37,18 @@
</template> </template>
<script> <script>
export default { import { contractList } from "@/api/contract.js"
export default {
data() { data() {
return { return {
changeType: 0,
list: []
} }
}, },
onLoad() {}, onLoad() {},
onShow() {}, onShow() {
this.initContractList()
},
methods: { methods: {
naviTo(url) { naviTo(url) {
url ? url ?
@ -51,6 +56,12 @@ export default {
url: url url: url
}) : Toast('暂未开放') }) : Toast('暂未开放')
}, },
async initContractList() {
let res = await contractList();
if (res?.data?.data.length > 0) {
this.list = res.data.data;
}
}
}, },
onPullDownRefresh() { onPullDownRefresh() {
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
@ -59,16 +70,18 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
.tabs{ .tabs {
height: 112rpx; height: 112rpx;
background-color: #fff; background-color: #fff;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding: 0 28rpx; padding: 0 28rpx;
.left{
.left {
display: flex; display: flex;
.item{
.item {
margin-right: 52.5rpx; margin-right: 52.5rpx;
width: 175rpx; width: 175rpx;
height: 53rpx; height: 53rpx;
@ -80,64 +93,88 @@ export default {
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
} }
.active{
.active {
background-color: #3274F9FF; background-color: #3274F9FF;
color: #FFFFFFFF; color: #FFFFFFFF;
} }
} }
.right{
.right {
font-size: 28rpx; font-size: 28rpx;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
line-height: 0rpx; line-height: 0rpx;
-webkit-background-clip: text; -webkit-background-clip: text;
} }
} }
.contract_list{
.contract_list {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding: 28rpx; padding: 28rpx;
.item{
.item {
width: 694rpx; width: 694rpx;
height: 263rpx; height: 263rpx;
padding: 28rpx; padding: 28rpx;
margin-bottom: 28rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 14rpx 14rpx 14rpx 14rpx; border-radius: 14rpx 14rpx 14rpx 14rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
.top{
.top {
display: flex; display: flex;
image{
image {
width: 87.6rpx; width: 87.6rpx;
height: 87.6rpx; height: 87.6rpx;
margin-right: 28rpx; margin-right: 28rpx;
} }
.text{
.text {
flex: 1; flex: 1;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
.name{
.title{ .name {
display: flex;
justify-content: space-between;
align-items: flex-end;
.title {
font-size: 32rpx; font-size: 32rpx;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
margin-right: 17.5rpx; margin-right: 17.5rpx;
white-space: nowrap;
/* 禁止换行 */
overflow: hidden;
/* 溢出隐藏 */
text-overflow: ellipsis;
/* 使用省略号代表被截断的文本 */
// width: 100rpx;
flex: 1;
/* 设置元素宽度，根据需要进行调整 */
} }
.number{
.number {
font-size: 25rpx; font-size: 25rpx;
font-weight: 400; font-weight: 400;
color: #3274F9; color: #3274F9;
} }
} }
.date{
.date {
font-size: 25rpx; font-size: 25rpx;
font-weight: 400; font-weight: 400;
color: #F9AA32; color: #F9AA32;
.time{
.time {
color: #CCCCCCFF; color: #CCCCCCFF;
margin-right: 10rpx; margin-right: 10rpx;
} }
@ -145,18 +182,22 @@ export default {
} }
} }
.bottom{
.bottom {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.left{
.left {
font-size: 28rpx; font-size: 28rpx;
font-weight: 400; font-weight: 400;
color: #34A853; color: #34A853;
} }
.red{
.red {
color: #F02828FF; color: #F02828FF;
} }
.right{
.right {
width: 158rpx; width: 158rpx;
height: 53rpx; height: 53rpx;
display: flex; display: flex;
@ -173,5 +214,5 @@ export default {
} }
} }
} }
</style> </style>

202
subpkg/contractDetail/contractDetail.vue
View File

@ -5,10 +5,10 @@
<view class="card"> <view class="card">
<view class="top"> <view class="top">
<view class="left"> <view class="left">
<image ></image> <image></image>
<view class="text"> <view class="text">
<view class="name">公司名称</view> <view class="name">{{company.company_name}}</view>
<view class="code">社会代码000000</view> <view class="code">社会代码{{company.organization_code}}</view>
</view> </view>
</view> </view>
<view class="right">公司类型</view> <view class="right">公司类型</view>
@ -25,20 +25,20 @@
<view class="one"> <view class="one">
<view class="linkman">主要联系人</view> <view class="linkman">主要联系人</view>
<view class="info"> <view class="info">
<view class="info_item">姓名：张三三</view> <view class="info_item">姓名：{{company.master_name}}</view>
<view class="info_item">职位：公司总经理</view> <view class="info_item">职位：{{company.master_position}}</view>
<view class="info_item">联系电话：0830-123456</view> <view class="info_item">联系电话：{{company.master_phone}}</view>
<view class="info_item">邮箱：123456789@qq.com</view> <view class="info_item">邮箱：{{company.master_email}}</view>
</view> </view>
</view> </view>
<view style="height: 32rpx;"></view> <view style="height: 32rpx;"></view>
<view class="one"> <view class="one" v-for="(other, index) in company.other_contacts" :key="index">
<view class="linkman">其他联系人</view> <view class="linkman">其他联系人</view>
<view class="info"> <view class="info">
<view class="info_item">姓名：张三三</view> <view class="info_item">姓名：{{other.name}}</view>
<view class="info_item">职位：公司总经理</view> <view class="info_item">职位：{{company.position}}</view>
<view class="info_item">联系电话：0830-123456</view> <view class="info_item">联系电话：{{other.phone}}</view>
<view class="info_item">邮箱：123456789@qq.com</view> <view class="info_item">邮箱：{{other.email}}</view>
</view> </view>
</view> </view>
</view> </view>
@ -46,19 +46,19 @@
<view class="item"> <view class="item">
<view class="title">资质信息</view> <view class="title">资质信息</view>
<view class="image_box"> <view class="image_box">
<image class="left"></image> <image class="left" @click="priview(company.qualification.bank_account)" :src="company.qualification.bank_account"></image>
<image class="right"></image> <image class="right" @click="priview(company.qualification.business_license)" :src="company.qualification.business_license"></image>
</view> </view>
</view> </view>
<view class="item"> <view class="item">
<view class="title">电子合同</view> <view class="title">电子合同</view>
<view class="card"> <view class="card">
<view class="one"> <view class="one">
<view class="linkman">签约公司名称</view> <view class="linkman">公司名称</view>
<view class="info"> <view class="info">
<view class="info_item">签约对象：被签约对象名称</view> <view class="info_item">签约对象：被签约对象名称</view>
<view class="info_item">合同类型：系统获取</view> <view class="info_item">合同类型：{{contract.type}}</view>
<view class="info_item">合同编号：系统获取</view> <view class="info_item">合同编号：{{contract.contract_no}}</view>
</view> </view>
</view> </view>
<u-line color="#999999FF" style="margin: 31rpx 0;"></u-line> <u-line color="#999999FF" style="margin: 31rpx 0;"></u-line>
@ -66,11 +66,15 @@
<view class="left"> <view class="left">
<image class="contract_img" src="../../static/img/contract/contract.png"></image> <image class="contract_img" src="../../static/img/contract/contract.png"></image>
<view class="text"> <view class="text">
<view class="name">《劳务派遣合同》</view> <view class="name">合同</view>
<view><text class="nickname">张郭郭</text><text>2023年01月01日</text></view> <view>
<!-- <text class="nickname">张郭郭</text> -->
<text>{{contract.create_time}}</text>
</view> </view>
</view> </view>
<view class="right" @click="naviTo('/subpkg/pdfView/pdfView?url=' + 'https://lihai001.oss-cn-chengdu.aliyuncs.com/uploads/20230130/1.pdf')"> </view>
<view class="right"
@click="naviTo('/subpkg/pdfView/pdfView?url=' + contract.file)">
<!-- <image class="icon"></image> --> <!-- <image class="icon"></image> -->
<uni-icons type="paperclip" color="#3274F9"></uni-icons> <uni-icons type="paperclip" color="#3274F9"></uni-icons>
<view>查看</view> <view>查看</view>
@ -78,19 +82,31 @@
</view> </view>
</view> </view>
</view> </view>
<button class="back_btn">返回</button> <button class="back_btn" @click="naviBack">返回</button>
<button class="stop_btn">终止合同</button> <!-- <button class="stop_btn">终止合同</button> -->
</view> </view>
</template> </template>
<script> <script>
export default { import { contractView } from "@/api/contract.js"
export default {
data() { data() {
return { return {
company: {
qualification: {
bank_account:"",
bank_accountB:"",
business_license:"",
business_licenseB:"",
},
},
contract: {},
users: []
} }
}, },
onLoad() {}, onLoad(options) {
this.initContract(options.id)
},
onShow() {}, onShow() {},
methods: { methods: {
naviTo(url) { naviTo(url) {
@ -99,6 +115,44 @@ export default {
url: url url: url
}) : Toast('暂未开放') }) : Toast('暂未开放')
}, },
naviBack(){
uni.navigateBack()
},
async initContract(id) {
let res = await contractView({ id });
this.company = res.data.company;
this.user = res.data.user;
this.contract = res.data.contract;
console.log(res.data);
},
//查看图片
priview(url){
uni.previewImage({
urls:[url],
longPressActions: {
itemList: ['保存图片'],
success: function(data) {
if (data.tapIndex === 0) {
uni.saveImageToPhotosAlbum({
filePath: url,
success: function() {
uni.showToast({
title: '保存成功',
icon: 'success'
})
},
fail: function() {
uni.showToast({
title: '保存失败',
icon: 'none'
})
}
})
}
}
}
})
}
}, },
onPullDownRefresh() { onPullDownRefresh() {
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
@ -107,9 +161,10 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
.item{ .item {
padding: 31.5rpx 28rpx; padding: 31.5rpx 28rpx;
.title{
.title {
margin-bottom: 21rpx; margin-bottom: 21rpx;
font-size: 35rpx; font-size: 35rpx;
font-weight: 500; font-weight: 500;
@ -117,7 +172,8 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
.card{
.card {
width: 694rpx; width: 694rpx;
// height: 231rpx; // height: 231rpx;
padding: 28rpx; padding: 28rpx;
@ -126,12 +182,15 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
.top{
.top {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.left{
.left {
display: flex; display: flex;
image{
image {
width: 102rpx; width: 102rpx;
height: 102rpx; height: 102rpx;
margin-right: 28rpx; margin-right: 28rpx;
@ -139,78 +198,94 @@ export default {
border-radius: 14rpx 14rpx 14rpx 14rpx; border-radius: 14rpx 14rpx 14rpx 14rpx;
opacity: 1; opacity: 1;
} }
.text{
.text {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
.name{
.name {
font-size: 32rpx; font-size: 32rpx;
font-weight: 500; font-weight: 500;
color: rgba(0,0,0,0.8); color: rgba(0, 0, 0, 0.8);
} }
.code{
.code {
font-size: 28rpx; font-size: 28rpx;
font-weight: 400; font-weight: 400;
color: #666666; color: #666666;
} }
} }
} }
.right{
.right {
font-size: 28rpx; font-size: 28rpx;
font-weight: 500; font-weight: 500;
color: #3274F9; color: #3274F9;
} }
} }
.bottom{
.bottom {
display: flex; display: flex;
align-items: center; align-items: center;
color: #666666FF; color: #666666FF;
margin-top: 32rpx; margin-top: 32rpx;
.location{
.location {
margin-left: 28rpx; margin-left: 28rpx;
} }
} }
.one{
.linkman{ .one {
.linkman {
height: 44rpx; height: 44rpx;
font-size: 32rpx; font-size: 32rpx;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
margin-bottom: 28rpx; margin-bottom: 28rpx;
} }
.info{
.info {
font-size: 28rpx; font-size: 28rpx;
font-weight: 400; font-weight: 400;
color: #666666; color: #666666;
line-height: 45rpx; line-height: 45rpx;
} }
} }
.contract{
.contract {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.left{
.left {
display: flex; display: flex;
.contract_img{
.contract_img {
width: 102rpx; width: 102rpx;
height: 102rpx; height: 102rpx;
background: #F5F5F5; background: #F5F5F5;
border-radius: 14rpx 14rpx 14rpx 14rpx; border-radius: 14rpx 14rpx 14rpx 14rpx;
margin-right: 21rpx; margin-right: 21rpx;
} }
.text{
.text {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
.name{
font-size: 32rpx;; .name {
font-size: 32rpx;
;
font-weight: 500; font-weight: 500;
color: rgba(0,0,0,0.8); color: rgba(0, 0, 0, 0.8);
line-height: 35rpx; line-height: 35rpx;
} }
.nickname{
.nickname {
margin-right: 35rpx; margin-right: 35rpx;
} }
text{
text {
height: 39rpx; height: 39rpx;
font-size: 28rpx; font-size: 28rpx;
font-weight: 400; font-weight: 400;
@ -219,7 +294,8 @@ export default {
} }
} }
} }
.right{
.right {
font-size: 28rpx; font-size: 28rpx;
font-weight: 500; font-weight: 500;
color: #3274F9; color: #3274F9;
@ -227,7 +303,8 @@ export default {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.icon{
.icon {
width: 35rpx; width: 35rpx;
height: 39rpx; height: 39rpx;
background-color: #3274F9; background-color: #3274F9;
@ -237,24 +314,28 @@ export default {
} }
} }
} }
.image_box{
.image_box {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.left{
.left {
width: 224rpx; width: 224rpx;
height: 319rpx; height: 319rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 14rpx 14rpx 14rpx 14rpx; border-radius: 14rpx 14rpx 14rpx 14rpx;
} }
.right{
.right {
width: 450rpx; width: 450rpx;
height: 318rpx; height: 318rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 14rpx 14rpx 14rpx 14rpx; border-radius: 14rpx 14rpx 14rpx 14rpx;
} }
} }
} }
.back_btn{
.back_btn {
width: 694rpx; width: 694rpx;
height: 84rpx; height: 84rpx;
background: #3274F9; background: #3274F9;
@ -264,8 +345,9 @@ export default {
align-items: center; align-items: center;
color: #fff; color: #fff;
margin: 30rpx auto; margin: 30rpx auto;
} }
.stop_btn{
.stop_btn {
width: 694rpx; width: 694rpx;
height: 84rpx; height: 84rpx;
border-radius: 42rpx 42rpx 42rpx 42rpx; border-radius: 42rpx 42rpx 42rpx 42rpx;
@ -275,5 +357,5 @@ export default {
color: #3274F9; color: #3274F9;
background-color: transparent; background-color: transparent;
margin: 30rpx auto; margin: 30rpx auto;
} }
</style> </style>

10
subpkg/finance/finance.vue
View File

@ -11,6 +11,13 @@
账户充值 账户充值
</view> </view>
</view> </view>
<view class="center">
<view>
<text style="margin-right: 20rpx;">账户总金额(元)</text><uni-icons type="eye" color="#fff"></uni-icons>
</view>
<view>1338.96</view>
<view>可提现金额</view>
</view>
</view> </view>
</view> </view>
</template> </template>
@ -65,5 +72,8 @@ export default {
color: #FFFFFF; color: #FFFFFF;
} }
} }
.center{
color: #fff;
}
} }
</style> </style>

14
subpkg/topUp/topUp.vue
View File

@ -32,7 +32,7 @@
</template> </template>
<script> <script>
import { recharge, payWay, payPrepay, wechatJsConfig } from "@/api/pay.js" import { recharge, payWay, payPrepay, wechatJsConfig, payStatus } from "@/api/pay.js"
export default { export default {
data() { data() {
return { return {
@ -95,17 +95,21 @@
success: (e) => { success: (e) => {
console.log('成功', e); console.log('成功', e);
uni.hideLoading(); uni.hideLoading();
payStatus({
order_id: data.order_id,
from: data.from,
}).then((status)=>{
uni.showToast({ uni.showToast({
icon:'success', icon:status.data.pay_status?'success':'error',
title:'支付成功!' title: status.data.pay_status?'支付成功!':'支付失败!'
})
}) })
}, },
fail: (e) => { fail: (e) => {
console.log('error', e);
uni.hideLoading(); uni.hideLoading();
uni.showToast({ uni.showToast({
icon:'error', icon:'error',
title: e.errMsg title: '支付失败!'
}) })
}, },
complete: () => {}, complete: () => {},