diff --git a/CoreCms.Net.Services/User/CoreCmsUserServices.cs b/CoreCms.Net.Services/User/CoreCmsUserServices.cs index 8414ce8..24ab85f 100644 --- a/CoreCms.Net.Services/User/CoreCmsUserServices.cs +++ b/CoreCms.Net.Services/User/CoreCmsUserServices.cs @@ -98,7 +98,7 @@ namespace CoreCms.Net.Services var balance = new CoreCmsUserBalance(); balance.type = (int)GlobalEnumVars.UserBalanceSourceTypes.Admin; balance.userId = model.id; - balance.balance = model.balance; + balance.balance = newMoney; balance.createTime = DateTime.Now; balance.memo = UserHelper.GetMemo(balance.type, money); balance.money = money; diff --git a/CoreCms.Net.Web.Admin/wwwroot/lib/custom/js/main.js b/CoreCms.Net.Web.Admin/wwwroot/lib/custom/js/main.js index eecea6d..3d91237 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/lib/custom/js/main.js +++ b/CoreCms.Net.Web.Admin/wwwroot/lib/custom/js/main.js @@ -1173,13 +1173,20 @@ Vue.component('layout-config', { }, selectGoods: function () { var that = this; + var objData = {}; + var list = that.selectWg.value.list; + for (var i = 0; i < list.length; i++) { + if (list[i].id) { + objData[list[i].id] = list[i]; + } + } layui.use(['form', 'table'], function () { layui.admin.popup({ title: '商品列表', area: ['1200px', '90%'], id: 'LAY-app-CoreCmsCommon-getGoodIds', success: function (layero, index) { - layui.view(this.id).render('common/getGoodIds', null).done(function () { + layui.view(this.id).render('common/getGoodIds', { data: objData }).done(function () { layui.form.on('submit(LAY-app-CoreCmsGoods-getData)', function (data) { //判断个数是否满足 diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/common/getGoodIds.html b/CoreCms.Net.Web.Admin/wwwroot/views/common/getGoodIds.html index ff816a5..c22f967 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/common/getGoodIds.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/common/getGoodIds.html @@ -45,7 +45,10 @@ , util = layui.util , table = layui.table , view = layui.view; - + if (d.params.data) { + ids = d.params.data; + console.log(ids); + } //重载form form.render(); var searchwhere; diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/promotion/group/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/promotion/group/edit.html index 1aeb182..564b374 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/promotion/group/edit.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/promotion/group/edit.html @@ -364,6 +364,8 @@ form.on('submit(LAY-app-CoreCmsGoods-getData)', function (data) { console.log(ids); + objData = ids; + if (!!!ids.id) { layer.msg("请先选择商品"); return; diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/promotion/pintuan/pintuanrule/create.html b/CoreCms.Net.Web.Admin/wwwroot/views/promotion/pintuan/pintuanrule/create.html index 9fa98bb..2f56a16 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/promotion/pintuan/pintuanrule/create.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/promotion/pintuan/pintuanrule/create.html @@ -96,6 +96,7 @@