Merge remote-tracking branch 'origin/master' into wjh

src/utils/filter.js

@@ -10,19 +10,19 @@ const filters = {
     return isEmpty(data) ? '--' : data;
   },
   fix2(num) {
-    if (num == null) {
+    if (num == null || isNaN(num)) {
       return num;
     }
     return num.toFixed(2);
   },
   fix10(num) {
-    if (num == null) {
+    if (num == null || isNaN(num)) {
       return num;
     }
     return num.toFixed(10);
   },
   fix8(num) {
-    if (num == null) {
+    if (num == null || isNaN(num)) {
       return num;
     }
     return num.toFixed(8);

src/views/bst/channel/index.vue

@@ -61,7 +61,7 @@
         </template>
       </el-table-column>
       <el-table-column label="渠道成本" align="center" prop="costRate">
-        <template slot-scope="d">{{d.row.costRate | money}} %</template>
+        <template slot-scope="d">{{d.row.costRate | fix2}} %</template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -85,7 +85,7 @@
       @pagination="getList"
     />
 
-    <channel-edit-dialog 
+    <channel-edit-dialog
       :show.sync="open"
       :channel-id="row.channelId"
       @success="getList"

src/views/bst/order/view/view.vue

@@ -264,8 +264,8 @@
               <el-descriptions-item label="支付时间">
                 {{ detail.ridePayTime | dv }}
               </el-descriptions-item>
-              <el-descriptions-item label="押金抵扣" v-if="detail.suitDepositDeduction">
-                {{ detail.suitDepositDeduction | fix2 | dv }} 元
+              <el-descriptions-item label="押金抵扣" v-if="detail.depositDeductionAmount">
+                {{ detail.depositDeductionAmount | fix2 | dv }} 元
               </el-descriptions-item>
             </el-descriptions>
           </collapse-panel>