GithubStar/CoreShop
1
0
Fork 0
mirror of https://github.com/CoreUnion/CoreShop.git synced 2026-10-29 13:39:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

1、修复小程序注册问题，导致交互事情。不然盛派的组件有bug，在不注册微信公众号只注册微信小程序的时候，进行小程序消息操作，默认还是走的是微信公众号的相关方法。导致提示MP appid未注册的bug。

Browse Source 
2、修复代码生成器生成long类型未生成的问题。
3、修复计算商品重量不正确的问题。
4、修复促销中心-团购(秒杀列表) -添加活动商品的未选择的情况下undefined的问题。
5、修复会员中心【余额】【积分】面板查询框失效问题。
6、小程序提交订单页面，没有显示出商品规格的问题。
7、修复【订单管理】【发货单列表】【查看详情】获取快递轨迹失败问题。
8、修复【商城设置】【分享好友三级佣金输入】命名重复问题。
This commit is contained in:
JianWeie
2021-07-15 22:45:33 +08:00
parent 8d28ae0abf
commit f202359563
30 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CoreCms.Net.CodeGenerator/CrudTemplete/Controllers/Controller.tpl
+3 -3
View File
@@ -19,7 +19,7 @@ using CoreCms.Net.Configuration;
using CoreCms.Net.Model.Entities;
using CoreCms.Net.Model.Entities.Expression;
using CoreCms.Net.Model.FromBody;
using CoreCms.Net.Model.ViewModels.UI;
using CoreCms.Net.Model.ViewModel.UI;
using CoreCms.Net.Filter;
using CoreCms.Net.Loging;
using CoreCms.Net.IServices;
@@ -95,7 +95,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
if (!string.IsNullOrEmpty({{field.DbColumnName}}))
{
where = where.And(p => p.{{field.DbColumnName}}.Contains({{field.DbColumnName}}));
}{% elsif field.DataType == 'int' %}
}{% elsif field.DataType == 'int' or field.DataType == 'bigint' %}
//{{field.ColumnDescription}} {{field.DataType}}
var {{field.DbColumnName}} = Request.Form["{{field.DbColumnName}}"].FirstOrDefault().ObjectToInt(0);
if ({{field.DbColumnName}} > 0)
@@ -388,7 +388,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
if (!string.IsNullOrEmpty({{field.DbColumnName}}))
{
where = where.And(p => p.{{field.DbColumnName}}.Contains({{field.DbColumnName}}));
}{% elsif field.DataType == 'int' %}
}{% elsif field.DataType == 'int' or field.DataType == 'bigint' %}
//{{field.ColumnDescription}} {{field.DataType}}
var {{field.DbColumnName}} = Request.Form["{{field.DbColumnName}}"].FirstOrDefault().ObjectToInt(0);
if ({{field.DbColumnName}} > 0)
CoreCms.Net.CodeGenerator/CrudTemplete/DbModel/Model.tpl
+4
View File
@@ -46,6 +46,10 @@ namespace CoreCms.Net.Model.Entities
public System.Int32 {{field.DbColumnName}} { get; set; }
{% elsif field.DataType == 'int' and field.IsNullable == true %}
public System.Int32? {{field.DbColumnName}} { get; set; }
{% elsif field.DataType == 'bigint' and field.IsNullable == false %}
public System.Int64 {{field.DbColumnName}} { get; set; }
{% elsif field.DataType == 'bigint' and field.IsNullable == true %}
public System.Int64? {{field.DbColumnName}} { get; set; }
{% elsif field.DataType == 'float' and field.IsNullable == false %}
public float {{field.DbColumnName}} { get; set; }
{% elsif field.DataType == 'float' and field.IsNullable == true %}
CoreCms.Net.CodeGenerator/CrudTemplete/Repositories/IRepository.tpl
+2 -2
View File
@@ -13,8 +13,8 @@ using System.Collections.Generic;
using System.Linq.Expressions;
using System.Threading.Tasks;
using CoreCms.Net.Model.Entities;
using CoreCms.Net.Model.ViewModels.Basics;
using CoreCms.Net.Model.ViewModels.UI;
using CoreCms.Net.Model.ViewModel.Basics;
using CoreCms.Net.Model.ViewModel.UI;
using SqlSugar;
CoreCms.Net.CodeGenerator/CrudTemplete/Repositories/Repository.tpl
+2 -2
View File
@@ -15,10 +15,10 @@ using System.Threading.Tasks;
using CoreCms.Net.Caching.Manual;
using CoreCms.Net.Configuration;
using CoreCms.Net.Model.Entities;
using CoreCms.Net.Model.ViewModels.Basics;
using CoreCms.Net.Model.ViewModel.Basics;
using CoreCms.Net.IRepository;
using CoreCms.Net.IRepository.UnitOfWork;
using CoreCms.Net.Model.ViewModels.UI;
using CoreCms.Net.Model.ViewModel.UI;
using SqlSugar;
namespace CoreCms.Net.Repository
CoreCms.Net.CodeGenerator/CrudTemplete/Services/IServices.tpl
+2 -2
View File
@@ -13,8 +13,8 @@ using System.Collections.Generic;
using System.Linq.Expressions;
using System.Threading.Tasks;
using CoreCms.Net.Model.Entities;
using CoreCms.Net.Model.ViewModels.Basics;
using CoreCms.Net.Model.ViewModels.UI;
using CoreCms.Net.Model.ViewModel.Basics;
using CoreCms.Net.Model.ViewModel.UI;
using SqlSugar;
namespace CoreCms.Net.IServices
CoreCms.Net.CodeGenerator/CrudTemplete/Services/Services.tpl
+2 -2
View File
@@ -17,8 +17,8 @@ using CoreCms.Net.IRepository;
using CoreCms.Net.IRepository.UnitOfWork;
using CoreCms.Net.IServices;
using CoreCms.Net.Model.Entities;
using CoreCms.Net.Model.ViewModels.Basics;
using CoreCms.Net.Model.ViewModels.UI;
using CoreCms.Net.Model.ViewModel.Basics;
using CoreCms.Net.Model.ViewModel.UI;
using SqlSugar;
CoreCms.Net.CodeGenerator/CrudTemplete/View/Create.tpl
+1 -1
View File
@@ -21,7 +21,7 @@
<div class="layui-input-block">
{% if field.Length >0 %}<input name="{{field.DbColumnName}}" lay-verType="tips" lay-verify="required|verify{{field.DbColumnName}}" class="layui-input" lay-reqText="请输入{{field.ColumnDescription}}" placeholder="请输入{{field.ColumnDescription}}"/>{% else %}<input name="{{field.DbColumnName}}" lay-verType="tips" lay-verify="required" class="layui-input" lay-reqText="请输入{{field.ColumnDescription}}" placeholder="请输入{{field.ColumnDescription}}" />{% endif %}
</div>
</div>{% elsif field.DataType == 'int' %}
</div>{% elsif field.DataType == 'int' or field.DataType == 'bigint' %}
<div class="layui-form-item">
<label for="{{field.DbColumnName}}" class="layui-form-label layui-form-required">{{field.ColumnDescription}}</label>
<div class="layui-input-block">
CoreCms.Net.CodeGenerator/CrudTemplete/View/Edit.tpl
+1 -1
View File
@@ -22,7 +22,7 @@
{% if field.Length >0 %}<input name="{{field.DbColumnName}}" lay-verType="tips" lay-verify="required|verify{{field.DbColumnName}}" class="layui-input" placeholder="请输入{{field.ColumnDescription}}" lay-reqText="请输入{{field.ColumnDescription}}" value="{% raw %}{{{% endraw %}d.params.data.{{field.DbColumnName}} || '' {% raw %}}}{% endraw %}" />{% else %}<input name="{{field.DbColumnName}}" lay-verType="tips" lay-verify="required" class="layui-input" placeholder="请输入{{field.ColumnDescription}}" lay-reqText="请输入{{field.ColumnDescription}}" value="{% raw %}{{{% endraw %}d.params.data.{{field.DbColumnName}} || '' {% raw %}}}{% endraw %}" />
{% endif %}
</div>
</div>{% elsif field.DataType == 'int' %}
</div>{% elsif field.DataType == 'int' or field.DataType == 'bigint' %}
<div class="layui-form-item">
<label for="{{field.DbColumnName}}" class="layui-form-label layui-form-required">{{field.ColumnDescription}}</label>
<div class="layui-input-block">