Skip to content

T
tl_estate
Commit 2543602b authored by zw's avatar zw
Browse files
Options

Merge branch 'test'

parents 779a888f fe7422e6
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 8 deletions
public/app/dist/index.html
View file @ 2543602b
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
if(!doc.addEventListener) return; if(!doc.addEventListener) return;
win.addEventListener(resizeEvt, recalc, false); win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', recalc, false); doc.addEventListener('DOMContentLoaded', recalc, false);
})(document, window);</script><link href=./static/css/app.a76e29d54235be617793e54941f1b2ba.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.f7f0a178d5f517c460bf.js></script></body></html> })(document, window);</script><link href=./static/css/app.779816c9a756d6a3ad4db5d00c02d253.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.fe75ab74bad5939b18eb.js></script></body></html>
\ No newline at end of file \ No newline at end of file
public/app/dist/static/js/app.f7f0a178d5f517c460bf.js deleted 100644 → 0
View file @ 779a888f
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.fe75ab74bad5939b18eb.js 0 → 100644
View file @ 2543602b
This source diff could not be displayed because it is too large. You can view the blob instead.
public/appnew/src/components/phoneDetail/phoneDetail.vue
View file @ 2543602b
...@@ -50,6 +50,12 @@ ...@@ -50,6 +50,12 @@
</div> </div>
</div> </div>
</div> </div>
<div style="text-align:center ;margin-top:0.2rem;" v-if = " items.length == 0 && !itemsta " >
<span style=" color :#999999">请输入筛选项，点击筛选按钮获取数据</span>
</div>
<div style="text-align:center ;margin-top:0.2rem;" v-else>
<span style=" color :#999999">暂无数据</span>
</div>
</div> </div>
</template> </template>
...@@ -86,6 +92,7 @@ ...@@ -86,6 +92,7 @@
console.log(time1) console.log(time1)
return { return {
items : [], items : [],
itemsta : false ,
headerData: { headerData: {
'title': "通话记录", 'title': "通话记录",
'noborder': false, 'noborder': false,
...@@ -342,6 +349,7 @@ ...@@ -342,6 +349,7 @@
items.push(list[i]); items.push(list[i]);
} }
that.items = items; that.items = items;
that.itemsta = true ;
} else { } else {
layer.tipsX(res.data.msg); layer.tipsX(res.data.msg);
......
public/appnew/src/components/priceReport/priceReport.vue
View file @ 2543602b
...@@ -290,6 +290,12 @@ ...@@ -290,6 +290,12 @@
"str2" : list.length > 1 ? (list[1].id ? list[1].id : "-") :"-", "str2" : list.length > 1 ? (list[1].id ? list[1].id : "-") :"-",
"str3" : list.length > 2 ? (list[2].id ? list[2].id : "-") :"-", "str3" : list.length > 2 ? (list[2].id ? list[2].id : "-") :"-",
}, },
{
"msg" : "成交报告ID" ,
"str1" : list.length > 0 ? (list[0].bargain_id ? list[0].bargain_id : "-") :"-",
"str2" : list.length > 1 ? (list[1].bargain_id ? list[1].bargain_id : "-") :"-",
"str3" : list.length > 2 ? (list[2].bargain_id ? list[2].bargain_id : "-") :"-",
},
{ {
"msg" : "商铺地址" , "msg" : "商铺地址" ,
"str1" : list.length > 0 ? (list[0].house_address ? list[0].house_address : "-") :"-", "str1" : list.length > 0 ? (list[0].house_address ? list[0].house_address : "-") :"-",
...@@ -387,6 +393,12 @@ ...@@ -387,6 +393,12 @@
"str2" : list.length > 1 ? (list[1].id ? list[1].id : "-") :"-", "str2" : list.length > 1 ? (list[1].id ? list[1].id : "-") :"-",
"str3" : list.length > 2 ? (list[2].id ? list[2].id : "-") :"-", "str3" : list.length > 2 ? (list[2].id ? list[2].id : "-") :"-",
}, },
{
"msg" : "成交报告ID" ,
"str1" : list.length > 0 ? (list[0].bargain_id ? list[0].bargain_id : "-") :"-",
"str2" : list.length > 1 ? (list[1].bargain_id ? list[1].bargain_id : "-") :"-",
"str3" : list.length > 2 ? (list[2].bargain_id ? list[2].bargain_id : "-") :"-",
},
{ {
"msg" : "成交商铺地址" , "msg" : "成交商铺地址" ,
"str1" : list.length > 0 ? (list[0].house_address ? list[0].house_address : "-") :"-", "str1" : list.length > 0 ? (list[0].house_address ? list[0].house_address : "-") :"-",
......
public/appnew/src/components/publicEg/headTabPublic.vue
View file @ 2543602b
...@@ -5,13 +5,13 @@ ...@@ -5,13 +5,13 @@
<div class="title"> <div class="title">
<!--<div class="title_area" v-for=" (item,index) in data.title">--> <!--<div class="title_area" v-for=" (item,index) in data.title">-->
<div class="title_area"> <div class="title_area" >
<h2 @click="changeType"> 月赛</h2> <h2 @click="changeType(0)" style="width : 1rem ; "> 月赛</h2>
<div :class="status == 0 ? 'border_line' : ''"></div> <div :class="status == 0 ? 'border_line' : ''"></div>
</div> </div>
<div class="title_area"> <div class="title_area">
<!--<h2 @click="changeType"> {{data.title[index]}}</h2>--> <!--<h2 @click="changeType"> {{data.title[index]}}</h2>-->
<h2 @click="changeType"> 周赛</h2> <h2 @click="changeType(1)" style="width : 1rem ; "> 周赛</h2>
<div :class="status == 1 ? 'border_line' : ''"></div> <div :class="status == 1 ? 'border_line' : ''"></div>
</div> </div>
</div> </div>
...@@ -59,9 +59,11 @@ ...@@ -59,9 +59,11 @@
}); });
} }
}, },
changeType : function(){ changeType : function(index){
var that = this ; var that = this ;
if (index == 1 ){
layer.tipsX("功能正在开发中，请耐心等待。。。"); layer.tipsX("功能正在开发中，请耐心等待。。。");
}
// var status = that.status ; // var status = that.status ;
// status = status - 1 ; // status = status - 1 ;
// if ( status < 0 ){ // if ( status < 0 ){
...@@ -158,7 +160,7 @@ ...@@ -158,7 +160,7 @@
background-color :#ff9318; background-color :#ff9318;
border-radius :2.5px; border-radius :2.5px;
text-align:center ; text-align:center ;
margin-left : .93rem ; margin-left : 1.08rem ;
position:relative; position:relative;
top:-0.1rem; top:-0.1rem;
} }
......
public/resource/js/performance_ranking.js
View file @ 2543602b
...@@ -47,7 +47,7 @@ define (['doT', 'ckfinder','ckfinderStart', 'css!style/home.css',"datetimepicker ...@@ -47,7 +47,7 @@ define (['doT', 'ckfinder','ckfinderStart', 'css!style/home.css',"datetimepicker
if(fujianArray){ if(fujianArray){
for ( var i = 0 ; i < fujianArray.length ; i++ ){ for ( var i = 0 ; i < fujianArray.length ; i++ ){
var _tempArr = fujianArray[i].split('/'); var _tempArr = fujianArray[i].split('/');
fujianArray[i] && $('#fujian_ul').append('<li><a href="{0}" title="点击可下载">{1}</a></li>'.stringFormatObj({ fujianArray[i] && $('#fujian_ul').append('<li><a href="{0}" title="点击可下载" target="_Blank">{1}</a></li>'.stringFormatObj({
'0': fujianArray[i], '0': fujianArray[i],
'1': that.dealFileName(decodeURI(_tempArr[_tempArr.length-1])) '1': that.dealFileName(decodeURI(_tempArr[_tempArr.length-1]))
})); }));
......
public/resource/js/reportList.js
View file @ 2543602b
...@@ -1772,6 +1772,8 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', ' ...@@ -1772,6 +1772,8 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
//添加 佣金总计 //添加 佣金总计
$('.total-commission-should').html(data.data.total_commission); $('.total-commission-should').html(data.data.total_commission);
$('.total-commission-real').html(data.data.total_income_money); $('.total-commission-real').html(data.data.total_income_money);
$('.total-commission-no').html(0);//未收佣金总计 置0
if(data.data.total_commission){ if(data.data.total_commission){
$('.total-commission-no').html((data.data.total_commission*1-data.data.total_income_money*1).toFixed(2)); $('.total-commission-no').html((data.data.total_commission*1-data.data.total_income_money*1).toFixed(2));
} }
......
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