shish 6 лет назад
Родитель
Сommit
5f2e9de5a1

+ 0 - 4
shop/src/cool/request/index.js

@@ -18,7 +18,6 @@ import single from '@/service/single/index';
 import setting from '@/service/setting/index';
 import setting from '@/service/setting/index';
 import workbench from '@/service/workbench/index';
 import workbench from '@/service/workbench/index';
 import auth from '@/service/auth/index';
 import auth from '@/service/auth/index';
-// sass
 import sassShop from '@/service/sass/shop/index';
 import sassShop from '@/service/sass/shop/index';
 import sassOrder from '@/service/sass/order/index';
 import sassOrder from '@/service/sass/order/index';
 import sassMember from '@/service/sass/member/index';
 import sassMember from '@/service/sass/member/index';
@@ -52,7 +51,6 @@ export function SET_SERVICE({ store }) {
 		setting,
 		setting,
 		workbench,
 		workbench,
 		auth,
 		auth,
-		// sass
 		sassShop,
 		sassShop,
 		sassOrder,
 		sassOrder,
 		sassMember,
 		sassMember,
@@ -65,6 +63,4 @@ export function SET_SERVICE({ store }) {
 
 
 	Vue.prototype.$service = modules;
 	Vue.prototype.$service = modules;
 	store.$service = modules;
 	store.$service = modules;
-
-	console.log('1111111');
 }
 }

+ 16 - 17
shop/src/mock/userInfo.js

@@ -546,49 +546,48 @@ let menu = {
             viewPath: 'views/my-invite/index.vue',
             viewPath: 'views/my-invite/index.vue',
             keepAlive: 1
             keepAlive: 1
         },
         },
-		// 设置
 		{
 		{
 			id: '12',
 			id: '12',
 			parentId: null,
 			parentId: null,
-			name: '设置',
+			name: '收支',
 			type: 0,
 			type: 0,
-			icon: 'iconshezhi',
+			icon: 'icondingdanguanli',
 			orderNum: 12,
 			orderNum: 12,
-			router: '/goods/list',
-			viewPath: 'views/goods/goods-list.vue',
+			router: '/admin/assets/list',
+			viewPath: 'views/assets/list.vue',
 			keepAlive: 1
 			keepAlive: 1
 		},
 		},
 		{
 		{
 			id: '1201',
 			id: '1201',
 			parentId: '12',
 			parentId: '12',
-			name: '公众号菜单',
+			name: '收入明细',
 			type: 1,
 			type: 1,
-			icon: 'iconkehuguanli',
+			icon: 'icondingdanguanli',
 			orderNum: 12,
 			orderNum: 12,
-			router: '/setting/wx-menu',
-			viewPath: 'views/setting/wx-menu.vue',
+			router: '/admin/assets/list',
+			viewPath: 'views/assets/list.vue',
 			keepAlive: 1
 			keepAlive: 1
 		},
 		},
 		{
 		{
 			id: '13',
 			id: '13',
 			parentId: null,
 			parentId: null,
-			name: '收支',
+			name: '设置',
 			type: 0,
 			type: 0,
-			icon: 'icondingdanguanli',
+			icon: 'iconshezhi',
 			orderNum: 12,
 			orderNum: 12,
-			router: '/admin/assets/list',
-			viewPath: 'views/assets/list.vue',
+			router: '/goods/list',
+			viewPath: 'views/goods/goods-list.vue',
 			keepAlive: 1
 			keepAlive: 1
 		},
 		},
 		{
 		{
 			id: '1301',
 			id: '1301',
 			parentId: '13',
 			parentId: '13',
-			name: '收支明细',
+			name: '公众号菜单',
 			type: 1,
 			type: 1,
-			icon: 'icondingdanguanli',
+			icon: 'iconkehuguanli',
 			orderNum: 12,
 			orderNum: 12,
-			router: '/admin/assets/list',
-			viewPath: 'views/assets/list.vue',
+			router: '/setting/wx-menu',
+			viewPath: 'views/setting/wx-menu.vue',
 			keepAlive: 1
 			keepAlive: 1
 		},
 		},
 		// ========================================================
 		// ========================================================

+ 8 - 0
shop/src/service/merchant-capital/index.js

@@ -0,0 +1,8 @@
+import { BaseService, Service } from '@/cool';
+
+@Service('merchant-capital')
+export class MerchantCapitalService extends BaseService {
+
+}
+
+export default new MerchantCapitalService();

+ 2 - 5
shop/src/views/assets/list.vue

@@ -5,17 +5,14 @@
 </template>
 </template>
 
 
 <script>
 <script>
+import merchantCapital from '@/service/merchant-capital/index';
 export default {
 export default {
 	name: 'assets-list',
 	name: 'assets-list',
 	methods: {
 	methods: {
 		// x-crud 组件ad
 		// x-crud 组件ad
 		onLoad({ ctx, app }) {
 		onLoad({ ctx, app }) {
 			this.app = app;
 			this.app = app;
-			ctx.service({
-				page: () => {
-					return this.$service.single.capitalList();
-				}
-			})
+			ctx.service(merchantCapital)
 				.set('table', {
 				.set('table', {
 					columns: [
 					columns: [
 						{
 						{