feats

src/app.js

@@ -15,6 +15,9 @@ import request from './util/request'
 
 const store = configStore()
 
+// 清空默认选择
+wx.setStorageSync('defaultShop', undefined)
+
 class App extends Component {
   componentDidMount() {}
 
@@ -25,7 +28,7 @@ class App extends Component {
   componentDidShow() {
     wx.login({
       success (res) {
-        console.log(res,'22222222222')
+        // console.log(res,'22222222222')
         if (res.code) {
           //发起网络请求
 

src/compents/Picker/index.jsx

@@ -0,0 +1,45 @@
+import React, { useState, useEffect } from 'react'
+
+export default props => {
+  const [label, setLabel] = useState()
+  const [pos, setPos] = useState()
+  const { value, range=[], rangeKey, rangeValue, placeholder = '请选择', preTitle = '' } = props
+
+  const handleChange = e => {
+    const inx = e.detail.value - 0
+    setPos(inx)
+    if (props.onChange) {
+      props.onChange(range[inx])
+    }
+  }
+  
+  useEffect(() => {
+    let inited = false
+    for (let i = 0; i < range.length; i ++) {
+      const val = range[i][rangeValue]
+      if (val === value) {
+        setPos(i)
+        inited = true
+        break
+      }
+    }
+
+    if (!inited) {
+      setPos()
+    }
+  }, [value])
+
+  useEffect(() => {
+    if (pos || pos === 0) {
+      setLabel(range[pos][rangeKey])
+    } else {
+      setLabel()
+    }
+  }, [pos])
+
+  return (
+    <picker value={pos} range={range} range-key={rangeKey} onChange={handleChange}>
+      <view>{label ? `${preTitle} ${label}` : placeholder}</view>
+    </picker>
+  )
+}

src/pages/guide/index.jsx

@@ -19,29 +19,6 @@ const guide = props => {
   // const [detail, setDetail] = useState({})
   const detail = props.dataSource || {};
 
-  // useDidShow(() => {
-  //     if (houseId) {
-  //         getDetail()
-  //     }
-  // })
-
-  // useEffect(() => {
-  //     console.log(houseId, 'params33')
-  //     if (houseId) {
-  //         getDetail()
-  //     }
-
-  // }, [])
-  // const getDetail = () => {
-  //     request({ url: `/taHouse/${houseId}` }).then((res) => {
-  //         setDetail(res.data.data)
-
-  //         wx.setNavigationBarTitle({
-  //             title: res.data.data.title
-  //         })
-  //     })
-  // }
-
   const onOpenLocation = lngLat => {
     const [latitude, longitude] = lngLat.split(",");
 
@@ -201,22 +178,26 @@ const guide = props => {
               </View>
             )
           }
-          <View className="guide-view">
-            <Text className="guide-view-info">wifi信息</Text>
-            <ContainerLayout
-              className="guide-view-layout guide-view-wifi"
-              onClick={() => onToMap("wifi")}
-            >
-              <View>
-                <Text>名称：</Text>
-                <Text>{detail.wifiName}</Text>
-              </View>
-              <View>
-                <Text>密码：</Text>
-                <Text>{detail.wifiPassword}</Text>
+          { detail.wifiName &&
+            (
+              <View className="guide-view">
+                <Text className="guide-view-info">wifi信息</Text>
+                <ContainerLayout
+                  className="guide-view-layout guide-view-wifi"
+                  onClick={() => onToMap("wifi")}
+                >
+                  <View>
+                    <Text>名称：</Text>
+                    <Text>{detail.wifiName}</Text>
+                  </View>
+                  <View>
+                    <Text>密码：</Text>
+                    <Text>{detail.wifiPassword}</Text>
+                  </View>
+                </ContainerLayout>
               </View>
-            </ContainerLayout>
-          </View>
+            )
+          }
           <View className="guide-view">
             <Text className="guide-view-info">其他指引</Text>
             {/* <ContainerLayout className='guide-view-layout guide-view-img'> */}

src/pages/house/addnewhouse/index.jsx

@@ -15,7 +15,8 @@ const index = (props) => {
 
     const user = useSelector(state => state.user)
     const { shopKeeperList = [] } = user
-    const shopId = shopKeeperList[0].shopId || ''
+    const defaultShop = user.defaultShop
+
     const [userRole, setUserRole] = useState('1')
     const [pageState, setPageState] = useState('1')
     const [list, setList] = useState([])
@@ -55,9 +56,6 @@ const index = (props) => {
     }
     
     const formSubmit = (e) => {
-        // console.log(e.detail, 'formSubmit')
-
-
         if(!e.detail.value?.title){
             wx.showToast({
                 title: '请完善房源信息',
@@ -72,10 +70,10 @@ const index = (props) => {
             ...value,
             lngLat: `${address.latitude || ''},${address.longitude || ''}`,
             parkLngLat: `${parking.latitude || ''},${parking.longitude || ''}`,
-            shopId: user.shopId,
-            desc:imgUrl,
+            shopId: defaultShop,
+            desc: imgUrl,
         }
-        console.log(data,e.detail.value,'formSubmit')
+        console.log(data, e.detail.value, user, 'formSubmit')
         request({ url: '/taHouse', method: 'post', data:{...data} }).then((res) => {
             if (res.data.code == 1000)
                 Taro.navigateBack({

src/pages/house/list/index.jsx

@@ -16,11 +16,12 @@ import RecycleList from "@/compents/RecycleList";
 
 let house = (props, ref) => {
   const user = useSelector(state => state.user)
+  const defaultShop = user.defaultShop
   const [list, setList] = useState([]);
   const [radioHouse, setRadioHouse] = useState();
   const [width, setWidth] = useState();
   const [height, setHeight] = useState();
-  const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10, shopId: user.shopId });
+  const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10, shopId: defaultShop });
   const [total, setTotal] = useState(0);
 
   useImperativeHandle(ref, () => ({
@@ -105,9 +106,15 @@ let house = (props, ref) => {
             for (let item of res) {
               if (item.height) {
                 found = true;
-                setHeight(
-                  Taro.getSystemInfoSync().safeArea.height - item.height - 50
-                );
+
+                let h = Taro.getSystemInfoSync().safeArea.height - item.height - 50
+
+                // 如果显示了下拉框，要去掉下拉框的高度
+                if (user.shopList && user.shopList.length > 1) {
+                  h -= 64
+                }
+
+                setHeight(h);
                 break;
               }
             }
@@ -137,8 +144,8 @@ let house = (props, ref) => {
   }, [queryParams]);
 
   useEffect(() => {
-      setQueryParams({ ...queryParams, shopId: user.shopId })
-  }, [user.shopId])
+      setQueryParams({ ...queryParams, shopId: defaultShop })
+  }, [defaultShop])
 
   // useDidShow(() => {
   //   setQueryParams({ ...queryParams })
@@ -210,5 +217,6 @@ let house = (props, ref) => {
     </View>
   );
 };
+
 house = forwardRef(house);
 export default house;

src/pages/index/index.config.js

@@ -3,6 +3,7 @@ export default {
   navigationStyle: "custom",
   enableShareAppMessage: true,
   usingComponents: {
-    "mp-actionSheet": "weui-miniprogram/actionsheet/actionsheet"
+    "mp-cells": "weui-miniprogram/cells/cells",
+    "mp-cell": "weui-miniprogram/cell/cell"
   }
 }

src/pages/index/index.jsx

@@ -17,8 +17,6 @@ const index = props => {
 
   const dispatch = useDispatch();
 
-  const shopList = (user.shopList || []).map(x => ({text: x.name, value: x.shopId}))
-
   useEffect(() => {
     if (user.role == roleList.landlord) {
       wx.setNavigationBarTitle({
@@ -51,11 +49,6 @@ const index = props => {
     setShowAuthPhone(false);
   };
 
-  const handleSelectShop = e => {
-    const shopId = e.detail.value
-    dispatch({ type: "SET_SHOP", shopId });
-  }
-
   return (
     <View className="index">
       {user.personId && (
@@ -73,31 +66,6 @@ const index = props => {
           )}
         </View>
       )}
-
-      {/* {userRole == 1 ? <Register userRole={userRole} list={list} onChange={(e) => onRegisterChange(e)}></Register> :
-          <View>userRole={userRole} list={list} onChange={(e) => onRegisterChange(e)}
-            {(userRole == 'guide' || userRole == 2) && <Guide userRole={userRole}/>}
-            {userRole == 'recommend' && <Recommend userRole={userRole}/>}
-          </View>
-        }
-        {userRole == 2 ? <Register userRole={userRole} list={list} onChange={(e) => onRegisterChange(e)}></Register> :
-          <View>
-            {(userRole == 'guide' || userRole == 2) && <Guide userRole={userRole}/>}
-            {userRole == 'recommend' && <Recommend userRole={userRole}/>}
-          </View>
-        }
-     <HouseLIst userRole={userRole} list={list} onChange={(e) => onRegisterChange(e)}></HouseLIst>  */}
-
-      {/* </View>
-    </ScrollView>
-    <Tab value={userRole} onClick={(e) => onTabClick(e)}></Tab> */}
-      {
-        shopList.length > 0 && !user.shopId &&
-        (
-          <mp-actionSheet show actions={shopList} title="请选择店铺" showCancel={false} onActiontap={handleSelectShop}>
-          </mp-actionSheet>
-        )
-      }
     </View>
   );
 };

src/pages/landlord/index.jsx

@@ -1,9 +1,10 @@
 import React, { useEffect, useRef, useState } from 'react'
 import Taro, { useDidShow } from "@tarojs/taro";
-import { useSelector } from 'react-redux'
+import { useSelector, useDispatch } from "react-redux"
 import { View, ScrollView, Button } from '@tarojs/components'
 import Layout from '../../layout/index'
 import Tab from '../../compents/tab/index'
+import Picker from '../../compents/Picker/index'
 // import Register from './register/index'
 import Guide from '../guide/index'
 import Recommend from '../recommend/index'
@@ -12,9 +13,8 @@ import { AtFloatLayout } from "taro-ui"
 import request from '@/util/request'
 import './index.scss'
 import NavCustom from '../../compents/navcustom'
-const index = (props) => {
-
 
+const index = (props) => {
   const user = useSelector(state => state.user)
   const [isOpened, setIsOpened] = useState(false)
   const [userRole, setUserRole] = useState('1')
@@ -23,9 +23,12 @@ const index = (props) => {
   const [radioHouseData, setRadioHouseData] = useState()
   const [radioHouseState, setRadioHouseState] = useState(false)
 
+  const shopList = (user.shopList || []).map(x => ({text: x.name, value: x.shopId}))
+  const defaultShop = user.defaultShop
 
   const childRef = useRef();
 
+  const dispatch = useDispatch()
 
   const handleClose = () => {
     setIsOpened(false)
@@ -35,15 +38,15 @@ const index = (props) => {
 
   }
 
-  const onRegisterChange = (e) => {
-  }
+  const onRegisterChange = (e) => {}
+
   const onCopy = (e) => {
 
     if (radioHouseData.houseId) {
 
       const {houseId,...data} = radioHouseData
 
-      request({ url: '/taHouse', method: 'post', data: { ...data } }).then((res) => {
+      request({ url: '/taHouse', method: 'post', data: { ...data, originId: houseId } }).then((res) => {
         Taro.showModal({
           title: '复制成功',
           content: '点击确认按钮，返回上级菜单',
@@ -80,13 +83,37 @@ const index = (props) => {
 
   }
   const navStyle =  Taro.getMenuButtonBoundingClientRect()
+  
 
-  return <View className='index'>
-
+  const handleSelectShop = shop => {
+    dispatch({ type: "SET_SHOP", shopId: shop.value });
+  }
 
+  return <View className='index'>
     <View>
-  
-  {pageState == '1' &&<NavCustom houseInfo={{title:'民宿房源管理'}}></NavCustom>}
+      {pageState == '1' &&<NavCustom houseInfo={{title:'民宿房源管理'}}></NavCustom>}
+
+      {
+        shopList.length > 1 &&
+        (
+          <mp-cells>
+            <mp-cell>
+              <Picker
+                value={defaultShop}
+                range={shopList}
+                rangeKey="text"
+                rangeValue="value"
+                preTitle="当前店铺"
+                placeholder="请选择店铺"
+                onChange={handleSelectShop}
+              />
+            </mp-cell>
+          </mp-cells>
+          // <mp-actionSheet show actions={shopList} title="请选择店铺" showCancel={false} onActiontap={handleSelectShop}>
+          // </mp-actionSheet>
+        )
+      }
+
       <Layout type='custom'>
         {pageState == '1' && <HouseLIst ref={childRef} radioHouseState={radioHouseState} onChange={(e) => setRadioHouseData(e)}></HouseLIst>}
       </Layout>

src/reducers/user.js

@@ -15,6 +15,11 @@ const INITIAL_STATE = {
   // role: 'customer'
 }
 
+
+function setDefaultShop(shopId) {
+  wx.setStorageSync('defaultShop',shopId)
+}
+
 export const login = () => {
   return {
     type: LOGIN
@@ -35,7 +40,6 @@ export function asyncLogina() {
 export default function user(state = INITIAL_STATE, action) {
   switch (action.type) {
     case 'LOGIN': {
-
       if (action.user.shopKeeperList && action.user.shopKeeperList.length) {
           wx.setNavigationBarTitle({
             title: '民宿房源管理'
@@ -54,14 +58,18 @@ export default function user(state = INITIAL_STATE, action) {
         }, [])
 
         // 默认当前的, 但是如果有多个, 则需要用户来确定
-        const shopId = shopList.length > 1 ? undefined : shopList[0]
-
+        const shopId = shopList.length > 1 ? undefined : shopList[0].shopId
+        const defaultShop = wx.getStorageSync('defaultShop')
+        if (shopId && shopId !== defaultShop) {
+          setDefaultShop(shopId)
+        }
+        
         return {
           ...state,
           ...action.user,
           role: 'landlord',
+          defaultShop: shopId || defaultShop,
           shopList,
-          shopId,
           // role: 'customer',
         }
       } else {
@@ -71,9 +79,6 @@ export default function user(state = INITIAL_STATE, action) {
           role: 'customer',
         }
       }
-
-
-
     }
     case 'phone': {
       return state
@@ -84,9 +89,11 @@ export default function user(state = INITIAL_STATE, action) {
         return state
       }
 
+      setDefaultShop(shopId)
+
       return {
         ...state,
-        shopId
+        defaultShop: shopId,
       }
     }