Commit 4a40e4796599fd115d08ded70a1fd3b720e100c8

Authored by wangfan
1 parent bffe07e7

customer

@@ -7,7 +7,8 @@ @@ -7,7 +7,8 @@
7 "pages/book/b_desk", 7 "pages/book/b_desk",
8 "pages/customer/index", 8 "pages/customer/index",
9 "pages/customer/detail_owner", 9 "pages/customer/detail_owner",
10 - "pages/customer/detail_customer" 10 + "pages/customer/detail_customer",
  11 + "pages/customer/list"
11 ], 12 ],
12 "window": { 13 "window": {
13 "backgroundTextStyle": "light", 14 "backgroundTextStyle": "light",
@@ -6,11 +6,8 @@ @@ -6,11 +6,8 @@
6 <view class="title">{{detail.topic?'#'+detail.topic+'#':''}}</view> 6 <view class="title">{{detail.topic?'#'+detail.topic+'#':''}}</view>
7 </view> 7 </view>
8 <view class="bottom"> 8 <view class="bottom">
9 - <view class="rdateStr">{{detail.rdateStr}}</view> 9 + <view class="rdateStr Medium">{{detail.rdateStr}}</view>
10 <view class="seller flex-lr" bindtap="lookLocation"> 10 <view class="seller flex-lr" bindtap="lookLocation">
11 - <view class="avatar">  
12 - <image src="{{detail.seller.seller_image}}" mode="aspectFill"></image>  
13 - </view>  
14 <view class="seller-info"> 11 <view class="seller-info">
15 <view class="name Medium">{{detail.seller.sellername}}</view> 12 <view class="name Medium">{{detail.seller.sellername}}</view>
16 <view class="addr">{{detail.seller.map_address}}</view> 13 <view class="addr">{{detail.seller.map_address}}</view>
@@ -19,8 +16,8 @@ @@ -19,8 +16,8 @@
19 <image src="../image/gps-icon.png"></image> 16 <image src="../image/gps-icon.png"></image>
20 </view> 17 </view>
21 </view> 18 </view>
22 - <view>{{detail.tableFirst}} {{detail.tableSubInfo}}</view>  
23 - <view class="flex-lr" bindtap="showManager"> 19 + <view class="tableInfo">{{detail.tableFirst}} <text class="tableSubInfo"> {{detail.tableSubInfo}}</text></view>
  20 + <view class="flex-lr showManager" bindtap="showManager">
24 <view class="">容客户经理-{{detail.cusman}}</view> 21 <view class="">容客户经理-{{detail.cusman}}</view>
25 <view style="text-decoration: underline">联系客户经理</view> 22 <view style="text-decoration: underline">联系客户经理</view>
26 </view> 23 </view>
@@ -29,21 +26,23 @@ @@ -29,21 +26,23 @@
29 <userinfo binduserinfo="userinfo" class="share-but-view"> 26 <userinfo binduserinfo="userinfo" class="share-but-view">
30 <view class="share-but Regular">我愿意</view> 27 <view class="share-but Regular">我愿意</view>
31 </userinfo> 28 </userinfo>
32 - <view class="line-text">  
33 - <view class="text">  
34 - <view>{{detail.customers.length}}人参与</view>  
35 - </view>  
36 - </view>  
37 - <view>  
38 - <block wx:for="{{detail.customers}}" wx:key="detail.customers.key">  
39 - <view class="flex-lr customers">  
40 - <view class="flex-ll">  
41 - <image src="{{item.headimgurl}}" class="avatar" mode="aspectFill"></image>  
42 - <view>{{item.nickname}}</view> 29 + <block wx:if="{{detail.customers.length>0}}">
  30 + <view class="line-text">
  31 + <view class="text">
  32 + <view>{{detail.customers.length}}人参与</view>
43 </view> 33 </view>
44 - <view>{{item.openid==detail.openid?'发起人':'已接受'}}</view> 34 + </view>
  35 + <view>
  36 + <block wx:for="{{detail.customers}}" wx:key="detail.customers.key">
  37 + <view class="flex-lr customers">
  38 + <view class="flex-ll">
  39 + <image src="{{item.headimgurl}}" class="avatar" mode="aspectFill"></image>
  40 + <view>{{item.nickname}}</view>
  41 + </view>
  42 + <view>{{item.openid==detail.openid?'发起人':'已接受'}}</view>
  43 + </view>
  44 + </block>
45 </view> 45 </view>
46 </block> 46 </block>
47 - </view>  
48 </view> 47 </view>
49 <manager manager="{{detail}}" id="manager"></manager> 48 <manager manager="{{detail}}" id="manager"></manager>
@@ -6,6 +6,8 @@ @@ -6,6 +6,8 @@
6 } 6 }
7 .seller{ 7 .seller{
8 height: 84rpx; 8 height: 84rpx;
  9 + margin-top: 14rpx;
  10 + margin-bottom: 46rpx;
9 } 11 }
10 .seller .avatar{ 12 .seller .avatar{
11 min-width: 60rpx; 13 min-width: 60rpx;
@@ -21,7 +23,6 @@ @@ -21,7 +23,6 @@
21 width: 60rpx; 23 width: 60rpx;
22 height: 84rpx; 24 height: 84rpx;
23 width:100%; 25 width:100%;
24 - padding: 0 14rpx;  
25 } 26 }
26 .seller .addr-icon{ 27 .seller .addr-icon{
27 min-width: 32rpx; 28 min-width: 32rpx;
@@ -33,13 +34,14 @@ @@ -33,13 +34,14 @@
33 } 34 }
34 .seller .addr{ 35 .seller .addr{
35 font-size: 26rpx; 36 font-size: 26rpx;
  37 + color:#999999;
36 } 38 }
37 .hr{ 39 .hr{
38 border-top: 2rpx solid #F1F0F4; 40 border-top: 2rpx solid #F1F0F4;
39 } 41 }
40 .share-but-view{ 42 .share-but-view{
41 - margin-top: 76rpx;  
42 - margin-bottom: 96rpx; 43 + margin-top: 128rpx;
  44 + margin-bottom: 86rpx;
43 display: block; 45 display: block;
44 } 46 }
45 .share-but{ 47 .share-but{
@@ -75,4 +77,37 @@ @@ -75,4 +77,37 @@
75 width:80rpx; 77 width:80rpx;
76 height:80rpx; 78 height:80rpx;
77 border-radius: 50%; 79 border-radius: 50%;
  80 +}
  81 +.tip{
  82 + font-size: 26rpx;
  83 + color:#666666;
  84 + margin-top: 10rpx;
  85 + margin-bottom: 48rpx;
  86 +}
  87 +.card{
  88 + border-radius: 10rpx;
  89 + box-shadow: 2rpx 2rpx 14rpx 6rpx rgba(231,228,228,.5);
  90 +}
  91 +.card .top{
  92 + min-height: 160rpx;
  93 +}
  94 +.card .bottom{
  95 + background-color: #EAECEE;
  96 + border-radius: 10rpx;
  97 + box-shadow: 2rpx 2rpx 14rpx 6rpx rgba(231,228,228,.5);
  98 + padding: 36rpx 46rpx 40rpx;
  99 +}
  100 +.card .bottom .rdateStr{
  101 + font-size: 30rpx;
  102 +}
  103 +.tableInfo{
  104 + font-size: 30rpx;
  105 +}
  106 +.tableSubInfo{
  107 + font-size: 30rpx;
  108 + color:#999999;
  109 +}
  110 +.showManager{
  111 + font-size: 30rpx;
  112 + margin-top: 26rpx;
78 } 113 }
@@ -46,7 +46,7 @@ Page({ @@ -46,7 +46,7 @@ Page({
46 } else { 46 } else {
47 url = 'detail_customer'; 47 url = 'detail_customer';
48 if (res.data.openid == opt.openid) { 48 if (res.data.openid == opt.openid) {
49 - //url = 'detail_owner'; 49 + url = 'detail_owner';
50 } 50 }
51 } 51 }
52 url+='?id='+opt.id 52 url+='?id='+opt.id
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 "id": 6, 72 "id": 6,
73 "name": "pages/customer/index", 73 "name": "pages/customer/index",
74 "pathName": "pages/customer/index", 74 "pathName": "pages/customer/index",
75 - "query": "id=63" 75 + "query": "id=64"
76 } 76 }
77 ] 77 ]
78 } 78 }
@@ -40,7 +40,7 @@ function rpc(host='',act,data={},fouce=false,header={},silence=true,cachetime=0, @@ -40,7 +40,7 @@ function rpc(host='',act,data={},fouce=false,header={},silence=true,cachetime=0,
40 return new Promise((success,fail)=>{ 40 return new Promise((success,fail)=>{
41 if(true){ 41 if(true){
42 getCache.isCache=true; 42 getCache.isCache=true;
43 - console.log(cache_key+'->use cache',getCache); 43 + console.log(cache_key+'\nuse cache',getCache);
44 success(getCache); 44 success(getCache);
45 }else{ 45 }else{
46 fail(); 46 fail();