Skip to content

G
GangShi-un2
提交 6347cb92 authored 作者: 黄旭新's avatar 黄旭新
浏览文件
操作

xin

上级 9c31ac2c
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 1413 行增加 和 164 行删除
pages.json
浏览文件 @ 6347cb92
...@@ -140,6 +140,13 @@ ...@@ -140,6 +140,13 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{
"path": "pages/Earnings/service/service",
"style": {
"navigationBarTitleText": "服务费收益",
"enablePullDownRefresh": false
}
},
{ {
"path": "pages/Earnings/affirmEarnings/affirmEarnings", "path": "pages/Earnings/affirmEarnings/affirmEarnings",
"style": { "style": {
......
pages/Earnings/service/service.vue 0 → 100644
浏览文件 @ 6347cb92
差异被折叠。
pages/MyBusiness/MyBusiness.vue
浏览文件 @ 6347cb92
...@@ -8,15 +8,26 @@ ...@@ -8,15 +8,26 @@
</view> </view>
</view> </view>
<!-- 搜索框end --> <!-- 搜索框end -->
<!-- 我的企业tab栏start --> <!-- 合同类型切换 -->
<view class="MyBusiness_tab"> <view class="ContractTab">
<view :class="{'border_bottom': tabIndex ==1}" @click="tabClick(1)">邀请的企业</view> <view class="ContractTab_child" @click="tabContract(1)">
<view :class="{'border_bottom': tabIndex ==2}" @click="tabClick(2)">签订的企业</view> <text :class="{'active':ContractType==1}">邀请的企业</text>
<view :class="{'border_bottom': tabIndex ==3}" @click="tabClick(3)">接单的企业</view>
<view :class="{'border_bottom': tabIndex ==4}" @click="tabClick(4)">委托的企业</view>
<view :class="{'border_bottom': tabIndex ==5}" @click="tabClick(5)">存量的企业</view>
</view> </view>
<!-- 我的企业tab栏end --> <view class="ContractTab_child" @click="tabContract(2)">
<text :class="{'active':ContractType==2}">签订的企业</text>
</view>
<view class="ContractTab_child" @click="tabContract(3)">
<text :class="{'active':ContractType==3}">接单的企业</text>
</view>
<view class="ContractTab_child" @click="tabContract(4)">
<text :class="{'active':ContractType==4}">委托的企业</text>
</view>
<view class="ContractTab_child" @click="tabContract(5)">
<text :class="{'active':ContractType==5}">存量企业</text>
</view>
<view class="hexian"></view>
</view>
<!-- 合同类型切换end -->
<!-- 统计start --> <!-- 统计start -->
<view class="lable"> <view class="lable">
<view class="lable_block"> <view class="lable_block">
...@@ -146,14 +157,12 @@ ...@@ -146,14 +157,12 @@
phone: '', // 企业联系电话 phone: '', // 企业联系电话
cashRatio: '', // 现货分成比例 cashRatio: '', // 现货分成比例
isshare: false, isshare: false,
isAuthenticate: null, // 电客认证状态 isAuthenticate: null, // 电客认证状态，
ContractType:'1',//合同类型
} }
}, },
methods: { methods: {
// tab栏索引
tabClick(i) {
this.tabIndex = i
},
//邀请企业 //邀请企业
inviteclick() { inviteclick() {
let that = this let that = this
...@@ -198,6 +207,11 @@ ...@@ -198,6 +207,11 @@
this.isshare = false this.isshare = false
} }
}, },
//切换合同类型
tabContract(index) {
this.ContractType=index
this.getMyEnterpriseList(this.electricId, this.enterpriseName)
},
//搜索 //搜索
searchContract() { searchContract() {
this.getMyEnterpriseList(this.electricId, this.enterpriseName) this.getMyEnterpriseList(this.electricId, this.enterpriseName)
...@@ -248,7 +262,8 @@ ...@@ -248,7 +262,8 @@
getMyEnterpriseList(electricId, companyName) { getMyEnterpriseList(electricId, companyName) {
get(api.myEnterpriseList, { get(api.myEnterpriseList, {
'electricId': electricId, 'electricId': electricId,
'enterpriseName': companyName 'enterpriseName': companyName,
'type':this.ContractType,
}).then(res => { }).then(res => {
console.log(res) console.log(res)
if (res.code == 200) { if (res.code == 200) {
...@@ -389,6 +404,48 @@ ...@@ -389,6 +404,48 @@
} }
} }
.ContractTab {
width: 100%;
background-color: #fff;
height: 95rpx;
position: relative;
display: flex;
flex-direction: row;
.ContractTab_child {
flex: 1;
height: 100%;
text-align: center;
font-size: 22rpx;
color: #999;
line-height: 95rpx;
text {
padding: 16rpx;
border-radius: 16rpx;
}
.active {
background-color: #1989FA;
color: #fff;
}
}
.hexian {
width: 100%;
height: 1px;
background-color: #f4f5f7;
transform: scaleY(0.5);
-webkit-transform: scaleY(0.5);
-moz-transform: scaleY(0.5);
-o-transform: scaleY(0.5);
-ms-transform: scaleY(0.5);
position: absolute;
bottom: 0;
left: 0;
}
}
//搜索框 //搜索框
.search_block { .search_block {
width: 100%; width: 100%;
......
pages/myInfo/myInfo.vue
浏览文件 @ 6347cb92
...@@ -155,6 +155,11 @@ ...@@ -155,6 +155,11 @@
others: '', others: '',
url: '/pages/Earnings/betweenEarnings/betweenEarnings', url: '/pages/Earnings/betweenEarnings/betweenEarnings',
},{
id: 6,
name: '服务费收益',
others: '',
url: '/pages/Earnings/service/service'
}, { }, {
id: 5, id: 5,
name: '待确认收益', name: '待确认收益',
...@@ -650,21 +655,22 @@ ...@@ -650,21 +655,22 @@
type: that.type type: that.type
}).then(res => { }).then(res => {
if (res.code == 200) { if (res.code == 200) {
that.earningsList_dianke[0].others = '￥' + res.data.spotIncome that.earningsList_dianke[0].others = '￥' + res.data.spotIncome//现货收益
that.earningsList_dianke[1].others = '￥' + res.data.intermediateIncome that.earningsList_dianke[1].others = '￥' + res.data.intermediateIncome//居间收益
that.earningsList_dianke[2].others = '￥' + res.data.commissionIncome that.earningsList_dianke[2].others = '￥' + res.data.commissionIncome//佣金收益
that.earningsList_dianke[3].others = '￥' + res.data.stockIntermediaryIncome that.earningsList_dianke[3].others = '￥' + res.data.stockIntermediaryIncome//存量居间收益
that.earningsList_dianke[4].others = '￥' + res.data.pendingIncome that.earningsList_dianke[4].others = '￥' + res.data.pendingIncome//服务费收益
that.earningsList_gaoji[0].others = '￥' + res.data.corporateDiscountAmount that.earningsList_dianke[5].others = '￥' + res.data.pendingIncome//待确认收益
that.earningsList_gaoji[1].others = '￥' + res.data.spotIncome that.earningsList_gaoji[0].others = '￥' + res.data.corporateDiscountAmount//企业优惠收益
that.earningsList_gaoji[2].others = '￥' + res.data.pendingIncome that.earningsList_gaoji[1].others = '￥' + res.data.spotIncome//现货收益
that.earningsList_zhongji[0].others = '￥' + res.data.corporateDiscountAmount that.earningsList_gaoji[2].others = '￥' + res.data.pendingIncome//待确认收益
that.earningsList_zhongji[1].others = '￥' + res.data.spotIncome that.earningsList_zhongji[0].others = '￥' + res.data.corporateDiscountAmount//企业优惠收益
that.earningsList_zhongji[2].others = '￥' + res.data.pendingIncome that.earningsList_zhongji[1].others = '￥' + res.data.spotIncome//现货认收益
that.earningsList_putong[0].others = '￥' + res.data.corporateDiscountAmount that.earningsList_zhongji[2].others = '￥' + res.data.pendingIncome//待确认收益
that.earningsList_putong[1].others = '￥' + res.data.pendingIncome that.earningsList_putong[0].others = '￥' + res.data.corporateDiscountAmount//企业优惠收益
that.earningsList_cunliang[0].others = '￥' + res.data.corporateDiscountAmount that.earningsList_putong[1].others = '￥' + res.data.pendingIncome//待确认收益
that.earningsList_cunliang[1].others = '￥' + res.data.pendingIncome that.earningsList_cunliang[0].others = '￥' + res.data.corporateDiscountAmount//企业优惠收益
that.earningsList_cunliang[1].others = '￥' + res.data.pendingIncome//待确认收益
} }
// else { // else {
// uni.showToast({ // uni.showToast({
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论