diff --git a/http/api/market/distributionFlow.js b/http/api/market/distributionFlow.js new file mode 100644 index 0000000..181ac2d --- /dev/null +++ b/http/api/market/distributionFlow.js @@ -0,0 +1,35 @@ +import http from '@/http/http.js' +const request = http.request +const urlType='market' + +export function distributionFlow(data) { + return request({ + url: `${urlType}/admin/distribution/distributionFlow`, + method: "GET", + data: { + ...data + } + }) +} + + +export function openFlow(data) { + return request({ + url: `${urlType}/admin/distribution/openFlow`, + method: "GET", + data: { + ...data + } + }) +} + + +export function flow(data) { + return request({ + url: `${urlType}/admin/distribution/flow`, + method: "GET", + data: { + ...data + } + }) +} diff --git a/pageDistributionFlow/charge.vue b/pageDistributionFlow/charge.vue new file mode 100644 index 0000000..a472cbd --- /dev/null +++ b/pageDistributionFlow/charge.vue @@ -0,0 +1,490 @@ + + + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index 4ef467a..7fa2055 100644 --- a/pages.json +++ b/pages.json @@ -98,7 +98,8 @@ "pageId": "PAGES_PAY", "style" : { - "navigationBarTitleText" : "支付" + "navigationBarTitleText" : "分销", + "navigationStyle" : "custom" } } ], @@ -629,7 +630,17 @@ "navigationBarTitleText": "消费返现" } } - + ] + }, + { + "root": "pageDistributionFlow", + "pages": [{ + "pageId": "PAGES_DISTRIBUTION_FLOW_CHARGE", + "path": "charge", + "style": { + "navigationBarTitleText": "分销" + } + } ] } diff --git a/pages/appliccation/marketing.vue b/pages/appliccation/marketing.vue index 1a3365d..8c34b50 100644 --- a/pages/appliccation/marketing.vue +++ b/pages/appliccation/marketing.vue @@ -78,6 +78,12 @@ icon: '/static/indexImg/icon-order.svg', pageUrl: 'PAGES_MARKET_CONSUME_CASHBACK' }, + { + title: '分销', + icon: '/static/indexImg/icon-order.svg', + pageUrl: 'PAGES_PAY' + }, + ]; console.log(menusStore.adminPages); diff --git a/pages/pay.vue b/pages/pay.vue index adf7562..f127d40 100644 --- a/pages/pay.vue +++ b/pages/pay.vue @@ -1,13 +1,142 @@ + + diff --git a/pages/permission/permission.vue b/pages/permission/permission.vue index b74084c..b2568ef 100644 --- a/pages/permission/permission.vue +++ b/pages/permission/permission.vue @@ -53,7 +53,7 @@ arr: [], scrollRightTop: 0, // 右边栏目scroll-view的滚动条高度 timer: null, // 定时器 - isTabClickOver:true + isTabClickOver: true } }, onLoad() { @@ -192,9 +192,9 @@ let height2 = this.arr[i + 1]; // 如果不存在height2,意味着数据循环已经到了最后一个,设置左边菜单为最后一项即可 if (!height2 || scrollHeight >= height1 && scrollHeight < height2) { - if(this.isTabClickOver){ + if (this.isTabClickOver) { this.leftMenuStatus(i); - }else{ + } else { this.isTabClickOver = true; } return; diff --git a/static/market/gold.png b/static/market/gold.png new file mode 100644 index 0000000..0e327e9 Binary files /dev/null and b/static/market/gold.png differ diff --git a/static/market/sel.png b/static/market/sel.png new file mode 100644 index 0000000..557284f Binary files /dev/null and b/static/market/sel.png differ diff --git a/static/market/title-bg.png b/static/market/title-bg.png new file mode 100644 index 0000000..08dedba Binary files /dev/null and b/static/market/title-bg.png differ diff --git a/static/market/top-bg.png b/static/market/top-bg.png new file mode 100644 index 0000000..be867fa Binary files /dev/null and b/static/market/top-bg.png differ diff --git a/store/menus.js b/store/menus.js index c1f4c1e..5f44d1a 100644 --- a/store/menus.js +++ b/store/menus.js @@ -51,7 +51,9 @@ export const useMenusStore = defineStore('menus', { async getMenus() { const data = await menusApi.getMenus() this.originMenus = data; - const arr = flattenNestedChildren(data).filter(v => v.miniPath) + const arr = flattenNestedChildren(data).filter(v =>{ + return v.miniPath + }) this.adminPages=arr; this.menuList = this.allPages.filter(v => { const findItem = arr.find(item => item.miniPath == v.pageId || item.miniPath