Selaa lähdekoodia

share personNum

zlisen 4 vuotta sitten
vanhempi
commit
16a766ee16
3 muutettua tiedostoa jossa 52 lisäystä ja 50 poistoa
  1. 0
    1
      src/compents/tab/index.jsx
  2. 50
    47
      src/pages/customer/register/index.jsx
  3. 2
    2
      src/reducers/user.js

+ 0
- 1
src/compents/tab/index.jsx Näytä tiedosto

@@ -24,7 +24,6 @@ const tab = (props) => {
24 24
     const { value, openType, pageState, formType, color, styleType='', ...prop } = props
25 25
 
26 26
     const [state, setState] = useState(1)
27
-    console.log(props, openType, 'formType')
28 27
     useEffect(() => {
29 28
 
30 29
     }, [])

+ 50
- 47
src/pages/customer/register/index.jsx Näytä tiedosto

@@ -7,8 +7,7 @@ import ContainerLayout from "../../../compents/container/index";
7 7
 import Tab from "../../../compents/tab";
8 8
 import Layout from "../../../layout";
9 9
 import request from "@/util/request";
10
-import { useSelector, } from 'react-redux'
11
-
10
+import { useSelector } from "react-redux";
12 11
 
13 12
 const InputGroup = props => {
14 13
   const [name, setName] = useState(props.dataSource.name);
@@ -85,16 +84,21 @@ const InputGroup = props => {
85 84
 
86 85
 const register = props => {
87 86
   let [list, setList] = useState([]);
88
-  const user = useSelector(state => state.user)
87
+  const user = useSelector(state => state.user);
88
+  // console.log(props, "personNum");
89 89
   useEffect(() => {
90 90
     if (props.dataSource) {
91 91
       const { personNum } = props.dataSource.houseSetting || {};
92
-
93
-      setList(
94
-        new Array(personNum || 0)
95
-          .fill("*")
96
-          .map(x => ({ name: undefined, phone: undefined }))
97
-      );
92
+     
93
+      if (personNum === 0) {
94
+        props.onFinished();
95
+      } else {
96
+        setList(
97
+          new Array(personNum || 0)
98
+            .fill("*")
99
+            .map(x => ({ name: undefined, phone: undefined }))
100
+        );
101
+      }
98 102
     }
99 103
   }, [props.dataSource]);
100 104
 
@@ -110,60 +114,57 @@ const register = props => {
110 114
       return;
111 115
     }
112 116
 
113
-  
114
-
115
-    const {subscribeMessageList=[]}= user
117
+    const { subscribeMessageList = [] } = user;
116 118
     wx.requestSubscribeMessage({
117
-        tmplIds: subscribeMessageList.filter(x=>x.type==='check-out').map(x=>x.code),
118
-        success (res) { 
119
-          console.log(res,'-------2222222----------')
120
-          postRegister()
121
-        },
122
-        fail (err) { 
123
-          console.log(err,'-------err----------')
124
-        },
125
-        
126
-        complete (res) { 
127
-          console.log(res,'-------2222222-00---------')
128
-        },
129
-
130
-        
131
-      })
132
-
133
-   
119
+      tmplIds: subscribeMessageList
120
+        .filter(x => x.type === "check-out")
121
+        .map(x => x.code),
122
+      success(res) {
123
+        console.log(res, "-------2222222----------");
124
+        postRegister();
125
+      },
126
+      fail(err) {
127
+        console.log(err, "-------err----------");
128
+      },
129
+
130
+      complete(res) {
131
+        console.log(res, "-------2222222-00---------");
132
+      }
133
+    });
134 134
   };
135 135
 
136
-  const postRegister=()=>{
136
+  const postRegister = () => {
137 137
     const data = {
138 138
       orderId: props.dataSource.orderId,
139 139
       houseId: props.dataSource.houseSetting.houseId,
140 140
       personList: list
141 141
     };
142 142
     request({ url: "/taHousePerson", method: "POST", data })
143
-    .then(res => {
144
-      if (props.onFinished) {
145
-        props.onFinished(res);
146
-      }
147
-    })
148
-    .catch(err => {
149
-      console.error(err);
150
-      const message = err.message || err.errMsg || err;
151
-      Taro.showToast({
152
-        title: message,
153
-        icon: "none",
154
-        duration: 3000
143
+      .then(res => {
144
+        if (props.onFinished) {
145
+          props.onFinished(res);
146
+        }
147
+      })
148
+      .catch(err => {
149
+        console.error(err);
150
+        const message = err.message || err.errMsg || err;
151
+        Taro.showToast({
152
+          title: message,
153
+          icon: "none",
154
+          duration: 3000
155
+        });
155 156
       });
156
-    });
157
-  }
157
+  };
158 158
 
159 159
   const onChangeList = index => value => {
160 160
     list[index] = value;
161 161
     setList([...list]);
162 162
   };
163
-
163
+  const { personNum } = props.dataSource?.houseSetting || {};
164 164
   return (
165
-    <View className="register">
166
-      <Layout>
165
+     <View className="register">
166
+      {personNum>0&& <View>
167
+         <Layout>
167 168
         {list.map((x, index) => {
168 169
           let inx = index;
169 170
           return (
@@ -178,6 +179,8 @@ const register = props => {
178 179
       </Layout>
179 180
 
180 181
       <Tab value={["开启旅程"]} onClick={e => onClick(e)}></Tab>
182
+       </View>}
183
+      
181 184
     </View>
182 185
   );
183 186
 };

+ 2
- 2
src/reducers/user.js Näytä tiedosto

@@ -43,8 +43,8 @@ export default function user(state = INITIAL_STATE, action) {
43 43
         return {
44 44
           ...state,
45 45
           ...action.user,
46
-          role: 'landlord',
47
-          // role: 'customer',
46
+          // role: 'landlord',
47
+          role: 'customer',
48 48
         }
49 49
       } else {
50 50
         return {