## v1.3.1 更新列表

1. 【修复】申请退款后积分等操作可能出现错误的问题
	2. 【修复】拼团支付可能出现支付错误的问题
	3. 【修复】退款申请后的订单流程优化和积分赠送的问题
	4. 【修复】回收站中的商品无法恢复的问题
	5. 【修复】一号通短信查询记录不完整的问题
	6. 【修复】用户管理批量加分组,标签的问题
	7. 【修复】积分日志搜索显示有误的问题
	8. 【修复】手动发送优惠券可能会出错的问题
	9. 【修复】核销订单创建在某种条件下会出错的问题
	10. 【修复】移动端商品详情,购物车等样式兼容问题
	11. 【修复】业务流程性的优化
This commit is contained in:
stivepeim
2021-01-19 10:16:45 +08:00
parent 4e42da0fc1
commit be34f57322
136 changed files with 19904 additions and 23329 deletions

View File

@@ -1,75 +1,78 @@
<template>
<div class="components-container">
<el-form ref="pram" label-width="150px" :model="pram">
<el-form-item label="标题" prop="title" :rules="[{required:true, message:'请填写标题', trigger:['blur','change']}]">
<el-input v-model="pram.title" placeholder="标题" maxlength="100"/>
</el-form-item>
<el-form-item label="作者" prop="author" :rules="[{required:true, message:'请填作者', trigger:['blur','change']}]">
<el-input v-model="pram.author" placeholder="作者" maxlength="20"/>
</el-form-item>
<el-form-item label="文章分类">
<el-select v-model="pram.cid" placeholder="请选择" style="width:100%;">
<el-option
v-for="item in categoryTreeData"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="图文封面" prop="imageInput" :rules="[{ required: true, message: '请上传图文封面', trigger: 'change' }]">
<div class="upLoadPicBox" @click="modalPicTap('1')">
<div v-if="pram.imageInput" class="pictrue"><img :src="pram.imageInput"></div>
<div v-else class="upLoad">
<i class="el-icon-camera cameraIconfont" />
</div>
</div>
</el-form-item>
<!--<el-form-item label="微信公众号封面" prop="imageInput" :rules="[{ required: true, message: '请上传图文封面', trigger: 'change' }]">-->
<!--<div class="upLoadPicBox">-->
<div class="divBox">
<el-card class="box-card">
<div class="components-container">
<el-form ref="pram" label-width="150px" :model="pram">
<el-form-item label="标题" prop="title" :rules="[{required:true, message:'请填写标题', trigger:['blur','change']}]">
<el-input v-model="pram.title" placeholder="标题" maxlength="100"/>
</el-form-item>
<el-form-item label="作者" prop="author" :rules="[{required:true, message:'请填作者', trigger:['blur','change']}]">
<el-input v-model="pram.author" placeholder="作者" maxlength="20"/>
</el-form-item>
<el-form-item label="文章分类">
<el-select v-model="pram.cid" placeholder="请选择" style="width:100%;">
<el-option
v-for="item in categoryTreeData"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="图文封面" prop="imageInput" :rules="[{ required: true, message: '请上传图文封面', trigger: 'change' }]">
<div class="upLoadPicBox" @click="modalPicTap('1')">
<div v-if="pram.imageInput" class="pictrue"><img :src="pram.imageInput"></div>
<div v-else class="upLoad">
<i class="el-icon-camera cameraIconfont" />
</div>
</div>
</el-form-item>
<!--<el-form-item label="微信公众号封面" prop="imageInput" :rules="[{ required: true, message: '请上传图文封面', trigger: 'change' }]">-->
<!--<div class="upLoadPicBox">-->
<!--<div v-if="pram.imageInput" class="pictrue"><img :src="pram.imageInput"></div>-->
<!--<el-upload-->
<!--v-else-->
<!--class="upload-demo mr10 mb15"-->
<!--action-->
<!--:http-request="handleUploadForm"-->
<!--:headers="myHeaders"-->
<!--:show-file-list="false"-->
<!--multiple-->
<!--v-else-->
<!--class="upload-demo mr10 mb15"-->
<!--action-->
<!--:http-request="handleUploadForm"-->
<!--:headers="myHeaders"-->
<!--:show-file-list="false"-->
<!--multiple-->
<!--&gt;-->
<!--<div class="upLoad">-->
<!--<i class="el-icon-camera cameraIconfont" />-->
<!--</div>-->
<!--<div class="upLoad">-->
<!--<i class="el-icon-camera cameraIconfont" />-->
<!--</div>-->
<!--</el-upload>-->
<!--</div>-->
<!--</el-form-item>-->
<el-form-item label="文章简介" prop="synopsis" :rules="[{required:true, message:'请填写文章简介', trigger:['blur','change']}]">
<el-input v-model="pram.synopsis" maxlength="100" type="textarea" :rows="2" resize="none" placeholder="文章简介" />
</el-form-item>
<el-form-item label="文章内容" prop="content" :rules="[{required:true, message:'请填写文章内容', trigger:['blur','change']}]">
<ueditor-from v-model="pram.content" :content="pram.content" />
</el-form-item>
<el-form-item label="是否Banner">
<el-switch v-model="pram.isBanner" />
</el-form-item>
<el-form-item label="是否热门">
<el-switch v-model="pram.isHot" />
</el-form-item>
<!--<el-form-item label="原文链接">-->
<!--<p>原文链接选填填写之后在图文左下方会出现此链接</p>-->
<!--<el-input v-model="pram.url" placeholder="原文链接" />-->
<!--</el-form-item>-->
<el-form-item>
<el-button type="primary" @click="handerSubmit('pram')">保存</el-button>
</el-form-item>
</el-form>
<!--</div>-->
<!--</el-form-item>-->
<el-form-item label="文章简介" prop="synopsis" :rules="[{required:true, message:'请填写文章简介', trigger:['blur','change']}]">
<el-input v-model="pram.synopsis" maxlength="100" type="textarea" :rows="2" resize="none" placeholder="文章简介" />
</el-form-item>
<el-form-item label="文章内容" prop="content" :rules="[{required:true, message:'请填写文章内容', trigger:['blur','change']}]">
<ueditor-from v-model="pram.content" :content="pram.content" />
</el-form-item>
<el-form-item label="是否Banner">
<el-switch v-model="pram.isBanner" />
</el-form-item>
<el-form-item label="是否热门">
<el-switch v-model="pram.isHot" />
</el-form-item>
<!--<el-form-item label="原文链接">-->
<!--<p>原文链接选填填写之后在图文左下方会出现此链接</p>-->
<!--<el-input v-model="pram.url" placeholder="原文链接" />-->
<!--</el-form-item>-->
<el-form-item>
<el-button type="primary" :loading="loading" @click="handerSubmit('pram')">保存</el-button>
</el-form-item>
</el-form>
</div>
</el-card>
</div>
</template>
<script>
import Tinymce from '@/components/Tinymce/index'
import * as categoryApi from '@/api/categoryApi.js'
import * as constants from '@/utils/constants.js'
import * as articleApi from '@/api/article.js'
import * as selfUtil from '@/utils/ZBKJIutil.js'
import { fileImageApi } from '@/api/systemSetting'
@@ -77,18 +80,10 @@ import { getToken } from '@/utils/auth'
export default {
// name: "edit",
components: { Tinymce },
props: {
isEdit: {
type: Number,
required: true
},
editData: {
type: Object
}
},
data() {
return {
constants,
loading:false,
constants: this.$constants,
categoryTreeData: [],
categoryProps: {
value: 'id',
@@ -114,14 +109,27 @@ export default {
id: null
// mediaId: null
},
editData: {},
myHeaders: { 'X-Token': getToken() }
}
},
created() {
this.tempRoute = Object.assign({}, this.$route)
},
mounted() {
if(this.$route.params.id){
this.getInfo()
this.setTagsViewTitle()
}
this.handlerGetCategoryTreeData()
this.hadlerInitEditData()
},
methods: {
getInfo (){
categoryApi.articleInfoApi({ id: this.$route.params.id }).then(data => {
this.editData = data
this.hadlerInitEditData()
})
},
// 上传
handleUploadForm(param){
const formData = new FormData()
@@ -150,13 +158,13 @@ export default {
}, tit, 'content')
},
hadlerInitEditData() {
if (this.isEdit !== 1) return
const { author, cid, content, imageInputs,
if (!this.$route.params.id) return
const { author, cid, content, imageInput,
isBanner, isHot, shareSynopsis, shareTitle, sort, synopsis, title, url, id } = this.editData
this.pram.author = author
this.pram.cid = Number.parseInt(cid)
this.pram.content = content
this.pram.imageInput = imageInputs
this.pram.imageInput = imageInput
this.pram.isBanner = isBanner
this.pram.isHot = isHot
this.pram.shareSynopsis = shareSynopsis
@@ -177,7 +185,7 @@ export default {
handerSubmit(form) {
this.$refs[form].validate(valid => {
if (!valid) return
if (this.isEdit === 0) {
if (!this.$route.params.id) {
this.handlerSave()
} else {
this.handlerUpdate()
@@ -185,23 +193,36 @@ export default {
})
},
handlerUpdate() {
this.loading = true
this.pram.cid = Array.isArray(this.pram.cid) ? this.pram.cid[0] : this.pram.cid
this.pram.shareTitle = this.pram.title
this.pram.shareSynopsis = this.pram.synopsis
articleApi.UpdateArticle(this.pram).then(data => {
this.$message.success('编辑文章成功')
this.$emit('hideDialog')
this.loading = false
this.$router.push({ path: '/content/articleManager' });
}).catch(()=>{
this.loading = false
})
},
handlerSave() {
this.loading = true
this.pram.cid = Array.isArray(this.pram.cid) ? this.pram.cid[0] : this.pram.cid
this.pram.shareTitle = this.pram.title
this.pram.shareSynopsis = this.pram.synopsis
articleApi.AddArticle(this.pram).then(data => {
this.$message.success('新增文章成功')
this.$emit('hideDialog')
this.loading = false
this.$router.push({ path: '/content/articleManager' });
}).catch(()=>{
this.loading = false
})
}
},
setTagsViewTitle() {
const title = '编辑文章'
const route = Object.assign({}, this.tempRoute, { title: `${title}-${this.$route.params.id}` })
this.$store.dispatch('tagsView/updateVisitedView', route)
},
}
}
</script>