yujialong 10 months ago
parent 1c3b3407ce
commit f3b80e173c
  1. 14
      src/pages/activity/add/index.vue
  2. 15
      src/pages/activity/list/index.vue
  3. 27
      src/pages/preschool/manage/basic.vue
  4. 26
      src/pages/supplier/manage/basic.vue
  5. 2
      src/pages/user/detail/index.vue

@ -1,10 +1,15 @@
<template> <template>
<div class="page" <div class="page"
style="padding-bottom: 70px"> style="padding-bottom: 70px">
<el-button v-if="!editing && id"
class="edit"
type="primary"
@click="editing = 1">编辑</el-button>
<el-form label-width="170px" <el-form label-width="170px"
label-suffix=":" label-suffix=":"
class="input-form model" class="input-form model"
size="small"> size="small"
:disabled="!editing">
<el-form-item label="活动封面(选填)"> <el-form-item label="活动封面(选填)">
<el-upload class="avatar-uploader" <el-upload class="avatar-uploader"
accept=".jpg,.png,.jpeg,.gif" accept=".jpg,.png,.jpeg,.gif"
@ -272,6 +277,7 @@ export default {
headers: { headers: {
token: Util.local.get(Setting.tokenKey) token: Util.local.get(Setting.tokenKey)
}, },
editing: this.$route.query.id ? 0 : 1,
editorConfig, editorConfig,
scope: 0, scope: 0,
form: { form: {
@ -732,6 +738,12 @@ $upload-lg-height: 150px;
.input-form.model { .input-form.model {
height: calc(100vh - 300px); height: calc(100vh - 300px);
} }
.edit {
z-index: 1000;
position: absolute;
top: -40px;
right: 30px;
}
/deep/ .d-inline-block { /deep/ .d-inline-block {
width: 216px; width: 216px;

@ -34,7 +34,7 @@
<el-select v-model="form.competitionScope" <el-select v-model="form.competitionScope"
clearable clearable
multiple multiple
@change="initData"> @change="scopeChange">
<el-option v-for="(item, i) in rangeList" <el-option v-for="(item, i) in rangeList"
:key="i" :key="i"
:label="item.name" :label="item.name"
@ -283,11 +283,14 @@ export default {
add () { add () {
this.$router.push("add"); this.$router.push("add");
}, },
// //
editEndTime (row) { scopeChange (e) {
this.modifyVisible = true if (e.includes(1)) {
row.newEndTime = '' this.form.competitionScope = [5, 6]
this.curRow = row } else if (e.includes(5) && e.includes(6)) {
this.form.competitionScope = [1]
}
this.initData()
}, },
// //
manage (row) { manage (row) {

@ -11,7 +11,7 @@
size="small" size="small"
:disabled="!editing"> :disabled="!editing">
<el-form-item label="LOGO"> <el-form-item label="LOGO">
<el-upload class="avatar-uploader" <el-upload :class="['avatar-uploader', {disabled: !editing}]"
accept=".jpg,.png,.jpeg,.gif" accept=".jpg,.png,.jpeg,.gif"
:limit="1" :limit="1"
:on-exceed="handleExceed" :on-exceed="handleExceed"
@ -74,7 +74,7 @@
<el-input type="textarea" <el-input type="textarea"
rows="4" rows="4"
v-model="form.briefIntroduction" /> v-model="form.briefIntroduction" />
<el-upload class="m-t-10" <el-upload :class="['m-t-10', {disabled: !editing}]"
action="#" action="#"
list-type="picture-card" list-type="picture-card"
:on-remove="handlePicRemove" :on-remove="handlePicRemove"
@ -89,7 +89,7 @@
<el-input v-model="form.qrCodeOneName" <el-input v-model="form.qrCodeOneName"
placeholder="请输入二维码描述" /> placeholder="请输入二维码描述" />
<el-upload class="avatar-uploader m-t-10" <el-upload :class="['avatar-uploader m-t-10', {disabled: !editing}]"
accept=".jpg,.png,.jpeg,.gif" accept=".jpg,.png,.jpeg,.gif"
:limit="1" :limit="1"
:on-exceed="handleExceed" :on-exceed="handleExceed"
@ -111,7 +111,7 @@
<el-form-item label="二维码二"> <el-form-item label="二维码二">
<el-input v-model="form.qrCodeTwoName" <el-input v-model="form.qrCodeTwoName"
placeholder="请输入二维码描述" /> placeholder="请输入二维码描述" />
<el-upload class="avatar-uploader m-t-10" <el-upload :class="['avatar-uploader m-t-10', {disabled: !editing}]"
accept=".jpg,.png,.jpeg,.gif" accept=".jpg,.png,.jpeg,.gif"
:limit="1" :limit="1"
:on-exceed="handleExceed" :on-exceed="handleExceed"
@ -134,7 +134,7 @@
<el-input v-model="form.qrCodeThreeName" <el-input v-model="form.qrCodeThreeName"
placeholder="请输入二维码描述" /> placeholder="请输入二维码描述" />
<el-upload class="avatar-uploader m-t-10" <el-upload :class="['avatar-uploader m-t-10', {disabled: !editing}]"
accept=".jpg,.png,.jpeg,.gif" accept=".jpg,.png,.jpeg,.gif"
:limit="1" :limit="1"
:on-exceed="handleExceed" :on-exceed="handleExceed"
@ -351,6 +351,14 @@ export default {
$upload-width: 140px; $upload-width: 140px;
$upload-height: 140px; $upload-height: 140px;
$upload-lg-height: 150px; $upload-lg-height: 150px;
/deep/.disabled {
.el-upload--picture-card {
cursor: not-allowed;
&:hover {
border-color: #c0ccda;
}
}
}
/deep/ .avatar-uploader { /deep/ .avatar-uploader {
.el-upload { .el-upload {
position: relative; position: relative;
@ -388,6 +396,15 @@ $upload-lg-height: 150px;
} }
} }
&.disabled {
.el-upload {
cursor: not-allowed;
&:hover {
border-color: #d9d9d9;
}
}
}
&.avatar-uploader-lg { &.avatar-uploader-lg {
.el-upload { .el-upload {
width: 100%; width: 100%;

@ -11,7 +11,7 @@
size="small" size="small"
:disabled="!editing"> :disabled="!editing">
<el-form-item label="LOGO"> <el-form-item label="LOGO">
<el-upload class="avatar-uploader" <el-upload :class="['avatar-uploader', {disabled: !editing}]"
accept=".jpg,.png,.jpeg,.gif" accept=".jpg,.png,.jpeg,.gif"
:limit="1" :limit="1"
:on-exceed="handleExceed" :on-exceed="handleExceed"
@ -80,7 +80,7 @@
<el-input type="textarea" <el-input type="textarea"
rows="4" rows="4"
v-model="form.briefIntroduction" /> v-model="form.briefIntroduction" />
<el-upload class="m-t-10" <el-upload :class="['m-t-10', {disabled: !editing}]"
action="#" action="#"
list-type="picture-card" list-type="picture-card"
:on-remove="handlePicRemove" :on-remove="handlePicRemove"
@ -95,7 +95,7 @@
<el-input v-model="form.qrCodeOneName" <el-input v-model="form.qrCodeOneName"
placeholder="请输入二维码描述" /> placeholder="请输入二维码描述" />
<el-upload class="avatar-uploader m-t-10" <el-upload :class="['avatar-uploader m-t-10', {disabled: !editing}]"
accept=".jpg,.png,.jpeg,.gif" accept=".jpg,.png,.jpeg,.gif"
:limit="1" :limit="1"
:on-exceed="handleExceed" :on-exceed="handleExceed"
@ -118,7 +118,7 @@
<el-input v-model="form.qrCodeTwoName" <el-input v-model="form.qrCodeTwoName"
placeholder="请输入二维码描述" /> placeholder="请输入二维码描述" />
<el-upload class="avatar-uploader m-t-10" <el-upload :class="['avatar-uploader m-t-10', {disabled: !editing}]"
accept=".jpg,.png,.jpeg,.gif" accept=".jpg,.png,.jpeg,.gif"
:limit="1" :limit="1"
:on-exceed="handleExceed" :on-exceed="handleExceed"
@ -141,7 +141,7 @@
<el-input v-model="form.qrCodeThreeName" <el-input v-model="form.qrCodeThreeName"
placeholder="请输入二维码描述" /> placeholder="请输入二维码描述" />
<el-upload class="avatar-uploader m-t-10" <el-upload :class="['avatar-uploader m-t-10', {disabled: !editing}]"
accept=".jpg,.png,.jpeg,.gif" accept=".jpg,.png,.jpeg,.gif"
:limit="1" :limit="1"
:on-exceed="handleExceed" :on-exceed="handleExceed"
@ -395,6 +395,14 @@ export default {
$upload-width: 140px; $upload-width: 140px;
$upload-height: 140px; $upload-height: 140px;
$upload-lg-height: 150px; $upload-lg-height: 150px;
/deep/.disabled {
.el-upload--picture-card {
cursor: not-allowed;
&:hover {
border-color: #c0ccda;
}
}
}
/deep/ .avatar-uploader { /deep/ .avatar-uploader {
.el-upload { .el-upload {
position: relative; position: relative;
@ -431,6 +439,14 @@ $upload-lg-height: 150px;
} }
} }
} }
&.disabled {
.el-upload {
cursor: not-allowed;
&:hover {
border-color: #d9d9d9;
}
}
}
&.avatar-uploader-lg { &.avatar-uploader-lg {
.el-upload { .el-upload {

@ -101,7 +101,7 @@
label="类型" label="类型"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ platformSource.find(e => e.id == scope.row.platformId).name }} {{ scope.row.platformId && platformSource.find(e => e.id == scope.row.platformId).name }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="creditCode" <el-table-column prop="creditCode"

Loading…
Cancel
Save