From 0a4efbb7f1f1f6b62d5fc7132dc7b776d77495f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= <jianweie@163.com>
Date: Thu, 31 Oct 2024 12:46:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E3=80=90=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91:=20=E7=94=A8=E6=88=B7=E5=A6=82=E6=9E=9C=E8=87=AA?=
 =?UTF-8?q?=E4=B8=BB=E6=B3=A8=E5=86=8C=EF=BC=8C=E5=B0=86=E6=97=A0=E4=B8=8A?=
 =?UTF-8?q?=E7=BA=A7=EF=BC=8C=E7=89=B9=E5=90=8E=E5=8F=B0=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=BC=80=E5=85=B3=EF=BC=8C=E5=8F=AF=E6=8E=A7=E5=88=B6=E6=AD=A4?=
 =?UTF-8?q?=E7=B1=BB=E7=94=A8=E6=88=B7=E4=BA=8C=E6=AC=A1=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E5=88=AB=E4=BA=BA=E7=9A=84=E5=88=86=E4=BA=AB=E6=B5=B7=E6=8A=A5?=
 =?UTF-8?q?=EF=BC=8C=E6=98=AF=E5=90=A6=E5=8F=AF=E4=BB=A5=E7=BB=A7=E7=BB=AD?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=B8=8A=E4=B8=8B=E7=BA=A7=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E3=80=82=E5=89=8D=E7=AB=AF=E5=B7=B2=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E6=9B=B4=E6=96=B0=E6=AD=A4=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SystemSettingConstVars.cs                    |  4 ++++
 .../SystemSettingDictionary.cs                   |  2 ++
 .../wwwroot/views/shop/setting/index.html        | 16 ++++++++++++----
 .../Controllers/CommonController.cs              |  4 +++-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/CoreCms.Net.Configuration/SystemSettingConstVars.cs b/CoreCms.Net.Configuration/SystemSettingConstVars.cs
index 6c225c62..2f3d6194 100644
--- a/CoreCms.Net.Configuration/SystemSettingConstVars.cs
+++ b/CoreCms.Net.Configuration/SystemSettingConstVars.cs
@@ -598,6 +598,10 @@ namespace CoreCms.Net.Configuration
         /// </summary>
         public const string AllowAddressToUseMap = "allowAddressToUseMap";
 
+        /// <summary>
+        /// 是否允许自己注册的用户二次扫码绑定上级
+        /// </summary>
+        public const string IsAllowUserSecondBind = "isAllowUserSecondBind";
 
         /// <summary>
         /// 显示首页弹窗
diff --git a/CoreCms.Net.Configuration/SystemSettingDictionary.cs b/CoreCms.Net.Configuration/SystemSettingDictionary.cs
index d5371c87..9644f3aa 100644
--- a/CoreCms.Net.Configuration/SystemSettingDictionary.cs
+++ b/CoreCms.Net.Configuration/SystemSettingDictionary.cs
@@ -66,6 +66,8 @@ namespace CoreCms.Net.Configuration
             di.Add(SystemSettingConstVars.ShowCustomForm, new DictionaryKeyValues() { sKey = "显示自定义表单按钮", sValue = "2" });
             di.Add(SystemSettingConstVars.AllowAddressToUseMap, new DictionaryKeyValues() { sKey = "用户地址开启坐标", sValue = "1" });
 
+            di.Add(SystemSettingConstVars.IsAllowUserSecondBind, new DictionaryKeyValues() { sKey = "已注册用户扫码绑定", sValue = "1" });
+
             di.Add(SystemSettingConstVars.ShowIndexPopupWindow, new DictionaryKeyValues() { sKey = "显示首页弹窗", sValue = "2" });
             di.Add(SystemSettingConstVars.IndexPopupWindowImageUrl, new DictionaryKeyValues() { sKey = "图片地址", sValue = "" });
             di.Add(SystemSettingConstVars.IndexPopupWindowHrefUrl, new DictionaryKeyValues() { sKey = "链接地址", sValue = "" });
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html
index 7fbebd0d..d995a8c1 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html
@@ -58,32 +58,40 @@
                                         </blockquote>
                                         <div class="layui-form-item">
                                             <label class="layui-form-label">{{d.data.configs['showStoresSwitch']['sKey']}}</label>
-                                            <div class="layui-input-inline layui-inline-7">
+                                            <div class="layui-input-inline layui-inline-4">
                                                 <input type="radio" lay-filter="showStoresSwitch" name="showStoresSwitch" value="1" title="开启" {{d.data.configs['showStoresSwitch']['sValue']==="1" ? 'checked':''}}>
                                                 <input type="radio" lay-filter="showStoresSwitch" name="showStoresSwitch" value="2" title="不开启" {{d.data.configs['showStoresSwitch']['sValue']==="2" ? 'checked':''}}>
                                             </div>
                                         </div>
                                         <div class="layui-form-item">
                                             <label class="layui-form-label">{{d.data.configs['showStoreBalanceRechargeSwitch']['sKey']}}</label>
-                                            <div class="layui-input-inline layui-inline-7">
+                                            <div class="layui-input-inline layui-inline-4">
                                                 <input type="radio" lay-filter="showStoreBalanceRechargeSwitch" name="showStoreBalanceRechargeSwitch" value="1" title="开启" {{d.data.configs['showStoreBalanceRechargeSwitch']['sValue']==="1" ? 'checked':''}}>
                                                 <input type="radio" lay-filter="showStoreBalanceRechargeSwitch" name="showStoreBalanceRechargeSwitch" value="2" title="不开启" {{d.data.configs['showStoreBalanceRechargeSwitch']['sValue']==="2" ? 'checked':''}}>
                                             </div>
                                         </div>
                                         <div class="layui-form-item">
                                             <label class="layui-form-label">{{d.data.configs['isAllowWithdrawCash']['sKey']}}</label>
-                                            <div class="layui-input-inline layui-inline-7">
+                                            <div class="layui-input-inline layui-inline-4">
                                                 <input type="radio" lay-filter="isAllowWithdrawCash" name="isAllowWithdrawCash" value="1" title="开启" {{d.data.configs['isAllowWithdrawCash']['sValue']==="1" ? 'checked':''}}>
                                                 <input type="radio" lay-filter="isAllowWithdrawCash" name="isAllowWithdrawCash" value="2" title="不开启" {{d.data.configs['isAllowWithdrawCash']['sValue']==="2" ? 'checked':''}}>
                                             </div>
                                         </div>
                                         <div class="layui-form-item">
                                             <label class="layui-form-label">{{d.data.configs['allowAddressToUseMap']['sKey']}}</label>
-                                            <div class="layui-input-inline layui-inline-7">
+                                            <div class="layui-input-inline layui-inline-4">
                                                 <input type="radio" lay-filter="allowAddressToUseMap" name="allowAddressToUseMap" value="1" title="开启" {{d.data.configs['allowAddressToUseMap']['sValue']==="1" ? 'checked':''}}>
                                                 <input type="radio" lay-filter="allowAddressToUseMap" name="allowAddressToUseMap" value="2" title="不开启" {{d.data.configs['allowAddressToUseMap']['sValue']==="2" ? 'checked':''}}>
                                             </div>
                                         </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">{{d.data.configs['isAllowUserSecondBind']['sKey']}}</label>
+                                            <div class="layui-input-inline layui-inline-4">
+                                                <input type="radio" lay-filter="isAllowUserSecondBind" name="isAllowUserSecondBind" value="1" title="开启" {{d.data.configs['isAllowUserSecondBind']['sValue']==="1" ? 'checked':''}}>
+                                                <input type="radio" lay-filter="isAllowUserSecondBind" name="isAllowUserSecondBind" value="2" title="不开启" {{d.data.configs['isAllowUserSecondBind']['sValue']==="2" ? 'checked':''}}>
+                                            </div>
+                                            <div class="layui-form-mid layui-word-aux">当用户是自己注册的那么是没有上级的，可以通过此开关控制这类用户是否二次扫码（上级分享海报）实现与上级绑定。（注意，已经有上级的此设置不生效）</div>
+                                        </div>
                                         <blockquote class="layui-elem-quote">
                                             控制首页是否弹出弹窗广告
                                         </blockquote>
diff --git a/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs b/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs
index 41c29a17..0871cb75 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs
@@ -188,6 +188,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
 
 
             var checkInIsOpen = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.CheckInIsOpen).ObjectToInt(2); //订单取消时间
+            var isAllowUserSecondBind = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.IsAllowUserSecondBind).ObjectToInt(2); //订单取消时间
 
 
             var model = new
@@ -256,7 +257,8 @@ namespace CoreCms.Net.Web.WebApi.Controllers
                 indexPopupWindowHrefUrl,
                 showCustomForm,
                 showLiveBroadCast,
-                allowAddressToUseMap
+                allowAddressToUseMap,
+                isAllowUserSecondBind
             };
             jm.data = model;
             return jm;