From 1ca80e97d83d2a0c5d54173d71acbfb3528fa2b4 Mon Sep 17 00:00:00 2001
From: JianWeie <jianweie@live.com>
Date: Wed, 28 Sep 2022 13:09:39 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E3=80=90=E6=88=91=E7=9A=84=E5=8F=91=E7=A5=A8=E3=80=91=E7=9A=84?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=EF=BC=8C=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=8F=AF=E5=BC=80=E5=90=AF=E6=88=96=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CoreShop/pages/index/member/member.vue     | 17 ++++++++++-------
 .../wwwroot/views/shop/setting/index.html      | 18 +++++++++---------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue b/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue
index 6832add5..416e03e6 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue
@@ -278,14 +278,14 @@
                         name: '我的发票',
                         icon: 'calendar',
                         router: '/pages/member/invoice/index',
-                        showItem: true
+                        showItem: false
+                    },
+                    myServices: {
+                        name: '我的服务卡',
+                        icon: 'bell',
+                        router: '/pages/member/serviceOrder/index/index',
+                        showItem: false
                     },
-                    //myServices: {
-                    //    name: '我的服务卡',
-                    //    icon: 'bell',
-                    //    router: '/pages/member/serviceOrder/index/index',
-                    //    showItem: true
-                    //},
                     myIntegral: {
                         name: '我的' + this.$store.state.config.pointShowName,
                         icon: 'integral',
@@ -486,6 +486,7 @@
                 _this.vas.storeMap.showItem = _this.config.showStoresSwitch == 1;
                 //服务商品
                 _this.vas.servicePackage.showItem = _this.config.showServicePackage == 1;
+                _this.utilityMenus.myServices.showItem = _this.config.showServicePackage == 1;
                 //优惠券
                 _this.vas.coupons.showItem = _this.config.showCoupon == 1;
                 //拼团
@@ -498,6 +499,8 @@
                 _this.vas.solitaire.showItem = _this.config.showSolitaire == 1;
                 //签到
                 _this.vas.calendar.showItem = _this.config.showCalendar == 1;
+                //显示我的发票
+                _this.utilityMenus.myInvoice.showItem = _this.config.invoiceSwitch == 1;
 
                 //获取用户信息
                 _this.getUserInfo();
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 0902d137..e60703af 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html
@@ -80,7 +80,14 @@
                                         <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['invoiceSwitch']['sKey']}}：</label>
+                                            <div class="layui-input-inline layui-inline-7">
+                                                <input type="radio" lay-filter="invoiceSwitch" name="invoiceSwitch" value="1" title="开启" {{d.data.configs['invoiceSwitch']['sValue']==="1" ? 'checked':''}}>
+                                                <input type="radio" lay-filter="invoiceSwitch" name="invoiceSwitch" value="2" title="不开启" {{d.data.configs['invoiceSwitch']['sValue']==="2" ? 'checked':''}}>
+                                            </div>
+                                            <div class="layui-form-mid layui-word-aux">关闭后除了不在个人中心显示【我的发票】，下单也不会显示发票模块。</div>
+                                        </div>
                                         <div class="layui-form-item">
                                             <label class="layui-form-label">{{d.data.configs['showVas']['sKey']}}：</label>
                                             <div class="layui-input-inline layui-inline-7">
@@ -223,14 +230,6 @@
                                             </div>
                                         </div>
 
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label">{{d.data.configs['invoiceSwitch']['sKey']}}：</label>
-                                            <div class="layui-input-inline layui-inline-7">
-                                                <input type="radio" lay-filter="invoiceSwitch" name="invoiceSwitch" value="1" title="开启" {{d.data.configs['invoiceSwitch']['sValue']==="1" ? 'checked':''}}>
-                                                <input type="radio" lay-filter="invoiceSwitch" name="invoiceSwitch" value="2" title="不开启" {{d.data.configs['invoiceSwitch']['sValue']==="2" ? 'checked':''}}>
-                                            </div>
-                                        </div>
-
                                         <div class="layui-form-item" style="margin-top: 20px;">
                                             <label class="layui-form-label">{{d.data.configs['recommendKeys']['sKey']}}：</label>
                                             <div class="layui-input-inline layui-inline-5">
@@ -391,6 +390,7 @@
                                             <div class="layui-form-mid layui-word-aux">订单催付款时间,单位为【分钟】，请设置10分钟以上时间，因为催付款任务5分钟执行一次</div>
                                         </div>
                                         <div class="layui-form-item">
+                                            rm
                                             <label class="layui-form-label">{{d.data.configs['reshipName']['sKey']}}：</label>
                                             <div class="layui-input-inline layui-inline-3">
                                                 <input type="text" name="reshipName" value="{{d.data.configs['reshipName']['sValue']}}" lay-verify="title" autocomplete="off" placeholder="收货人名称" class="layui-input">