diff --git a/src/views/bl/massage/massagePackage.vue b/src/views/bl/massage/massagePackage.vue index 638a4c8..67128ce 100644 --- a/src/views/bl/massage/massagePackage.vue +++ b/src/views/bl/massage/massagePackage.vue @@ -239,20 +239,20 @@ @click="handleDelete(scope.row)" >删除 - 购买 - - 支付 - + + + + + + + + + + + + + + diff --git a/src/views/bl/order/packageOrder.vue b/src/views/bl/order/packageOrder.vue index 5cac050..0447332 100644 --- a/src/views/bl/order/packageOrder.vue +++ b/src/views/bl/order/packageOrder.vue @@ -92,13 +92,13 @@ @click="showPackageView(scope.row)" >服务包 - 退款 - + + + + + + + diff --git a/src/views/business/merchantList.vue b/src/views/business/merchantList.vue index 1f24068..be4d8ca 100644 --- a/src/views/business/merchantList.vue +++ b/src/views/business/merchantList.vue @@ -140,7 +140,7 @@
商家抽成比例: - +
@@ -232,7 +232,7 @@
商家抽成比例: - +
@@ -679,6 +679,18 @@ import { serverPaths } from '@/utils/enumData' type: 'warning' }); return + }else { + alert(this.rate); + console.log(this.rate); + } + if (this.rate < 0 || this.rate > 1) { + this.$notify({ + title: '提示', + duration: 1800, + message: '抽成比例只能设置0-1之间的数字', + type: 'warning' + }); + return } if (this.phone === '') { this.$notify({ @@ -863,6 +875,15 @@ import { serverPaths } from '@/utils/enumData' }); return } + if (this.rate < 0 || this.rate > 1) { + this.$notify({ + title: '提示', + duration: 1800, + message: '抽成比例只能设置0-1之间的数字', + type: 'warning' + }); + return + } if (this.phone === '') { this.$notify({ title: '提示', diff --git a/src/views/orderCenter/orderCenter.vue b/src/views/orderCenter/orderCenter.vue index 76425d1..5360f87 100644 --- a/src/views/orderCenter/orderCenter.vue +++ b/src/views/orderCenter/orderCenter.vue @@ -138,12 +138,12 @@ {{ scope.row.ordersMassageList[0].massageType.classifyName }} - + - + @@ -285,8 +285,8 @@ - - + +