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

2、修复代码生成器生成long类型未生成的问题。 3、修复计算商品重量不正确的问题。 4、修复促销中心-团购(秒杀列表) -添加活动商品的未选择的情况下undefined的问题。 5、修复会员中心【余额】【积分】面板查询框失效问题。 6、小程序提交订单页面，没有显示出商品规格的问题。 7、修复【订单管理】【发货单列表】【查看详情】获取快递轨迹失败问题。 8、修复【商城设置】【分享好友三级佣金输入】命名重复问题。
2026-10-17 05:12:39 +08:00 · 2021-07-15 22:45:33 +08:00
parent 8d28ae0abf
commit f202359563
30 changed files with 50 additions and 45 deletions
@@ -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)
@@ -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 %}
@@ -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;


@@ -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
@@ -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
@@ -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;


@@ -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">
@@ -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">
@@ -559,7 +559,7 @@ namespace CoreCms.Net.Services
                    //算订单总价格
                    cartDto.amount = Math.Round(cartDto.amount + item.products.amount, 2);
                    //计算总重量
-                    cartDto.weight = Math.Round(cartDto.weight + Math.Round(item.weight + item.nums, 2), 2);
+                    cartDto.weight = Math.Round(cartDto.weight + Math.Round(item.weight * item.nums, 2), 2);
                }
            }

@@ -98,7 +98,7 @@
                            <view class="cu-avatar radius lg" :style="[{backgroundImage:'url('+ item.products.images+'?x-oss-process=image/resize,m_lfit,h_200,w_200' +')'}]" />
                            <view class="goods-info-view">
                                <view class="text-black u-line-2">{{ item.products.name || ''}}</view>
-                                <view class="text-sm text-gray" v-if="item.products.spes_desc !== null">{{ item.products.spes_desc || ''}}</view>
+                                <view class="text-sm text-gray" v-if="item.products.spesDesc !== null">{{ item.products.spesDesc || ''}}</view>
                                <view class="coreshop-tag-view" v-if="item.products.promotionList">
                                    <text class="cu-tag line-blue sm radius" v-for="(v, k) in item.products.promotionList" :key="k"> {{ v.name || ''}}</text>
                                </view>
@@ -338,6 +338,9 @@
            this.getUserCounpons()
            //获取默认门店信息
            this.getDefaultStore();
+
+            console.log("当前scene值:" + this.$store.state.scene);
+
        },
        onShow() {
            // #ifdef MP-ALIPAY || MP-TOUTIAO
@@ -599,7 +602,8 @@
                    receiptType: this.receiptType,
                    teamId: this.teamId,
                    groupId: this.groupId,
-                    orderType: this.params.orderType //订单类型
+                    orderType: this.params.orderType, //订单类型
+                    scene: this.$store.state.scene //场景值（用于确定小程序是否来源直播和视频号）
                }

                let delivery = {}
@@ -640,8 +644,6 @@
                    }
                }

-
-
                // 发票信息
                data['taxType'] = this.invoice.type
                data['taxName'] = this.invoice.name
@@ -19,7 +19,7 @@
    }
    .goods-info-view-box { position: relative; padding: 27.27rpx 18.18rpx;
        .cu-avatar { position: absolute; height: 163.63rpx; width: 163.63rpx; left: 18.18rpx; }
-        .goods-info-view { position: relative; padding-left: 181.81rpx; height: 163.63rpx; line-height: 1.4;
+        .goods-info-view { position: relative; padding-left: 181.81rpx; min-height: 163.63rpx; line-height: 1.4;
            .coreshop-tag-view { position: relative; }
            .goods-price-view { position: relative; line-height: 1.7; top: 9.09rpx;
                .goods-num { width: 50rpx; position: absolute; right: 5rpx; top: 5rpx; }
@@ -93,10 +93,6 @@
  </ItemGroup>

  <ItemGroup>
-    <Content Update="wwwroot\favicon.ico">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
    <Content Update="wwwroot\views\good\goods\batchModifyPrice.html">
      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
@@ -8,7 +8,7 @@
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
+    <link rel="shortcut icon" href="static/images/common/favicon.ico" type="image/x-icon" />
    <link rel="stylesheet" href="/lib/layui/css/layui.css" media="all">
    <link href="/lib/layuiAdmin/style/dtree/dtree.css" rel="stylesheet" />
    <link href="/lib/layuiAdmin/style/dtree/font/dtreefont.css" rel="stylesheet" />
@@ -1010,9 +1010,6 @@ form > .row > .col-sm-12.mb-2 > .form-group { position: relative }
 div#agreement > h3, div#privacy > h3 { font-size: 20px }
 div#agreement > p, div#privacy > p { font-size: 14px }
 a.social-login-link { cursor: pointer }
-.fa-baidu { overflow: hidden; position: relative; height: 32px; width: 32px; margin-top: 9px }
-.fa-baidu-del { background: url(/static/images/common/baidu.png) no-repeat; height: 100%; width: 100%; display: inline-block; filter: drop-shadow(32px 0 #009688); position: relative; left: -32px }
-.fa-baidu:hover > .fa-baidu-del { background: url(/static/images/common/baidu.png) no-repeat; height: 100%; width: 100%; display: inline-block; opacity: .8; filter: alpha(opacity=80); color: #fff; position: relative; left: -32px }


 .layui-form-checked[lay-skin=primary] i { border-color: #009688 !important; background-color: #009688; color: #fff; }
@@ -995,6 +995,9 @@ xm-select .xm-body .xm-option.hide-icon.selected {
  margin-top: -24px;
 }
 /*自定义全局包围*/
+.coreshop-admin .layui-logo {
+  padding: 0px;
+}
 .coreshop-admin .layui-logo span {
  font-size: 21px;
  font-weight: 550;
@@ -311,7 +311,7 @@ xm-select .xm-label .xm-label-block, xm-select .xm-body .xm-option.hide-icon.sel
 }
 /*自定义全局包围*/
 .coreshop-admin {
-    .layui-logo { 
+    .layui-logo { padding: 0px;
        span { font-size: 21px; font-weight: 550; letter-spacing: 5px; }
    }
 }
@@ -31,10 +31,10 @@
                            <option value="del">删除</option>
                        </select>
                    </div>
-                </div>
+                </div>     
            </div>
            <div class="layui-inline" style="float: right;">
-                <div class="layui-inline">
+                <div class="layui-inline">  
                    <div class="layui-input-inline">
                        <input type="text" name="name" id="name" placeholder="请输入商品名称" class="layui-input">
                    </div>
@@ -470,7 +470,6 @@
                                        form.on('submit(LAY-app-CoreCmsGoods-batchModifyPrice-submit)',
                                            function (data) {
                                                var field = data.field; //获取提交的字段
-                                                field.ids = e.data.entity.id;
                                                if (debug) { console.log(field); } //开启调试返回数据
                                                //return false;
                                                //提交 Ajax 成功后，关闭当前弹层并重载表格
@@ -507,7 +506,7 @@
                                        form.on('submit(LAY-app-CoreCmsGoods-batchModifyStock-submit)',
                                            function (data) {
                                                var field = data.field; //获取提交的字段
-                                                field.ids = e.data.entity.id;
+                                                field.ids = field.ids.split(',');
                                                if (debug) { console.log(field); } //开启调试返回数据
                                                //return false;
                                                //提交 Ajax 成功后，关闭当前弹层并重载表格
@@ -55,10 +55,11 @@
  <div class="layui-side layui-side-menu">
    <div class="layui-side-scroll">
      <script type="text/html" template  lay-type="Post" lay-url="{{ layui.setter.apiUrl }}api/tools/getNavs?v={{ layui.admin.v }}"
-      lay-done="layui.element.render('nav', 'layadmin-system-side-menu');layui.data.updateMainBreadcrumb();" id="TPL_layout">
+              lay-done="layui.element.render('nav', 'layadmin-system-side-menu');layui.data.updateMainBreadcrumb();" id="TPL_layout">

-        <div class="layui-logo" lay-href="">
-            <span>{{ layui.setter.name || '核心商城系统' }}</span>
+          <div class="layui-logo" lay-href="">
+              <!--<span>{{ layui.setter.name || '核心商城系统' }}</span>-->
+              <img src="../static/images/common/coreshop.png" style="height: 50px;width: 220px;" />
        </div>

        <ul class="layui-nav layui-nav-tree coreshop-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">
@@ -129,7 +129,7 @@
                , coreHelper = layui.coreHelper
                , form = layui.form;

-            coreHelper.Post("Api/Tools/LogisticsByApi", { code: d.params.data.model.logiCode, no: d.params.data.model.logiNo }, function (e) {
+            coreHelper.Post("Api/Tools/LogisticsByApi", { code: d.params.data.model.logiCode, no: d.params.data.model.logiNo, mobile: d.params.data.model.shipMobile }, function (e) {
                console.log(e);
                if (e.code === 0) {
                    if (e.data.data.length > 0) {
@@ -356,13 +356,15 @@
                                    form.on('submit(LAY-app-CoreCmsGoods-getData)',
                                        function (data) {
                                            console.log(ids);
-                                            if (!!!ids) {
+                                            if (!!!ids.id) {
                                                layer.msg("请先选择商品");
                                                return;
                                            }
-                                            $("#goods_list").empty();
-                                            $("#goods_list").append('<li><span id="' + ids.id + '"  lay-active="goodsDelete">×</span>' + ids.name + '</li>');
-                                            $("#goods").val(ids.id);
+                                            if (ids.id) {
+                                                $("#goods_list").empty();
+                                                $("#goods_list").append('<li><span id="' + ids.id + '"  lay-active="goodsDelete">×</span>' + ids.name + '</li>');
+                                                $("#goods").val(ids.id);
+                                            }
                                            layer.close(index);
                                        });
                                });
@@ -509,7 +509,7 @@
                                        <div class="layui-form-item">
                                            <label class="layui-form-label">{{d.data.configs['commissionThird']['sKey']}}：</label>
                                            <div class="layui-input-inline layui-inline-2">
-                                                <input type="text" name="commissionSecond" value="{{d.data.configs['commissionThird']['sValue']}}" lay-verify="title|money" autocomplete="off" placeholder="%" class="layui-input">
+                                                <input type="text" name="commissionThird" value="{{d.data.configs['commissionThird']['sValue']}}" lay-verify="title|money" autocomplete="off" placeholder="%" class="layui-input">
                                            </div>
                                        </div>

@@ -508,7 +508,7 @@
                                        <div class="layui-form-item">
                                            <label class="layui-form-label">{{d.data.configs['commissionThird']['sKey']}}：</label>
                                            <div class="layui-input-inline layui-inline-2">
-                                                <input type="text" name="commissionSecond" value="{{d.data.configs['commissionThird']['sValue']}}" lay-verify="title|money" autocomplete="off" placeholder="%" class="layui-input">
+                                                <input type="text" name="commissionThird" value="{{d.data.configs['commissionThird']['sValue']}}" lay-verify="title|money" autocomplete="off" placeholder="%" class="layui-input">
                                            </div>
                                        </div>

@@ -152,7 +152,7 @@ namespace CoreCms.Net.Web.WebApi
                    p.SerializerSettings.DateFormatString = "yyyy/MM/dd HH:mm:ss";
                });

-           
+

        }

@@ -291,7 +291,8 @@ namespace CoreCms.Net.Web.WebApi

                    #endregion
                });
-
+            // 必须要注册，不然盛派的组件有bug，在不注册微信公众号只注册微信小程序的时候，进行小程序消息操作，默认还是走的是微信公众号的相关方法。导致提示MP appid未注册的bug
+            Senparc.Weixin.MP.Containers.AccessTokenContainer.RegisterAsync(senparcWeixinSetting.Value.WxOpenAppId, senparcWeixinSetting.Value.WxOpenAppSecret, "小程序");
            #endregion