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

Merge branch 'develop' into 'master'

Browse Source 
Develop

See merge request jianweie/coreshoppro!16
This commit is contained in:
大灰灰
2022-10-18 06:30:53 +00:00
parent 5450982d2d fb4e468223
commit 91e6cb2432
4 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CoreCms.Net.Services/Promotion/CoreCmsPromotionServices.cs
View File

@@ -391,7 +391,7 @@ namespace CoreCms.Net.Services
where = where.And(p => p.isAutoReceive == true); //自动领取状态
where = where.And(p => p.isDel == false); //是否被删除
var data = await _dal.QueryPageAndChildsAsync(where, p => p.id, OrderByType.Desc, false, 0, limit);
var data = await _dal.QueryPageAndChildsAsync(where, p => p.sort, OrderByType.Asc, false, 0, limit);
if (data != null && data.Any())
{
@@ -438,7 +438,7 @@ namespace CoreCms.Net.Services
where = where.And(p => p.isAutoReceive == true); //自动领取状态
where = where.And(p => p.isDel == false); //是否被删除
var data = await _dal.QueryPageAndChildsAsync(where, p => p.id, OrderByType.Desc, true, page, limit);
var data = await _dal.QueryPageAndChildsAsync(where, p => p.sort, OrderByType.Asc, true, page, limit);
if (data != null && data.Any())
{

15
CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails.vue
View File

@@ -476,6 +476,21 @@
this.$store.commit('hasLogin', val);
}
},
userInfo: {
get() {
return this.$store.state.userInfo;
},
set(val) {
this.$store.commit('userInfo', val);
}
},
pointSwitch() { return this.$store.state.config.pointSwitch },
pointShowExchangePrice() { return this.$store.state.config.pointShowExchangePrice },
pointDiscountedProportion() { return this.$store.state.config.pointDiscountedProportion },
pointExchangeModel() { return this.$store.state.config.pointExchangeModel },
pointShowName() { return this.$store.state.config.pointShowName },
pointGetModel() { return this.$store.state.config.pointGetModel },
pointShowPoint() { return this.$store.state.config.pointShowPoint },
shopName() {
return this.$store.state.config.shopName;
},

15
CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/seckillDetails/seckillDetails.vue
View File

@@ -485,6 +485,21 @@
this.$store.commit('hasLogin', val);
}
},
userInfo: {
get() {
return this.$store.state.userInfo;
},
set(val) {
this.$store.commit('userInfo', val);
}
},
pointSwitch() { return this.$store.state.config.pointSwitch },
pointShowExchangePrice() { return this.$store.state.config.pointShowExchangePrice },
pointDiscountedProportion() { return this.$store.state.config.pointDiscountedProportion },
pointExchangeModel() { return this.$store.state.config.pointExchangeModel },
pointShowName() { return this.$store.state.config.pointShowName },
pointGetModel() { return this.$store.state.config.pointGetModel },
pointShowPoint() { return this.$store.state.config.pointShowPoint },
shopName() {
return this.$store.state.config.shopName;
},

6
CoreCms.Net.Web.Admin/wwwroot/views/user/userInfo/index.html
View File

@@ -464,7 +464,7 @@
if (e.code === 0) {
admin.popup({
shadeClose: false,
title: '修改余额',
title: '修改积分',
area: ['500px', '300px'],
id: 'LAY-popup-CoreCmsUser-EditPoint',
success: function (layero, index) {
@@ -499,13 +499,13 @@
});
}
//执行编辑积分
//执行修改推荐人
function doEditParentId(obj) {
coreHelper.Post("Api/CoreCmsUser/GetEditParentId", { id: obj.data.id }, function (e) {
if (e.code === 0) {
admin.popup({
shadeClose: false,
title: '修改余额',
title: '修改推荐人',
area: ['500px', '300px'],
id: 'LAY-popup-CoreCmsUser-EditParentId',
success: function (layero, index) {