Merge branch 'master' of http://git.ycjcjy.com/shigongli/client-miniapp

config/dev.js

@@ -5,9 +5,9 @@ module.exports = {
   },
   defineConstants: {
     // HOST: '"http://localhost:7080"',
-    // HOST: '"https://sgl.ycjcjy.com"',
-    // HOST: '"http://192.168.31.211:7080"',
-    HOST: '"http://192.168.211.105:7080"',
+    // HOST: '"https://sgl.njyunzhi.com"',
+    HOST: '"http://192.168.31.211:7080"',
+    // HOST: '"http://192.168.211.105:7080"',
  
     // OSS_PATH: "https://njcj.oss-cn-shanghai.aliyuncs.com/",
     // OSS_FAST_PATH: "https://njcj.oss-accelerate.aliyuncs.com/",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "shigongliApp",
-  "version": "1.0.0",
+  "version": "0.0.10",
   "private": true,
   "description": "十公里小程序",
   "templateInfo": {

src/compents/navcustom/index.jsx

@@ -50,7 +50,7 @@ const NavCustom = props => {
                   height: 40,
                   borderRadius: 20,
                   margin:0,
-                  background: "#000"
+                 
                 }}
                 src={taShop.logo}
               ></Image>

src/pages/customer/register/index.jsx

@@ -7,6 +7,8 @@ import ContainerLayout from "../../../compents/container/index";
 import Tab from "../../../compents/tab";
 import Layout from "../../../layout";
 import request from "@/util/request";
+import { useSelector, } from 'react-redux'
+
 
 const InputGroup = props => {
   const [name, setName] = useState(props.dataSource.name);
@@ -83,6 +85,7 @@ const InputGroup = props => {
 
 const register = props => {
   let [list, setList] = useState([]);
+  const user = useSelector(state => state.user)
   useEffect(() => {
     if (props.dataSource) {
       const { personNum } = props.dataSource.houseSetting || {};
@@ -107,28 +110,51 @@ const register = props => {
       return;
     }
 
+  
+
+    const {subscribeMessageList=[]}= user
+    wx.requestSubscribeMessage({
+        tmplIds: subscribeMessageList.filter(x=>x.type==='check-out').map(x=>x.code),
+        success (res) { 
+          console.log(res,'-------2222222----------')
+          postRegister()
+        },
+        fail (err) { 
+          console.log(err,'-------err----------')
+        },
+        
+        complete (res) { 
+          console.log(res,'-------2222222-00---------')
+        },
+
+        
+      })
+
+   
+  };
+
+  const postRegister=()=>{
     const data = {
       orderId: props.dataSource.orderId,
       houseId: props.dataSource.houseSetting.houseId,
       personList: list
     };
-
     request({ url: "/taHousePerson", method: "POST", data })
-      .then(res => {
-        if (props.onFinished) {
-          props.onFinished(res);
-        }
-      })
-      .catch(err => {
-        console.error(err);
-        const message = err.message || err.errMsg || err;
-        Taro.showToast({
-          title: message,
-          icon: "none",
-          duration: 3000
-        });
+    .then(res => {
+      if (props.onFinished) {
+        props.onFinished(res);
+      }
+    })
+    .catch(err => {
+      console.error(err);
+      const message = err.message || err.errMsg || err;
+      Taro.showToast({
+        title: message,
+        icon: "none",
+        duration: 3000
       });
-  };
+    });
+  }
 
   const onChangeList = index => value => {
     list[index] = value;

src/pages/house/addnewhouse/index.jsx

@@ -93,8 +93,8 @@ const index = (props) => {
     const onParkingAdderssChange = (e) => {
         console.log(e,'formReset')
         setParking({
-            ...address,
-            parking:e.detail.value
+            ...parking,
+            address:e.detail.value
         })
     }
     

src/pages/house/household/index.config.js

@@ -1,3 +1,3 @@
 export default {
-    navigationBarTitleText: '民宿房源管理',
+    navigationBarTitleText: '查看入住人',
 }

src/pages/share/index.jsx

@@ -16,10 +16,13 @@ import request from '../../util/request';
 //         array: [{ msg: '1' }, { msg: '2' }]
 //     }
 // })
+const defaultImgUrl= 'https://zhiyun-image.oss-cn-shanghai.aliyuncs.com/shigongli/shigongli_share_default-min.jpg'
 
 const Index = () => {
     const router = useRouter()
     const { houseId,title } = router.params
+    const user = useSelector(state => state.user)
+
     const [personNum, setPersonNum] = useState()
     const [startTime, setStartTime] = useState('')
     const [endTime, setEndTime] = useState('')
@@ -44,8 +47,31 @@ const Index = () => {
         setStartTime(e.detail.value)
     }
 
+    const   handSubscribeMessage=()=>{
+        const {subscribeMessageList=[]}= user
+        wx.requestSubscribeMessage({
+            tmplIds: subscribeMessageList.filter(x=>x.type==='settled-in').map(x=>x.code),
+            success (res) { 
+              console.log(res,'-------2222222----------')
+              handleShareReady()
+            //   setShowShareModal(false)
+            },
+            fail (err) { 
+              console.log(err,'-------err----------')
+            },
+            
+            complete (res) { 
+              console.log(res,'-------2222222-00---------')
+            },
+    
+            
+          })
+    }  
+
     const handleShareReady = () => {
 
+
+
         const data = {
             houseId,
             personNum,
@@ -64,13 +90,27 @@ const Index = () => {
 
                     const share = {
                         title: `欢迎来到${title}`,
-                        imageUrl: (res.data.data || {}).image,
+                        imageUrl: (res.data.data || {}).image||defaultImgUrl,
                         path: `/pages/index/index?houseId=${houseId}&personNum=${personNum}&startTime=${startTime}&endTime=${endTime}&orderId=${orderId}`
                     }
 
                     setShareObj(share)
                     setShowShareLoading(false)
                     setShowShareModal(true)
+                }).catch((err)=>{
+                    setShowShareLoading(false)
+                Taro.showModal({
+                    title: '输入信息有误',
+                    content: '请重新输入',
+                    showCancel: false,
+                    success: function (res) {
+                        if (res.confirm) {
+                            console.log('用户点击确定')
+                        } else if (res.cancel) {
+                            console.log('用户点击取消')
+                        }
+                    }
+                })
                 })
             } else {
                 setShowShareLoading(false)
@@ -88,6 +128,20 @@ const Index = () => {
                 })
             }
 
+        }).catch((err)=>{
+            setShowShareLoading(false)
+                Taro.showModal({
+                    title: '输入信息有误',
+                    content: '请重新输入',
+                    showCancel: false,
+                    success: function (res) {
+                        if (res.confirm) {
+                            console.log('用户点击确定')
+                        } else if (res.cancel) {
+                            console.log('用户点击取消')
+                        }
+                    }
+                })
         })
 
     }
@@ -96,6 +150,13 @@ const Index = () => {
         return shareObj
     })
 
+    const onShare=()=>{
+        setShowShareModal(false)
+
+    }
+
+    
+
     return <View className='share'>
         <Layout>
             <View className='inputstyle-view'>
@@ -128,8 +189,8 @@ const Index = () => {
                 </Container>
             </View>
         </Layout>
-        <Tab className='addhousetab' color='#ffffff' pageState='3' onClick={handleShareReady} value={['分享到微信']} ></Tab>
-        <AtModal isOpened={showShareLoading} closeOnClickOverlay={false}>
+        <Tab className='addhousetab' color='#ffffff' pageState='3' onClick={handSubscribeMessage} value={['分享到微信']} ></Tab>
+        <AtModal isOpened={showShareLoading} onClose={()=>{setShowShareLoading(false)}} closeOnClickOverlay={false}>
             <AtModalContent>
                 <View style={{textAlign: 'center'}}>
                     <Loading size='48px' />
@@ -137,10 +198,10 @@ const Index = () => {
                 <View style={{marginTop: '2em', textAlign: 'center'}}>正在生成分享内容, 请稍候...</View>
             </AtModalContent>
         </AtModal>
-        <AtModal isOpened={showShareModal}>
+        <AtModal isOpened={showShareModal} onClose={()=>{setShowShareModal(false)}}>
             <AtModalHeader>分享到微信</AtModalHeader>
             <AtModalAction>
-                <Button open-type='share' onClick={() => setShowShareModal(false)}>去分享</Button>
+                <Button open-type='share' onClick={() => onShare() }>去分享</Button>
             </AtModalAction>
         </AtModal>
     </View>