From 4653a5874dd728c99992c04a07c2bf16d3851a16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=8F=B6?= <yerz@shengshi.com.cn>
Date: Mon, 14 Mar 2022 17:03:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/customer/detail/index.js   | 11 ++++++++++-
 pages/customer/detail/index.wxml | 27 ++++++++++++++++++++-------
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/pages/customer/detail/index.js b/pages/customer/detail/index.js
index 106364b..5fcaef2 100644
--- a/pages/customer/detail/index.js
+++ b/pages/customer/detail/index.js
@@ -688,8 +688,16 @@ Page({
     let params = {};
     params['id'] = this.data.id;
     _.apiQuery.getAppCustomersTag(params).then(res => {
+      let taglList = res.data
+      taglList.forEach(itemA => {
+        itemA.list.forEach(itemB => {
+          if(itemB.checked){
+            itemA.have=true
+          }
+        })
+      })
       this.setData({
-        taglList:res.data,
+        taglList,
       })
     });
   },
@@ -707,6 +715,7 @@ Page({
     this.getAppCustomersDetails()
     this.getAppCustomerData()
     this.getAppCustomerlogs()
+    this.getAppCustomersTag()
   },
 
   //页面上拉触底事件的处理函数
diff --git a/pages/customer/detail/index.wxml b/pages/customer/detail/index.wxml
index 489ba11..2c6bed2 100644
--- a/pages/customer/detail/index.wxml
+++ b/pages/customer/detail/index.wxml
@@ -156,17 +156,30 @@
         </view>
       </view>
     </view>
-    <view class="mt10 pl30 pr30 pb200" wx:elif="{{tabid == tab[2].id}}">
-      <view>
-        <block wx:for="{{detailinfo.tags}}" wx:for-index='i' wx:for-item='tag' wx:key='i'>
-          <text class="inline-block space-nowrap mt20 mr20 pt15 pb15 pl30 pr30 font-22 ulib-r10 bg-f3f6fc">{{tag}}</text>
-        </block>
-        <block wx:for='{{taglList}}' wx:for-item='list' wx:for-index='i' wx:key='i'>
+    <view class="mt10 pl40 pr30 pb200" wx:elif="{{tabid == tab[2].id}}">
+      <view class="relative">
+        <view class="absolute left-0 box-middle font-28">客户级别</view>
+        <view class="pl150" wx:if="{{detailinfo.tags.length>0}}">
+          <block wx:for="{{detailinfo.tags}}" wx:for-index='i' wx:for-item='tag' wx:key='i'>
+            <text class="inline-block space-nowrap mt20 mr10 pt15 pb15 pl30 pr30 font-22 ulib-r10 bg-f3f6fc">{{tag}}</text>
+          </block>
+        </view>
+        <!-- <block wx:for='{{taglList}}' wx:for-item='list' wx:for-index='i' wx:key='i'>
           <block wx:for='{{list.list}}' wx:for-item='option' wx:for-index='j' wx:key='j'>
             <text class="inline-block space-nowrap mt20 mr20 pt15 pb15 pl30 pr30 font-22 ulib-r10 bg-f3f6fc" wx:if="{{option.checked}}">{{option.name}}</text>
           </block>
-        </block>
+        </block> -->
       </view>
+      <block wx:for='{{taglList}}' wx:for-item='list' wx:for-index='i' wx:key='i'>
+        <view class="relative mt20" wx:if="{{list.have}}">
+          <view class="absolute left-0 box-middle font-28">{{list.name}}</view>
+          <view class="pl150">
+            <block wx:for='{{list.list}}' wx:for-item='option' wx:for-index='j' wx:key='j'>
+              <view class="inline-block space-nowrap mt10 mr20 pt15 pb15 pl30 pr30 font-22 ulib-r10 bg-f3f6fc" wx:if="{{option.checked}}">{{option.name}}</view>
+            </block>
+          </view>
+        </view>
+      </block>
     </view>
   </view>