张延森 hace 4 años
padre
commit
f490f5006a
Se han modificado 4 ficheros con 17 adiciones y 12 borrados
  1. 1
    1
      config/dev.js
  2. 4
    2
      src/app.js
  3. 2
    2
      src/pages/house/household/index.jsx
  4. 10
    7
      src/pages/share/index.jsx

+ 1
- 1
config/dev.js Ver fichero

4
     NODE_ENV: '"development"'
4
     NODE_ENV: '"development"'
5
   },
5
   },
6
   defineConstants: {
6
   defineConstants: {
7
-    HOST: '"http://10.161.7.66:7080"',
7
+    HOST: '"http://127.0.0.1:7080"',
8
     // HOST: '"https://sgl.njyunzhi.com"',
8
     // HOST: '"https://sgl.njyunzhi.com"',
9
     // HOST: '"http://192.168.31.211:7080"',
9
     // HOST: '"http://192.168.31.211:7080"',
10
     // HOST: '"http://192.168.211.105:7080"',
10
     // HOST: '"http://192.168.211.105:7080"',

+ 4
- 2
src/app.js Ver fichero

25
   componentDidShow() {
25
   componentDidShow() {
26
     wx.login({
26
     wx.login({
27
       success (res) {
27
       success (res) {
28
+        console.log(res,'22222222222')
28
         if (res.code) {
29
         if (res.code) {
29
           //发起网络请求
30
           //发起网络请求
30
 
31
 
31
           request({url:`/login?code=${res.code}`,method:"post"}).then((res)=>{
32
           request({url:`/login?code=${res.code}`,method:"post"}).then((res)=>{
32
-            console.log(res,'22222222222')
33
+            
33
             try {
34
             try {
34
               Taro.setStorageSync('token', res.data.data.token)
35
               Taro.setStorageSync('token', res.data.data.token)
35
               store.dispatch({type:'LOGIN',user:res.data.data})
36
               store.dispatch({type:'LOGIN',user:res.data.data})
44
         } else {
45
         } else {
45
           console.log('登录失败!' + res.errMsg)
46
           console.log('登录失败!' + res.errMsg)
46
         }
47
         }
47
-      }
48
+      },
49
+      fail: e => console.error(e)
48
     })
50
     })
49
   }
51
   }
50
 
52
 

+ 2
- 2
src/pages/house/household/index.jsx Ver fichero

58
               <ContainerLayout className="household-view-card">
58
               <ContainerLayout className="household-view-card">
59
                 {list[item].map(x => {
59
                 {list[item].map(x => {
60
                   return (
60
                   return (
61
-                    <view>
61
+                    <view onClick={() => onCopy(x)}>
62
                       <Text>
62
                       <Text>
63
                         {x.name}: {x.phone}   
63
                         {x.name}: {x.phone}   
64
                       </Text>
64
                       </Text>
65
-                      <Image className="household-view-card-icon" src={copy} onClick={() => onCopy(x)}></Image>
65
+                      <Image className="household-view-card-icon" src={copy}></Image>
66
                     </view>
66
                     </view>
67
                   );
67
                   );
68
                 })}
68
                 })}

+ 10
- 7
src/pages/share/index.jsx Ver fichero

23
     const { houseId,title } = router.params
23
     const { houseId,title } = router.params
24
     const user = useSelector(state => state.user)
24
     const user = useSelector(state => state.user)
25
 
25
 
26
-    const [personNum, setPersonNum] = useState()
27
-    const [startTime, setStartTime] = useState('')
28
-    const [endTime, setEndTime] = useState('')
26
+    const now = new Date()
27
+    const today = now.toJSON().substring(0, 10)
28
+
29
+    const [personNum, setPersonNum] = useState(0)
30
+    const [startTime, setStartTime] = useState(today)
31
+    const [endTime, setEndTime] = useState(today)
29
     // const [data,setData] = useState({})
32
     // const [data,setData] = useState({})
30
     const [shareObj, setShareObj] = useState()
33
     const [shareObj, setShareObj] = useState()
31
     const [showShareModal, setShowShareModal] = useState(false)
34
     const [showShareModal, setShowShareModal] = useState(false)
32
-    const nowtime=new Date()
35
+    
33
     useEffect(() => {
36
     useEffect(() => {
34
         if (houseId) {
37
         if (houseId) {
35
             request({ url: "/taHouseSetting/last", params: { houseId } }).then((res) => {
38
             request({ url: "/taHouseSetting/last", params: { houseId } }).then((res) => {
163
             <View className='inputstyle-view'>
166
             <View className='inputstyle-view'>
164
                 <Text className='title'>入住人数</Text>
167
                 <Text className='title'>入住人数</Text>
165
                 <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
168
                 <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
166
-                    <Input type='number' value={personNum||0} onInput={(e) => setPersonNum(e.detail.value)} placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
169
+                    <Input type='number' value={personNum} onInput={(e) => setPersonNum(e.detail.value)} placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
167
                 </Container>
170
                 </Container>
168
             </View>
171
             </View>
169
             <View className='inputstyle-view'>
172
             <View className='inputstyle-view'>
172
 
175
 
173
                     <Picker mode='date' onChange={onTimeChange}>
176
                     <Picker mode='date' onChange={onTimeChange}>
174
                         <View className='input' style={{ height: '44rpx', lineHeight: '44rpx', fontsize: '28rpx' }}>
177
                         <View className='input' style={{ height: '44rpx', lineHeight: '44rpx', fontsize: '28rpx' }}>
175
-                            {startTime||`${nowtime.getFullYear()}-0${nowtime.getMonth()+1}-${nowtime.getDate()}`}
178
+                            {startTime}
176
                         </View>
179
                         </View>
177
                     </Picker>
180
                     </Picker>
178
                     {/* <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='' /> */}
181
                     {/* <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='' /> */}
184
                 <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
187
                 <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
185
                     <Picker mode='date' onChange={(e) => { setEndTime(e.detail.value) }}>
188
                     <Picker mode='date' onChange={(e) => { setEndTime(e.detail.value) }}>
186
                         <View className='input' style={{ height: '44rpx', lineHeight: '44rpx', fontsize: '28rpx' }}>
189
                         <View className='input' style={{ height: '44rpx', lineHeight: '44rpx', fontsize: '28rpx' }}>
187
-                            {endTime||`${nowtime.getFullYear()}-0${nowtime.getMonth()+1}-${nowtime.getDate()+1}`}
190
+                            {endTime}
188
                         </View>
191
                         </View>
189
                     </Picker>
192
                     </Picker>
190
                 </Container>
193
                 </Container>