Merge branch 'dev'

src/pages/turnover/turnover.vue

@@ -4,7 +4,7 @@
             <view :class="[tabID == 4?'active':'']" @click="tabChange(4)">品牌统计</view>
             <view :class="[tabID == 3?'active':'']" @click="tabChange(3)">门店统计</view>
         </view>
-        <view class="tc-total-section" v-if="false">
+        <view class="tc-total-section">
             <!-- 品牌 -->
             <view class="tts-address" v-if="tabID == 4&&storeList.length > 1"> 
                 <image class="ta-logo" :src="totalData.logo" mode="aspectFit"></image>
@@ -24,6 +24,8 @@
                 </view>
             </picker>
 
+            <!-- 20230707 pm: 商家助手品牌统计跟门店统计这块隐藏掉 -->
+            <block v-if="false">
                 <view class="tts-money">
                     <view>{{totalData.brand_or_stadium_duration || '-'}}</view>
                     <view>
@@ -55,6 +57,8 @@
                         <view class="ti-price">¥{{totalData.joint_actual_income_amount || '0'}}</view>
                     </view>
                 </view>
+            </block>
+            
             
         </view>
         <view class="tc-info-section">