ytf 2 роки тому
батько
коміт
f57fe8ff8b

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

@@ -305,13 +305,13 @@ export default [
305 305
           },
306 306
         ],
307 307
       },
308
-      // CMS文章
308
+      // 发现装修
309 309
       {
310 310
         path: '/decorate_information',
311 311
         icon: 'deployment-unit',
312 312
         name: 'decorate_mobile_information',
313 313
         routes: [
314
-          // 文章首页
314
+          // 发现首页
315 315
           {
316 316
             path: '/decorate_information/information',
317 317
             name: 'information',

+ 2 - 2
admin/src/locales/zh-CN/menu.js

@@ -27,8 +27,8 @@ export default {
27 27
   'menu.decorate_mobile_topic.topic_lists': '专题装修',
28 28
   'menu.decorate_mobile_cat_img': '分类图片',
29 29
   'menu.decorate_mobile_cat_img.lists': '分类图片',
30
-  'menu.decorate_mobile_information': 'CMS文章',
31
-  'menu.decorate_mobile_information.information': '文章首页',
30
+  'menu.decorate_mobile_information': '发现装修',
31
+  'menu.decorate_mobile_information.information': '发现首页',
32 32
   'menu.product': '商品管理',
33 33
   'menu.product.add_goods': '发布管理',
34 34
   'menu.product.goods_detail': '商品详情',

+ 3 - 4
admin/src/models/login.js

@@ -50,13 +50,12 @@ export default {
50 50
               } else if (target == 'bussset') {
51 51
                 target_data.name = '运营管理';
52 52
                 target_data.icon = 'yunying';
53
+              } else if (target == 'point') {
54
+                target_data.name = '积分商城';
55
+                target_data.icon = 'ziyuan115';
53 56
               } else {
54 57
                 continue;
55 58
               }
56
-              //  else if (target == 'point') {
57
-              //   target_data.name = '积分商城';
58
-              //   target_data.icon = 'ziyuan115';
59
-              // }
60 59
               cur_top_nav.push(target);
61 60
               cur_top_nav_info.push(target_data);
62 61
             }

+ 1 - 29
admin/src/pages/mdecorate/information.js

@@ -85,34 +85,6 @@ export default class Information extends Component {
85 85
           width: 150,
86 86
         },
87 87
         {
88
-          title: `${sldComLanguage('Android')}`,//Android
89
-          width: 80,
90
-          align: 'center',
91
-          dataIndex: 'android',
92
-          render: (text, record) => {
93
-            return <Switch checked={text == 1 ? true : false}
94
-                           onChange={(val) => this.handleSetEnable(val, record.decoId, 'android')}/>;
95
-          },
96
-        },
97
-        {
98
-          title: `${sldComLanguage('IOS')}`,//IOS
99
-          dataIndex: 'ios',
100
-          align: 'center',
101
-          width: 80,
102
-          render: (text, record) => {
103
-            return <Switch checked={text == 1 ? true : false}
104
-                           onChange={(val) => this.handleSetEnable(val, record.decoId, 'ios')}/>;
105
-          },
106
-        }, {
107
-          title: `${sldComLanguage('微商城')}`,//H5
108
-          dataIndex: 'h5',
109
-          align: 'center',
110
-          width: 80,
111
-          render: (text, record) => {
112
-            return <Switch checked={text == 1 ? true : false}
113
-                           onChange={(val) => this.handleSetEnable(val, record.decoId, 'h5')}/>;
114
-          },
115
-        }, {
116 88
           title: `${sldComLanguage('微信小程序')}`,//是否推荐
117 89
           dataIndex: 'weixinXcx',
118 90
           align: 'center',
@@ -406,7 +378,7 @@ export default class Information extends Component {
406 378
     const { selectedRows, modalVisible, title, addData, columns, submiting, data, loading, search_con, modalTitle, modalVisibleAdv, screen_data } = this.state;
407 379
     return (
408 380
       <div className={global.common_page}>
409
-        {sldLlineRtextAddGoodsAddMargin('#FA6F1E', `${sldComLanguage('文章首页')}`, 0, 0, 10)}{/*文章首页*/}
381
+        {sldLlineRtextAddGoodsAddMargin('#FA6F1E', `${sldComLanguage('发现首页')}`, 0, 0, 10)}{/*发现首页*/}
410 382
         <Spin spinning={loading}>
411 383
           { /*公共功能条-start*/}
412 384
           <div className={global.operate_bg}>

+ 0 - 28
admin/src/pages/mdecorate/lists.js

@@ -85,34 +85,6 @@ export default class Lists extends Component {
85 85
           width: 150,
86 86
         },
87 87
         {
88
-          title: `${sldComLanguage('Android')}`,//Android
89
-          width: 80,
90
-          align: 'center',
91
-          dataIndex: 'android',
92
-          render: (text, record) => {
93
-            return <Switch checked={text == 1 ? true : false}
94
-                           onChange={(val) => this.handleSetEnable(val, record.decoId, 'android')}/>;
95
-          },
96
-        },
97
-        {
98
-          title: `${sldComLanguage('IOS')}`,//IOS
99
-          dataIndex: 'ios',
100
-          align: 'center',
101
-          width: 80,
102
-          render: (text, record) => {
103
-            return <Switch checked={text == 1 ? true : false}
104
-                           onChange={(val) => this.handleSetEnable(val, record.decoId, 'ios')}/>;
105
-          },
106
-        }, {
107
-          title: `${sldComLanguage('微商城')}`,//H5
108
-          dataIndex: 'h5',
109
-          align: 'center',
110
-          width: 80,
111
-          render: (text, record) => {
112
-            return <Switch checked={text == 1 ? true : false}
113
-                           onChange={(val) => this.handleSetEnable(val, record.decoId, 'h5')}/>;
114
-          },
115
-        }, {
116 88
           title: `${sldComLanguage('微信小程序')}`,//是否推荐
117 89
           dataIndex: 'weixinXcx',
118 90
           align: 'center',

+ 0 - 28
admin/src/pages/point/mdiy/home.js

@@ -85,34 +85,6 @@ export default class PointHome extends Component {
85 85
           width: 150,
86 86
         },
87 87
         {
88
-          title: `${sldComLanguage('Android')}`,
89
-          width: 80,
90
-          align: 'center',
91
-          dataIndex: 'android',
92
-          render: (text, record) => {
93
-            return <Switch checked={text == 1 ? true : false}
94
-                           onChange={(val) => this.handleSetEnable(val, record.decoId, 'android')}/>;
95
-          },
96
-        },
97
-        {
98
-          title: `${sldComLanguage('IOS')}`,
99
-          dataIndex: 'ios',
100
-          align: 'center',
101
-          width: 80,
102
-          render: (text, record) => {
103
-            return <Switch checked={text == 1 ? true : false}
104
-                           onChange={(val) => this.handleSetEnable(val, record.decoId, 'ios')}/>;
105
-          },
106
-        }, {
107
-          title: `${sldComLanguage('微商城')}`,//H5
108
-          dataIndex: 'h5',
109
-          align: 'center',
110
-          width: 80,
111
-          render: (text, record) => {
112
-            return <Switch checked={text == 1 ? true : false}
113
-                           onChange={(val) => this.handleSetEnable(val, record.decoId, 'h5')}/>;
114
-          },
115
-        }, {
116 88
           title: `${sldComLanguage('微信小程序')}`,//是否推荐
117 89
           dataIndex: 'weixinXcx',
118 90
           align: 'center',

+ 0 - 9
admin/src/pages/sysset/base/payment.js

@@ -101,18 +101,9 @@ export default class Payment extends Component {
101 101
 		} else if (val.name == 'wxpay_is_enable_pc') {
102 102
 			//PC微信支付
103 103
 			dis_type = 'sldsetting/get_pc_weixin_info';
104
-		} else if (val.name == 'alipay_is_enable_h5') {
105
-			//支付宝移动支付
106
-			dis_type = 'sldsetting/get_alipay_mobile';
107 104
 		} else if (val.name == 'wxpay_is_enable_miniapp') {
108 105
 			//微信小程序支付
109 106
 			dis_type = 'sldsetting/get_wxpay_miniapp';
110
-		} else if (val.name == 'wxpay_is_enable_app') {
111
-			//微信app支付
112
-			dis_type = 'sldsetting/get_wxpay_app';
113
-		} else if (val.name == 'wxpay_is_enable_h5') {
114
-			//微信h5支付
115
-			dis_type = 'sldsetting/get_wxpay_h5';
116 107
 		}
117 108
 		title = `${sldComLanguage('编辑')}` + val.payment + `${sldComLanguage('信息')}`;
118 109
 		dispatch({