From f45b115355cf88ded112d6067769b3feb8128892 Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Tue, 28 Dec 2021 19:54:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=BB=A1=E9=A2=9D=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E8=B5=A0=E9=80=81=E7=A7=AF=E5=88=86=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=A1=AB=E5=86=99=E7=A7=AF=E5=88=86=E3=80=82=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E8=A7=84=E6=A0=BC=E9=BB=98=E8=AE=A4=E9=A1=B9=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E9=80=80=E6=A0=BC=E5=88=A0=E9=99=A4=E3=80=82=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E8=8F=9C=E5=8D=95=E9=80=89=E6=8B=A9=E6=9F=90=E4=B8=80?=
 =?UTF-8?q?=E5=AD=90=E9=A1=B9=E8=8E=B7=E5=8F=96=E9=80=89=E6=8B=A9=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/sys/role-manage/roleManage.vue              | 4 +++-
 seller/src/views/goods/goods-seller/goodsOperationSec.vue     | 2 +-
 .../src/views/promotion/full-discount/full-discount-add.vue   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/manager/src/views/sys/role-manage/roleManage.vue b/manager/src/views/sys/role-manage/roleManage.vue
index 623b9c4e..2209e248 100644
--- a/manager/src/views/sys/role-manage/roleManage.vue
+++ b/manager/src/views/sys/role-manage/roleManage.vue
@@ -541,7 +541,9 @@ export default {
 
       permData.forEach((p) => {
         if (that.hasPerm(p, rolePerms) && p.status != -1) {
-          this.$set(p, "checked", true);
+          if (p.children && p.children.length === 0) {
+            this.$set(p, "checked", true);
+          }
         } else {
           this.$set(p, "checked", false);
         }
diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
index 70e0e9da..f7a8d0ca 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
@@ -1071,7 +1071,7 @@ export default {
       let pushData = [];
       //渲染头部
       this.skuInfo.forEach((sku) => {
-        !sku.name ? (sku.name = "规格名") : "";
+        // !sku.name ? (sku.name = "规格名") : "";
         //列名称
         let columnName = sku.name;
         pushData.push({
diff --git a/seller/src/views/promotion/full-discount/full-discount-add.vue b/seller/src/views/promotion/full-discount/full-discount-add.vue
index 27388d3d..f1067acf 100644
--- a/seller/src/views/promotion/full-discount/full-discount-add.vue
+++ b/seller/src/views/promotion/full-discount/full-discount-add.vue
@@ -145,7 +145,7 @@
                 }}</Option>
               </Select>
             </FormItem>
-            <FormItem v-if="form.pointGift" label="赠积分" prop="point">
+            <FormItem v-if="form.pointFlag" label="赠积分" prop="point">
               <InputNumber
                 :min="0"
                 :disabled="form.promotionStatus != 'NEW'"