diff --git a/components/my-components/my-marketing-mask.vue b/components/my-components/my-marketing-mask.vue new file mode 100644 index 0000000..d290956 --- /dev/null +++ b/components/my-components/my-marketing-mask.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/pageBwc/index/index.vue b/pageBwc/index/index.vue index d61f3f4..a039d37 100644 --- a/pageBwc/index/index.vue +++ b/pageBwc/index/index.vue @@ -1,53 +1,37 @@ \ No newline at end of file + diff --git a/pageMarket/consumeCashback/components/config.vue b/pageMarket/consumeCashback/components/config.vue index 25f6837..672a883 100644 --- a/pageMarket/consumeCashback/components/config.vue +++ b/pageMarket/consumeCashback/components/config.vue @@ -1,333 +1,293 @@ - - - - \ No newline at end of file + diff --git a/pageMarket/consumeCashback/index.vue b/pageMarket/consumeCashback/index.vue index 0a7b6b9..d853a99 100644 --- a/pageMarket/consumeCashback/index.vue +++ b/pageMarket/consumeCashback/index.vue @@ -5,29 +5,27 @@ - {{selShop.shopName || "全部门店"}} + {{ selShop.shopName || '全部门店' }} - + - + - 关联订单:{{ item.orderNo }} + 关联订单:{{ item.orderNo }} - {{ item.shopName }} + {{ item.shopName }} {{ item.createTime }} - ID:{{ item.id }} + ID:{{ item.id }} @@ -40,16 +38,15 @@ 返现金额 - {{ item.cashbackAmount ||0 }} + {{ item.cashbackAmount || 0 }} - + 支付金额 {{ item.amount || 0 }} - - + @@ -57,159 +54,157 @@ - - + + + \ No newline at end of file +.delete-btn { + background: #ffe7e6; + color: #ff1c1c; +} + diff --git a/pageMarket/couponExchangeCode/index.vue b/pageMarket/couponExchangeCode/index.vue index a8e52dd..b769bcf 100644 --- a/pageMarket/couponExchangeCode/index.vue +++ b/pageMarket/couponExchangeCode/index.vue @@ -1,359 +1,325 @@ diff --git a/pageMarket/rechargeExchangeCode/index.vue b/pageMarket/rechargeExchangeCode/index.vue index 5179f15..97a7cec 100644 --- a/pageMarket/rechargeExchangeCode/index.vue +++ b/pageMarket/rechargeExchangeCode/index.vue @@ -1,372 +1,335 @@ diff --git a/pageRecharge/index.vue b/pageRecharge/index.vue index 25c233d..7ff478a 100644 --- a/pageRecharge/index.vue +++ b/pageRecharge/index.vue @@ -5,6 +5,17 @@ + + + + 是否开启 + + + + + + + +