Commit 6c15f370602aa8c1370ba296c09d445db1318f0c

Authored by wangfan
1 parent 4110a574

smsbatch

@@ -33,5 +33,8 @@ Component({ @@ -33,5 +33,8 @@ Component({
33 this.triggerEvent('click',{...util.attr(e)}); 33 this.triggerEvent('click',{...util.attr(e)});
34 this.hide(); 34 this.hide();
35 }, 35 },
  36 + actionSheetChange(){
  37 + this.hide();
  38 + }
36 } 39 }
37 }) 40 })
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <action-sheet hidden="{{actionSheetHidden}}" bindchange="actionSheetChange"> 2 <action-sheet hidden="{{actionSheetHidden}}" bindchange="actionSheetChange">
3 <view class="tip"><slot></slot></view> 3 <view class="tip"><slot></slot></view>
4 <block wx:for="{{items}}" wx:key="items.key"> 4 <block wx:for="{{items}}" wx:key="items.key">
5 - <action-sheet-item class="item" bindtap="bindItemTap" data-value="{{item}}" data-index="{{index}}">{{item}}</action-sheet-item> 5 + <action-sheet-item bindtap="bindItemTap" data-value="{{item}}" data-index="{{index}}">{{item}}</action-sheet-item>
6 </block> 6 </block>
7 - <action-sheet-cancel class="cancel" bindtap="bindItemTap">取消</action-sheet-cancel> 7 + <action-sheet-cancel bindtap="bindItemTap">取消</action-sheet-cancel>
8 </action-sheet> 8 </action-sheet>
1 /* components/actionSheet/index.wxss */ 1 /* components/actionSheet/index.wxss */
  2 +action-sheet-item,action-sheet-cancel{
  3 + padding: 0;
  4 + margin:0;
  5 + height: 100rpx;
  6 + line-height: 100rpx;
  7 +}
2 .tip{ 8 .tip{
3 color: #999999; 9 color: #999999;
4 font-size: 36rpx; 10 font-size: 36rpx;
5 text-align: center; 11 text-align: center;
6 - padding: 20rpx 0; 12 + height: 100rpx;
  13 + line-height: 100rpx;
  14 +}
  15 +action-sheet-cancel{
  16 + padding: 0;
  17 + margin:0;
  18 + height: 60rpx;
  19 + line-height: 60rpx;
7 } 20 }
1 <!--components/book/smsbatch/rows.wxml--> 1 <!--components/book/smsbatch/rows.wxml-->
2 <view class="row flex-lr Medium"> 2 <view class="row flex-lr Medium">
3 - <view>{{item.addtimeStr}}</view>  
4 - <view>{{item.send_total}}人</view>  
5 - <view class="sms-status{{item.status}}"></view>  
6 - <block wx:if="{{item.status==-1}}">  
7 - <view> 3 + <view style="width: 100%;">
  4 + <formids url="/pages/book/smsbatch/detail?id={{item.id}}&seller_id={{item.sid}}" style="width: 100%;">
  5 + <view class="row flex-lr Medium" style="width: 100%;">
  6 + <view>{{item.addtimeStr}}</view>
  7 + <view>{{item.send_total}}人</view>
  8 + <view class="sms-status{{item.status}}"></view>
  9 + </view>
  10 + </formids>
  11 + </view>
  12 + <view style="min-width: 160rpx;margin-left: 50rpx;">
  13 + <block wx:if="{{item.status==-1}}">
8 <service> 14 <service>
9 <view class="opt-but">联系客服</view> 15 <view class="opt-but">联系客服</view>
10 </service> 16 </service>
11 - </view>  
12 - </block>  
13 - <block wx:elif="{{item.status==1}}">  
14 - <view>  
15 - <userinfo wx:if="{{hasScene==1}}" binduserinfo="sendMsg" data-id="{{item.id}}">  
16 - <view class="opt-but">立即发放</view>  
17 - </userinfo>  
18 - <sendsms wx:else="" bindtap="sendMsg" data-id="{{item.id}}">  
19 - <view class="opt-but">立即发放</view>  
20 - </sendsms>  
21 - </view>  
22 - </block>  
23 - <block wx:else="">  
24 - <formids url="/pages/book/smsbatch/detail?id={{item.id}}&seller_id={{item.sid}}">  
25 - <view class="opt-but">查看详情</view>  
26 - </formids>  
27 - </block> 17 + </block>
  18 + <block wx:elif="{{item.status==1}}">
  19 + <view>
  20 + <userinfo wx:if="{{hasScene==1}}" binduserinfo="sendMsg" data-id="{{item.id}}">
  21 + <view class="opt-but">立即发放</view>
  22 + </userinfo>
  23 + <sendsms wx:else="" bindtap="sendMsg" data-id="{{item.id}}">
  24 + <view class="opt-but">立即发放</view>
  25 + </sendsms>
  26 + </view>
  27 + </block>
  28 + <block wx:else="">
  29 + <formids url="/pages/book/smsbatch/detail?id={{item.id}}&seller_id={{item.sid}}">
  30 + <view class="opt-but">查看详情</view>
  31 + </formids>
  32 + </block>
  33 + </view>
28 </view> 34 </view>
1 <!--pages/book/smsbatch/list.wxml--> 1 <!--pages/book/smsbatch/list.wxml-->
2 -<nav id="nav" hasHome backgroundColor="#199095" color="#fefefe">短信记录</nav> 2 +<nav id="nav" hasHome backgroundColor="#199095" color="#fefefe">历史记录</nav>
3 <view class="page"> 3 <view class="page">
4 - <view class="Medium title">短信记录</view> 4 + <view class="Medium title">历史记录</view>
5 <block wx:if="{{list.length>0}}"> 5 <block wx:if="{{list.length>0}}">
6 - <view class="rows" style="width: 100%" wx:for="{{list}}" wx:key="list.key" > 6 + <view class="list-rows" wx:for="{{list}}" wx:key="list.key" >
7 <rows item="{{item}}"></rows> 7 <rows item="{{item}}"></rows>
8 </view> 8 </view>
9 </block> 9 </block>
@@ -7,12 +7,12 @@ @@ -7,12 +7,12 @@
7 font-size: 30rpx; 7 font-size: 30rpx;
8 color: #353535; 8 color: #353535;
9 } 9 }
10 -.rows{ 10 +.list-rows{
11 height: 140rpx; 11 height: 140rpx;
12 line-height: 140rpx; 12 line-height: 140rpx;
13 border-bottom: 2rpx solid #F1F0F4; 13 border-bottom: 2rpx solid #F1F0F4;
14 } 14 }
15 -.rows:last-child{ 15 +.list-rows:last-child{
16 border-bottom-width: 0; 16 border-bottom-width: 0;
17 } 17 }
18 .title{ 18 .title{