From 17d5dd8d6bfa07dc1f2a32db4e7d840983be924a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Mon, 8 Jul 2024 09:39:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E6=88=90=E6=AF=94=E4=BE=8B=E9=99=90?=
 =?UTF-8?q?=E5=88=B60-1=E4=B9=8B=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bl/massage/massagePackage.vue | 28 +++++++++---------
 src/views/bl/order/packageOrder.vue     | 14 ++++-----
 src/views/business/merchantList.vue     | 25 ++++++++++++++--
 src/views/orderCenter/orderCenter.vue   | 39 +++++++++++++------------
 src/views/user/userList.vue             | 20 ++++++++++++-
 5 files changed, 83 insertions(+), 43 deletions(-)

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)"
 					>删除
 					</el-button>
-					<el-button
-						size="mini"
-						type="danger"
-						style="margin: 5px"
-						@click="showBuyView(scope.row)"
-					>购买
-					</el-button>
-					<el-button
-						size="mini"
-						type="danger"
-						style="margin: 5px"
-						@click="showPayView()"
-					>支付
-					</el-button>
+<!--					<el-button-->
+<!--						size="mini"-->
+<!--						type="danger"-->
+<!--						style="margin: 5px"-->
+<!--						@click="showBuyView(scope.row)"-->
+<!--					>购买-->
+<!--					</el-button>-->
+<!--					<el-button-->
+<!--						size="mini"-->
+<!--						type="danger"-->
+<!--						style="margin: 5px"-->
+<!--						@click="showPayView()"-->
+<!--					>支付-->
+<!--					</el-button>-->
 				</template>
 			</el-table-column>
 		</el-table>
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)"
 					>服务包
 					</el-button>
-					<el-button v-if="scope.row.status==1"
-						size="mini"
-						type="danger"
-						style="margin: 5px"
-						@click="showRefundView(scope.row)"
-					>退款
-					</el-button>
+<!--					<el-button v-if="scope.row.status==1"-->
+<!--						size="mini"-->
+<!--						type="danger"-->
+<!--						style="margin: 5px"-->
+<!--						@click="showRefundView(scope.row)"-->
+<!--					>退款-->
+<!--					</el-button>-->
 				</template>
 			</el-table-column>
 		</el-table>
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 @@
 
 			<div style="margin-bottom: 10px;">
 				<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>
 			</div>
 			<div style="margin-bottom: 10px;">
@@ -232,7 +232,7 @@
 
 			<div style="margin-bottom: 10px;">
 				<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>
 			</div>
 			<div style="margin-bottom: 10px;">
@@ -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 @@
 						<span v-if="scope.row.ordersMassageList&&scope.row.ordersMassageList[0].massageType">{{ scope.row.ordersMassageList[0].massageType.classifyName }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column prop="price" label="项目名称">	
+				<el-table-column prop="price" label="项目名称">
 					<template slot-scope="scope">
 						<span v-if="scope.row.ordersMassageList&&scope.row.ordersMassageList[0].massageType">{{ scope.row.ordersMassageList[0].massageType.title }}</span>
 					</template>
 				</el-table-column>
-				
+
 				<el-table-column prop="price" label="项目价格">
 				</el-table-column>
 				<el-table-column prop="couponName" label="优惠券名称">
@@ -285,8 +285,8 @@
 				</el-table-column>
 				<el-table-column prop="endTimes" label="订单完成时间" width="100">
 				</el-table-column>
-				
-				
+
+
 				<el-table-column prop="overTimeOrders" label="是否超时" fixed="right" width="50">
 					<template slot-scope="scope">
 						<span style="color: #f56c6c;" v-if="scope.row.overTimeOrders==1">是</span>
@@ -325,7 +325,8 @@
 						</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"
 							@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 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>
@@ -634,13 +635,13 @@
 				content: '',
 				serveTime:'',
 				shopName:'',
-				
+
 				zongjine:0,
 				dacefei:0,
 				xiangmujin:0,
 				dialogFormVisibleBftk:false,
 				dialogFormVisibleBfkk:false,
-				
+
 				fwData:[],
 				classifyId:'',
 				title: '',
@@ -943,7 +944,7 @@
 				this.totalMoneyTy = 0
 				this.totalMoneyTj = 0
 				this.totalMoneyP = 0
-				this.totalMoneyShop = 0  
+				this.totalMoneyShop = 0
 				this.$http({
 					url: this.$http.adornUrl('artificer/selectOrdersList'),
 					method: 'get',
@@ -1219,13 +1220,13 @@
 			},
 			// 修改备注、时间
 			updateBz(row){
-				
+
 				var times1 =  row.serveTime
-				
+
 				this.ordersId = row.ordersId
 				this.serveTime = row.serveTime.slice(0,11)
 				this.times = row.serveTime.slice(11,16)
-				
+
 				// for (var j in this.timeLis) {
 				// 	if (this.times==this.timeLis[j].times) {
 				// 		this.timeLis[j].classify = 1
@@ -1274,21 +1275,21 @@
 			},
 			// 取消订单弹框
 			replyNoticeKk(row){
-				
+
 				this.content = ''
 				this.ordersId = row.ordersId
 				this.zongjine = Number(row.sumMoney)
 				this.dacefei = row.taxiMoney
 				this.xiangmujin = Number(row.sumMoney)-Number(row.taxiMoney)
 				this.dialogFormVisibleBfkk = true
-				
-				
-				
+
+
+
 			},
 			quxiaoBtn(row){
 				let delid = row.ordersId
-				
-				
+
+
 				this.$confirm('当前技师已接单，若取消订单，系统将扣除'+this.bili+'%的手续费以及所需的车费！确定继续取消订单吗?', '提示', {
 					confirmButtonText: '确定',
 					cancelButtonText: '取消',
@@ -1319,7 +1320,7 @@
 								}
 							})
 						}
-				
+
 					})
 				})
 			},
@@ -1422,7 +1423,7 @@
 								}
 							})
 						}
-			
+
 					})
 				})
 			},
diff --git a/src/views/user/userList.vue b/src/views/user/userList.vue
index 51d53ed..ea187d1 100644
--- a/src/views/user/userList.vue
+++ b/src/views/user/userList.vue
@@ -1227,7 +1227,7 @@
 			<el-dialog :title="titleBl" :visible.sync="dialogFormVisible2" center>
 				<div style="margin-bottom: 10px;">
 					<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>
 				</div>
 				<div slot="footer" class="dialog-footer">
@@ -1972,6 +1972,24 @@ import { serverPaths } from '@/utils/enumData'
 				this.dialogFormVisible2 = true
 			},
 			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 = {}
 				if (this.texts == 'userRate') {
 					datas.userRate = this.proportion