Skip to content

C
center-register
提交 bdb2c0e9 authored 作者: matian's avatar matian
浏览文件
操作

bug修复

上级 536c8dd7
隐藏空白字符变更
内嵌 并排
正在显示 包含 112 行增加 和 39 行删除
.env
浏览文件 @ bdb2c0e9
VITE_LOGIN_URL=https://login.ezijing.com/auth/login/index
VITE_SHARE_URL=https://accounts.ezijing.com
.env.dev
浏览文件 @ bdb2c0e9
VITE_LOGIN_URL=https://login.ezijing.com/auth/login/index
VITE_SHARE_URL=https://accounts.ezijing.com
.env.test
浏览文件 @ bdb2c0e9
VITE_LOGIN_URL=https://login.ezijing.com/auth/login/index
VITE_SHARE_URL=https://accounts.ezijing.com
package-lock.json
浏览文件 @ bdb2c0e9
{
"name": "highway-admin",
"name": "center-register",
"version": "0.0.0",
"lockfileVersion": 2,
"requires": true,
......
src/modules/activity/components/FormType.vue
浏览文件 @ bdb2c0e9
......@@ -7,11 +7,29 @@
<div class="field-list" v-for="(item, index) in fieldList" :key="index">
<div class="field-list_title">{{ item.title }}</div>
<div class="field-list_content">
<el-checkbox style="margin:0 90px 10px 10px" :disabled="cItem.disabled ? cItem.disabled : false" :label="cItem.key" v-for="cItem in item.fields" :key="cItem.key">
<el-checkbox
style="margin: 0 90px 10px 10px"
:disabled="cItem.disabled ? cItem.disabled : false"
:label="cItem.key"
v-for="cItem in item.fields"
:key="cItem.key"
>
<div class="checkbox">
{{ cItem.label }}&nbsp;&nbsp;&nbsp;必填：
<el-radio @change="checkboxChange" v-model="cItem.required" :disabled="cItem.disabled ? cItem.disabled : false" label="1">是</el-radio>
<el-radio @change="checkboxChange" v-model="cItem.required" :disabled="cItem.disabled ? cItem.disabled : false" label="2">否</el-radio>
<el-radio
@change="checkboxChange"
v-model="cItem.required"
:disabled="cItem.disabled ? cItem.disabled : false"
label="1"
>是</el-radio
>
<el-radio
@change="checkboxChange"
v-model="cItem.required"
:disabled="cItem.disabled ? cItem.disabled : false"
label="2"
>否</el-radio
>
</div>
</el-checkbox>
</div>
......@@ -24,7 +42,7 @@
<el-radio v-model="data.can_pay" :label="1">开启</el-radio>
<el-radio v-model="data.can_pay" :label="0">关闭</el-radio>
</el-form-item>
<template v-if="!!(data.can_pay)">
<template v-if="!!data.can_pay">
<el-form-item label="价格：" prop="pay_price">
<el-input style="width: 20%" v-model="data.pay_price"></el-input>
</el-form-item>
......@@ -40,7 +58,7 @@
<el-radio v-model="data.can_jump" :label="1">开启</el-radio>
<el-radio v-model="data.can_jump" :label="0">关闭</el-radio>
</el-form-item>
<template v-if="!!(data.can_jump)">
<template v-if="!!data.can_jump">
<el-form-item label="跳转链接：" prop="jump_url">
<el-input style="width: 20%" v-model="data.jump_url"></el-input>
</el-form-item>
......@@ -49,7 +67,7 @@
<el-radio v-model="data.can_skip_pay" :label="1">开启</el-radio>
<el-radio v-model="data.can_skip_pay" :label="0">关闭</el-radio>
</el-form-item>
<el-form-item label="跳过文案：" prop="skip_pay_title" v-if="!!(data.can_skip_pay)">
<el-form-item label="跳过文案：" prop="skip_pay_title" v-if="!!data.can_skip_pay">
<el-input style="width: 20%" v-model="data.skip_pay_title"></el-input>
</el-form-item>
<el-form-item label="支付平台：" prop="shop_id">
......@@ -80,11 +98,23 @@ export default {
data() {
return {
rules: {
title: { required: true, message: '请填写标题', trigger: 'change' },
pay_price: { required: true, message: '请填写支付金额', trigger: 'change' },
jump_url: { required: true, message: '请填写跳转链接', trigger: 'change' },
shop_id: { required: true, message: '请选择支付平台', trigger: 'change' },
skip_pay_title: { required: true, message: '请填写跳过支付文案', trigger: 'change' }
title: { required: true, message: '请填写标题', trigger: 'blur' },
pay_price: [
{ required: true, message: '请填写支付金额', trigger: 'blur' },
{
trigger: 'blur',
validator(rule, value, callback) {
if (Number(value) >= 0) {
callback()
} else {
callback(new Error('请输小于正整数'))
}
}
}
],
jump_url: { required: true, message: '请填写跳转链接', trigger: 'blur' },
shop_id: { required: true, message: '请选择支付平台', trigger: 'blur' },
skip_pay_title: { required: true, message: '请填写跳过支付文案', trigger: 'blur' }
},
options: [],
checkList: [],
......
src/modules/activity/views/Create.vue
浏览文件 @ bdb2c0e9
......@@ -21,7 +21,7 @@
</el-tabs>
</div>
<div class="create-bottom_btn">
<el-button type="primary" style="margin-right: 80px">暂存配置</el-button>
<el-button type="primary" style="margin-right: 80px" @click="hanleSessionStorage">暂存配置</el-button>
<el-button type="primary" @click="handleAddPageClick">添加步骤</el-button>
<el-button @click="handleRemovePageClick">删除步骤</el-button>
</div>
......@@ -112,7 +112,12 @@ export default {
},
// 编辑
handleUpdate() {
if (this.isDisplayModulesValidate() !== -1) {
this.$message.warning('请填写按钮文案')
return
}
const params = Object.assign(this.basicForm, { details: this.stepPageInfo })
console.log(params, 'this')
params.id = this.$route.query.id
params.details.map(item => {
if (parseInt(item.type) === 2) {
......@@ -120,6 +125,7 @@ export default {
}
return item
})
console.log(params, 'params')
updateRegister(params).then(res => {
this.$message({
message: '更新成功',
......@@ -186,15 +192,14 @@ export default {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
this.stepPageInfo = this.stepPageInfo.filter((item, index) => index !== parseInt(this.activeName))
this.activeName = (this.activeName === '0' ? '0' : this.activeName - 1).toString()
this.$message({
type: 'success',
message: '删除成功!'
})
}).then(() => {
this.stepPageInfo = this.stepPageInfo.filter((item, index) => index !== parseInt(this.activeName))
this.activeName = (this.activeName === '0' ? '0' : this.activeName - 1).toString()
this.$message({
type: 'success',
message: '删除成功!'
})
})
} else {
this.$message({
message: '最少保留一个步骤',
......@@ -226,7 +231,9 @@ export default {
console.log(this.basicForm)
console.log(res)
})
}
},
// 暂存配置
hanleSessionStorage() {}
}
}
</script>
......
src/modules/register/components/SetBasic.vue
浏览文件 @ bdb2c0e9
......@@ -286,11 +286,11 @@ export default {
message: '修改成功',
type: 'success'
})
this.$router.push('/register/list')
})
}
}
}
</script>
<style lang="scss" scoped>
</style>
<style lang="scss" scoped></style>
src/modules/register/components/setTabelHeade.vue
浏览文件 @ bdb2c0e9
<template>
<div>
<el-dialog v-bind="$attrs" v-on="$listeners" title="表头设置" width="500px" :close-on-click-modal="false">
<el-dialog v-bind="$attrs" v-on="$listeners" title="表头设置" :close-on-click-modal="false">
<p class="tips">上下拖动表头名称可调整表头顺序</p>
<ul class="column-options-list">
<li>
......@@ -29,11 +29,11 @@ export default {
},
data() {
return {
dialogWidth: 0,
columnsOptionsVisible: false
}
},
mounted() {
},
methods: {
// handleSubmit() {
// window.localStorage.registerTabelField = JSON.stringify(this.tabelField)
......@@ -104,4 +104,20 @@ export default {
// }
}
}
.el-dialog {
width: 100%;
position: relative;
margin: 0 auto;
background: #ffffff;
-webkit-box-sizing: border-box;
box-sizing: border-box;
// height: 100%;
}
.el-dialog_body {
border-top: 1px solid I#dcdfe6;
border-bottom: 1px solid I#dcdfe6;
// max-height: 59%;
overflow-y: auto;
}
</style>
src/modules/register/views/List.vue
浏览文件 @ bdb2c0e9
......@@ -42,7 +42,7 @@
<el-button type="primary" @click="importDialogVisible = true">导入人员</el-button>
<el-button type="primary" @click="columnsOptionsVisible = true">表头筛选</el-button>
</div>
<el-table :data="tableData" style="width: 100%">
<el-table :data="tableData" style="width: 100%" :row-class-name="getRowClass">
<el-table-column type="expand">
<template slot-scope="props">
<div class="demo-table-expand">
......@@ -69,18 +69,21 @@
</template>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button type="text" @click="$router.push({ path: '/register/detail', query: { id: scope.row.id } })">详情</el-button>
<el-button type="text" @click="$router.push({ path: '/register/detail', query: { id: scope.row.id } })"
>详情</el-button
>
<el-button type="text" v-if="!scope.row.isDelete" @click="deleteJoin(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div style="display:flex; justify-content: center;padding-top:30px">
<div style="display: flex; justify-content: center; padding-top: 30px">
<el-pagination
layout="prev, pager, next"
:page-size="page.size"
:current-page="page.currentPage"
@current-change="pageSizeChange"
:total="page.total">
:total="page.total"
>
</el-pagination>
</div>
</div>
......@@ -164,7 +167,8 @@ export default {
{ visible: true, key: 'check_in_time', label: '入住时间' },
{ visible: true, key: 'check_out_time', label: '离店时间' },
{ visible: true, key: 'room_type', label: '房型' },
{ visible: true, key: 'breakfast', label: '早餐' }
{ visible: true, key: 'breakfast', label: '早餐' },
{ visible: true, key: 'user_type', label: '人员类型' }
]
}
},
......@@ -175,6 +179,11 @@ export default {
}
},
methods: {
getRowClass(row) {
if (row.row.pay_records.length === 0) {
return 'row-expand-cover'
}
},
pageSizeChange(value) {
this.page.currentPage = value
this.handleScreen()
......@@ -206,7 +215,7 @@ export default {
this.tableData = res.data.list.map(item => {
const findData = item.pay_records.find(pay => pay.pay_status === '1')
item.isDelete = !!findData
item.gender = parseInt(item.gender) ? parseInt(item.gender) === 1 ? '男' : '女' : '未知'
item.gender = parseInt(item.gender) ? (parseInt(item.gender) === 1 ? '男' : '女') : '未知'
Object.keys(item).forEach(cItem => {
item[cItem] = item[cItem] === '' ? '-' : item[cItem]
})
......@@ -226,12 +235,16 @@ export default {
},
// 删除报名记录
deleteJoin(id) {
deleteJoin({ join_id: id }).then(res => {
this.$message({
message: '删除成功',
type: 'success'
this.$confirm('确认删除该条报名记录吗？删除后不可恢复').then(_ => {
deleteJoin({ join_id: id }).then(res => {
if (res.code === 0) {
this.$message({
message: '删除成功',
type: 'success'
})
this.getAppList()
}
})
this.getAppList()
})
},
// 编辑
......@@ -289,4 +302,7 @@ export default {
}
}
}
.row-expand-cover td .el-table__expand-icon {
visibility: hidden !important;
}
</style>
src/store/index.js
浏览文件 @ bdb2c0e9
......@@ -7,7 +7,8 @@ Vue.use(Vuex)
const store = new Vuex.Store({
state: {
user: {},
permissions: [] // 权限列表
permissions: [],
commonMap: {} // 权限列表
},
mutations: {
setUser(state, user) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论