张延森 3 年之前
父節點
當前提交
9dde86bcf1

+ 2
- 2
config/proxy.js 查看文件

@@ -8,8 +8,8 @@
8 8
 export default {
9 9
   dev: {
10 10
     '/api/': {
11
-      target: 'https://xlk.njyz.tech/',
12
-      // target: 'http://localhost:8081/',
11
+      // target: 'https://xlk.njyz.tech/',
12
+      target: 'http://localhost:8081/',
13 13
       // target: 'https://www.newhousehold.cn',
14 14
       changeOrigin: true,
15 15
       pathRewrite: {

+ 1
- 1
src/components/AuthButton/index.jsx 查看文件

@@ -9,7 +9,7 @@ const AuthButton = ({ children, name, noRight = null }) => {
9 9
     return children
10 10
   }
11 11
 
12
-  const hasRight = current.filter(x => x.code === name)[0]  
12
+  const hasRight = current.filter(x => x.code === name)[0]
13 13
   return hasRight ? <>{children}</> : <>{noRight}</>
14 14
 }
15 15
 

+ 2
- 2
src/pages/building/Edit/Channel.jsx 查看文件

@@ -81,9 +81,9 @@ const ChannelForm = React.forwardRef((props, ref) => {
81 81
       {getFieldDecorator('remark', {})(<Input.TextArea row={4} />)}
82 82
       </Form.Item>
83 83
       <Form.Item label=" " colon={false} style={{marginTop: '2em'}}>
84
-       {!isPublish&& <AuthButton name="building.channel.save">
84
+        <AuthButton name="building.channel.save">
85 85
           <Button style={{marginLeft: '4em'}} loading={loading} type="primary" htmlType="submit">保存</Button>
86
-        </AuthButton>}
86
+        </AuthButton>
87 87
         {/* <Button style={{marginLeft: '2em'}} onClick={props.onCancel}>取消</Button> */}
88 88
       </Form.Item>
89 89
     </Form>

+ 2
- 2
src/pages/building/Edit/OnSiteService.jsx 查看文件

@@ -97,11 +97,11 @@ export default props => {
97 97
       key: 'action',
98 98
       render: (_, row) => (
99 99
         <AuthButton name="building.marketing.delete">
100
-         {!isPublish&& <Popconfirm title="确认执行取消操作?" onConfirm={() => handleCancel(row)}>
100
+          <Popconfirm title="确认执行取消操作?" onConfirm={() => handleCancel(row)}>
101 101
             <a href="#" style={{ color: 'red' }}>
102 102
               取消绑定
103 103
             </a>
104
-          </Popconfirm>}
104
+          </Popconfirm>
105 105
         </AuthButton>
106 106
       ),
107 107
     },

+ 1
- 1
src/pages/customer/deal/detail.jsx 查看文件

@@ -34,7 +34,7 @@ function costomerDeal(props) {
34 34
     },
35 35
     {
36 36
       title: '户型',
37
-      render: detail.houseType,
37
+      render: detail.houseTypeName,
38 38
     },
39 39
     {
40 40
       title: '房号',