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

project.config.dev.json

@@ -4,7 +4,7 @@
   "description": "十公里",
   "appid": "wx835627a9b9b3932a",
   "setting": {
-    "urlCheck": true,
+    "urlCheck": false,
     "es6": false,
     "postcss": false,
     "minified": false

src/components/AuthPage/login.less

@@ -30,20 +30,16 @@
   bottom: 80px;
   width: 100%;
   vertical-align: middle;
-
   radio-group {
     display: inline-block;
     vertical-align: middle;
   }
-
   radio {
     transform: scale(.8);
   }
-
   view {
     display: inline-block;
     vertical-align: middle;
-
     text{
       color: #274190;
       text-decoration: underline;

src/components/BossCard/index.jsx

@@ -1,6 +1,6 @@
 import Taro from '@tarojs/taro'
 import { View, Text } from '@tarojs/components'
-import Pay from '@/assets/icons/GuideCheck/Pay_logo.png'
+import Pay from '@/assets/icons/housemantj/pay.png'
 import { getQueryString } from '@/utils/index'
 import CouponCard from '@/components/CouponCard'
 import { compressImage } from '@/utils'
@@ -33,7 +33,7 @@ export default (props) => {
       <CouponMedia onClick={goFood}>
         <CouponMedia.Header
           cashback={item.cashback}
-          image={compressImage(item.poster)}
+          image={compressImage(item.poster, 'thumb')}
           badge='food'
         />
         <CouponMedia.Body star={st}>

src/components/CompoentsOrder/OrderCard/index.jsx

@@ -9,7 +9,7 @@ import { getQrcode } from '@/services/miniapp'
 import QRcode from "@/assets/icons/UserCenter/QRcode.png";
 import refund from "@/assets/icons/GuideCheck/refund.png";
 import Cancel from "@/assets/icons/UserCenter/Cancel.png";
-import Pay from "@/assets/icons/GuideCheck/Pay_logo.png";
+import Pay from "@/assets/icons/housemantj/pay.png";
 import Null from "@/assets/icons/UserCenter/null_logo.png";
 import Evaluated from "@/assets/icons/UserCenter/evaluated.png";
 import Refund from "@/assets/icons/UserCenter/Refund.png";
@@ -75,16 +75,6 @@ export default (props) => {
       url: `/pages/MineUserAll/RefundMoney/CheckRefund/index?id=${item.orderId}`,
     });
   };
-  // const PayAction =
-  //   kkp == '1' ? null ://空卡片用于售后详情页面
-  //     sh == '1' ? <Action.Icon icon={Refund} text='售后/退款' onClick={() => handleRefund(item)} /> ://售后页面卡片
-  //       item.status === 0 ? <Action.Icon icon={Pay} text='支付' onClick={handleDetail} /> ://待支付
-  //         item.status === 1 && item.isVerified == false ? <Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} /> ://待核销
-  //           item.status === 2 && item.isVerified == false ? <Action.Image image={refund} /> ://已退费
-  //             item.status === 7 && item.isVerified == false ? <Action.Image image={Cancel} /> ://已取消
-  //               item.status === 9 ? <Action.Image image={Null} /> ://已过期
-  //                 item.isVerified == true && item.isEvaluated > 0 ? <Action.Image image={Evaluated} /> ://已评价
-  //                   item.isVerified == true ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} /> : null//待评价
 
   let PayAction = null
   if (kkp == '1') {//空卡片用于售后详情页面

src/components/CouponCard/Action/IconAction.jsx

@@ -18,7 +18,7 @@ export default (props) => {
     <View className='cpn-action cpn-icon-action'>
       <View onClick={handleClick}>
         <Image src={icon} />
-        {text?<Text>{text}</Text>:null}
+        {text?<Text style={{color:text=='支付'?'#FC9C57':'#202020'}}>{text}</Text>:null}
       </View>
     </View>
   )

src/components/CouponCard/Media/Header.jsx

@@ -14,7 +14,7 @@ export default (props) => {
       {enableCashback && <Cashback money={cashback} style={{ marginTop: '-10px' }} />}
       <View className='coupun-media_thumb'>
         <BadgeTag type={badge} />
-        <Image src={image} />
+        <Image src={image} webp />
       </View>
     </View>
   )

src/components/SearchBar/style.less

@@ -1,41 +1,27 @@
-
 .searchBar{
   margin: 35px 0;
   .weui-search-bar{
     padding: 0px;
     border-radius: 45px;
     background: #F8F8F8;
-
-    .weui-search-bar__label{
-      background: #F8F8F8;
-    }
     .weui-search-bar__form{
       border-radius: 45px;
       background: #F8F8F8;
-      
-
     }
-
     .weui-search-bar__label{
       border-radius: 45px;
       background: #F8F8F8;
-
-
     }
     .weui-search-bar__input{
       text-align: center;
       background: #F8F8F8;
-
-    }
-  
+    }  
     .weui-search-bar__cancel-btn{
       position: relative;
       left: -10px;
       font-size: 31px;
       padding-left: 5px;
       background: #F8F8F8;
-
-
     }
   }
 }

src/components/foodCards/foodCards.jsx

@@ -1,11 +1,13 @@
 import Taro from '@tarojs/taro'
-import { View, Text } from '@tarojs/components'
+import { View, Text, Image, Button, ScrollView } from '@tarojs/components'
 import CouponCard from '@/components/CouponCard'
 import Location from '@/components/Location'
 import { compressImage } from '@/utils'
 import SaveIcon from '@/components/SaveIcon'
 import Pay from '@/assets/icons/housemantj/pay.png'
+import Popup from '@/components/Popup'
 import './style.less'
+import { useState } from 'react'
 
 
 const CouponMedia = CouponCard.Media
@@ -13,25 +15,45 @@ const Action = CouponCard.Action
 
 //套餐卡片
 export default (props) => {
-  const { item, st, det, editable, goshop, scene, subOrderId, id } = props
+  const { item, st, det, editable,setScroll, goshop, scene, subOrderId, id } = props
   const { shopId } = props.item
   const goFood = () => {
     Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${shopId}` })
   }
+  const [showCutover, setShowCutover] = useState(false)
+  const goDetail = () => {
+    //打开当前套餐详情弹窗
+    setShowCutover(true)
+    //使父组件禁止滚动
+    setScroll(false)
+  }
+  const onClose = () => {
+    //关闭当前套餐详情弹窗
+    setShowCutover(false)
+    //使父组件恢复滚动
+    setScroll(true)
+  }
 
-  // 支付成功--判断---有---问--没有--跳转到全部订单
 
 
   const handlePayClick = () => {
     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 (
-    <View style={{ margin: '15px 5px' }}>
+    <View style={{ margin: '15px 5px' }} >
+      <View className='packageDetail' style={{display:goshop?'':'none'}}>
+        <Popup show={showCutover} maskClosable={showCutover}  onClose={onClose}>
+          <ScrollView
+            scrollY
+            style={{ maxHeight: '60vh' }}
+          >
+            <Image mode='widthFix' src={item.details ? item.details : item.poster} />
+          </ScrollView>
+        </Popup >
+      </View>
       <CouponCard action={PayAction}>
-        <CouponMedia onClick={goshop ? '' : goFood}>
+        <CouponMedia onClick={goshop ? goDetail : goFood}>
           <CouponMedia.Header
             cashback={item.cashback}
             image={compressImage(item.poster)}

src/components/foodCards/style.less

@@ -35,4 +35,13 @@
       flex: 1;
     }
   }
+}
+.packageDetail{
+  Image{
+    width: 100%;
+  }
+  .weui-dialog__bd{
+    padding: 0;
+    margin: 0;
+  }
 }

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

@@ -1,28 +1,28 @@
-#det{
-  .editword{
+#det {
+  .editword {
     padding-top: 60px;
-    .srl{
+    .srl {
       font-size: 30px;
       font-weight: bold;
       color: #202020;
-    }  
-    .mg{
+    }
+    .mg {
       font-size: 38px;
       margin: 0 20px 50px 20px;
     }
-    .rzline{
+    .rzline {
       border-top: 2px #999 dashed;
       height: 2px;
       width: 160px;
       display: inline-block;
       margin-bottom: 8px;
-    } 
-    .cancel{
+    }
+    .cancel {
       color: #274290;
       display: inline-block;
       margin-right: 44px;
-      width: 240px;      
-      font-size: 30px;      
+      width: 240px;
+      font-size: 30px;
       font-weight: bold;
       height: 78px;
       line-height: 78px;
@@ -34,30 +34,41 @@
       letter-spacing: 3px;
       width: 240px;
       height: 78px;
-      font-size: 30px;      
+      font-size: 30px;
       line-height: 78px;
       background: #274290;
       font-weight: bold;
       border-radius: 12px;
       display: inline-block;
       color: #fff;
-    }  
+    }
   }
-  .storezn{
+  .storezn {
+    // color: #202020;
+    // line-height: 64px;
+    // margin-bottom: 60px;
+    // overflow: hidden;
+    // text-align: justify;
+    // white-space: pre-wrap;
+
     color: #202020;
     line-height: 64px;
     margin-bottom: 60px;
+    overflow: hidden;
     text-align: justify;
+    padding: 0 21px 0 11px;
+    /* padding-right: -12px; */
     white-space: pre-wrap;
+    overflow-wrap: break-word;
   }
-  Textarea{
+  Textarea {
     height: 300px;
     width: 100%;
     padding: 30px;
-    background: #F8F8F8;
+    background: #f8f8f8;
     border-radius: 8px;
     box-sizing: border-box;
     height: 254px;
     font-size: 26px;
   }
-}
+}

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

@@ -34,13 +34,14 @@ export default withLayout((props) => {
 
   const onRoomMap = () => {
     Taro.chooseLocation().then((res) => {
-      setRoomModel({ ...roomModel, location: res.longitude + ',' + res.latitude, locName: res.name })
+      console.log("🚀 ~ file: addRoom.jsx ~ line 37 ~ Taro.chooseLocation ~ res", res)
+      setRoomModel({ ...roomModel, location: res.longitude + ',' + res.latitude, locName: res.name, address: res.address })
     })
   }
-  
+
   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, parkingAddress: res.address })
     })
   }
   const sumbit = () => {
@@ -174,7 +175,7 @@ export default withLayout((props) => {
         <CustomNav title={hotelName} />
       </view>
       <view className='roomDetail' style={{ height: '100%', overflow: "hidden", }} >
-        <scroll-view scrollY style={{ height: '100%' }}>
+        <scroll-view scrollY style={{ height: '87%' }}>
           <View id='det'>
             <Popup show={showCutover} onClose={onClose}>
               <View className='editword'>

src/hotel/pages/landlord/addRoom/addRoom.less

@@ -56,14 +56,27 @@
     }
   }
   .button-OK {
-    height: 92px;
+    // height: 92px;
+    // background: #274291;
+    // margin: 60px 0 30px 0;
+    // letter-spacing: 5px;
+    // line-height: 92px;
+    // border-radius: 12px;
+    // font-size: 30px;
+    // font-weight: bold;
+    // color: #fff;
+    /* height: 95rpx; */
+
     background: #274291;
-    margin: 60px 0 30px 0;
-    letter-spacing: 5px;
-    line-height: 92px;
-    border-radius: 12px;
-    font-size: 30px;
+    margin: 60rpx 0 30rpx 0;
+    letter-spacing: 5rpx;
+    line-height: 92rpx;
+    border-radius: 12rpx;
+    font-size: 30rpx;
     font-weight: bold;
     color: #fff;
+    position: fixed;
+    top: 37em;
+    width: 23em;
   }
 }

src/layouts/Loading.jsx

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

src/pages/MineUserAll/AllOrder/index.jsx

@@ -1,11 +1,33 @@
-import { useState, useEffect, } from 'react'
-import { Taro, useRouter } from '@tarojs/taro'
+import { useState, useEffect, useMemo, } from 'react'
+import { Current, Taro, useRouter } from '@tarojs/taro'
 import { View } from '@tarojs/components'
 import withLayout from '@/layouts'
 import CustomNav from '@/components/CustomNav'
 import Complete from '@/components/CompoentsOrder/complete'
 import './style.less'
 
+const tabs = ['全部', '待支付', '待核销', '已使用', '已过期'].map(x => ({ title: x }))
+
+const TabBar = (props) => {
+  const handleClick = (e) => {
+    const { index } = e.detail
+    props.onClick(index)
+  }
+
+  return (
+    <mp-tabs
+      tabClass='tabs-extend'
+      activeClass='tabs-extend-active'
+      swiperClass='tabs-extend-swiper'
+      tabUnderlineColor='#000'
+      tabs={tabs}
+      activeTab={props.current}
+      onTabclick={handleClick}
+    >
+    </mp-tabs>
+  )
+}
+
 
 export default withLayout((props) => {
   const [activeTab, setActiveTab] = useState(0)
@@ -13,7 +35,6 @@ export default withLayout((props) => {
   const { params } = useRouter()
   const { tabJump } = params || {}
 
-
   useEffect(() => {
     if (tabJump) {
       setActiveTab(tabJump - 0)
@@ -21,52 +42,22 @@ export default withLayout((props) => {
   }, [tabJump])
 
 
+  const handleTabClick = (index) => {
+    console.log('------tab-----event--------', index)
+    setActiveTab(index)
 
-  const tabs = [
-    {
-      title: '全部',
-    },
-    {
-      title: '待支付',
-
-    },
-    {
-      title: '待核销',
-
-    },
-    {
-      title: '已使用',
-
-    },
-    {
-      title: '已过期',
+  }
 
-    },
-  ]
+  console.log('------setActiveTab--------', activeTab)
 
-  const handleTabChange = (e) => {
-    const { index } = e.detail
-    setActiveTab(index)
-  }
   return (
     <view className='page-index box-content'>
-      <view className='index-navbar'>
+      <view className='index-navbar'  >
         <CustomNav title='我的订单' />
       </view>
-      <View className='index-container' style={{display:'flex',flexDirection:'column',boxSizing:'border-box'}}>
+      <View className='index-container' style={{ display: 'flex', flexDirection: 'column', boxSizing: 'border-box' }}>
         <view className='index-tabs'>
-          <mp-tabs
-            tabClass='tabs-Unselected'
-            swiperClass='tabs-swiper'
-            activeClass='tabs-Selected'
-            tabUnderlineColor='#000'
-            tabInactiveTextColor='#C0C8D3'
-            tabs={tabs}
-            current={activeTab}
-            onChange={handleTabChange}
-            activeTab={activeTab}
-          >
-          </mp-tabs>
+          <TabBar onClick={handleTabClick} current={activeTab} />
         </view>
         {activeTab === 0 && <Complete />}
         {activeTab === 1 && <Complete type={0} />}

src/pages/MineUserAll/AllOrder/style.less

@@ -3,25 +3,24 @@
   .index-tabs {
     width: 100%;
 
-    .tabs-Unselected {
+    .tabs-extend {
       width: 20vw;
       text-align: center;
-      height: 26px;
+      line-height: 84px;
+      height: 84px;
       font-size: 28px;
       font-weight: bold;
       color: #c0c8d3;
+      box-sizing: border-box;
     }
-    .tabs-swiper {
-      max-height: 0px;
-    }
-    .tabs-Selected {
-      height: 30px;
-      font-size: 32px;
-      font-weight: bold;
+
+    .tabs-extend-active {
       color: #4c4c4c;
-      padding-top: 33px;
-      padding-bottom: 28px;
       border-bottom: 5px solid black;
     }
+
+    .tabs-extend-swiper {
+      max-height: 0;
+    }
   }
 }

src/pages/details/foodDetails/foodDetails.config.js

@@ -2,6 +2,8 @@ export default {
   navigationBarTitleText: '美食详情',
   navigationStyle: 'custom',
   disableScroll: true,
-
-  enableShareAppMessage: true
+  enableShareAppMessage: true,
+  usingComponents: {
+    "mp-dialog": "weui-miniprogram/dialog/dialog",
+  }
 }

src/pages/details/foodDetails/foodDetails.jsx

@@ -126,7 +126,7 @@ export default withLayout((props) => {
       imageUrl: detail.poster,
     };
   });
-
+ const [isScroll,setScroll]=useState(true)
   return (
     <view className='page-index'>
       <view className='index-navbar'>
@@ -134,7 +134,7 @@ export default withLayout((props) => {
       </view>
       <SpinBox loading={loading} className='index-container' style={{ padding: '0 30rpx' }}>
         <scroll-view
-          scrollY
+          scrollY={isScroll}
           style={{ height: '100%' }}
         >
           <view className='storeDetails'>
@@ -217,7 +217,7 @@ export default withLayout((props) => {
                     <text>返现套餐</text>
                   </view>
                   {(spackage || []).map((item) => (
-                    <Cards scene={scene} id={id} subOrderId={subOrderId} key={item.packageId} editable='1' st={star} goshop='1' item={item} det={detail} />
+                    <Cards scene={scene} id={id} setScroll={setScroll} subOrderId={subOrderId} key={item.packageId} editable='1' st={star} goshop='1' item={item} det={detail} />
                   ))}
                 </view>
                 <view

src/pages/index/components/Card/style.less

@@ -6,11 +6,9 @@
   margin-bottom: 30px;
   break-inside: avoid;
   position: relative;
-
   width: calc(100% - 30px);
   box-sizing: border-box;
   margin-left: 15px;
-
   .cardTop{
     border-radius: 24px 24px 0px 0px;
     .cCardimg{
@@ -40,10 +38,8 @@
       color: #404040;
       text-align: justify;
     }
-
     .cCBottom {
-      display: flex;
-    
+      display: flex;    
       .cCleft{
         flex: 3;
         position: relative;

src/pages/index/tabbar.js

@@ -1,8 +1,8 @@
 
 const tabbar = [
-  {
+  {//recommend_active
     text: '老板推荐',
-    iconPath: require('@/assets/icons/tabbar/recommend.png'),
+    iconPath: require('@/assets/icons/tabbar/recommend.gif'),
     selectedIconPath: require('@/assets/icons/tabbar/recommend_active.png'),
   },
   {

src/pages/index/tabs/Guide.jsx

@@ -253,9 +253,10 @@ export default (props) => {
             <text className='title-title-boss' >老板推荐好吃的</text>
           </view>
         </view>
-        <view style={{ marginTop: '10rpx', marginBottom: '60rpx' }}>
+        <view style={{ marginTop: '10rpx', paddingBottom: '60rpx' }}>
           {(spackage || []).map((item, index) => <BossCard det={item} st={parseFloat(item.score.toFixed(1))} key={(index)} trackClick={trackClick} taRoomContent={taRoomContent} item={item} />)}
         </view>
+        {/* <Image src={} /> */}
       </view>
     </scroll-view>
   )

src/pages/index/tabs/Recommend.jsx

@@ -11,6 +11,7 @@ import { getIndexType, getResourceList } from '@/services/home'
 import { random } from '@/utils'
 import Card from '../components/Card'
 import './less/Recommend.less'
+import { OfficialAccount } from '@tarojs/components'
 
 const listStyle = { height: '100%' }
 
@@ -32,17 +33,18 @@ export default (props) => {
 
   //分类标签
   const tabs = [{ title: '附近' }].concat(typeList.map(x => ({ ...x, title: x.typeName })))
-  //切换上面的标签
-  const handleTabChange = (e) => {
-    const { index } = e.detail
+  const details=(index,tab)=>{
     setActiveTab(index)
-    const tab = tabs[index].typeId || ''
-
     setQueryParams({
       ...queryParams,
       typeId: tab
     })
   }
+  //切换上面的标签
+  const handleTabChange = (e) => {
+    const { index } = e.detail
+    details(index,tabs[index].typeId||'')
+  }
 
   const handleDataChange = (value, e) => {
     if (e.paramsChanged) {
@@ -61,6 +63,8 @@ export default (props) => {
     //查询分类标签表
     getIndexType({ pageSize: 20 }).then((res) => {
       setTypeList(res.records || [])
+      details(1,res.records[0].typeId)
+
     })
   }, [])
 
@@ -75,6 +79,7 @@ export default (props) => {
 
   return (
     <view style={{ height: '100%', overflow: 'hidden', display: 'flex', flexDirection: 'column' }}>
+      <OfficialAccount>s21</OfficialAccount>
       <view className='search' onClick={onSearch} >
         <input className='searchInput' disabled />
         <image className='searchicon' src={iconsearch} />

src/utils/index.js

@@ -61,15 +61,17 @@ export function random(prefix) {
  * @param {*} url 
  * @returns 
  */
-export function compressImage(url) {
+export function compressImage(url, typ) {
   if (!url) return url;
 
   // GIF 不压缩
   if (url.indexOf('.gif') > -1) return url;
 
+  const style = typ || 'cmp80'
+
   // eslint-disable-next-line no-undef
   if (url.indexOf(OSS) > -1) {
-    return `${url}?x-oss-process=style/cmp80`
+    return `${url}?x-oss-process=style/${style}`.replace('http://', 'https://')
   }
 
   return url;