Merge branch 'feature/按钮权限' into dev

src/components/giftLadderPrice.vue

@@ -131,7 +131,7 @@ export default {
             }
             this.list3 = res.data.result.gradeProSkus ? res.data.result.gradeProSkus : [];
             this.list3.forEach(item => {
-              item.skuList.forEach(it => {
+              item.skuList && item.skuList.forEach(it => {
                 it.giftPropValues = JSON.parse(it.giftPropValuesJson);
               });
             });

src/views/goods/coupon/coupon.vue

@@ -333,7 +333,7 @@
                     <el-button type="text" v-if="scope.row.canEdit">删除</el-button>
                   </dm-delete> -->
                   <el-dropdown
-                    v-if="scope.row.isDifferentialPricing || scope.row.canEdit || $getButtonLimit($buttonCode.couponTieredPricing)|| $getButtonLimit($buttonCode.couponDelete)"
+                    v-if="(scope.row.isDifferentialPricing || scope.row.canEdit)&& ($getButtonLimit($buttonCode.couponTieredPricing)|| $getButtonLimit($buttonCode.couponDelete))"
                     style="margin-left:20px;"
                     @command="command => handleCommand(command, scope.row, scope.$index)"
                     placement="bottom-start"

src/views/goods/gift/gift.vue

@@ -354,7 +354,7 @@
                     编辑
                   </el-button>
                   <el-dropdown
-                    v-if="(scope.row.changeType === '5' && scope.row.canEdit) || scope.row.isDifferentialPricing || scope.row.canEdit ||$getButtonLimit($buttonCode.giftCouponCode) || $getButtonLimit($buttonCode.giftTieredPricing) || $getButtonLimit($buttonCode.giftDelete)"
+                    v-if="((scope.row.changeType === '5' && scope.row.canEdit) || scope.row.isDifferentialPricing || scope.row.canEdit) && ($getButtonLimit($buttonCode.giftCouponCode) || $getButtonLimit($buttonCode.giftTieredPricing) || $getButtonLimit($buttonCode.giftDelete))"
                     style="margin-left:20px;"
                     @command="command => handleCommand(command, scope.row, scope.$index)"
                     placement="bottom-start"