wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2026-02-05 05:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

# 2022-02-21

Browse Source 
### 1.3.7 开源社区版：
无
### 0.2.2 会员专业版：
【修复】修复服务商品下单失败，提示参数错误的问题。
【修复】修复服务商品订单列表样式问题。
【修复】修复服务商品核销码列表样式问题。
【优化】优化拼团列表图片被拉伸高度的问题。
This commit is contained in:
JianWeie
2022-02-21 23:47:30 +08:00
parent ef07cbe49c
commit 5c3861bb9b
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByWx.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<view> <view>
<u-toast ref="uToast" /> <u-toast ref="uToast" />
<form v-for="item in payments" :key="item.code" @submit="toPayHandler" v-if="!(type == 2 && item.code == 'balancepay')"> <form v-for="item in payments" :key="item.code" @submit="toPayHandler" v-if="!(type == $globalConstVars.paymentType.recharge && item.code == 'balancepay')">
<input name="code" :value="item.code" class="hide"> <input name="code" :value="item.code" class="hide">
<button class="u-reset-button coreshop-list menu-avatar padding-xl radius shadow shadow-lg bg-blue margin-top" form-type="submit"> <button class="u-reset-button coreshop-list menu-avatar padding-xl radius shadow shadow-lg bg-blue margin-top" form-type="submit">
<view class="coreshop-list-item"> <view class="coreshop-list-item">
@@ -112,7 +112,7 @@
payment_type: this.type, payment_type: this.type,
params: {} params: {}
} }
data['ids'] = (this.type == this.$globalConstVars.paymentType.common || this.type == this.$globalConstVars.paymentType.pinTuan || this.type == this.$globalConstVars.paymentType.group || this.type == this.$globalConstVars.paymentType.skill || this.type == this.$globalConstVars.paymentType.bargain || this.type == this.$globalConstVars.paymentType.giveaway || this.type == this.$globalConstVars.paymentType.solitaire || this.type == this.$globalConstVars.paymentType.transactionComponent) ? this.orderId : this.uid data['ids'] = (this.type == this.$globalConstVars.paymentType.common || this.type == this.$globalConstVars.paymentType.pinTuan || this.type == this.$globalConstVars.paymentType.group || this.type == this.$globalConstVars.paymentType.skill || this.type == this.$globalConstVars.paymentType.bargain || this.type == this.$globalConstVars.paymentType.giveaway || this.type == this.$globalConstVars.paymentType.solitaire || this.type == this.$globalConstVars.paymentType.transactionComponent || this.type == this.$globalConstVars.paymentType.serviceOrder) ? this.orderId : this.uid
// 判断订单支付类型 // 判断订单支付类型
if (this.type == this.$globalConstVars.paymentType.recharge && this.recharge) { if (this.type == this.$globalConstVars.paymentType.recharge && this.recharge) {

2
CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/list/list.vue
View File

@@ -22,7 +22,7 @@
<view class="activity-goods-box coreshop-flex coreshop-justify-between"> <view class="activity-goods-box coreshop-flex coreshop-justify-between">
<view class="img-box"> <view class="img-box">
<view class="tag" v-if="index < 3">TOP{{ index + 1 }}</view> <view class="tag" v-if="index < 3">TOP{{ index + 1 }}</view>
<image class="img" :src="item.image" mode="aspectFill"></image> <u--image :src="item.image" mode="widthFix" width="100%" height="104px" radius="10"></u--image>
</view> </view>
<view class="goods-right coreshop-flex coreshop-justify-between coreshop-flex-direction"> <view class="goods-right coreshop-flex coreshop-justify-between coreshop-flex-direction">
<view class="title u-line-2">{{ item.name }}</view> <view class="title u-line-2">{{ item.name }}</view>

2
CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/details/details.vue
View File

@@ -242,7 +242,7 @@
id: 0, id: 0,
info: {}, info: {},
timestamp: 86400, timestamp: 86400,
orderType: 5, // 订单类型 orderType: this.$globalConstVars.paymentType.serviceOrder, // 订单类型
otherRecommendData: [], // 其他数据 otherRecommendData: [], // 其他数据
timeData: {}, timeData: {},
} }

9
CoreCms.Net.Web.WebApi/Controllers/UserController.cs
View File

@@ -1270,7 +1270,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
[Authorize] [Authorize]
public async Task<WebApiCallBack> GetBankCardsOrganization([FromBody] FMStringId entity) public async Task<WebApiCallBack> GetBankCardsOrganization([FromBody] FMStringId entity)
{ {
var jm =await _userBankCardServices.BankCardsOrganization(entity.id); var jm = await _userBankCardServices.BankCardsOrganization(entity.id);
return jm; return jm;
} }
@@ -1932,7 +1932,8 @@ namespace CoreCms.Net.Web.WebApi.Controllers
foreach (var item in orders) foreach (var item in orders)
{ {
item.service = services.Find(p => p.id == item.servicesId); item.service = services.Find(p => p.id == item.servicesId);
item.statusStr = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.ServicesOrderStatus>(item.status); var entityModel = EnumHelper.GetEnumberEntity<GlobalEnumVars.ServicesOrderStatus>(item.status);
item.statusStr = entityModel.title;
} }
} }
@@ -2000,8 +2001,8 @@ namespace CoreCms.Net.Web.WebApi.Controllers
{ {
foreach (var item in orders) foreach (var item in orders)
{ {
item.statusStr = var entityModel = EnumHelper.GetEnumberEntity<GlobalEnumVars.ServicesTicketStatus>(item.status);
EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.ServicesTicketStatus>(item.status); item.statusStr = entityModel.title;
} }
} }