zlisen vor 3 Jahren
Ursprung
Commit
3b6870bb4b

+ 2
- 2
config/proxy.js Datei anzeigen

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

+ 1
- 1
src/pages/activity/groupRoomActivity/detail.jsx Datei anzeigen

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

+ 1
- 1
src/pages/activity/lookHouseActivity/detail.jsx Datei anzeigen

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

+ 1
- 1
src/pages/customer/Customer/PublicCustomer/AssistConsultant/AssistConsultant.jsx Datei anzeigen

@@ -67,7 +67,7 @@ const AssistConsultant = props => {
67 67
     request({
68 68
       ...apis.customer.consultantAssist,
69 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 72
       .then(res => {
73 73
         // eslint-disable-next-line no-unused-expressions

+ 6
- 4
src/pages/customer/Customer/PublicCustomer/components/AssistConsultant.jsx Datei anzeigen

@@ -16,7 +16,8 @@ const AssistConsultant = props => {
16 16
 
17 17
   const [tableData, setTableData] = useState({});
18 18
   const [loading, setLoading] = useState(false);
19
-
19
+  const [buildingId, setBuildingId] = useState();
20
+  
20 21
   const openNotificationWithIcon = (type, message) => {
21 22
     notification[type]({
22 23
       message,
@@ -52,11 +53,12 @@ const AssistConsultant = props => {
52 53
 
53 54
   // 分页
54 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 59
   function changBuilding(buildingId) {
59 60
     if (buildingId) {
61
+      setBuildingId(buildingId)
60 62
       getList({ pageNumber: 1, pageSize: 5, buildingId: buildingId });
61 63
     }
62 64
   }
@@ -67,7 +69,7 @@ const AssistConsultant = props => {
67 69
     request({
68 70
       ...apis.customer.consultantAssist,
69 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 74
       .then(res => {
73 75
         // eslint-disable-next-line no-unused-expressions
@@ -141,7 +143,7 @@ const AssistConsultant = props => {
141 143
               </>
142 144
             )} */}
143 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 148
             <Table
147 149
               dataSource={tableData.records}