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

src/compents/Loading/index.jsx

@@ -0,0 +1,16 @@
+import React from 'react'
+import { View } from '@tarojs/components'
+import './style.scss'
+
+export default props => {
+
+  const loadingStyle = {
+    width: props.size || '64px',
+    height: props.size || '64px',
+    borderTopColor: props.color || '#fed12f'
+  }
+
+  return (
+    <View className="cust-loading" style={loadingStyle}></View>
+  )
+}

src/compents/Loading/style.scss

@@ -0,0 +1,17 @@
+
+.cust-loading {
+  display: inline-block;
+  border: 3px solid #f3f3f3;
+  border-top: 3px solid #fed12f;
+  border-radius: 50%;
+  animation: loading-360 1s infinite linear;
+}
+
+@keyframes loading-360 {
+  0% {
+      transform: rotate(0deg); /*动画起始的时候旋转了0度*/
+  }
+  100% {
+      transform: rotate(360deg); /*动画结束的时候旋转了360度*/
+  }
+}

src/pages/share/index.jsx

@@ -1,7 +1,9 @@
 import React, { useEffect, useState } from 'react'
 import Taro, { useShareAppMessage, useRouter } from "@tarojs/taro";
-import { View, Input, Text, Picker, Button } from '@tarojs/components'
-import { AtModal, AtModalHeader, AtModalAction } from "taro-ui"
+import { useSelector, } from 'react-redux'
+import { View, Input, Text, Image, Picker, Button } from '@tarojs/components'
+import { AtModal, AtModalHeader, AtModalContent, AtModalAction } from "taro-ui"
+import Loading from '@/compents/Loading'
 import Layout from '../../layout/index'
 import Tab from '../../compents/tab/index'
 import Container from '../../compents/container/index'
@@ -36,6 +38,8 @@ const Index = () => {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [])
 
+    const [showShareLoading, setShowShareLoading] = useState(false)
+    
     const onTimeChange = (e) => {
         setStartTime(e.detail.value)
     }
@@ -48,10 +52,8 @@ const Index = () => {
             startDate: startTime,
             endDate: endTime
         }
-
-        Taro.showLoading({
-            title: '正在生成分享内容,请稍后...'
-        })
+        
+        setShowShareLoading(true)
 
         return request({ url: '/taHouseSetting', method: 'post', data }).then(res => {
             const { data } = res.data
@@ -67,11 +69,11 @@ const Index = () => {
                     }
 
                     setShareObj(share)
-                    Taro.hideLoading()
+                    setShowShareLoading(false)
                     setShowShareModal(true)
                 })
             } else {
-                Taro.hideLoading()
+                setShowShareLoading(false)
                 Taro.showModal({
                     title: '输入信息有误',
                     content: '请重新输入',
@@ -127,11 +129,19 @@ const Index = () => {
             </View>
         </Layout>
         <Tab className='addhousetab' color='#ffffff' pageState='3' onClick={handleShareReady} value={['分享到微信']} ></Tab>
+        <AtModal isOpened={showShareLoading} closeOnClickOverlay={false}>
+            <AtModalContent>
+                <View style={{textAlign: 'center'}}>
+                    <Loading size='48px' />
+                </View>
+                <View style={{marginTop: '2em', textAlign: 'center'}}>正在生成分享内容, 请稍后...</View>
+            </AtModalContent>
+        </AtModal>
         <AtModal isOpened={showShareModal}>
             <AtModalHeader>分享到微信</AtModalHeader>
             <AtModalAction>
                 <Button onClick={() => setShowShareModal(false)}>取消</Button>
-                <Button open-type="share" onClick={() => setShowShareModal(false)}>确定</Button>
+                <Button open-type='share' onClick={() => setShowShareModal(false)}>确定</Button>
             </AtModalAction>
         </AtModal>
     </View>