Commit 7c38cd73 authored by youjie's avatar youjie

no message

parent cb74c599
......@@ -388,21 +388,16 @@
</div>
<!-- 消息通知 -->
<notification v-if="rightOpen" @close="rightOpen = false"></notification>
</div>
</template>
<script>
import notification from './components/notification'
import OrderList from './components/OrderList'
import detailsButtom from './components/details'
// import OrderList from '../myOrdersAllType/components/OrderList'
import progressComm from './components/progressComm'
export default {
components: {
notification,
OrderList,
progressComm,
detailsButtom
......
......@@ -52,7 +52,7 @@
border-radius: 0 !important;
}
/deep/.relative-position .el-progress-bar__inner{
text-align: center;
text-align: left;
border-radius: 0 !important;
}
/deep/.relative-position:first-child .el-progress{
......@@ -71,13 +71,12 @@
<div class="progress-box">
<div v-for="(item,index) in commissionratioList.CommissionRateList" :key="index"
class="relative-position">
<!-- :text-color="(commissionratioList.type==2&&commissionratioList.CommissionRate>=item.Rate)||
(commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)?'#fff':'#666666'" -->
<el-progress :text-inside="true" :stroke-width="20"
:percentage="setItemProgress(item)"
:status="setItemStatus(item)"
:format="setItemText(item)"
:text-color="(commissionratioList.type==2&&commissionratioList.CommissionRate>=item.Rate)||
(commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)?'#666666':'#666666'"
:color="(commissionratioList.type==2&&commissionratioList.CommissionRate>=item.Rate)||
(commissionratioList.type!=2&&commissionratioList.AvgLureNum>=item.StartValue)?customColor[0]:customColor[1]">
</el-progress>
......@@ -169,7 +168,7 @@
if(this.commissionratioList.type==2){
if(this.commissionratioList.CommissionProfit
&&this.commissionratioList.CommissionProfit>=data.StartValue&&this.commissionratioList.CommissionProfit<=data.EndValue){
return this.commissionratioList.CommissionProfit>25001?(this.commissionratioList.CommissionProfit/data.StartValue)*100:(this.commissionratioList.CommissionProfit/data.EndValue)*100
return this.commissionratioList.CommissionProfit>25000?(this.commissionratioList.CommissionProfit/data.StartValue)*100:(this.commissionratioList.CommissionProfit/data.EndValue)*100
}else{
return 100
}
......
......@@ -72,31 +72,6 @@
</div>
<div style="display: flex;justify-content: space-between;">
<!-- <img style="cursor: pointer;" src="../../assets/img/jinbin@2x.png" alt="" class="img" @click="goAnticipate(1)"> -->
<!-- <div class="royalty" style="cursor: pointer;position: relative;" @click="goAnticipate(1)">
<div class="tc">
<p>
<span></span>
<span>{{data.totalCommission}}</span>
</p>
<p style="margin-bottom: 3px;">
<el-tag
v-if="data.peopelBonus" size="mini" type="danger"
effect="dark" style="color: #ffff;position: absolute;right: -10px;bottom: 23px;">奖+{{data.peopelBonus}}</el-tag>
<span style="color: #BDBDBD;font-size: 13px;
padding: 0 0 5px 0;font-weight: 100;">{{data.periodsName}}</span>
</p>
</div> -->
<!-- <span><p class="tc">{{data.totalCommission}}</p></span>-->
<!-- <div stye="font-size: 16px;color: #666666;display: block;display: inline-block;">
<span>出境提成</span>
<template v-if="data.comissionGeneralId>0">
<span v-if="data.share==1" class="Sale_Share" style="color:#333;cursor:default;">已确认</span>
<span v-if="data.share==0" @click="tichengDialog=true" class="Sale_Share"
:class="{'ShareDisClick':!isSubmit}">分享并确认</span>
</template>
</div>
</div> -->
<div style="cursor: pointer;cursor: pointer;position: relative;" class="royalty" @click="goAnticipate(1)">
<div class="tc">
<p>
......@@ -105,7 +80,7 @@
</p>
<p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.periodsName}}<el-tag
v-if="data.peopelBonus" size="mini" type="danger"
effect="dark" style="color: #ffff;position: absolute;right: 0px;bottom: 23px;font-size: 11px;">奖+{{data.peopelBonus}}</el-tag></p>
effect="dark" style="color: #ffff;position: absolute;left: 70px;bottom: 23px;font-size: 11px;">奖+{{data.peopelBonus}}</el-tag></p>
</div>
<div stye="font-size: 16px;color: #666666;display: block;display: inline-block;">
<span>出境提成</span>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment