feat fix

src/app.js

@@ -14,6 +14,7 @@ class App extends Component {
     // 登录获取人员信息
 
     Taro.getLocation({
+      type: 'gcj02',
       success (res) {
         const location = `${res.longitude},${res.latitude}`
         Taro.setStorageSync('location', location)

src/components/ButtontWX/index.jsx

@@ -3,7 +3,7 @@ import { View, Text, Button } from '@tarojs/components'
 import './style.less'
 
 export default (props) => {
-  const { butText, butWidth, butHeight, butFontSize, butBorderRadius, onClick, formType, disabled, opacity } = props
+  const { butText, butWidth, butHeight, butFontSize, butBorderRadius, loading, onClick, formType, disabled, opacity } = props
   let butStyle = {
     width: `${butWidth || 100}px`,
     height: `${butHeight || 40}px`,

src/pages/CheckMap/index.jsx

@@ -37,12 +37,16 @@ export default (props) => {
 
   const markers = [{ // 绘制浮标，传入JSON支持多个
     iconPath: locationImage,
-    id: 0,
-    latitude: LocationMap[0],// 经度
-    longitude: LocationMap[1],//纬度
-    width: 50, // 浮标宽度
-    height: 50 // 浮标高度
+    id: 1,
+    // longitude: LocationMap[0] ,// 经度
+    // latitude: LocationMap[1] ,//纬度
+    longitude: 112.095318,
+    latitude: 32.695301,
+    top: 10,
+    width: 40, // 浮标宽度
+    height: 37,// 浮标高度
   }]
+  console.log("🚀 ~ file: index.jsx ~ line 46 ~ markers", markers)
 
   return (
     <View className='page-index'>
@@ -54,8 +58,8 @@ export default (props) => {
         <View className='MapBox-centent'>
           <Map
             id='map'
-            longitude='112.092169'
-            latitude='32.694883'
+            longitude={112.092169}
+            latitude={32.694883}
             scale='12'
             markers={markers}
             bindmarkertap='markertap'

src/pages/FeedbackText/index.jsx

@@ -12,26 +12,42 @@ import './style.less'
 export default (props) => {
 
   const [textAreaValue, setTextAreaValue] = useState('')
-
+  const [loading, setLoading] = useState(false)
 
   const onSubmitClick = () => {
+    setLoading(true)
     console.log('textAreaValue', textAreaValue);
-    feedback({ content: textAreaValue }).then(() => {
+    if (textAreaValue == '') {
       Taro.showToast({
-        title: '反馈已收到！',
-        icon: 'success',
+        title: '请填写内容哦',
+        icon: 'none',
         duration: 2000
-      }).then(() => {
-        setTimeout(() => {
-          Taro.navigateBack({
-            delta: 1
-          }
+      })
+
+    } else {
+
+      feedback({ content: textAreaValue }).then(() => {
+        Taro.showToast({
+          title: '反馈已收到！',
+          icon: 'success',
+          duration: 2000
+        }).then(() => {
 
-          )
-        }, 1500)
+          setTimeout(() => {
+            setLoading(true)
 
+            Taro.navigateBack({
+              delta: 1
+            }
+
+
+            )
+          }, 1000)
+
+        })
       })
-    })
+    }
+
 
 
   }
@@ -47,7 +63,7 @@ export default (props) => {
           <Textarea placeholder='请留下您宝贵的意见和建议！' className='components-page-TextareaCentent' autoHeight onInput={(e) => { setTextAreaValue(e.detail.value) }} />
         </View>
         <View className='buton-bottom-Feedback'>
-          <ButtontWX onClick={onSubmitClick} butText='提交' butWidth={350} butHeight={49} butFontSize={16} butBorderRadius={49} />
+          <ButtontWX disabled={loading} onClick={onSubmitClick} butText='提交' butWidth={350} butHeight={49} butFontSize={16} butBorderRadius={49} />
         </View>
       </View>
     </View>

src/pages/MyAddressList/AddressInfos/index.jsx

@@ -34,7 +34,7 @@ export default (props) => {
             Taro.navigateBack({
               delta: 1
             })
-          }, 1500)
+          }, 1000)
 
         })
       })
@@ -50,7 +50,7 @@ export default (props) => {
             Taro.navigateBack({
               delta: 1
             })
-          }, 1500)
+          }, 1000)
         })
       })
     }

src/pages/OrderInfo/index.jsx

@@ -44,7 +44,7 @@ export default (props) => {
                 Taro.navigateBack({
                   delta: 1
                 })
-              }, 1500)
+              }, 1000)
             })
           })
         } else if (res.cancel) {
@@ -69,7 +69,7 @@ export default (props) => {
           Taro.navigateBack({
             delta: 1
           })
-        }, 1500)
+        }, 1000)
       })
     }
 

src/pages/userInfo/index.jsx

@@ -44,7 +44,7 @@ export default (props) => {
           Taro.navigateBack({
             delta: 1
           })
-        }, 1500)
+        }, 1000)
       }).catch((e) => {
         console.log(e)
         Taro.showToast({