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

# Conflicts:
#	src/views/goods/coupon/coupon.vue

src/views/goods/coupon/coupon.vue

@@ -333,14 +333,14 @@
                     <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) || $getButtonLimit($buttonCode.couponDetail) || $getButtonLimit($buttonCode.couponConversion))"
+                    v-if="(scope.row.isDifferentialPricing || scope.row.canEdit)&& ($getButtonLimit($buttonCode.couponTieredPricing)|| $getButtonLimit($buttonCode.couponDelete) || $getButtonLimit($buttonCode.couponConversion))"
                     style="margin-left:20px;"
                     @command="command => handleCommand(command, scope.row, scope.$index)"
                     placement="bottom-start"
                   >
                     <span class="el-dropdown-link" style="color:#1890ff;cursor: pointer;"> <i class="el-icon-more" /> </span>
                     <el-dropdown-menu slot="dropdown" style="width:110px;">
-                      <el-dropdown-item command="0" v-if="$getButtonLimit($buttonCode.couponDetail)" :limit-code="$buttonCode.couponDetail">
+                      <el-dropdown-item command="0">
                         查看详情
                       </el-dropdown-item>
                       <el-dropdown-item command="1" v-if="$getButtonLimit($buttonCode.couponConversion)" :limit-code="$buttonCode.couponConversion">

src/views/goods/gift/gift.vue

@@ -361,7 +361,7 @@
                   >
                     <span class="el-dropdown-link" style="color:#1890ff;cursor: pointer;"> <i class="el-icon-more" /> </span>
                     <el-dropdown-menu slot="dropdown" style="width:110px;">
-                      <el-dropdown-item command="0" v-if="$getButtonLimit($buttonCode.giftDetail)" :limit-code="$buttonCode.giftDetail">
+                      <el-dropdown-item command="0">
                         查看详情
                       </el-dropdown-item>
                       <el-dropdown-item command="1" v-if="$getButtonLimit($buttonCode.giftConversion)" :limit-code="$buttonCode.giftConversion">