From 25759f98b387a53787eb59a9fadb53bc869f855a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 16 Jan 2025 17:47:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/applyList/technician.vue     | 183 +++++++++++++--
 src/views/autonym/autonym.vue          |  64 +++++-
 src/views/banner/bannerList.vue        |  10 +-
 src/views/orderCenter/orderCenter.vue  |  12 +-
 src/views/riderTop/creditScore.vue     | 294 ++++++++++++++-----------
 src/views/riderTop/riderTop.vue        |   3 +
 src/views/travelConf/add-or-update.vue |   6 +-
 src/views/user/userDetail.vue          |   6 +-
 8 files changed, 401 insertions(+), 177 deletions(-)

diff --git a/src/views/applyList/technician.vue b/src/views/applyList/technician.vue
index 2a0469e..5bf109d 100644
--- a/src/views/applyList/technician.vue
+++ b/src/views/applyList/technician.vue
@@ -110,7 +110,7 @@
               ></span>
             </template>
           </el-table-column>
-			<el-table-column prop="artificerImg" label="头像" fixed="left">
+			<el-table-column prop="artificerImg" label="头像">
 				<template slot-scope="scope">
 					<img v-if="scope.row.artificerImg==null" src="~@/assets/img/avatar.png" alt="" width="40"
 						 height="40">
@@ -242,9 +242,31 @@
           </el-table-column>
           <el-table-column prop="latitude" label="纬度" width="100">
           </el-table-column>
-          <el-table-column prop="ordersCount" label="完成订单" width="80">
+          <el-table-column prop="artificerSales" label="订单数量" width="120">
+			  <template slot-scope="scope">
+				  <span>{{ scope.row.artificerSales }}</span>
+				  <el-button
+					  size="mini"
+					  :disabled="!isAuth('userList:updatebl')"
+					  style="color: #4f9dec; background: #fff; border: none"
+					  @click="xiugaiSales(scope.row)"
+				  >
+					  修改</el-button
+				  >
+			  </template>
           </el-table-column>
-          <el-table-column prop="creditScore" label="信用分" width="80">
+          <el-table-column prop="creditScore" label="信用分" width="120">
+			  <template slot-scope="scope">
+				  <span>{{ scope.row.creditScore }}</span>
+				  <el-button
+					  size="mini"
+					  :disabled="!isAuth('userList:updatebl')"
+					  style="color: #4f9dec; background: #fff; border: none"
+					  @click="xiugaiScore(scope.row)"
+				  >
+					  修改</el-button
+				  >
+			  </template>
           </el-table-column>
           <el-table-column prop="ordersScore" label="服务分" width="80">
           </el-table-column>
@@ -977,7 +999,7 @@
               <span v-else>暂无图片</span>
             </template>
           </el-table-column>
-          <el-table-column prop="certificateImg" label="项目详情图" width="250">
+          <el-table-column prop="certificateImg" label="项目详情图" width="100">
             <template slot-scope="scope">
               <div v-if="scope.row.contentImg.length > 0">
                 <div
@@ -1003,7 +1025,7 @@
               <div v-else>暂无图片</div>
             </template>
           </el-table-column>
-          <el-table-column prop="applyPeople" label="适用人群" width="300">
+          <el-table-column prop="applyPeople" label="适用人群" width="450">
           </el-table-column>
           <el-table-column prop="region" label="性别要求" width="100">
             <template slot-scope="scope">
@@ -1390,8 +1412,8 @@
             >状态：</span
           >
           <el-radio-group v-model="massageTypeStatus">
-            <el-radio :label="1">上线</el-radio>
-            <el-radio :label="2">下线</el-radio>
+            <el-radio :label="1">上架</el-radio>
+            <el-radio :label="2">下架</el-radio>
           </el-radio-group>
         </div>
         <div style="margin-bottom: 10px">
@@ -1581,15 +1603,16 @@
 			  type="selection"
 			  width="55">
 		  </el-table-column>
-          <el-table-column prop="massageTypeId" label="编号" width="80">
+          <el-table-column prop="massageTypeId" label="编号" width="80" fixed="left">
           </el-table-column>
 			<el-table-column
 				prop="classifyName"
 				label="项目类型"
 				width="100"
+				fixed="left"
 			>
 			</el-table-column>
-          <el-table-column prop="title" label="项目名称"> </el-table-column>
+          <el-table-column prop="title" label="项目名称" fixed="left"> </el-table-column>
           <el-table-column prop="massageImg" label="项目图片">
             <template slot-scope="scope">
               　　<img
@@ -1601,7 +1624,7 @@
               <span v-else>暂无图片</span>
             </template>
           </el-table-column>
-          <el-table-column prop="certificateImg" label="项目详情图" width="250">
+          <el-table-column prop="certificateImg" label="项目详情图" width="100">
             <template slot-scope="scope">
               <div
                 v-for="(item, index) in scope.row.contentImg"
@@ -1627,7 +1650,7 @@
               <span v-if="scope.row.isSex == 2">女</span>
             </template>
           </el-table-column>
-          <el-table-column prop="applyPeople" label="适用人群" width="300">
+          <el-table-column prop="applyPeople" label="适用人群" width="450">
           </el-table-column>
           <el-table-column prop="region" label="城市" width="100">
             <template slot-scope="scope">
@@ -1652,8 +1675,8 @@
 
           <el-table-column prop="status" label="状态">
             <template slot-scope="scope">
-              <span v-if="scope.row.status == 1">上线</span>
-              <span v-if="scope.row.status == 2">下线</span>
+              <span v-if="scope.row.status == 1">上架</span>
+              <span v-if="scope.row.status == 2">下架</span>
             </template>
           </el-table-column>
           <!-- <el-table-column prop="createTime" label="创建时间" width="160">
@@ -1907,7 +1930,7 @@
 							</span>
 						</template>
 					</el-table-column> -->
-          <el-table-column prop="title" label="标题" width="150">
+          <el-table-column prop="title" label="标题" width="450">
           </el-table-column>
           <el-table-column prop="content" label="内容"> </el-table-column>
           <!-- <el-table-column prop="image" label="图片" width="150">
@@ -2034,6 +2057,51 @@
           <el-button type="primary" @click="StairNoticeTo3()">确 定</el-button>
         </div>
       </el-dialog>
+		<!-- 修改销量 -->
+		<el-dialog :title="titleBl" :visible.sync="salesVisible" center>
+			<div style="margin-bottom: 10px">
+          <span style="width: 200px; display: inline-block; text-align: right"
+		  >订单数量：</span
+		  >
+				<el-input
+					style="width: 50%"
+					v-model="artificerSales"
+					type="number"
+					:min="0"
+					:controls="false"
+					:placeholder="titleBl"
+				></el-input>
+			</div>
+			<div slot="footer" class="dialog-footer">
+				<el-button @click="salesVisible = false">取 消</el-button>
+				<el-button type="primary" @click="StairNoticeTo4()">确 定</el-button>
+			</div>
+		</el-dialog>
+		<!-- 修改信用分 -->
+		<el-dialog :title="titleBl" :visible.sync="scoreVisible" center>
+			<div style="margin-bottom: 10px">
+				<span style="width: 200px; display: inline-block; text-align: right">操作：</span>
+				<el-radio-group v-model="operation">
+					<el-radio :label="1">增加</el-radio>
+					<el-radio :label="2">减少</el-radio>
+				</el-radio-group>
+			</div>
+			<div style="margin-bottom: 10px">
+          		<span style="width: 200px; display: inline-block; text-align: right">信用分：</span>
+				<el-input
+					style="width: 50%"
+					v-model="creditScore"
+					type="number"
+					:min="0"
+					:controls="false"
+					:placeholder="titleBl"
+				></el-input>
+			</div>
+			<div slot="footer" class="dialog-footer">
+				<el-button @click="scoreVisible = false">取 消</el-button>
+				<el-button type="primary" @click="StairNoticeTo5()">确 定</el-button>
+			</div>
+		</el-dialog>
     </el-tabs>
   </div>
 </template>
@@ -2293,10 +2361,15 @@ export default {
 
       dialogFormVisible2: false,
       tecTypeVisible: false,
+	  salesVisible: false,
+	  scoreVisible: false,
       titleBl: "抽成比例",
       proportion: "",
       tecTypeValue: "",
-      phoneT: "",
+	  artificerSales:"",
+	  creditScore:"",
+		operation:"1",
+	  phoneT: "",
       MaterialpackageStatus: false,
       MaterialpackageList: [],
       addMaterialPackageStatus: false,
@@ -4616,6 +4689,21 @@ export default {
       this.artificerId = row.artificerId;
       this.tecTypeVisible = true;
     },
+	  //修改技师订单数量
+	  xiugaiSales(row) {
+		  this.titleBl = "技师订单数量";
+		  this.artificerSales = row.artificerSales;
+		  this.artificerId = row.artificerId;
+		  this.salesVisible = true;
+	  },
+	  //修改技师信用分
+	  xiugaiScore(row) {
+		  this.titleBl = "技师信用分";
+		  this.creditScore = 0;
+		  this.operation = 1;
+		  this.artificerId = row.artificerId;
+		  this.scoreVisible = true;
+	  },
     StairNoticeTo2() {
       this.$http({
         url: this.$http.adornUrl("artificer/updateArtificers"),
@@ -4679,6 +4767,71 @@ export default {
         }
       });
     },
+	  //修改技师类型
+	  StairNoticeTo4() {
+		  this.$http({
+			  url: this.$http.adornUrl("artificer/updateArtificers"),
+			  method: "post",
+			  // params: this.$http.adornParams({
+			  data: this.$http.adornData({
+				  artificerId: this.artificerId,
+				  artificerSales: this.artificerSales,
+			  }),
+		  }).then(({ data }) => {
+			  console.log("data", data);
+			  if (data.code == 0) {
+				  this.$message({
+					  message: "修改成功",
+					  type: "success",
+					  duration: 1500,
+					  onClose: () => {
+						  this.salesVisible = false;
+						  this.InformationSelect();
+					  },
+				  });
+			  } else {
+				  this.$message({
+					  message: data.msg,
+					  type: "warning",
+					  duration: 1500,
+					  onClose: () => {},
+				  });
+			  }
+		  });
+	  },
+	  //修改信用分
+	  StairNoticeTo5() {
+		  this.$http({
+			  url: this.$http.adornUrl("artificer/updateArtificerCreditScore"),
+			  method: "post",
+			  params: this.$http.adornParams({
+			  // data: this.$http.adornData({
+				  artificerId: this.artificerId,
+				  creditScore: this.creditScore,
+				  type: this.operation,
+			  }),
+		  }).then(({ data }) => {
+			  console.log("data", data);
+			  if (data.code == 0) {
+				  this.$message({
+					  message: "修改成功",
+					  type: "success",
+					  duration: 1500,
+					  onClose: () => {
+						  this.scoreVisible = false;
+						  this.InformationSelect();
+					  },
+				  });
+			  } else {
+				  this.$message({
+					  message: data.msg,
+					  type: "warning",
+					  duration: 1500,
+					  onClose: () => {},
+				  });
+			  }
+		  });
+	  },
     // 取消师傅
     quxiaoJs(row) {
       this.$confirm(
diff --git a/src/views/autonym/autonym.vue b/src/views/autonym/autonym.vue
index 3a7eda3..159f9e0 100644
--- a/src/views/autonym/autonym.vue
+++ b/src/views/autonym/autonym.vue
@@ -95,7 +95,7 @@
 								<el-popover placement="top-start" title="" trigger="hover">
 									<img style="width: 50px; height: 50px" :src="scope.row.front" alt=""
 										slot="reference">
-									<img style="width: 200px; height: 200px" :src="scope.row.front" alt="">
+									<img style="width: auto; height: 600px" :src="scope.row.front" alt="">
 								</el-popover>
 							</div>
 						</template>
@@ -109,7 +109,7 @@
 								<el-popover placement="top-start" title="" trigger="hover">
 									<img style="width: 50px; height: 50px" :src="scope.row.back" alt=""
 										slot="reference">
-									<img style="width: 200px; height: 200px" :src="scope.row.back" alt="">
+									<img style="width: auto; height: 600px" :src="scope.row.back" alt="">
 								</el-popover>
 							</div>
 						</template>
@@ -123,7 +123,7 @@
 								style="display: inline-block; margin: 3px;">
 								<el-popover placement="top-start" title="" trigger="hover">
 									<img style="width: 50px; height: 50px" :src="item" alt="" slot="reference">
-									<img style="width: 300px; height: auto" :src="item" alt="">
+									<img style="width: auto; height: 600px" :src="item" alt="">
 								</el-popover>
 							</div>
 						</template>
@@ -137,7 +137,7 @@
 								style="display: inline-block; margin: 3px;">
 								<el-popover placement="top-start" title="" trigger="hover">
 									<img style="width: 50px; height: 50px" :src="item" alt="" slot="reference">
-									<img style="width: 300px; height: auto" :src="item" alt="">
+									<img style="width: auto; height: 600px" :src="item" alt="">
 								</el-popover>
 							</div>
 						</template>
@@ -158,16 +158,20 @@
 							<span v-if="scope.row.status == 2">已拒绝</span>
 						</template>
 					</el-table-column>
-					<el-table-column fixed='right' label="操作" width="180">
+					<el-table-column fixed='right' label="操作" width="240">
 						<template slot-scope="scope">
 							<el-button size="mini" type="primary"
 								:disabled="scope.row.status !== 0 || !isAuth('autonym:jujue')"
 								@click="refuseClick(scope.row)" style="margin: 5px;">
-								拒绝
+								拒绝审核
 							</el-button>
 							<el-button size="mini" type="primary"
 								:disabled="scope.row.status !== 0 || !isAuth('autonym:tongguo')"
-								@click="passClicks(scope.row)" style="margin: 5px;">通过
+								@click="passClicks(scope.row)" style="margin: 5px;">通过审核
+							</el-button>
+							<el-button size="mini" type="primary"
+									   :disabled="scope.row.status == 0"
+									   @click="cancelClicks(scope.row)" style="margin: 5px;">取消审核
 							</el-button>
 							<el-button size="mini" type="primary" :disabled="!isAuth('autonym:tongguo')"
 								@click="updateClicks(scope.row)" style="margin: 5px;">修改
@@ -529,8 +533,6 @@ import { serverPaths } from '@/utils/enumData'
 
 					})
 				})
-
-
 			},
 			//任务拒绝
 			refuseClick(rows) {
@@ -574,6 +576,50 @@ import { serverPaths } from '@/utils/enumData'
 					})
 				})
 			},
+			cancelClicks(row){
+				this.status = 0
+				this.content = '系统取消审核'
+
+				this.$confirm(`确定取消该技师实名认证的审核?`, '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(() => {
+					this.$http({
+						url: this.$http.adornUrl('admin/realname/auditRealName'),
+						method: 'post',
+						data: this.$http.adornData({
+							'status': this.status,
+							'id': row.id,
+							'remek': this.content
+						})
+					}).then(({data}) => {
+						if (data.code == 0) {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.content = ''
+									this.status = ''
+									this.dataSelect()
+								}
+							})
+						} else {
+							this.$message({
+								message: data.msg,
+								type: 'error',
+								duration: 1500,
+								onClose: () => {
+									this.content = ''
+									this.status = ''
+									this.dataSelect()
+								}
+							})
+						}
+					})
+				})
+			},
 			// 查询
 			select() {
 				this.page = 1
diff --git a/src/views/banner/bannerList.vue b/src/views/banner/bannerList.vue
index ffa2048..048093c 100644
--- a/src/views/banner/bannerList.vue
+++ b/src/views/banner/bannerList.vue
@@ -1,6 +1,6 @@
 <template>
 	<el-tabs v-model="activeName" @tab-click="handleClick">
-		<el-tab-pane label="轮播图" name="first">
+<!--		<el-tab-pane label="轮播图" name="first">
 			<div style="float: right;margin-right:2%;">
 				<el-button style="margin: 10px 0;" :disabled="!isAuth('bannerList:add')" size="mini" type="primary"
 					icon="document" @click="addNotice">添加轮播图</el-button>
@@ -44,7 +44,7 @@
 					layout="total,sizes, prev, pager, next,jumper" :total="tableData.totalCount">
 				</el-pagination>
 			</div>
-			<!-- 添加弹框 -->
+			&lt;!&ndash; 添加弹框 &ndash;&gt;
 			<el-dialog title="添加" :visible.sync="dialogFormVisible" center>
 				<div style="margin-bottom: 10px;display: flex;">
 					<span style="width: 200px;display: inline-block;text-align: right;">图片：</span>
@@ -76,7 +76,7 @@
 					<el-button type="primary" @click="addNoticeTo()">确 定</el-button>
 				</div>
 			</el-dialog>
-		</el-tab-pane>
+		</el-tab-pane>-->
 		<!-- <el-tab-pane label="首页分类" name="second">
 			<div style="float: right;margin-right:2%;">
 				<el-button style="margin: 10px 0;" :disabled="!isAuth('bannerList:add')" size="mini" type="primary"
@@ -502,7 +502,7 @@ import { serverPaths } from '@/utils/enumData'
 				uploadUrl: serverPaths.uploadUrl,
 				page: 1,
 				limit: 5,
-				classify: 1,
+				classify: 5,
 				openValue: 1,
 				closeValue: 2,
 				name: '',
@@ -511,7 +511,7 @@ import { serverPaths } from '@/utils/enumData'
 				state: -1,
 				describes: '',
 				hideUpload: false,
-				activeName: 'first',
+				activeName: 'fourthly',
 				dialogFormVisible: false,
 				dialogFormVisible1: false,
 				dialogFormVisible2: false,
diff --git a/src/views/orderCenter/orderCenter.vue b/src/views/orderCenter/orderCenter.vue
index 1d3ed19..ff16d4c 100644
--- a/src/views/orderCenter/orderCenter.vue
+++ b/src/views/orderCenter/orderCenter.vue
@@ -322,13 +322,13 @@
 				<el-table-column prop="status" label="状态" fixed="right" width="80">
 					<template slot-scope="scope">
 						<span style="color: #f56c6c;" v-if="scope.row.status==1">待支付</span>
-						<span style="color: #E87D0D;" v-if="scope.row.status==2">待服务</span>
+						<span style="color: #E87D0D;" v-if="scope.row.status==2">已接单</span>
 						<span style="color: #009900;cursor: pointer;" v-if="scope.row.status==3" @click="pingjiaBtn(scope.row)">待评价</span>
 						<span style="color: #999;" v-if="scope.row.status==4">已取消</span>
 						<span style="color: #999;cursor: pointer;" v-if="scope.row.status==5" @click="pingjiaBtn(scope.row)">已完成</span>
 						<span style="color: red;" v-if="scope.row.status==6">服务中</span>
-						<span style="color: #E87D0D;" v-if="scope.row.status==7">师傅出发</span>
-						<span style="color: #E87D0D;" v-if="scope.row.status==8">师傅到达</span>
+						<span style="color: #E87D0D;" v-if="scope.row.status==7">已出发</span>
+						<span style="color: #E87D0D;" v-if="scope.row.status==8">已到达</span>
 						<span style="color: #E87D0D;" v-if="scope.row.status==9">待确认</span>
 						<span style="color: #E87D0D;" v-if="scope.row.status==10">待补单</span>
 						<span style="color: #E87D0D;" v-if="scope.row.status==11">挂单</span>
@@ -602,7 +602,7 @@
 					},
 					{
 						value: 2,
-						label: '待服务'
+						label: '已接单'
 					},
 					{
 						value: 3,
@@ -621,11 +621,11 @@
 						label: '服务中'
 					},
 					{
-						label: '师傅出发',
+						label: '已出发',
 						value: 7
 					},
 					{
-						label: '师傅到达',
+						label: '已到达',
 						value: 8
 					},
 				],
diff --git a/src/views/riderTop/creditScore.vue b/src/views/riderTop/creditScore.vue
index 6a3a959..c7ab258 100644
--- a/src/views/riderTop/creditScore.vue
+++ b/src/views/riderTop/creditScore.vue
@@ -2,7 +2,9 @@
 	<div>
 		<el-tabs v-model="activeName" @tab-click="handleClick">
 			<el-tab-pane label="信用分明细" name="first">
-
+				<div style="margin:6px 0;">
+					<span style="color: red;font-size: 12px;">{{remarks}}</span>
+				</div>
 				<div style="margin:6px 0;display: inline-block;">
 					<span>用户昵称：</span>
 					<el-input style="width: 150px;" @keydown.enter.native="select" clearable placeholder="请输入用户昵称"
@@ -26,8 +28,7 @@
 					</el-table-column>
 					<el-table-column prop="artificerName" label="技师昵称" width="150">
 						<template slot-scope="scope">
-							<span style="color: #4f9dec;cursor: pointer;"
-								@click="updates(scope.row.userId)">{{scope.row.artificerName ? scope.row.artificerName : '未绑定'}}</span>
+							<span>{{scope.row.artificerName ? scope.row.artificerName : '未绑定'}}</span>
 						</template>
 					</el-table-column>
 					<el-table-column prop="artificerImg" label="头像">
@@ -37,16 +38,26 @@
 					</el-table-column>
 					<el-table-column prop="phone" label="手机号">
 					</el-table-column>
-					<el-table-column prop="title" label="标题">
-					</el-table-column>
-					<el-table-column prop="content" label="内容">
-					</el-table-column>
-					<!-- <el-table-column prop="score" label="信用分">
+					<el-table-column prop="creditScore" label="信用分">
 						<template slot-scope="scope">
-							<span>{{scope.row.score?scope.row.score:'暂无'}}</span>
+							<span>{{ scope.row.creditScore }}</span>
+							<el-button
+								size="mini"
+								style="color: #4f9dec; background: #fff; border: none"
+								@click="xiugaiScore(scope.row)"
+							>修改</el-button>
+						</template>
+					</el-table-column>
+					<el-table-column label="操作" prop="id" width="300" fixed="right">
+						<template slot-scope="scope">
+							<el-button
+								size="mini"
+								type="primary"
+								style="margin: 5px"
+								@click="xinyongBtn(scope.row)"
+							>信用分明细
+							</el-button>
 						</template>
-					</el-table-column> -->
-					<el-table-column prop="createTime" label="创建时间" width="180">
 					</el-table-column>
 				</el-table>
 				<div style="text-align: center;margin-top: 10px;">
@@ -56,21 +67,53 @@
 					</el-pagination>
 				</div>
 			</el-tab-pane>
-			<!-- 回复 -->
-			<el-dialog title="回复" :visible.sync="dialogFormVisible" center>
-				<el-form :model="form">
-					<el-form-item label="回复内容：" :label-width="formLabelWidth">
-						<el-input v-model="form.reply" type="textarea" :rows="4" style="width:65%;"
-							placeholder="请输入回复内容">
-						</el-input>
-					</el-form-item>
-				</el-form>
-				<div slot="footer" class="dialog-footer">
-					<el-button @click="dialogFormVisible = false">取 消</el-button>
-					<el-button type="primary" @click="replyNoticeTo()">确 定</el-button>
-				</div>
-			</el-dialog>
 		</el-tabs>
+		<!-- 信用分明细 -->
+		<el-dialog title="信用分明细" :visible.sync="dialogFormVisibleXyf" center>
+			<el-table v-loading="tableDataLoadingXyf" :data="tableDataXyf.list">
+				<el-table-column prop="id" label="编号" width="80"> </el-table-column>
+				<el-table-column prop="title" label="标题" width="450">
+				</el-table-column>
+				<el-table-column prop="content" label="内容"> </el-table-column>
+			</el-table>
+			<div style="text-align: center; margin-top: 10px">
+				<el-pagination
+					@size-change="handleSizeChangeXyf"
+					@current-change="handleCurrentChangeXyf"
+					:page-sizes="[10, 20, 30, 40]"
+					:page-size="size1"
+					:current-page="page1"
+					layout="total,sizes, prev, pager, next,jumper"
+					:total="tableDataXyf.totalCount"
+				>
+				</el-pagination>
+			</div>
+		</el-dialog>
+		<!-- 修改信用分 -->
+		<el-dialog title="调整信用分" :visible.sync="scoreVisible" center>
+			<div style="margin-bottom: 10px">
+				<span style="width: 200px; display: inline-block; text-align: right">操作：</span>
+				<el-radio-group v-model="operation">
+					<el-radio :label="1">增加</el-radio>
+					<el-radio :label="2">减少</el-radio>
+				</el-radio-group>
+			</div>
+			<div style="margin-bottom: 10px">
+				<span style="width: 200px; display: inline-block; text-align: right">信用分：</span>
+				<el-input
+					style="width: 50%"
+					v-model="creditScore"
+					type="number"
+					:min="0"
+					:controls="false"
+					placeholder="请输入要调整的信用分"
+				></el-input>
+			</div>
+			<div slot="footer" class="dialog-footer">
+				<el-button @click="scoreVisible = false">取 消</el-button>
+				<el-button type="primary" @click="modifyCreditScore()">确 定</el-button>
+			</div>
+		</el-dialog>
 	</div>
 </template>
 
@@ -80,29 +123,7 @@
 			return {
 				size: 10,
 				page: 1,
-				goodsId: '',
-				form: {
-					commentId: '',
-					reply: ''
-				},
-				scoreType: 0,
-				scoreTypes: [{
-						value: 0,
-						label: '全部'
-					},
-					{
-						value: 1,
-						label: '好评'
-					},
-					{
-						value: 2,
-						label: '中评'
-					},
-					{
-						value: 3,
-						label: '差评'
-					}
-				],
+				scoreType: 1,
 				formLabelWidth: '200px',
 				tableDataLoading: false,
 				dialogFormVisible: false,
@@ -112,7 +133,16 @@
 				userName: '',
 				phone: '',
 				activeName: 'first',
-
+				creditScore: '',
+				artificerId: '',
+				dialogFormVisibleXyf: false,
+				tableDataLoadingXyf: false,
+				tableDataXyf: {},
+				size1: 10,
+				page1: 1,
+				operation:"1",
+				scoreVisible: false,
+				remarks: '',
 			}
 		},
 		methods: {
@@ -128,7 +158,7 @@
 				this.page = val;
 				this.dataSelect()
 			},
-			
+
 			// tabs切换
 			handleClick(tab, event) {
 				this.phone = ''
@@ -137,7 +167,6 @@
 				if (tab._props.label == '评价列表') {
 					this.dataSelect()
 				}
-				
 			},
 			// 刷新
 			refresh() {
@@ -157,110 +186,107 @@
 				this.page = 1
 				this.dataSelect()
 			},
-			
-			// 回复
-			replyClick(row) {
-				this.dialogFormVisible = true
-				this.form.commentId = row.commentId
-				this.form.reply = row.reply
-			},
-			replyNoticeTo() {
-				this.$http({
-					url: this.$http.adornUrl('/selfGoodsComment/reply'),
-					method: 'get',
-					params: this.$http.adornParams({
-						'commentId': this.form.commentId,
-						'reply': this.form.reply,
-					})
-				}).then(({
-					data
-				}) => {
-					this.$message({
-						message: '回复成功',
-						type: 'success',
-						duration: 1500,
-						onClose: () => {
-							this.dataSelect()
-						}
-					})
-					this.dialogFormVisible = false
-				})
-			},
-			// 删除评价
-			deletes(row) {
-				this.$confirm(`确定删除此条信息?`, '提示', {
-					confirmButtonText: '确定',
-					cancelButtonText: '取消',
-					type: 'warning'
-				}).then(() => {
-					this.$http({
-						url: this.$http.adornUrl(`takingComment/deleteOrderTakingComment/${row.id}`),
-						method: 'post',
-						params: this.$http.adornParams({})
-					}).then(({
-						data
-					}) => {
-						if (data.code == 0) {
-							this.$message({
-								message: '删除成功',
-								type: 'success',
-								duration: 1500,
-								onClose: () => {
-									this.dataSelect()
-								}
-							})
-						} else {
-							this.$message({
-								message: data.msg,
-								type: 'warning',
-								duration: 1500,
-								onClose: () => {}
-							})
-						}
-					})
-				}).catch(() => {})
-			},
 			// 获取评价列表数据
 			dataSelect() {
 				this.tableDataLoading = true
 				this.$http({
-					url: this.$http.adornUrl('message/selectArtificerScoreList'),
+					url: this.$http.adornUrl('message/selectArtificerList'),
 					method: 'get',
 					params: this.$http.adornParams({
 						'page': this.page,
 						'limit': this.size,
 						'artificerName': this.userName,
-						// 'content': this.content,
 						'phone': this.phone
 					})
 				}).then(({
 					data
 				}) => {
 					this.tableDataLoading = false
-					let returnData = data.data;
-					this.tableData = returnData
+					let returnData = data.data.data;
+					this.tableData = returnData;
+					this.remarks = data.data.remarks;
 				})
 			},
-			
-			// 详情跳转
-			updates(userId) {
-				this.$router.push({
-					path: '/userDetail',
-					query: {
-						userId: userId
+			// 信用分明细弹框
+			xinyongBtn(row) {
+				this.artificerId = row.userId;
+				this.xinyongSelect(this.artificerId);
+				this.dialogFormVisibleXyf = true;
+			},
+			// 信用分明细数据
+			xinyongSelect(artificerId) {
+				this.tableDataLoadingXyf = true;
+				this.$http({
+					url: this.$http.adornUrl("message/selectMessageByUserId"),
+					method: "get",
+					params: this.$http.adornParams({
+						userId: artificerId,
+						page: this.page1,
+						limit: this.size1,
+						state: 8,
+					}),
+				}).then(({ data }) => {
+					if (data.code == 0) {
+						this.tableDataLoadingXyf = false;
+						let returnData = data.data;
+						this.tableDataXyf = returnData;
+					} else {
+						this.$notify({
+							title: "提示",
+							duration: 1800,
+							message: data.msg,
+							type: "warning",
+						});
 					}
-				})
+				});
 			},
-			// 商品跳转
-			toGoods(title) {
-				this.$router.push({
-					path: '/shopAdmin1',
-					query: {
-						title: title
+			handleSizeChangeXyf(val) {
+				this.size1 = val;
+				this.xinyongSelect(this.artificerId);
+			},
+			handleCurrentChangeXyf(val) {
+				this.page1 = val;
+				this.xinyongSelect(this.artificerId);
+			},
+			//修改技师信用分
+			xiugaiScore(row) {
+				this.creditScore = 0;
+				this.operation = 1;
+				this.artificerId = row.artificerId;
+				this.scoreVisible = true;
+			},
+			//修改信用分
+			modifyCreditScore() {
+				this.$http({
+					url: this.$http.adornUrl("artificer/updateArtificerCreditScore"),
+					method: "post",
+					params: this.$http.adornParams({
+						artificerId: this.artificerId,
+						creditScore: this.creditScore,
+						type: this.operation,
+					}),
+				}).then(({ data }) => {
+					console.log("data", data);
+					if (data.code == 0) {
+						this.$message({
+							message: "修改成功",
+							type: "success",
+							duration: 1500,
+							onClose: () => {
+								this.scoreVisible = false;
+								this.refresh();
+							},
+						});
+					} else {
+						this.$message({
+							message: data.msg,
+							type: "warning",
+							duration: 1500,
+							onClose: () => {},
+						});
 					}
-				})
+				});
 			},
-			
 		},
 		activated() {
 			this.dataSelect()
diff --git a/src/views/riderTop/riderTop.vue b/src/views/riderTop/riderTop.vue
index 76aed33..361c32a 100644
--- a/src/views/riderTop/riderTop.vue
+++ b/src/views/riderTop/riderTop.vue
@@ -18,6 +18,7 @@
 					<el-option value="5" label="加钟金额"></el-option>
 					<el-option value="6" label="充值金额"></el-option>
 					<el-option value="7" label="积分"></el-option>
+					<el-option value="8" label="信用分"></el-option>
 				</el-select>&nbsp;&nbsp;
 			</div>
 			<div style="position: relative;display: inline-block;">
@@ -69,6 +70,8 @@
 			</el-table-column>
 			<el-table-column prop="czl" label="充值金额">
 			</el-table-column>
+			<el-table-column prop="xyf" label="信用分">
+			</el-table-column>
 			<el-table-column prop="jf" label="积分">
 				<template slot-scope="scope">
 					<span style="color: #4f9dec;cursor: pointer;" @click="showJfDetails(scope.row)">
diff --git a/src/views/travelConf/add-or-update.vue b/src/views/travelConf/add-or-update.vue
index 1ebb43d..b67c459 100644
--- a/src/views/travelConf/add-or-update.vue
+++ b/src/views/travelConf/add-or-update.vue
@@ -56,8 +56,8 @@
 						<el-input-number v-model="dataForm.freeKilometers" controls-position="right" :precision="2" :min="0" :step="1" label="起步公里数"/>
 					</el-form-item>
 				</el-col>
-				<el-col :span="12" v-if="dataForm.pricingType == 1">
-					<el-form-item label="固定价格类型" prop="fixedType">
+				<el-col :span="12">
+					<el-form-item label="往返类型" prop="fixedType">
 						<el-radio-group v-model="dataForm.fixedType">
 							<el-radio :label="1">往返</el-radio>
 							<el-radio :label="2">单程</el-radio>
@@ -162,7 +162,7 @@
 						if(saveData.pricingType == 1){
 							cleanField = [ 'seasonsType', 'timeIntervalType', 'startingPrice', 'freeKilometers',  'pricePerKilometer' ];
 						}else if(saveData.pricingType == 2) {
-							cleanField = [ 'fixedType', 'fixedPrice' ];
+							cleanField = [ 'fixedPrice' ];
 						}
 						if(cleanField.length){
 							cleanField.forEach(key => {
diff --git a/src/views/user/userDetail.vue b/src/views/user/userDetail.vue
index 0688158..7c497e5 100644
--- a/src/views/user/userDetail.vue
+++ b/src/views/user/userDetail.vue
@@ -347,7 +347,7 @@
 								</tr>
 								<tr>
 									<th class="border-bt">忙时</th>
-									<td class="border-bt border-rt" style="min-width: 300px;">
+									<td class="border-bt border-rt" style="min-width: 300px;" colspan="5">
 										<span>日期：</span>
 										<el-date-picker style="width: 160px;margin-left: 10px;" v-model="artificerDate"
 														align="right" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@@ -360,10 +360,6 @@
 										</div>
 										<el-tag type="info" style="cursor:pointer" @click="updateMs">修改</el-tag>
 									</td>
-									<th class="border-bt"></th>
-									<td class="border-bt"></td>
-									<th class="border-bt"></th>
-									<td class="border-bt border-rt" style="min-width: 300px;"></td>
 								</tr>
 							</tbody>
 						</table>