Skip to content

P
pet-business-web
Commit f405ef9b authored by 刘怀志's avatar 刘怀志
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 27a70a17 b7b28324
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 339 additions and 215 deletions
src/assets/styles/btn.scss
View file @ f405ef9b
...@@ -218,3 +218,61 @@ ...@@ -218,3 +218,61 @@
font-size: 14px; font-size: 14px;
border-radius: 4px; border-radius: 4px;
} }
.form-detail-button {
//padding: 7px 13px 7px 11px !important;
padding-left: 6px !important;
padding-right: 6px !important;
height: 32px;
background: #5BB647;
border-radius: 4px 4px 4px 4px;
border: 1px solid #5BB647;
opacity: 1;
font-size: 12px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400;
color: #FFFFFF;
i{
width: 8px;
height: 8px;
margin-right: 4px;
}
&:hover {
background: #83C374!important;
color: #FFFFFF!important;
border: 1px solid #83C374!important;
}
&:focus {
background: #55A343!important;
color: #FFFFFF!important;
border: 1px solid #55A343!important;
}
}
.form-edit-button {
//padding: 7px 13px 7px 11px !important;
padding-left: 6px !important;
padding-right: 6px !important;
height: 32px;
background: #3490ce;
border-radius: 4px 4px 4px 4px;
border: 1px solid #3490ce;
opacity: 1;
font-size: 12px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400;
color: #FFFFFF;
i{
width: 8px;
height: 8px;
margin-right: 4px;
}
&:hover {
background: #63a8d6;
color: #FFFFFF!important;
border: 1px solid #63a8d6;
}
&:focus {
background: #3490ce!important;
color: #FFFFFF;
border: 1px solid #3490ce!important;
}
}
src/components/ImageUpload/index.vue
View file @ f405ef9b
...@@ -96,7 +96,6 @@ export default { ...@@ -96,7 +96,6 @@ export default {
value: { value: {
handler(val) { handler(val) {
if (val) { if (val) {
console.log('kkkkkkkkkkkkkkkkkk', this.baseUrl)
// 首先将值转为数组 // 首先将值转为数组
const list = Array.isArray(val) ? val : this.value.split(',') const list = Array.isArray(val) ? val : this.value.split(',')
// 然后将数组转为对象数组 // 然后将数组转为对象数组
...@@ -138,13 +137,13 @@ export default { ...@@ -138,13 +137,13 @@ export default {
} }
if (!isImg) { if (!isImg) {
this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join('/')}图片格式文件!`) this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join('/')}图片格式文件`)
return false return false
} }
if (this.fileSize) { if (this.fileSize) {
const isLt = file.size / 1024 / 1024 < this.fileSize const isLt = file.size / 1024 / 1024 < this.fileSize
if (!isLt) { if (!isLt) {
this.$modal.msgError(`上传图片大小不能超过 ${this.fileSize} MB!`) this.$modal.msgError(`上传图片大小不能超过 ${this.fileSize} MB`)
return false return false
} }
} }
...@@ -153,7 +152,7 @@ export default { ...@@ -153,7 +152,7 @@ export default {
}, },
// 文件个数超出 // 文件个数超出
handleExceed() { handleExceed() {
this.$modal.msgError(`上传文件数量不能超过 ${this.limit} 个!`) this.$modal.msgError(`上传文件数量不能超过 ${this.limit} 个`)
}, },
// 上传成功回调 // 上传成功回调
handleUploadSuccess(res, file) { handleUploadSuccess(res, file) {
......
src/utils/request.js
View file @ f405ef9b
...@@ -78,7 +78,8 @@ service.interceptors.response.use(res => { ...@@ -78,7 +78,8 @@ service.interceptors.response.use(res => {
if (code === 401) { if (code === 401) {
if (!isRelogin.show) { if (!isRelogin.show) {
isRelogin.show = true; isRelogin.show = true;
MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => { MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', cancelButtonClass: 'resetBtn',
confirmButtonClass: 'queryBtn',type: 'warning' }).then(() => {
isRelogin.show = false; isRelogin.show = false;
store.dispatch('LogOut').then(() => { store.dispatch('LogOut').then(() => {
location.href = '/index'; location.href = '/index';
......
src/views/banner_management/banner_add.vue
View file @ f405ef9b
<template> <template>
<div class="banner-container"> <div class="banner-container">
<div class="bannerHeaderTitle"> <!-- 头部标题-->
<span style="color: #666666; font-weight: 600; font-size: 16px;">新增</span> <div style="padding-top:32px;text-align: center;">
<span class="top-title-style">新增</span>
</div> </div>
<div class="bannerAddMain"> <div class="bannerAddMain">
<div style="display: flex;margin: 20px;"> <div style="padding: 20px;">
<div style="height: 30px;border-left: 5px solid #5FB54B;" /> <div style="display: flex">
<div style="padding-top: 3px;padding-left: 10px;color: #666666; font-weight: 700; font-size: 16px;">轮播信息</div> <!-- 轮播信息 -->
<div class="tip-green" />
<div class="title-font-style">
轮播信息
</div>
</div>
</div> </div>
<div> <div>
<el-form ref="form" :model="form" label-width="133px" :rules="rules"> <el-form ref="form" :model="form" label-width="133px" :rules="rules">
<el-form-item label="标题：" prop="title"> <el-form-item label="标题：" prop="title">
<el-input v-model.trim="form.title" class="form-input" style="width: 420px" maxlength="12" show-word-limit clearable /> <el-input v-model.trim="form.title" class="form-input" style="width: 420px" maxlength="12" clearable />
</el-form-item> </el-form-item>
<el-form-item label="轮播图：" prop="img"> <el-form-item label="轮播图：" prop="img">
<image-upload v-model="form.img" :limit="1" :is-show-tip="false" file-size="20" /> <image-upload v-model="form.img" :limit="1" :is-show-tip="false" file-size="20" />
</el-form-item> </el-form-item>
<el-form-item label="跳转地址：" prop="url"> <el-form-item label="跳转地址：" prop="url">
<el-input v-model.trim="form.url" class="form-input" style="width: 420px" maxlength="255" show-word-limit clearable /> <el-input v-model.trim="form.url" class="form-input" style="width: 420px" maxlength="255" clearable />
</el-form-item> </el-form-item>
<el-form-item label="权重：" prop="sort"> <el-form-item label="权重：" prop="sort">
<el-input-number <el-input-number
...@@ -47,7 +53,7 @@ ...@@ -47,7 +53,7 @@
<span v-else style="height: 2.5rem;line-height: 2.5rem;color: #f5aa6c;margin-left: 5px;">未发布</span> <span v-else style="height: 2.5rem;line-height: 2.5rem;color: #f5aa6c;margin-left: 5px;">未发布</span>
</el-form-item> </el-form-item>
<el-form-item label="备注：" prop="notes"> <el-form-item label="备注：" prop="notes">
<el-input v-model.trim="form.notes" class="form-input" style="width: 420px" maxlength="60" show-word-limit clearable /> <el-input v-model.trim="form.notes" type="textarea" rows="3" class="form-input" style="width: 420px" maxlength="60" clearable />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button :loading="submitLoading" class="queryBtn" icon="el-icon-check" @click="submitForm">提交</el-button> <el-button :loading="submitLoading" class="queryBtn" icon="el-icon-check" @click="submitForm">提交</el-button>
...@@ -166,7 +172,7 @@ export default { ...@@ -166,7 +172,7 @@ export default {
if (res.code === 200) { if (res.code === 200) {
this.submitLoading = false this.submitLoading = false
this.$message({ this.$message({
message: '新增成功！', message: '新增成功',
type: 'success' type: 'success'
}) })
this.goBack() this.goBack()
...@@ -211,4 +217,28 @@ export default { ...@@ -211,4 +217,28 @@ export default {
line-height: 40px !important; line-height: 40px !important;
font-size: 14px !important; font-size: 14px !important;
} }
//最上方文字样式
.top-title-style{
font-size: 24px;
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #333333;
}
//模块tip样式--绿色
.tip-green {
margin-right: 13px;
width: 3px;
height: 24px;
background: #5FB54B;
border-radius: 10px 10px 10px 10px;
opacity: 1;
}
//小标题样式
.title-font-style {
font-size: 16px;
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #333333;
line-height: 24px;
}
</style> </style>
src/views/banner_management/banner_detail.vue
View file @ f405ef9b
<template> <template>
<div class="banner-container"> <div class="banner-container">
<div class="bannerHeaderTitle"> <!-- 头部标题-->
<span style="color: #666666; font-weight: 600; font-size: 16px;">详情</span> <div style="padding-top:32px;text-align: center;">
<span class="top-title-style">详情</span>
</div> </div>
<div class="bannerAddMain"> <div class="bannerAddMain">
<div style="display: flex;margin: 20px;"> <div style="padding: 20px;">
<div style="height: 30px;border-left: 5px solid #5FB54B;" /> <div style="display: flex">
<div style="padding-top: 3px;padding-left: 10px;color: #666666; font-weight: 700; font-size: 16px;">轮播信息</div> <!-- 轮播信息 -->
<div class="tip-green" />
<div class="title-font-style">
轮播信息
</div>
</div>
</div> </div>
<div> <div>
<el-form ref="form" :model="form" label-width="133px"> <el-form ref="form" :model="form" label-width="133px">
...@@ -47,7 +53,7 @@ ...@@ -47,7 +53,7 @@
</span> </span>
</el-form-item> </el-form-item>
<el-form-item label="备注：" prop="notes"> <el-form-item label="备注：" prop="notes">
<el-input v-model.trim="form.notes" disabled class="form-input" style="width: 420px" maxlength="60" show-word-limit clearable /> <el-input v-model.trim="form.notes" type="textarea" rows="3" show-word-limit disabled class="form-input" style="width: 420px" maxlength="60" clearable />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button class="resetBtn" icon="el-icon-back" @click="goBack">返回</el-button> <el-button class="resetBtn" icon="el-icon-back" @click="goBack">返回</el-button>
...@@ -147,4 +153,28 @@ export default { ...@@ -147,4 +153,28 @@ export default {
height: 9.25rem; height: 9.25rem;
background-color: #00afff; background-color: #00afff;
} }
//最上方文字样式
.top-title-style{
font-size: 24px;
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #333333;
}
//模块tip样式--绿色
.tip-green {
margin-right: 13px;
width: 3px;
height: 24px;
background: #5FB54B;
border-radius: 10px 10px 10px 10px;
opacity: 1;
}
//小标题样式
.title-font-style {
font-size: 16px;
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #333333;
line-height: 24px;
}
</style> </style>
src/views/banner_management/banner_edit.vue
View file @ f405ef9b
<template> <template>
<div class="banner-container"> <div class="banner-container">
<div class="bannerHeaderTitle"> <!-- 头部标题-->
<span style="color: #666666; font-weight: 600; font-size: 16px;">编辑</span> <div style="padding-top:32px;text-align: center;">
<span class="top-title-style">编辑</span>
</div> </div>
<div class="bannerAddMain"> <div class="bannerAddMain">
<div style="display: flex;margin: 20px;"> <div style="padding: 20px;">
<div style="height: 30px;border-left: 5px solid #5FB54B;" /> <div style="display: flex">
<div style="padding-top: 3px;padding-left: 10px;color: #666666; font-weight: 700; font-size: 16px;">轮播信息</div> <!-- 轮播信息 -->
<div class="tip-green" />
<div class="title-font-style">
轮播信息
</div>
</div>
</div> </div>
<div> <div>
<el-form ref="form" :model="form" label-width="133px" :rules="rules"> <el-form ref="form" :model="form" label-width="133px" :rules="rules">
<el-form-item label="标题：" prop="title"> <el-form-item label="标题：" prop="title">
<el-input v-model.trim="form.title" class="form-input" style="width: 420px" maxlength="12" show-word-limit clearable :disabled="form.id === 1" /> <el-input v-model.trim="form.title" class="form-input" style="width: 420px" maxlength="12" clearable :disabled="form.id === 1" />
</el-form-item> </el-form-item>
<el-form-item label="轮播图：" prop="img"> <el-form-item label="轮播图：" prop="img">
<image-upload v-model="form.img" :limit="1" :is-show-tip="false" file-size="20" /> <image-upload v-model="form.img" :limit="1" :is-show-tip="false" file-size="20" />
</el-form-item> </el-form-item>
<el-form-item label="跳转地址：" prop="url"> <el-form-item label="跳转地址：" prop="url">
<el-input v-model.trim="form.url" class="form-input" style="width: 420px" maxlength="255" show-word-limit clearable :disabled="form.id === 1" /> <el-input v-model.trim="form.url" class="form-input" style="width: 420px" maxlength="255" clearable :disabled="form.id === 1" />
</el-form-item> </el-form-item>
<el-form-item label="权重：" prop="sort"> <el-form-item label="权重：" prop="sort">
<el-input-number <el-input-number
...@@ -49,7 +55,7 @@ ...@@ -49,7 +55,7 @@
</span> </span>
</el-form-item> </el-form-item>
<el-form-item label="备注：" prop="notes"> <el-form-item label="备注：" prop="notes">
<el-input v-model.trim="form.notes" :disabled="form.id === 1" class="form-input" style="width: 420px" maxlength="60" show-word-limit clearable /> <el-input v-model.trim="form.notes" type="textarea" rows="3" :disabled="form.id === 1" class="form-input" style="width: 420px" maxlength="60" clearable />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button :loading="submitLoading" class="queryBtn" icon="el-icon-check" @click="submitForm">提交</el-button> <el-button :loading="submitLoading" class="queryBtn" icon="el-icon-check" @click="submitForm">提交</el-button>
...@@ -193,7 +199,7 @@ export default { ...@@ -193,7 +199,7 @@ export default {
if (res.code === 200) { if (res.code === 200) {
this.submitLoading = false this.submitLoading = false
this.$message({ this.$message({
message: '修改成功！', message: '修改成功',
type: 'success' type: 'success'
}) })
this.goBack() this.goBack()
...@@ -239,4 +245,28 @@ export default { ...@@ -239,4 +245,28 @@ export default {
line-height: 40px !important; line-height: 40px !important;
font-size: 14px !important; font-size: 14px !important;
} }
//最上方文字样式
.top-title-style{
font-size: 24px;
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #333333;
}
//模块tip样式--绿色
.tip-green {
margin-right: 13px;
width: 3px;
height: 24px;
background: #5FB54B;
border-radius: 10px 10px 10px 10px;
opacity: 1;
}
//小标题样式
.title-font-style {
font-size: 16px;
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #333333;
line-height: 24px;
}
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment