Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev

config/dev.js

@@ -4,7 +4,7 @@ module.exports = {
   },
   defineConstants: {
     // HOST: '"http://192.168.89.147:8080"',
-    HOST: '"https://sgl-v2-test.njyunzhi.com"',
+    HOST: '"http://sgl-v2-test.njyunzhi.com"',
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
   },
   mini: {},

project.config.json

@@ -2,7 +2,7 @@
   "miniprogramRoot": "./dist",
   "projectname": "miniapp",
   "description": "十公里",
-  "appid": "wx06a7372d48d56843",
+  "appid": "wx835627a9b9b3932a",
   "setting": {
     "urlCheck": true,
     "es6": false,

src/components/List/index.jsx

@@ -14,7 +14,8 @@ export default React.forwardRef((props, ref) => {
     onDataChange,
     noData,
     className,
-    refres,
+    refres,//刷新复位
+    refresherEnabled,
     ...leftProps
   } = props
 
@@ -35,6 +36,10 @@ export default React.forwardRef((props, ref) => {
     }
   }
 
+  const loadingOff = () => {
+    refres()
+  }
+
   const fetchList = () => {
     if (!request) return;
 
@@ -87,38 +92,7 @@ export default React.forwardRef((props, ref) => {
       }).exec()
     })
   }, [])
-  const asd = () => {
-    request({
-      ...params,
-      pageSize,
-      pageNum: pageRef.current.current
-    }).then((res) => {
-      const { records, ...pageInfo } = res || {}
-      const lst = pageInfo.current === 1 ? records || [] : list.concat(records || [])
-      setList(lst)
-      setHasMore(pageInfo.current < pageInfo.pages)
-
-      if (onDataChange) {
-        onDataChange(lst, { paramsChanged: pageInfo.current === 1 })
-      }
-
 
-      pageRef.current = pageInfo
-      setLoading(false)
-      refres()
-
-
-    }).catch((err) => {
-      console.error(err)
-      setLoading(false)
-      refres()
-
-      if (onError) {
-        onError(err)
-      }
-    })
-
-  }
   // https://developers.weixin.qq.com/miniprogram/dev/api/ui/scroll/ScrollViewContext.html
   // ScrollViewContext 透传给父组件
   //https://zh-hans.reactjs.org/docs/hooks-reference.html#useimperativehandle
@@ -126,13 +100,15 @@ export default React.forwardRef((props, ref) => {
     context: contextRef.current,
   }))
 
+
   return (
     <ScrollView
       {...leftProps}
       scrollY
       enhanced
-      refresherEnabled={props}
-      onRefresherrefresh={asd}
+      refresherEnabled={refresherEnabled}
+
+      onRefresherrefresh={fetchRef.current = fetchList}
       onScrollToLower={handleScrollToLower}
       className={`${className} ${uqCls} list-view`}
     >

src/components/ShopUsed/style.less

@@ -19,7 +19,7 @@
     box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
     border-radius: 12px;
     padding: 20px;
-    margin: 0 5px;
+    margin: 0 3px;
     .orderTop{
       display: flex;
       .orderImg{

src/components/foodCards/foodCards.jsx

@@ -13,13 +13,19 @@ const Action = CouponCard.Action
 
 //套餐卡片
 export default (props) => {
-  const { item, st, det, editable, goshop } = props
+  const { item, st, det, editable, goshop, scene, subOrderId, id } = props
   const { shopId } = props.item
   const goFood = () => {
     Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${shopId}` })
   }
+
+  // 支付成功--判断---有---问--没有--跳转到全部订单
+
+
   const handlePayClick = () => {
-    Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}` })
+    Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}&scene=${scene || ''}&subOrderId=${subOrderId}&id=${id}` })
+    console.log("🚀 ~ file: foodCards.jsx ~ line 17 ~ scene", item.packageId, scene)
+
   }
   const PayAction = <Action.Icon icon={Pay} text='支付' onClick={handlePayClick} />
   return (

src/hotel/components/HouseManage/houseManage.jsx

@@ -150,25 +150,26 @@ export default React.forwardRef((props, ref) => {
     setShowCutover3(false)
   }
   return (
-    <view>
-      <view style={{ padding: '0 30rpx', height: '100%' }}>
-        <ToggleRole role='hotel' showCutover={showCutover3} maskClosable={showCutover3} onClose={onClose3} />
-        <View>
-          <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder="请选择民宿" value={hotel?.hotelId} kv={['hotelName', 'hotelId']} dicts={hotelList} onChange={handleHotelChange} /></view>
-          <view onClick={ShowMoldeOn3} className='User-info-cutover'>
-            <image className='User-info-cutover-image' src={cutoverUser} />
-          </view>
-        </View>
+    <View style={{ padding: '0 30rpx', height: '100%', display: 'flex', flexDirection: 'column' }}>
+      <ToggleRole role='hotel' showCutover={showCutover3} maskClosable={showCutover3} onClose={onClose3} />
+      <View style={{ flex: 'none' }}>
+        <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder="请选择民宿" value={hotel?.hotelId} kv={['hotelName', 'hotelId']} dicts={hotelList} onChange={handleHotelChange} /></view>
+        <view onClick={ShowMoldeOn3} className='User-info-cutover'>
+          <image className='User-info-cutover-image' src={cutoverUser} />
+        </view>
+      </View>
+      <View style={{ flex: 'none' }}>
         <SearchBar placeholder='请输入房源名搜索' onBlur={onSearch} />
-        <ShareRoom showCutover={showCutover} onClose={onClose} room={room} onFinish={handleFinish} />
-        <ShareCard showCutover={showCard} onClose={onClose2} />
+      </View>
+      <ShareRoom showCutover={showCutover} onClose={onClose} room={room} onFinish={handleFinish} />
+      <ShareCard showCutover={showCard} onClose={onClose2} />
+      <View style={{ flex: 'auto', overflow: 'hidden', position: 'relative' }}>
         <List
-          style={{ height: 'calc(100vh - 290px)' }}
+          style={{ height: '100%' }}
           request={getRoomList}
           params={queryParams}
           onDataChange={setDetail}
           refresherEnabled={false}
-
           noData="暂无房源信息"
         >
           <view className='waterfall'>
@@ -185,11 +186,10 @@ export default React.forwardRef((props, ref) => {
             }
           </view>
         </List>
-      </view>
-      <view className='addHouse' onClick={handelClick}>
-        <image className='addImg' src={addImg} />添加房源
-      </view>
-
-    </view>
+      </View>
+      <View className='addHouse' onClick={handelClick} style={{ flex: 'none' }}>
+        <Image className='addImg' src={addImg} />添加房源
+      </View>
+    </View>
   )
-})
+})

src/hotel/components/HouseManage/houseManage.less

@@ -51,7 +51,7 @@
   }
 }
 .addHouse{
-  margin: 0 30px 50px;
+  margin-bottom:50px;
   height: 88px;
   background: #274291;
   border-radius: 12px;

src/hotel/components/Income/income.jsx

@@ -1,4 +1,6 @@
 import { useState, useMemo } from 'react'
+import Taro from '@tarojs/taro'
+import { View, Image } from '@tarojs/components';
 import eyes from '@/assets/icons/shopKeeper/eyesON.png'
 import ceyes from '@/assets/icons/shopKeeper/eyesOFF.png'
 import sImg from '@/assets/icons/landlord/money2.png'
@@ -28,32 +30,30 @@ export default (props) => {
     isMomth ? setMonth(false) : setMonth(true)
   }
   return (
-    <view>
-      <view style={{ padding: '30rpx', height: '100%' }}>
-        <view className='storexx'>
-          <view className='storeName'>店名：{hotel.hotelName}</view>
-          <view className='money'>
-            <view className='sleft'>
-              <view className='lword'>全年收入（税前）</view>
-              <view className='yearMoney'>
-                <text>{isyear ? formatPrice(account?.amounts) : '******'}</text>元
-                <image className='micon' src={isyear ? eyes : ceyes} onClick={handleYear} />
-              </view>
+    <view style={{ padding: '30rpx', height: '100%',display:'flex',flexDirection:'column' }}>
+      <view className='storexx' style={{flex:'none'}}>
+        <view className='storeName'>店名：{hotel.hotelName}</view>
+        <view className='money'>
+          <view className='sleft'>
+            <view className='lword'>全年收入（税前）</view>
+            <view className='yearMoney'>
+              <text>{isyear ? formatPrice(account?.amounts) : '******'}</text>元
+              <image className='micon' src={isyear ? eyes : ceyes} onClick={handleYear} />
             </view>
-            <view className='line' />
-            <view className='sright'>
-              <view className='rword'>当月收入（税前）</view>
-              <view className='monthMoney'>
-                <text>{isMomth ? formatPrice(account?.currentCharges) : '******'}</text>元
-                <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
-              </view></view>
           </view>
+          <view className='line' />
+          <view className='sright'>
+            <view className='rword'>当月收入（税前）</view>
+            <view className='monthMoney'>
+              <text>{isMomth ? formatPrice(account?.currentCharges) : '******'}</text>元
+              <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
+            </view></view>
         </view>
-
-        <view className='title' >推广收入记录</view>
-
+      </view>
+      <view className='title' style={{flex:'none'}}>推广收入记录</view>
+      <View style={{flex:'auto',overflow:'hidden',position:'relative'}}>
         <List
-          style={{ height: 'calc(100vh - 375px)' }}
+          style={{ height: '100%' }}
           request={fetchAPI}
           params={queryParams}
           noData={<NoData />}
@@ -70,7 +70,7 @@ export default (props) => {
           )}
         >
         </List>
-      </view>
+      </View>
     </view>
   )
 }

src/hotel/pages/components/Extend/index.jsx

@@ -110,7 +110,7 @@ export default (props) => {
             : item.contentType == 'video' ?
               <View>
                 <SlideView del onDelete={handelDelete}>
-                  <Video className='storezn' style={{ width: '100%', display: 'block' }} src={eimg} />
+                  <Video style={{ width: '100%', display: 'block' }} src={eimg} />
                 </SlideView>
               </View>
               : null

src/hotel/pages/components/Extend/style.less

@@ -48,20 +48,8 @@
     line-height: 64px;
     margin-bottom: 60px;
     text-align: justify;
+    white-space: pre-wrap;
   }
-  // .weui-slideview__btn__wrp{
-  //   background: #FFFFFF;
-  //   box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
-  //   border-radius: 12px;
-  //   margin: 5px 5px 5px 20px;
-  //   height: 97%;
-  //   width: 67px;
-  // }
-  // .weui-slideview__btn{
-  //   width: 44px;
-  //   height: 44px;
-  //   line-height: 44px;
-  // }
   Textarea{
     height: 300px;
     width: 100%;

src/hotel/pages/landlord/addRoom/addRoom.jsx

@@ -32,34 +32,31 @@ export default withLayout((props) => {
   const [paddress, setpAddress] = useState()
   const [wifiName, setwifiName] = useState()
 
-  const tipsMap = () => {
-    Taro.showToast({
-      title: '位置信息添加成功',
-      icon: 'success',
-      duration: 2000
-    })
-  }
-
-
   const onRoomMap = () => {
     Taro.chooseLocation().then((res) => {
-      setRoomModel({ ...roomModel, location: res.longitude + ',' + res.latitude,locName: res.name })
+      setRoomModel({ ...roomModel, location: res.longitude + ',' + res.latitude, locName: res.name })
     })
   }
-
-
-
+  
   const onParkMap = () => {
     Taro.chooseLocation().then((res) => {
-      setRoomModel({ ...roomModel, parkingLocation: res.longitude + ',' + res.latitude, pkLocName: res.name  })
+      setRoomModel({ ...roomModel, parkingLocation: res.longitude + ',' + res.latitude, pkLocName: res.name })
     })
   }
   const sumbit = () => {
     if (
+      roomModel.roomName != null &&
       roomModel.roomName != '' &&
+
+      roomModel.address != null &&
       roomModel.address != '' &&
+
+      roomModel.location != null &&
       roomModel.location != '' &&
+
+      roomModel.weight != null &&
       roomModel.weight != ''
+
     ) {
       const seveices = roomId ? updateRoom : saveRoom
       seveices(roomModel, roomId).then(() => {
@@ -204,7 +201,7 @@ export default withLayout((props) => {
               <mp-cell>
                 <View className='roomloc'>
                   <Label style={{ color: '#666', lineHeight: '30px' }} onClick={onRoomMap} >{roomModel.locName || '请选择定位'}</Label>
-                  <Textarea style={{height:'60px',width:'100%'}} onInput={(e) => setRoomModel({ ...roomModel, address: e.detail.value })} value={roomModel.address} placeholder='请输入房屋位置（必填）' />
+                  <Textarea style={{ height: '60px', width: '100%' }} onInput={(e) => setRoomModel({ ...roomModel, address: e.detail.value })} value={roomModel.address} placeholder='请输入房屋位置（必填）' />
                   <Label style={{ display: 'none' }} >{isError(roomModel.location) ? '房间定位（必填）' : roomModel.location}</Label>
                   <Image className='location' src={GPS} onClick={onRoomMap} />
                 </View>
@@ -216,8 +213,8 @@ export default withLayout((props) => {
                   <mp-cell>
                     <View className='roomloc'>
                       <Label style={{ color: '#666', lineHeight: '30px' }} onClick={onParkMap}>{roomModel.pkLocName || '请选择定位'}</Label>
-                      <Textarea  style={{height:'60px',width:'100%'}} onInput={(e) => setRoomModel({ ...roomModel, parkingAddress: e.detail.value })} value={roomModel.parkingAddress} placeholder='请输入停车场位置' />
-                      <Label style={{display: 'none' }}>{isError(roomModel.parkingLocation) ? '停车场定位' : roomModel.parkingLocation}</Label>
+                      <Textarea style={{ height: '60px', width: '100%' }} onInput={(e) => setRoomModel({ ...roomModel, parkingAddress: e.detail.value })} value={roomModel.parkingAddress} placeholder='请输入停车场位置' />
+                      <Label style={{ display: 'none' }}>{isError(roomModel.parkingLocation) ? '停车场定位' : roomModel.parkingLocation}</Label>
                       <Image className='location' src={GPS} onClick={onParkMap} />
                     </View>
                   </mp-cell>

src/layouts/Loading.jsx

@@ -24,7 +24,7 @@ export default (props) => {
           textAlign: 'center',
           opacity: '0.8',
           animation: ' logo-opacity 2s linear infinite',
-
+          fontSize: '4vw',
         }}
       >
         收集人间美好

src/layouts/index.jsx

@@ -58,6 +58,7 @@ export default (Child) => (props) => {
     })
   }
 
+
   return loading ? <Loading /> : <Child {...props} person={person} router={router} location={location} />
 
 }

src/pages/MineUserAll/ContactMe/index.jsx

@@ -58,7 +58,7 @@ export default withLayout((props) => {
           <Image mode='aspectFit' src='https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20210918145337.png' />
         </view>
         <view className='button-info'>
-          <Button className='button-box' onClick={submit} loading={loading}  disabled={loading} >提交</Button>
+          <Button className='button-box' onClick={submit} loading={loading} disabled={loading}  >提交</Button>
           <Button className='button-box-Cancel' onClick={back} >取消</Button>
         </view>
       </view>

src/pages/PayOrder/index.jsx

@@ -17,7 +17,8 @@ import "./style.less";
 
 export default withLayout((props) => {
   const { router, person } = props;
-  const { packageId, orderId } = props.router.params;
+  console.log("🚀 ~ file: index.jsx ~ line 20 ~ withLayout ~ props", props)
+  const { packageId, orderId, scene, subOrderId, id } = props.router.params;
   const [payInfo, setPayInfo] = useState();
   // 是否已阅读协议
   const [agreement, setAgreement] = useState(false);
@@ -64,14 +65,35 @@ export default withLayout((props) => {
       package: params.packageValue,
       success: () => {
         setPayInfo();
-        Taro.redirectTo({
-          url: "/pages/MineUserAll/AllOrder/index",
-        });
+
         Taro.showToast({
           title: "支付成功",
           icon: "none",
-          duration: 2000,
+          duration: 1000,
         });
+        if (!scene) {
+          Taro.redirectTo({
+            url: "/pages/MineUserAll/AllOrder/index",
+          });
+        } else {
+          Taro.showModal({
+            title: '是否核销',
+            success: function (res) {
+              if (res.confirm) {
+                Taro.navigateTo({
+                  url: `/pages/TobeShop/index?id=${id}&subOrderId=${subOrderId}`,
+                });
+
+              } else if (res.cancel) {
+                Taro.redirectTo({
+                  url: "/pages/MineUserAll/AllOrder/index",
+                });
+              }
+            }
+          })
+        }
+
+
       },
       fail: (e) => {
         Taro.showToast({

src/pages/details/foodDetails/foodDetails.jsx

@@ -217,7 +217,7 @@ export default withLayout((props) => {
                     <text>返现套餐</text>
                   </view>
                   {(spackage || []).map((item) => (
-                    <Cards key={item.packageId} editable='1' st={star} goshop='1' item={item} det={detail} />
+                    <Cards scene={scene} id={id} subOrderId={subOrderId} key={item.packageId} editable='1' st={star} goshop='1' item={item} det={detail} />
                   ))}
                 </view>
                 <view

src/shop/components/Sparead/spreadMoney.jsx

@@ -19,9 +19,7 @@ export default (props) => {
   const [isyear, setYear] = useState(true)
   const [isMomth, setMonth] = useState(false)
 
-  const queryParams = useMemo(() => ({
-
-  }), [])
+  const queryParams = useMemo(() => ({}), [])
 
 
   const reqestAPI = getList(shopMoney?.acc?.accountId)

src/shop/pages/spread/spreadIndex.jsx

@@ -1,11 +1,8 @@
 import React, { useState, useEffect, useRef } from 'react'
 import CustomNav from '@/components/CustomNav'
 import { useRouter } from '@tarojs/taro'
-import baozan from '@/assets/icons/housemantj/bgood.png'
-
-import { getShopList, getShopMoney, getAccount, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
+import { getShopList, getShopMoney, getVerifiedOrder } from '@/services/shopBoss'
 import { withSubscribeMessage } from '@/utils/subscribeMessage'
-import SpinBox from "@/components/Spin/SpinBox";
 import withLayout from '@/layouts'
 import {
   TPL_MESSAGE_SHOP_PAY_SUCCESS,
@@ -22,15 +19,17 @@ import { View } from '@tarojs/components'
 
 export default withLayout((props) => {
   const { router, person } = props
-
   const { params } = useRouter()
-  const { tab } = params || {}
+  const { tab,shopOrderId } = params || {}
   const [currentTab, setCurrentTab] = useState(0)
+  //顶部的商铺列表
   const [shopList, setShopList] = useState([])
+  //当前商铺
   const [shop, setShop] = useState()
+  // const shopOrderId='1a8deba868489b0be19cba941e6f577e'
   const shopId = shop?.shopId
-  const [loading, setLoading] = useState(false)
 
+  
   const [amountType, setAmountType] = useState('order')
   const [isVerified, setisVerified] = useState(0)
   const [shopMoney, setShopMoney] = useState([])
@@ -52,7 +51,12 @@ export default withLayout((props) => {
     getShopList().then((res) => {
       const { shopList: list, shop: current } = res
       setShopList(list)
-      setShop(current)
+      if (shopOrderId) {
+        setShop(list.filter(x=>x.shopId==shopOrderId)[0])
+      }
+      else{
+        setShop(current)
+      }
     })
   }, [])
 
@@ -73,14 +77,11 @@ export default withLayout((props) => {
   }
 
   useEffect(() => {
-    setLoading(true)
     if (shopId) {
       getShopMoney(shopId, amountType).then((e) => {
         setShopMoney(e)
-        setLoading(false)
-      }).catch(setLoading(false))
+      })
     }
-
   }, [amountType, shopId, currentTab])
 
   //店铺选择