暂存

Areas/Admin/Controllers/BsServer/ColController.cs

@@ -67,7 +67,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("ColName", "2"); //名称
             Fields.Add("ColEnName", "2"); //英文名
             string condition = " and ColId like '" + CurColId + "%'";
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).IndexData("Col", Fields, "ColId asc", "False", page, limit, condition);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).IndexData("Col", Fields, "Sort", "False", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             List<Dictionary<string, object>> result = new List<Dictionary<string, object>>();
             foreach (Dictionary<string, object> dic in diclist)

Areas/Admin/Controllers/MainServer/ProductsController.cs

@@ -67,7 +67,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ColId like '%" + ColId + "%'";
             }
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("Products", Fields, "Id desc", "False", page, limit, condition);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("Products", Fields, "Sort", "False", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
@@ -131,6 +131,10 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("EndDate", data.EndDate); //下架时间
             // Fields.Add("EndDate", data.EndDate); //下架时间
             Fields.Add("IsLimit", data.IsLimit); //限时抢购
+            Fields.Add("IsBanner", data.IsBanner); //是否Banner推荐
+            Fields.Add("BannerPhoto", data.BannerPhoto); //Banner图
+            Fields.Add("LinkUrl", data.LinkUrl); //外链
+            Fields.Add("BannerSort", data.BannerSort); //排序
             Fields.Add("SourcePrice", data.SourcePrice); //原价
             Fields.Add("Price", data.Price); //价格
             Fields.Add("Integral", data.Integral); //抵扣积分
@@ -212,6 +216,10 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("StartDate", data.StartDate); //上架时间
             Fields.Add("EndDate", data.EndDate); //下架时间
             Fields.Add("IsLimit", data.IsLimit); //限时抢购
+            Fields.Add("IsBanner", data.IsBanner); //是否Banner推荐
+            Fields.Add("BannerPhoto", data.BannerPhoto); //Banner图
+            Fields.Add("LinkUrl", data.LinkUrl); //外链
+            Fields.Add("BannerSort", data.BannerSort); //排序
             Fields.Add("SourcePrice", data.SourcePrice); //原价
             Fields.Add("Price", data.Price); //价格
             Fields.Add("Integral", data.Integral); //抵扣积分

Areas/Admin/Views/MainServer/Products/Add.cshtml

@@ -34,12 +34,12 @@
                         <li lay-id="5">运费设置</li>
                         @* <li lay-id="6">限时抢购</li> *@
                         <li lay-id="7">数据</li>
-                        <li lay-id="8">宣传标语</li>
-                        <li lay-id="9">SEO设置</li>
+                        @* <li lay-id="8">宣传标语</li> *@
+                        @* <li lay-id="9">SEO设置</li> *@
                     </ul>
                     <div class="layui-tab-content mt20" id="app">
                         <div class="layui-tab-item layui-show">
-                            @{
+                            @* @{
                                 Dictionary<string, string> KqProductsDic = new MySystem.DictionaryClass().getKqProductBrandDic();
                             }
                             <div class="layui-form-item">
@@ -53,7 +53,7 @@
                                         }
                                     </select>
                                 </div>
-                            </div>
+                            </div> *@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">商品类型</label>
                                 <div class="layui-input-inline">
@@ -84,14 +84,6 @@
                                     }
                                 </div>
                             </div>
-
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">外部连接</label>
-                                <div class="layui-input-block">
-                                    <input class="layui-input" type="text" id="LinkUrl" name="LinkUrl" maxlength="500"
-                                        lay-verify="" autocomplete="off" placeholder="请输入外部连接，可不填">
-                                </div>
-                            </div>
                             <div class="layui-form-item">
                                 <label class="layui-form-label">商品名称</label>
                                 <div class="layui-input-block">
@@ -121,7 +113,7 @@
                                 </div>
                             </div>
 
-                            <div class="layui-form-item">
+                            @* <div class="layui-form-item">
                                 <label class="layui-form-label">推荐</label>
                                 <div class="layui-input-block">
                                     <input type="checkbox" id="IsRecommend" name="IsRecommend" value="1"
@@ -134,7 +126,7 @@
                                     <input type="checkbox" id="IsRecommend2" name="IsRecommend2" value="1"
                                         lay-skin="switch" lay-filter="switchTest" title="开关">
                                 </div>
-                            </div>
+                            </div> *@
                             @* <div class="layui-form-item">
                                 <label class="layui-form-label">上架时间</label>
                                 <div class="layui-input-inline">
@@ -170,13 +162,46 @@
                                         maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入限购数量">
                                 </div>
                             </div>
-                            <div class="layui-form-item layui-form-text">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">首页Banner推荐</label>
+                                <div class="layui-input-block">
+                                    <input type="checkbox" id="IsBanner" name="IsBanner" value="1"
+                                        lay-skin="switch" lay-filter="IsBanner" title="开关">
+                                </div>
+                            </div>
+                            <div class="layui-form-item" id="BannerList" style="display: none;">
+                                <label class="layui-form-label">Banner图片</label>
+                                <div class="layui-input-block">
+                                    <div class="layui-upload">
+                                        <input type="hidden" id="BannerPhoto" name="BannerPhoto" value="">
+                                        <button class="layui-btn" type="button" id="ListPicBtn">选择图片</button>
+                                        <div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("ProductsBannerPhoto"))</div>
+                                    </div>
+                                    <div style="margin-top:10px;" id="BannerPhotoImage">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-form-item" id="OutLink" style="display: none;">
+                                <label class="layui-form-label">外部连接</label>
+                                <div class="layui-input-block">
+                                    <input class="layui-input" type="text" id="LinkUrl" name="LinkUrl" maxlength="500"
+                                        lay-verify="" autocomplete="off" placeholder="请输入外部连接，可不填">
+                                </div>
+                            </div>
+                            <div class="layui-form-item" id="SortBanner" style="display: none;">
+                                <label class="layui-form-label">Banner排序</label>
+                                <div class="layui-input-block">
+                                    <input class="layui-input" type="text" id="BannerSort" name="BannerSort" maxlength="500"
+                                        lay-verify="" autocomplete="off" placeholder="请输入Banner排序，可不填">
+                                </div>
+                            </div>
+                            @* <div class="layui-form-item layui-form-text">
                                 <label class="layui-form-label">关键词</label>
                                 <div class="layui-input-block">
                                     <textarea class="layui-textarea" id="KeyWord" name="KeyWord" lay-verify=""
                                         placeholder="请输入关键词"></textarea>
                                 </div>
-                            </div>
+                            </div> *@
 
                         </div>
                         <div class="layui-tab-item">
@@ -205,7 +230,7 @@
                             </div>
                         </div>
                         <div class="layui-tab-item">
-                            <div class="layui-form-item">
+                            @* <div class="layui-form-item">
                                 <label class="layui-form-label">成本价</label>
                                 <div class="layui-input-inline">
                                     <input class="layui-input" type="text" id="CostPrice" name="CostPrice"
@@ -219,7 +244,7 @@
                                         maxlength="20" lay-verify="required|number|" autocomplete="off"
                                         placeholder="请输入原价">
                                 </div>
-                            </div>
+                            </div> *@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">价格</label>
                                 <div class="layui-input-inline">
@@ -227,7 +252,7 @@
                                         lay-verify="" autocomplete="off" placeholder="请输入价格">
                                 </div>
                             </div>
-                            <div class="layui-form-item">
+                            @* <div class="layui-form-item">
                                 <label class="layui-form-label">抵扣积分</label>
                                 <div class="layui-input-inline">
                                     <input class="layui-input" type="text" id="Integral" name="Integral" maxlength="20"
@@ -247,7 +272,7 @@
                                     <input class="layui-input" type="text" id="UserIntegral" name="UserIntegral"
                                         maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入创客抵扣积分">
                                 </div>
-                            </div>
+                            </div> *@
                         </div>
                         <div class="layui-tab-item">
                             <div class="layui-form-item">
@@ -325,7 +350,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="layui-tab-item">
+                        @* <div class="layui-tab-item">
                             <div class="layui-form-item">
                                 <label class="layui-form-label">标语1</label>
                                 <div class="layui-input-block">
@@ -364,7 +389,7 @@
                                 </div>
                             </div>
 
-                        </div>
+                        </div> *@
 
                     </div>
                 </div>
@@ -546,6 +571,20 @@
                     location.hash = 'test=' + $(this).attr('lay-id');
                 });
 
+                form.on('switch(IsBanner)', function (data) {
+                    console.log(data);
+                    if (this.checked) {
+                        $('#BannerList').css('display', 'block');
+                        $('#OutLink').css('display', 'block');
+                        $('#SortBanner').css('display', 'block');
+                    } else {
+                        $('#BannerList').css('display', 'none');
+                        $('#OutLink').css('display', 'none');
+                        $('#SortBanner').css('display', 'none');
+                    }
+                    form.render();
+                });
+
                 //日期
                 laydate.render({
                     elem: '#StartDate',
@@ -566,6 +605,11 @@
                     $('#DetailPicPathImage').append('<div style="float:left; width:285px; height:320px; margin:10px; padding:10px; border:1px solid #cccccc; text-align:center;"><div style="height:285px;"><img src="' + osshost + filename + '" style="max-width:285px; max-height:285px;" onclick="showBigPic(\'' + osshost + filename + '\')" /></div><input type="text" placeholder="图片说明" value="" style="width:285px; margin-top:5px; font-size:12px;" /><br><a href="javascript:;" onclick="movePrev(this,\'DetailPicPath\')" style="color:#000; font-size:12px; padding:0px 2px;">左移</a><a href="javascript:;" onclick="moveNext(this,\'DetailPicPath\')" style="color:#000; font-size:12px; padding:0px 2px;">右移</a><a href="javascript:;" onclick="deletePic(this,\'DetailPicPath\')" style="color:#000; font-size:12px; padding:0px 2px;">删除</a><a href="javascript:;" onclick="setListPhoto(\'' + filename + '\')" style="color:#000; font-size:12px; padding:0px 2px;">设为缩略图</a></div>');
                 });
 
+                WebUploadJs('ListPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ProductBannerListPic"))), function (filename) {
+                    $('#BannerPhotoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
+                    $('#BannerPhoto').val(filename);
+                });
+
 
                 //穿梭框
                 transfer.render({

Areas/Admin/Views/MainServer/Products/Edit.cshtml

@@ -39,8 +39,8 @@
                         <li lay-id="5">运费设置</li>
                         @* <li lay-id="6">限时抢购</li> *@
                         <li lay-id="7">数据</li>
-                        <li lay-id="8">宣传标语</li>
-                        <li lay-id="9">SEO设置</li>
+                        @* <li lay-id="8">宣传标语</li> *@
+                        @* <li lay-id="9">SEO设置</li> *@
                     </ul>
                     <div class="layui-tab-content mt20" id="app">
                         <div class="layui-tab-item layui-show">
@@ -63,10 +63,12 @@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">商品类型</label>
                                 <div class="layui-input-inline">
-                                    <select id="ProductKind" name="ProductKind"  lay-verify="required|">
+                                    <select id="ProductKind" name="ProductKind" lay-verify="required|">
                                         <option value="">请选择</option>
-                                        <option value="1" @(editData.ProductKind == 1 ? "selected=selected" : "")>实物商品</option>
-                                        <option value="2" @(editData.ProductKind == 2 ? "selected=selected" : "")>虚拟商品</option>
+                                        <option value="1" @(editData.ProductKind == 1 ? "selected=selected" : "")>实物商品
+                                        </option>
+                                        <option value="2" @(editData.ProductKind == 2 ? "selected=selected" : "")>虚拟商品
+                                        </option>
                                     </select>
                                 </div>
                             </div>
@@ -76,7 +78,8 @@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">分类</label>
                                 <div class="layui-input-block">
-                                    <input type="hidden" id="ColId" name="ColId" value="@editData.ColId" lay-verify="required|"/>
+                                    <input type="hidden" id="ColId" name="ColId" value="@editData.ColId"
+                                        lay-verify="required|" />
                                     <div id="ColIdTransfer" class="demo-transfer"></div>
                                     @{
                                         string ColJson = "[";
@@ -90,15 +93,6 @@
                                     }
                                 </div>
                             </div>
-
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">外部连接</label>
-                                <div class="layui-input-block">
-                                    <input class="layui-input" type="text" id="LinkUrl" name="LinkUrl"
-                                        value="@editData.LinkUrl" maxlength="500" lay-verify="" autocomplete="off"
-                                        placeholder="请输入外部连接，可不填">
-                                </div>
-                            </div>
                             <div class="layui-form-item">
                                 <label class="layui-form-label">商品名称</label>
                                 <div class="layui-input-block">
@@ -130,22 +124,22 @@
                                         style="width:100%;height:500px;">@(MySystem.OssHelper.Instance.CheckOSSPic(editData.Contents))</textarea>
                                 </div>
                             </div>
-                            <div class="layui-form-item">
+                            @* <div class="layui-form-item">
                                 <label class="layui-form-label">推荐</label>
                                 <div class="layui-input-block">
-                                    <input type="checkbox" id="IsRecommend" name="IsRecommend" value="1"
-                                        @(editData.IsRecommend == 1 ? "checked=checked" : "") lay-skin="switch"
-                                        lay-filter="switchTest" title="开关">
+                                <input type="checkbox" id="IsRecommend" name="IsRecommend" value="1"
+                                @(editData.IsRecommend == 1 ? "checked=checked" : "") lay-skin="switch"
+                                lay-filter="switchTest" title="开关">
                                 </div>
-                            </div>
-                            <div class="layui-form-item">
+                                </div>
+                                <div class="layui-form-item">
                                 <label class="layui-form-label">有好货</label>
                                 <div class="layui-input-block">
-                                    <input type="checkbox" id="IsRecommend2" name="IsRecommend2" value="1"
-                                        @(editData.IsRecommend2 == 1 ? "checked=checked" : "") lay-skin="switch"
-                                        lay-filter="switchTest" title="开关">
+                                <input type="checkbox" id="IsRecommend2" name="IsRecommend2" value="1"
+                                @(editData.IsRecommend2 == 1 ? "checked=checked" : "") lay-skin="switch"
+                                lay-filter="switchTest" title="开关">
                                 </div>
-                            </div>
+                                </div> *@
                             @* <div class="layui-form-item">
                                 <label class="layui-form-label">上架时间</label>
                                 <div class="layui-input-inline">
@@ -186,13 +180,54 @@
                                         placeholder="请输入限购数量">
                                 </div>
                             </div>
-                            <div class="layui-form-item layui-form-text">
-                                <label class="layui-form-label">关键词</label>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">首页Banner推荐</label>
                                 <div class="layui-input-block">
-                                    <textarea class="layui-textarea" id="KeyWord" name="KeyWord" lay-verify=""
-                                        placeholder="请输入关键词">@editData.KeyWord</textarea>
+                                    <input type="checkbox" id="IsBanner" name="IsBanner" value="1"
+                                        @(editData.IsBanner == 1 ? "checked=checked" : "") lay-skin="switch" lay-filter="IsBanner" title="开关">
+                                </div>
+                            </div>
+                            <div class="layui-form-item" id="BannerList" style="display: none;">
+                                <label class="layui-form-label">Banner图片</label>
+                                <div class="layui-input-block">
+                                    <div class="layui-upload">
+                                        <input type="hidden" id="BannerPhoto" name="BannerPhoto"
+                                            value="@editData.BannerPhoto">
+                                        <button class="layui-btn" type="button" id="ListPicBtn">选择图片</button>
+                                        <div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("ProductsBannerPhoto"))</div>
+                                    </div>
+                                    <div style="margin-top:10px;" id="BannerPhotoImage">
+                                        @if (!string.IsNullOrEmpty(editData.BannerPhoto))
+                                        {
+                                            <img src="@(MySystem.OssHelper.Instance.SourceHost)@editData.BannerPhoto"
+                                            class="layui-upload-img" style="max-width:85px; max-height:85px;"
+                                            onclick="showBigPic('@(MySystem.OssHelper.Instance.SourceHost)@editData.BannerPhoto')">
+                                        }
+                                    </div>
                                 </div>
                             </div>
+                            <div class="layui-form-item" id="OutLink" style="display: none;">
+                                <label class="layui-form-label">外部连接</label>
+                                <div class="layui-input-block">
+                                    <input class="layui-input" type="text" id="LinkUrl" name="LinkUrl"
+                                        value="@editData.LinkUrl" maxlength="500" lay-verify="" autocomplete="off"
+                                        placeholder="请输入外部连接，可不填">
+                                </div>
+                            </div>
+                            <div class="layui-form-item" id="SortBanner" style="display: none;">
+                                <label class="layui-form-label">Banner排序</label>
+                                <div class="layui-input-block">
+                                    <input class="layui-input" type="text" id="BannerSort" name="BannerSort" value="@editData.BannerSort" maxlength="500"
+                                        lay-verify="" autocomplete="off" placeholder="请输入Banner排序，可不填">
+                                </div>
+                            </div>
+                            @* <div class="layui-form-item layui-form-text">
+                                <label class="layui-form-label">关键词</label>
+                                <div class="layui-input-block">
+                                <textarea class="layui-textarea" id="KeyWord" name="KeyWord" lay-verify=""
+                                placeholder="请输入关键词">@editData.KeyWord</textarea>
+                                </div>
+                                </div> *@
 
                         </div>
                         <div class="layui-tab-item">
@@ -255,7 +290,7 @@
                             </div>
                         </div>
                         <div class="layui-tab-item">
-                            <div class="layui-form-item">
+                            @* <div class="layui-form-item">
                                 <label class="layui-form-label">成本价</label>
                                 <div class="layui-input-inline">
                                     <input class="layui-input" type="text" id="CostPrice" name="CostPrice"
@@ -270,7 +305,7 @@
                                         value="@editData.SourcePrice" maxlength="20" lay-verify="required|number|"
                                         autocomplete="off" placeholder="请输入原价">
                                 </div>
-                            </div>
+                            </div> *@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">价格</label>
                                 <div class="layui-input-inline">
@@ -279,7 +314,7 @@
                                         placeholder="请输入价格">
                                 </div>
                             </div>
-                            <div class="layui-form-item">
+                            @* <div class="layui-form-item">
                                 <label class="layui-form-label">抵扣积分</label>
                                 <div class="layui-input-inline">
                                     <input class="layui-input" type="text" id="Integral" name="Integral"
@@ -302,7 +337,7 @@
                                         value="@editData.UserIntegral" maxlength="20" lay-verify="" autocomplete="off"
                                         placeholder="请输入创客抵扣积分">
                                 </div>
-                            </div>
+                            </div> *@
                         </div>
                         <div class="layui-tab-item">
                             <div class="layui-form-item">
@@ -385,7 +420,7 @@
                             </div>
 
                         </div>
-                        <div class="layui-tab-item">
+                        @* <div class="layui-tab-item">
                             <div class="layui-form-item">
                                 <label class="layui-form-label">标语1</label>
                                 <div class="layui-input-block">
@@ -426,7 +461,7 @@
                                 </div>
                             </div>
 
-                        </div>
+                        </div> *@
 
                     </div>
                 </div>
@@ -611,6 +646,27 @@
                     location.hash = 'test=' + $(this).attr('lay-id');
                 });
 
+                form.on('switch(IsBanner)', function (data) {
+                    console.log(data);
+                    if (this.checked) {
+                        $('#BannerList').css('display', 'block');
+                        $('#OutLink').css('display', 'block');
+                        $('#SortBanner').css('display', 'block');
+                    } else {
+                        $('#BannerList').css('display', 'none');
+                        $('#OutLink').css('display', 'none');
+                        $('#SortBanner').css('display', 'none');
+                    }
+                    form.render();
+                });
+                var IsBanner = '@editData.IsBanner';
+                if(IsBanner == '1')
+                {
+                    $('#BannerList').css('display', 'block');
+                    $('#OutLink').css('display', 'block');
+                    $('#SortBanner').css('display', 'block');
+                }
+
                 //日期
                 laydate.render({
                     elem: '#StartDate',
@@ -624,6 +680,10 @@
                     elem: '#PublishDate',
                     type: 'datetime'
                 });
+                laydate.render({
+                    elem: '#IsBanner',
+                    type: 'checkbox'
+                });
 
 
                 //上传文件
@@ -631,6 +691,11 @@
                     $('#DetailPicPathImage').append('<div style="float:left; width:285px; height:320px; margin:10px; padding:10px; border:1px solid #cccccc; text-align:center;"><div style="height:285px;"><img src="' + osshost + filename + '" style="max-width:285px; max-height:285px;" onclick="showBigPic(\'' + osshost + filename + '\')" /></div><input type="text" placeholder="图片说明" value="" style="width:285px; margin-top:5px; font-size:12px;" /><br><a href="javascript:;" onclick="movePrev(this,\'DetailPicPath\')" style="color:#000; font-size:12px; padding:0px 2px;">左移</a><a href="javascript:;" onclick="moveNext(this,\'DetailPicPath\')" style="color:#000; font-size:12px; padding:0px 2px;">右移</a><a href="javascript:;" onclick="deletePic(this,\'DetailPicPath\')" style="color:#000; font-size:12px; padding:0px 2px;">删除</a><a href="javascript:;" onclick="setListPhoto(\'' + filename + '\')" style="color:#000; font-size:12px; padding:0px 2px;">设为缩略图</a></div>')
                 });
 
+                WebUploadJs('ListPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ProductBannerListPic"))), function (filename) {
+                    $('#BannerPhotoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
+                    $('#BannerPhoto').val(filename);
+                });
+
 
                 //穿梭框
                 transfer.render({
@@ -712,17 +777,17 @@
                 },
                 showMerchantCol() {
                     let that = this;
-                    @* $.ajax({
-                        url: "/Admin/MerchantCol/GetSelect?r=" + Math.random(1),
-                        data: "MerchantId=" + MerchantId,
-                        dataType: "json",
-                        success: function (data) {
-                            that.merchantColList = data;
-                            setTimeout(function () {
-                                form.render();
-                            }, 1000);
-                        }
-                    }); *@
+        @* $.ajax({
+            url: "/Admin/MerchantCol/GetSelect?r=" + Math.random(1),
+            data: "MerchantId=" + MerchantId,
+            dataType: "json",
+            success: function (data) {
+            that.merchantColList = data;
+            setTimeout(function () {
+            form.render();
+            }, 1000);
+            }
+            }); *@
                 },
             }
         });

wwwroot/layuiadmin/modules_main/Products_Admin.js

@@ -67,13 +67,14 @@ layui.config({
             { type: 'checkbox', fixed: 'left' }
             , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
             , { field: 'ProductName', width: 200, title: '商品名称', sort: true }
+            , { field: 'Status', width: 200, title: '状态', sort: true }
             , { field: 'Stock', width: 200, title: '库存', sort: true }
             , { field: 'BuyCount', width: 200, title: '已购买数', sort: true }
-            , { field: 'Price', width: 200, title: '价格', sort: true }
-            , { field: 'Integral', width: 200, title: '抵扣积分', sort: true }
-            , { field: 'MemberPrice', width: 200, title: '创客价', sort: true }
-            , { field: 'UserIntegral', width: 200, title: '创客抵扣积分', sort: true }
-            , { field: 'Status', width: 200, title: '状态', sort: true }
+            , { field: 'Price', width: 200, title: '单价', sort: true }
+            // , { field: 'Integral', width: 200, title: '抵扣积分', sort: true }
+            // , { field: 'MemberPrice', width: 200, title: '创客价', sort: true }
+            // , { field: 'UserIntegral', width: 200, title: '创客抵扣积分', sort: true }
+            // , { field: 'Status', width: 200, title: '状态', sort: true }
 
             , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             , { title: '操作', width: 250, align: 'center', fixed: 'right', toolbar: '#table-list-tools' }