Showing
12 changed files
with
219 additions
and
6 deletions
| @@ -39,7 +39,8 @@ | @@ -39,7 +39,8 @@ | ||
| 39 | "pages/manager-invitation/setting/index", | 39 | "pages/manager-invitation/setting/index", |
| 40 | "pages/manager-invitation/setting/sellers", | 40 | "pages/manager-invitation/setting/sellers", |
| 41 | "pages/manager-invitation/setting/seller-editor", | 41 | "pages/manager-invitation/setting/seller-editor", |
| 42 | - "pages/manager-invitation/crm/index" | 42 | + "pages/manager-invitation/crm/index", |
| 43 | + "pages/manager-invitation/setting/history" | ||
| 43 | ], | 44 | ], |
| 44 | "subpackages": [ | 45 | "subpackages": [ |
| 45 | { | 46 | { |
| @@ -24,6 +24,7 @@ | @@ -24,6 +24,7 @@ | ||
| 24 | </block> | 24 | </block> |
| 25 | </view> | 25 | </view> |
| 26 | </view> | 26 | </view> |
| 27 | +<nav wx:else="" backgroundColor="rgba(0,0,0,0)" style="position: fixed;"></nav> | ||
| 27 | <view class="editor flex-vc" bindtap="goEditor" wx:if="{{!options.rid}}">修改内容</view> | 28 | <view class="editor flex-vc" bindtap="goEditor" wx:if="{{!options.rid}}">修改内容</view> |
| 28 | <!--//商务--> | 29 | <!--//商务--> |
| 29 | <template name="tpl-1"> | 30 | <template name="tpl-1"> |
| @@ -56,6 +56,7 @@ image{ | @@ -56,6 +56,7 @@ image{ | ||
| 56 | line-height: 50rpx; | 56 | line-height: 50rpx; |
| 57 | text-align: center; | 57 | text-align: center; |
| 58 | align-items:flex-start; | 58 | align-items:flex-start; |
| 59 | + width: 90%; | ||
| 59 | } | 60 | } |
| 60 | .seller .content:last-child{ | 61 | .seller .content:last-child{ |
| 61 | margin-bottom: 0; | 62 | margin-bottom: 0; |
pages/manager-invitation/setting/history.js
0 → 100644
| 1 | +// pages/manager-invitation/setting/history.js | ||
| 2 | +import util from '../../../utils/util'; | ||
| 3 | +import App from '../../../utils/api'; | ||
| 4 | +const {regeneratorRuntime} = global | ||
| 5 | +Page({ | ||
| 6 | + offset: 0, | ||
| 7 | + limit: 10, | ||
| 8 | + hasMore: true, | ||
| 9 | + /** | ||
| 10 | + * 页面的初始数据 | ||
| 11 | + */ | ||
| 12 | + data: { | ||
| 13 | + list:{}, | ||
| 14 | + hasMore:true, | ||
| 15 | + }, | ||
| 16 | + | ||
| 17 | + /** | ||
| 18 | + * 生命周期函数--监听页面加载 | ||
| 19 | + */ | ||
| 20 | + onLoad: function (options) { | ||
| 21 | + this.getLists(); | ||
| 22 | + }, | ||
| 23 | + | ||
| 24 | + /** | ||
| 25 | + * 生命周期函数--监听页面初次渲染完成 | ||
| 26 | + */ | ||
| 27 | + onReady: function () { | ||
| 28 | + | ||
| 29 | + }, | ||
| 30 | + | ||
| 31 | + /** | ||
| 32 | + * 生命周期函数--监听页面显示 | ||
| 33 | + */ | ||
| 34 | + onShow: function () { | ||
| 35 | + | ||
| 36 | + }, | ||
| 37 | + | ||
| 38 | + /** | ||
| 39 | + * 生命周期函数--监听页面隐藏 | ||
| 40 | + */ | ||
| 41 | + onHide: function () { | ||
| 42 | + | ||
| 43 | + }, | ||
| 44 | + | ||
| 45 | + /** | ||
| 46 | + * 生命周期函数--监听页面卸载 | ||
| 47 | + */ | ||
| 48 | + onUnload: function () { | ||
| 49 | + | ||
| 50 | + }, | ||
| 51 | + | ||
| 52 | + /** | ||
| 53 | + * 页面相关事件处理函数--监听用户下拉动作 | ||
| 54 | + */ | ||
| 55 | + onPullDownRefresh: function () { | ||
| 56 | + | ||
| 57 | + }, | ||
| 58 | + | ||
| 59 | + /** | ||
| 60 | + * 页面上拉触底事件的处理函数 | ||
| 61 | + */ | ||
| 62 | + onReachBottom: function () { | ||
| 63 | + if(this.hasMore){ | ||
| 64 | + this.getLists(true); | ||
| 65 | + } | ||
| 66 | + }, | ||
| 67 | + | ||
| 68 | + getLists(hasReachBottom=false){ | ||
| 69 | + App.Invitation.InvitationList({ | ||
| 70 | + openid:getApp().openid, | ||
| 71 | + offset: this.offset, | ||
| 72 | + limit: this.limit, | ||
| 73 | + }).then(res => { | ||
| 74 | + let list = this.data.list; | ||
| 75 | + let dl=res.data.length; | ||
| 76 | + if (dl > 0) { | ||
| 77 | + res.data.forEach(r => { | ||
| 78 | + let ctime=util.unixtoTime(r.ctime,'YYYY/MM/DD') | ||
| 79 | + r.arrival_timeStr = util.unixtoTime(r.arrival_time, 'HH:II') | ||
| 80 | + list[ctime]=list[ctime]||{'date':ctime,data:[]}; | ||
| 81 | + list[ctime].data.push(r) | ||
| 82 | + }) | ||
| 83 | + } | ||
| 84 | + let obj={list:list}; | ||
| 85 | + if(dl<this.limit && hasReachBottom){ | ||
| 86 | + this.hasMore=false; | ||
| 87 | + obj.hasMore=false; | ||
| 88 | + }else{ | ||
| 89 | + this.offset+=this.limit; | ||
| 90 | + } | ||
| 91 | + this.setData(obj) | ||
| 92 | + }) | ||
| 93 | + }, | ||
| 94 | +}) |
| 1 | +<!--pages/manager-invitation/setting/history.wxml--> | ||
| 2 | +<nav>通知客户记录</nav> | ||
| 3 | +<view class="table-header flex-lr"> | ||
| 4 | + <view class="Medium td1 flex-vc" style="align-items: flex-start">客户</view> | ||
| 5 | + <view class="Medium td2 flex-vc" style="align-items: flex-start">桌号</view> | ||
| 6 | + <view class="Medium td3">时间</view> | ||
| 7 | + <view class="Medium td4">操作</view> | ||
| 8 | +</view> | ||
| 9 | +<view class="pages"> | ||
| 10 | + <view class="table-body"> | ||
| 11 | + <view class="table-block" wx:for="{{list}}" wx:key="list.key"> | ||
| 12 | + <view class="date">{{item.date}}</view> | ||
| 13 | + <block wx:for="{{item.data}}" wx:key="item.data.key"> | ||
| 14 | + <formids url="/pages/manager-invitation/review?rid={{item.id}}&tplid={{item.template_id}}"> | ||
| 15 | + <view class="table-tr flex-lr"> | ||
| 16 | + <view class="Medium td1 flex-vc" style="align-items: flex-start"> | ||
| 17 | + <block wx:if="{{item.nickname}}"> | ||
| 18 | + {{item.nickname}} | ||
| 19 | + </block> | ||
| 20 | + <block wx:elif="{{item.in_openid}}"> | ||
| 21 | + 客户已查看 | ||
| 22 | + </block> | ||
| 23 | + <block wx:else=""> | ||
| 24 | + <text style="color:#F05522;">客户未查看</text> | ||
| 25 | + </block> | ||
| 26 | + </view> | ||
| 27 | + <view class="Medium td2 flex-vc" style="align-items: flex-start">{{item.room_name}}</view> | ||
| 28 | + <view class="Medium td3">{{item.arrival_timeStr}}</view> | ||
| 29 | + <view class="Medium td4">详情</view> | ||
| 30 | + </view> | ||
| 31 | + </formids> | ||
| 32 | + </block> | ||
| 33 | + </view> | ||
| 34 | + <view wx:if="{{!hasMore}}" class="hasMore flex-vc">已经到底了</view> | ||
| 35 | + </view> | ||
| 36 | +</view> |
| 1 | +/* pages/manager-invitation/setting/history.wxss */ | ||
| 2 | +page{ | ||
| 3 | + background-color: #f5f5f5; | ||
| 4 | +} | ||
| 5 | +.table-header{ | ||
| 6 | + width: 100%; | ||
| 7 | + position: fixed; | ||
| 8 | + left: 0; | ||
| 9 | + right: 0; | ||
| 10 | + background-color: #ffffff; | ||
| 11 | + height: 120rpx; | ||
| 12 | + line-height: 120rpx; | ||
| 13 | + z-index: 10; | ||
| 14 | + font-size: 34rpx; | ||
| 15 | +} | ||
| 16 | +.pages{ | ||
| 17 | + margin-top: 120rpx; | ||
| 18 | + background-color: #F5F5F5; | ||
| 19 | +} | ||
| 20 | +.td1{ | ||
| 21 | + margin-left: 40rpx; | ||
| 22 | +} | ||
| 23 | +.td4{ | ||
| 24 | + margin-right: 40rpx; | ||
| 25 | + min-width: 68rpx; | ||
| 26 | +} | ||
| 27 | +.td1,.td2{ | ||
| 28 | + width: 208rpx; | ||
| 29 | + min-width: 208rpx; | ||
| 30 | +} | ||
| 31 | +.td3{ | ||
| 32 | + width: 100%; | ||
| 33 | + text-align: left; | ||
| 34 | +} | ||
| 35 | +.td1,.td2{ | ||
| 36 | + height: 80rpx; | ||
| 37 | + overflow: hidden; | ||
| 38 | +} | ||
| 39 | +.date{ | ||
| 40 | + background-color: #F5F5F5; | ||
| 41 | + height: 60rpx; | ||
| 42 | + line-height: 60rpx; | ||
| 43 | + font-size: 26rpx; | ||
| 44 | + width: 100%; | ||
| 45 | + text-indent: 40rpx; | ||
| 46 | +} | ||
| 47 | +.table-tr{ | ||
| 48 | + background-color: #ffffff; | ||
| 49 | + font-size: 30rpx; | ||
| 50 | + height: 160rpx; | ||
| 51 | + width: 100%; | ||
| 52 | +} | ||
| 53 | +.hasMore{ | ||
| 54 | + height: 100rpx; | ||
| 55 | + line-height: 100rpx; | ||
| 56 | + font-size: 30rpx; | ||
| 57 | + color: #aaaaaa; | ||
| 58 | +} | ||
| 59 | +.table-body .td4{ | ||
| 60 | + color:#199095; | ||
| 61 | +} |
| @@ -17,9 +17,9 @@ | @@ -17,9 +17,9 @@ | ||
| 17 | </view> | 17 | </view> |
| 18 | </view> | 18 | </view> |
| 19 | </formids> | 19 | </formids> |
| 20 | - <formids url="/pages/manager-invitation/setting/sellers"> | 20 | + <formids url="/pages/manager-invitation/setting/history"> |
| 21 | <view class="row flex-lr" style="padding-top: 34rpx;"> | 21 | <view class="row flex-lr" style="padding-top: 34rpx;"> |
| 22 | - <view>我的预订安排</view> | 22 | + <view>通知客户记录</view> |
| 23 | <view class="flex-rr"> | 23 | <view class="flex-rr"> |
| 24 | <view class="more"></view> | 24 | <view class="more"></view> |
| 25 | </view> | 25 | </view> |
| @@ -39,9 +39,9 @@ | @@ -39,9 +39,9 @@ | ||
| 39 | </view> | 39 | </view> |
| 40 | </view> | 40 | </view> |
| 41 | </formids> | 41 | </formids> |
| 42 | - <formids bindclick="gotoSellerBook" wx:if="{{hasManagerInvitation}}"> | 42 | + <formids url="/pages/manager-invitation/review" wx:if="{{hasManagerInvitation}}"> |
| 43 | <view class="item flex-lr"> | 43 | <view class="item flex-lr"> |
| 44 | - <view class="left">切换到客户经理</view> | 44 | + <view class="left">客户经理模式</view> |
| 45 | <view class="right"> | 45 | <view class="right"> |
| 46 | <image src="http://qn.colorcun.com/custom/lite-yd/image/click.png"></image> | 46 | <image src="http://qn.colorcun.com/custom/lite-yd/image/click.png"></image> |
| 47 | </view> | 47 | </view> |
| @@ -31,7 +31,7 @@ | @@ -31,7 +31,7 @@ | ||
| 31 | "list": [] | 31 | "list": [] |
| 32 | }, | 32 | }, |
| 33 | "miniprogram": { | 33 | "miniprogram": { |
| 34 | - "current": 47, | 34 | + "current": 48, |
| 35 | "list": [ | 35 | "list": [ |
| 36 | { | 36 | { |
| 37 | "id": 0, | 37 | "id": 0, |
| @@ -391,6 +391,12 @@ | @@ -391,6 +391,12 @@ | ||
| 391 | "pathName": "pages/manager-invitation/setting/sellers", | 391 | "pathName": "pages/manager-invitation/setting/sellers", |
| 392 | "query": "", | 392 | "query": "", |
| 393 | "scene": null | 393 | "scene": null |
| 394 | + }, | ||
| 395 | + { | ||
| 396 | + "id": -1, | ||
| 397 | + "name": "pages/manager-invitation/setting/history", | ||
| 398 | + "pathName": "pages/manager-invitation/setting/history", | ||
| 399 | + "scene": null | ||
| 394 | } | 400 | } |
| 395 | ] | 401 | ] |
| 396 | } | 402 | } |
| @@ -215,6 +215,9 @@ export default { | @@ -215,6 +215,9 @@ export default { | ||
| 215 | //根据客户经理openid 获取当前用户所负责的顾客 | 215 | //根据客户经理openid 获取当前用户所负责的顾客 |
| 216 | 'App.Invitation.Members':null, | 216 | 'App.Invitation.Members':null, |
| 217 | 217 | ||
| 218 | + //根据客户经理openid 获取当前用户预定列表 | ||
| 219 | + 'App.Invitation.InvitationList':null, | ||
| 220 | + | ||
| 218 | //上传图片,只能上传单个图片文件 | 221 | //上传图片,只能上传单个图片文件 |
| 219 | 'App.Examples_Upload.UploadQn':null, | 222 | 'App.Examples_Upload.UploadQn':null, |
| 220 | } | 223 | } |
-
Please register or login to post a comment