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

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

src/router/index.js

@@ -50,6 +50,11 @@ const router = new Router({
           component: giftInfo,
         },
         {
+          path: '/giftDetail',
+          name: 'giftDetail',
+          component: giftInfo,
+        },
+        {
           path: '/coupon',
           name: 'coupon',
           component: coupon,
@@ -68,6 +73,11 @@ const router = new Router({
           component: couponInfo,
         },
         {
+          path: '/couponDetail',
+          name: 'couponDetail',
+          component: couponInfo,
+        },
+        {
           path: '/soldStatistics',
           name: 'soldStatistics',
           component: soldStatistics,

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.couponConversion))"
+                    v-if="(scope.row.isDifferentialPricing || scope.row.canEdit)&& ($getButtonLimit($buttonCode.couponTieredPricing)|| $getButtonLimit($buttonCode.couponDelete) || $getButtonLimit($buttonCode.couponDetail) || $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">
+                      <el-dropdown-item command="0" v-if="!$getButtonLimit($buttonCode.couponDetail)" :limit-code="$buttonCode.couponDetail">
                         查看详情
                       </el-dropdown-item>
                       <el-dropdown-item command="1" v-if="$getButtonLimit($buttonCode.couponConversion)" :limit-code="$buttonCode.couponConversion">
@@ -836,7 +836,7 @@ export default {
         sortColumn: this.sortColumn,
       };
       window.localStorage.setItem('couponListObj', JSON.stringify(this.couponListObj));
-      this.$router.push({ name: 'couponInfo', query: { giftId: item.integralMallProId, coupCardId: item.proReferId, canEdit: item.canEdit, isDetail: type === 'detail' ? 1 : 0 } });
+      this.$router.push({ name: type === 'detail' ? 'couponDetail' : 'couponInfo', query: { giftId: item.integralMallProId, coupCardId: item.proReferId, canEdit: item.canEdit, isDetail: type === 'detail' ? 1 : 0 } });
     },
     // 编辑序号
     editNumber (item) {

src/views/goods/gift/gift.vue

@@ -354,14 +354,14 @@
                     编辑
                   </el-button>
                   <el-dropdown
-                    v-if="((scope.row.changeType === '5' && scope.row.canEdit) || scope.row.isDifferentialPricing || scope.row.canEdit) && ($getButtonLimit($buttonCode.giftConversion) || $getButtonLimit($buttonCode.giftCouponCode) || $getButtonLimit($buttonCode.giftTieredPricing) || $getButtonLimit($buttonCode.giftDelete) || $getButtonLimit($buttonCode.giftDetail))"
+                    v-if="((scope.row.changeType === '5' && scope.row.canEdit) || scope.row.isDifferentialPricing || scope.row.canEdit) && ($getButtonLimit($buttonCode.giftConversion) || $getButtonLimit($buttonCode.giftCouponCode) || $getButtonLimit($buttonCode.giftTieredPricing) || $getButtonLimit($buttonCode.giftDetail) || $getButtonLimit($buttonCode.giftDelete))"
                     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">
+                      <el-dropdown-item command="0" v-if="$getButtonLimit($buttonCode.giftDetail)" :limit-code="$buttonCode.giftDetail">
                         查看详情
                       </el-dropdown-item>
                       <el-dropdown-item command="1" v-if="$getButtonLimit($buttonCode.giftConversion)" :limit-code="$buttonCode.giftConversion">
@@ -894,7 +894,7 @@ export default {
         sortColumn: this.sortColumn,
       };
       window.localStorage.setItem('giftListObj', JSON.stringify(this.giftListObj));
-      this.$router.push({ name: 'giftInfo', query: { type: item.giftType, giftId: item.integralMallProId, proReferId: item.proReferId, isDetail: type === 'detail' ? 1 : 0 } });
+      this.$router.push({ name: type === 'detail' ? 'giftDetail' : 'giftInfo', query: { type: item.giftType, giftId: item.integralMallProId, proReferId: item.proReferId, isDetail: type === 'detail' ? 1 : 0 } });
     },
     // 编辑序号
     editNumber (item) {