Merge branch 'feature-dgy-商城商品自动上下架' into feature-dgy-后台测试

# Conflicts:
#	Areas/Admin/Views/Home/Login.cshtml

Areas/Admin/Controllers/MainServer/MerchantDepositReturnsController.cs

@@ -311,6 +311,10 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["UserIdMakerCode"] = userid_Users.MakerCode;
                 dic.Remove("UserId");
 
+                int PayKind = int.Parse(dic["PayKind"].ToString());
+                if (PayKind == 0) dic["PayKindName"] = "支付宝";
+                if (PayKind == 1) dic["PayKindName"] = "银行卡";
+
                 //实际返还金额
                 decimal amt = decimal.Parse(dic["ReturnAmount"].ToString());
                 dic["ReturnAmounts"] = (amt * 0.92M).ToString("f2");

Areas/Admin/Controllers/MainServer/ProductsController.cs

@@ -135,8 +135,10 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("IsRecommend", data.IsRecommend); //推荐
             Fields.Add("IsRecommend2", data.IsRecommend2);
             Fields.Add("IsRecommend3", data.IsRecommend3);
-            Fields.Add("StartDate", data.StartDate); //开始时间
-            Fields.Add("EndDate", data.EndDate); //结束时间
+            Fields.Add("StartDate", data.StartDate); //上架时间
+            Fields.Add("EndDate", data.EndDate); //下架时间
+            // Fields.Add("StartDate", DateTime.Now); //开始时间
+            Fields.Add("EndDate", data.EndDate); //下架时间
             Fields.Add("IsLimit", data.IsLimit); //限时抢购
             Fields.Add("SourcePrice", data.SourcePrice); //原价
             Fields.Add("Price", data.Price); //价格
@@ -213,8 +215,9 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("IsRecommend", data.IsRecommend); //推荐
             Fields.Add("IsRecommend2", data.IsRecommend2);
             Fields.Add("IsRecommend3", data.IsRecommend3);
-            Fields.Add("StartDate", data.StartDate); //开始时间
-            Fields.Add("EndDate", data.EndDate); //结束时间
+            Fields.Add("StartDate", data.StartDate); //上架时间
+            Fields.Add("EndDate", data.EndDate); //下架时间
+            // Fields.Add("StartDate", DateTime.Now); //开始时间
             Fields.Add("IsLimit", data.IsLimit); //限时抢购
             Fields.Add("SourcePrice", data.SourcePrice); //原价
             Fields.Add("Price", data.Price); //价格

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1016,18 +1016,8 @@ namespace MySystem.Areas.Admin.Controllers
             string bindResult = "", bindTime = "";
             if (pos.BindingState == 0)
             {
-                SpModels.BindRecord bind = spdb.BindRecord.FirstOrDefault(m => m.MerSnNo == pos.PosSn);
-                if (bind != null)
-                {
-                    if (bind.Status != 1)
-                    {
-                        bindResult = "执行中";
-                    }
-                }
-                else
-                {
-                    bindResult = "未绑定";
-                }
+
+                bindResult = "未绑定";
             }
             else
             {
@@ -3625,6 +3615,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 posMerchant.MerIdcardNo = MerIdcardNo;
                 posMerchant.MerchantName = MerchantName;
+                posMerchant.MerRealName = MerchantName;
                 posMerchant.MerchantMobile = MerchantMobile;
                 db.SaveChanges();
                 function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + query + ":" + SysUserName + "-" + SysRealName, "设置商户信息");

Areas/Admin/Views/Home/Login.cshtml

@@ -25,8 +25,8 @@
                 <div class="form-group pb10">
                     <label for="password">密码 / Password</label>
                     <input class="form-input" type="password" name="Pwd" id="Pwd" onKeyUp="if(event.keyCode==13){$('#CheckCode').focus();}" placeholder="请填写密码">
-                @* </div>
-                <div class="form-group pb10">
+                </div>
+                @* <div class="form-group pb10">
                     <label for="password">验证码 / Verification</label>
                     <input class="form-input" type="text" name="CheckCode" id="CheckCode" onkeyup="if(event.keyCode==13){syslogin();}" placeholder="请填写验证码" style="width: 70%; display: inline-block; margin-right: 2%">
                     <img src="/Api/PublicMethod/CheckCode" onclick="$(this).attr('src','/Api/PublicMethod/CheckCode?r='+Math.random())" style="width: 26%; height:38px;" />

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

@@ -92,11 +92,23 @@
                             <input type="checkbox" id="IsRecommend2" name="IsRecommend2" value="1" lay-skin="switch" lay-filter="switchTest" title="开关">
                         </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="PublishDate" name="PublishDate" lay-verify="" autocomplete="off" placeholder="请输入上架时间">
                         </div>
+                    </div> *@
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">上架时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" id="StartDate" name="StartDate" lay-verify="required" autocomplete="off" placeholder="请输入上架时间">
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">下架时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" id="EndDate" name="EndDate" lay-verify="required" autocomplete="off" placeholder="请输入下架时间">
+                        </div>
                     </div>
                     <div class="layui-form-item">
                         <label class="layui-form-label">限购数量</label>

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

@@ -94,11 +94,23 @@
                             <input type="checkbox" id="IsRecommend2" name="IsRecommend2" value="1" @(editData.IsRecommend2 == 1 ? "checked=checked" : "") lay-skin="switch" lay-filter="switchTest" title="开关">
                         </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="PublishDate" name="PublishDate" value="@(editData.PublishDate == null ? "" : editData.PublishDate.Value.ToString("yyyy-MM-dd HH:mm:ss"))" lay-verify="" autocomplete="off" placeholder="请输入上架时间">
                         </div>
+                    </div> *@
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">上架时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" id="StartDate" name="StartDate" value="@(editData.StartDate == null ? "" : editData.StartDate.Value.ToString("yyyy-MM-dd HH:mm:ss"))" lay-verify="" autocomplete="off" placeholder="请输入上架时间">
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">下架时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" id="EndDate" name="EndDate" value="@(editData.EndDate == null ? "" : editData.EndDate.Value.ToString("yyyy-MM-dd HH:mm:ss"))" lay-verify="" autocomplete="off" placeholder="请输入下架时间">
+                        </div>
                     </div>
                     <div class="layui-form-item">
                         <label class="layui-form-label">限购数量</label>