Merge branch '绿色' into 测试

packageA/saleClue/audit/project.js

@@ -109,6 +109,20 @@ Page({
                         } catch (error) {
                             v.leaderName = ""
                         }
+                        v.chars = v.chars.reduce((acc, item) => ({
+                            ...acc,
+                            ...item
+                        }), {});
+                        v.projectname = v.projectname.split('').map(text => {
+                            let projectname = v.chars.projectname.join("") || ''
+                            return projectname.includes(text) ? {
+                                text,
+                                color: "red"
+                            } : {
+                                text,
+                                color: "#666666"
+                            }
+                        })
                         return v
                     }),
                     showPage: "重复项目",

packageA/saleClue/audit/project.wxml

@@ -7,17 +7,15 @@
 		重复项目
 	</view>
 	<view class="item" wx:for="{{list}}" wx:key="sys_enterpriseid">
-		<view class="title">
-			{{item.projectname}}
-		</view>
+		<view class="title"><text wx:for="{{item.projectname}}" wx:key="i" wx:for-item="it" wx:for-index="i" style="color: {{it.color}};">{{it.text}}</text></view>
 		<view class="tag-box">
 			<view class="systemtag" wx:for="{{item.tag_sys}}" wx:key="item">{{item}}</view>
 			<view class="datatag" wx:for="{{item.tag}}" wx:key="item">{{item}}</view>
 		</view>
 		<view class="row" wx:for="{{showItemList}}" wx:for-item="it" wx:key="label">
-			<view class="label">{{it.label}}：</view>
-			<view wx:if="{{it.key == 'address'}}" class="value">{{item.province + item.city + item.county + item[it.key]}}</view>
-			<view wx:else class="value">{{item[it.key] || '--'}}</view>
+			<view class="label" style="color: {{item.chars[it.key] ? 'red' : '#666666'}}">{{it.label}}：</view>
+			<view wx:if="{{it.key == 'address'}}" class="value" style="color: {{item.chars['address'] ? 'red' : '#666666'}}">{{item.province + item.city + item.county + item[it.key]}}</view>
+			<view wx:else class="value" style="color: {{item.chars[it.key] ? 'red' : '#666666'}}">{{item[it.key] || '--'}}</view>
 		</view>
 	</view>
 </block>