Merge branch 'feature/11月迭代'

src/components/allCustomers/consumption.vue

@@ -76,7 +76,7 @@
                         </template>
                         <template v-else>
                           <div style="display:flex;align-items:center;padding-left:14px;">
-                            ￥{{ group[colunm.prop]?(group[colunm.prop]|fomatFloat):'--' }}
+                            ￥{{ group[colunm.prop]|fomatFloat }}
                             <el-popover popper-class="amount-detail-popover" placement="bottom"
                               width="242" trigger="hover" :open-delay="200" @show="getOrderDetail(group.orderId)">
                               <div class="amount-detail" v-loading="orderLoading">