1-12-1

src/api/info.js

@@ -0,0 +1,37 @@
+import request from "@/utils/request";
+
+//文章列表
+export function getArtList(data) {
+  return request({
+    url: "/Enterprise/Article/list",
+    method: "POST",
+    data,
+  });
+}
+
+//文章详情
+export function getArtDetail(data) {
+  return request({
+    url: "/Enterprise/Article/details",
+    method: "POST",
+    data,
+  });
+}
+
+//文章修改
+export function getArtUpdate(data) {
+  return request({
+    url: "/Enterprise/Article/update",
+    method: "POST",
+    data,
+  });
+}
+
+//共享股东加盟高管列表
+export function getZdyRy(data) {
+  return request({
+    url: "/Enterprise/Personnel/list",
+    method: "POST",
+    data,
+  });
+}

src/component/Tinymce/components/EditorImage.vue

@@ -13,6 +13,7 @@
       :img-height="-1"
       :limit="100"
       :is-check="true"
+      :modal="model"
       :is-show="pic_model_show"
       @cancel="pic_model_show = false"
       @confirm="uploadSuccess"
@@ -37,6 +38,10 @@
         type: String,
         default: "#1890ff",
       },
+      model:{
+        type: Boolean,
+        default: true,
+      }
     },
     data() {
       return {

src/component/Tinymce/index.vue

@@ -7,6 +7,7 @@
     <textarea :id="tinymceId" class="tinymce-textarea" />
     <div class="editor-custom-btn-container">
       <editorImage
+        :model='model'
         color="#1890ff"
         class="editor-upload-btn"
         @successCBK="imageSuccessCBK"
@@ -68,6 +69,10 @@
         required: false,
         default: "auto",
       },
+      model:{
+        type: Boolean,
+        default: true,
+      }
     },
     data() {
       return {

src/views/info/components/InfoAdd.vue

@@ -0,0 +1,210 @@
+<template>
+	<div>
+		<el-drawer class="edit-drawer" :title="isEdit ? '修改班次' : '新增班次'" size="1000px" :visible.sync="visible"
+			direction="rtl" :modal="modal" :wrapper-closable="false" @close="close">
+			<el-form ref="form" :rules="rules" size="small" :model="form" label-width="120px">
+				<el-form-item label="名称" prop="name">
+					<el-input v-model="form.name" placeholder="请输入名称"></el-input>
+				</el-form-item>
+				<el-form-item label="职务" prop="duties">
+					<el-input v-model="form.duties" placeholder="请输入职务"></el-input>
+				</el-form-item>
+        <el-form-item label="联系方式" prop="phone">
+        	<el-input v-model="form.phone" placeholder="请输入联系方式" type=""></el-input>
+        </el-form-item>
+				<el-form-item style="text-align: right; padding-right: 10px">
+					<el-button type="primary" @click="confirm">确 定</el-button>
+					<el-button @click="close">取 消</el-button>
+				</el-form-item>
+			</el-form>
+		</el-drawer>
+	</div>
+</template>
+
+<script>
+	import {
+		// postClassDetails,
+		postAddClass
+	} from "@/api/Department";
+	export default {
+		name: "AddClass",
+		props: {
+			visible: {
+				type: Boolean,
+				default: false,
+			},
+			isEdit: {
+				type: Boolean,
+				default: false,
+			},
+			// 是否需要遮罩层
+			modal: {
+				type: Boolean,
+				default: true,
+			},
+		},
+		data() {
+			return {
+				form: {
+          name: "", //姓名
+          duties: "", //职务
+          type: "", //1招商2连锁3共享股东4高管
+          phone: "", //联系方式 添加1招商2连锁3共享股东传入
+          address: "" ,//地址 添加1招商2连锁3共享股东传入
+          business:"",//业务
+          job_no: ""//工号
+				},
+				rules: {
+					name: [{
+						required: true,
+						message: "请输入名称",
+						trigger: "blur"
+					}],
+          type: [{
+						required: true,
+						message: "请选择身份",
+						trigger: "blur"
+					}],
+				}
+			};
+		},
+		// created() {
+		// 	if (this.id) {
+		// 		this.postClassDetails();
+		// 	}
+		// },
+		methods: {
+			// 删除上下班
+			delTime(ind) {
+				this.form.sections.splice(ind, 1)
+			},
+			// 添加上下班
+			addTime() {
+				this.form.sections.push({
+					times: [{
+						"check_type": "OnDuty", //类型(OnDuty上班，OffDuty下班)
+						"across": 0, //是否跨天
+						"end_min": -1, //允许的最玩打卡时间，分钟为单位（-1表示不限制）
+						"check_time": "", //check时间
+						"free_check": false, //是否免打卡
+						"begin_min": 0 //允许的最早提前打卡时间，分钟为单位}
+					}, {
+						"check_type": "OffDuty", //类型(OnDuty上班，OffDuty下班)
+						"across": 0, //是否跨天
+						"end_min": -1, //允许的最玩打卡时间，分钟为单位（-1表示不限制）
+						"check_time": "", //check时间
+						"free_check": false, //是否免打卡
+						"begin_min": 0 //允许的最早提前打卡时间，分钟为单位
+					}],
+				})
+			},
+
+			close() {
+				this.$emit("close");
+			},
+			//  班次详情 postClassDetails
+			// async postClassDetails() {
+			// 	if (!this.id) return;
+			// 	const {
+			// 		data
+			// 	} = await postClassDetails(this.id);
+
+			// 	this.form = {
+			// 		...data,
+			// 		departmentPidPath: data.extend.departmentPidPath,
+			// 		rolePidPath: data.extend.rolePidPath,
+			// 		age: data.age * 1000,
+			// 	};
+			// 	if (data.extend.rolePidPath) {
+			// 		this.role = data.extend.rolePidPath.split(",").map((item) => {
+			// 			return parseInt(item);
+			// 		});
+			// 	}
+
+			// 	this.department = data.extend.departmentPidPath
+			// 		.split(",")
+			// 		.map((item) => {
+			// 			return parseInt(item);
+			// 		});
+			// 	let shopArr = [];
+			// 	data.dataField.shopIds.forEach((item, index) => {
+			// 		shopArr.push({
+			// 			id: item,
+			// 			name: data.dataField.shopNames[index],
+			// 		});
+			// 	});
+			// 	this.shop_arr = shopArr;
+			// 	let arr = [];
+			// 	data.dataField.staffIds.forEach((item, index) => {
+			// 		arr.push({
+			// 			id: item,
+			// 			staffName: data.dataField.staffNames[index],
+			// 		});
+			// 	});
+			// 	this.staffName_arr = arr;
+			// },
+			async confirm() {
+				this.$refs.form.validate(async (valid) => {
+					if (valid) {
+						let upData = {
+							shift: Object.assign({}, this.form)
+						};
+						upData.shift.sections = upData.shift.sections.map((res) => {
+							let data = res.times.map((e)=>{
+								return Object.assign({},e)
+							})
+
+							if (data[1].check_time == '24:00') {
+								data[1].across = 1;
+								data[1].check_time = "00:00";
+							}
+							data[0].check_time = "1970-01-01 " + data[0].check_time +
+								':00'
+							data[1].check_time = "1970-01-01 " + data[1].check_time +
+								':00'
+
+								return {
+									times:data
+									};
+						})
+						const data = await postAddClass(upData);
+						this.$message({
+							message: data.data,
+							type: "success",
+						});
+
+						this.close();
+						this.$emit("confirm");
+					}
+				});
+			},
+		},
+	};
+</script>
+
+<style scoped>
+	.btn-up {
+		position: relative;
+	}
+
+	.btn-department {
+		position: absolute;
+		left: 270px;
+		top: 4px;
+	}
+
+	.btn-role-up {
+		position: relative;
+	}
+
+	.add-role {
+		position: absolute;
+		left: 270px;
+		top: 4px;
+	}
+
+	.creat-shop {
+		color: #1890ff;
+		font-size: 12px;
+	}
+</style>

src/views/info/components/infoUpdate.vue

@@ -0,0 +1,192 @@
+<template>
+	<div>
+		<el-drawer class="edit-drawer" title="修改文章" size="1000px" :visible.sync="visible"
+			direction="rtl" :modal="modal" :wrapper-closable="false" @close="close">
+			<el-form ref="form" :rules="rules" size="small" :model="artDetail" label-width="120px">
+				<el-form-item label="文章标题" prop="title">
+					<el-input v-model="artDetail.title" placeholder="请输入文章标题"></el-input>
+				</el-form-item>
+        <el-form-item label="文章内容" prop="content">
+        	<Tinymce  v-model="artDetail.content" :model='false' :height="300" />
+        </el-form-item>
+				<el-form-item style="text-align: right; padding-right: 10px">
+					<el-button type="primary" @click="confirm">确 定</el-button>
+					<el-button @click="close">取 消</el-button>
+				</el-form-item>
+			</el-form>
+		</el-drawer>
+	</div>
+</template>
+
+<script>
+	import {
+		getArtUpdate
+	} from "@/api/info";
+  import Tinymce from "@/component/Tinymce";
+	export default {
+		name: "InfoUpdate",
+    components: {
+      Tinymce,
+    },
+		filters: {
+			startTimeConfig: function(value) {
+				return {
+					start: '08:00',
+					step: '00:15',
+					end: '20:30',
+					minTime: value
+				}
+			},
+			endTimeConfig: function(value) {
+				return {
+					start: '08:00',
+					step: '00:15',
+					end: '24:00',
+					minTime: value
+				};
+			}
+		},
+		props: {
+			visible: {
+				type: Boolean,
+				default: false,
+			},
+      artDetail: {
+        type: Object,
+        default: ()=> {
+          return {}
+        },
+      },
+			isEdit: {
+				type: Boolean,
+				default: false,
+			},
+			// 是否需要遮罩层
+			modal: {
+				type: Boolean,
+				default: true,
+			},
+		},
+		data() {
+			return {
+				form: {
+          // 富文本
+          title:'',
+					//班次名字
+					name: '',
+					//签到单次奖励金额
+					single_time: 0,
+					// 签到时间范围
+					// 整合签到数据
+					sections: [{
+						times: [{
+							"check_type": "OnDuty", //类型(OnDuty上班，OffDuty下班)
+							"across": 0, //是否跨天
+							"end_min": -1, //允许的最玩打卡时间，分钟为单位（-1表示不限制）
+							"check_time": "08:30", //check时间
+							"free_check": false, //是否免打卡
+							"begin_min": 0 //允许的最早提前打卡时间，分钟为单位}
+						}, {
+							"check_type": "OffDuty", //类型(OnDuty上班，OffDuty下班)
+							"across": 0, //是否跨天
+							"end_min": -1, //允许的最玩打卡时间，分钟为单位（-1表示不限制）
+							"check_time": "11:30", //check时间
+							"free_check": false, //是否免打卡
+							"begin_min": 0 //允许的最早提前打卡时间，分钟为单位
+						}],
+					}],
+				},
+				rules: {
+					title: [{
+						required: true,
+						message: "请输入文章标题",
+						trigger: "blur"
+					}],
+					content: [{
+						required: true,
+						message: "请输入文章内容",
+						trigger: "blur"
+					}],
+				}
+			};
+		},
+		// created() {
+		// 	if (this.id) {
+		// 		this.postClassDetails();
+		// 	}
+		// },
+		methods: {
+			// 删除上下班
+			delTime(ind) {
+				this.form.sections.splice(ind, 1)
+			},
+			// 添加上下班
+			addTime() {
+				this.form.sections.push({
+					times: [{
+						"check_type": "OnDuty", //类型(OnDuty上班，OffDuty下班)
+						"across": 0, //是否跨天
+						"end_min": -1, //允许的最玩打卡时间，分钟为单位（-1表示不限制）
+						"check_time": "", //check时间
+						"free_check": false, //是否免打卡
+						"begin_min": 0 //允许的最早提前打卡时间，分钟为单位}
+					}, {
+						"check_type": "OffDuty", //类型(OnDuty上班，OffDuty下班)
+						"across": 0, //是否跨天
+						"end_min": -1, //允许的最玩打卡时间，分钟为单位（-1表示不限制）
+						"check_time": "", //check时间
+						"free_check": false, //是否免打卡
+						"begin_min": 0 //允许的最早提前打卡时间，分钟为单位
+					}],
+				})
+			},
+
+			close() {
+				this.$emit("close");
+			},
+
+			async confirm() {
+				this.$refs.form.validate(async (valid) => {
+					if (valid) {
+            console.log(this.artDetail,'artDetail')
+            const data = await getArtUpdate(this.artDetail)
+						// const data = await postAddClass(upData);
+						this.$message({
+							message: data.data,
+							type: "success",
+						});
+						this.close();
+						this.$emit("confirm");
+					}
+				});
+			},
+		},
+	};
+</script>
+
+<style scoped>
+	.btn-up {
+		position: relative;
+	}
+
+	.btn-department {
+		position: absolute;
+		left: 270px;
+		top: 4px;
+	}
+
+	.btn-role-up {
+		position: relative;
+	}
+
+	.add-role {
+		position: absolute;
+		left: 270px;
+		top: 4px;
+	}
+
+	.creat-shop {
+		color: #1890ff;
+		font-size: 12px;
+	}
+</style>

src/views/info/infoArticleList.vue

@@ -1,131 +1,167 @@
 <template>
-	<ContainerQuery>
-		<div v-if="$accessCheck($Access.CommissionRuleAddCommissionRule)" slot="left">
-			<el-button size="small" type="primary" @click="$router.push('/Shareholders/RuleCommission')">
-				新增股东
-			</el-button>
-		</div>
-		<div slot="more">
-			<el-form size="small" :inline="true">
-				<el-form-item>
-					<el-date-picker v-model="time" clearable type="date" end-placeholder="添加日期" @change="changeTime">
-					</el-date-picker>
-				</el-form-item>
-			</el-form>
-		</div>
-		<el-table :data="rule_list">
-			<el-table-column prop="name" label="股东名称" show-overflow-tooltip min-width="155"></el-table-column>
-			<el-table-column prop="number" label="联系方式" show-overflow-tooltip min-width="155"></el-table-column>
-			<el-table-column prop="dends" label="分红股份" min-width="140"></el-table-column>
-			<el-table-column prop="shares" label="原始股份" min-width="140"></el-table-column>
-			<el-table-column prop="createTime" label="添加时间" min-width="140"></el-table-column>
-			<el-table-column prop="name" label="操作" min-width="120">
-				<template slot-scope="scope">
-					<el-button v-if="$accessCheck($Access.CommissionRuleEditCommissionRule)" type="text" @click="
-              $router.push(
-                '/Shareholders/RuleCommissionEdit?id=' + scope.row.id
-              )
-            ">
-						修改
-					</el-button>
-					<el-button v-if="$accessCheck($Access.CommissionRuleDelCommissionRule)" type="text"
+  <div>
+  <ContainerQuery v-if="!balanceAdjustment">
+    <!-- <el-button slot="left" size="small" type="primary" @click="infoShow = true">
+    	新增文章
+    </el-button> -->
+    <el-table :data="rule_list">
+      <el-table-column prop="id" label="文章id" show-overflow-tooltip min-width="155"></el-table-column>
+      <el-table-column prop="title" label="文章标题" show-overflow-tooltip min-width="155"></el-table-column>
+      <el-table-column prop="createTime" label="添加时间" min-width="140">
+        <template #default="{ row }">
+          {{ $_common.formatDate(row.createTime) }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="name" label="操作" min-width="120">
+        <template slot-scope="scope">
+          <el-button v-if="$accessCheck($Access.CommissionRuleEditCommissionRule)" type="text"
+            @click="balanceAdjustmentFlag(scope.row)">
+            修改
+          </el-button>
+          <!-- <el-button v-if="$accessCheck($Access.CommissionRuleDelCommissionRule)" type="text"
 						@click="delData(scope.row.id)">
 						删除
-					</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
-		<FooterPage :page-size="pageSize" :total-page.sync="total" :current-page.sync="page" @pageChange="pageChange"
-			@sizeChange="sizeChange"></FooterPage>
-	</ContainerQuery>
+					</el-button> -->
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 		<FooterPage :page-size="pageSize" :total-page.sync="total" :current-page.sync="page" @pageChange="pageChange"
+			@sizeChange="sizeChange"></FooterPage> -->
+
+  </ContainerQuery>
+ <InfoAdd v-if="infoShow" :is-edit="isEdit" :visible="infoShow" @close="infoShow = false"
+ 	@confirm="staffConfirm"></InfoAdd>
+ <info-update v-if="info_update_show" :visible="true" :art-detail="formData" @close="info_update_show = false"
+  	@confirm="updateConfirm"></info-update>
+</div>
 </template>
 
 <script>
-	import {
-		Lst,
-	} from "@/api/Holders";
-	import {
-		enableRewardRule,
-		getAllRewardRule,
-		deleteRewardRule,
-	} from "@/api/Reward";
-	export default {
-		name: "RewardList",
-		data() {
-			return {
-				rule_list: [],
-				time: '',
-				search_form: {
-					start: "",
-				},
-				total: 0,
-				page: 1,
-				pageSize: 10,
-			};
-		},
-		created() {
-			this.Lst();
-		},
-		activated() {
-			if (this.$_isInit()) return;
-			this.Lst();
-		},
-		methods: {
-			//  订单时间
-			changeTime(val) {
-				if (val && val.length) {
-					this.search_form.start = val[0] / 1000;
-				} else {
-					this.search_form.start = "";
-				}
-				this.pageChange(1);
-			},
-			pageChange(page) {
-				this.page = page;
-				this.Lst();
-			},
-			// 每页数据大小改变
-			sizeChange(val) {
-				this.pageSize = val;
-				this.pageChange(1);
-			},
-			editData(index) {},
-			async Lst() {
-				const {
-					data,
-					pageTotal
-				} = await Lst({
-					page: this.page,
-					pageSize: this.pageSize,
-					createTime: this.search_form.start,
-				});
-				this.rule_list = data.map((item) => {
-					const staffName = data.map((item) => item.staffName);
-					return {
-						...item,
-						staffName: staffName.length ? staffName.join("，") : "",
-					};
-				});
-				this.total = pageTotal;
-			},
-			// 删除
-			async delData(id) {
-				this.$confirm("是否要将该提成规则删除?", "提示", {
-					confirmButtonText: "确定",
-					cancelButtonText: "取消",
-					type: "warning",
-				}).then(async () => {
-					const data = await deleteRewardRule(id);
+  import {
+    Lst,
+  } from "@/api/Holders";
+  import {
+    getArtList,
+    getArtDetail,
+    getArtUpdate
+  } from '@/api/info'
+
+  import InfoAdd from "./components/InfoAdd.vue";
+  import InfoUpdate from "./components/infoUpdate.vue";
+
+  export default {
+    name: "InfoArticleList",
+    components: {
+      InfoAdd,
+      InfoUpdate
+    },
+    data() {
+      return {
+        // 是否显示添加弹窗
+        infoShow:false,
+        info_update_show: false,
+        content: '',
+        rule_list: [],
+        time: '',
+        search_form: {
+          start: "",
+        },
+        total: 0,
+        page: 1,
+        pageSize: 10,
+        balanceAdjustment: false,
+        formData: {},
+        rules: {
+          title: [{
+            required: true,
+            message: "请输入标题",
+            trigger: "blur"
+          }],
+          content:[{
+            required: true,
+            message: "请输入内容",
+            trigger: "blur"
+          }]
+        },
+      };
+    },
+    created() {
+      this.Lst();
+      // this.getArtList()
+    },
+    activated() {
+      if (this.$_isInit()) return;
+      this.Lst();
+    },
+    methods: {
+      updateConfirm() {
+          this.Lst();
+      },
+      rechargeMemberBalance() {
+        this.$refs.form.validate(async (valid) => {
+          if(valid) {
+            getArtUpdate(this.formData).then(res => {
+              console.log(res)
+               this.Lst();
+              this.closeBalanceAdjustment()
+            })
+          }
+        })
+
+      },
+      closeBalanceAdjustment() {
+        this.balanceAdjustment = false
+      },
+      balanceAdjustmentFlag(row) {
+        console.log(row);
+        this.formData = {}
+        getArtDetail({
+          id: row.id
+        }).then(({
+          data
+        }) => {
+          this.formData = data;
+          this.info_update_show = true;
+        })
+
+        // this.formData.name = row.name;
+      },
+      // 每页数据大小改变
+      sizeChange(val) {
+        this.pageSize = val;
+        this.pageChange(1);
+      },
+      editData(index) {},
+      async Lst() {
+        const {
+          data,
+          pageTotal
+        } = await getArtList({
+          page: this.page,
+          pageSize: this.pageSize,
+          // createTime: this.search_form.start,
+        });
+        this.rule_list = data
+        // this.total = pageTotal;
+      },
+      // 删除
+      async delData(id) {
+        this.$confirm("是否要将该提成规则删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(async () => {
+          const data = await deleteRewardRule(id);
 
-					this.$message({
-						type: "success",
-						message: "操作成功!",
-					});
-					this.getAllRewardRule();
-				});
-			},
-		},
-	};
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+          this.getAllRewardRule();
+        });
+      },
+    },
+  };
 </script>
 
 <style scoped></style>

src/views/info/infoHomeList.vue

@@ -1,9 +1,18 @@
 <template>
 	<ContainerQuery>
 		<div v-if="$accessCheck($Access.CommissionRuleAddCommissionRule)" slot="left">
-			<el-button size="small" type="primary" @click="$router.push('/Shareholders/RuleCommission')">
-				新增股东
+			<el-button size="small" type="primary" @click="infoShow = true">
+				新增
 			</el-button>
+      <!-- <el-button size="small" type="primary" @click="$router.push('/Shareholders/RuleCommission')">
+      	新增连锁
+      </el-button>
+      <el-button size="small" type="primary" @click="$router.push('/Shareholders/RuleCommission')">
+      	新增共享股东
+      </el-button>
+      <el-button size="small" type="primary" @click="$router.push('/Shareholders/RuleCommission')">
+      	新增高管
+      </el-button> -->
 		</div>
 		<div slot="more">
 			<el-form size="small" :inline="true">
@@ -14,11 +23,60 @@
 			</el-form>
 		</div>
 		<el-table :data="rule_list">
-			<el-table-column prop="name" label="股东名称" show-overflow-tooltip min-width="155"></el-table-column>
-			<el-table-column prop="number" label="联系方式" show-overflow-tooltip min-width="155"></el-table-column>
-			<el-table-column prop="dends" label="分红股份" min-width="140"></el-table-column>
-			<el-table-column prop="shares" label="原始股份" min-width="140"></el-table-column>
-			<el-table-column prop="createTime" label="添加时间" min-width="140"></el-table-column>
+			<el-table-column prop="name" label="名称" show-overflow-tooltip min-width="280">
+        <template slot-scope="scope">
+          <div class="clearfix">
+            <div class="float_left customer-img-view">
+              <img
+                v-if="scope.row.avatar"
+                class="customer-img"
+                :src="scope.row.avatar"
+              />
+            </div>
+            <div class="float_left customer-name-view">
+              <p class="customer-name">
+                {{ scope.row.name }}
+              </p>
+              <p> 身份：{{ scope.row.type == 1 ? '招商':(scope.row.type == 2 ? '连锁': (scope.row.type == 3? '共享股东': '高管')) }}</p>
+            </div>
+          </div>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column prop="type" label="身份" show-overflow-tooltip min-width="155">
+        <template #default="{ row }">
+          {{ row.type == 1 ? '招商':(row.type == 2 ? '连锁': (row.type == 3? '共享股东': '高管')) }}
+        </template>
+      </el-table-column> -->
+      <el-table-column prop="job_no" label="工号" show-overflow-tooltip min-width="100">
+        <template #default="{ row }">
+          {{ row.job_no ? row.job_no: '--' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="phone" label="联系方式" show-overflow-tooltip min-width="155">
+        <template #default="{ row }">
+          {{ row.phone ? row.phone: '--' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="duties" label="职务" show-overflow-tooltip min-width="155">
+        <template #default="{ row }">
+          {{ row.duties ? row.duties: '--' }}
+        </template>
+      </el-table-column>
+       <el-table-column prop="business" label="业务" show-overflow-tooltip min-width="155">
+         <template #default="{ row }">
+           {{ row.business ? row.business: '--' }}
+         </template>
+       </el-table-column>
+      <el-table-column prop="address" label="地址" show-overflow-tooltip min-width="155">
+        <template #default="{ row }">
+          {{ row.address ? row.address: '--' }}
+        </template>
+      </el-table-column>
+			<el-table-column prop="createTime" label="添加时间" min-width="140">
+        <template #default="{ row }">
+          {{ $_common.formatDate(row.createTime) }}
+        </template>
+      </el-table-column>
 			<el-table-column prop="name" label="操作" min-width="120">
 				<template slot-scope="scope">
 					<el-button v-if="$accessCheck($Access.CommissionRuleEditCommissionRule)" type="text" @click="
@@ -37,22 +95,28 @@
 		</el-table>
 		<FooterPage :page-size="pageSize" :total-page.sync="total" :current-page.sync="page" @pageChange="pageChange"
 			@sizeChange="sizeChange"></FooterPage>
+      <InfoAdd v-if="infoShow" :is-edit="isEdit" :visible="infoShow" @close="infoShow = false"
+      	@confirm="infoConfirm"></InfoAdd>
 	</ContainerQuery>
 </template>
 
 <script>
-	import {
-		Lst,
-	} from "@/api/Holders";
-	import {
-		enableRewardRule,
-		getAllRewardRule,
-		deleteRewardRule,
-	} from "@/api/Reward";
+  import InfoAdd from "./components/InfoAdd.vue";
+  import {
+    getArtList,
+    getArtDetail,
+    getArtUpdate,
+    getZdyRy
+  } from '@/api/info'
+
 	export default {
 		name: "RewardList",
+    components: {
+      InfoAdd
+    },
 		data() {
 			return {
+        infoShow: false,
 				rule_list: [],
 				time: '',
 				search_form: {
@@ -71,6 +135,9 @@
 			this.Lst();
 		},
 		methods: {
+      infoConfirm() {
+
+      },
 			//  订单时间
 			changeTime(val) {
 				if (val && val.length) {
@@ -94,19 +161,14 @@
 				const {
 					data,
 					pageTotal
-				} = await Lst({
+				} = await getZdyRy({
 					page: this.page,
 					pageSize: this.pageSize,
-					createTime: this.search_form.start,
-				});
-				this.rule_list = data.map((item) => {
-					const staffName = data.map((item) => item.staffName);
-					return {
-						...item,
-						staffName: staffName.length ? staffName.join("，") : "",
-					};
+					// createTime: this.search_form.start,
 				});
+				this.rule_list = data
 				this.total = pageTotal;
+        console.log(this.rule_list,'this.rule_list')
 			},
 			// 删除
 			async delData(id) {
@@ -128,4 +190,17 @@
 	};
 </script>
 
-<style scoped></style>
+<style scoped>
+  .customer-img-view {
+    width: 50px;
+    height: 50px;
+    background-color: #f4f4f4;
+    margin-right: 10px;
+    border-radius: 4px;
+  }
+  .customer-img {
+    width: 50px;
+    height: 50px;
+    border-radius: 4px;
+  }
+</style>