Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

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 
             })
         },
     },

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({

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 />

pages/insight/pages/brandInsight/index.wxss

@@ -54,4 +54,12 @@
    }
    .view-tabs .van-tabs__line {
     background: transparent;
-   }
+   }
+
+.userAvatar{
+    width:  80rpx;
+    height: 80rpx;
+    border-radius: 40rpx;
+    margin-right: 24rpx;
+    background: #FFF;
+}

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="margin-left: 12rpx;">{{totalCount}}</text>
-                        <text style="font-size: 13px;font-weight: 400;color: rgba(255,255,255,0.6000);"> 品牌占比</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>