优化滚动

src/pages/editOrder/components/shipmentMode/index.tsx

@@ -1,18 +1,22 @@
 import { Text, View } from "@tarojs/components"
 import styles  from './index.module.scss'
 import classnames from "classnames";
-import { memo, useRef, useState } from "react";
+import { memo, useEffect, useRef, useState } from "react";
 
 type Param = {
     onSelect?:(val:number) => void
+    defaultValue?: 0|1|2
 }
-export default memo(({onSelect}: Param) => {
-    //收货方法 1:自提，2：物流
+export default memo(({onSelect, defaultValue = 0}: Param) => {
+    //收货方法 0:没选择, 1:自提，2：物流
     const shipmentMode = useRef([
         {value:1, label:'上门自提', selected:false},
         {value:2, label:'物流', selected:false}
     ]) 
-    const [selectValue, setSelectValue] = useState()
+    const [selectValue, setSelectValue] = useState<number>()
+    useEffect(() => {
+        setSelectValue(defaultValue)
+    }, [defaultValue])
     const selectShipmentMode = (value) => {
         setSelectValue(() => value)
         onSelect?.(value)

src/pages/editOrder/index.tsx

@@ -1,21 +1,62 @@
 import { Text, View } from "@tarojs/components"
 import styles  from './index.module.scss'
 import classnames from "classnames";
-import { useCallback, useRef, useState } from "react";
+import { useCallback, useMemo, useRef, useState } from "react";
 import ShipmentMode from "./components/shipmentMode";
 import AddressList from "@/components/AddressList";
-import { goLink } from "@/common/common";
+import { alert, goLink } from "@/common/common";
+import { getParam } from "@/common/system";
+import {EditSaleOrderAddressApi, EditSaleOrderShipmentModeApi} from "@/api/order";
+import Taro from "@tarojs/taro";
+
 export default () => {
+
+  //获取临时传递的数据
+  const params = getParam()
+  const [paramsData, setParamsData] = useState<any>(params)
+
   //提交的数据
   const [submitData, setSubmitData] = useState({
     address_id:0,
-    id:0,
-    shipment_mode: 0
+    id:params.id,
+    shipment_mode: params.shipment_mode
   })
+  
+
+  //格式化地址
+  const address = useMemo(() => {
+    return paramsData.province_name+' '+paramsData.city_name+' '+paramsData.district_name+' '+paramsData.address_detail
+  }, [paramsData])
+
   //获取收货方法
   const getShipmentMode = useCallback((num) => {
     setSubmitData((val) => ({...val, shipment_mode:num}))
   }, [])
+
+  //获取地址
+  const getSelectAddress = useCallback((e) => {
+    setSubmitData((val) => ({...val, address_id:e.id}))
+  }, [])
+
+  //修改请求
+  const {fetchData: addressFetchData} = EditSaleOrderAddressApi()
+  const {fetchData: shipmentFetchData} = EditSaleOrderShipmentModeApi()
+  const editData = async () => {
+    if(submitData.address_id) {
+      let res = await addressFetchData(submitData)
+      if(!res.success) {
+        alert.error(res.msg)
+        return false
+      }
+    }
+    let res = await shipmentFetchData(submitData)
+    if(!res.success) {
+      alert.error(res.msg)
+      return false
+    }
+    Taro.navigateBack()
+  }
+
   return (
     <View className={styles.order_edit_main}>
       <View className={classnames(styles.title_msg)}>
@@ -26,24 +67,24 @@ export default () => {
         </View>
       </View>
       <View className={styles.shipmentMode_con}>
-        <ShipmentMode onSelect={getShipmentMode}/>
+        <ShipmentMode onSelect={getShipmentMode} defaultValue={paramsData.shipment_mode}/>
       </View>
       <View className={styles.old_address}>
         <Text className={styles.old_address_text}>原地址:</Text>
-        <Text className={styles.old_address_text}>广东省 佛山市 禅城区 张槎街道 清风路1988号麦兜的大 大仓库</Text>
+        <Text className={styles.old_address_text}>{address}</Text>
         <View className={styles.userInfo}>
-          <Text className={styles.userInfo_text}>陈先生</Text>
-          <Text className={styles.userInfo_text}>1818877790</Text>
+          <Text className={styles.userInfo_text}>{paramsData.name}</Text>
+          <Text className={styles.userInfo_text}>{paramsData.phone}</Text>
         </View>
       </View>
       <View className={styles.select_address_con}>
         <View className={styles.title}>重新选择收货地址</View>
         <View className={styles.address_list}>
-          <AddressList focusBorderEnabled={true} addButtonEnabled={false}/>
+          <AddressList focusBorderEnabled={true} addButtonEnabled={false} onSelect={getSelectAddress}/>
         </View>
         <View className={styles.submitBtn}>
           <View onClick={() => goLink('/pages/addressAdd/index', {type:'add'})} className={classnames(styles.addAddress, styles.addressBtn)}>添加新地址</View>
-          <View className={classnames(styles.submitUpdate, styles.addressBtn)}>提交修改</View>
+          <View className={classnames(styles.submitUpdate, styles.addressBtn)} onClick={() => editData()}>提交修改</View>
         </View>
       </View>
       <View className="common_safe_area_y"></View>