zlisen 4 jaren geleden
bovenliggende
commit
48f4be0cb0
3 gewijzigde bestanden met toevoegingen van 106 en 20 verwijderingen
  1. 1
    1
      config/dev.js
  2. 41
    15
      src/pages/customer/register/index.jsx
  3. 64
    4
      src/pages/share/index.jsx

+ 1
- 1
config/dev.js Bestand weergeven

@@ -5,7 +5,7 @@ module.exports = {
5 5
   },
6 6
   defineConstants: {
7 7
     // HOST: '"http://localhost:7080"',
8
-    // HOST: '"https://sgl.ycjcjy.com"',
8
+    // HOST: '"https://sgl.njyunzhi.com"',
9 9
     HOST: '"http://192.168.31.211:7080"',
10 10
     // HOST: '"http://192.168.211.105:7080"',
11 11
  

+ 41
- 15
src/pages/customer/register/index.jsx Bestand weergeven

@@ -7,6 +7,8 @@ import ContainerLayout from "../../../compents/container/index";
7 7
 import Tab from "../../../compents/tab";
8 8
 import Layout from "../../../layout";
9 9
 import request from "@/util/request";
10
+import { useSelector, } from 'react-redux'
11
+
10 12
 
11 13
 const InputGroup = props => {
12 14
   const [name, setName] = useState(props.dataSource.name);
@@ -83,6 +85,7 @@ const InputGroup = props => {
83 85
 
84 86
 const register = props => {
85 87
   let [list, setList] = useState([]);
88
+  const user = useSelector(state => state.user)
86 89
   useEffect(() => {
87 90
     if (props.dataSource) {
88 91
       const { personNum } = props.dataSource.houseSetting || {};
@@ -107,28 +110,51 @@ const register = props => {
107 110
       return;
108 111
     }
109 112
 
113
+  
114
+
115
+    const {subscribeMessageList=[]}= user
116
+    wx.requestSubscribeMessage({
117
+        tmplIds: subscribeMessageList.filter(x=>x.type==='check-out').map(x=>x.code),
118
+        success (res) { 
119
+          console.log(res,'-------2222222----------')
120
+          postRegister()
121
+        },
122
+        fail (err) { 
123
+          console.log(err,'-------err----------')
124
+        },
125
+        
126
+        complete (res) { 
127
+          console.log(res,'-------2222222-00---------')
128
+        },
129
+
130
+        
131
+      })
132
+
133
+   
134
+  };
135
+
136
+  const postRegister=()=>{
110 137
     const data = {
111 138
       orderId: props.dataSource.orderId,
112 139
       houseId: props.dataSource.houseSetting.houseId,
113 140
       personList: list
114 141
     };
115
-
116 142
     request({ url: "/taHousePerson", method: "POST", data })
117
-      .then(res => {
118
-        if (props.onFinished) {
119
-          props.onFinished(res);
120
-        }
121
-      })
122
-      .catch(err => {
123
-        console.error(err);
124
-        const message = err.message || err.errMsg || err;
125
-        Taro.showToast({
126
-          title: message,
127
-          icon: "none",
128
-          duration: 3000
129
-        });
143
+    .then(res => {
144
+      if (props.onFinished) {
145
+        props.onFinished(res);
146
+      }
147
+    })
148
+    .catch(err => {
149
+      console.error(err);
150
+      const message = err.message || err.errMsg || err;
151
+      Taro.showToast({
152
+        title: message,
153
+        icon: "none",
154
+        duration: 3000
130 155
       });
131
-  };
156
+    });
157
+  }
132 158
 
133 159
   const onChangeList = index => value => {
134 160
     list[index] = value;

+ 64
- 4
src/pages/share/index.jsx Bestand weergeven

@@ -21,6 +21,8 @@ const defaultImgUrl= 'https://zhiyun-image.oss-cn-shanghai.aliyuncs.com/shigongl
21 21
 const Index = () => {
22 22
     const router = useRouter()
23 23
     const { houseId,title } = router.params
24
+    const user = useSelector(state => state.user)
25
+
24 26
     const [personNum, setPersonNum] = useState()
25 27
     const [startTime, setStartTime] = useState('')
26 28
     const [endTime, setEndTime] = useState('')
@@ -45,8 +47,31 @@ const Index = () => {
45 47
         setStartTime(e.detail.value)
46 48
     }
47 49
 
50
+    const   handSubscribeMessage=()=>{
51
+        const {subscribeMessageList=[]}= user
52
+        wx.requestSubscribeMessage({
53
+            tmplIds: subscribeMessageList.filter(x=>x.type==='settled-in').map(x=>x.code),
54
+            success (res) { 
55
+              console.log(res,'-------2222222----------')
56
+              handleShareReady()
57
+            //   setShowShareModal(false)
58
+            },
59
+            fail (err) { 
60
+              console.log(err,'-------err----------')
61
+            },
62
+            
63
+            complete (res) { 
64
+              console.log(res,'-------2222222-00---------')
65
+            },
66
+    
67
+            
68
+          })
69
+    }  
70
+
48 71
     const handleShareReady = () => {
49 72
 
73
+
74
+
50 75
         const data = {
51 76
             houseId,
52 77
             personNum,
@@ -72,6 +97,20 @@ const Index = () => {
72 97
                     setShareObj(share)
73 98
                     setShowShareLoading(false)
74 99
                     setShowShareModal(true)
100
+                }).catch((err)=>{
101
+                    setShowShareLoading(false)
102
+                Taro.showModal({
103
+                    title: '输入信息有误',
104
+                    content: '请重新输入',
105
+                    showCancel: false,
106
+                    success: function (res) {
107
+                        if (res.confirm) {
108
+                            console.log('用户点击确定')
109
+                        } else if (res.cancel) {
110
+                            console.log('用户点击取消')
111
+                        }
112
+                    }
113
+                })
75 114
                 })
76 115
             } else {
77 116
                 setShowShareLoading(false)
@@ -89,6 +128,20 @@ const Index = () => {
89 128
                 })
90 129
             }
91 130
 
131
+        }).catch((err)=>{
132
+            setShowShareLoading(false)
133
+                Taro.showModal({
134
+                    title: '输入信息有误',
135
+                    content: '请重新输入',
136
+                    showCancel: false,
137
+                    success: function (res) {
138
+                        if (res.confirm) {
139
+                            console.log('用户点击确定')
140
+                        } else if (res.cancel) {
141
+                            console.log('用户点击取消')
142
+                        }
143
+                    }
144
+                })
92 145
         })
93 146
 
94 147
     }
@@ -97,6 +150,13 @@ const Index = () => {
97 150
         return shareObj
98 151
     })
99 152
 
153
+    const onShare=()=>{
154
+        setShowShareModal(false)
155
+
156
+    }
157
+
158
+    
159
+
100 160
     return <View className='share'>
101 161
         <Layout>
102 162
             <View className='inputstyle-view'>
@@ -129,8 +189,8 @@ const Index = () => {
129 189
                 </Container>
130 190
             </View>
131 191
         </Layout>
132
-        <Tab className='addhousetab' color='#ffffff' pageState='3' onClick={handleShareReady} value={['分享到微信']} ></Tab>
133
-        <AtModal isOpened={showShareLoading} closeOnClickOverlay={false}>
192
+        <Tab className='addhousetab' color='#ffffff' pageState='3' onClick={handSubscribeMessage} value={['分享到微信']} ></Tab>
193
+        <AtModal isOpened={showShareLoading} onClose={()=>{setShowShareLoading(false)}} closeOnClickOverlay={false}>
134 194
             <AtModalContent>
135 195
                 <View style={{textAlign: 'center'}}>
136 196
                     <Loading size='48px' />
@@ -138,10 +198,10 @@ const Index = () => {
138 198
                 <View style={{marginTop: '2em', textAlign: 'center'}}>正在生成分享内容, 请稍候...</View>
139 199
             </AtModalContent>
140 200
         </AtModal>
141
-        <AtModal isOpened={showShareModal}>
201
+        <AtModal isOpened={showShareModal} onClose={()=>{setShowShareModal(false)}}>
142 202
             <AtModalHeader>分享到微信</AtModalHeader>
143 203
             <AtModalAction>
144
-                <Button open-type='share' onClick={() => setShowShareModal(false)}>去分享</Button>
204
+                <Button open-type='share' onClick={() => onShare() }>去分享</Button>
145 205
             </AtModalAction>
146 206
         </AtModal>
147 207
     </View>