Merge branch '绿黄2' into 测试

portrayal/index/index.scss

@@ -16,7 +16,6 @@
     .right {
         display: flex;
         align-items: center;
-        height: 86rpx;
         background-color: #fff;
         flex-shrink: 0;
 

portrayal/list/client.js

@@ -176,6 +176,7 @@ Component({
             setTimeout(() => {
                 this.selectComponent('#ListBox').automaticSetHei();
                 if (this.data.searchShow) {
+                    if (this.selectComponent("#Yl_Filtrate1").data.show) return
                     this.setData({
                         focus: true
                     })

portrayal/list/client.wxml

@@ -41,6 +41,6 @@
     <My_empty wx:if="{{list.length==0}}" />
 </Yl_ListBox>
 
-<Yl_Filtrate1 show='{{showFiltrate}}' list='{{filtratelist}}' dateRange bindhandle="handleFilter">
+<Yl_Filtrate1 id='Yl_Filtrate1' show='{{showFiltrate}}' list='{{filtratelist}}' dateRange bindhandle="handleFilter">
     <organization slot='head' defaultIsleave='1' dimissionF id='organization' />
 </Yl_Filtrate1>

portrayal/list/contacts.js

@@ -153,6 +153,7 @@ Component({
             setTimeout(() => {
                 this.selectComponent('#ListBox').automaticSetHei();
                 if (this.data.searchShow) {
+                    if (this.selectComponent("#Yl_Filtrate1").data.show) return
                     this.setData({
                         focus: true
                     })

portrayal/list/project.js

@@ -23,11 +23,11 @@ Component({
             getApp().globalData.Language.getLanguagePackage(this)
             this.data.organization = this.selectComponent("#organization");
             this.data.organization.initDepAndUser().then(active => {
-               let userid = active.userid || wx.getStorageSync("userMsg").userid;
-               this.setData({
-                   "content.dataid": userid,
-                   userid,
-               })
+                let userid = active.userid || wx.getStorageSync("userMsg").userid;
+                this.setData({
+                    "content.dataid": userid,
+                    userid,
+                })
                 this.triggerEvent('update', "Client")
             });
             this.setFiltratelist();
@@ -190,6 +190,7 @@ Component({
             setTimeout(() => {
                 this.selectComponent('#ListBox').automaticSetHei();
                 if (this.data.searchShow) {
+                    if (this.selectComponent("#Yl_Filtrate1").data.show) return
                     this.setData({
                         focus: true
                     })

portrayal/list/sales.js

@@ -123,6 +123,7 @@ Component({
             setTimeout(() => {
                 this.selectComponent('#ListBox').automaticSetHei();
                 if (this.data.searchShow) {
+                    if (this.selectComponent("#Yl_Filtrate1").data.show) return
                     this.setData({
                         focus: true
                     })

portrayal/modules/followUp.wxml

@@ -18,7 +18,7 @@
                 <view class="value">{{list[0].name||list[0].changeby||''}}</view>
             </view>
         </view>
-        <view class="row" style='margin-top: 20px;'>
+        <view class="row" style='margin-top: 20rpx;'>
             <view class="col" style='background-color: #3874F6;'>
                 <view class="label">{{language['最近跟进时间']||'最近跟进时间'}}</view>
                 <view class="value">{{list[0].createdate||''}}</view>

portrayal/modules/serve.wxml

@@ -15,7 +15,7 @@
                 <view class="value">{{list[0].okWorkOrderQty || 0}}</view>
             </view>
         </view>
-        <view class="row" style='margin-top: 20px;'>
+        <view class="row" style='margin-top: 20rpx;'>
             <view class="col" style='background-color: #3874F6;'>
                 <view class="label">{{language['最近服务时间']||'最近服务时间'}}</view>
                 <view class="value">{{list[0].createdate||'--'}}</view>

portrayal/project/client.wxml

@@ -22,7 +22,7 @@
         <view style='padding-top: 20rpx;'>
             <navigator url="/packageA/project/detail?id={{item.sa_projectid}}" class="global-card serve-item" wx:for='{{list}}' wx:key='sa_projectid'>
                 <view class="title">{{item.projectname}}</view>
-                <view class="status" style="background-color:{{sColors[item.status]||'#3874F6'}}">
+                <view class="status" style="background-color: {{item.status == '跟进中'? '#3874f6' :sColors[item.status]}};">
                     {{language[item.status]||item.status}}
                 </view>
                 <view class="line">{{language['项目地址']||'项目地址'}}：{{item.address || ' --'}}</view>

portrayal/project/contacts.wxml

@@ -29,7 +29,7 @@
         <view style='padding-top: 20rpx;'>
             <navigator url="/packageA/project/detail?id={{item.sa_projectid}}" class="global-card serve-item" wx:for='{{list}}' wx:key='sa_projectid'>
                 <view class="title">{{item.projectname}}</view>
-                <view class="status" style="background-color:{{sColors[item.status]||'#3874F6'}}">
+                <view class="status" style="background-color: {{item.status == '跟进中'? '#3874f6' :sColors[item.status]}};">
                     {{language[item.status]||item.status}}
                 </view>
                 <view class="line">{{language['项目地址']||'项目地址'}}：{{item.address || ' --'}}</view>

portrayal/project/sales.wxml

@@ -26,7 +26,7 @@
         <view style='padding-top: 20rpx;'>
             <navigator url="/packageA/project/detail?id={{item.sa_projectid}}" class="global-card serve-item" wx:for='{{list}}' wx:key='sa_projectid'>
                 <view class="title">{{item.projectname}}</view>
-                <view class="status" style="background-color:{{sColors[item.status]||'#3874F6'}}">
+                <view class="status" style="background-color: {{item.status == '跟进中'? '#3874f6' :sColors[item.status]}};">
                     {{language[item.status]||item.status}}
                 </view>
                 <view class="line">{{language['项目地址']||'项目地址'}}：{{item.address || ' --'}}</view>