diff --git a/src/routers/index.js b/src/routers/index.js index 7023c88..5add8a0 100644 --- a/src/routers/index.js +++ b/src/routers/index.js @@ -9,6 +9,7 @@ import marketingClose from "@/views/navigation/accounts/marketingClose" import memberCancel from "@/views/navigation/memberCancel" import memberGathering from "@/views/navigation/consume/memberGathering" import memberIntegral from "@/views/navigation/integral/memberIntegral" +import AddEnd from "@/views/navigation/integral/AddEnd" import memberTicket from "@/views/navigation/ticket/memberTicket" import ticketDetails from "@/views/navigation/ticket/ticketDetails" import chPhone from "@/views/navigation/ticket/chPhone" @@ -124,13 +125,19 @@ const routes = [ }, { - path: '/memberIntegral',//会员积分integralParticulars + path: '/memberIntegral',//会员积分 name: 'memberIntegral', component:memberIntegral }, { - path: '/integralParticulars',//会员积分 - 查询详情页 + path: '/AddEnd',//会员积分 添加完成 + name: 'AddEnd', + component:AddEnd + + }, + { + path: '/integralParticulars',//会员积分 - 查询详情页 name: 'integralParticulars', component:integralParticulars diff --git a/src/services/apiUrl.js b/src/services/apiUrl.js index 9549af6..6e1472f 100644 --- a/src/services/apiUrl.js +++ b/src/services/apiUrl.js @@ -62,4 +62,16 @@ export const apiUrl = { * 获取营销结算汇总 */ getSubsidySummary:"/api/subsidy/summary", + /** + * 根据手机号查询C端会员信息 + */ + findByPhone:"/api/credit/findByPhone", + /** + * 获取消费金额对应积分 + */ + getCreditNum:"/api/credit/findByMerchantIdAndSpend", + /** + * 积分新增 + */ + addCredit:"/api/credit/add", } diff --git a/src/views/navigation/accounts/marketingClose.vue b/src/views/navigation/accounts/marketingClose.vue index 19dab43..738fd7f 100644 --- a/src/views/navigation/accounts/marketingClose.vue +++ b/src/views/navigation/accounts/marketingClose.vue @@ -26,16 +26,22 @@
-
{{item.sourceStr+" "+item.typeStr}}
+
+ {{ item.sourceStr + " " + item.typeStr }} +
- {{`应收:${item.subsidyStr}`}} + {{ `应收:${item.subsidyStr}` }}
-
{{item.statusStr}}
-
{{item.statusStr}}
+
+ {{ item.statusStr }} +
+
+ {{ item.statusStr }} +
-
+
{{ beginDateText }}
@@ -45,7 +51,7 @@
查询
-
+
-
+
-
+
- 未结算 + 补贴
- 已结算 + 卡消费
- 未结算 + 券核销
- 已结算 + 砍价核销
- 未结算 + 拼团核销
- 已结算 + 收银分账
@@ -116,7 +128,7 @@
总计应收
-
{{`¥${aggregate/100}`}}
+
{{ `¥${aggregate / 100}` }}
{ const { code, data, message } = res; if (code == 200) { - if(data.list.length==0){ - this.noData = true + if (data.list.length == 0) { + this.noData = true; } - data.list.map(item=>{ - item.sourceStr = this.auditWayOptions.filter(e => e.value == item.source).length > 0 ? this.auditWayOptions.filter(e => e.value == item.source)[0].name : ''; - item.typeStr = this.billtypes.filter(e => e.id == item.type).length > 0 ? this.billtypes.filter(e => e.id == item.type)[0].name : ''; - item.statusStr = item.status===0?'未结算' : "已结算"; - }) + data.list.map((item) => { + item.sourceStr = + this.auditWayOptions.filter((e) => e.value == item.source) + .length > 0 + ? this.auditWayOptions.filter( + (e) => e.value == item.source + )[0].name + : ""; + item.typeStr = + this.billtypes.filter((e) => e.id == item.type).length > 0 + ? this.billtypes.filter((e) => e.id == item.type)[0].name + : ""; + item.statusStr = item.status === 0 ? "未结算" : "已结算"; + }); this.list = data.list; + this.itiLsitData() } else { Toast(message); + this.itiLsitData() } }) .catch((res) => { Toast(res); + this.itiLsitData() }); }, getTotal() { @@ -332,9 +396,9 @@ export default { .getSubsidySummary({ method: "get", params: { - startdate: this.beginDateText+' 00:00:00', - enddate:this.endDateText+' 23:59:59', - source: "", + startdate: this.beginDateText + " 00:00:00", + enddate: this.endDateText + " 23:59:59", + source: this.source, type: this.type, status: "", }, @@ -351,14 +415,14 @@ export default { Toast(res); }); }, - search(){ - this.showTiem = false + search() { + this.showTiem = false; this.getLsit(); - this.getTotal(); + this.getTotal(); }, }, mounted() { - this.search() + this.search(); }, }; diff --git a/src/views/navigation/consume/current.vue b/src/views/navigation/consume/current.vue index bb3e980..b1cf45a 100644 --- a/src/views/navigation/consume/current.vue +++ b/src/views/navigation/consume/current.vue @@ -69,7 +69,7 @@ import moment from "moment"; import Vue from "vue"; import { Calendar,Toast } from "vant"; import{ mapState} from "vuex"; -Vue.use(Calendar).use(Toast); +Vue.use(Calendar,Toast); export default { data() { return { diff --git a/src/views/navigation/integral/AddEnd.vue b/src/views/navigation/integral/AddEnd.vue new file mode 100644 index 0000000..784a7be --- /dev/null +++ b/src/views/navigation/integral/AddEnd.vue @@ -0,0 +1,70 @@ + + + + \ No newline at end of file diff --git a/src/views/navigation/integral/integralParticulars.vue b/src/views/navigation/integral/integralParticulars.vue index 0f691d8..62bf408 100644 --- a/src/views/navigation/integral/integralParticulars.vue +++ b/src/views/navigation/integral/integralParticulars.vue @@ -9,6 +9,9 @@
@@ -116,10 +208,9 @@ export default { } .integral { width: 95%; - margin: 1rem 0 1rem 0; + margin: 1rem 0 1rem 0; text-align: right; color: red; - } .integral::before { content: "本次积分"; diff --git a/src/views/navigation/ticket/chPhone.vue b/src/views/navigation/ticket/chPhone.vue index f7a0ef0..3ae933f 100644 --- a/src/views/navigation/ticket/chPhone.vue +++ b/src/views/navigation/ticket/chPhone.vue @@ -9,6 +9,9 @@