From b83ba3cc4687f21d744e9866e10e30e91229e8a4 Mon Sep 17 00:00:00 2001 From: queenwuli <942534046@qq.com> Date: Thu, 28 Jan 2021 16:23:30 +0800 Subject: [PATCH] gx --- hive-app/pages/workbench/followRecords/index.vue | 40 ++++++++++++++++++++++++++-------------- 1 files changed, 26 insertions(+), 14 deletions(-) diff --git a/hive-app/pages/workbench/followRecords/index.vue b/hive-app/pages/workbench/followRecords/index.vue index 119ec2e..7ccfec3 100644 --- a/hive-app/pages/workbench/followRecords/index.vue +++ b/hive-app/pages/workbench/followRecords/index.vue @@ -31,14 +31,14 @@ <image v-for="(op,index) in item.albums" @click="previewImg(item.albums,index)" class="content-img mr-10" :src="op.img"></image> </view> <view class="flex align-center justify-between mt-5 gray font-13"> - <text>客户: {{item.vipName}}</text> + <navigator :url="'../../member/detail?id='+item.vipId" hover-class="none" style="padding-right: 50px;">客户: {{item.vipName}}</navigator> <view class="flex align-center" v-if="item.nextNotifyTime"> <text class="iconfont iconzhong mr-5"></text> <text>{{item.nextNotifyTime}}</text> </view> </view> - <view class="mt-5 gray font-13"> - <text>订单:{{item.orderAbstract}}</text> + <view class="flex align-center justify-between mt-5 gray font-13"> + <text style="padding-right: 50px;" @click="toOrder(item)">订单: {{item.orderAbstract}}</text> </view> <view class="right mt-5"> <text class="iconfont" :class="item.zans && item.zans.indexOf(userInfo.id)>-1?'blue iconlove-b':'iconlove-b1'" @click="thumbsUp(item)"></text> @@ -58,8 +58,8 @@ <no-record :isShow="!list.length" txt="暂无跟进记录"></no-record> <uni-popup ref="commentEl" type="bottom" :isShowMask="false"> <view class="message-row"> - <input type="text" v-model="comment" :focus="true" class="message-input" placeholder="评论" placeholder-class="placeholder"/> - <button class="green-btn message-btn" :disabled="!comment" @click="addFollowupComment">发送</button> + <input type="text" v-model="comment" :focus="true" class="message-input" placeholder="评论" placeholder-class="placeholder"/> + <button class="blue-btn message-btn" :disabled="!comment" @click="addFollowupComment">发送</button> </view> </uni-popup> <fillter :isShow="isShowFilter" :staffList="staffList" :vipList="vipList" @reset="resetFilter" @change="changeFilter"></fillter> @@ -142,7 +142,7 @@ onPullDownRefresh(){ this.reload(); let timer = setTimeout(function () { - uni.startPullDownRefresh(); + uni.stopPullDownRefresh(); clearTimeout(timer); timer = null; }, 800); @@ -184,11 +184,11 @@ staffIds: staffIds, vipIds: vipIds }, 'POST').then((res) => { + console.log(res.rows) if(res.status == 200){ this.list = res.rows } }) - console.log(Math.floor(this.list.length/10)) }, loadList(isRest){ if(this.loadStatus!=='more'){ @@ -299,6 +299,18 @@ this.startTime = data.startTime; this.endTime = data.endTime; this.reload(); + }, + toOrder(item){ + if(item.orderId){ + uni.navigateTo({ + url: '../orderDetail?orderId='+item.orderId + }) + } + if(item.serviceId){ + uni.navigateTo({ + url: '../serviceOrderDetail?id='+item.serviceId + }) + } } } } @@ -337,10 +349,15 @@ font-size: 13px; } .message-row{ + position: fixed; + bottom: 0; + left: 0; + right: 0; display: flex; align-items: center; - background: #F6F6F8; + background: #eee; padding: 10px; + margin-bottom: var(–safe-area-inset-bottom); } .message-input{ flex: 1; @@ -354,12 +371,7 @@ .message-btn{ margin: 0; line-height: 30px; - border-radius: 0; + border-radius: 2px; font-size: 14px; - } - uni-button[disabled]:not([type]), uni-button[disabled][type=default]{ - color: #FFFFFF; - background-color: rgb(31 183 19 / 0.4); - border: 0; } </style> -- Gitblit v1.9.1