Browse Source

del check

lhl 2 years ago
parent
commit
9c6e44dadc

+ 1 - 1
package.json

@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --open  --mode=dev ",
-    "dev": "npm run serve --mode=dev",
+    "dev": "vue-cli-service serve --open  --mode=dev",
     "build": "vue-cli-service build --mode=production"
   },
   "dependencies": {

+ 0 - 557
src/pages/store/checkRule/create.vue

@@ -1,557 +0,0 @@
-<template>
-	<div class="form-submit">
-		<div class="i-layout-page-header">
-			<PageHeader class="product_tabs" hidden-breadcrumb>
-				<div slot="title">
-					<router-link :to="{ path: `${roterPre}/store/checkRule/index` }">
-						<div class="font-sm after-line">
-							<span class="iconfont iconfanhui"></span>
-							<span class="pl10">返回</span>
-						</div>
-					</router-link>
-					<span v-text="$route.params.id ? '编辑打卡规则' : '添加打卡规则'" class="mr20 ml16"></span>
-				</div>
-			</PageHeader>
-		</div>
-		<Card :bordered="false" dis-hover class="ivu-mt">
-			<Form :model="formData" :label-width="150">
-				<FormItem label="规则名称" required>
-					<Input v-model="formData.groupname" v-width="320"></Input>
-				</FormItem>
-				<FormItem label="打卡员工" required>
-					<!-- <Input v-model="formData.groupname" v-width="320"></Input> -->
-					<template v-for="item in checkedStaff">
-						<Tag>{{item.name}}</Tag>
-					</template>
-					<Button type="primary" @click="chooseSatff">选择员工</Button>
-				</FormItem>
-				<FormItem label="打卡经度">
-					<Input v-model="formData.loc_infos[0].lng" v-width="320"></Input>
-					<span> (实际经度的1000000倍)</span>
-				</FormItem>
-				<FormItem label="打卡纬度">
-					<Input v-model="formData.loc_infos[0].lat" v-width="320"></Input>
-					<span> (实际纬度的1000000倍)</span>
-				</FormItem>
-				<FormItem label="打卡地名">
-					<Input v-model="formData.loc_infos[0].loc_title" v-width="320"></Input>
-					<span> (实际纬度的1000000倍)</span>
-				</FormItem>
-				<FormItem label="打卡详细地址">
-					<Input v-model="formData.loc_infos[0].loc_detail" v-width="320"></Input>
-					<span> (实际纬度的1000000倍)</span>
-				</FormItem>
-				<FormItem label="WiFi名称">
-					<Input v-model="formData.wifimac_infos[0].wifiname" v-width="320"></Input>
-					<span> </span>
-				</FormItem>
-				<FormItem label="无线路由器MAC地址">
-					<Input v-model="formData.wifimac_infos[0].wifimac" v-width="320"></Input>
-					<span> </span>
-				</FormItem>
-				<card v-for="(itemx,indexx) in formData.checkindate" style="width:1000px;">
-					<div style="padding-bottom: 10px;">打卡时间
-						<Button type="primary" style="margin-left: 20px;" @click="addNewDkTime()"
-							v-if="indexx == 0">添加新打卡时间</Button>
-						<Button type="primary" style="margin-left: 20px;" @click="delNewDkTime(indexx)"
-							v-else>删除</Button>
-					</div>
-					<FormItem label="工作日" required>
-						<TagSelect v-model="itemx.workdays" hide-check-all>
-							<TagSelectOption :name="1">星期一</TagSelectOption>
-							<TagSelectOption :name="2">星期二</TagSelectOption>
-							<TagSelectOption :name="3">星期三</TagSelectOption>
-							<TagSelectOption :name="4">星期四</TagSelectOption>
-							<TagSelectOption :name="5">星期五</TagSelectOption>
-							<TagSelectOption :name="6">星期六</TagSelectOption>
-							<TagSelectOption :name="0">星期天</TagSelectOption>
-						</TagSelect>
-					</FormItem>
-					<card v-for="(item,index) in itemx.checkintime" style="margin-bottom: 10px;">
-						<FormItem label="时段id" required>
-							<Input v-width="320" placeholder="大于0,小于99999,且唯一" v-model="item.time_id"></Input>
-							<Button type="primary" style="margin-left: 20px;" @click="addNewDk(itemx)"
-								v-if="index == 0">添加新上班时段</Button>
-							<Button type="primary" style="margin-left: 20px;" @click="delNewDk(itemx,index)"
-								v-else>删除</Button>
-						</FormItem>
-						<FormItem label="上班时间" required>
-							<TimePicker :steps="[1, 5]" placeholder="" v-width="320" format="HH:mm"
-								v-model="item.work_sec" />
-						</FormItem>
-						<FormItem label="上班最早时间" required>
-							<TimePicker :steps="[1, 5]" placeholder="" v-width="320" format="HH:mm"
-								v-model="item.earliest_work_sec" />
-						</FormItem>
-						<FormItem label="上班最晚时间" required>
-							<TimePicker :steps="[1, 5]" placeholder="" v-width="320" format="HH:mm"
-								v-model="item.latest_work_sec" />
-						</FormItem>
-						<FormItem label="上班提醒时间" required>
-							<TimePicker :steps="[1, 5]" placeholder="" v-width="320" format="HH:mm"
-								v-model="item.remind_work_sec" />
-						</FormItem>
-						<FormItem label="下班时间" required>
-							<TimePicker :steps="[1, 5]" placeholder="" v-width="320" format="HH:mm"
-								v-model="item.off_work_sec" />
-						</FormItem>
-						<FormItem label="下班最早时间" required>
-							<TimePicker :steps="[1, 5]" placeholder="" v-width="320" format="HH:mm"
-								v-model="item.earliest_off_work_sec" />
-						</FormItem>
-						<FormItem label="下班最晚时间" required>
-							<TimePicker :steps="[1, 5]" placeholder="" v-width="320" format="HH:mm"
-								v-model="item.latest_off_work_sec" />
-						</FormItem>
-						<FormItem label="下班提醒时间" required>
-							<TimePicker :steps="[1, 5]" placeholder="" v-width="320" format="HH:mm"
-								v-model="item.remind_off_work_sec" />
-						</FormItem>
-					</card>
-				</card>
-
-
-			</Form>
-			<div style="width: 500px; display: flex;justify-content: center;">
-				<Button type="primary" class="submission" @click="save" :disabled="disabled"
-					v-if="!formData.id">立即创建</Button>
-				<Button type="primary" class="submission" @click="save" :disabled="disabled" v-else>立即修改</Button>
-				<Button type="primary" @click="showDate()">测试数据</Button>
-			</div>
-		</Card>
-		<Modal v-model="modals" title="员工列表" footerHide class="paymentFooter" scrollable width="900"
-			@on-cancel="cancel">
-			<staff-list ref="stafflist" :goodsType="1" v-if="modals" @getProductId="getProductId"
-				:serviceCard="1"></staff-list>
-		</Modal>
-	</div>
-</template>
-
-<script>
-	import {
-		mapState
-	} from "vuex";
-	import staffList from "@/components/staffList/index";
-	import storeList from "@/components/storeList";
-	import {
-		couponCategoryApi,
-		couponSaveApi,
-		couponDetailApi,
-		VipEditApi,
-		serveAddApi,
-		serveReadApi,
-		createServeProduct
-	} from "@/api/marketing";
-	import {
-		addCheckRule
-	} from '@/api/store';
-	import {
-		brandList
-	} from "@/api/product";
-	// import { formatDate } from '@/utils/validate';
-	import Setting from "@/setting";
-	export default {
-		name: "storeCouponCreate",
-		components: {
-			storeList,
-			staffList
-		},
-		data() {
-			return {
-				checkedStaff: [],
-				modals: false, //选择员工弹出
-				value: '',
-				id: '',
-				work_sec: '',
-				roterPre: Setting.roterPre,
-				disabled: false,
-				storesList: [],
-				formData: {
-					groupname: '',
-					grouptype: 1, //规则类型: 1-固定时间上下班;2-按班次上下班;3-自由上下班
-					type: 2, //	打卡方式 0-手机,2-考勤机,3-手机/考勤机
-					loc_infos: [{
-						lat: 30547030,
-						lng: 104062890,
-						loc_title: "腾讯成都大厦",
-						loc_detail: "四川省成都市武侯区高新南区天府三街",
-						distance: 300
-					}],
-					wifimac_infos: [{
-						"wifiname": "Tencent-WiFi-1",
-						"wifimac": "c0:7b:bc:37:f8:d3"
-					}],
-					range: {
-						userid: [
-							"qywx4633487382413312"
-						]
-					}, //打卡人员
-					checkindate: [{
-						'workdays': [],
-						"checkintime": [{
-							"time_id": '1',
-							"work_sec": '', //上班时间(距0点秒数,整分钟)
-							"off_work_sec": '', //下班时间
-							"remind_work_sec": '', //上班提醒时间
-							"remind_off_work_sec": '', //下班提醒时间
-							"earliest_work_sec": '', //上班最早时间
-							"latest_work_sec": '', //上班最晚时间
-							"earliest_off_work_sec": '', //下班最早时间
-							"latest_off_work_sec": '' //	下班最晚时间
-						}],
-						"flex_on_duty_time": 0,
-						"flex_off_duty_time": 0
-					}]
-
-				},
-				id: 0,
-				product_name: '',
-				product_id: 0,
-				store_name: '',
-				repertory: '',
-				card_price: '',
-				explain: '',
-				unit_name: '',
-				image: '',
-				images: '',
-				modals: false,
-			}
-		},
-		computed: {
-			...mapState("admin/layout", ["isMobile", "menuCollapse"]),
-		},
-		created() {},
-		methods: {
-			// 测试数据
-			showDate() {
-				console.log('shuju', this.formData)
-			},
-			// 打开员工选择弹窗
-			chooseSatff() {
-				this.modals = true;
-			},
-			changeT(e) {
-				// close()
-				console.log(e, 'dddddddddddddd')
-			},
-			showTime(time) {
-
-				let hh = '',
-					mm = '';
-				hh = Math.floor(time / 3600);
-				hh = hh > 9 ? hh : ('0' + hh)
-				mm = Math.floor((time % 3600) / 60);
-				mm = mm > 9 ? mm : ('0' + mm)
-				let str = hh + ':' + mm + ':' + '00'
-				console.log('str:', str)
-				return str
-
-
-			},
-			addNewDk(item) {
-				item.checkintime.push({
-					"time_id": '',
-					"work_sec": '', //上班时间(距0点秒数,整分钟)
-					"off_work_sec": '', //下班时间
-					"remind_work_sec": '', //上班提醒时间
-					"remind_off_work_sec": '', //下班提醒时间
-					"earliest_work_sec": '', //上班最早时间
-					"latest_work_sec": '', //上班最晚时间
-					"earliest_off_work_sec": '', //下班最早时间
-					"latest_off_work_sec": '' //	下班最晚时间
-				})
-			},
-			addNewDkTime() {
-				this.formData.checkindate.push({
-					'workdays': [],
-					"checkintime": [{
-						"time_id": '',
-						"work_sec": '', //上班时间(距0点秒数,整分钟)
-						"off_work_sec": '', //下班时间
-						"remind_work_sec": '', //上班提醒时间
-						"remind_off_work_sec": '', //下班提醒时间
-						"earliest_work_sec": '', //上班最早时间
-						"latest_work_sec": '', //上班最晚时间
-						"earliest_off_work_sec": '', //下班最早时间
-						"latest_off_work_sec": '' //	下班最晚时间
-					}],
-					"flex_on_duty_time": 0,
-					"flex_off_duty_time": 0
-				})
-			},
-
-			delNewDkTime(index) {
-				this.formData.checkindate.splice(index, 1)
-			},
-			delNewDk(item,index) {
-				item.splice(index, 1)
-			},
-			// 
-			onchangeTime(e) {
-				console.log(e, 'xuanz');
-			},
-			// 商品id
-			getProductId(row) {
-				this.modals = false;
-				console.log(row, '这个');
-				this.checkedStaff = row
-				let arr = []
-				this.checkedStaff.forEach(item => {
-					arr.push(item.userid)
-				})
-				this.formData.range.userid = arr
-
-			},
-			// 选择商品
-			changeGoods() {
-				this.modals = true;
-			},
-			downTab() {
-				// if (!this.formData.store_name) {
-				// 	return this.$Message.error("请输入服务卡名称");
-				// }
-				// if (!this.formData.card_price) {
-				// 	return this.$Message.error("请输入售价");
-				// }
-				// if (!this.formData.repertory) {
-				// 	return this.$Message.error("请输入库存");
-				// }
-			},
-			getTime(str) {
-				if(typeof(str) == 'string') {
-					let arr = str.split(':')
-					return arr[0]*60*60 + arr[1]*60
-				}else {
-					return str
-				}
-				
-			},
-			// 创建
-			save() {
-				let that = this
-				this.downTab();
-				console.log('这');
-				let qdata = {}
-				qdata = Object.assign(qdata,this.formData)
-				try{
-					// let qdata = JSON.parse(JSON.stringify(this.formData))
-					let checkindate = []
-					this.formData.checkindate.forEach(item => {
-						// checkindate.push(item.)
-						let mitem = []
-						item.checkintime.forEach(itemt => {
-							for(let key in itemt) {
-								// let val = ''
-								if(key != 'time_id') {
-									itemt[key] = that.getTime(itemt[key])
-								}else {
-									itemt[key] = itemt[key]*1
-								}
-							}
-							mitem.push(itemt)
-						})
-						item.checkintime = mitem
-						checkindate.push(item)
-					})
-					qdata.checkindate = checkindate
-					console.log(qdata,'this.formData')
-				}catch(e){
-					//TODO handle the exception
-					console.log(e,'cuow')
-				}
-				
-				
-				addCheckRule({
-						'group': qdata
-					})
-					.then((res) => {
-						this.disabled = true;
-						this.$Message.success(res.msg);
-						setTimeout(() => {
-							this.$router.push({
-								path: this.roterPre + "/store/checkRule/index",
-							});
-						}, 1000);
-					})
-					.catch((err) => {
-						this.$Message.error(err.msg);
-					});
-			},
-			cancel() {
-				this.modals = false;
-			},
-		},
-	};
-</script>
-
-<style scoped lang="stylus">
-	.tips {
-		display: inline-bolck;
-		font-size: 12px;
-		font-weight: 400;
-		color: #999999;
-		margin-top: 10px;
-	}
-
-	.imgPic {
-		.info {
-			width: 60%;
-			margin-left: 10px;
-		}
-
-		.pictrue {
-			height: 36px;
-			margin: 7px 3px 0 3px;
-
-			img {
-				height: 100%;
-				display: block;
-			}
-		}
-	}
-
-	.productType {
-		width: 120px;
-		height: 60px;
-		background: #FFFFFF;
-		border-radius: 3px;
-		border: 1px solid #E7E7E7;
-		float: left;
-		text-align: center;
-		padding-top: 8px;
-		position: relative;
-		cursor: pointer;
-		line-height: 23px;
-		margin-right: 12px;
-
-		&.on {
-			border-color: #1890FF;
-		}
-
-		.name {
-			font-size: 14px;
-			font-weight: 600;
-			color: rgba(0, 0, 0, 0.85);
-
-			&.on {
-				color: #1890FF;
-			}
-		}
-
-		.title {
-			font-size: 12px;
-			font-weight: 400;
-			color: #999999;
-		}
-
-		.jiao {
-			position: absolute;
-			bottom: 0;
-			right: 0;
-			width: 0;
-			height: 0;
-			border-bottom: 26px solid #1890FF;
-			border-left: 26px solid transparent;
-		}
-
-		.iconfont {
-			position: absolute;
-			bottom: -3px;
-			right: 1px;
-			color: #FFFFFF;
-			font-size: 12px;
-		}
-	}
-
-	.info {
-		color: #888;
-		font-size: 12px;
-	}
-
-	.ivu-input-wrapper {
-		width: 320px;
-	}
-
-	.ivu-input-number {
-		width: 160px;
-	}
-
-	.ivu-date-picker {
-		width: 320px;
-	}
-
-	.ivu-icon-ios-camera-outline {
-		width: 58px;
-		height: 58px;
-		border: 1px dotted rgba(0, 0, 0, 0.1);
-		border-radius: 4px;
-		background-color: rgba(0, 0, 0, 0.02);
-		line-height: 58px;
-		cursor: pointer;
-		vertical-align: middle;
-	}
-
-	.upload-list {
-		width: 58px;
-		height: 58px;
-		border: 1px dotted rgba(0, 0, 0, 0.1);
-		border-radius: 4px;
-		margin-right: 15px;
-		display: inline-block;
-		position: relative;
-		cursor: pointer;
-		vertical-align: middle;
-	}
-
-	.upload-list img {
-		display: block;
-		width: 100%;
-		height: 100%;
-	}
-
-	.ivu-icon-ios-close-circle {
-		position: absolute;
-		top: 0;
-		right: 0;
-		transform: translate(50%, -50%);
-	}
-
-	.form-submit {
-		/deep/.ivu-card {
-			border-radius: 0;
-		}
-
-		margin-bottom: 79px;
-
-		.fixed-card {
-			position: fixed;
-			right: 0;
-			bottom: 0;
-			left: 200px;
-			z-index: 99;
-			box-shadow: 0 -1px 2px rgb(240, 240, 240);
-
-			/deep/ .ivu-card-body {
-				padding: 15px 16px 14px;
-			}
-
-			.ivu-form-item {
-				margin-bottom: 0;
-			}
-
-			/deep/ .ivu-form-item-content {
-				margin-right: 124px;
-				text-align: center;
-			}
-
-			.ivu-btn {
-				height: 36px;
-				padding: 0 20px;
-			}
-		}
-	}
-
-	/deep/.vxe-tree-cell {
-		padding-left: 0 !important;
-	}
-</style>

+ 0 - 286
src/pages/store/checkRule/index.vue

@@ -1,286 +0,0 @@
-<template>
-	<div>
-		<div class="i-layout-page-header">
-			<PageHeader class="product_tabs" title="会员卡" hidden-breadcrumb></PageHeader>
-		</div>
-		<Card :bordered="false" dis-hover class="ivu-mt">
-			<Form ref="tableFrom" :model="tableFrom" :label-width="labelWidth" :label-position="labelPosition"
-				@submit.native.prevent>
-				<Row type="flex">
-					<Col v-bind="grid">
-					<Button v-auth="['admin-marketing-store_coupon-add']" type="primary" icon="md-add"
-						@click="add">添加打卡规则</Button>
-					</Col>
-				</Row>
-			</Form>
-			<Table :columns="columns1" :data="tableList" ref="table" class="mt25" :loading="loading" highlight-row
-				no-userFrom-text="暂无数据" no-filtered-userFrom-text="暂无筛选结果">
-				<template slot-scope="{ row, index }" slot="groupname">
-					{{row.checkin_option.groupname}}
-				</template>
-				<!-- workdays -->
-				<template slot-scope="{ row, index }" slot="workdays">
-					<el-tag v-for="witem in row.checkin_option.checkindate[0].workdays">{{witem | showWd}}</el-tag>
-				</template>
-				<template slot-scope="{ row, index }" slot="status">
-					<Icon type="md-checkmark" v-if="row.status === 1" color="#0092DC" size="14" />
-					<Icon type="md-close" v-else color="#ed5565" size="14" />
-				</template>
-				<template slot-scope="{ row, index }" slot="add_time">
-					<span> {{row.add_time | formatDate}}</span>
-				</template>
-				<template slot-scope="{ row, index }" slot="action">
-					<!-- <a @click="couponSend(row)">编辑</a>
-					<Divider type="vertical" /> -->
-					<a @click="couponDel(row,'删除会员卡',index)">删除</a>
-				</template>
-			</Table>
-			<div class="acea-row row-right page">
-				<Page :total="total" :current="tableFrom.page" show-elevator show-total @on-change="pageChange"
-					:page-size="tableFrom.limit" />
-			</div>
-		</Card>
-		<!--表单编辑-->
-		<edit-from :FromData="FromData" @changeType="changeType" ref="edits"></edit-from>
-	</div>
-</template>
-
-<script>
-	import {
-		mapState
-	} from 'vuex';
-	import {
-		couponListApi,
-		couponCreateApi,
-		couponEditeApi,
-		couponSendApi,
-		vipListApi,
-		VipDeleteApi,
-		VipEditApi
-	} from '@/api/marketing';
-	import {
-		checkGroupList,
-		checkRuleList
-	} from '@/api/store';
-	import editFrom from '@/components/from/from';
-	import {
-		formatDate
-	} from '@/utils/validate';
-	import Setting from "@/setting";
-	export default {
-		name: 'storeCoupon',
-		filters: {
-			formatDate(time) {
-				if (time !== 0) {
-					let date = new Date(time * 1000);
-					return formatDate(date, 'yyyy-MM-dd hh:mm');
-				}
-			},
-			showWd(day) {
-				let str = ''
-				if(day) {
-					switch (day*1){
-						case 1:
-							str = '星期一'
-							break;
-						case 2:
-							str = '星期二'
-							break;
-						case 3:
-							str = '星期三'
-							break;
-						case 4:
-							str = '星期四'
-							break;
-						case  5:
-							str = '星期五'
-							break;
-						case 6:
-							str = '星期六'
-							break;
-						case  0:
-							str = '星期日'
-							break;
-						default:
-							break;
-					}
-				}
-				return str
-			}
-		},
-		components: {
-			editFrom
-		},
-		data() {
-			return {
-				roterPre: Setting.roterPre,
-				grid: {
-					xl: 7,
-					lg: 7,
-					md: 12,
-					sm: 24,
-					xs: 24
-				},
-				loading: false,
-				columns1: [{
-						title: 'ID',
-						key: 'id',
-						width: 80
-					},
-					{
-						title: '规则名称',
-						slot: 'groupname',
-						minWidth: 150
-					},
-					{
-						title: '工作日',
-						slot: 'workdays',
-						minWidth: 80
-					},
-					{
-						title: '添加时间',
-						key: 'create_time',
-						minWidth: 100
-					},
-					// {
-					//     title: '折扣',
-					//     key: 'discount_ratio',
-					//     minWidth: 100
-					// },
-					{
-						title: '操作',
-						slot: 'action',
-						fixed: 'right',
-						minWidth: 170
-					}
-				],
-				tableFrom: {
-					page: 1,
-					limit: 15
-				},
-				tableList: [],
-				total: 0,
-				FromData: null
-			}
-		},
-		created() {
-			this.getList();
-		},
-		computed: {
-			...mapState('admin/layout', [
-				'isMobile'
-			]),
-			labelWidth() {
-				return this.isMobile ? undefined : 90;
-			},
-			labelPosition() {
-				return this.isMobile ? 'top' : 'left';
-			}
-		},
-		methods: {
-			// 失效
-			couponInvalid(row, tit, num) {
-				let delfromData = {
-					title: tit,
-					num: num,
-					url: `marketing/coupon/status/${row.id}`,
-					method: 'PUT',
-					ids: ''
-				};
-				this.$modalSure(delfromData).then((res) => {
-					this.$Message.success(res.msg);
-					this.getList();
-				}).catch(res => {
-					this.$Message.error(res.msg);
-				});
-			},
-			// 发布
-			couponSend(row) {
-				// this.$modalForm(VipEditApi(row.id)).then(() => this.getList());
-				this.$router.push({
-					path: this.roterPre + "/store/checkRule/create"
-				});
-			},
-			// 删除
-			couponDel(row, tit, num) {
-				let delfromData = {
-					title: tit,
-					url: `membership/deleteCard/${row.id}`,
-					method: 'DELETE',
-					ids: ''
-				};
-				this.$modalSure(delfromData).then((res) => {
-					this.$Message.success(res.msg);
-					this.tableList.splice(num, 1)
-				}).catch(res => {
-					this.$Message.error(res.msg);
-				});
-			},
-			// 列表
-			getList() {
-				this.loading = true;
-
-				checkRuleList(this.tableFrom).then(async res => {
-					let data = res.data
-					this.tableList = data.data;
-					this.total = res.data.count;
-					this.loading = false;
-				}).catch(res => {
-					this.loading = false;
-					this.$Message.error(res.msg);
-				});
-			},
-			pageChange(index) {
-				this.tableFrom.page = index;
-				this.getList();
-			},
-			changeType(data) {
-				this.type = data;
-			},
-			// 添加
-			add() {
-				// this.$modalForm(couponCreateApi()).then(() => this.getList());
-				this.$router.push({
-					path: this.roterPre + "/store/checkRule/create"
-				});
-				// this.addType(0);
-			},
-			addType(type) {
-				couponCreateApi(type).then(async res => {
-					if (res.data.status === false) {
-						return this.$authLapse(res.data);
-					}
-					// console.log()
-					console.log(res.data, 'res.data');
-					this.FromData = res.data;
-					this.$refs.edits.modals = true;
-				}).catch(res => {
-					this.$Message.error(res.msg);
-				})
-			},
-			// 编辑
-			edit(row) {
-				this.$modalForm(couponEditeApi(row.id)).then(() => this.getList());
-			},
-			// 表格搜索
-			userSearchs() {
-				this.tableFrom.page = 1;
-				this.getList();
-			},
-			// 修改成功
-			submitFail() {
-				this.getList();
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	.ivu-col:nth-of-type(1) .ivu-form-item .ivu-form-item-label {
-		width: 80px !important;
-	}
-
-	.ivu-col:nth-of-type(1) .ivu-form-item .ivu-form-item-content {
-		margin-left: 80px !important;
-	}
-</style>

+ 0 - 512
src/pages/store/classes/create.vue

@@ -1,512 +0,0 @@
-<template>
-	<div class="form-submit">
-		<div class="i-layout-page-header">
-			<PageHeader class="product_tabs" hidden-breadcrumb>
-				<div slot="title">
-					<router-link :to="{ path: `${roterPre}/store/checkRule/index` }">
-						<div class="font-sm after-line">
-							<span class="iconfont iconfanhui"></span>
-							<span class="pl10">返回</span>
-						</div>
-					</router-link>
-					<span v-text="$route.params.id ? '编辑打卡规则' : '添加打卡规则'" class="mr20 ml16"></span>
-				</div>
-			</PageHeader>
-		</div>
-		<Card :bordered="false" dis-hover class="ivu-mt">
-			<Form :model="formData" :label-width="150">
-				<FormItem label="规则名称" required>
-					<Input v-model="formData.groupname" v-width="320"></Input>
-				</FormItem>
-				<FormItem label="打卡规则" required>
-					<!-- <Input v-model="formData.groupname" v-width="320"></Input> -->
-					<template v-for="item in checkedStaff">
-						<Tag>{{item.name}}</Tag>
-					</template>
-					<Button type="primary" @click="chooseSatff">选择员工</Button>
-				</FormItem>
-				<card v-for="(itemx,indexx) in formData.checkindate" style="width:1000px;">
-					<card v-for="(item,index) in itemx.checkintime" style="margin-bottom: 10px;">
-						<FormItem label="时段id" required>
-							<Input v-width="320" placeholder="大于0,小于99999,且唯一" v-model="item.time_id"></Input>
-						</FormItem>
-						<FormItem label="上班时间" required>
-							<TimePicker :steps="[1, 5]" placeholder="" v-width="320" format="HH:mm"
-								v-model="item.work_sec" />
-						</FormItem>
-						<FormItem label="上班最早时间" required>
-							<TimePicker :steps="[1, 5]" placeholder="" v-width="320" format="HH:mm"
-								v-model="item.earliest_work_sec" />
-						</FormItem>
-						<FormItem label="上班最晚时间" required>
-							<TimePicker :steps="[1, 5]" placeholder="" v-width="320" format="HH:mm"
-								v-model="item.latest_work_sec" />
-						</FormItem>
-						<FormItem label="上班提醒时间" required>
-							<TimePicker :steps="[1, 5]" placeholder="" v-width="320" format="HH:mm"
-								v-model="item.remind_work_sec" />
-						</FormItem>
-						<FormItem label="下班时间" required>
-							<TimePicker :steps="[1, 5]" placeholder="" v-width="320" format="HH:mm"
-								v-model="item.off_work_sec" />
-						</FormItem>
-						<FormItem label="下班最早时间" required>
-							<TimePicker :steps="[1, 5]" placeholder="" v-width="320" format="HH:mm"
-								v-model="item.earliest_off_work_sec" />
-						</FormItem>
-						<FormItem label="下班最晚时间" required>
-							<TimePicker :steps="[1, 5]" placeholder="" v-width="320" format="HH:mm"
-								v-model="item.latest_off_work_sec" />
-						</FormItem>
-						<FormItem label="下班提醒时间" required>
-							<TimePicker :steps="[1, 5]" placeholder="" v-width="320" format="HH:mm"
-								v-model="item.remind_off_work_sec" />
-						</FormItem>
-					</card>
-				</card>
-
-
-			</Form>
-			<div style="width: 500px; display: flex;justify-content: center;">
-				<Button type="primary" class="submission" @click="save" :disabled="disabled"
-					v-if="!formData.id">立即创建</Button>
-				<Button type="primary" class="submission" @click="save" :disabled="disabled" v-else>立即修改</Button>
-				<Button type="primary" @click="showDate()">测试数据</Button>
-			</div>
-		</Card>
-		<Modal v-model="modals" title="员工列表" footerHide class="paymentFooter" scrollable width="900"
-			@on-cancel="cancel">
-			<staff-list ref="stafflist" :goodsType="1" v-if="modals" @getProductId="getProductId"
-				:serviceCard="1"></staff-list>
-		</Modal>
-	</div>
-</template>
-
-<script>
-	import {
-		mapState
-	} from "vuex";
-	import staffList from "@/components/staffList/index";
-	import storeList from "@/components/storeList";
-	import {
-		couponCategoryApi,
-		couponSaveApi,
-		couponDetailApi,
-		VipEditApi,
-		serveAddApi,
-		serveReadApi,
-		createServeProduct
-	} from "@/api/marketing";
-	import {
-		addCheckRule
-	} from '@/api/store';
-	import {
-		brandList
-	} from "@/api/product";
-	// import { formatDate } from '@/utils/validate';
-	import Setting from "@/setting";
-	export default {
-		name: "storeCouponCreate",
-		components: {
-			storeList,
-			staffList
-		},
-		data() {
-			return {
-				checkedStaff: [],
-				modals: false, //选择员工弹出
-				value: '',
-				id: '',
-				work_sec: '',
-				roterPre: Setting.roterPre,
-				disabled: false,
-				storesList: [],
-				formData: {
-					groupname: '',
-					grouptype: 1, //规则类型: 1-固定时间上下班;2-按班次上下班;3-自由上下班
-					type: 2, //	打卡方式 0-手机,2-考勤机,3-手机/考勤机
-					loc_infos: [{
-						lat: 30547030,
-						lng: 104062890,
-						loc_title: "腾讯成都大厦",
-						loc_detail: "四川省成都市武侯区高新南区天府三街",
-						distance: 300
-					}],
-					wifimac_infos: [{
-						"wifiname": "Tencent-WiFi-1",
-						"wifimac": "c0:7b:bc:37:f8:d3"
-					}],
-					range: {
-						userid: [
-							"qywx4633487382413312"
-						]
-					}, //打卡人员
-					checkindate: [{
-						'workdays': [],
-						"checkintime": [{
-							"time_id": '1',
-							"work_sec": '', //上班时间(距0点秒数,整分钟)
-							"off_work_sec": '', //下班时间
-							"remind_work_sec": '', //上班提醒时间
-							"remind_off_work_sec": '', //下班提醒时间
-							"earliest_work_sec": '', //上班最早时间
-							"latest_work_sec": '', //上班最晚时间
-							"earliest_off_work_sec": '', //下班最早时间
-							"latest_off_work_sec": '' //	下班最晚时间
-						}],
-						"flex_on_duty_time": 0,
-						"flex_off_duty_time": 0
-					}]
-
-				},
-				id: 0,
-				product_name: '',
-				product_id: 0,
-				store_name: '',
-				repertory: '',
-				card_price: '',
-				explain: '',
-				unit_name: '',
-				image: '',
-				images: '',
-				modals: false,
-			}
-		},
-		computed: {
-			...mapState("admin/layout", ["isMobile", "menuCollapse"]),
-		},
-		created() {},
-		methods: {
-			// 测试数据
-			showDate() {
-				console.log('shuju', this.formData)
-			},
-			// 打开员工选择弹窗
-			chooseSatff() {
-				this.modals = true;
-			},
-			changeT(e) {
-				// close()
-				console.log(e, 'dddddddddddddd')
-			},
-			showTime(time) {
-
-				let hh = '',
-					mm = '';
-				hh = Math.floor(time / 3600);
-				hh = hh > 9 ? hh : ('0' + hh)
-				mm = Math.floor((time % 3600) / 60);
-				mm = mm > 9 ? mm : ('0' + mm)
-				let str = hh + ':' + mm + ':' + '00'
-				console.log('str:', str)
-				return str
-
-
-			},
-			addNewDk(item) {
-				item.checkintime.push({
-					"time_id": '',
-					"work_sec": '', //上班时间(距0点秒数,整分钟)
-					"off_work_sec": '', //下班时间
-					"remind_work_sec": '', //上班提醒时间
-					"remind_off_work_sec": '', //下班提醒时间
-					"earliest_work_sec": '', //上班最早时间
-					"latest_work_sec": '', //上班最晚时间
-					"earliest_off_work_sec": '', //下班最早时间
-					"latest_off_work_sec": '' //	下班最晚时间
-				})
-			},
-			addNewDkTime() {
-				this.formData.checkindate.push({
-					'workdays': [],
-					"checkintime": [{
-						"time_id": '',
-						"work_sec": '', //上班时间(距0点秒数,整分钟)
-						"off_work_sec": '', //下班时间
-						"remind_work_sec": '', //上班提醒时间
-						"remind_off_work_sec": '', //下班提醒时间
-						"earliest_work_sec": '', //上班最早时间
-						"latest_work_sec": '', //上班最晚时间
-						"earliest_off_work_sec": '', //下班最早时间
-						"latest_off_work_sec": '' //	下班最晚时间
-					}],
-					"flex_on_duty_time": 0,
-					"flex_off_duty_time": 0
-				})
-			},
-
-			delNewDkTime(index) {
-				this.formData.checkindate.splice(index, 1)
-			},
-			delNewDk(item,index) {
-				item.splice(index, 1)
-			},
-			// 
-			onchangeTime(e) {
-				console.log(e, 'xuanz');
-			},
-			// 商品id
-			getProductId(row) {
-				this.modals = false;
-				console.log(row, '这个');
-				this.checkedStaff = row
-				let arr = []
-				this.checkedStaff.forEach(item => {
-					arr.push(item.userid)
-				})
-				this.formData.range.userid = arr
-
-			},
-			// 选择商品
-			changeGoods() {
-				this.modals = true;
-			},
-			downTab() {
-				// if (!this.formData.store_name) {
-				// 	return this.$Message.error("请输入服务卡名称");
-				// }
-				// if (!this.formData.card_price) {
-				// 	return this.$Message.error("请输入售价");
-				// }
-				// if (!this.formData.repertory) {
-				// 	return this.$Message.error("请输入库存");
-				// }
-			},
-			getTime(str) {
-				if(typeof(str) == 'string') {
-					let arr = str.split(':')
-					return arr[0]*60*60 + arr[1]*60
-				}else {
-					return str
-				}
-				
-			},
-			// 创建
-			save() {
-				let that = this
-				this.downTab();
-				console.log('这');
-				let qdata = {}
-				qdata = Object.assign(qdata,this.formData)
-				try{
-					// let qdata = JSON.parse(JSON.stringify(this.formData))
-					let checkindate = []
-					this.formData.checkindate.forEach(item => {
-						// checkindate.push(item.)
-						let mitem = []
-						item.checkintime.forEach(itemt => {
-							for(let key in itemt) {
-								// let val = ''
-								if(key != 'time_id') {
-									itemt[key] = that.getTime(itemt[key])
-								}else {
-									itemt[key] = itemt[key]*1
-								}
-							}
-							mitem.push(itemt)
-						})
-						item.checkintime = mitem
-						checkindate.push(item)
-					})
-					qdata.checkindate = checkindate
-					console.log(qdata,'this.formData')
-				}catch(e){
-					//TODO handle the exception
-					console.log(e,'cuow')
-				}
-				
-				
-				addCheckRule({
-						'group': qdata
-					})
-					.then((res) => {
-						this.disabled = true;
-						this.$Message.success(res.msg);
-						setTimeout(() => {
-							this.$router.push({
-								path: this.roterPre + "/store/checkRule/index",
-							});
-						}, 1000);
-					})
-					.catch((err) => {
-						this.$Message.error(err.msg);
-					});
-			},
-			cancel() {
-				this.modals = false;
-			},
-		},
-	};
-</script>
-
-<style scoped lang="stylus">
-	.tips {
-		display: inline-bolck;
-		font-size: 12px;
-		font-weight: 400;
-		color: #999999;
-		margin-top: 10px;
-	}
-
-	.imgPic {
-		.info {
-			width: 60%;
-			margin-left: 10px;
-		}
-
-		.pictrue {
-			height: 36px;
-			margin: 7px 3px 0 3px;
-
-			img {
-				height: 100%;
-				display: block;
-			}
-		}
-	}
-
-	.productType {
-		width: 120px;
-		height: 60px;
-		background: #FFFFFF;
-		border-radius: 3px;
-		border: 1px solid #E7E7E7;
-		float: left;
-		text-align: center;
-		padding-top: 8px;
-		position: relative;
-		cursor: pointer;
-		line-height: 23px;
-		margin-right: 12px;
-
-		&.on {
-			border-color: #1890FF;
-		}
-
-		.name {
-			font-size: 14px;
-			font-weight: 600;
-			color: rgba(0, 0, 0, 0.85);
-
-			&.on {
-				color: #1890FF;
-			}
-		}
-
-		.title {
-			font-size: 12px;
-			font-weight: 400;
-			color: #999999;
-		}
-
-		.jiao {
-			position: absolute;
-			bottom: 0;
-			right: 0;
-			width: 0;
-			height: 0;
-			border-bottom: 26px solid #1890FF;
-			border-left: 26px solid transparent;
-		}
-
-		.iconfont {
-			position: absolute;
-			bottom: -3px;
-			right: 1px;
-			color: #FFFFFF;
-			font-size: 12px;
-		}
-	}
-
-	.info {
-		color: #888;
-		font-size: 12px;
-	}
-
-	.ivu-input-wrapper {
-		width: 320px;
-	}
-
-	.ivu-input-number {
-		width: 160px;
-	}
-
-	.ivu-date-picker {
-		width: 320px;
-	}
-
-	.ivu-icon-ios-camera-outline {
-		width: 58px;
-		height: 58px;
-		border: 1px dotted rgba(0, 0, 0, 0.1);
-		border-radius: 4px;
-		background-color: rgba(0, 0, 0, 0.02);
-		line-height: 58px;
-		cursor: pointer;
-		vertical-align: middle;
-	}
-
-	.upload-list {
-		width: 58px;
-		height: 58px;
-		border: 1px dotted rgba(0, 0, 0, 0.1);
-		border-radius: 4px;
-		margin-right: 15px;
-		display: inline-block;
-		position: relative;
-		cursor: pointer;
-		vertical-align: middle;
-	}
-
-	.upload-list img {
-		display: block;
-		width: 100%;
-		height: 100%;
-	}
-
-	.ivu-icon-ios-close-circle {
-		position: absolute;
-		top: 0;
-		right: 0;
-		transform: translate(50%, -50%);
-	}
-
-	.form-submit {
-		/deep/.ivu-card {
-			border-radius: 0;
-		}
-
-		margin-bottom: 79px;
-
-		.fixed-card {
-			position: fixed;
-			right: 0;
-			bottom: 0;
-			left: 200px;
-			z-index: 99;
-			box-shadow: 0 -1px 2px rgb(240, 240, 240);
-
-			/deep/ .ivu-card-body {
-				padding: 15px 16px 14px;
-			}
-
-			.ivu-form-item {
-				margin-bottom: 0;
-			}
-
-			/deep/ .ivu-form-item-content {
-				margin-right: 124px;
-				text-align: center;
-			}
-
-			.ivu-btn {
-				height: 36px;
-				padding: 0 20px;
-			}
-		}
-	}
-
-	/deep/.vxe-tree-cell {
-		padding-left: 0 !important;
-	}
-</style>

+ 0 - 300
src/pages/store/classes/index.vue

@@ -1,300 +0,0 @@
-<template>
-	<div>
-		<div class="i-layout-page-header">
-			<PageHeader class="product_tabs" title="会员卡" hidden-breadcrumb></PageHeader>
-		</div>
-		<Card :bordered="false" dis-hover class="ivu-mt">
-			<Form ref="tableFrom" :model="tableFrom" :label-width="labelWidth" :label-position="labelPosition"
-				@submit.native.prevent>
-				<Row type="flex">
-					<Col v-bind="grid">
-					<Button v-auth="['admin-store-classes-add']" type="primary" icon="md-add"
-						@click="add">添加班次</Button>
-					</Col>
-				</Row>
-			</Form>
-			<Table :columns="columns1" :data="tableList" ref="table" class="mt25" :loading="loading" highlight-row
-				no-userFrom-text="暂无数据" no-filtered-userFrom-text="暂无筛选结果">
-				<template slot-scope="{ row, index }" slot="groupname">
-					{{row.checkin_option.groupname}}
-				</template>
-				<!-- workdays -->
-				<template slot-scope="{ row, index }" slot="workdays">
-					<el-tag v-for="witem in row.checkin_option.checkindate[0].workdays">{{witem | showWd}}</el-tag>
-				</template>
-				<template slot-scope="{ row, index }" slot="status">
-					<Icon type="md-checkmark" v-if="row.status === 1" color="#0092DC" size="14" />
-					<Icon type="md-close" v-else color="#ed5565" size="14" />
-				</template>
-				<template slot-scope="{ row, index }" slot="time">
-					<!-- <span> {{row.add_time | formatDate}}</span> -->
-					<div v-for="time in row.time" style="margin-top: 10px;">
-						<span>{{time.work_sec| showTime}} </span> - <span>{{time.off_work_sec | showTime}}</span>
-					</div>
-				</template>
-				<template slot-scope="{ row, index }" slot="add_time">
-					<span> {{row.add_time | formatDate}}</span>
-				</template>
-				<template slot-scope="{ row, index }" slot="action">
-					<!-- <a @click="couponSend(row)">编辑</a>
-					<Divider type="vertical" /> -->
-					<a @click="couponDel(row,'删除会员卡',index)">删除</a>
-				</template>
-			</Table>
-			<div class="acea-row row-right page">
-				<Page :total="total" :current="tableFrom.page" show-elevator show-total @on-change="pageChange"
-					:page-size="tableFrom.limit" />
-			</div>
-		</Card>
-		<!--表单编辑-->
-		<edit-from :FromData="FromData" @changeType="changeType" ref="edits"></edit-from>
-	</div>
-</template>
-
-<script>
-	import {
-		mapState
-	} from 'vuex';
-	import {
-		checkGroupList,
-		checkRuleList,
-		getClasses
-	} from '@/api/store';
-	import editFrom from '@/components/from/from';
-	import {
-		formatDate
-	} from '@/utils/validate';
-	import Setting from "@/setting";
-	export default {
-		name: 'storeCoupon',
-		filters: {
-			formatDate(time) {
-				if (time !== 0) {
-					let date = new Date(time * 1000);
-					return formatDate(date, 'yyyy-MM-dd hh:mm');
-				}
-			},
-			showWd(day) {
-				let str = ''
-				if(day) {
-					switch (day*1){
-						case 1:
-							str = '星期一'
-							break;
-						case 2:
-							str = '星期二'
-							break;
-						case 3:
-							str = '星期三'
-							break;
-						case 4:
-							str = '星期四'
-							break;
-						case  5:
-							str = '星期五'
-							break;
-						case 6:
-							str = '星期六'
-							break;
-						case  0:
-							str = '星期日'
-							break;
-						default:
-							break;
-					}
-				}
-				return str
-			}
-		},
-		components: {
-			editFrom
-		},
-		filters: {
-			showTime(seconds) {
-				  
-
-				if(seconds ) {
-					var hours = Math.floor(seconds / 3600);
-					var minutes = Math.floor((seconds % 3600) / 60);
-					return (hours > 9?hours: '0' + hours ) + ": " + (minutes>9?minutes: '0'+ minutes) 
-				}
-			}
-		},
-		data() {
-			return {
-				roterPre: Setting.roterPre,
-				grid: {
-					xl: 7,
-					lg: 7,
-					md: 12,
-					sm: 24,
-					xs: 24
-				},
-				loading: false,
-				columns1: [{
-						title: 'ID',
-						key: 'id',
-						width: 80
-					},
-					{
-						title: '班次名称',
-						key: 'name',
-						minWidth: 150
-					},
-					{
-						title: '打卡奖励',
-						key: 'price',
-						minWidth: 80
-					},
-					{
-						title: '打卡时段',
-						slot: 'time',
-						minWidth: 100
-					},
-					{
-						title: '添加时间',
-						key: 'create_time',
-						minWidth: 100
-					},
-					// {
-					//     title: '折扣',
-					//     key: 'discount_ratio',
-					//     minWidth: 100
-					// },
-					{
-						title: '操作',
-						slot: 'action',
-						fixed: 'right',
-						minWidth: 170
-					}
-				],
-				tableFrom: {
-					page: 1,
-					limit: 15
-				},
-				tableList: [],
-				total: 0,
-				FromData: null
-			}
-		},
-		created() {
-			this.getList();
-		},
-		computed: {
-			...mapState('admin/layout', [
-				'isMobile'
-			]),
-			labelWidth() {
-				return this.isMobile ? undefined : 90;
-			},
-			labelPosition() {
-				return this.isMobile ? 'top' : 'left';
-			}
-		},
-		methods: {
-			// 失效
-			couponInvalid(row, tit, num) {
-				let delfromData = {
-					title: tit,
-					num: num,
-					url: `marketing/coupon/status/${row.id}`,
-					method: 'PUT',
-					ids: ''
-				};
-				this.$modalSure(delfromData).then((res) => {
-					this.$Message.success(res.msg);
-					this.getList();
-				}).catch(res => {
-					this.$Message.error(res.msg);
-				});
-			},
-			// 发布
-			couponSend(row) {
-				// this.$modalForm(VipEditApi(row.id)).then(() => this.getList());
-				this.$router.push({
-					path: this.roterPre + "/store/checkRule/create"
-				});
-			},
-			// 删除
-			couponDel(row, tit, num) {
-				let delfromData = {
-					title: tit,
-					url: `membership/deleteCard/${row.id}`,
-					method: 'DELETE',
-					ids: ''
-				};
-				this.$modalSure(delfromData).then((res) => {
-					this.$Message.success(res.msg);
-					this.tableList.splice(num, 1)
-				}).catch(res => {
-					this.$Message.error(res.msg);
-				});
-			},
-			// 列表
-			getList() {
-				this.loading = true;
-
-				getClasses(this.tableFrom).then(async res => {
-					let data = res.data
-					this.tableList = data.list;
-					this.total = res.data.count;
-					this.loading = false;
-				}).catch(res => {
-					this.loading = false;
-					this.$Message.error(res.msg);
-				});
-			},
-			pageChange(index) {
-				this.tableFrom.page = index;
-				this.getList();
-			},
-			changeType(data) {
-				this.type = data;
-			},
-			// 添加
-			add() {
-				// this.$modalForm(couponCreateApi()).then(() => this.getList());
-				this.$router.push({
-					path: this.roterPre + "/store/classes/create"
-				});
-				// this.addType(0);
-			},
-			addType(type) {
-				couponCreateApi(type).then(async res => {
-					if (res.data.status === false) {
-						return this.$authLapse(res.data);
-					}
-					// console.log()
-					console.log(res.data, 'res.data');
-					this.FromData = res.data;
-					this.$refs.edits.modals = true;
-				}).catch(res => {
-					this.$Message.error(res.msg);
-				})
-			},
-			// 编辑
-			edit(row) {
-				this.$modalForm(couponEditeApi(row.id)).then(() => this.getList());
-			},
-			// 表格搜索
-			userSearchs() {
-				this.tableFrom.page = 1;
-				this.getList();
-			},
-			// 修改成功
-			submitFail() {
-				this.getList();
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	.ivu-col:nth-of-type(1) .ivu-form-item .ivu-form-item-label {
-		width: 80px !important;
-	}
-
-	.ivu-col:nth-of-type(1) .ivu-form-item .ivu-form-item-content {
-		margin-left: 80px !important;
-	}
-</style>

+ 1 - 55
src/router/modules/store.js

@@ -148,60 +148,6 @@ export default {
 				title: '新增/修改部门'
 			},
 			component: () => import('@/pages/store/department/create')
-		},
-		{
-			path: 'checkGroup/index',
-			name: `${pre}checkGroupList`,
-			meta: {
-				auth: ['admin-store-checkGroup-index'],
-				title: '考勤组'
-			},
-			component: () => import('@/pages/store/checkGroup/index')
-		},
-		{
-			path: 'checkGroup/create',
-			name: `${pre}checkGroupCreate`,
-			meta: {
-				auth: ['admin-store-checkGroup-add'],
-				title: '添加考勤组'
-			},
-			component: () => import('@/pages/store/checkGroup/create')
-		},
-		{
-			path: 'checkRule/index',
-			name: `${pre}checkRuleIndex`,
-			meta: {
-				auth: ['admin-store-checkRule-index'],
-				title: '打卡规则'
-			},
-			component: () => import('@/pages/store/checkRule/index')
-		},
-		{
-			path: 'checkRule/create',
-			name: `${pre}checkRuleCreate`,
-			meta: {
-				auth: ['admin-store-checkRule-add'],
-				title: '打卡规则'
-			},
-			component: () => import('@/pages/store/checkRule/create')
-		},
-		{
-			path: 'classes/index',
-			name: `${pre}classIndex`,
-			meta: {
-				auth: ['admin-store-classes-index'],
-				title: '打卡规则'
-			},
-			component: () => import('@/pages/store/classes/index')
-		},
-		{
-			path: 'classes/create',
-			name: `${pre}classIndex`,
-			meta: {
-				auth: ['admin-store-classes-add'],
-				title: '打卡规则'
-			},
-			component: () => import('@/pages/store/classes/create')
-		},
+		}
 	]
 };

+ 8 - 1
vue.config.js

@@ -28,7 +28,14 @@ module.exports = {
   productionSourceMap: false, //关闭生产环境下的SourceMap映射文件
   devServer: {
     publicPath: Setting.publicPath,
-    
+    proxy: {
+        '/adminapi' : {
+            target : "https://wx.junhailan.com/adminapi",
+            pathRewrite : {
+                '/adminapi' : ''
+            }
+        }
+    }
   },
 
   // 打包优化