Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/offer/special.vue

@@ -49,7 +49,7 @@
           prop="address"
           label="操作">
           <template v-slot="{row}">
-          <el-button size="mini" type="text" v-hasPermi="['ecw:offer:update']" @click="$router.push(`'/offer/discount?offerId=${row.offerId}&offerProdId=${row.offerProdId}`)">优惠申请</el-button>
+          <el-button size="mini" type="text" v-hasPermi="['ecw:offer:update']" @click="$router.push(`/offer/discount?offerId=${row.offerId}&offerProdId=${row.offerProdId}`)">优惠申请</el-button>
 <!--            <el-button size="mini" type="text" v-hasPermi="['ecw:offer:update']">佣金规则</el-button>-->
 <!--            <el-button size="mini" type="text" v-hasPermi="['ecw:offer:update']">管理折扣</el-button>-->
           </template>