Sfoglia il codice sorgente

版本07.13.2(地址模块bug)

panhui 5 anni fa
parent
commit
97631df725

+ 23 - 15
screens/Address/AddressCom.jsx

@@ -24,27 +24,35 @@ const AddressItem = ({ info, editEvent, isChoose, leftEvent }) => {
       <Div row alignItems="center" py={15}>
         <Button bg="white" onPress={leftEvent}>
           {isChoose ? (
-            <Icon name="check-circle" color="#FFC21C" size={16} />
+            <Icon name="checkcircle" color="#FFC21C" size={16} />
           ) : (
-            <Icon name="circle-thin" color="#787878" size={16} />
+            <Div
+              w={16}
+              h={16}
+              rounded="circle"
+              borderWidth={1}
+              borderColor="#787878"
+            />
           )}
         </Button>
-        <Div flex={1} mx={15}>
-          <Text fontSize="sm" textAlign="left">
-            {info.addressName}
-          </Text>
-          <Text fontSize="xs" textAlign="left">
-            {info.addressInfo}
-          </Text>
-          <Div row>
-            <Text fontSize="xs" color="gray300" textAlign="left">
-              {info.name}
+        <Button block flex={1} mx={15} p={0} bg="hide" onPress={leftEvent}>
+          <Div flex={1}>
+            <Text fontSize="sm" textAlign="left">
+              {info.addressName}
             </Text>
-            <Text ml={15} fontSize="xs" color="gray300" textAlign="left">
-              {info.phone}
+            <Text fontSize="xs" textAlign="left">
+              {info.addressInfo}
             </Text>
+            <Div row>
+              <Text fontSize="xs" color="gray300" textAlign="left">
+                {info.name}
+              </Text>
+              <Text ml={15} fontSize="xs" color="gray300" textAlign="left">
+                {info.phone}
+              </Text>
+            </Div>
           </Div>
-        </Div>
+        </Button>
         <Button onPress={editEvent} bg="white">
           <Icon name="edit" color="#787878" size={20} />
         </Button>

+ 9 - 1
screens/Address/EditAddressScreen.jsx

@@ -49,7 +49,15 @@ export default function EditAddressScreen({ navigation }) {
   }, [locationInfo]);
 
   const canSub = useCreation(() => {
-    if (phone && name && addressName && number && longitude && latitude) {
+    if (
+      phone &&
+      name &&
+      addressName &&
+      number &&
+      longitude &&
+      latitude &&
+      addressTag
+    ) {
       return true;
     } else {
       return false;

+ 1 - 1
screens/Address/model.js

@@ -62,7 +62,7 @@ const AddressModel = (now) => ({
           phone: submitPhone(phone),
           addressName,
           number,
-          addressTag,
+          addressTag: addressTag || '',
           isDefault,
           latitude,
           longitude,

+ 1 - 1
screens/Main/Home/HomeHeader.js

@@ -93,7 +93,7 @@ export default function Header() {
             }}
             title={local ? TchangeToChinese : TchangeToth}
           />
-          <Menu.Item onPress={() => {}} title="版本07.13.1(订单详情页)" />
+          <Menu.Item onPress={() => {}} title="版本07.13.2(地址模块bug)" />
         </Menu>
       </Appbar.Header>
     </>

+ 1 - 1
screens/Main/HomeScreen.jsx

@@ -66,7 +66,7 @@ export default function HomeScreen({ navigation }) {
             fontSize="xs"
             mx={15}
             my={10}
-            onPress={() => navigation.navigate('HomeAddress')}
+            onPress={() => navigation.navigate('Search')}
           >
             搜索
           </Button>