feats

src/app.config.js

@@ -29,5 +29,8 @@ export default {
     'scope.userLocation': {
       'desc': '你的位置信息将用于房源信息定位'
     }
+  },
+  useExtendedLib: {
+    weui: true
   }
 }

src/compents/tab/index.jsx

@@ -18,15 +18,11 @@ const getColor = (role) => {
 
 
 const tab = (props) => {
-
     const user = useSelector(state => state.user)
 
     const { value, openType, pageState, formType, color, styleType='', ...prop } = props
 
     const [state, setState] = useState(1)
-    useEffect(() => {
-
-    }, [])
     
     //  &-on{
     //     color: #fed12f;

src/pages/customer/index.js

@@ -73,11 +73,11 @@ const index = (props) => {
     })
 
   }, [props.houseId, props.orderId, regUnFinished])
- 
+
   return (
     <View className='index' >
 
-<NavCustom houseInfo={houseInfo}></NavCustom>
+      <NavCustom houseInfo={houseInfo}></NavCustom>
       {pageState=='1'&&<Register oderId={orderId} dataSource={orderInfo} onFinished={handleRegisterFinished}></Register>}
 
       {pageState!='1'&&<Layout type='custom'>

src/pages/customer/register/index.jsx

@@ -161,26 +161,28 @@ const register = props => {
     setList([...list]);
   };
   const { personNum } = props.dataSource?.houseSetting || {};
+
   return (
      <View className="register">
-      {personNum>0&& <View>
+      {personNum>0&& 
+      <View>
          <Layout>
-        {list.map((x, index) => {
-          let inx = index;
-          return (
-            <InputGroup
-              key={inx}
-              index={index}
-              dataSource={x}
-              onChange={onChangeList(inx)}
-            />
-          );
-        })}
-      </Layout>
-
-      <Tab value={["开启旅程"]} onClick={e => onClick(e)}></Tab>
-       </View>}
-      
+          {list.map((x, index) => {
+            let inx = index;
+            return (
+              <InputGroup
+                key={inx}
+                index={index}
+                dataSource={x}
+                onChange={onChangeList(inx)}
+              />
+            );
+          })}
+        </Layout>
+
+        <Tab value={["开启旅程"]} onClick={e => onClick(e)}></Tab>
+      </View>
+      }
     </View>
   );
 };

src/pages/guide/index.jsx

@@ -165,37 +165,42 @@ const guide = props => {
               )}
             </ContainerLayout>
           </View>
-          <View className="guide-view">
-            <Text className="guide-view-info">停车位置</Text>
-            <ContainerLayout
-              className="guide-view-layout"
-              style={{ display: "flex", justifyContent: "space-between" }}
-              onClick={() => onToMap("park")}
-            >
-              <View>
-                <View className="guide-view-layout-text1">
-                  {detail.shortParking}
-                </View>
-                <View className="guide-view-layout-text2">
-                  {detail.parking}
-                </View>
-              </View>
-              {user.role == userRloe.customer && (
-                <View
-                  style={{
-                    float: "right",
-                    display: "flex",
-                    justifyContent: "center",
-                    flexDirection: "column"
-                  }}
-                  onClick={() => onOpenLocation(detail.parkLngLat)}
+          {
+            detail.parking &&
+            (
+              <View className="guide-view">
+                <Text className="guide-view-info">停车位置</Text>
+                <ContainerLayout
+                  className="guide-view-layout"
+                  style={{ display: "flex", justifyContent: "space-between" }}
+                  onClick={() => onToMap("park")}
                 >
-                  <Image className="icon" src={icon} />
-                  <View className="icontext">去这里</View>
-                </View>
-              )}
-            </ContainerLayout>
-          </View>
+                  <View>
+                    <View className="guide-view-layout-text1">
+                      {detail.shortParking}
+                    </View>
+                    <View className="guide-view-layout-text2">
+                      {detail.parking}
+                    </View>
+                  </View>
+                  {user.role == userRloe.customer && (
+                    <View
+                      style={{
+                        float: "right",
+                        display: "flex",
+                        justifyContent: "center",
+                        flexDirection: "column"
+                      }}
+                      onClick={() => onOpenLocation(detail.parkLngLat)}
+                    >
+                      <Image className="icon" src={icon} />
+                      <View className="icontext">去这里</View>
+                    </View>
+                  )}
+                </ContainerLayout>
+              </View>
+            )
+          }
           <View className="guide-view">
             <Text className="guide-view-info">wifi信息</Text>
             <ContainerLayout

src/pages/house/add/index.jsx

@@ -45,9 +45,6 @@ const houseadd = (props) => {
     <ScrollView scrollY style={{ height: 'calc(100vh - 180rpx)' }} >
     <View className='page-container' >
         <View className='house-add'>
-        
-
-
             <View>
               {userRole == 'guide' && <Guide userRole={userRole} />}
               {userRole == 'recommend' && <Recommend userRole={userRole} />}

src/pages/house/addnewhouse/index.jsx

@@ -70,11 +70,9 @@ const index = (props) => {
         const value = e.detail.value
         const data = {
             ...value,
-            // address: `${value.address}____${value.addressdetail}`,
-            // parking: `${value.parking}____${value.parkingdetail}`,
             lngLat: `${address.latitude || ''},${address.longitude || ''}`,
             parkLngLat: `${parking.latitude || ''},${parking.longitude || ''}`,
-            
+            shopId: user.shopId,
             desc:imgUrl,
         }
         console.log(data,e.detail.value,'formSubmit')

src/pages/house/list/index.jsx

@@ -6,6 +6,7 @@ import React, {
   useImperativeHandle
 } from "react";
 import Taro, { useDidShow } from "@tarojs/taro";
+import { useSelector } from 'react-redux'
 import "./index.scss";
 import { View, Text, Input, Image } from "@tarojs/components";
 import ContainerLayout from "../../../compents/container/index";
@@ -14,11 +15,12 @@ import request from "@/util/request";
 import RecycleList from "@/compents/RecycleList";
 
 let house = (props, ref) => {
+  const user = useSelector(state => state.user)
   const [list, setList] = useState([]);
   const [radioHouse, setRadioHouse] = useState();
   const [width, setWidth] = useState();
   const [height, setHeight] = useState();
-  const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 });
+  const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10, shopId: user.shopId });
   const [total, setTotal] = useState(0);
 
   useImperativeHandle(ref, () => ({
@@ -31,12 +33,11 @@ let house = (props, ref) => {
   const radioHouseState = useMemo(() => props.radioHouseState, [
     props.radioHouseState
   ]);
-
-  wx.setNavigationBarTitle({
-    title: "民宿房源管理"
-  });
+  
 
   const getHouseList = () => {
+    if (!queryParams.shopId) return
+
     request({
       url: "/taHouse",
       params: queryParams
@@ -81,7 +82,9 @@ let house = (props, ref) => {
   }
 
   useEffect(() => {
-    
+    wx.setNavigationBarTitle({
+      title: "民宿房源管理"
+    });
 
     Taro.nextTick(() => {
       Taro.createSelectorQuery()
@@ -133,14 +136,16 @@ let house = (props, ref) => {
     getHouseList();
   }, [queryParams]);
 
+  useEffect(() => {
+      setQueryParams({ ...queryParams, shopId: user.shopId })
+  }, [user.shopId])
+
   // useDidShow(() => {
   //   setQueryParams({ ...queryParams })
   // })
  
   return (
     <View className="houselist">
-     
-
       {(!list || !list.length) && <View className="nodata"> 暂无数据</View>}
       <RecycleList
         height={height}

src/pages/index/index.config.js

@@ -1,5 +1,8 @@
 export default {
   // navigationBarTitleText: '首页',
   navigationStyle: "custom",
-  enableShareAppMessage: true
+  enableShareAppMessage: true,
+  usingComponents: {
+    "mp-actionSheet": "weui-miniprogram/actionsheet/actionsheet"
+  }
 }

src/pages/index/index.jsx

@@ -15,10 +15,10 @@ const index = props => {
   const { houseId, orderId } = router.params;
   const user = useSelector(state => state.user);
 
-  console.log(user);
-
   const dispatch = useDispatch();
 
+  const shopList = (user.shopList || []).map(x => ({text: x.name, value: x.shopId}))
+
   useEffect(() => {
     if (user.role == roleList.landlord) {
       wx.setNavigationBarTitle({
@@ -51,6 +51,11 @@ const index = props => {
     setShowAuthPhone(false);
   };
 
+  const handleSelectShop = e => {
+    const shopId = e.detail.value
+    dispatch({ type: "SET_SHOP", shopId });
+  }
+
   return (
     <View className="index">
       {user.personId && (
@@ -86,6 +91,13 @@ const index = props => {
       {/* </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/share/index.jsx

@@ -10,12 +10,6 @@ import Container from '../../compents/container/index'
 import './index.scss'
 import request from '../../util/request';
 
-// Page({
-//     data: {
-//         text: 'init data',
-//         array: [{ msg: '1' }, { msg: '2' }]
-//     }
-// })
 const defaultImgUrl= 'https://zhiyun-image.oss-cn-shanghai.aliyuncs.com/shigongli/shigongli_share_default-min.jpg'
 
 const Index = () => {
@@ -24,11 +18,12 @@ const Index = () => {
     const user = useSelector(state => state.user)
 
     const now = new Date()
-    const today = now.toJSON().substring(0, 10)
+    const nextDate = new Date()
+    nextDate.setDate(nextDate.getDate() + 1)
 
     const [personNum, setPersonNum] = useState(0)
-    const [startTime, setStartTime] = useState(today)
-    const [endTime, setEndTime] = useState(today)
+    const [startTime, setStartTime] = useState(now.toJSON().substring(0, 10))
+    const [endTime, setEndTime] = useState(nextDate.toJSON().substring(0, 10))
     // const [data,setData] = useState({})
     const [shareObj, setShareObj] = useState()
     const [showShareModal, setShowShareModal] = useState(false)
@@ -73,9 +68,6 @@ const Index = () => {
     }  
 
     const handleShareReady = () => {
-
-
-
         const data = {
             houseId,
             personNum,

src/reducers/user.js

@@ -40,10 +40,28 @@ export default function user(state = INITIAL_STATE, action) {
           wx.setNavigationBarTitle({
             title: '民宿房源管理'
           })
+
+        const shopList = action.user.shopKeeperList.reduce((acc, item) => {
+          const shop = item.taShop
+          if (!shop) return acc
+
+          const exist = !!acc.filter(x => x.shopId === shop.shopId)[0]
+          if (!exist) {
+            acc.push(shop)
+          }
+
+          return acc
+        }, [])
+
+        // 默认当前的, 但是如果有多个, 则需要用户来确定
+        const shopId = shopList.length > 1 ? undefined : shopList[0]
+
         return {
           ...state,
           ...action.user,
           role: 'landlord',
+          shopList,
+          shopId,
           // role: 'customer',
         }
       } else {
@@ -60,6 +78,17 @@ export default function user(state = INITIAL_STATE, action) {
     case 'phone': {
       return state
     }
+    case 'SET_SHOP': {
+      const shopId = action.shopId
+      if (!shopId) {
+        return state
+      }
+
+      return {
+        ...state,
+        shopId
+      }
+    }
 
     default:
       return state