Merge branch 'master' of http://git2.eqbidding.com/ytf/ds_admin

admin/config/router.config.js

@@ -74,12 +74,12 @@ export default [
             name: 'order',
             component: './sysset/base/order',
           },
-          //APP配置
-          {
-            path: '/sysset_setting/app_set',
-            name: 'app_set',
-            component: './sysset/base/app_set',
-          },
+          //APP配置 pc 和 app 暂时禁用
+          // {
+          //   path: '/sysset_setting/app_set',
+          //   name: 'app_set',
+          //   component: './sysset/base/app_set',
+          // },
         ],
       },
       //系统配置—通知管理
@@ -295,7 +295,7 @@ export default [
             name: '',
             component: './pcdecorate/home/add_template',
           },
-          // // 测试模板
+          // // 测试模板 pc 和 app 暂时禁用
           // {
           //   path: '/pcdecorate_home/adv_222',
           //   name: 'adv_222',
@@ -472,7 +472,7 @@ export default [
             name: '',
             component: './manage/order/order_detail',
           },
-          //售后管理
+          //售后管理 pc 和 app 暂时禁用
           // {
           //     path: '/manage_order/aftersales_lists',
           //     name: 'aftersales_lists',
@@ -497,26 +497,26 @@ export default [
           },
         ],
       },
-      // 文章管理
-      {
-        path: '/manage_article',
-        icon: 'file-word',
-        name: 'article',
-        routes: [
-          {
-            path: '/manage_article/article_cat_lists',
-            name: 'article_cat_lists',
-            component: './manage/article/article_cat_lists',
-          }, {
-            path: '/manage_article/article_lists',
-            name: 'article_lists',
-            component: './manage/article/article_lists',
-          }, {
-            path: '/manage_article/article_lists_to_add',
-            component: './manage/article/add_article',
-          },
-        ],
-      },
+      // 文章管理 pc 和 app 暂时禁用
+      // {
+      //   path: '/manage_article',
+      //   icon: 'file-word',
+      //   name: 'article',
+      //   routes: [
+      //     {
+      //       path: '/manage_article/article_cat_lists',
+      //       name: 'article_cat_lists',
+      //       component: './manage/article/article_cat_lists',
+      //     }, {
+      //       path: '/manage_article/article_lists',
+      //       name: 'article_lists',
+      //       component: './manage/article/article_lists',
+      //     }, {
+      //       path: '/manage_article/article_lists_to_add',
+      //       component: './manage/article/add_article',
+      //     },
+      //   ],
+      // },
       // 促销活动
       {
         path: '/bussset_promotion',

admin/src/models/login.js

@@ -44,22 +44,25 @@ export default {
               } else if (target == 'manage') {
                 target_data.name = '商城管理';
                 target_data.icon = 'shangchengguanli2';
-              } else if (target == 'pcdecorate') {
-                target_data.name = 'PC装修';
-                target_data.icon = 'ziyuan114';
-              } else if (target == 'decorate') {
+              }  else if (target == 'decorate') {
                 target_data.name = '手机装修';
                 target_data.icon = 'shouji';
               } else if (target == 'bussset') {
                 target_data.name = '运营管理';
                 target_data.icon = 'yunying';
-              } else if (target == 'point') {
-                target_data.name = '积分商城';
-                target_data.icon = 'ziyuan115';
-              } else if (target == 'spreader') {
-                target_data.name = '推手系统';
-                target_data.icon = 'ziyuan115';
+              } else {
+                continue;
               }
+              // else if (target == 'pcdecorate') {
+              //   target_data.name = 'PC装修';
+              //   target_data.icon = 'ziyuan114';
+              // }else if (target == 'point') {
+              //   target_data.name = '积分商城';
+              //   target_data.icon = 'ziyuan115';
+              // } else if (target == 'spreader') {
+              //   target_data.name = '推手系统';
+              //   target_data.icon = 'ziyuan115';
+              // }
               cur_top_nav.push(target);
               cur_top_nav_info.push(target_data);
             }

admin/src/pages/sysset/base/payment.js

@@ -34,7 +34,7 @@ export default class Payment extends Component {
 			mobile_data: {},
 			curData: {},//当前编辑的对象信息
 			pc_data: {},
-			activeTabKey: '1',
+			activeTabKey: '2',
 			columns: [
 				{
 					title: ' ',
@@ -255,22 +255,6 @@ export default class Payment extends Component {
 				{getSldEmptyH(10)}
 				<Spin spinning={initLoading}>
 					<Tabs activeKey={activeTabKey} onChange={(key) => this.changeSldTab(key)} type="card">
-						<TabPane tab={sldComLanguage('PC支付')} key="1">
-							{showMoreHelpTip(``, sld_need_update_setting(),8,sld_show_tip)}{/*操作提示*/}
-							{getSldEmptyH(8)}
-							<StandardTable
-								sldpagination={false}
-								selectedRows={[]}
-								data={pc_data}
-								rowKey={'payment'}
-								isCheck={false}
-								columns={columns}
-								onSelectRow={this.handleSelectRows}
-								onChange={(pagination, filtersArg, sorter) => this.handleTablePagination(pagination, filtersArg, sorter, 'bottom')}
-								resizeTable={(index, size) => this.resizeTable(index, size, 'columns', columns)}
-								isColumnResize={true}
-							/>
-						</TabPane>
 						<TabPane tab={sldComLanguage('移动端支付')} key="2">
 							{showMoreHelpTip(``, sld_need_update_setting(),8,sld_show_tip)}{/*操作提示*/}
 							{getSldEmptyH(8)}