jiazhizhong/crmeb_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复内容

Browse Source 
1. 会员等级背景图去掉校验
	2. 当查询不到会员等级是，按无会员等级展示
	3. 删除商城首页冗余配置在index中的引用
	4. 换绑推广人时，计算上一个推广人的推广人数
	5. pc后台清除推广人时，更新推广人数量
	6. 保证砍价金额最小为0.01
	7. 修复商品删除时购物车关联删除
	8. 删除商品问题修复
	9. 运费模板——指定包邮，包邮数量类型修改
	10. 签到错误修复
	11. 修复我的优惠券只查询20条的问题
	12. 文章列表修复
	13. 拼团商品详情页数据统计显示问题修复
	14. PC后台，账户详情，持有优惠券列表修复
	15. 支付查询参数修复
	16. 修复过期优惠券可以重复领取
	17. 订单邮费切换地址重复计算修复
	18. 判断是否在指定包邮区域内 必须满足件数 + 金额 才能包邮
	19. 支付页面，切换tab，金额计算问题修复
	20. 物流模板新增、编辑——修复
	21. 去除线下邮费的影响
	22. 订单运费计算重写
	23. 下单页面到店自提合计金额不应该计算商品邮费
	24. 新人券领取后，部分使用时间为空——修复
This commit is contained in:
stivepeim
2021-03-19 18:26:43 +08:00
parent e289857849
commit f44c0ade12
292 changed files with 5985 additions and 41476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
app/pages/index/components/a_seckill.vue
View File

File diff suppressed because one or more lines are too long

50
app/pages/index/components/b_combination.vue
View File

@@ -1,14 +1,14 @@
<template>
<view :class="{borderShow:isBorader}">
<view class="combination" v-if="combinationList.length">
<view class="title acea-row row-between-wrapper">
<view class="acea-row row-middle">
<view class="title acea-row row-right">
<!-- <view class="acea-row row-middle">
<view class="sign">
<image src="../../../static/images/sign02.png"></image>
</view>
<view class="name">拼团惠<text>享超值开团价</text></view>
</view>
<navigator url="/pages/activity/goods_combination/index" hover-class="none" class="more acea-row row-center-wrapper">超值精选<text class="iconfont icon-xiangyou"></text></navigator>
</view> -->
<navigator url="/pages/activity/goods_combination/index" hover-class="none" class="more acea-row row-center-wrapper">更多<text class="iconfont icon-xiangyou"></text></navigator>
</view>
<view class="conter acea-row">
<scroll-view scroll-x="true" style="white-space: nowrap; vertical-align: middle;" show-scrollbar="false">
@@ -18,8 +18,9 @@
<image :src="item.image"></image>
</view>
<view class="text lines1">
<text class="money">¥<text class="num">{{item.price}}</text></text>
<!-- <text class="y_money">¥{{item.otPrice}}</text> -->
<view class="name line1">{{item.title}}</view>
<view class="money">¥<text class="num">{{item.price}}</text></view>
<view class="y_money">¥{{item.otPrice}}</view>
</view>
</view>
</view>
@@ -81,7 +82,7 @@
}
</script>
<style lang="scss">
<style lang="scss" scoped>
.default{
width: 690rpx;
height: 300rpx;
@@ -95,12 +96,14 @@
}
}
.combination{
width: 690rpx;
width: 700rpx;
background-color: #fff;
border-radius: 14rpx;
margin: 26rpx auto 0 auto;
padding: 25rpx 20rpx 21rpx 20rpx;
background-image: url(../../../static/images/pth.png);
background-repeat: no-repeat;
background-size: 100%;
.title {
.sign {
width: 40rpx;
@@ -127,12 +130,9 @@
}
.more {
width: 122rpx;
height: 37rpx;
background: linear-gradient(270deg, #1DB0FC 0%, #22CAFD 100%);
border-radius: 21rpx;
font-size: 22rpx;
color: #fff;
color: #666666;
padding-left: 2rpx;
.iconfont {
@@ -141,7 +141,7 @@
}
}
.conter{
margin-top: 18rpx;
margin-top: 28rpx;
.itemCon {
display: inline-block;
width: 174rpx;
@@ -161,20 +161,26 @@
}
.text{
margin-top: 4rpx;
.money{
.y_money {
font-size: 20rpx;
color: #999999;
text-decoration: line-through;
}
.name {
font-size: 24rpx;
color: #000;
margin-top: 14rpx;
}
.money {
color: #FD502F;
font-size: 28rpx;
height: 100%;
font-weight: bold;
.num{
margin: 2rpx 0;
.num {
font-size: 28rpx;
}
}
.y_money{
color: #959595;
text-decoration: line-through;
font-size: 20rpx;
margin-left: 8rpx;
}
}
}
}

90
app/pages/index/components/c_bargain.vue
View File

@@ -1,14 +1,14 @@
<template>
<view :class="{borderShow:isBorader}">
<view class="combination" v-if="bargList.length">
<view class="title acea-row row-between-wrapper">
<view class="acea-row row-middle">
<view class="title acea-row row-between">
<view class="acea-row row-column">
<view class="sign">
<image src="../../../static/images/sign03.png"></image>
Hi，{{userData.nickname || '亲爱的顾客'}}！
</view>
<view class="name">砍价活动<text>呼朋唤友来砍价</text></view>
<view class="name"><text>你的好友正在邀请你参与砍价</text></view>
</view>
<navigator url="/pages/activity/goods_bargain/index" hover-class="none" class="more acea-row row-center-wrapper">品质好货<text class="iconfont icon-xiangyou"></text></navigator>
<navigator url="/pages/activity/goods_bargain/index" hover-class="none" class="more acea-row row-center-wrapper">更多<text class="iconfont icon-xiangyou"></text></navigator>
</view>
<view class="conter acea-row">
<scroll-view scroll-x="true" style="white-space: nowrap; vertical-align: middle;" show-scrollbar="false">
@@ -18,8 +18,10 @@
<image :src="item.image"></image>
</view>
<view class="text lines1">
<text class="money">¥<text class="num">{{item.minPrice}}</text></text>
<text class="y_money">¥{{item.price}}</text>
<view class="name line1">{{item.title}}</view>
<view class="money">¥<text class="num">{{item.minPrice}}</text></view>
<view class="btn">参与砍价</view>
<!-- <view class="y_money">¥{{item.price}}</view> -->
</view>
</view>
</view>
@@ -40,7 +42,10 @@
import { mapGetters } from 'vuex';
export default {
name: 'c_bargain',
computed: mapGetters(['uid']),
computed: mapGetters({
'userData': 'userInfo',
'uid': 'uid'
}),
data() {
return {
bargList: [],
@@ -72,7 +77,7 @@
}
</script>
<style lang="scss">
<style lang="scss" scoped>
.default{
width: 690rpx;
height: 300rpx;
@@ -87,44 +92,37 @@
}
.combination{
width: 690rpx;
background-image: url(../../../static/images/kjbj.png);
background-repeat: no-repeat;
background-size: 100%;
// height: 288rpx;
background-color: #fff;
border-radius: 14rpx;
margin: 26rpx auto 0 auto;
padding: 25rpx 20rpx 21rpx 20rpx;
padding: 25rpx 20rpx 25rpx 20rpx;
.title {
.sign {
width: 40rpx;
height: 40rpx;
image {
width: 100%;
height: 100%;
}
font-size: 32rpx;
color: #E93323;
margin-bottom: 2rpx;
font-weight: bold;
margin-bottom: 10rpx;
}
.name {
font-size: 32rpx;
color: #282828;
margin-left: 12rpx;
font-weight: bold;
text {
color: #797979;
font-size: 24rpx;
color: #333333;
font-size: 26rpx;
font-weight: 400;
margin-left: 14rpx;
}
}
.more {
width: 122rpx;
height: 37rpx;
background: linear-gradient(135deg, #FF9F6C 0%, #FD502F 100%);
border-radius: 21rpx;
font-size: 22rpx;
color: #fff;
color: #666666;
padding-left: 2rpx;
.iconfont {
@@ -133,7 +131,7 @@
}
}
.conter{
margin-top: 18rpx;
margin-top: 28rpx;
.itemCon {
display: inline-block;
width: 174rpx;
@@ -153,19 +151,37 @@
}
.text{
margin-top: 4rpx;
.money{
.y_money {
font-size: 20rpx;
color: #999999;
text-decoration: line-through;
}
.name {
font-size: 24rpx;
color: #000;
margin-top: 14rpx;
}
.money {
color: #FD502F;
font-size: 28rpx;
height: 100%;
font-weight: bold;
.num{
margin: 2rpx 0;
.num {
font-size: 28rpx;
}
}
.y_money{
color: #959595;
text-decoration: line-through;
font-size: 20rpx;
margin-left: 8rpx;
.btn{
width: 174rpx;
height: 48rpx;
line-height: 48rpx;
text-align: center;
background: linear-gradient(129deg, #FF5555 0%, #FF0000 100%);
opacity: 1;
border-radius: 0px 0px 14rpx 14rpx;
color: #FFFFFF;
font-size: 26rpx;
margin-top: 6rpx;
}
}
}