商城测试版v8

src/pages/order/comfirm.tsx

@@ -88,8 +88,8 @@ import { throttle } from "@/common/util";
             district_name: address?.district_name,
             address_detail: address?.address_detail,
             id: address?.id,
-            name: address?.name,
-            phone: address?.phone,
+            target_user_name: address?.name,
+            target_user_phone: address?.phone,
             shipment_mode: address?.shipment_mode,
             take_goods_address: preViewOrder?.take_goods_address,
             take_goods_phone: preViewOrder?.take_goods_phone,

src/pages/order/components/addressInfoDetail/index.tsx

@@ -28,7 +28,9 @@ type Param =  {
         district_name: string,
         address_detail: string,
         take_goods_address: string,
-        take_goods_phone: string
+        take_goods_phone: string,
+        target_user_name: string,
+        target_user_phone: string
     }
 }
 
@@ -174,10 +176,8 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, orderInfo, stat
     //地址格式
     const formatAddress = useMemo(() => {
         if(receivingStatus == 2) {
-            console.log('take_goods_addressbb::', addressInfo)
-            return addressInfo?.province_name?addressInfo.province_name + addressInfo.city_name + addressInfo.district_name + addressInfo.address_detail:''
+            return addressInfo?.address_detail?addressInfo.province_name + addressInfo.city_name + addressInfo.district_name + addressInfo.address_detail:''
         } else {
-            console.log('take_goods_address::', addressInfo)
             return addressInfo?.take_goods_address
         }
     }, [receivingStatus, addressInfo])

src/pages/order/components/scanPay/index.tsx

@@ -85,7 +85,8 @@ export default memo(({show = true, onClose, company, orderInfo}:Param) => {
                 actual_amount: formatPriceDiv(orderInfo.actual_amount).toString(),
                 show_actual_amount: orderInfo.actual_amount > 0,
                 wait_pay_amount: formatPriceDiv(orderInfo.wait_pay_amount).toString(),
-                show_wait_pay_amount: orderInfo.wait_pay_amount > 0
+                show_wait_pay_amount: orderInfo.wait_pay_amount > 0,
+                show_barcode: true
             }))
         }
     }, [orderInfo])

src/pages/order/components/scanPayCheck/index.tsx

@@ -89,7 +89,8 @@ export default memo(({show = true, onClose, company, orderInfo}:Param) => {
                 actual_amount: formatPriceDiv(orderInfo.actual_amount).toString(),
                 show_actual_amount: orderInfo.actual_amount > 0,
                 wait_pay_amount: formatPriceDiv(orderInfo.wait_pay_amount).toString(),
-                show_wait_pay_amount: orderInfo.wait_pay_amount > 0
+                show_wait_pay_amount: orderInfo.wait_pay_amount > 0,
+                show_barcode: true
             }))
         }
     }, [orderInfo])

src/pages/order/orderList/components/order/index.tsx

@@ -108,16 +108,16 @@ export default memo(({value, onClickBtn}: Param) => {
             <View className={styles.product_con} onClick={() => goLink('/pages/order/index', {id: value?.id})}>
                 <View className={styles.product_title}>
                     <View className={styles.product_tag}>{value?.sale_mode_name}</View>
-                    <View className={styles.product_name}>{formatHashTag(value?.product_list[0].code, value?.product_list[0].name)}</View>
+                    <View className={styles.product_name}>{formatHashTag(value?.product_list?.[0].code, value?.product_list?.[0].name)}</View>
                     <View className={styles.tag}>{value?.shipment_mode_name}</View>
                 </View>
                 <View className={styles.product_list}>
                     <View className={styles.image}>
                         <LabAndImg value={{lab:value.lab,rgb:value.rgb,texture_url:value.texture_url}}/>
-                        <View className={styles.color_num}>{value?.product_list[0].product_colors[0].code}</View>
+                        <View className={styles.color_num}>{value?.product_list?.[0].product_colors?.[0].code}</View>
                     </View>
                     <View className={styles.color_list}>
-                        {value?.product_list[0].product_colors.map((itemColor, index) => {
+                        {value?.product_list?.[0].product_colors.map((itemColor, index) => {
                                 return (
                                     (index <= 1)&&<View className={styles.color_item}>
                                         <View className={styles.color_title}>{formatHashTag(itemColor.code, itemColor.name)}</View>
@@ -127,7 +127,7 @@ export default memo(({value, onClickBtn}: Param) => {
                                 )
                             })
                         }
-                        {value?.product_list[0].length > 2 && <View className={styles.color_item}>
+                        {value?.product_list?.[0].length > 2 && <View className={styles.color_item}>
                             <View className={styles.color_more}>……</View>
                             <View className={styles.color_more}>……</View>
                             <View className={styles.color_more}>……</View>