diff --git a/src/views/applyList/technician.vue b/src/views/applyList/technician.vue
index 3f7f6bf..acc98c4 100644
--- a/src/views/applyList/technician.vue
+++ b/src/views/applyList/technician.vue
@@ -92,7 +92,7 @@
             fixed="left"
           >
           </el-table-column>
-          <el-table-column prop="classifyId" label="项目类型" width="150">
+          <el-table-column prop="classifyId" label="项目类型" fixed="left">
 			  <template slot-scope="scope">
 				  <div v-for="(item, index) in scope.row.artificerClassifyList" :key="index"
 					   class="borderInner">
@@ -109,6 +109,13 @@
               ></span>
             </template>
           </el-table-column>
+			<el-table-column prop="artificerImg" label="头像" fixed="left">
+				<template slot-scope="scope">
+					<img v-if="scope.row.artificerImg==null" src="~@/assets/img/avatar.png" alt="" width="40"
+						 height="40">
+					<img v-else :src="scope.row.artificerImg" alt="" width="40" height="40">
+				</template>
+			</el-table-column>
           <el-table-column prop="phone" width="120" label="手机号">
             <template slot-scope="scope">
               <span>{{ scope.row.phone ? scope.row.phone : "未绑定" }}</span>
@@ -231,7 +238,14 @@
 
           <!-- <el-table-column prop="createTime" label="创建时间" width="180">
 					</el-table-column> -->
-          <el-table-column prop="status " label="在线状态" fixed="right">
+			<el-table-column
+				prop="accountNumberStauts"
+				label="账号状态"
+				fixed="right"
+				width="80"
+			>
+			</el-table-column>
+			<el-table-column prop="status " label="在线状态" fixed="right">
             <template slot-scope="scope">
               <span style="color: #13ce66" v-if="scope.row.status === 1"
                 >上线</span
@@ -244,14 +258,8 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="accountNumberStauts"
-            label="账号状态"
-            width="80"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="status"
-            label="是否优选"
+            prop="isGoods"
+            label="是否行业大拿"
             fixed="right"
             width="80"
           >
@@ -268,25 +276,25 @@
               </el-switch>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="isHot"
-            label="是否热度最高"
-            fixed="right"
-            width="80"
-          >
-            <template slot-scope="scope">
-              <el-switch
-                v-model="scope.row.isHot"
-                @change="changeR(scope.row.isHot, scope.row.artificerId)"
-                :active-value="openValue"
-                :disabled="!isAuth('locality:update')"
-                :inactive-value="closeValue"
-                active-color="#13ce66"
-                inactive-color="#ff4949"
-              >
-              </el-switch>
-            </template>
-          </el-table-column>
+<!--          <el-table-column-->
+<!--            prop="isHot"-->
+<!--            label="是否热度最高"-->
+<!--            fixed="right"-->
+<!--            width="80"-->
+<!--          >-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-switch-->
+<!--                v-model="scope.row.isHot"-->
+<!--                @change="changeR(scope.row.isHot, scope.row.artificerId)"-->
+<!--                :active-value="openValue"-->
+<!--                :disabled="!isAuth('locality:update')"-->
+<!--                :inactive-value="closeValue"-->
+<!--                active-color="#13ce66"-->
+<!--                inactive-color="#ff4949"-->
+<!--              >-->
+<!--              </el-switch>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
           <el-table-column
             prop="isStart"
             label="是否明星技师"
@@ -364,7 +372,7 @@
                 @click="xinyongBtn(scope.row)"
                 >信用分明细
               </el-button>
-              <el-button
+              <el-button v-if="scope.row.artificerStatus != 1"
                 size="mini"
                 type="primary"
                 style="margin: 5px"
@@ -2372,17 +2380,23 @@ export default {
       this.getMaterialpackageList();
     },
     removeDisabled(row) {
-      // 获取列表数据
-      console.log(this.choicenData, row);
-      let getUserId = this.choicenData.list.filter(
-        (item) => item.userId == row.userId
-      );
-      this.$http({
-        url: this.$http.adornUrl(
-          "artificer/cancellationSuspension/" + getUserId[0].userId
-        ),
-        method: "POST",
-      }).then(({ data }) => {});
+		this.$confirm(`确定解除停牌?`, "提示", {
+			confirmButtonText: "确定",
+			cancelButtonText: "取消",
+			type: "warning",
+		}).then(() => {
+			let getUserId = this.choicenData.list.filter(
+				(item) => item.userId == row.userId
+			);
+			this.$http({
+				url: this.$http.adornUrl(
+					"artificer/cancellationSuspension/" + getUserId[0].userId
+				),
+				method: "POST",
+			}).then(({ data }) => {
+				this.InformationSelect();
+			});
+		}).catch(() => {});
     },
     //查看照片
     refund(e) {
@@ -2594,12 +2608,12 @@ export default {
         this.tableDataLoading = false;
         let returnData = data.data;
         data.data.list.forEach((item) => {
-          switch (item.status) {
+          switch (item.artificerStatus) {
             case 1:
               item.accountNumberStauts = "正常";
               break;
             case 2:
-              item.accountNumberStauts = "禁用";
+              item.accountNumberStauts = "停牌";
               break;
             case 3:
               item.accountNumberStauts = "停牌";
diff --git a/src/views/orderCenter/orderCenter.vue b/src/views/orderCenter/orderCenter.vue
index dda62f3..3c357d8 100644
--- a/src/views/orderCenter/orderCenter.vue
+++ b/src/views/orderCenter/orderCenter.vue
@@ -1030,7 +1030,7 @@
 
 
 			},
-			
+
 			//技师列表更换页数
 			handleSizeChange1(val) {
 				this.jishisize = val;
@@ -1422,15 +1422,14 @@
 			},
 			quxiaoBtn(row){
 				let delid = row.ordersId
-
-
-				this.$confirm('当前技师已接单，若取消订单，系统将扣除'+this.bili+'%的手续费以及所需的车费！确定继续取消订单吗?', '提示', {
+				// this.$confirm('当前技师已接单，若取消订单，系统将扣除'+this.bili+'%的手续费以及所需的车费！确定继续取消订单吗?', '提示', {
+				this.$confirm('确定继续取消订单吗?', '提示', {
 					confirmButtonText: '确定',
 					cancelButtonText: '取消',
 					type: 'warning'
 				}).then(() => {
 					this.$http({
-						url: this.$http.adornUrl('artificer/cancelOrders?ordersId='+delid),
+						url: this.$http.adornUrl('artificer/cancelOrdersByPc?ordersId='+delid),
 						method: 'post',
 						params: this.$http.adornParams({})
 					}).then(({
diff --git a/src/views/riderTop/czlTop.vue b/src/views/riderTop/czlTop.vue
index f2dabb1..4440bbe 100644
--- a/src/views/riderTop/czlTop.vue
+++ b/src/views/riderTop/czlTop.vue
@@ -6,8 +6,9 @@
 				<el-select v-model="descType" style="width:150px;margin-left: 10px;" @change="select">
 					<el-option label="在线时长" value="1"></el-option>
 					<el-option label="业绩" value="2"></el-option>
-					<el-option label="加钟率" value="3"></el-option>
-					<el-option label="充值率" value="4"></el-option>
+<!--					<el-option label="加钟率" value="3"></el-option>-->
+<!--					<el-option label="充值率" value="4"></el-option>-->
+					<el-option label="积分" value="5"></el-option>
 				</el-select>
 			</div>
 			<div style="margin:5px;display: inline-block;">
@@ -33,22 +34,32 @@
 			</el-table-column>
 			<el-table-column prop="artificerName" label="师傅昵称">
 				<template slot-scope="scope">
-					<div style="color: #4f9dec;cursor: pointer;" @click="updatesvideo(scope.row.userId)">
+<!--					<div style="color: #4f9dec;cursor: pointer;" @click="updatesvideo(scope.row.userId)">-->
 						{{scope.row.artificerName?scope.row.artificerName:'未绑定'}}
-					</div>
+<!--					</div>-->
 				</template>
 			</el-table-column>
-			
+
 			<el-table-column prop="typeval" label="在线时长" v-if="descType==1">
 			</el-table-column>
-			
+
 			<el-table-column prop="typeval" label="业绩" v-if="descType==2">
 			</el-table-column>
-			
-			<el-table-column prop="typeval" label="加钟率" v-if="descType==3">
-			</el-table-column>
-			
-			<el-table-column prop="typeval" label="充值率" v-if="descType==4">
+
+<!--			<el-table-column prop="typeval" label="加钟率" v-if="descType==3">-->
+<!--			</el-table-column>-->
+
+<!--			<el-table-column prop="typeval" label="充值率" v-if="descType==4">-->
+<!--			</el-table-column>-->
+
+			<el-table-column prop="typeval" label="积分" v-if="descType==5">
+				<template slot-scope="scope">
+					<span style="color: #4f9dec;cursor: pointer;" @click="showJfDetails(scope.row)">
+						{{scope.row.typeval}}
+					</span>
+					<el-button size="mini" style="color: #4f9dec;background: #fff;border: none;"
+							   @click="showInsertJfDetail(scope.row)">修改</el-button>
+				</template>
 			</el-table-column>
 		</el-table>
 		<div style="text-align: center;margin-top: 10px;">
@@ -58,6 +69,107 @@
 			</el-pagination>
 		</div>
 
+		<!--技师积分详情列表-->
+		<el-dialog title="技师积分详情列表" :visible.sync="dialogJfDetailListFormVisible" width="80%" center>
+			<div style="display: inline-block">
+				<span>类型：</span>
+				<el-select
+					clearable
+					v-model="jfDetailClassify"
+					style="width: 150px; margin-left: 10px">
+					<el-option
+						v-for="item in dictData"
+						:key="item.id"
+						:label="item.value"
+						:value="item.id">
+					</el-option>
+				</el-select>&nbsp;&nbsp;
+			</div>
+			<div style="margin-left:10px;display: inline-block;">
+				<span>开始时间：</span>
+				<el-date-picker style="width: 160px;" v-model="jfDetailStartTime" align="right"
+								type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择开始时间">
+				</el-date-picker>&nbsp;&nbsp;&nbsp;
+			</div>
+			<div style="margin-left:10px;display: inline-block;">
+				<span>结束时间：</span>
+				<el-date-picker style="width: 160px;" v-model="jfDetailEndTime" align="right" type="datetime"
+								format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择结束时间">
+				</el-date-picker>
+			</div>
+			<el-button
+				style="margin-left: 10px;"
+				size="mini"
+				type="primary"
+				icon="document"
+				@click="selectJfDetails">查询
+			</el-button>
+			<el-button
+				style="margin-left: 10px"
+				size="mini"
+				type="primary"
+				icon="document"
+				@click="cleanJfDetails">重置
+			</el-button>
+			<el-table :data="jfDetailData.records" style="width: 100%">
+				<el-table-column prop="artificerName" label="技师名称" align="center"></el-table-column>
+				<el-table-column prop="createTime" label="时间" align="center"></el-table-column>
+				<el-table-column prop="classify" label="类型" align="center">
+					<template slot-scope="scope">
+						{{ showDictValue(scope.row.classify, dictData) }}
+					</template>
+				</el-table-column>
+				<el-table-column prop="integral" label="积分" align="center">
+					<template slot-scope="scope">
+						<span v-if="scope.row.type==2">-</span>
+						{{scope.row.integral}}
+					</template>
+				</el-table-column>
+				<el-table-column prop="achievement" label="业绩" align="center"></el-table-column>
+				<el-table-column prop="ordersNo" label="订单号" align="center"></el-table-column>
+				<el-table-column prop="remarks" label="备注" align="center"></el-table-column>
+			</el-table>
+			<div style="text-align: center; margin-top: 10px">
+				<el-pagination
+					@size-change="handleJfSizeChange"
+					@current-change="handleJfCurrentChange"
+					:page-size="jfDetailLimit"
+					:current-page="jfDetailPage"
+					layout="total, prev, pager, next,jumper"
+					:total="jfDetailData.totalCount"
+				></el-pagination>
+			</div>
+		</el-dialog>
+
+		<!-- 修改积分 -->
+		<el-dialog title="修改积分" :visible.sync="dialogJfDetail" center>
+			<div style="margin-bottom: 10px;">
+				<span style="width: 200px;display: inline-block;text-align: right;">修改类型：</span>
+				<el-radio-group v-model="jfDetailType">
+					<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="jfDetailIntegral" type="number" :min="0" :max="100" :controls="false"
+						  placeholder="请输入积分"></el-input>
+			</div>
+			<div style="margin-bottom: 10px;">
+				<span style="width: 200px;display: inline-block;text-align: right;">备注：</span>
+				<el-input style="width:50%;"
+						  v-model="jfDetailRemarks"
+						  type="textarea"
+						  :rows="4"
+						  placeholder="请输入备注">
+				</el-input>
+			</div>
+			<div slot="footer" class="dialog-footer">
+				<el-button @click="dialogJfDetail = false">取 消</el-button>
+				<el-button type="primary" @click="insertJfDetail()">确 定</el-button>
+			</div>
+		</el-dialog>
+
 	</div>
 </template>
 
@@ -97,7 +209,7 @@
 				method: 'false',
 				tableDataLoading: true,
 				homeData: {},
-				
+
 				choicenData: [],
 
 				userId: '',
@@ -107,7 +219,7 @@
 				statusId: 1,
 
 				quillOption: quillConfig,
-				
+
 				// x新的
 				indentState: 0, //任务状态
 				info: {
@@ -118,11 +230,27 @@
 				},
 				startTime: '',
 				endTime: '',
-				
+
 				fwData:[],
 				classifyId:'',
 				artificerName:'',
 				descType:'1',
+
+				jfDetailArtificerId: '',
+				jfDetailArtificerName: '',
+				jfDetailClassify: '',
+				jfDetailType: '',
+				jfDetailIntegral: 0,
+				jfDetailRemarks: '',
+				jfDetailStartTime: '',
+				jfDetailEndTime: '',
+				jfDetailPage: 1,
+				jfDetailLimit: 10,
+				jfDetailData: {},
+				jfDetailTableDataLoading: false,
+				dialogJfDetailListFormVisible: false,
+				dialogJfDetail: false,
+				dictData:[{id:1,value:'在线时长'},{id:2,value:'充值'},{id:3,value:'业绩'},{id:4,value:'系统调整'}],
 			}
 		},
 		methods: {
@@ -166,7 +294,7 @@
 				this.page = val
 				this.homeSelect()
 			},
-			
+
 			// 获取社区数据列表
 			homeSelect() {
 				this.tableDataLoading = true
@@ -262,6 +390,112 @@
 					this.fwData = returnData
 				})
 			},
+			showDictValue(data, datas){
+				const dictItem = datas.find(item => data === item.id);
+				return dictItem ? dictItem.value : '';
+			},
+			showJfDetails(row){
+				this.jfDetailArtificerId=row.artificerId;
+				this.dialogJfDetailListFormVisible = true;
+				this.selectJfDetails();
+			},
+			selectJfDetails(){
+				this.jfDetailTableDataLoading = true;
+				this.$http({
+					url: this.$http.adornUrl('artificer/getJfDetailList'),
+					method: 'get',
+					params: this.$http.adornParams({
+						'artificerId' : this.jfDetailArtificerId,
+						'classify': this.jfDetailClassify,
+						'startTime': this.jfDetailStartTime,
+						'endTime': this.jfDetailEndTime,
+						'page': this.jfDetailPage,
+						'limit': this.jfDetailLimit,
+					})
+				}).then(({ data }) => {
+					this.jfDetailTableDataLoading = false
+					this.jfDetailData = data.data
+				})
+			},
+			cleanJfDetails(){
+				this.jfDetailClassify='';
+				this.jfDetailStartTime='';
+				this.jfDetailEndTime='';
+				this.jfDetailPage=1;
+				this.jfDetailLimit=10;
+				this.selectJfDetails();
+			},
+			//分页
+			handleJfSizeChange(val) {
+				this.jfDetailLimit = val;
+				this.selectJfDetails();
+			},
+
+			//翻页
+			handleJfCurrentChange(val) {
+				this.jfDetailPage = val;
+				this.selectJfDetails();
+			},
+			showInsertJfDetail(row){
+				this.jfDetailArtificerId=row.artificerId;
+				this.jfDetailArtificerName=row.artificerName;
+				this.jfDetailType='';
+				this.jfDetailIntegral=0;
+				this.jfDetailRemarks='';
+				this.dialogJfDetail = true;
+			},
+			insertJfDetail(){
+				if (this.jfDetailType == "") {
+					this.$notify({
+						title: "提示",
+						duration: 1800,
+						message: "请选择型",
+						type: "warning",
+					});
+					return;
+				}
+				if (this.jfDetailIntegral == "") {
+					this.$notify({
+						title: "提示",
+						duration: 1800,
+						message: "请填写积分",
+						type: "warning",
+					});
+					return;
+				}
+				this.$http({
+					url: this.$http.adornUrl("artificer/insertJfDetail"),
+					method: "post",
+					params: this.$http.adornParams({
+						artificerId: this.jfDetailArtificerId,
+						artificerName: this.jfDetailArtificerName,
+						type: this.jfDetailType,
+						integral: this.jfDetailIntegral,
+						remarks : "系统调整积分："+this.jfDetailRemarks,
+					}),
+				}).then(({data}) => {
+					if (data.code == 0) {
+						this.$message({
+							message: "修改成功",
+							type: "success",
+							duration: 1500,
+							onClose: () => {
+								this.homeSelect();
+							},
+						});
+						this.dialogJfDetail = false;
+					} else {
+						this.$message({
+							message: data.msg,
+							type: "warning",
+							duration: 1500,
+							onClose: () => {
+							},
+						});
+					}
+				});
+			},
+
 		},
 		mounted() {
 			this.homeSelect()
diff --git a/src/views/riderTop/riderTop.vue b/src/views/riderTop/riderTop.vue
index abe6ec0..76aed33 100644
--- a/src/views/riderTop/riderTop.vue
+++ b/src/views/riderTop/riderTop.vue
@@ -2,17 +2,30 @@
 	<div>
 		<div style="display: inline-block;">
 			<div style="position: relative;display: inline-block;margin: 5px;">
-				<span>项目类型：</span>
-				<el-select v-model="classifyId" style="width:150px;margin-left: 10px;" @change="select()">
-					<el-option v-for="item in fwData" :key="item.id" :label="item.value" :value="item.id">
-					</el-option>
+				<span>排序类型：</span>
+				<el-select v-model="px" style="width:150px;margin-left: 10px;">
+					<el-option value="1" label="正序"></el-option>
+					<el-option value="2" label="倒叙"></el-option>
 				</el-select>&nbsp;&nbsp;
 			</div>
 			<div style="position: relative;display: inline-block;">
-				<span>项目名称：</span>
-				<el-input style="width: 200px;" @keydown.enter.native="select" placeholder="请输入项目名称"
-					v-model="artificerName">
-				</el-input>&nbsp;&nbsp;
+				<span>排序字段：</span>
+				<el-select v-model="type" style="width:150px;margin-left: 10px;">
+					<el-option value="1" label="订单数量"></el-option>
+					<el-option value="2" label="总收益"></el-option>
+					<el-option value="3" label="业绩"></el-option>
+					<el-option value="4" label="在线时长"></el-option>
+					<el-option value="5" label="加钟金额"></el-option>
+					<el-option value="6" label="充值金额"></el-option>
+					<el-option value="7" label="积分"></el-option>
+				</el-select>&nbsp;&nbsp;
+			</div>
+			<div style="position: relative;display: inline-block;">
+				<span>技师状态：</span>
+				<el-select v-model="status" style="width:150px;margin-left: 10px;">
+					<el-option value="1" label="正常"></el-option>
+					<el-option value="2" label="停牌"></el-option>
+				</el-select>&nbsp;&nbsp;
 			</div>
 			<div style="margin:5px;display: inline-block;">
 				<span>开始时间：</span>
@@ -48,76 +61,148 @@
 			</el-table-column>
 			<el-table-column prop="sy" label="总收益">
 			</el-table-column>
-			<el-table-column prop="zxsc" label="在线时长(分钟)">
-			</el-table-column>
 			<el-table-column prop="yj" label="业绩">
 			</el-table-column>
-			<el-table-column prop="jzl" label="加钟率">
+			<el-table-column prop="zxsc" label="在线时长(分钟)">
 			</el-table-column>
-			<el-table-column prop="czl" label="充值率">
+			<el-table-column prop="jzl" label="加钟金额">
+			</el-table-column>
+			<el-table-column prop="czl" label="充值金额">
+			</el-table-column>
+			<el-table-column prop="jf" label="积分">
+				<template slot-scope="scope">
+					<span style="color: #4f9dec;cursor: pointer;" @click="showJfDetails(scope.row)">
+						{{scope.row.jf}}
+					</span>
+					<el-button size="mini" style="color: #4f9dec;background: #fff;border: none;"
+							   @click="showInsertJfDetail(scope.row)">修改</el-button>
+				</template>
 			</el-table-column>
-			<!-- <el-table-column prop="createTime" label="创建时间" width="160">
-			</el-table-column> -->
 		</el-table>
 		<div style="text-align: center;margin-top: 10px;">
-			<el-pagination @size-change="handleSizeChange1" @current-change="handleCurrentChange1"
-				:page-sizes="[10, 20, 30, 40]" :page-size="size" :current-page="page"
-				layout="total,sizes, prev, pager, next,jumper" :total="homeData.totalCount">
+			<el-pagination
+				@size-change="handleSizeChange1"
+				@current-change="handleCurrentChange1"
+				:page-size="limit"
+				:current-page="page"
+				layout="total,prev,pager,next,jumper"
+				:total="homeData.total">
 			</el-pagination>
 		</div>
 
+		<!--技师积分详情列表-->
+		<el-dialog title="技师积分详情列表" :visible.sync="dialogJfDetailListFormVisible" width="80%" center>
+			<div style="display: inline-block">
+				<span>类型：</span>
+				<el-select
+					clearable
+					v-model="jfDetailClassify"
+					style="width: 150px; margin-left: 10px">
+					<el-option
+						v-for="item in dictData"
+						:key="item.id"
+						:label="item.value"
+						:value="item.id">
+					</el-option>
+				</el-select>&nbsp;&nbsp;
+			</div>
+			<div style="margin-left:10px;display: inline-block;">
+				<span>开始时间：</span>
+				<el-date-picker style="width: 160px;" v-model="jfDetailStartTime" align="right"
+								type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择开始时间">
+				</el-date-picker>&nbsp;&nbsp;&nbsp;
+			</div>
+			<div style="margin-left:10px;display: inline-block;">
+				<span>结束时间：</span>
+				<el-date-picker style="width: 160px;" v-model="jfDetailEndTime" align="right" type="datetime"
+								format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择结束时间">
+				</el-date-picker>
+			</div>
+			<el-button
+				style="margin-left: 10px;"
+				size="mini"
+				type="primary"
+				icon="document"
+				@click="selectJfDetails">查询
+			</el-button>
+			<el-button
+				style="margin-left: 10px"
+				size="mini"
+				type="primary"
+				icon="document"
+				@click="cleanJfDetails">重置
+			</el-button>
+			<el-table :data="jfDetailData.records" style="width: 100%">
+				<el-table-column prop="artificerName" label="技师名称" align="center"></el-table-column>
+				<el-table-column prop="createTime" label="时间" align="center"></el-table-column>
+				<el-table-column prop="classify" label="类型" align="center">
+					<template slot-scope="scope">
+						{{ showDictValue(scope.row.classify, dictData) }}
+					</template>
+				</el-table-column>
+				<el-table-column prop="integral" label="积分" align="center">
+					<template slot-scope="scope">
+						<span v-if="scope.row.type==2">-</span>
+						{{scope.row.integral}}
+					</template>
+				</el-table-column>
+				<el-table-column prop="achievement" label="业绩" align="center"></el-table-column>
+				<el-table-column prop="ordersNo" label="订单号" align="center"></el-table-column>
+				<el-table-column prop="remarks" label="备注" align="center"></el-table-column>
+			</el-table>
+			<div style="text-align: center; margin-top: 10px">
+				<el-pagination
+					@size-change="handleJfSizeChange"
+					@current-change="handleJfCurrentChange"
+					:page-size="jfDetailLimit"
+					:current-page="jfDetailPage"
+					layout="total, prev, pager, next,jumper"
+					:total="jfDetailData.totalCount"
+				></el-pagination>
+			</div>
+		</el-dialog>
+
+		<!-- 修改积分 -->
+		<el-dialog title="修改积分" :visible.sync="dialogJfDetail" center>
+			<div style="margin-bottom: 10px;">
+				<span style="width: 200px;display: inline-block;text-align: right;">修改类型：</span>
+				<el-radio-group v-model="jfDetailType">
+					<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="jfDetailIntegral" type="number" :min="0" :max="100" :controls="false"
+						  placeholder="请输入积分"></el-input>
+			</div>
+			<div style="margin-bottom: 10px;">
+				<span style="width: 200px;display: inline-block;text-align: right;">备注：</span>
+				<el-input style="width:50%;"
+						  v-model="jfDetailRemarks"
+						  type="textarea"
+						  :rows="4"
+						  placeholder="请输入备注">
+				</el-input>
+			</div>
+			<div slot="footer" class="dialog-footer">
+				<el-button @click="dialogJfDetail = false">取 消</el-button>
+				<el-button type="primary" @click="insertJfDetail()">确 定</el-button>
+			</div>
+		</el-dialog>
+
 	</div>
 </template>
 
 <script>
-	import {
-		quillEditor
-	} from 'vue-quill-editor'
-	import 'quill/dist/quill.core.css'
-	import 'quill/dist/quill.snow.css'
-	import 'quill/dist/quill.bubble.css'
-	import quillConfig from '../locality/quill-config.js'
-	import axios from 'axios';
-	import {
-		jsonp
-	} from 'vue-jsonp'
-	import {
-		provinceAndCityData,
-		regionData,
-		provinceAndCityDataPlus,
-		regionDataPlus,
-		CodeToText,
-		TextToCode
-	} from 'element-china-area-data'
-	var cityOptions = []
-	var geocoder, map, markersArray = [];
 	export default {
-		components: {
-			quillEditor
-		},
 		data() {
 			return {
-				size: 10,
 				page: 1,
 				limit: 10,
-				classify: 6,
-				type: '',
 				method: 'false',
 				tableDataLoading: true,
 				homeData: {},
-				
-				choicenData: [],
-
-				userId: '',
-				search: '',
-				myPhone: '',
-				classifyIds: 0,
-				statusId: 1,
-
-				quillOption: quillConfig,
-				
-				// x新的
-				indentState: 0, //任务状态
 				info: {
 					stockDate: this.getNowTime(), //日期
 				},
@@ -126,10 +211,25 @@
 				},
 				startTime: '',
 				endTime: '',
-				
-				fwData:[],
-				classifyId:'',
-				artificerName:'',
+				px: '',
+				type: '',
+				status: '',
+
+				jfDetailArtificerId: '',
+				jfDetailArtificerName: '',
+				jfDetailClassify: '',
+				jfDetailType: '',
+				jfDetailIntegral: 0,
+				jfDetailRemarks: '',
+				jfDetailStartTime: '',
+				jfDetailEndTime: '',
+				jfDetailPage: 1,
+				jfDetailLimit: 10,
+				jfDetailData: {},
+				jfDetailTableDataLoading: false,
+				dialogJfDetailListFormVisible: false,
+				dialogJfDetail: false,
+				dictData:[{id:1,value:'在线时长'},{id:2,value:'充值'},{id:3,value:'业绩'},{id:4,value:'系统调整'}],
 			}
 		},
 		methods: {
@@ -173,7 +273,7 @@
 				this.page = val
 				this.homeSelect()
 			},
-			
+
 			// 获取社区数据列表
 			homeSelect() {
 				this.tableDataLoading = true
@@ -185,16 +285,15 @@
 						'limit': this.limit,
 						'startTime': this.startTime,
 						'endTime': this.endTime,
-						'classifyId':this.classifyId,
-						'title':this.artificerName,
+						'px':this.px,
+						'type':this.type,
+						'status':this.status,
 					})
 				}).then(({ data }) => {
 					console.log("------>",data)
 					this.tableDataLoading = false
-					let returnData = data.data
-
-					console.log(data.data.state)
 					this.homeData = data.data
+					console.log(this.homeData)
 				})
 			},
 			// 详情跳转
@@ -225,10 +324,11 @@
 			},
 			// 重置
 			cleans() {
-				this.classifyId = ''
-				this.artificerName = ''
-				this.address = ''
-				this.flag = ''
+				this.px = ''
+				this.type = ''
+				this.status = ''
+				this.startTime = ''
+				this.endTime = ''
 				this.info.stockDate = this.getNowTime()
 				this.homeSelect()
 			},
@@ -273,6 +373,111 @@
 					this.fwData = returnData
 				})
 			},
+			showDictValue(data, datas){
+				const dictItem = datas.find(item => data === item.id);
+				return dictItem ? dictItem.value : '';
+			},
+			showJfDetails(row){
+				this.jfDetailArtificerId=row.artificerId;
+				this.dialogJfDetailListFormVisible = true;
+				this.selectJfDetails();
+			},
+			selectJfDetails(){
+				this.jfDetailTableDataLoading = true;
+				this.$http({
+					url: this.$http.adornUrl('artificer/getJfDetailList'),
+					method: 'get',
+					params: this.$http.adornParams({
+						'artificerId' : this.jfDetailArtificerId,
+						'classify': this.jfDetailClassify,
+						'startTime': this.jfDetailStartTime,
+						'endTime': this.jfDetailEndTime,
+						'page': this.jfDetailPage,
+						'limit': this.jfDetailLimit,
+					})
+				}).then(({ data }) => {
+					this.jfDetailTableDataLoading = false
+					this.jfDetailData = data.data
+				})
+			},
+			cleanJfDetails(){
+				this.jfDetailClassify='';
+				this.jfDetailStartTime='';
+				this.jfDetailEndTime='';
+				this.jfDetailPage=1;
+				this.jfDetailLimit=10;
+				this.selectJfDetails();
+			},
+			//分页
+			handleJfSizeChange(val) {
+				this.jfDetailLimit = val;
+				this.selectJfDetails();
+			},
+
+			//翻页
+			handleJfCurrentChange(val) {
+				this.jfDetailPage = val;
+				this.selectJfDetails();
+			},
+			showInsertJfDetail(row){
+				this.jfDetailArtificerId=row.artificerId;
+				this.jfDetailArtificerName=row.artificerName;
+				this.jfDetailType='';
+				this.jfDetailIntegral=0;
+				this.jfDetailRemarks='';
+				this.dialogJfDetail = true;
+			},
+			insertJfDetail(){
+				if (this.jfDetailType == "") {
+					this.$notify({
+						title: "提示",
+						duration: 1800,
+						message: "请选择型",
+						type: "warning",
+					});
+					return;
+				}
+				if (this.jfDetailIntegral == "") {
+					this.$notify({
+						title: "提示",
+						duration: 1800,
+						message: "请填写积分",
+						type: "warning",
+					});
+					return;
+				}
+				this.$http({
+					url: this.$http.adornUrl("artificer/insertJfDetail"),
+					method: "post",
+					params: this.$http.adornParams({
+						artificerId: this.jfDetailArtificerId,
+						artificerName: this.jfDetailArtificerName,
+						type: this.jfDetailType,
+						integral: this.jfDetailIntegral,
+						remarks : "系统调整积分："+this.jfDetailRemarks,
+					}),
+				}).then(({data}) => {
+					if (data.code == 0) {
+						this.$message({
+							message: "修改成功",
+							type: "success",
+							duration: 1500,
+							onClose: () => {
+								this.homeSelect();
+							},
+						});
+						this.dialogJfDetail = false;
+					} else {
+						this.$message({
+							message: data.msg,
+							type: "warning",
+							duration: 1500,
+							onClose: () => {
+							},
+						});
+					}
+				});
+			},
 		},
 		mounted() {
 			this.homeSelect()