Merge branch 'master' into dev

src/pages/admin/statistics/index.vue

@@ -35,11 +35,22 @@
       </view>
     </view>
     <view class="wrapper">
+      <view class="flex justify-between">
+        <view>
           <view class="title">
             {{ title }}{{ where.type == 1 ? '营业额' : '订单量' }}
           </view>
-      <view v-if="where.type == 1" class="money">{{ dataObj.all || 0 }}</view>
+          <view v-if="where.type == 1" class="money">{{
+            dataObj.all || 0
+          }}</view>
           <view v-else class="money">{{ dataObj.all || 0 }}</view>
+        </view>
+        <view>
+          <view class="title"> {{ title }}现金部分 </view>
+          <view class="money">{{ dataObj.all_discount }}</view>
+        </view>
+      </view>
+
       <view class="increase">
         <view>
           {{ time === 'date' ? '' : title }}增长率：<text
@@ -395,6 +406,7 @@ const touchEnd = (e: any) => {
       display: flex;
       justify-content: space-between;
       align-items: center;
+
       .red {
         color: #ff6969;
       }
@@ -402,6 +414,7 @@ const touchEnd = (e: any) => {
       .green {
         color: #1abb1d;
       }
+
       .iconfont {
         font-size: 23px;
         margin-left: 15px;
@@ -428,6 +441,7 @@ const touchEnd = (e: any) => {
     .top {
       display: flex;
       align-items: center;
+
       text {
         margin-right: 5px;
       }
@@ -436,6 +450,7 @@ const touchEnd = (e: any) => {
         color: #fa2c19;
       }
     }
+
     .table {
       margin-top: 10px;
     }