Merge remote-tracking branch 'origin/dev_1.1' into dev_1.1

src/views/hlgstatistics/HlgAccountDetailInList.vue

@@ -151,24 +151,7 @@
             align:"left",
             dataIndex: 'sumMoney',
             customRender: (text,record)=> {
-              var refundAmount=record.refundAmount
-              var refundServiceFee= record.refundServiceFee
-              if(refundAmount==null && refundServiceFee==null){
-                return this.numAdd(record.amount,record.serviceFee)
-              }else{
-                if(refundAmount==null){
-                  refundAmount=0
-                }
-                if(refundServiceFee==null){
-                  refundServiceFee=0
-                }
-                if(record.isDisplay===0){
-                  return this.accSub(this.numAdd(record.amount,record.serviceFee),this.numAdd(refundAmount,refundServiceFee))
-                }else{
-                  return this.accSub(this.numAdd(record.amount,record.serviceFee),this.numAdd(refundAmount,refundServiceFee))+"(退款："+this.numAdd(refundAmount,refundServiceFee)+")"
-                }
-              }
-              return '--';
+              return this.numAdd(record.amount,record.serviceFee)
             }
           },