Просмотр исходного кода

邀请分佣平台设置ghs移到pt

ouyang 1 день назад
Родитель
Сommit
b70440064d

+ 0 - 2
ghs/src/cool/request/index.js

@@ -10,7 +10,6 @@ import level from '@/service/level/index';
 import category from '@/service/category/index';
 import shopAdmin from '@/service/shop-admin/index';
 import invite from '@/service/invite/index';
-import shopInvite from '@/service/shop-invite/index';
 import coupon from '@/service/coupon/index';
 import ad from '@/service/ad/index';
 import staff from '@/service/staff/index';
@@ -128,7 +127,6 @@ export function SET_SERVICE({ store }) {
 		level,
 		category,
 		invite,
-		shopInvite,
 		coupon,
 		ad,
 		staff,

+ 0 - 3
ghs/src/mock/userInfo.js

@@ -195,9 +195,6 @@ let menu = {
 
 		{id: '11',parentId: null,name: '邀请',type: 0,icon: 'iconyaoqingyouli',orderNum: 11,router: '/pages/admin/my-invite',viewPath: 'views/my-invite/index.vue',keepAlive: 1},
         {id: '1101',parentId: 11,name: '邀请注册',type: 1,icon: 'iconyaoqingyouli',orderNum: 1,router: '/pages/admin/my-invite',viewPath: 'views/my-invite/index.vue',keepAlive: 1},
-        {id: '11021',parentId: 11,name: '分成比例管理',type: 1,icon: 'iconyaoqingyouli',orderNum: 2,router: '/invite/shop-invite/ratio',viewPath: 'views/shop-invite/ratio-manage.vue',keepAlive: 1},
-        {id: '11022',parentId: 11,name: '佣金分成明细',type: 1,icon: 'iconyaoqingyouli',orderNum: 3,router: '/invite/shop-invite/commission-list',viewPath: 'views/shop-invite/commission-list.vue',keepAlive: 1},
-        {id: '11023',parentId: 11,name: '佣金分成详情',type: 1,icon: 'iconyaoqingyouli',orderNum: 99,router: '/invite/shop-invite/commission-detail',viewPath: 'views/shop-invite/commission-detail.vue',keepAlive: 0},
 
 		{id: '12',parentId: null,name: '统计',type: 0,icon: 'icondingdanguanli',orderNum: 12,router: '/assets/list',viewPath: 'views/assets/list.vue',keepAlive: 1},
 		{id: '1201',parentId: '12',name: '余额明细',type: 1,icon: 'icondingdanguanli',orderNum: 12,router: '/assets/list',viewPath: 'views/assets/list.vue',keepAlive: 1},

+ 2 - 0
pt/src/cool/request/index.js

@@ -48,6 +48,7 @@ import ptItem from '@/service/pt-item/index';
 import ptItemCatRelate from '@/service/pt-item-cat-relate/index';
 import apply from '@/service/apply/index';
 import renew from '@/service/renew/index';
+import shopInvite from '@/service/shop-invite/index';
 
 export function SET_SERVICE({ store }) {
 	// const files = require.context('@/service/', true, /\.js$/);
@@ -55,6 +56,7 @@ export function SET_SERVICE({ store }) {
 
 	let modules = {
 		renew,
+		shopInvite,
 		ptItemCatRelate,
 		ptItem,
 		ptCpItem,

+ 6 - 0
pt/src/mock/userInfo.js

@@ -188,6 +188,12 @@ let menu = {
 		{id: '701',parentId: '7',name: '套餐列表',type: 1,icon: 'icongongzuotai',orderNum: 7,router: '/saas/manage/package',viewPath: 'saas/manage/package',keepAlive: 1},
 		{id: '701',parentId: '7',name: '权限',type: 1,icon: 'icongongzuotai',orderNum: 7,router: '/views/system/user',viewPath: 'views/system/user',keepAlive: 1},
 
+		// 邀请分佣(原 ghs shop-invite 迁入)
+		{id: '20',parentId: null,name: '邀请分佣',type: 0,icon: 'iconyaoqingyouli',orderNum: 20,router: '',viewPath: '',keepAlive: 1},
+		{id: '2001',parentId: '20',name: '分成比例管理',type: 1,icon: 'iconyaoqingyouli',orderNum: 1,router: '/invite-commission/ratio',viewPath: 'views/shop-invite/ratio-manage.vue',keepAlive: 1},
+		{id: '2002',parentId: '20',name: '佣金分成明细',type: 1,icon: 'iconyaoqingyouli',orderNum: 2,router: '/invite-commission/commission-list',viewPath: 'views/shop-invite/commission-list.vue',keepAlive: 1},
+		{id: '2003',parentId: '20',name: '佣金分成详情',type: 1,icon: 'iconyaoqingyouli',orderNum: 99,router: '/invite-commission/commission-detail',viewPath: 'views/shop-invite/commission-detail.vue',keepAlive: 0},
+
 	]
 };
 

+ 6 - 2
pt/src/pages/layout/slider/index.vue

@@ -57,7 +57,8 @@ export default {
 			if (this.$util.isEmpty(arr)) {
 				return [];
 			}
-			return arr;
+			// orderNum >= 90 为隐藏路由(如佣金详情),不在侧栏展示
+			return arr.filter(item => Number(item.orderNum || 0) < 90);
 		}
 	},
 	mounted() {
@@ -86,7 +87,10 @@ export default {
 			if (this.$util.isEmpty(item.children)) {
 				this.$router.push(item.path);
 			} else {
-				this.$router.push(item.children[0].path);
+				// 跳过 orderNum>=90 的隐藏页,落到第一个可见子菜单
+				const visible = item.children.filter(c => Number(c.orderNum || 0) < 90);
+				const first = visible[0] || item.children[0];
+				this.$router.push(first.path);
 				this.subIndex = 0;
 			}
 		},

+ 2 - 2
ghs/src/service/shop-invite/index.js → pt/src/service/shop-invite/index.js

@@ -1,6 +1,6 @@
 /**
- * 门店邀请分佣管理 — ghs Web
- * 对接 app-ghs MainInviteAdminController
+ * 门店邀请分佣管理 — pt 平台后台
+ * 对接 app-pt MainInviteAdminController(bizHd MainInviteAdminClass)
  */
 import { BaseService, Service } from '@/cool';
 

+ 2 - 2
ghs/src/views/shop-invite/commission-detail.vue → pt/src/views/shop-invite/commission-detail.vue

@@ -1,5 +1,5 @@
 <!--
-  佣金分成详情 — ghs Web 门店邀请分佣
+  佣金分成详情 — pt 平台「邀请分佣」
   按设计稿展示分佣/批发商/受邀花店/会员订单四块信息
 -->
 <template>
@@ -149,7 +149,7 @@ export default {
 			});
 		},
 		goBack() {
-			this.$router.push({ path: '/invite/shop-invite/commission-list' });
+			this.$router.push({ path: '/invite-commission/commission-list' });
 		}
 	}
 };

+ 2 - 2
ghs/src/views/shop-invite/commission-list.vue → pt/src/views/shop-invite/commission-list.vue

@@ -1,5 +1,5 @@
 <!--
-  佣金分成明细 — ghs Web 门店邀请分佣
+  佣金分成明细 — pt 平台「邀请分佣」
   汇总卡片 + 筛选表格 + 跳转详情
 -->
 <template>
@@ -186,7 +186,7 @@ export default {
 		},
 		goDetail(row) {
 			this.$router.push({
-				path: '/invite/shop-invite/commission-detail',
+				path: '/invite-commission/commission-detail',
 				query: { id: row.id }
 			});
 		},

+ 1 - 1
ghs/src/views/shop-invite/ratio-manage.vue → pt/src/views/shop-invite/ratio-manage.vue

@@ -1,5 +1,5 @@
 <!--
-  分成比例管理 — ghs Web 门店邀请分佣
+  分成比例管理 — pt 平台「邀请分佣」
   Tab1 基础分佣只读展示 dict;Tab2 批发商独立比例 CRUD
 -->
 <template>