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

src/components/add-tips/index.wxss

   justify-content: flex-end;
   align-items: flex-end;
   flex-direction: column;
-  width: 600px;
+  /* width: 600px; */
 }
 .arrow {
   width: 0;

src/components/add-tipsFood/index.js

+
+const STORAGE_KEY = 'PLUG-ADD-MYAPP-KEY'
+Component({
+  properties: {
+    name: {
+      type: String,
+      value: '测试'
+    },
+    duration: {
+      type: Number,
+      value: 10
+    },
+    delay: {
+      type: Number,
+      value: 2
+    },
+    logo: {
+      type: String,
+      value: 'https://cdn.blog.makergyt.com/mini/assets/component-add_tips.png'
+    },
+    custom: {
+      type: Boolean,
+      value: false
+    }
+  },
+  lifetimes: {
+    attached: function () {
+      if (wx.getStorageSync(STORAGE_KEY)) return;
+      //取胶囊位置
+      let rect = wx.getMenuButtonBoundingClientRect ? wx.getMenuButtonBoundingClientRect() : null
+      //取屏幕宽度
+      let { screenWidth } = wx.getSystemInfoSync()
+      this.setData({
+        navbarHeight: rect.bottom,
+        arrowR: screenWidth - rect.right + rect.width * 0.5 / 1 - 20,
+        bodyR: screenWidth - rect.right
+      })
+      this.startTimer = setTimeout(() => {
+        this.setData({
+          SHOW_TOP: true
+        })
+      }, this.data.delay * 1000)
+      this.duraTimer = setTimeout(() => {
+        this.shrink();
+      }, (this.data.duration + this.data.delay) * 1000)
+    },
+    detached: function () {
+      if (this.startTimer) clearTimeout(this.startTimer)
+      if (this.duraTimer) clearTimeout(this.duraTimer)
+    },
+  },
+  data: {
+    SHOW_TOP: false
+  },
+  methods: {
+    hiddenButton: function () {
+      // wx.setStorageSync(STORAGE_KEY, true)
+      this.shrink()
+    },
+    shrink: function () {
+      this.animate('#add-tips', [
+        { scale: [1, 1] },
+        { scale: [0, 0], ease: 'ease', transformOrigin: `calc(600rpx - ${this.data.arrowR}px) 2%` }
+      ], 500, function () {
+        this.setData({
+          SHOW_TOP: false
+        })
+      }.bind(this))
+    }
+  }
+})
+

src/components/add-tipsFood/index.json

+{
+  "component": true
+}

src/components/add-tipsFood/index.wxml

+<view class="box" wx:if="{{SHOW_TOP}}" style="top:{{custom?navbarHeight:0}}px;" id="add-tips">
+  <view class='arrow' style="margin-right:{{arrowR}}vw;"></view>
+  <view class='body' bindtap='hiddenButton' style="margin-right:{{bodyR}}px;">
+    <image src="{{logo}}" class="logo"></image>
+    <view class="tips">更多美食优惠点这里</view>
+  </view>
+</view>

src/components/add-tipsFood/index.wxss

+.box {
+  position: absolute;
+  left: 0;
+  z-index: 999;
+  display: flex;
+  justify-content: flex-end;
+  align-items: flex-end;
+  flex-direction: column;
+  margin-left: 20px;
+}
+.arrow {
+  width: 0;
+  height: 0;
+  border-width: 18px;
+  border-style: solid;
+  border-color: transparent transparent rgba(252, 156, 87, 0.9) transparent;
+}
+.body {
+  background-color: rgba(252, 156, 87, 0.9);
+  border-radius: 15rpx;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-justify-content: center;
+  -ms-flex-pack: center;
+  justify-content: center;
+  padding: 20rpx 20rpx;
+  width: 318px;
+  height: 20px;
+}
+.tips {
+  flex: 1;
+  color: #fff;
+  font-size: 30px;
+  /* font-weight: 700; */
+}
+.logo {
+  height: 35px;
+  width: 35px;
+  border-radius: 8px;
+  margin-right: 10px;
+}
+
+.button-view {
+  color: #04b040;
+  text-align: center;
+  font-size: 20px;
+  /* line-height: 22px; */
+  display: initial;
+}

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

       <view className='index-navbar'>
         <CustomNav title={hotelName} />
       </view>
-      <view className='roomDetail' style={{ height: '100%', overflow: "hidden", }} >
-        <scroll-view scrollY style={{ height: '100%' }}>
+      <view className='roomDetail' style={{ height: '100%', display: 'flex', flexDirection: 'column', overflow: 'hidden' }} >
+        <scroll-view scrollY style={{ height: '100%', position: 'relative', overflow: "hidden", flex: 'auto' }}>
           <View id='det'>
             <Popup show={showCutover} onClose={onClose}>
               <View className='editword'>
               </mp-cell>
             </mp-cells>
             {roomId ? <>
-                <view className='weui-cells__title'>其他指引</view>
-                {
-                  extend == '' ? null :
-                    <>
-                      {extend.map((item) => (
-                        <Extend key={item.extId} item={item} setReset={setReset} />
-                      ))}
-                    </>
-                }
+              <view className='weui-cells__title'>其他指引</view>
+              {
+                extend == '' ? null :
+                  <>
+                    {extend.map((item) => (
+                      <Extend key={item.extId} item={item} setReset={setReset} />
+                    ))}
+                  </>
+              }
             </> : null
             }
           </mp-form>
             </View>
           </> : null
           }
-          <Button className='button-OK' onClick={sumbit}>确定</Button>
         </scroll-view>
+        <Button className='button-OK' onClick={sumbit}>确定</Button>
       </view>
     </view>
   )

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

       }
     }
   }
-
+}
   .button-OK {
-    height: 92px;
+    flex: none;
     background: #274291;
-    margin: 60px 0 30px 0;
+    margin: 30px 0 20px 0;
     letter-spacing: 5px;
     line-height: 92px;
     border-radius: 12px;
     font-weight: bold;
     color: #fff;
   }
-
-}

src/pages/MineUserAll/AllOrder/index.jsx

 
 
   const handleTabClick = (index) => {
-    console.log('------tab-----event--------', index)
     setActiveTab(index)
 
   }
 
-  console.log('------setActiveTab--------', activeTab)
 
   return (
     <view className='page-index box-content'>

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

   enableShareAppMessage: true,
   usingComponents: {
     "mp-dialog": "weui-miniprogram/dialog/dialog",
+    "add-tipsFood": "../../../components/add-tipsFood/index"
+
   }
 }

src/pages/details/foodDetails/foodDetails.jsx

 import useSave from "@/utils/hooks/useSave";
 import useLike from "@/utils/hooks/useLike";
 import Extend from "../components/Extend/extend";
+import logo from "./laba.png";
+
 import "./foodDetails.less";
 
 export default withLayout((props) => {
   const { router, person, location } = props;
   const { id, subOrderId, scene } = props.router.params;
 
+
   useEffect(() => {
     if (id && (scene || subOrderId)) {
       getVerifyTargetList({
   const [isSaved, toggleSave] = useSave(detail.isSaved, "shop", id);
   const [isLike, toggleLike] = useLike(detail.isLike, "shop", id);
 
+  //引导显隐
+  const [guidance, setGuidance] = useState('shareOff')
+  //引导显隐
+
+  useEffect(() => {
+    if (router.params.scene || router.params.enterType === "share") {
+      setGuidance('shareOn')
+    }
+  }, [router.params.enterType, router.params.scene])
+
+
+
+
+
+
   //本店指南
   const [extend, setExtend] = useState([]);
 
   const log = useRef("");
   const lat = useRef("");
 
-
   const handlePhone = () => {
     if (!detail.phone) {
       Taro.showToast({
 
   // 分享
   useShareAppMessage(() => {
+    // setShareAppMessage('shareOff')
     return {
       title: detail.shopName,
-      path: `/pages/details/foodDetails/foodDetails?id=${id}&subOrderId=${subOrderId}`,
+      path: `/pages/details/foodDetails/foodDetails?id=${id}&subOrderId=${subOrderId}&enterType=share`,
       imageUrl: detail.poster,
+
     };
   });
- const [isScroll,setScroll]=useState(true)
+  const [isScroll, setScroll] = useState(true)
   return (
     <view className='page-index'>
+      {
+        guidance === 'shareOn' && (<add-tipsFood logo={logo} custom duration={-1} />)
+      }
+      {/* <add-tipsFood custom duration={-1} /> */}
       <view className='index-navbar'>
         <CustomNav title='十公里' />
       </view>

src/pages/index/index.jsx

 
 export default withLayout((props) => {
   const { router, person, location } = props
+  console.log("🚀 ~ file: index.jsx ~ line 25 ~ withLayout ~ router", router)
   let { roomId, roomOrderId } = router.params
   const { roomId: rid } = useModel('hotel')