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,37 +24,41 @@
                 </view>
             </picker>
 
-            <view class="tts-money">
-                <view>{{totalData.brand_or_stadium_duration || '-'}}</view>
-                <view>
-                    <text>总收入</text>
-                    <image mode="aspectFit" src="/static/images/icon/question_mark.png" @click="showQuestionModal"></image>
-                </view>
-                <view><text>¥</text>{{totalData.count_type_actual_income_amount || '0'}}</view>
-            </view>
-            <view class="tts-preview-ls">
-                <view class="tpl-item">
-                    <view class="ti-name">
-                        <text>线上</text>
-                        <image mode="aspectFit" @click="incomeQusModal(totalData.online_tips)" src="/static/images/icon/question_mark.png"></image>
+            <!-- 20230707 pm: 商家助手品牌统计跟门店统计这块隐藏掉 -->
+            <block v-if="false">
+                <view class="tts-money">
+                    <view>{{totalData.brand_or_stadium_duration || '-'}}</view>
+                    <view>
+                        <text>总收入</text>
+                        <image mode="aspectFit" src="/static/images/icon/question_mark.png" @click="showQuestionModal"></image>
                     </view>
-                    <view class="ti-price">¥{{totalData.online_actual_income_amount || '0'}}</view>
+                    <view><text>¥</text>{{totalData.count_type_actual_income_amount || '0'}}</view>
                 </view>
-                <view class="tpl-item">
-                    <view class="ti-name">
-                        <text>线下</text>
-                        <image mode="aspectFit" @click="incomeQusModal(totalData.offline_tips)" src="/static/images/icon/question_mark.png"></image>
+                <view class="tts-preview-ls">
+                    <view class="tpl-item">
+                        <view class="ti-name">
+                            <text>线上</text>
+                            <image mode="aspectFit" @click="incomeQusModal(totalData.online_tips)" src="/static/images/icon/question_mark.png"></image>
+                        </view>
+                        <view class="ti-price">¥{{totalData.online_actual_income_amount || '0'}}</view>
                     </view>
-                    <view class="ti-price">¥{{totalData.offline_actual_income_amount || '0'}}</view>
-                </view>
-                <view class="tpl-item">
-                    <view class="ti-name">
-                        <text>联营</text>
-                        <image mode="aspectFit" @click="incomeQusModal(totalData.joint_tips)" src="/static/images/icon/question_mark.png"></image>
+                    <view class="tpl-item">
+                        <view class="ti-name">
+                            <text>线下</text>
+                            <image mode="aspectFit" @click="incomeQusModal(totalData.offline_tips)" src="/static/images/icon/question_mark.png"></image>
+                        </view>
+                        <view class="ti-price">¥{{totalData.offline_actual_income_amount || '0'}}</view>
+                    </view>
+                    <view class="tpl-item">
+                        <view class="ti-name">
+                            <text>联营</text>
+                            <image mode="aspectFit" @click="incomeQusModal(totalData.joint_tips)" src="/static/images/icon/question_mark.png"></image>
+                        </view>
+                        <view class="ti-price">¥{{totalData.joint_actual_income_amount || '0'}}</view>
                     </view>
-                    <view class="ti-price">¥{{totalData.joint_actual_income_amount || '0'}}</view>
                 </view>
-            </view>
+            </block>
+            
             
         </view>
         <view class="tc-info-section">