diff --git a/CoreCms.Net.Configuration/SystemSettingConstVars.cs b/CoreCms.Net.Configuration/SystemSettingConstVars.cs index fdca3c14..f88b22d6 100644 --- a/CoreCms.Net.Configuration/SystemSettingConstVars.cs +++ b/CoreCms.Net.Configuration/SystemSettingConstVars.cs @@ -536,6 +536,10 @@ namespace CoreCms.Net.Configuration /// public const string ShowStoreBalanceRechargeSwitch = "showStoreBalanceRechargeSwitch"; + /// + /// 是否允许提现 + /// + public const string IsAllowWithdrawCash = "isAllowWithdrawCash"; /// /// 显示增值服务板块 diff --git a/CoreCms.Net.Configuration/SystemSettingDictionary.cs b/CoreCms.Net.Configuration/SystemSettingDictionary.cs index 02b74c38..d0e71843 100644 --- a/CoreCms.Net.Configuration/SystemSettingDictionary.cs +++ b/CoreCms.Net.Configuration/SystemSettingDictionary.cs @@ -47,6 +47,7 @@ namespace CoreCms.Net.Configuration //开关功能 di.Add(SystemSettingConstVars.ShowStoreBalanceRechargeSwitch, new DictionaryKeyValues() { sKey = "显示充值功能", sValue = "2" }); + di.Add(SystemSettingConstVars.IsAllowWithdrawCash, new DictionaryKeyValues() { sKey = "是否允许提现", sValue = "2" }); di.Add(SystemSettingConstVars.ShowVas, new DictionaryKeyValues() { sKey = "显示增值服务板块", sValue = "2" }); di.Add(SystemSettingConstVars.ShowStoresSwitch, new DictionaryKeyValues() { sKey = "显示门店列表", sValue = "2" }); @@ -259,8 +260,6 @@ namespace CoreCms.Net.Configuration //小程序直播 di.Add(SystemSettingConstVars.ShowLiveBroadCast, new DictionaryKeyValues() { sKey = "显示小程序直播入口", sValue = "2" }); - - return di; } diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/index/index.vue index 438879c9..ae6a3faf 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/index/index.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/index/index.vue @@ -21,7 +21,7 @@ - + @@ -51,13 +51,16 @@ data() { return { userInfo: {}, - platform: 'ios', + platform: 'ios' } }, computed: { showRecharge() { return this.$store.state.config.showStoreBalanceRechargeSwitch === 1; - } + }, + isAllowWithdrawCash() { + return this.$store.state.config.isAllowWithdrawCash === 1; + }, }, onShow() { this.getUserInfo(); diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/recharge/recharge.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/recharge/recharge.vue index ee1de9c5..0b872d41 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/recharge/recharge.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/recharge/recharge.vue @@ -10,7 +10,7 @@ - + {{ user.balance || '0'}} @@ -54,6 +54,15 @@ 去支付 + + + + + + + + + @@ -83,6 +92,11 @@ orderType: this.$globalConstVars.paymentType.recharge // 储值类型 } }, + computed: { + showRecharge() { + return this.$store.state.config.showStoreBalanceRechargeSwitch === 1; + } + }, onReady() { this.$refs.uForm.setRules(this.rules); }, diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.vue index 1cf8a8e2..b36c8148 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.vue @@ -10,7 +10,7 @@ - + @@ -54,6 +54,15 @@ 确认提现 + + + + + + + + + @@ -109,7 +118,10 @@ } else { return '' } - } + }, + isAllowWithdrawCash() { + return this.$store.state.config.isAllowWithdrawCash === 1; + }, }, methods: { // 获取我的默认银行卡信息 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 ae232e66..5043edca 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html @@ -52,6 +52,7 @@
1、如果开启【显示门店列表】模块，则微信小程序审核如果发现可能会失败，并提示“【小程序涉及多个商家提供商品的在线交易及配送，请补充选择：电商平台-电商平台类目。】”，可先关闭，审核后再开启。
2、如果开启【显示充值】模块，则微信小程序审核如果发现可能会失败，并提示“【小程序页面内容涉及账户充值服务，需补充商家自营-预付卡销售-发行方类目。】”，可先关闭，审核后再开启。
+ 2、如果开启【是否允许提现】模块，则微信小程序审核如果发现可能会失败，并提示“【小程序页面内容涉嫌收集用户信息，包括但不限于银行卡，手机号码等。】”，可先关闭，审核后再开启。
@@ -67,6 +68,13 @@
+
+ +
+ + +
+
控制首页是否弹出弹窗广告
diff --git a/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs b/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs index 6b26971d..c9c2a5bc 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs @@ -99,6 +99,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers var shopBeiAn = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShopBeiAn); //店铺备案 var shopDesc = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShopDesc); //店铺描述 var showStoreBalanceRechargeSwitch = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowStoreBalanceRechargeSwitch).ObjectToInt(2); //显示充值功能 + var isAllowWithdrawCash = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.IsAllowWithdrawCash).ObjectToInt(2); //显示充值功能 var showStoresSwitch = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowStoresSwitch).ObjectToInt(2); //显示门店列表 var showVas = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowVas).ObjectToInt(2); //显示增值服务板块 @@ -197,6 +198,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers storeSwitch, showStoresSwitch, showStoreBalanceRechargeSwitch, + isAllowWithdrawCash, cateStyle, cateType, toCashMoneyLow,