Merge branch 'dev' into test

src/views/order/index/index.vue

@@ -23,6 +23,11 @@
               <n-number-animation :from="0" :to="cardData.gift_pulse" />
             </n-statistic>
           </n-card>
+          <n-card ml-10 w-500>
+            <n-statistic label="抵扣后价格(元)" tabular-nums>
+              <n-number-animation :from="0" :to="cardData.discount_number" :precision="2" />
+            </n-statistic>
+          </n-card>
         </div>
       </n-col>
       <n-col :span="24" mt-10>
@@ -388,6 +393,7 @@ const getList = async () => {
     cardData.value.service = res.data.commission
     cardData.value.count = res.data.total
     cardData.value.gift_pulse = res.data.gift_pulse
+    cardData.value.discount_number = res.data.discount_number
   } catch (error) {
     $message.error(error.msg)
   }