ytf лет назад: 3
Родитель
Сommit
84aa633f64
3 измененных файлов с 42 добавлено и 55 удалено
  1. 28 28
      admin/config/router.config.js
  2. 13 10
      admin/src/models/login.js
  3. 1 17
      admin/src/pages/sysset/base/payment.js

+ 28 - 28
admin/config/router.config.js

@@ -74,12 +74,12 @@ export default [
74 74
             name: 'order',
75 75
             component: './sysset/base/order',
76 76
           },
77
-          //APP配置
78
-          {
79
-            path: '/sysset_setting/app_set',
80
-            name: 'app_set',
81
-            component: './sysset/base/app_set',
82
-          },
77
+          //APP配置 pc 和 app 暂时禁用
78
+          // {
79
+          //   path: '/sysset_setting/app_set',
80
+          //   name: 'app_set',
81
+          //   component: './sysset/base/app_set',
82
+          // },
83 83
         ],
84 84
       },
85 85
       //系统配置—通知管理
@@ -295,7 +295,7 @@ export default [
295 295
             name: '',
296 296
             component: './pcdecorate/home/add_template',
297 297
           },
298
-          // // 测试模板
298
+          // // 测试模板 pc 和 app 暂时禁用
299 299
           // {
300 300
           //   path: '/pcdecorate_home/adv_222',
301 301
           //   name: 'adv_222',
@@ -472,7 +472,7 @@ export default [
472 472
             name: '',
473 473
             component: './manage/order/order_detail',
474 474
           },
475
-          //售后管理
475
+          //售后管理 pc 和 app 暂时禁用
476 476
           // {
477 477
           //     path: '/manage_order/aftersales_lists',
478 478
           //     name: 'aftersales_lists',
@@ -497,26 +497,26 @@ export default [
497 497
           },
498 498
         ],
499 499
       },
500
-      // 文章管理
501
-      {
502
-        path: '/manage_article',
503
-        icon: 'file-word',
504
-        name: 'article',
505
-        routes: [
506
-          {
507
-            path: '/manage_article/article_cat_lists',
508
-            name: 'article_cat_lists',
509
-            component: './manage/article/article_cat_lists',
510
-          }, {
511
-            path: '/manage_article/article_lists',
512
-            name: 'article_lists',
513
-            component: './manage/article/article_lists',
514
-          }, {
515
-            path: '/manage_article/article_lists_to_add',
516
-            component: './manage/article/add_article',
517
-          },
518
-        ],
519
-      },
500
+      // 文章管理 pc 和 app 暂时禁用
501
+      // {
502
+      //   path: '/manage_article',
503
+      //   icon: 'file-word',
504
+      //   name: 'article',
505
+      //   routes: [
506
+      //     {
507
+      //       path: '/manage_article/article_cat_lists',
508
+      //       name: 'article_cat_lists',
509
+      //       component: './manage/article/article_cat_lists',
510
+      //     }, {
511
+      //       path: '/manage_article/article_lists',
512
+      //       name: 'article_lists',
513
+      //       component: './manage/article/article_lists',
514
+      //     }, {
515
+      //       path: '/manage_article/article_lists_to_add',
516
+      //       component: './manage/article/add_article',
517
+      //     },
518
+      //   ],
519
+      // },
520 520
       // 促销活动
521 521
       {
522 522
         path: '/bussset_promotion',

+ 13 - 10
admin/src/models/login.js

@@ -44,22 +44,25 @@ export default {
44 44
               } else if (target == 'manage') {
45 45
                 target_data.name = '商城管理';
46 46
                 target_data.icon = 'shangchengguanli2';
47
-              } else if (target == 'pcdecorate') {
48
-                target_data.name = 'PC装修';
49
-                target_data.icon = 'ziyuan114';
50
-              } else if (target == 'decorate') {
47
+              }  else if (target == 'decorate') {
51 48
                 target_data.name = '手机装修';
52 49
                 target_data.icon = 'shouji';
53 50
               } else if (target == 'bussset') {
54 51
                 target_data.name = '运营管理';
55 52
                 target_data.icon = 'yunying';
56
-              } else if (target == 'point') {
57
-                target_data.name = '积分商城';
58
-                target_data.icon = 'ziyuan115';
59
-              } else if (target == 'spreader') {
60
-                target_data.name = '推手系统';
61
-                target_data.icon = 'ziyuan115';
53
+              } else {
54
+                continue;
62 55
               }
56
+              // else if (target == 'pcdecorate') {
57
+              //   target_data.name = 'PC装修';
58
+              //   target_data.icon = 'ziyuan114';
59
+              // }else if (target == 'point') {
60
+              //   target_data.name = '积分商城';
61
+              //   target_data.icon = 'ziyuan115';
62
+              // } else if (target == 'spreader') {
63
+              //   target_data.name = '推手系统';
64
+              //   target_data.icon = 'ziyuan115';
65
+              // }
63 66
               cur_top_nav.push(target);
64 67
               cur_top_nav_info.push(target_data);
65 68
             }

+ 1 - 17
admin/src/pages/sysset/base/payment.js

@@ -34,7 +34,7 @@ export default class Payment extends Component {
34 34
 			mobile_data: {},
35 35
 			curData: {},//当前编辑的对象信息
36 36
 			pc_data: {},
37
-			activeTabKey: '1',
37
+			activeTabKey: '2',
38 38
 			columns: [
39 39
 				{
40 40
 					title: ' ',
@@ -255,22 +255,6 @@ export default class Payment extends Component {
255 255
 				{getSldEmptyH(10)}
256 256
 				<Spin spinning={initLoading}>
257 257
 					<Tabs activeKey={activeTabKey} onChange={(key) => this.changeSldTab(key)} type="card">
258
-						<TabPane tab={sldComLanguage('PC支付')} key="1">
259
-							{showMoreHelpTip(``, sld_need_update_setting(),8,sld_show_tip)}{/*操作提示*/}
260
-							{getSldEmptyH(8)}
261
-							<StandardTable
262
-								sldpagination={false}
263
-								selectedRows={[]}
264
-								data={pc_data}
265
-								rowKey={'payment'}
266
-								isCheck={false}
267
-								columns={columns}
268
-								onSelectRow={this.handleSelectRows}
269
-								onChange={(pagination, filtersArg, sorter) => this.handleTablePagination(pagination, filtersArg, sorter, 'bottom')}
270
-								resizeTable={(index, size) => this.resizeTable(index, size, 'columns', columns)}
271
-								isColumnResize={true}
272
-							/>
273
-						</TabPane>
274 258
 						<TabPane tab={sldComLanguage('移动端支付')} key="2">
275 259
 							{showMoreHelpTip(``, sld_need_update_setting(),8,sld_show_tip)}{/*操作提示*/}
276 260
 							{getSldEmptyH(8)}