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

【优化】优化多种全局促销及优惠券组合模式下，后端管理促销显示误差的问题。

Browse Source
This commit is contained in:
jianweie code
2023-11-12 23:54:27 +08:00
parent 26734139fb
commit 5e5aacdf59
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CoreCms.Net.Services/Order/CoreCmsOrderServices.cs
View File

@@ -753,10 +753,11 @@ namespace CoreCms.Net.Services
if (!string.IsNullOrEmpty(p.promotionList))
{
var jobj = JObject.Parse(p.promotionList);
if (jobj.Values().Any())
{
p.promotionObj = jobj.Values().FirstOrDefault();
}
p.promotionObj = jobj.Values();
//if (jobj.Values().Any())
//{
// p.promotionObj = jobj.Values().FirstOrDefault();
//}
}
});
}

2
CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue
View File

@@ -20,7 +20,7 @@
<text class="coreshop-font-24">{{ product.price || '0.00' }}</text>
</view>
<view class="coreshop-flex coreshop-text-left coreshop-margin-left-12 coreshop-margin-top-6 coreshop-justify-start coreshop-align-center">
<view class="coreshop-font-16 coreshop-text-gray coreshop-text-through">{{ priceSection }}</view>
<view class="coreshop-font-16 coreshop-text-gray coreshop-text-through">¥{{ priceSection }}</view>
</view>
</view>
<view class="coreshop-flex coreshop-flex-wrap coreshop-flex-direction-row coreshop-margin-top-12" v-if="pointSwitch==1 && pointExchangeModel==2 && pointShowExchangePrice==1 && product.pointsDeduction > 0">

18
CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html
View File

@@ -213,9 +213,9 @@
<th>商品名称</th>
<th width="30">商品<br />单价</th>
<th width="30">购买<br />数量</th>
<th width="30">优惠<br />金额</th>
<th width="30">促销<br />金额</th>
<th width="40">商品<br />总价</th>
<th width="110">优惠券名称</th>
<th width="110">促销名称</th>
<th width="120">货品编码</th>
<th width="120">商品编码</th>
<th width="30">商品总重量</th>
@@ -231,7 +231,19 @@
<td>{{item.nums}}</td>
<td>{{item.promotionAmount}}</td>
<td>{{item.amount}}</td>
<td>{{# if(item.promotionObj){ }}{{item.promotionObj.name}}{{# } else { }}{{# } }}</td>
<td>
{{# if(item.promotionObj){ }}
{{# layui.each(item.promotionObj, function(indexP, itemP){ }}
【{{itemP.name}}】
{{# }); }}
{{# } }}
</td>
<td>{{item.sn}}</td>
<td>{{item.bn}}</td>
<td>{{item.weight}}</td>