Merge branch 'feature-dgy-商城优化' into feature-dgy-后台测试

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

@@ -44,7 +44,7 @@
                     </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">
@@ -59,7 +59,7 @@
                                         }
                                     </select>
                                 </div>
-                            </div>
+                            </div> *@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">商品类型</label>
                                 <div class="layui-input-inline">

wwwroot/layuiadmin/modules_main/Orders_Admin.js

@@ -152,10 +152,10 @@ layui.config({
             , { field: 'ProductKind', width: 200, title: '商品类型', sort: true }
             , { field: 'TotalPrice', width: 200, title: '订单金额', sort: true }
             , { field: 'BuyCount', width: 200, title: '购买数量', sort: true }
+            , { field: 'UserInfo', width: 200, title: '创客信息', sort: true }
             , { field: 'Store', width: 200, title: '发货仓库信息', sort: true }
             , { field: 'StoreContact', width: 200, title: '仓库联系人信息', sort: true }
             , { field: 'StoreFrom', width: 200, title: '仓库归属信息', sort: true }
-            , { field: 'UserInfo', width: 200, title: '创客信息', sort: true }
             , { field: 'TopUserInfo', width: 200, title: '顶级创客信息', sort: true }
             , { field: 'Address', width: 200, title: '收货地址', sort: true }
             , { field: 'RecieveInfo', width: 200, title: '收件人姓名-联系电话', sort: true }