wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2025-12-06 18:23:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

# 2022-02-20

Browse Source 
### 1.3.7 开源社区版：
无
### 0.2.1 会员专业版：
【修复】修复商品分享链接获取失败的问题。
【优化】同城配送运费计算直线距离超过50km的极端情况下直接按照公里数*2元计算。
【修复】修复同城配送切换地址成功但是未重新计算运费的问题。
【优化】优化会员中心面板用户登录后昵称与会员等级挤压导致换行问题。
【修复】修复购物车加减按钮反复频繁点击下。导致总价可能出现异常的情况。
【优化】优化下单界面布局细节。
【修复】修复首页秒杀排列样式问题。#I4UE2E
This commit is contained in:
JianWeie
2022-02-20 00:34:54 +08:00
parent 286c329a74
commit ef07cbe49c
7 changed files with 46 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
CoreCms.Net.Services/Cart/CoreCmsCartServices.cs
View File

@@ -715,30 +715,17 @@ namespace CoreCms.Net.Services
var intraCityServiceBy15Km = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.IntraCityServiceBy15KM).ObjectToDecimal(0);
var intraCityServiceBy20Km = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.IntraCityServiceBy20KM).ObjectToDecimal(0);
if (0 <= result && result <= 2)
cartDto.costFreight = result switch
{
cartDto.costFreight = intraCityServiceBy2Km;
}
else if (result > 2 && result <= 5)
{
cartDto.costFreight = intraCityServiceBy5Km;
}
else if (result > 5 && result <= 10)
{
cartDto.costFreight = intraCityServiceBy5Km;
}
else if (result > 10 && result <= 15)
{
cartDto.costFreight = intraCityServiceBy5Km;
}
else if (result > 15 && result <= 20)
{
cartDto.costFreight = intraCityServiceBy5Km;
}
else
{
cartDto.costFreight = 0;
}
>= 0 and <= 2 => intraCityServiceBy2Km,
> 2 and <= 5 => intraCityServiceBy5Km,
> 5 and <= 10 => intraCityServiceBy10Km,
> 10 and <= 15 => intraCityServiceBy15Km,
> 15 and <= 20 => intraCityServiceBy20Km,
> 20 => Math.Round(result * 2).ObjectToDecimal(),
< 0 => intraCityServiceBy2Km,
_ => cartDto.costFreight
};
cartDto.amount = Math.Round(cartDto.amount + cartDto.costFreight, 2);
}
return true;

26
CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-groupPurchase.vue
View File

@@ -7,25 +7,23 @@
<view class="coreshop-margin-left-15 coreshop-margin-right-15" v-if="coreshopdata.parameters.list && count">
<view class="img-list-item" v-if="item.id !== 'undefined' && item.id" v-for="(item, key) in coreshopdata.parameters.list" :key="key" @click="goSeckillDetail(item.goods.id, item.goods.groupId)">
<view class="img-list-item-l">
<u-image :src="item.goods.image" :index="item.id" :showLoading="true"></u-image>
<u-image :src="item.goods.image" :index="item.id" :showLoading="true" width="100%" height="96px"></u-image>
</view>
<view class="img-list-item-r">
<view class="coreshop-font-14 u-line-1">{{item.name}}</view>
<view class="description u-line-2 coreshop-margin-10">{{item.goods.name}}</view>
<view class="item-c">
<view class="red-price coreshop-justify-between">
<view class="coreshop-font-18 u-line-1">{{item.name}}</view>
<view class="u-line-2 coreshop-margin-top-5 coreshop-margin-bottom-5">{{item.goods.name}}</view>
<view class="item-c coreshop-flex coreshop-justify-between">
<view class="red-price coreshop-justify-between">
￥{{item.goods.product.price}}
<span class="coreshop-font-xs coreshop-text-through coreshop-margin-left-15">{{item.goods.product.mktprice}}元</span>
<span class="coreshop-font-xs coreshop-text-through coreshop-margin-left-5">{{item.goods.product.mktprice}}元</span>
</view>
<view class="coreshop-flex-direction-row coreshop-justify-between">
<view>
<view class="red-price coreshop-font-30 coreshop-flex-direction-row" v-if="(item.startStatus == 1) && item.lastTime">
剩余：<u-count-down :time="item.lastTime" format="HH:mm:ss"></u-count-down>
</view>
<view class="coreshop-font-12 red-price" v-if="item.startStatus == 3">已结束</view>
<view class="coreshop-font-12 red-price" v-if="item.startStatus == 2">即将开始</view>
<view class="coreshop-flex coreshop-flex-direction-row coreshop-justify-between">
<view class="red-price coreshop-font-15 coreshop-flex-direction-row" v-if="(item.startStatus == 1) && item.lastTime">
<u-count-down :time="item.lastTime" format="HH:mm:ss"></u-count-down>
</view>
<u-icon name="shopping-cart" color="#2979ff" size="20" class="btnCart"></u-icon>
<view class="coreshop-font-12 red-price" v-if="item.startStatus == 3">已结束</view>
<view class="coreshop-font-12 red-price" v-if="item.startStatus == 2">即将开始</view>
<u-icon name="shopping-cart" color="#2979ff" size="25" class="btnCart"></u-icon>
</view>
</view>
</view>

15
CoreCms.Net.Uni-App/CoreShop/pages/index/cart/cart.vue
View File

@@ -230,6 +230,10 @@
this.$u.throttle(this.numberChange(e), 500)
},
numberChange(e) {
uni.showLoading({
title: '加载中',
mask: true
});
let _this = this;
let data = {
id: this.shoppingCard.list[e.name].productId,
@@ -238,12 +242,19 @@
_this.$u.api.setCartNum(data).then(res => {
if (res.status) {
_this.shoppingCard.list[e.name].nums = e.value;
//重新计算总价
this.countTotoal();
setTimeout(function () {
uni.hideLoading();
}, 300);
} else {
_this.$u.toast(res.msg);
setTimeout(function () {
uni.hideLoading();
}, 300);
}
});
//重新计算总价
this.countTotoal();
},
removeGoods: function (index) {
let _this = this;

3
CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.scss
View File

@@ -57,3 +57,6 @@
.grid-text { font-size: 14px; margin-top: 10px; margin-bottom: 10px; color: $core-type-info; }
.coreshop-bg-green { background-color: #077044; color: #ffffff; }

10
CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue
View File

@@ -35,17 +35,19 @@
<!--已登陆-->
<view v-else>
<view class="coreshop-flex user-box coreshop-padding-left-15 coreshop-padding-right-10 coreshop-padding-bottom-30 coreshop-flex-direction-row">
<view class="coreshop-margin-right-10">
<view class="coreshop-margin-right-10 coreshop-padding-top-20">
<u-avatar :src="userInfo.avatarImage" size="48"></u-avatar>
</view>
<view class="coreshop-flex-1 coreshop-padding-top-10 coreshop-padding-bottom-5 coreshop-padding-right-10">
<view class="coreshop-font-17 coreshop-padding-bottom-10 coreshop-flex-direction-row">
<text class="coreshop-margin-right-10">{{ userInfo.nickName }}</text>
<text class="coreshop-font-12">（{{ userInfo.gradeName }}）</text>
</view>
<view class="coreshop-font-12 coreshop-padding-bottom-10 coreshop-flex-direction-row">
<text class="coreshop-font-12">等级：{{ userInfo.gradeName }}</text>
</view>
<view class="coreshop-font-12 coreshop-flex-direction-row">
<text class="text-border-x">积分 {{ userInfo.point }}</text>
<text>余额 {{ userInfo.balance }}</text>
<text class="text-border-x">积分： {{ userInfo.point }}</text>
<text>余额： {{ userInfo.balance }}</text>
</view>
</view>
<!-- #ifndef MP-WEIXIN -->

1
CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue
View File

@@ -91,6 +91,7 @@
// #ifdef MP-WEIXIN
beforePage.$vm.userShip = data;
beforePage.$vm.params.userShipId = data.id;
beforePage.$vm.params.areaId = data.areaId;
// #endif

2
CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/index/index.vue
View File

@@ -233,7 +233,7 @@
<!--底部操作-->
<view class="coreshop-bg-white coreshop-footer-fixed coreshop-foot-padding-bottom">
<view class="coreshop-flex coreshop-flex-nowrap coreshop-justify-between coreshop-padding-10 coreshop-percent-100">
<view class="coreshop-text-black coreshop-text-bold price-view coreshop-basis-6">
<view class="coreshop-text-black coreshop-text-bold price-view coreshop-basis-6 coreshop-flex coreshop-align-center">
<text class="coreshop-margin-right-10">共 {{ productNums}} 件商品</text>
<text>合计<text class="coreshop-text-price coreshop-text-red coreshop-font-lg coreshop-margin-left-10"> {{ cartData.amount}}</text></text>
</view>