Skip to content

T
tl_estate
Commit 27facf9b authored by clone's avatar clone
Browse files
Options

Merge branch 'wx0604' of https://gitee.com/zwyjjc/tl_estate into wx0604

parents 483401a6 5d756a07
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 133 deletions
application/api/controller/Member.php
View file @ 27facf9b
......@@ -399,19 +399,25 @@ class Member extends Basic
* @throws \think\exception\DbException
*/
public function inviteList() {
// $id = $this->params['id'];
// if (empty($id)) {
//$id = $this->params['id'];
//if (empty($id)) {
$id = $this->userId;
// }
//$id = 5741;
//}
$data['status'] = 101;
$data['data'] = array();
$data['msg'] = '';
if ($id) {
$pageNo = empty($params['pageNo']) ? 1 : $params['pageNo'];
$pageSize = empty($params['pageSize']) ? 15 : $params['pageSize'];
$result = $this->user->field('id,user_nick,user_phone,create_time')
->where('referrer_id',$id)
->where('status',0)
->order('create_time desc')
->limit($pageSize)
->page($pageNo)
->select();
$data_arr = [];
foreach ($result as $k=>$v) {
......@@ -420,8 +426,14 @@ class Member extends Basic
$data_arr[$k]['user_phone'] = hide_customer_phone($arr['user_phone']);
$data_arr[$k]['create_time'] = date('Y-m-d', strtotime($arr['create_time']));
}
$data['data'] = $data_arr;
$data['status'] = 200;
$data['data']['list'] = $data_arr;
$data['status'] = 200;
$data['data']['total'] = $this->user->field('id,user_nick,user_phone,create_time')
->where('referrer_id',$id)
->where('status',0)
->order('create_time desc')
->count();
} else {
$data['msg'] = 'id is null';
}
......
public/appnew/src/components/achieveMain/achieveRegion.vue
View file @ 27facf9b
......@@ -31,30 +31,30 @@
<div class="main-content-area">
<!--tab切换及title区域-->
<section class="ul_header por">
<p class="ul_title">
<span v-for="(item,index) in tabsMain" :key="item.title" :class="{active:index == initTabNumMain}" @click="tabMain(index)">{{item.title}}</span>
<p class="ul_title flex">
<span v-for="(item,index) in tabsMain" :key="item.title" class="flex-center" :class="{active:index == initTabNumMain}" @click="tabMain(index)">{{item.title}}</span>
</p>
<div class="div-tri">
<div class="box-tri-1"></div>
<div class="box-tri-2" :style="'left: '+countLeft+'rem;'"></div>
</div>
<p class="ul_title_add add_zz" v-for="(item,index) in tabsMain" :key="item.title" v-show="index == initTabNumMain">
<p class="ul_title_add flex" v-for="(item,index) in tabsMain" :key="item.title" v-show="index == initTabNumMain">
<span v-for="(item2,index2) in item.titleList">{{item2}}</span>
</p>
</section>
<!--主列表区域-->
<ul class='achieve_zz_ul' v-for="(item,index) in tabsMain" :key="item.title" v-show="index == initTabNumMain" :id="'listall_'+index">
<li v-for="(item2,index2) in item.dataList" :data-id="item2.store_id">
<li class="flex" v-for="(item2,index2) in item.dataList" :data-id="item2.store_id">
<div class="db-line">
<div class="ellipsis">{{item2.store_name}}</div>
<div class="ellipsis">{{item2.name}}</div>
</div>
<div>{{item2.add_house_num}}</div>
<div>{{item2.add_user_num}}</div>
<div>{{item2.march_in_num}}</div>
<div>{{item2.performance}}</div>
<div>{{item2.official_receipts}}</div>
<div class="flex-center">{{item2.add_house_num}}</div>
<div class="flex-center">{{item2.add_user_num}}</div>
<div class="flex-center">{{item2.march_in_num}}</div>
<div class="flex-center">{{item2.performance}}</div>
<div class="flex-center">{{item2.official_receipts}}</div>
</li>
</ul>
</div>
......@@ -82,7 +82,7 @@
headerData: {
'title': '门店业绩',
'noborder': true,
'isBack': false
'isBack': true
},
token: '',
startDate: '',
......@@ -307,7 +307,23 @@
if(_data.data) {
_this.tabsMain[_this.initTabNumMain].dataList = _data.data;
};
fn && fn();
// _this.tabsMain[_this.initTabNumMain].dataList = [{
// 'store_name': 'eterte',
// 'name': 'bb',
// 'add_house_num': 155,
// 'add_user_num': 156,
// 'march_in_num': 157,
// 'performance': 158,
// 'official_receipts': 159,
// },{
// 'store_name': 'eterte',
// 'name': 'bb',
// 'add_house_num': 155,
// 'add_user_num': 156,
// 'march_in_num': 157,
// 'performance': 158,
// 'official_receipts': 159,
// }];
} else {
layer.tipsX(response.data.msg);
}
......@@ -332,6 +348,7 @@
</script>
<style scoped>
/*顶部背景图，及圈圈部分样式*/
.achieve-top {
width: 100%;
background: url(images/bg_yj-.png) no-repeat center center /7.5rem 4.9rem;
......@@ -411,6 +428,8 @@
margin-top: -0.05rem;
}
/*搜索日期部分样式重写*/
.achieve-top-time-area{
bottom: .3rem;
......@@ -419,7 +438,7 @@
height: .6rem;
justify-content: center;
color: white;
font-size: .24rem;
font-size: .26rem;
}
.input-area-left{
flex: 5.8rem 0 0;
......@@ -461,42 +480,40 @@
}
/*搜索日期部分样式重写*/
/*列表*/
/*tab切换部分样式*/
.main-content-area {
width: 100%;
box-sizing: border-box;
background: white;
padding: 0 0.3rem;
}
/*js里的样式分离*/
/*2017-05-09 xishifeng*/
/********************************中间两行的 标题**********************************/
.ul_header>p {
.ul_header>p:nth-last-of-type(1) {
border-bottom: 1px solid #F2F2F2;
overflow: hidden;
}
.ul_header>p>span{
float: left;
}
.ul_header>p.ul_title {
height: 0.9rem;
.ul_title {
height: 0.8rem;
font-size: 0.32rem;
margin-top: -0.05rem;
font-weight: bold;
color: #333;
justify-content: center;
}
.ul_title>span {
flex: 45% 0 0;
font-size: 0.32rem;
margin-top: 0.25rem;
}
.ul_header>p.ul_title_add {
.ul_title>span.active {
color: #ff9419;
}
/*三角划线部分样式*/
p.ul_title_add {
height: 0.7rem;
box-sizing: border-box;
}
......@@ -506,38 +523,12 @@
color: #666;
line-height: .7rem;
text-align: center;
}
/*组长看到的样式*/
p.ul_title {
height: 0.8remt;
border-bottom: none;
position: relative;
}
p.ul_title>span {
margin-top: 0.25rem;
color: #333;
}
p.ul_title>span.active {
color: #ff9419;
}
p.ul_title>span:nth-of-type(1) {
box-sizing: border-box;
/*width: 3.3rem;*/
padding-left: 0.8rem;
margin-left: 0;
float: left;
width: 1.18rem;
}
p.ul_title>span:nth-of-type(2) {
padding-right: 0.8rem;
margin-left: 0;
/*width: 3.3rem;*/
box-sizing: border-box;
float: right;
p.ul_title_add>span:nth-of-type(1) {
width: 0.9rem;
text-align: left;
}
.div-tri {
......@@ -561,78 +552,21 @@
left: 1.85rem;
background-color: white;
}
/*三角划线部分样式*/
p.add_zz>span {
width: 1.18rem;
}
p.add_zz>span:nth-of-type(1) {
width: 0.9rem;
text-align: left;
}
/********************************************li项*************************************************/
.main-content-area ul li {
/*主要列表区域样式*/
.achieve_zz_ul>li{
border-bottom: 1px solid #f2f2f2;
/*height: 1.2rem;*/
cursor: pointer;
position: relative;
overflow: hidden;
}
.main-content-area ul li::after {
content: "";
/*background: url(../images/inat.png) no-repeat right center;*/
background-size: 0.14rem 0.26rem;
position: absolute;
right: 0;
top: 0;
width: 0.4rem;
height: 1.2rem;
}
.main-content-area ul li>div {
float: left;
color: #333;
font-size: 0.3rem;
/*height: 1.2rem;*/
box-sizing: border-box;
text-align: center;
overflow: hidden;
.achieve_zz_ul>li>div{
word-break: break-all;
padding-top: .2rem .05rem;
}
/*组长看到的样式*/
.achieve_zz_ul>li>div {
/*line-height: 1.2rem;*/
/*width: 1.18rem;*/
width: 17%;
}
.achieve_zz_ul>li>div:nth-of-type(1) {
text-align: left;
white-space: nowrap;
text-overflow: ellipsis;
}
.achieve_zz_ul>li>div:nth-of-type(2) {
width: 0.9rem;
padding-right: 0.3rem;
}
/******************************案场业绩时的导航栏下拉框***************************/
/*补充*/
.db-line {
padding-top: .2rem;
width: 1.18rem;
color: #333;
font-size: .24rem;
}
.db-line>div {
line-height: .4rem;
font-size: .2rem;
.achieve_zz_ul>li>div:nth-of-type(1){
width: .9rem;
padding: .15rem 0;
}
</style>-->
\ No newline at end of file
</style>
\ No newline at end of file
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