【新增】增加控制个人中心【增值业务】【服务商品】【优惠券】【拼团】【团购】【接龙】【签到】按钮的展示。通过后台【商城设置】【平台设置】【特殊开关】开启和关闭。

CoreCms.Net.Configuration/SystemSettingConstVars.cs

@@ -534,14 +534,56 @@ namespace CoreCms.Net.Configuration
         public const string PrivacyPolicy = "privacyPolicy";
 
         /// <summary>
-        /// 显示门店列表
+        /// 显示充值功能
+        /// </summary>
+        public const string ShowStoreBalanceRechargeSwitch = "showStoreBalanceRechargeSwitch";
+
+
+        /// <summary>
+        /// 显示增值服务板块
+        /// </summary>
+        public const string ShowVas = "showVas";
+
+        /// <summary>
+        /// 显示门店列表按钮
         /// </summary>
         public const string ShowStoresSwitch = "showStoresSwitch";
 
         /// <summary>
-        /// 显示充值功能
+        /// 显示服务商品按钮
         /// </summary>
-        public const string ShowStoreBalanceRechargeSwitch = "showStoreBalanceRechargeSwitch";
+        public const string ShowServicePackage = "servicePackage";
+
+        /// <summary>
+        /// 显示优惠券按钮
+        /// </summary>
+        public const string ShowCoupon = "showCoupon";
+
+        /// <summary>
+        /// 显示拼团按钮
+        /// </summary>
+        public const string ShowPinTuan = "showPinTuan";
+
+        /// <summary>
+        /// 显示秒杀按钮
+        /// </summary>
+        public const string ShowSeckill = "showSeckill";
+
+        /// <summary>
+        /// 显示团购按钮
+        /// </summary>
+        public const string ShowGroupBuying = "showGroupBuying";
+
+        /// <summary>
+        /// 显示接龙按钮
+        /// </summary>
+        public const string ShowSolitaire = "showSolitaire";
+
+        /// <summary>
+        /// 显示签到按钮
+        /// </summary>
+        public const string ShowCalendar = "showCalendar";
+
 
         //第三方接口============================================================================
         /// <summary>

CoreCms.Net.Configuration/SystemSettingDictionary.cs

@@ -45,15 +45,28 @@ namespace CoreCms.Net.Configuration
             di.Add(SystemSettingConstVars.PrivacyPolicyId, new DictionaryKeyValues() { sKey = "隐私政策", sValue = "4" });
             di.Add(SystemSettingConstVars.PrivacyPolicy, new DictionaryKeyValues() { sKey = "隐私政策", sValue = "" });
 
-            di.Add(SystemSettingConstVars.ShowStoresSwitch, new DictionaryKeyValues() { sKey = "显示门店列表", sValue = "2" });
+            //开关功能
             di.Add(SystemSettingConstVars.ShowStoreBalanceRechargeSwitch, new DictionaryKeyValues() { sKey = "显示充值功能", sValue = "2" });
 
+            di.Add(SystemSettingConstVars.ShowVas, new DictionaryKeyValues() { sKey = "显示增值服务板块", sValue = "2" });
+            di.Add(SystemSettingConstVars.ShowStoresSwitch, new DictionaryKeyValues() { sKey = "显示门店列表", sValue = "2" });
+            di.Add(SystemSettingConstVars.ShowServicePackage, new DictionaryKeyValues() { sKey = "显示服务商品按钮", sValue = "2" });
+            di.Add(SystemSettingConstVars.ShowCoupon, new DictionaryKeyValues() { sKey = "显示优惠券按钮", sValue = "2" });
+            di.Add(SystemSettingConstVars.ShowPinTuan, new DictionaryKeyValues() { sKey = "显示拼团按钮", sValue = "2" });
+            di.Add(SystemSettingConstVars.ShowSeckill, new DictionaryKeyValues() { sKey = "显示秒杀按钮", sValue = "2" });
+            di.Add(SystemSettingConstVars.ShowGroupBuying, new DictionaryKeyValues() { sKey = "显示团购按钮", sValue = "2" });
+            di.Add(SystemSettingConstVars.ShowSolitaire, new DictionaryKeyValues() { sKey = "显示接龙按钮", sValue = "2" });
+            di.Add(SystemSettingConstVars.ShowCalendar, new DictionaryKeyValues() { sKey = "显示签到按钮", sValue = "2" });
+
+
             //搜索发现关键字
             di.Add(SystemSettingConstVars.RecommendKeys, new DictionaryKeyValues() { sKey = "搜索发现关键词", sValue = "核心,内容,管理,系统" });
+
             //分享设置
             di.Add(SystemSettingConstVars.ShareImage, new DictionaryKeyValues() { sKey = "分享图片", sValue = "" });
             di.Add(SystemSettingConstVars.ShareTitle, new DictionaryKeyValues() { sKey = "分享标题", sValue = "优质好店邀您共享" });
             di.Add(SystemSettingConstVars.ShareDesc, new DictionaryKeyValues() { sKey = "分享描述", sValue = "" });
+
             //会员设置
             di.Add(SystemSettingConstVars.ShopMobile, new DictionaryKeyValues() { sKey = "商家手机号", sValue = "" });
             //1绑定，2不绑定-第三方的登陆的时候，是否需要绑定手机号码，强烈建议用户开启，除非只在微信小程序内使用
@@ -75,8 +88,6 @@ namespace CoreCms.Net.Configuration
 
 
             di.Add(SystemSettingConstVars.StoreOrderAutomaticDelivery, new DictionaryKeyValues() { sKey = "门店自提自动发货", sValue = "2" });
-
-
             di.Add(SystemSettingConstVars.CommissionChannel, new DictionaryKeyValues() { sKey = "佣金计算通道", sValue = "1" });
 
             //分销功能
@@ -205,7 +216,6 @@ namespace CoreCms.Net.Configuration
 
             di.Add(SystemSettingConstVars.FilesStorageAliYunEndpoint, new DictionaryKeyValues() { sKey = "阿里云节点", sValue = "https://oss-cn-shenzhen.aliyuncs.com" });
             di.Add(SystemSettingConstVars.FilesStorageAliYunBucketName, new DictionaryKeyValues() { sKey = "阿里云桶名称", sValue = "CoreShop" });
-
             di.Add(SystemSettingConstVars.FilesStorageQiNiuBucketName, new DictionaryKeyValues() { sKey = "七牛云桶名称", sValue = "CoreShop" });
 
             //短信发送内容模板

CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue

@@ -170,7 +170,7 @@
             </view>
 
             <!--增值业务-->
-            <view class="coreshop-padding-top-10 coreshop-padding-left-10 coreshop-padding-right-10 coreshop-padding-bottom-30 coreshop-bg-white coreshop-margin-top-15 coreshop-user-info-tools-box">
+            <view class="coreshop-padding-top-10 coreshop-padding-left-10 coreshop-padding-right-10 coreshop-padding-bottom-30 coreshop-bg-white coreshop-margin-top-15 coreshop-user-info-tools-box" v-if="showVas">
                 <view class="coreshop-padding-10 tools-view">
                     <view class="coreshop-text-black coreshop-text-bold coreshop-font-lg tools-title">增值业务</view>
                 </view>
@@ -280,12 +280,12 @@
                         router: '/pages/member/invoice/index',
                         showItem: true
                     },
-                    myServices: {
+                    //myServices: {
-                        name: '我的服务卡',
+                    //    name: '我的服务卡',
-                        icon: 'bell',
+                    //    icon: 'bell',
-                        router: '/pages/member/serviceOrder/index/index',
+                    //    router: '/pages/member/serviceOrder/index/index',
-                        showItem: true
+                    //    showItem: true
-                    },
+                    //},
                     myIntegral: {
                         name: '我的' + this.$store.state.config.pointShowName,
                         icon: 'integral',
@@ -311,6 +311,7 @@
                         showItem: true
                     },
                 },
+                showVas: false,
                 vas: {
                     storeMap: {
                         name: '门店列表',
@@ -322,43 +323,43 @@
                         name: '服务商品',
                         icon: 'list-dot',
                         router: '/pages/serviceGoods/index/index',
-                        showItem: true
+                        showItem: false
                     },
                     coupons: {
                         name: '优惠券',
                         icon: 'red-packet',
                         router: '/pages/coupon/coupon',
-                        showItem: true
+                        showItem: false
                     },
                     pinTuan: {
                         name: '拼团',
                         icon: 'grid',
                         router: '/pages/activity/pinTuan/list/list',
-                        showItem: true
+                        showItem: false
                     },
                     seckill: {
                         name: '秒杀',
                         icon: 'clock',
                         router: '/pages/activity/seckill/list/list',
-                        showItem: true
+                        showItem: false
                     },
                     groupBuying: {
                         name: '团购',
                         icon: 'trash',
                         router: '/pages/activity/groupBuying/list/list',
-                        showItem: true
+                        showItem: false
                     },
                     solitaire: {
                         name: '接龙',
                         icon: 'bag',
                         router: '/pages/activity/solitaire/list/list',
-                        showItem: true
+                        showItem: false
                     },
                     calendar: {
                         name: '签到',
                         icon: 'calendar',
                         router: '/pages/activity/checkIn/checkIn/checkIn',
-                        showItem: true
+                        showItem: false
                     },
                 },
                 other: {
@@ -473,33 +474,33 @@
                 var _this = this
                 //判断是开启分销还是原始推广
                 this.config = this.$store.state.config;
-                if (this.config.openDistribution == 2) {
+                //分销中心
-                    //屏蔽分销按钮
+                _this.isDistribution = this.config.openDistribution == 1;
-                    _this.isDistribution = false
+                //代理中心
-                } else if (this.config.openDistribution == 1) {
+                _this.isAgent = this.config.isOpenAgent == 1 && this.config.isShowAgentPortal == 1;
-                    _this.isDistribution = true
+                //邀请好友
-                }
+                _this.other.invite.showItem = this.config.showInviter == 1;
-                if (this.config.isOpenAgent == 1 && this.config.isShowAgentPortal == 1) {
+                //显示营销功能
-                    _this.isAgent = true
+                _this.showVas = this.config.showVas == 1;
-                } else if (this.config.openDistribution == 1) {
+                //门店展示列表
-                    //屏蔽代理中心入库
+                _this.vas.storeMap.showItem = _this.config.showStoresSwitch == 1;
-                    _this.isAgent = false
+                //服务商品
-                }
+                _this.vas.servicePackage.showItem = _this.config.showServicePackage == 1;
-                if (this.config.showInviter == 1) {
+                //优惠券
-                    //不显示-邀请好友
+                _this.vas.coupons.showItem = _this.config.showCoupon == 1;
-                    _this.other.invite.showItem = true;
+                //拼团
-                } else if (this.config.showInviter == 2) {
+                _this.vas.pinTuan.showItem = _this.config.showPinTuan == 1;
-                    //显示-邀请好友
+                //秒杀
-                    _this.other.invite.showItem = false;
+                _this.vas.seckill.showItem = _this.config.showSeckill == 1;
-                }
+                //团购
-                if (this.config.showStoresSwitch == 1) {
+                _this.vas.groupBuying.showItem = _this.config.showGroupBuying == 1;
-                    //不显示-门店展示列表
+                //接龙
-                    _this.vas.storeMap.showItem = true;
+                _this.vas.solitaire.showItem = _this.config.showSolitaire == 1;
-                } else if (this.config.showStoresSwitch == 2) {
+                //签到
-                    //显示-门店展示列表
+                _this.vas.calendar.showItem = _this.config.showCalendar == 1;
-                    _this.vas.storeMap.showItem = false;
+
-                }
+                //获取用户信息
-                this.getUserInfo();
+                _this.getUserInfo();
             },
             getUserInfo() {
                 var _this = this

CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html

@@ -46,11 +46,12 @@
                             <div class="layui-tab-content">
                                 <div class="layui-tab-item layui-show">
 
-                                    <blockquote class="layui-elem-quote" style="padding-top: 20px;line-height: 30px;">
+
-                                        1、如果开启【显示门店列表】模块，则微信小程序审核如果发现可能会失败，并提示“<text style="color: #ff0000;">【小程序涉及多个商家提供商品的在线交易及配送，请补充选择：电商平台-电商平台类目。】</text>”，可先关闭，审核后再开启。<br />
-                                        2、如果开启【显示充值】模块，则微信小程序审核如果发现可能会失败，并提示“<text style="color: #ff0000;">【小程序页面内容涉及账户充值服务，需补充商家自营-预付卡销售-发行方类目。】</text>”，可先关闭，审核后再开启。<br />
-                                    </blockquote>
                                     <div class="layui-form coreshop-form">
+                                        <blockquote class="layui-elem-quote" style="padding-top: 20px;line-height: 30px;">
+                                            1、如果开启【显示门店列表】模块，则微信小程序审核如果发现可能会失败，并提示“<text style="color: #ff0000;">【小程序涉及多个商家提供商品的在线交易及配送，请补充选择：电商平台-电商平台类目。】</text>”，可先关闭，审核后再开启。<br />
+                                            2、如果开启【显示充值】模块，则微信小程序审核如果发现可能会失败，并提示“<text style="color: #ff0000;">【小程序页面内容涉及账户充值服务，需补充商家自营-预付卡销售-发行方类目。】</text>”，可先关闭，审核后再开启。<br />
+                                        </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">
@@ -65,6 +66,66 @@
                                                 <input type="radio" lay-filter="showStoreBalanceRechargeSwitch" name="showStoreBalanceRechargeSwitch" value="2" title="不开启" {{d.data.configs['showStoreBalanceRechargeSwitch']['sValue']==="2" ? 'checked':''}}>
                                             </div>
                                         </div>
+
+                                        <blockquote class="layui-elem-quote" style="padding-top: 20px;line-height: 30px;">
+                                            控制个人中心面板是否显示以下组件按钮
+                                        </blockquote>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">{{d.data.configs['showVas']['sKey']}}：</label>
+                                            <div class="layui-input-inline layui-inline-7">
+                                                <input type="radio" lay-filter="showVas" name="showVas" value="1" title="开启" {{d.data.configs['showVas']['sValue']==="1" ? 'checked':''}}>
+                                                <input type="radio" lay-filter="showVas" name="showVas" value="2" title="不开启" {{d.data.configs['showVas']['sValue']==="2" ? 'checked':''}}>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">{{d.data.configs['servicePackage']['sKey']}}：</label>
+                                            <div class="layui-input-inline layui-inline-7">
+                                                <input type="radio" lay-filter="servicePackage" name="servicePackage" value="1" title="开启" {{d.data.configs['servicePackage']['sValue']==="1" ? 'checked':''}}>
+                                                <input type="radio" lay-filter="servicePackage" name="servicePackage" value="2" title="不开启" {{d.data.configs['servicePackage']['sValue']==="2" ? 'checked':''}}>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">{{d.data.configs['showCoupon']['sKey']}}：</label>
+                                            <div class="layui-input-inline layui-inline-7">
+                                                <input type="radio" lay-filter="showCoupon" name="showCoupon" value="1" title="开启" {{d.data.configs['showCoupon']['sValue']==="1" ? 'checked':''}}>
+                                                <input type="radio" lay-filter="showCoupon" name="showCoupon" value="2" title="不开启" {{d.data.configs['showCoupon']['sValue']==="2" ? 'checked':''}}>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">{{d.data.configs['showPinTuan']['sKey']}}：</label>
+                                            <div class="layui-input-inline layui-inline-7">
+                                                <input type="radio" lay-filter="showPinTuan" name="showPinTuan" value="1" title="开启" {{d.data.configs['showPinTuan']['sValue']==="1" ? 'checked':''}}>
+                                                <input type="radio" lay-filter="showPinTuan" name="showPinTuan" value="2" title="不开启" {{d.data.configs['showPinTuan']['sValue']==="2" ? 'checked':''}}>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">{{d.data.configs['showSeckill']['sKey']}}：</label>
+                                            <div class="layui-input-inline layui-inline-7">
+                                                <input type="radio" lay-filter="showSeckill" name="showSeckill" value="1" title="开启" {{d.data.configs['showSeckill']['sValue']==="1" ? 'checked':''}}>
+                                                <input type="radio" lay-filter="showSeckill" name="showSeckill" value="2" title="不开启" {{d.data.configs['showSeckill']['sValue']==="2" ? 'checked':''}}>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">{{d.data.configs['showGroupBuying']['sKey']}}：</label>
+                                            <div class="layui-input-inline layui-inline-7">
+                                                <input type="radio" lay-filter="showGroupBuying" name="showGroupBuying" value="1" title="开启" {{d.data.configs['showGroupBuying']['sValue']==="1" ? 'checked':''}}>
+                                                <input type="radio" lay-filter="showGroupBuying" name="showGroupBuying" value="2" title="不开启" {{d.data.configs['showGroupBuying']['sValue']==="2" ? 'checked':''}}>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">{{d.data.configs['showSolitaire']['sKey']}}：</label>
+                                            <div class="layui-input-inline layui-inline-7">
+                                                <input type="radio" lay-filter="showSolitaire" name="showSolitaire" value="1" title="开启" {{d.data.configs['showSolitaire']['sValue']==="1" ? 'checked':''}}>
+                                                <input type="radio" lay-filter="showSolitaire" name="showSolitaire" value="2" title="不开启" {{d.data.configs['showSolitaire']['sValue']==="2" ? 'checked':''}}>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">{{d.data.configs['showCalendar']['sKey']}}：</label>
+                                            <div class="layui-input-inline layui-inline-7">
+                                                <input type="radio" lay-filter="showCalendar" name="showCalendar" value="1" title="开启" {{d.data.configs['showCalendar']['sValue']==="1" ? 'checked':''}}>
+                                                <input type="radio" lay-filter="showCalendar" name="showCalendar" value="2" title="不开启" {{d.data.configs['showCalendar']['sValue']==="2" ? 'checked':''}}>
+                                            </div>
+                                        </div>
                                         <div class="layui-form-item">
                                             <label class="layui-form-label">&nbsp;</label>
                                             <div class="layui-input-block">
@@ -633,7 +694,7 @@
                                         <div class="layui-form-item">
                                             <label class="layui-form-label">{{d.data.configs['inviterUserIntegral']['sKey']}}：</label>
                                             <div class="layui-input-inline layui-inline-2">
-                                                <input type="text" name="inviterUserIntegral" value="{{d.data.configs['inviterUserIntegral']['sValue']}}" lay-verify="title|money" autocomplete="off"  class="layui-input">
+                                                <input type="text" name="inviterUserIntegral" value="{{d.data.configs['inviterUserIntegral']['sValue']}}" lay-verify="title|money" autocomplete="off" class="layui-input">
                                             </div>
                                         </div>
                                         <div class="layui-form-item">

CoreCms.Net.Web.WebApi/Controllers/CommonController.cs

@@ -98,9 +98,18 @@ namespace CoreCms.Net.Web.WebApi.Controllers
             var shopName = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShopName);  //店铺名称
             var shopBeiAn = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShopBeiAn);  //店铺备案
             var shopDesc = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShopDesc);  //店铺描述
-            var showStoresSwitch = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowStoresSwitch).ObjectToInt(2);   //显示门店列表
             var showStoreBalanceRechargeSwitch = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowStoreBalanceRechargeSwitch).ObjectToInt(2); //显示充值功能
 
+            var showStoresSwitch = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowStoresSwitch).ObjectToInt(2);   //显示门店列表
+            var showVas = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowVas).ObjectToInt(2);   //显示增值服务板块
+            var showServicePackage = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowServicePackage).ObjectToInt(2);   //显示服务商品按钮
+            var showCoupon = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowCoupon).ObjectToInt(2);   //显示优惠券按钮
+            var showPinTuan = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowPinTuan).ObjectToInt(2);   //显示拼团按钮
+            var showSeckill = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowSeckill).ObjectToInt(2);   //显示秒杀按钮
+            var showGroupBuying = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowGroupBuying).ObjectToInt(2);   //显示团购按钮
+            var showSolitaire = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowSolitaire).ObjectToInt(2);   //显示接龙按钮
+            var showCalendar = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowCalendar).ObjectToInt(2);   //显示签到按钮
+
             var imageMax = 5; //前端上传图片最多几张
             var storeSwitch = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.StoreSwitch).ObjectToInt();    //开启门店自提状态
             var cateStyle = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.CateStyle).ObjectToInt();    //分类样式
@@ -222,7 +231,15 @@ namespace CoreCms.Net.Web.WebApi.Controllers
                 agentAgreement,
                 agentStore,
                 qqMapKey,
-                checkInIsOpen
+                checkInIsOpen,
+                showVas,
+                showServicePackage,
+                showCoupon,
+                showPinTuan,
+                showSeckill,
+                showGroupBuying,
+                showSolitaire,
+                showCalendar
             };
             jm.data = model;
             return jm;