yangjun
/
sadjv3_admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提成比例限制0-1之间

This commit is contained in:
曹磊 2024-07-08 09:39:45 +08:00
parent c3b9b6ed07
commit 17d5dd8d6b
5 changed files with 83 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/views/bl/massage/massagePackage.vue
View File

@ -239,20 +239,20 @@
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
>删除 >删除
</el-button> </el-button>
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="danger" <!-- type="danger"-->
style="margin: 5px" <!-- style="margin: 5px"-->
@click="showBuyView(scope.row)" <!-- @click="showBuyView(scope.row)"-->
>购买 <!-- >购买-->
</el-button> <!-- </el-button>-->
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="danger" <!-- type="danger"-->
style="margin: 5px" <!-- style="margin: 5px"-->
@click="showPayView()" <!-- @click="showPayView()"-->
>支付 <!-- >支付-->
</el-button> <!-- </el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

14
src/views/bl/order/packageOrder.vue
View File

@ -92,13 +92,13 @@
@click="showPackageView(scope.row)" @click="showPackageView(scope.row)"
>服务包 >服务包
</el-button> </el-button>
<el-button v-if="scope.row.status==1" <!-- <el-button v-if="scope.row.status==1"-->
size="mini" <!-- size="mini"-->
type="danger" <!-- type="danger"-->
style="margin: 5px" <!-- style="margin: 5px"-->
@click="showRefundView(scope.row)" <!-- @click="showRefundView(scope.row)"-->
>退款 <!-- >退款-->
</el-button> <!-- </el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

25
src/views/business/merchantList.vue
View File

@ -140,7 +140,7 @@
<div style="margin-bottom: 10px;"> <div style="margin-bottom: 10px;">
<span style="width: 200px;display: inline-block;text-align: right;">商家抽成比例：</span> <span style="width: 200px;display: inline-block;text-align: right;">商家抽成比例：</span>
<el-input style="width:50%;" v-model="rate" type="number" :min="0" placeholder="请输入商家抽成比例,例如:0.1为10%"> <el-input style="width:50%;" v-model="rate" type="number" :min="0" :max="1" :step="0.01" placeholder="请输入商家抽成比例,例如:0.1为10%">
</el-input> </el-input>
</div> </div>
<div style="margin-bottom: 10px;"> <div style="margin-bottom: 10px;">
@ -232,7 +232,7 @@
<div style="margin-bottom: 10px;"> <div style="margin-bottom: 10px;">
<span style="width: 200px;display: inline-block;text-align: right;">商家抽成比例：</span> <span style="width: 200px;display: inline-block;text-align: right;">商家抽成比例：</span>
<el-input style="width:50%;" v-model="rate" type="number" :min="0" placeholder="请输入商家抽成比例,例如:0.1为10%"> <el-input style="width:50%;" v-model="rate" type="number" :min="0" :max="1" :step="0.01" placeholder="请输入商家抽成比例,例如:0.1为10%">
</el-input> </el-input>
</div> </div>
<div style="margin-bottom: 10px;"> <div style="margin-bottom: 10px;">
@ -679,6 +679,18 @@ import { serverPaths } from '@/utils/enumData'
type: 'warning' type: 'warning'
}); });
return 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 === '') { if (this.phone === '') {
this.$notify({ this.$notify({
@ -863,6 +875,15 @@ import { serverPaths } from '@/utils/enumData'
}); });
return return
} }
if (this.rate < 0 || this.rate > 1) {
this.$notify({
title: '提示',
duration: 1800,
message: '抽成比例只能设置0-1之间的数字',
type: 'warning'
});
return
}
if (this.phone === '') { if (this.phone === '') {
this.$notify({ this.$notify({
title: '提示', title: '提示',

39
src/views/orderCenter/orderCenter.vue
View File

@ -138,12 +138,12 @@
<span v-if="scope.row.ordersMassageList&&scope.row.ordersMassageList[0].massageType">{{ scope.row.ordersMassageList[0].massageType.classifyName }}</span> <span v-if="scope.row.ordersMassageList&&scope.row.ordersMassageList[0].massageType">{{ scope.row.ordersMassageList[0].massageType.classifyName }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="price" label="项目名称"> <el-table-column prop="price" label="项目名称">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.ordersMassageList&&scope.row.ordersMassageList[0].massageType">{{ scope.row.ordersMassageList[0].massageType.title }}</span> <span v-if="scope.row.ordersMassageList&&scope.row.ordersMassageList[0].massageType">{{ scope.row.ordersMassageList[0].massageType.title }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="price" label="项目价格"> <el-table-column prop="price" label="项目价格">
</el-table-column> </el-table-column>
<el-table-column prop="couponName" label="优惠券名称"> <el-table-column prop="couponName" label="优惠券名称">
@ -285,8 +285,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="endTimes" label="订单完成时间" width="100"> <el-table-column prop="endTimes" label="订单完成时间" width="100">
</el-table-column> </el-table-column>
<el-table-column prop="overTimeOrders" label="是否超时" fixed="right" width="50"> <el-table-column prop="overTimeOrders" label="是否超时" fixed="right" width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="color: #f56c6c;" v-if="scope.row.overTimeOrders==1">是</span> <span style="color: #f56c6c;" v-if="scope.row.overTimeOrders==1">是</span>
@ -325,7 +325,8 @@
</el-button> </el-button>
<el-button size="mini" type="danger" :disabled="!isAuth('orderCenter:wancheng')" v-if="scope.row.status==2||scope.row.status==6||scope.row.status==7||scope.row.status==8" <el-button size="mini" type="danger" :disabled="!isAuth('orderCenter:wancheng')" v-if="scope.row.status==2||scope.row.status==6||scope.row.status==7||scope.row.status==8"
@click="wancheng(scope.row)" style="margin:5px;" plain>完成订单</el-button> @click="wancheng(scope.row)" style="margin:5px;" plain>完成订单</el-button>
<el-button style="margin:5px;" size="mini" type="warning" icon="document" :disabled="!isAuth('orderCenter:quxiao')" v-if="scope.row.status==7||scope.row.status==8" @click="quxiaoBtn(scope.row)" plain>取消订单 <!-- <el-button style="margin:5px;" size="mini" type="warning" icon="document" :disabled="!isAuth('orderCenter:quxiao')" v-if="scope.row.status==7||scope.row.status==8" @click="quxiaoBtn(scope.row)" plain>取消订单-->
<el-button style="margin:5px;" size="mini" type="warning" icon="document" :disabled="!isAuth('orderCenter:quxiao')" @click="quxiaoBtn(scope.row)" plain>取消订单
</el-button> </el-button>
<el-button style="margin:5px;" size="mini" type="warning" icon="document" :disabled="!isAuth('orderCenter:tuikuan')" @click="tuikuanBtn(scope.row)" v-if="scope.row.status!=1&&scope.row.status!=4&&scope.row.status!=3&&scope.row.status!=5">退全款 <el-button style="margin:5px;" size="mini" type="warning" icon="document" :disabled="!isAuth('orderCenter:tuikuan')" @click="tuikuanBtn(scope.row)" v-if="scope.row.status!=1&&scope.row.status!=4&&scope.row.status!=3&&scope.row.status!=5">退全款
</el-button> </el-button>
@ -634,13 +635,13 @@
content: '', content: '',
serveTime:'', serveTime:'',
shopName:'', shopName:'',
zongjine:0, zongjine:0,
dacefei:0, dacefei:0,
xiangmujin:0, xiangmujin:0,
dialogFormVisibleBftk:false, dialogFormVisibleBftk:false,
dialogFormVisibleBfkk:false, dialogFormVisibleBfkk:false,
fwData:[], fwData:[],
classifyId:'', classifyId:'',
title: '', title: '',
@ -943,7 +944,7 @@
this.totalMoneyTy = 0 this.totalMoneyTy = 0
this.totalMoneyTj = 0 this.totalMoneyTj = 0
this.totalMoneyP = 0 this.totalMoneyP = 0
this.totalMoneyShop = 0 this.totalMoneyShop = 0
this.$http({ this.$http({
url: this.$http.adornUrl('artificer/selectOrdersList'), url: this.$http.adornUrl('artificer/selectOrdersList'),
method: 'get', method: 'get',
@ -1219,13 +1220,13 @@
}, },
// 修改备注、时间 // 修改备注、时间
updateBz(row){ updateBz(row){
var times1 = row.serveTime var times1 = row.serveTime
this.ordersId = row.ordersId this.ordersId = row.ordersId
this.serveTime = row.serveTime.slice(0,11) this.serveTime = row.serveTime.slice(0,11)
this.times = row.serveTime.slice(11,16) this.times = row.serveTime.slice(11,16)
// for (var j in this.timeLis) { // for (var j in this.timeLis) {
// if (this.times==this.timeLis[j].times) { // if (this.times==this.timeLis[j].times) {
// this.timeLis[j].classify = 1 // this.timeLis[j].classify = 1
@ -1274,21 +1275,21 @@
}, },
// 取消订单弹框 // 取消订单弹框
replyNoticeKk(row){ replyNoticeKk(row){
this.content = '' this.content = ''
this.ordersId = row.ordersId this.ordersId = row.ordersId
this.zongjine = Number(row.sumMoney) this.zongjine = Number(row.sumMoney)
this.dacefei = row.taxiMoney this.dacefei = row.taxiMoney
this.xiangmujin = Number(row.sumMoney)-Number(row.taxiMoney) this.xiangmujin = Number(row.sumMoney)-Number(row.taxiMoney)
this.dialogFormVisibleBfkk = true this.dialogFormVisibleBfkk = true
}, },
quxiaoBtn(row){ quxiaoBtn(row){
let delid = row.ordersId let delid = row.ordersId
this.$confirm('当前技师已接单，若取消订单，系统将扣除'+this.bili+'%的手续费以及所需的车费！确定继续取消订单吗?', '提示', { this.$confirm('当前技师已接单，若取消订单，系统将扣除'+this.bili+'%的手续费以及所需的车费！确定继续取消订单吗?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
@ -1319,7 +1320,7 @@
} }
}) })
} }
}) })
}) })
}, },
@ -1422,7 +1423,7 @@
} }
}) })
} }
}) })
}) })
}, },

20
src/views/user/userList.vue
View File

@ -1227,7 +1227,7 @@
<el-dialog :title="titleBl" :visible.sync="dialogFormVisible2" center> <el-dialog :title="titleBl" :visible.sync="dialogFormVisible2" center>
<div style="margin-bottom: 10px;"> <div style="margin-bottom: 10px;">
<span style="width: 200px;display: inline-block;text-align: right;">比例：</span> <span style="width: 200px;display: inline-block;text-align: right;">比例：</span>
<el-input style="width:50%;" v-model="proportion" type="number" :min="0" :controls="false" <el-input style="width:50%;" v-model="proportion" type="number" :min="0" :max="1" :step="0.01" :controls="false"
:placeholder="titleBl"></el-input> :placeholder="titleBl"></el-input>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -1972,6 +1972,24 @@ import { serverPaths } from '@/utils/enumData'
this.dialogFormVisible2 = true this.dialogFormVisible2 = true
}, },
StairNoticeTo2() { StairNoticeTo2() {
if (this.proportion === '') {
this.$notify({
title: '提示',
duration: 1800,
message: '请输入抽成比例',
type: 'warning'
});
return
}
if (this.proportion < 0 || this.proportion > 1) {
this.$notify({
title: '提示',
duration: 1800,
message: '抽成比例只能设置0-1之间的数字',
type: 'warning'
});
return
}
var datas = {} var datas = {}
if (this.texts == 'userRate') { if (this.texts == 'userRate') {
datas.userRate = this.proportion datas.userRate = this.proportion