Bladeren bron

Merge branch 'master' of http://git.2weisou.com/wangxiao/zkPCproject into master

newStyle
lancer 3 jaren geleden
bovenliggende
commit
6cb77c7656
2 gewijzigde bestanden met toevoegingen van 38 en 30 verwijderingen
  1. +37
    -29
      src/views/Receive/index.vue
  2. +1
    -1
      vue.config.js

+ 37
- 29
src/views/Receive/index.vue Bestand weergeven

@@ -46,7 +46,7 @@
客户:<span style="color: #2671E2;">{{userinformationlist.name || ''}}</span>
</div>
<div style="display: flex;font-size:15px;margin-top: 8px;">
<div style="width:40%;">
<div style="width:50%;">
<div>负责顾问:{{userinformationlist.agentName|| ''}}</div>
<div style="margin-top: 8px;">客户等级:
<span v-if="userinformationlist.level"></span>
@@ -56,7 +56,7 @@
<span v-if="userinformationlist.level==4">D</span>
</div>
</div>
<div style="width:60%;">
<div style="width:50%;">
<div >到访次数:{{userinformationlist.visitRecord|| ''}}次</div>
<div style="margin-top: 8px;">客户阶段:</div>
</div>
@@ -162,7 +162,7 @@
</div>
</div>
<div class="content123" @click="checkMsg(item,index)" style="cursor:pointer;">
<div v-html="item.onebest"></div>
<div :class="{ adjskdjroleindexclass: item.isShow == 1 }" v-html="item.onebest"></div>
</div>
</div>

@@ -173,7 +173,7 @@
<div v-else>A</div>
</div>
<div class="content123" @click="checkMsg(item,index)" style="cursor:pointer;">
<div v-html="item.onebest"></div>
<div :class="{ adjskdjroleindexclass: item.isShow == 1 }" v-html="item.onebest"></div>
</div>
</div>

@@ -183,7 +183,7 @@
<div v-else>B</div>
</div>
<div class="content123" @click="checkMsg(item,index)" style="cursor:pointer;">
<div v-html="item.onebest"></div>
<div :class="{ adjskdjroleindexclass: item.isShow == 1 }" v-html="item.onebest"></div>
</div>
</div>

@@ -193,7 +193,7 @@
<div v-else>C</div>
</div>
<div class="content123" @click="checkMsg(item,index)" style="cursor:pointer;">
<div v-html="item.onebest"></div>
<div :class="{ adjskdjroleindexclass: item.isShow == 1 }" v-html="item.onebest"></div>
</div>
</div>

@@ -203,7 +203,7 @@
<div v-else>D</div>
</div>
<div class="content123" @click="checkMsg(item,index)" style="cursor:pointer;">
<div v-html="item.onebest"></div>
<div :class="{ adjskdjroleindexclass: item.isShow == 1 }" v-html="item.onebest"></div>
</div>
</div>

@@ -213,7 +213,7 @@
<div v-else>E</div>
</div>
<div class="content123" @click="checkMsg(item,index)" style="cursor:pointer;">
<div v-html="item.onebest"></div>
<div :class="{ adjskdjroleindexclass: item.isShow == 1 }" v-html="item.onebest"></div>
</div>
</div>

@@ -223,7 +223,7 @@
<div v-else>F</div>
</div>
<div class="content123" @click="checkMsg(item,index)" style="cursor:pointer;">
<div v-html="item.onebest"></div>
<div :class="{ adjskdjroleindexclass: item.isShow == 1 }" v-html="item.onebest"></div>
</div>
</div>

@@ -233,7 +233,7 @@
<div v-else>G</div>
</div>
<div class="content123" @click="checkMsg(item,index)" style="cursor:pointer;">
<div v-html="item.onebest"></div>
<div :class="{ adjskdjroleindexclass: item.isShow == 1 }" v-html="item.onebest"></div>
</div>
</div>

@@ -243,7 +243,7 @@
<div v-else>H</div>
</div>
<div class="content123" @click="checkMsg(item,index)" style="cursor:pointer;">
<div v-html="item.onebest"></div>
<div :class="{ adjskdjroleindexclass: item.isShow == 1 }" v-html="item.onebest"></div>
</div>
</div>

@@ -253,7 +253,7 @@
<div v-else>I</div>
</div>
<div class="content123" @click="checkMsg(item,index)" style="cursor:pointer;">
<div v-html="item.onebest"></div>
<div :class="{ adjskdjroleindexclass: item.isShow == 1 }" v-html="item.onebest"></div>
</div>
</div>

@@ -263,7 +263,7 @@
<div v-else>J</div>
</div>
<div class="content123" @click="checkMsg(item,index)" style="cursor:pointer;">
<div v-html="item.onebest"></div>
<div :class="{ adjskdjroleindexclass: item.isShow == 1 }" v-html="item.onebest"></div>
</div>
</div>

@@ -273,7 +273,7 @@
<div v-else>K</div>
</div>
<div class="content123" @click="checkMsg(item,index)" style="cursor:pointer;">
<div v-html="item.onebest"></div>
<div :class="{ adjskdjroleindexclass: item.isShow == 1 }" v-html="item.onebest"></div>
</div>
</div>

@@ -283,7 +283,7 @@
<div v-else>L</div>
</div>
<div class="content123" @click="checkMsg(item,index)" style="cursor:pointer;">
<div v-html="item.onebest"></div>
<div :class="{ adjskdjroleindexclass: item.isShow == 1 }" v-html="item.onebest"></div>
</div>
</div>

@@ -293,7 +293,7 @@
<div v-else>M</div>
</div>
<div class="content123" @click="checkMsg(item,index)" style="cursor:pointer;">
<div v-html="item.onebest"></div>
<div :class="{ adjskdjroleindexclass: item.isShow == 1 }" v-html="item.onebest"></div>
</div>
</div>

@@ -303,7 +303,7 @@
<div v-else>N</div>
</div>
<div class="content123" @click="checkMsg(item,index)" style="cursor:pointer;">
<div v-html="item.onebest"></div>
<div :class="{ adjskdjroleindexclass: item.isShow == 1 }" v-html="item.onebest"></div>
</div>
</div>

@@ -313,7 +313,7 @@
<div v-else>O</div>
</div>
<div class="content123" @click="checkMsg(item,index)" style="cursor:pointer;">
<div v-html="item.onebest"></div>
<div :class="{ adjskdjroleindexclass: item.isShow == 1 }" v-html="item.onebest"></div>
</div>
</div>

@@ -323,7 +323,7 @@
<div v-else>P</div>
</div>
<div class="content123" @click="checkMsg(item,index)" style="cursor:pointer;">
<div v-html="item.onebest"></div>
<div :class="{ adjskdjroleindexclass: item.isShow == 1 }" v-html="item.onebest"></div>
</div>
</div>

@@ -552,7 +552,7 @@
</div>
</div>
<div class="content123" style="cursor:pointer;">
<div v-html="item.onebest"></div>
<div :class="{ adjskdjroleindexclass: item.isShow == 1 }" v-html="item.onebest"></div>
</div>
</div>
</div>
@@ -1219,7 +1219,9 @@ export default {
}
})
})
level1[0].show = true;
if(level1.length!=0){
level1[0].show = true;
}
this.ratelist=level1;
this.prohibitedlist=list2;
})
@@ -1499,15 +1501,15 @@ export default {
#zxldiv{
overflow-y: scroll;
// height: 100%;
height:calc(80vh - 270px);
height:calc(80vh - 248px);
}
.biaotibox{
width: 100%;
height: 40px;
height: 30px;
display: flex;
font-size: 20px;
font-weight: 600;
line-height: 30px;
line-height: 20px;
}
.biaotibox>div:nth-of-type(1){
width: 50%;
@@ -1522,7 +1524,7 @@ export default {
padding-right: 10px;
width: 100%;
// height: 100%;
height:calc(80vh - 285px);
height:calc(80vh - 265px);
overflow-y: scroll;
}

@@ -1571,10 +1573,12 @@ export default {
text-align: left;
}
.content123 div{
color:#ffffff;
// color:#ffffff;
color:#32363D;
background:#f4f5f7;
font-size:14px;
padding:5px 14px;
background:#3ca953;
// background:#3ca953;
border-radius:8px;
margin: 0 12px;
line-height: 1.5;
@@ -1830,8 +1834,8 @@ export default {
.topbox1{
width: 100%;
display: flex;
margin-top: 18px;
height: calc(80vh - 178px);
margin-top: 12px;
height: calc(80vh - 156px);
.topzuo{
width:75% ;
min-width: 700px;
@@ -2075,4 +2079,8 @@ export default {
width:83%;
margin-top: 20px;
}
.adjskdjroleindexclass{
background: #3ca953 !important;
color:#ffffff !important;
}
</style>

+ 1
- 1
vue.config.js Bestand weergeven

@@ -7,7 +7,7 @@ const url = 'http://39.97.167.65:9999' //测试
// const url = 'http://192.168.31.169:9999' //长龙
// const url = 'http://192.168.31.134:9999' //嘉豪
// const url = 'http://192.168.31.100:9999' //王笑
// const url = 'http://nitu5e.natappfree.cc' //王笑
const url = 'http://62.234.122.43:9999' //王笑

const CompressionWebpackPlugin = require('compression-webpack-plugin')
const productionGzipExtensions = ['js', 'css']


Laden…
Annuleren
Opslaan