线索池

pages/threadedTree/details/index.wxml

@@ -31,13 +31,14 @@
         <view style="height: 140rpx;" />
     </van-tab>
 </van-tabs>
+
 <block wx:if="{{!per.query(auth,'只读')}}">
     <view class="footer" wx:if="{{detailsData.status=='待跟进'||detailsData.status=='跟进中'}}">
-        <navigator wx:if="{{detailsData.isMemberFollow==0}}" url="#" data-name="跟进计划" catchtap="openPoput">
+        <navigator url="#" data-name="跟进计划" catchtap="openPoput">
             <view class="iconfont icon-genjin" />
             <view class="text">执行</view>
         </navigator>
-        <navigator wx:if="{{per.query(auth,'修改')&&detailsData.isMemberFollow==0}}" url="#" data-name="线索编辑" catchtap="openPoput">
+        <navigator wx:if="{{per.query(auth,'修改')}}" url="#" data-name="线索编辑" catchtap="openPoput">
             <view class="iconfont icon-bianji" />
             <view class="text">编辑</view>
         </navigator>

pages/threadedTree/index.js

@@ -31,11 +31,8 @@ Page({
     },
     /* 打开弹窗 */
     openSheet(e) {
-        const {
-            title
-        } = e.target.dataset;
         this.setData({
-            sheetTitle: title
+            sheetTitle: "添加线索"
         })
     },
     /* 结束新建 */

pages/threadedTree/index.json

@@ -3,7 +3,6 @@
     "usingComponents": {
         "Search": "./modules/search/search",
         "List": "./modules/list/list",
-        "FloatingButton": "./modules/FloatingButton/index",
         "Insert": "./modules/insert/insert",
         "Popup": "./modules/popup/index"
     }

pages/threadedTree/index.wxml

@@ -10,9 +10,7 @@
 </van-tabs>
 
 <!-- 浮动按钮 -->
-<FloatingButton wx:if="{{per.query(auth,'新增')}}" radius='32'>
-    <image style="width: 160rpx; height: 160rpx; transform: translate(-50%,-50%);" src='../../static/image/add.png' data-title="新建线索" bindtap="openSheet" />
-</FloatingButton>
+<Yl_FloatingButton wx:if="{{per.query(auth,'新增')}}" radius='32' bindtap="openSheet" />
 
 <My_listBox id='ListBox' bindgetlist="getList" height='{{scrollHeight}}'>
     <List list='{{list}}' tagColor='{{tagColor}}' auth="{{auth}}" />

pages/threadedTree/modules/FloatingButton/index.js

@@ -1,34 +0,0 @@
-Component({
-    properties: {
-        radius: Number //半径 单位px
-    },
-    data: {
-        top: "550px",
-        left: "345px",
-        viewHeight: null
-    },
-    lifetimes: {
-        attached: function () {
-            let that = this;
-            wx.getSystemInfo({
-                success: (res => that.setData({
-                    viewHeight: res.windowHeight
-                }))
-            });
-        },
-    },
-    methods: {
-        viewTouchMove(e) {
-            let left = e.touches[0].pageX;
-            if (left > (375 - this.data.radius)) left = 375 - (this.data.radius / 2);
-            if (left < 0 + this.data.radius) left = 0 + this.data.radius;
-            let top = e.touches[0].pageY;
-            if (top < 0 + this.data.radius) top = 0 + this.data.radius;
-            if (top > this.data.viewHeight - this.data.radius) top = this.data.viewHeight - this.data.radius;
-            this.setData({
-                left: left + 'px',
-                top: top + 'px'
-            })
-        }
-    }
-})

pages/threadedTree/modules/FloatingButton/index.json

@@ -1,4 +0,0 @@
-{
-    "component": true,
-    "usingComponents": {}
-}

pages/threadedTree/modules/FloatingButton/index.scss

@@ -1,4 +0,0 @@
-.float-box{
-    position: absolute;
-    z-index: 99;
-}

pages/threadedTree/modules/FloatingButton/index.wxml

@@ -1,3 +0,0 @@
-<view class="float-box" style="top: {{top}}; left: {{left}};" bindtouchmove="viewTouchMove">
-    <slot></slot>
-</view>

pages/threadedTree/modules/insert/insert.js

@@ -48,7 +48,7 @@ Component({
             if (this.data.disabled || this.data.loading) return;
             if (!deleteMark.CheckPhoneNumber(this.data.content.phonenumber)) return;
             const that = this;
-            if (this.data.type == '新建线索') return this.handleEdit();
+            if (this.data.type == '添加线索') return this.handleEdit();
             wx.showModal({
                 title: "提示",
                 content: "是否确认本次修改",

pages/threadedTree/modules/list/list.scss

@@ -1,7 +1,6 @@
 .box {
     position: relative;
     width: 690rpx;
-    height: 242rpx;
     background: #FFFFFF;
     border-radius: 16rpx;
     margin: 20rpx auto 0;

pages/threadedTree/modules/list/list.wxml

@@ -3,11 +3,13 @@
         <view class="line-1">{{item.name}}</view>
         <text wx:if="{{item.lognum}}">{{item.lognum}}次跟进</text>
     </view>
-    <view>最近跟进时间：{{item.followtime?item.followtime:'暂未跟进'}}</view>
+    <view wx:if="{{item.followBy}}">最近跟进人：{{item.followBy}}</view>
+    <view wx:if="{{item.followtime}}">最近跟进时间：{{item.followtime}}</view>
+    <view wx:else>跟进状态：暂未跟进</view>
     <view class="line-1">地址：{{item.province?item.province+item.city+item.county+item.address:"暂无"}}</view>
     <view catchtap="callOut" data-phonenumber="{{item.phonenumber}}">
         <text class="iconfont icon-bodadianhua" style="color: #52C41A; font-size: 24rpx;margin-right: 10rpx;" />手机号：{{item.phonenumber}}
     </view>
     <view class="r-t-state {{tagColor=='#ffffff'?'fff':''}}" style="background: {{tagColor}};">{{item.status}}</view>
-    <view class="r-b-state" wx:if="{{item.isMemberFollow==1}}">成员跟进</view>
+    <!-- <view class="r-b-state" wx:if="{{item.isMemberFollow==1}}">成员跟进</view> -->
 </navigator>