public/crmeb_java
1
0
Fork 0
mirror of https://gitee.com/ZhongBangKeJi/crmeb_java.git synced 2026-04-23 03:58:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

## v1.3.1 更新列表

Browse Source 
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 92d6d60122
commit c7654e50b1
136 changed files with 19904 additions and 23329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/components/couponListWindow/index.vue
View File

@@ -9,16 +9,17 @@
<view class="pic-num">满{{item.minPrice}}元可用</view>
</view>
<view class='text'>
<view class='condition line1'>
<span class='line-title' :class='item.isUse?"gray":""' v-if='item.type===0'>通用劵</span>
<span class='line-title' :class='item.isUse?"gray":""' v-else-if='item.type===1'>品类券</span>
<span class='line-title' :class='item.isUse?"gray":""' v-else>商品券</span>
<view class='condition line2'>
<span class='line-title' :class='item.isUse?"gray":""' v-if='item.useType===1'>通用</span>
<span class='line-title' :class='item.isUse?"gray":""' v-else-if='item.useType===3'>品类</span>
<span class='line-title' :class='item.isUse?"gray":""' v-else>商品</span>
<span>{{item.name}}</span>
</view>
<view class='data acea-row row-between-wrapper'>
<view>{{ item.receiveStartTime ? item.receiveStartTime + " ~ " : ""}}{{ item.receiveEndTime }}</view>
<view class='bnt gray' v-if="item.isUse">{{item.use_title || '已领取'}}</view>
<view class='bnt bg-color' v-else>{{coupon.statusTile || '立即领取'}}</view>
<view v-if="item.day>0">领取后{{item.day}}天内可用</view>
<view v-else>{{ item.useStartTimeStr&& item.useEndTimeStr ? item.useStartTimeStr + " - " + item.useEndTimeStr : ""}}</view>
<view class='bnt gray' v-if="item.isUse">{{item.use_title || '已领取'}}</view>
<view class='bnt bg-color' v-else>{{coupon.statusTile || '立即领取'}}</view>
</view>
</view>
</view>

173
app/components/couponListWindow/备份.vue
View File

@@ -1,173 +0,0 @@
<template>
<view>
<view class='coupon-list-window' :class='coupon.coupon==true?"on":""'>
<view class='title'>优惠券<text class='iconfont icon-guanbi' @click='close'></text></view>
<view class='coupon-list' v-if="coupon.list.length">
<view class='item acea-row row-center-wrapper' v-for="(item,index) in coupon.list" @click="getCouponUser(index,item)"
:key='index'>
<view class='money'>
<div>
￥<span class="num">{{ item.coupon_price }}</span>
</div>
<div class="pic-num">满{{ item.use_min_price }}元可用</div>
</view>
<view class='text'>
<view class='condition line1'>
<span class="line-title" v-if="item.type === 0">通用劵</span>
<span class="line-title" v-else-if="item.type === 1">品类券</span>
<span class="line-title" v-else>商品券</span>
<span>{{ item.title }}</span>
</view>
<view class='data acea-row row-between-wrapper'>
<view>{{ item.start_time ? item.start_time + "-" : ""}}{{ item.end_time }}</view>
<view class="iconfont icon-xuanzhong1 font-color-red" v-if="checked.id === item.id"></view>
<view v-else class="iconfont icon-weixuanzhong"></view v-else>
<!-- <view class='bnt gray' v-if="item.is_use">{{item.use_title || '已领取'}}</view>
<view class='bnt bg-color' v-else>{{coupon.statusTile || '立即领取'}}</view> -->
</view>
</view>
</view>
</view>
<!-- 无优惠券 -->
<view class='pictrue' v-else>
<image src='../../static/images/noCoupon.png'></image>
</view>
</view>
<view class='mask' catchtouchmove="true" :hidden='coupon.coupon==false' @click='close'></view>
</view>
</template>
<script>
import {
setCouponReceive
} from '@/api/api.js';
export default {
props: {
//打开状态 0=领取优惠券,1=使用优惠券
openType: {
type: Number,
default: 0,
},
coupon: {
type: Object,
default: function() {
return {};
}
},
checked:{
type: Object,
default: function() {
return {};
}
},
},
data() {
return {
};
},
methods: {
close: function() {
this.$emit('ChangCouponsClone');
},
getCouponUser: function(index, item) {
let that = this;
let list = that.coupon.list;
that.$emit('ChangCoupons', item);
// if (list[index].is_use == true && this.openType == 0) return true;
// switch (this.openType) {
// case 0:
// //领取优惠券
// setCouponReceive(id).then(res => {
// that.$emit('ChangCouponsUseState', index);
// that.$util.Tips({
// title: "领取成功"
// });
// that.$emit('ChangCoupons', list[index]);
// })
// break;
// case 1:
// that.$emit('ChangCoupons', index);
// break;
// }
}
}
}
</script>
<style scoped lang="scss">
.coupon-list-window {
position: fixed;
bottom: 0;
left: 0;
width: 100%;
background-color: #f5f5f5;
border-radius: 16rpx 16rpx 0 0;
z-index: 555;
transform: translate3d(0, 100%, 0);
transition: all .3s cubic-bezier(.25, .5, .5, .9);
}
.coupon-list-window.on {
transform: translate3d(0, 0, 0);
}
.coupon-list-window .title {
height: 124rpx;
width: 100%;
text-align: center;
line-height: 124rpx;
font-size: 32rpx;
font-weight: bold;
position: relative;
}
.coupon-list-window .title .iconfont {
position: absolute;
right: 30rpx;
top: 50%;
transform: translateY(-50%);
font-size: 35rpx;
color: #8a8a8a;
font-weight: normal;
}
.coupon-list-window .coupon-list {
margin: 0 0 50rpx 0;
height: 550rpx;
overflow: auto;
}
.coupon-list-window .pictrue {
width: 414rpx;
height: 336rpx;
margin: 0 auto 50rpx auto;
}
.coupon-list-window .pictrue image {
width: 100%;
height: 100%;
}
.coupon-list .item .money{
display: flex;
flex-direction: column;
justify-content: center;
.pic-num{
color: #ffffff;
font-size: 24rpx;
}
}
.condition .line-title{
width: 90rpx;
padding: 0 10rpx;
box-sizing: border-box;
background: rgba(255, 247, 247, 1);
border: 1px solid rgba(232, 51, 35, 1);
opacity: 1;
border-radius: 22rpx;
font-size: 20rpx;
color: #e83323;
margin-right: 12rpx;
}
</style>