set pages

src/pages/MyAddressList/index.jsx

@@ -1,17 +1,15 @@
-import { View, Image, Switch, Radio, RadioGroup } from "@tarojs/components"
+import { View, Image, Radio, RadioGroup } from "@tarojs/components"
 import Taro, { useDidShow } from "@tarojs/taro"
-import { useState, useEffect, useMemo } from "react"
+import { useState, useEffect } from "react"
 import CustomNav from "@/components/CustomNav"
-import edit from "@/assets/icons/comm/edit.png"
-import userRight from '@/assets/mineImgaes/userRight.png'
 import withLayout from '@/layouts'
 import deletes from "@/assets/icons/comm/deletes.png"
 import ButtontWX from '@/components/ButtontWX'
 import { useModel } from "@/store"
-
-
-import { addressDefault, getAddress, addressDelete, addressUpdate } from "@/services/address"
-
+import { addressDefault, getAddress, addressDelete } from "@/services/address"
+import edit from "@/assets/icons/comm/edit.png"
+import selectImg from "@/assets/icons/selected.png"
+import unSelectImg from "@/assets/icons/unSelected.png"
 import './style.less'
 
 
@@ -20,18 +18,10 @@ export default withLayout((props) => {
   const [addresList, setAddresList] = useState([])
   const $instance = Taro.getCurrentInstance()
   const { type } = $instance.router.params
-
-
-  console.log("🚀 ~ file: index.jsx ~ line 23 ~ withLayout ~ orderAddress", type)
-
-
-  const { setUserOrderAddress, userOrderAddress } = useModel('userData')
-
-
+  const { setUserOrderAddress } = useModel('userData')
   const addAddress = () => {
-    Taro.navigateTo({ url: `/pages/MyAddressList/AddressInfos/index` })
+    Taro.navigateTo({ url: `/pages/AddressInfos/index` })
   }
-
   const addressDeletess = (e) => {
     Taro.showModal({
       title: '提示',
@@ -45,63 +35,38 @@ export default withLayout((props) => {
               duration: 2000
             })
             getList()
-
           })
         } else if (res.cancel) {
           console.log('用户点击取消')
         }
       }
     })
-
   }
-  const [switchBool, setSwitchBool] = useState()
-  // const [switchValue, setSwitchValue] = useState('')
 
-  const handelSwitch = (a, e) => {
-    const { value } = e.detail
-    addressDefault(a).then((se) => {
-      console.log('e', se);
+  const handelSwitch = (id) => {
+    addressDefault(id).then((res) => {
       getList()
+      console.log(addresList);
     })
-    // if (value == '') {
-    //   setSwitchBool(!!value)
-
-    // } else {
-    //   setSwitchBool(!value)
-    // }
 
   }
   const addressEdit = (e, res) => {
-    console.log('e', e);
-    Taro.navigateTo({ url: `/pages/MyAddressList/AddressInfos/index?addressId=${e}&address=${res}` })
-
+    Taro.navigateTo({ url: `/pages/AddressInfos/index?addressId=${e}&address=${res}` })
   }
-
-
-
   const getList = () => {
     getAddress().then((e) => {
-      console.log('地址列表', e);
-      // let abccList = e.records.sort((a, b) => b.isDefault - a.isDefault)
-      // console.log("🚀 ~ file: index.jsx ~ line 75 ~ getAddress ~ abccList", abccList)
       setAddresList(e.records)
     })
   }
   useDidShow(() => {
+    console.log(9999);
     getList()
-
   })
 
-  useEffect(() => {
-    getList()
-
-
-  }, [])
+  // useEffect(() => {
+  //   getList()
+  // }, [])
 
-  const srcor = (e) => {
-    console.log('评分', e.detail);
-
-  }
   const handleAddress = (e) => {
     if (e) {
       setUserOrderAddress(e)
@@ -116,15 +81,7 @@ export default withLayout((props) => {
           })
         }, 300)
       })
-
-      console.log('选择的地址存放在store', userOrderAddress);
-
-
-
     }
-
-
-
   }
   return (
     <View className='page-index'>
@@ -137,11 +94,11 @@ export default withLayout((props) => {
           {
             addresList.map((item, index) => {
               return (
-                <View className='addressList-box' key={index}>
+                <View className='addressList-box' key={item.addressId}>
                   <View className='addressList-box-addressTop'>
                     {
                       item.isDefault ?
-                        <View className='addressList-box-addressTop-redText'>默认地址</View> : ''
+                        <View className='addressList-box-addressTop-redText'>默认地址</View> : null
                     }
                     <View className='addressList-box-addressTop-title'>我的地址{index + 1}</View>
                   </View>
@@ -157,40 +114,33 @@ export default withLayout((props) => {
                       {
                         !type ? <>
                           <View>
-                            设为默认地址:
-                            <RadioGroup className='radio-group' onChange={(res) => handelSwitch(item.addressId, res)} >
-                              <Radio color='#FC5531' checked={item.isDefault}></Radio>
-                            </RadioGroup>
+                            设为默认地址:{
+                              item.isDefault ?
+                                <Image src={selectImg} className='selectImgClass' />
+                                : <Image src={unSelectImg} className='selectImgClass' onClick={() => handelSwitch(item.addressId)} />}
                           </View>
-
                           <View className='addressList-box-addressBotton-addressDelete' onClick={() => addressDeletess(item.addressId)}>
                             <View>
                               删除
                             </View>
                             <Image src={deletes} />
-
                           </View>
                         </>
                           : <View className='orderAddressa' onClick={() => handleAddress(item.address)}>
                             选择此地址
                           </View>
                       }
-
                     </View>
                   </View>
                 </View>
               )
             })
           }
-
           <View className='bottomButtom' >
             <ButtontWX onClick={addAddress} formType='submit' butText='+新增地址' butWidth={315} butHeight={49} butFontSize={16} butBorderRadius={49} />
           </View>
-
         </View>
       </scroll-view>
     </View >
   )
-})
-
-
+})

src/pages/MyAddressList/style.less

@@ -51,42 +51,16 @@
       align-items: center;
       > View {
         font-size: 30px;
-
-        .radio-group {
-          display: inline-block;
-
-          .wx-radio-input {
-            position: relative;
-            display: flex;
-            left: 2vw;
-            height: 40rpx;
-            width: 40rpx;
-            margin-top: -4rpx;
-            border-radius: 50%;
-            border: 2rpx solid #999;
-            background: transparent;
-          }
-        }
-
-        // .wx-radio-input.wx-radio-input-checked::before {
-        //   /* 去除对号 */
-        //   content: "";
-        //   /* background: #fff; */
-        //   width: 40rpx;
-        //   height: 40rpx;
-        //   border-radius: 50%;
-        //   /* background: red; */
-        //   background-color: rgb(216, 216, 216);
-        //   /* 居中 */
-        //   margin-top: 0rpx;
-        //   display: flex;
-        //   position: relative;
-        // }
+        display: flex;
       }
       .orderAddressa {
         font-size: 34px;
         font-weight: 800;
       }
+      .selectImgClass{
+        width: 50px;
+        height: 50px;
+      }
     }
     &-addressDelete {
       display: flex;

src/pages/index/index.jsx

@@ -38,8 +38,6 @@ export default withLayout((props) => {
 
   console.log("🚀 ~ file: index.jsx ~ line 24 ~ withLayout ~ tab", tab)
   const [currentTab, setCurrentTab] = useState(0)
-  const [isDidShow, setIsDidShow] = useState(0)
-  const [tabsIndex, setTabsIndex] = useState(0)
 
 
 

src/routes.js

@@ -38,7 +38,7 @@ const Pages = [
   },
   {
     title: '我的详细地址',
-    page: 'pages/MyAddressList/AddressInfos/index',
+    page: 'pages/AddressInfos/index',
   },
 
   {

src/store/userData.js

@@ -13,7 +13,7 @@ export default () => {
 
 
 
-  console.log("🚀 来自store的打印 person数据", person)
+  // console.log("🚀 来自store的打印 person数据", person)