From 67aabfaa40e62df17ca7dccee352b5050c7d185d Mon Sep 17 00:00:00 2001
From: zx <604444282@qq.com>
Date: Wed, 7 Sep 2022 18:06:09 +0800
Subject: [PATCH] zx

---
 pages/insight/brandChild/index.js           |  3 ++-
 pages/insight/pages/brandInsight/index.js   |  4 ++++
 pages/insight/pages/brandInsight/index.wxml |  4 ++--
 pages/insight/pages/brandInsight/index.wxss | 10 +++++++++-
 pages/insight/pages/modalInsight/index.wxml |  6 +++---
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/pages/insight/brandChild/index.js b/pages/insight/brandChild/index.js
index 2e9e196..5e9807b 100644
--- a/pages/insight/brandChild/index.js
+++ b/pages/insight/brandChild/index.js
@@ -11,6 +11,7 @@ Component({
     methods: {
         toBrandInsight(e) {
             let name = e.currentTarget.dataset.id.brandname; //获取点击的name
+            let img = e.currentTarget.dataset.id.img;
             let obj = {
                 brandname: name,
                 img: e.currentTarget.dataset.id.img
@@ -43,7 +44,7 @@ Component({
             }
             wx.setStorageSync('sBrand', name);
             wx.navigateTo({
-                url: "/pages/insight/pages/brandInsight/index" 
+                url: "/pages/insight/pages/brandInsight/index"+'?img='+img 
             })
         },
     },
diff --git a/pages/insight/pages/brandInsight/index.js b/pages/insight/pages/brandInsight/index.js
index 519b0b8..fc2b3c5 100644
--- a/pages/insight/pages/brandInsight/index.js
+++ b/pages/insight/pages/brandInsight/index.js
@@ -6,6 +6,10 @@ Page({
         currentBrand: '',
         compShow: true,
         tabActive: 0,
+        brandImg: '',
+    },
+    onLoad(option) {
+        this.setData({brandImg: option.img});
     },
     onShow() {
         this.setData({
diff --git a/pages/insight/pages/brandInsight/index.wxml b/pages/insight/pages/brandInsight/index.wxml
index 4fab773..d5d481e 100644
--- a/pages/insight/pages/brandInsight/index.wxml
+++ b/pages/insight/pages/brandInsight/index.wxml
@@ -9,10 +9,10 @@
             </van-row>
             <van-divider custom-style="background: linear-gradient(117deg, rgba(245,245,245,0) 0%, #EEEEEE 50%, rgba(232,232,232,0) 100%);" hairline />
             <view class="switch-middle" style="margin-left: 24rpx;">
-                <van-image round src=""></van-image>
+                <image class="userAvatar" src="{{brandImg}}" />
                 <view class="brand-number">
                     <view>{{currentBrand}}</view>
-                    <view>{{totalCount}} <text style="font-size: 13px;font-weight: 400;color: rgba(255,255,255,0.6000);">数据总量</text></view>
+                    <view> <text style="font-size: 13px;font-weight: 400;color: rgba(255,255,255,0.6000);margin-right: 12rpx;">数据总量</text>{{totalCount}}</view>
                 </view>
             </view>
             <van-divider custom-style="background: linear-gradient(117deg, rgba(245,245,245,0) 0%, #EEEEEE 50%, rgba(232,232,232,0) 100%);" hairline />
diff --git a/pages/insight/pages/brandInsight/index.wxss b/pages/insight/pages/brandInsight/index.wxss
index 5d3e16f..d7d84bb 100644
--- a/pages/insight/pages/brandInsight/index.wxss
+++ b/pages/insight/pages/brandInsight/index.wxss
@@ -54,4 +54,12 @@
    }
    .view-tabs .van-tabs__line {
     background: transparent;
-   }
\ No newline at end of file
+   }
+
+.userAvatar{
+    width:  80rpx;
+    height: 80rpx;
+    border-radius: 40rpx;
+    margin-right: 24rpx;
+    background: #FFF;
+}
\ No newline at end of file
diff --git a/pages/insight/pages/modalInsight/index.wxml b/pages/insight/pages/modalInsight/index.wxml
index 9ef324c..b06bc2c 100644
--- a/pages/insight/pages/modalInsight/index.wxml
+++ b/pages/insight/pages/modalInsight/index.wxml
@@ -13,10 +13,10 @@
                 <view class="brand-number">
                     <view>{{currentSeries}}</view>
                     <view>
-                        <text>{{totalCount}}</text>
                         <text style="font-size: 13px;font-weight: 400;color: rgba(255,255,255,0.6000);"> 数据总量</text>
-                        <text style="margin-left: 24rpx;">{{percent}}</text>
-                        <text style="font-size: 13px;font-weight: 400;color: rgba(255,255,255,0.6000);"> 品牌占比</text>
+                        <text style="margin-left: 12rpx;">{{totalCount}}</text>
+                        <text style="margin-left: 24rpx;font-size: 13px;font-weight: 400;color: rgba(255,255,255,0.6000);"> 品牌占比</text>
+                        <text style="margin-left: 12rpx;">{{percent}}</text>
                     </view>
                 </view>
             </view>