## 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

@@ -5,12 +5,41 @@
<router-view :key="key" />
</keep-alive>
</transition>
<div class="footers">
<el-link v-for="item in links" :key="item.key" :href="item.href" target="_blank" class="mr15 mb20">{{item.title}}</el-link>
<div class="title mb15" v-text="copyright"></div>
</div>
</section>
</template>
<script>
export default {
name: 'AppMain',
data () {
return {
links: [
{
title: '官网',
key: '1',
href: 'https://www.crmeb.com',
blankTarget: true
},
{
title: '社区',
key: '2',
href: 'http://bbs.crmeb.net',
blankTarget: true
},
{
title: '文档',
key: '3',
href: 'https://help.crmeb.net',
blankTarget: true
}
],
copyright: 'Copyright © 2020 西安众邦网络科技有限公司'
}
},
computed: {
cachedViews() {
return this.$store.state.tagsView.cachedViews
@@ -23,6 +52,15 @@ export default {
</script>
<style lang="scss" scoped>
.footers{
text-align: center;
font-size: 14px;
color: #808695;
.title{
font-size: 14px;
color: #808695;
}
}
.app-main {
/* 50= navbar 50 */
min-height: calc(100vh - 50px);
@@ -46,13 +84,10 @@ export default {
padding-top: 84px;
}
}
</style>
<style lang="scss">
// fix css style bug in open el-dialog
.el-popup-parent--hidden {
.fixed-header {
padding-right: 15px;
}
}
</style>

View File

@@ -202,9 +202,9 @@ export default {
<style lang="scss" scoped>
.tags-view-container {
height: 34px;
padding: 6px 0;
width: 100%;
background: #fff;
background: #f5f7f9;
border-bottom: 1px solid #d8dce5;
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
.tags-view-wrapper {
@@ -212,15 +212,14 @@ export default {
display: inline-block;
position: relative;
cursor: pointer;
height: 26px;
line-height: 26px;
border: 1px solid #d8dce5;
height: 30px;
line-height: 30px;
border: 1px solid #fff;
color: #495060;
background: #fff;
padding: 0 8px;
font-size: 12px;
margin-left: 5px;
margin-top: 4px;
&:first-of-type {
margin-left: 15px;
}
@@ -228,9 +227,9 @@ export default {
margin-right: 15px;
}
&.active {
background-color: #42b983;
color: #fff;
border-color: #42b983;
background-color: #fff;
color: #498ff7;
border-color: #fff;
&::before {
content: '';
background: #fff;

View File

@@ -12,6 +12,7 @@
<settings />
</right-panel>
</div>
<div class="open-image" @click="clear" v-if="openImage"><img src="@/assets/imgs/kefuImg.jpg" alt=""></div>
</div>
</template>
@@ -23,6 +24,11 @@ import { mapState } from 'vuex'
export default {
name: 'Layout',
data(){
return {
openImage: true
}
},
components: {
AppMain,
Navbar,
@@ -50,6 +56,9 @@ export default {
}
},
methods: {
clear () {
this.openImage = false;
},
handleClickOutside() {
this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
}
@@ -60,7 +69,18 @@ export default {
<style lang="scss" scoped>
@import "~@/styles/mixin.scss";
@import "~@/styles/variables.scss";
.open-image {
display: flex;
align-items: center;
justify-content: center;
position: fixed;
background-color: rgba(0,0,0,0.6);
height: 100%;
width: 100%;
top: 0;
left: 0;
z-index: 999999;
}
.app-wrapper {
@include clearfix;
position: relative;