zlisen 3 years ago
parent
commit
3b6870bb4b

+ 2
- 2
config/proxy.js View File

8
 export default {
8
 export default {
9
   dev: {
9
   dev: {
10
     '/api/': {
10
     '/api/': {
11
-      // target: 'https://xlk.njyz.tech/',
11
+      target: 'https://xlk.njyz.tech/',
12
       // target: 'http://localhost:8081/',
12
       // target: 'http://localhost:8081/',
13
-      target: 'https://xlj.newlandsh.com/',
13
+      // target: 'https://xlj.newlandsh.com/',
14
       changeOrigin: true,
14
       changeOrigin: true,
15
       pathRewrite: {
15
       pathRewrite: {
16
         '^': '',
16
         '^': '',

+ 1
- 1
src/pages/activity/groupRoomActivity/detail.jsx View File

31
 
31
 
32
 const getSignList = dynamicId => {
32
 const getSignList = dynamicId => {
33
   router.push({
33
   router.push({
34
-    pathname: '/activity/SignupActivity/registrationRecord',
34
+    pathname: '/activity/groupRoomActivity/registrationRecord',
35
     query: {
35
     query: {
36
       dynamicId,
36
       dynamicId,
37
     },
37
     },

+ 1
- 1
src/pages/activity/lookHouseActivity/detail.jsx View File

31
 
31
 
32
 const getSignList = dynamicId => {
32
 const getSignList = dynamicId => {
33
   router.push({
33
   router.push({
34
-    pathname: '/activity/SignupActivity/registrationRecord',
34
+    pathname: '/activity/lookHouseActivity/registrationRecord',
35
     query: {
35
     query: {
36
       dynamicId,
36
       dynamicId,
37
     },
37
     },

+ 1
- 1
src/pages/customer/Customer/PublicCustomer/AssistConsultant/AssistConsultant.jsx View File

67
     request({
67
     request({
68
       ...apis.customer.consultantAssist,
68
       ...apis.customer.consultantAssist,
69
       urlData: { id: data.customerId },
69
       urlData: { id: data.customerId },
70
-      data: { userId: record.userId, buildingId: data.buildingName || data.buildingId },
70
+      data: { userId: record.userId, buildingId:  data.buildingName || data.buildingId },
71
     })
71
     })
72
       .then(res => {
72
       .then(res => {
73
         // eslint-disable-next-line no-unused-expressions
73
         // eslint-disable-next-line no-unused-expressions

+ 6
- 4
src/pages/customer/Customer/PublicCustomer/components/AssistConsultant.jsx View File

16
 
16
 
17
   const [tableData, setTableData] = useState({});
17
   const [tableData, setTableData] = useState({});
18
   const [loading, setLoading] = useState(false);
18
   const [loading, setLoading] = useState(false);
19
-
19
+  const [buildingId, setBuildingId] = useState();
20
+  
20
   const openNotificationWithIcon = (type, message) => {
21
   const openNotificationWithIcon = (type, message) => {
21
     notification[type]({
22
     notification[type]({
22
       message,
23
       message,
52
 
53
 
53
   // 分页
54
   // 分页
54
   function onChange(pageNum) {
55
   function onChange(pageNum) {
55
-    getList({ pageNumber: pageNum, pageSize: 5 });
56
+    getList({ pageNumber: pageNum, pageSize: 5,buildingId: buildingId||data.buildingId });
56
   }
57
   }
57
 
58
 
58
   function changBuilding(buildingId) {
59
   function changBuilding(buildingId) {
59
     if (buildingId) {
60
     if (buildingId) {
61
+      setBuildingId(buildingId)
60
       getList({ pageNumber: 1, pageSize: 5, buildingId: buildingId });
62
       getList({ pageNumber: 1, pageSize: 5, buildingId: buildingId });
61
     }
63
     }
62
   }
64
   }
67
     request({
69
     request({
68
       ...apis.customer.consultantAssist,
70
       ...apis.customer.consultantAssist,
69
       urlData: { id: data.customerId },
71
       urlData: { id: data.customerId },
70
-      data: { userId: record.userId, buildingId: data.buildingName || data.buildingId },
72
+      data: { userId: record.userId, buildingId: buildingId || data.buildingId },
71
     })
73
     })
72
       .then(res => {
74
       .then(res => {
73
         // eslint-disable-next-line no-unused-expressions
75
         // eslint-disable-next-line no-unused-expressions
141
               </>
143
               </>
142
             )} */}
144
             )} */}
143
             {data?.buildingId == null && (
145
             {data?.buildingId == null && (
144
-              <BuildSelect onChange={e => changBuilding(e)} value={data?.buildingName} />
146
+              <BuildSelect onChange={e => changBuilding(e)} value={buildingId||data?.buildingId} />
145
             )}
147
             )}
146
             <Table
148
             <Table
147
               dataSource={tableData.records}
149
               dataSource={tableData.records}