Skip to content

W
wechatapp.shangjiadao.com
Commit 52284b9c authored by wangxuelai's avatar wangxuelai
Browse files
Options

Merge remote-tracking branch 'origin/sj-dev-v3' into wxl-develop-ad

parents f0e93793 cd4e315b
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 26 deletions
business/pages/orgpotentialcustomer/index.js
View file @ 52284b9c
......@@ -33,7 +33,7 @@ Page({
backTopValue:false,
listLoading: false,
selectedCustomer: {},
detailShow: true,
detailShow: false,
classInfo: {}
},
onLoad: function(options) { // Do some initialize when page load.
......@@ -53,7 +53,7 @@ Page({
hasmore: true
})
this.memberListGet('init');
this.circleDetail(this.data.id);
// this.circleDetail(this.data.id);
},
onHide: function() { // Do something when page hide.
......@@ -220,7 +220,7 @@ Page({
info.custom = [];
} else {
try {
info.custom = JSON.parse(info.custom);
info.custom =info.custom? JSON.parse(info.custom):'';
} catch (e) {
info.custom = [];
}
......
business/pages/orgpotentialcustomer/index.wxml
View file @ 52284b9c
......@@ -13,22 +13,25 @@
<text class="count" selectable="false" space="false" decode="false">{{memberTotal}}</text>
<text class="" selectable="false" space="false" decode="false">个潜在客户</text>
</view>
<view class="customer-item clearfix" hover-class="none" hover-stop-propagation="false">
<view class="customer-item clearfix" hover-class="none" hover-stop-propagation="false" wx:for="{{memberList}}" wx:key="{{index}}">
<view class="info-box" hover-class="none" hover-stop-propagation="false">
<view class="avator-box" hover-class="none" hover-stop-propagation="false">
<image class="" src="{{imageRoot}}2b/potentialcustomer/emptyimg.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="" src="{{filter.imagify(item.avatar)}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
</view>
<view class="left-box" hover-class="none" hover-stop-propagation="false">
<view class="center-box" hover-class="none" hover-stop-propagation="false">
<view class="name" hover-class="none" hover-stop-propagation="false">武剑奇</view>
<view class="time" hover-class="none" hover-stop-propagation="false">2018-09-26 12:12</view>
<view class="name" hover-class="none" hover-stop-propagation="false">{{item.name}}</view>
<view class="time" hover-class="none" hover-stop-propagation="false">{{item.created_at}}</view>
</view>
<view class="phone-box" hover-class="none" hover-stop-propagation="false">18735113988</view>
<view class="phone-box" hover-class="none" hover-stop-propagation="false" bindtap="makecall" data-mobile="{{item.mobile}}">{{item.mobile}}</view>
</view>
</view>
<view class="from-box" hover-class="none" hover-stop-propagation="false">
<view class="content" hover-class="none" hover-stop-propagation="false">来源：小星星英语培训班。速成</view>
<view class="btn" hover-class="none" hover-stop-propagation="false">查看详情</view>
<view class="content" hover-class="none" hover-stop-propagation="false" wx:if="{{item.source_type==1}}">来源：领取体验课</view>
<view class="content" hover-class="none" hover-stop-propagation="false" wx:if="{{item.source_type==2}}">来源：学校活动</view>
<view class="content" hover-class="none" hover-stop-propagation="false" wx:if="{{item.source_type==3}}">来源：报名咨询</view>
<view class="content" hover-class="none" hover-stop-propagation="false" wx:if="{{item.source_type==4}}">来源：课程报名</view>
<view class="btn" hover-class="none" hover-stop-propagation="false" bindtap="seeCustomerDetail" data-info="{{item}}">查看详情</view>
</view>
</view>
<list-loading loading="{{listLoading}}"></list-loading>
......@@ -52,32 +55,35 @@
<view class="content-header clearfix {{selectedCustomer.custom.length > 0 ? 'border-b-1px' : ''}}" hover-class="none" hover-stop-propagation="false">
<image class="avator" src="{{filter.imagify(selectedCustomer.avatar)}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<view class="namemobile" hover-class="none" hover-stop-propagation="false">
<view class="name" hover-class="none" hover-stop-propagation="false">张飞</view>
<view class="name" hover-class="none" hover-stop-propagation="false">{{selectedCustomer.name}}</view>
<view class="mobiletime clearfix" hover-class="none" hover-stop-propagation="false">
<view class="createtime" hover-class="none" hover-stop-propagation="false">2018-09-26 12:12</view>
<view class="createtime" hover-class="none" hover-stop-propagation="false">{{selectedCustomer.created_at}}</view>
</view>
</view>
<view class="mobile" hover-class="none" hover-stop-propagation="false" data-mobile="{{selectedCustomer.mobile}}" bindtap="makecall" >13548871935</view>
<view class="mobile" hover-class="none" hover-stop-propagation="false" data-mobile="{{selectedCustomer.mobile}}" bindtap="makecall" >{{selectedCustomer.mobile}}</view>
</view>
<view class="from-info-box" hover-class="none" hover-stop-propagation="false" >
<view class="from-box-item" hover-class="none" hover-stop-propagation="false" >
<!-- <view class="from-box-item" hover-class="none" hover-stop-propagation="false" >
<view class="name" hover-class="none" hover-stop-propagation="false" >来源:</view>
<view class="text" hover-class="none" hover-stop-propagation="false" >小星星英语培训班。速成科目【的很快大厦考虑的话撒谎的】</view>
</view>
</view> -->
<view class="from-box-item" hover-class="none" hover-stop-propagation="false" >
<view class="name" hover-class="none" hover-stop-propagation="false" >来源:</view>
<view class="text" hover-class="none" hover-stop-propagation="false" >小星星英语培训班。速成科目【的很快大厦考虑的话撒谎的】</view>
<view class="name" hover-class="none" hover-stop-propagation="false" >类型:</view>
<view class="text" hover-class="none" hover-stop-propagation="false" wx:if="{{selectedCustomer.source_type==1}}">领取体验课</view>
<view class="text" hover-class="none" hover-stop-propagation="false" wx:if="{{selectedCustomer.source_type==2}}">学校活动</view>
<view class="text" hover-class="none" hover-stop-propagation="false" wx:if="{{selectedCustomer.source_type==3}}">报名咨询</view>
<view class="text" hover-class="none" hover-stop-propagation="false" wx:if="{{selectedCustomer.source_type==4}}">课程报名</view>
</view>
</view>
<view class="extra-info-box" hover-class="none" hover-stop-propagation="false" >
<view class="extra-info-item" hover-class="none" hover-stop-propagation="false">
<view class="extra-info-box" hover-class="none" hover-stop-propagation="false" wx:if="{{selectedCustomer.custom.length > 0}}">
<view class="extra-info-item" hover-class="none" hover-stop-propagation="false" wx:for="{{selectedCustomer.custom}}" wx:key="{{key}}">
<view class="question" hover-class="none" hover-stop-propagation="false">
<view class="bluedot" hover-class="none" hover-stop-propagation="false"></view>
<view class="questiontext" hover-class="none" hover-stop-propagation="false">刘备</view>
<view class="questiontext" hover-class="none" hover-stop-propagation="false">{{item.value}}</view>
</view>
<view class="question answer" hover-class="none" hover-stop-propagation="false">
<view class="bluedot" hover-class="none" hover-stop-propagation="false"></view>
<view class="questiontext" hover-class="none" hover-stop-propagation="false">啊实打实的</view>
<view class="questiontext" hover-class="none" hover-stop-propagation="false">{{item.userInput}}</view>
</view>
</view>
</view>
......
business/pages/orgpotentialcustomer/index.wxss
View file @ 52284b9c
......@@ -178,7 +178,8 @@
justify-content: space-between;
}
.content .customer-item .from-box .content{
width:383rpx;
/* width:383rpx; */
display: inline-block;
height:40rpx;
line-height: 40rpx;
background:rgba(246,247,249,1);
......@@ -187,10 +188,11 @@
font-family:PingFang-SC-Regular;
font-weight:400;
color:rgba(136,136,136,1);
padding: 0 20rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
text-align: center;
text-align: center;
}
.content .customer-item .from-box .btn{
font-size:24rpx;
......@@ -297,10 +299,10 @@
font-family:PingFang-SC-Medium;
font-weight:500;
color:rgba(101,184,244,1);
padding-left: 82rpx;
padding-left: 64rpx;
}
.detail-info-content .from-info-box{
padding: 26rpx 50rpx 0 44rpx;
padding: 26rpx 50rpx 40rpx 44rpx;
}
.detail-info-content .from-info-box .from-box-item{
display: flex;
......@@ -311,7 +313,7 @@
line-height:40rpx;
}
.detail-info-content .from-info-box .from-box-item .name{
width: 120rpx;
width: 100rpx;
}
.detail-info-content .extra-info-box {
padding: 40rpx 43rpx 26rpx;
......
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