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

【修复】修复服务商品后台手动核销后，前端状态仍然显示正常的问题。

Browse Source 
【修复】修复微信同步头像及昵称数据，只更新用户表，未更新微信来源表的问题。
This commit is contained in:
大灰灰
2022-08-01 01:47:45 +08:00
parent 7857b9f8cb
commit 4c6ad4c0dc
5 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@
<view class="coreshop-text-gray coreshop-font-sm flex coreshop-text-left"> <view class="coreshop-text-gray coreshop-font-sm flex coreshop-text-left">
<view class="u-line-1 coreshop-text-red" v-if="item.code == 'balancepay'"> <view class="u-line-1 coreshop-text-red" v-if="item.code == 'balancepay'">
当前余额：{{userInfo.balance}}元 当前余额：{{userInfo.balance}}元
</view> </view>
<view class="u-line-1" v-else> <view class="u-line-1" v-else>
{{item.memo}} {{item.memo}}
</view> </view>
@@ -110,7 +110,7 @@
payments = payments.filter(item => item.code !== 'alipay') payments = payments.filter(item => item.code !== 'alipay')
// 如果是充值订单,服务订单 过滤余额支付 过滤非线上支付方式 // 如果是充值订单,服务订单 过滤余额支付 过滤非线上支付方式
if (this.type == this.$globalConstVars.paymentType.recharge || this.type === this.$globalConstVars.paymentType.serviceOrder) { if (this.type == this.$globalConstVars.paymentType.recharge) {
payments = payments.filter(item => item.code !== 'balancepay' || item.isOnline === false) payments = payments.filter(item => item.code !== 'balancepay' || item.isOnline === false)
} }
@@ -129,18 +129,19 @@
let data = { let data = {
payment_code: code, payment_code: code,
payment_type: this.type, payment_type: this.type,
params: { params: {}
trade_type: 'JSAPI',
}
} }
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 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) {
data.params.money = this.recharge; data['params'] = {
money: this.recharge
}
} else if ((this.type == this.$globalConstVars.paymentType.formPay || this.type == this.$globalConstVars.paymentType.formOrder) && this.recharge) { } else if ((this.type == this.$globalConstVars.paymentType.formPay || this.type == this.$globalConstVars.paymentType.formOrder) && this.recharge) {
data.ids = this.orderId; data['ids'] = this.orderId;
data['params'] = {
}
} }
let _this = this let _this = this
switch (code) { switch (code) {

9
CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/details/details.vue
View File

@@ -58,8 +58,13 @@
<view class="date u-line-1" v-if="item.validityStartTime && item.validityEndTime">{{item.validityStartTime}} 至 {{item.validityEndTime}}</view> <view class="date u-line-1" v-if="item.validityStartTime && item.validityEndTime">{{item.validityStartTime}} 至 {{item.validityEndTime}}</view>
</view> </view>
</view> </view>
<view class="right"> <view class="right coreshop-flex coreshop-align-center coreshop-justify-center">
<view class="use immediate-use" :round="true">{{item.statusStr}}</view> <view class="coreshop-width-fit-content">
<u-button text="正常" type="info" plain size="mini" v-if="item.status==0"></u-button>
<u-button text="过期" type="default" plain size="mini" v-if="item.status==1"></u-button>
<u-button text="作废" type="warning" plain size="mini" v-if="item.status==2"></u-button>
<u-button text="已核销" type="success" plain size="mini" v-if="item.status==3"></u-button>
</view>
</view> </view>
</view> </view>
<u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" /> <u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="20" margin-bottom="20" />

10
CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs
View File

@@ -951,6 +951,16 @@ namespace CoreCms.Net.Web.Admin.Controllers
return jm; return jm;
} }
oldModel.isVerification = (bool)entity.data; oldModel.isVerification = (bool)entity.data;
if (oldModel.isVerification)
{
oldModel.status = (int)GlobalEnumVars.ServicesTicketStatus.已核销;
oldModel.verificationTime = DateTime.Now;
}
else
{
oldModel.status = (int)GlobalEnumVars.ServicesTicketStatus.正常;
oldModel.verificationTime = null;
}
var bl = await _coreCmsUserServicesTicketServices.UpdateAsync(oldModel); var bl = await _coreCmsUserServicesTicketServices.UpdateAsync(oldModel);
jm.code = bl ? 0 : 1; jm.code = bl ? 0 : 1;

8
CoreCms.Net.Web.Admin/wwwroot/views/order/servicesOrder/details.html
View File

@@ -111,7 +111,7 @@
pagebar: '#LAY-app-CoreCmsUserServicesTicket-pagebar', pagebar: '#LAY-app-CoreCmsUserServicesTicket-pagebar',
className: 'pagebarbox', className: 'pagebarbox',
defaultToolbar: ['filter', 'print', 'exports'], defaultToolbar: ['filter', 'print', 'exports'],
height: 'full-227',//面包屑142px,搜索框4行172,3行137,2行102,1行67 height: 'full-230',//面包屑142px,搜索框4行172,3行137,2行102,1行67
page: true, page: true,
limit: 30, limit: 30,
limits: [10, 15, 20, 25, 30, 50, 100, 200], limits: [10, 15, 20, 25, 30, 50, 100, 200],
@@ -126,7 +126,7 @@
//{ field: 'serviceId', title: '关联服务项目id', sort: false, width: 105 }, //{ field: 'serviceId', title: '关联服务项目id', sort: false, width: 105 },
//{ field: 'userId', title: '关联用户id', sort: false, width: 105 }, //{ field: 'userId', title: '关联用户id', sort: false, width: 105 },
{ {
field: 'status', title: '状态', sort: false, width: 70, templet: function (data) { field: 'status', title: '状态', sort: false, width: 60, templet: function (data) {
for (var i = 0; i < d.params.data.servicesTicketStatus.length; i++) { for (var i = 0; i < d.params.data.servicesTicketStatus.length; i++) {
if (data.status == d.params.data.servicesTicketStatus[i].value) { if (data.status == d.params.data.servicesTicketStatus[i].value) {
return d.params.data.servicesTicketStatus[i].description; return d.params.data.servicesTicketStatus[i].description;
@@ -150,7 +150,7 @@
{ field: 'validityStartTime', title: '核销开始时间', width: 130, sort: false }, { field: 'validityStartTime', title: '核销开始时间', width: 130, sort: false },
{ field: 'validityEndTime', title: '核销结束时间', width: 130, sort: false }, { field: 'validityEndTime', title: '核销结束时间', width: 130, sort: false },
{ field: 'createTime', title: '创建时间', width: 130, sort: false }, { field: 'createTime', title: '创建时间', width: 130, sort: false },
{ field: 'isVerification', title: '是否核销', width: 65, templet: '#switch_isVerification', sort: false, unresize: true }, { field: 'isVerification', title: '是否核销', width: 75, templet: '#switch_isVerification', sort: false, unresize: true },
{ field: 'verificationTime', title: '核销时间', width: 130, sort: false }, { field: 'verificationTime', title: '核销时间', width: 130, sort: false },
{ width: 60, align: 'center', title: '操作', fixed: 'right', toolbar: '#LAY-app-CoreCmsUserServicesTicket-tableBox-bar' } { width: 60, align: 'center', title: '操作', fixed: 'right', toolbar: '#LAY-app-CoreCmsUserServicesTicket-tableBox-bar' }
] ]
@@ -254,7 +254,7 @@
layui.form.on('switch(switch_isVerification)', function (obj) { layui.form.on('switch(switch_isVerification)', function (obj) {
coreHelper.Post("Api/CoreCmsUserServicesOrder/DoSetisVerification", { id: this.value, data: obj.elem.checked }, function (e) { coreHelper.Post("Api/CoreCmsUserServicesOrder/DoSetisVerification", { id: this.value, data: obj.elem.checked }, function (e) {
if (debug) { console.log(e); } //开启调试返回数据 if (debug) { console.log(e); } //开启调试返回数据
//table.reloadData('LAY-app-CoreCmsUserServicesTicket-tableBox'); table.reloadData('LAY-app-CoreCmsUserServicesTicket-tableBox');
layer.msg(e.msg); layer.msg(e.msg);
}); });
}); });

2
CoreCms.Net.Web.Admin/wwwroot/views/user/wechatuserinfo/index.html
View File

@@ -132,7 +132,7 @@
{ {
field: 'avatar', title: '头像', sort: false, field: 'avatar', title: '头像', sort: false,
templet: function (d) { templet: function (d) {
if (d.avatarImage) { if (d.avatar) {
return '<a href="javascript:void(0);" onclick=layui.coreHelper.viewImage("' + d.avatar + '")><image style="max-width:28px;max-height:28px;" src="' + d.avatar + '" /></a>'; return '<a href="javascript:void(0);" onclick=layui.coreHelper.viewImage("' + d.avatar + '")><image style="max-width:28px;max-height:28px;" src="' + d.avatar + '" /></a>';
} else { } else {
return '<a href="javascript:void(0);" onclick=layui.coreHelper.viewImage("' + setter.noImagePicUrl + '")><image style="max-width:30px;max-height:30px;" src="' + setter.noImagePicUrl + '" /></a>'; return '<a href="javascript:void(0);" onclick=layui.coreHelper.viewImage("' + setter.noImagePicUrl + '")><image style="max-width:30px;max-height:30px;" src="' + setter.noImagePicUrl + '" /></a>';