diff --git a/src/assets/info.png b/src/assets/info.png
new file mode 100644
index 0000000..b28e4f9
Binary files /dev/null and b/src/assets/info.png differ
diff --git a/src/components/sp-filter-bar-new/index.js b/src/components/sp-filter-bar-new/index.js
index da31d1c..a54f247 100755
--- a/src/components/sp-filter-bar-new/index.js
+++ b/src/components/sp-filter-bar-new/index.js
@@ -88,15 +88,16 @@ export default class SpFilterBar extends Component {
                 {item.icon && <Text className={classNames('iconfont', isArray(item.icon) ? item.icon[sortOrder == 1 ? 0 : 1] : item.icon)}></Text>}
               </View>
             ))} */}
-          <SpPicker mode="select" isTop source={list} value={value} pickerConfirm={this.handleConfirm.bind(this)} leftBtnTxt="筛选" rightBtnTxt={<AtIcon value="close" size={14} color="#000"></AtIcon>}>
+          {/* 2024年02月21日暂时不做了，胡和客户开会沟通过了 */}
+          {false && <SpPicker mode="select" isTop source={list} value={value} pickerConfirm={this.handleConfirm.bind(this)} leftBtnTxt="筛选" rightBtnTxt={<AtIcon value="close" size={14} color="#000"></AtIcon>}>
             <View className="item" onClick={() => false && this.setState({ showFilter: true })}>
               <Text className='text'>筛选</Text>
               {/* <Image className="img" src={require('@/assets/icon/filter.png')}></Image> */}
               <AtIcon value='menu' size='16' color='#000'></AtIcon>
             </View>
-          </SpPicker>
+          </SpPicker>}
           <SpPicker mode="select" source={list} value={sortVal} pickerConfirm={this.handleConfirm.bind(this)} leftBtnTxt="排序" rightBtnTxt={<AtIcon value="close" size={14} color="#000"></AtIcon>}>
-            <View className="item item-right">
+            <View className="item item-right-1">
               <Text className='text'>排序</Text>
               <Image className="img" src={require('@/assets/icon/sort.png')}></Image>
             </View>
diff --git a/src/components/sp-page/index.scss b/src/components/sp-page/index.scss
index 6cd4293..dfcf1f3 100755
--- a/src/components/sp-page/index.scss
+++ b/src/components/sp-page/index.scss
@@ -28,7 +28,7 @@
   &.ipx {
     padding-bottom: 20px;
     .sp-page-footer {
-      height: $page-ipx-footer-height;
+      min-height: $page-ipx-footer-height;
     }
     .sp-float-layout-ft {
       padding-bottom: 40px;
@@ -63,7 +63,7 @@
     bottom: 0;
     left: 0;
     right: 0;
-    height: $toolbar-height; //+20
+    // height: $toolbar-height; //+20
     z-index: $z-index-level-3;
     background: #fff;
   }
diff --git a/src/hooks/usePayment.js b/src/hooks/usePayment.js
index a2d6127..d12f222 100755
--- a/src/hooks/usePayment.js
+++ b/src/hooks/usePayment.js
@@ -19,7 +19,8 @@ export default (props = {}) => {
   // const { params, orderInfo } = state
   const cashierResultUrl = `/pages/cart/cashier-result`
   const $instance = getCurrentInstance()
-  const currentPath = $instance.router.path
+  console.log("🚀 ~ $instance.router:", $instance.router)
+  const currentPath = $instance.router?.path
 
   const cashierPayment = (params, orderInfo) => {
     console.log(`cashierPayment:`, params, orderInfo)
@@ -101,13 +102,13 @@ export default (props = {}) => {
 
       // 是否开启adapay小程序插件
       if (process.env.APP_ADAPAY == 'true') {
-        const adapayPlugin = requirePlugin("Adapay");
+        const adapayPlugin = requirePlugin("Adapay")
         adapayPlugin.requestPay(weappOrderInfo.expend, () => {
           paySuccess(params, orderInfo)
         }, (e) => {
           console.error('adapayPlugin:', e)
           payError(orderInfo)
-        });
+        })
       } else {
         await Taro.requestPayment(weappOrderInfo)
         paySuccess(params, orderInfo)
diff --git a/src/marketing/pages/member/address.js b/src/marketing/pages/member/address.js
index ed95387..d8673db 100755
--- a/src/marketing/pages/member/address.js
+++ b/src/marketing/pages/member/address.js
@@ -1,10 +1,11 @@
 import React, { useEffect } from 'react'
 import { useImmer } from 'use-immer'
 import Taro, { getCurrentInstance, getCurrentPages } from '@tarojs/taro'
-import { View, Text } from '@tarojs/components'
+import { View, Text, Image } from '@tarojs/components'
 import { AtButton, AtSwipeAction } from 'taro-ui'
 import { useDispatch, useSelector } from 'react-redux'
-import { SpToast, SpNavBar, SpPage } from '@/components'
+import { SpToast, SpNavBar, SpPage, SpCheckboxNew } from '@/components'
+import { classNames } from '@/utils'
 import S from '@/spx'
 import api from '@/api'
 
@@ -15,7 +16,11 @@ const ADDRESS_ID = 'address_id'
 const initialState = {
   list: [],
   isPicker: false,
-  selectedId: null
+  selectedId: null,
+  isSelected: '',
+  selItem: null,
+  editId: null,
+  visible: false
 }
 
 function AddressIndex (props) {
@@ -34,12 +39,17 @@ function AddressIndex (props) {
   }
 
   const fetch = async (isDelete = false) => {
-    const { isPicker, receipt_type = '', city = '' } = $instance.router.params
+    const { isPicker, isSelected = '', receipt_type = '', city = '' } = $instance.router.params
     if (isPicker) {
       setState(draft => {
         draft.isPicker = true
       })
     }
+    if (isSelected) {
+      setState(draft => {
+        draft.isSelected = isSelected
+      })
+    }
     Taro.showLoading({ title: '' })
     const { list } = await api.member.addressList()
     Taro.hideLoading()
@@ -64,9 +74,14 @@ function AddressIndex (props) {
     } else {
       selectedId = list.find((addr) => addr.is_def > 0) || null
     }
+    let item = null
+    if (isSelected) {
+      item = list.find((addr) => addr[ADDRESS_ID] == isSelected)
+    }
     setState(draft => {
       draft.list = newList
       draft.selectedId = selectedId
+      draft.selItem = item
     })
   }
 
@@ -168,7 +183,7 @@ function AddressIndex (props) {
     Taro.navigateBack()
   }
 
-  const { selectedId, isPicker, list } = state
+  const { selectedId, isPicker, list, isSelected, selItem, editId, visible } = state
   const options = [
     {
       text: '',
@@ -180,15 +195,30 @@ function AddressIndex (props) {
       }
     }
   ]
+  const editAddr = async () => {
+    setState(draft => {
+      draft.visible = true
+    })
+    setTimeout(() => {
+      setState(draft => {
+        draft.visible = false
+      })
+      // Taro.navigateBack()
+    }, 700)
+  }
 
   return (
     <SpPage
       className='page-address-index'
+      title={isSelected || isPicker ? '修改地址' : '收货地址管理'}
       renderFooter={
         <View className='btn-wrap'>
-          <AtButton type='primary' onClick={handleClickToEdit}>
+          <AtButton onClick={handleClickToEdit}>
             新增地址
           </AtButton>
+          {!!isSelected && <AtButton type='primary' disabled={!editId} onClick={editAddr} style={{ margin: '30rpx 0 100rpx 0' }}>
+            确认修改
+          </AtButton>}
         </View>
       }
     >
@@ -214,6 +244,35 @@ function AddressIndex (props) {
         )} */}
 
         <View className='member-address-list'>
+          {selectedId && selItem && <>
+            <View className="address-item">
+              <View className="address-item__content" style={{ display: 'flex', alignItems: 'center', padding: '16rpx 26rpx 16rpx 20rpx' }}>
+                <Image src='/assets/info.png' className='info-icon'></Image>
+                <View className="info__txt">
+                  修改后会影响物流时效、送货上门等服务，只能原价修改且付款后只能修改一次。
+                  若因商品换仓、已发货、运费变更等原因导致修改失败，请您谅解。
+                </View>
+              </View>
+            </View>
+            <View className='address-item'>
+              <View className='address-item__content'>
+                <View className='address-item__title' style={{ marginBottom: "20rpx" }}>
+                  <View className='address-item__info'>
+                    <Text>原地址</Text>
+                  </View>
+                </View>
+                <View className='address-item__detail_box'>
+                  <View className='address-item__detail'>
+                    {selItem.province}
+                    {selItem.city}
+                    {selItem.county}
+                    {selItem.adrdetail}
+                  </View>
+                </View>
+                <Text className='address-item__info_tel'>{selItem.username} {selItem.telephone}</Text>
+              </View>
+            </View>
+          </>}
           {list?.length > 0 && list.map((item, index) => {
             return (
               <View
@@ -221,80 +280,87 @@ function AddressIndex (props) {
                 className={`address-item ${item.disabled ? 'disabled' : ''}`}
               >
                 <AtSwipeAction options={options} disabled={item.disabled} isOpened={item.isOpened} autoClose onClick={e => handleDelete(e, item, index)} key={item[ADDRESS_ID]}>
-                  <View className='address-item__content'>
-                    <View className='address-item__title'>
-                      <View className='address-item__info'>
-                        <Text>{item.username}</Text>
-                        <Text className='address-item__info_edit' onClick={e => handleClickToEdit(e, item)}>编辑</Text>
-                      </View>
-                      <Text className='address-item__info_tel'>{item.telephone}</Text>
-                    </View>
-                    <View className='address-item__detail_box'>
-                      <View className='address-item__detail'>
-                        {item.province}
-                        {item.city}
-                        {item.county}
-                        {item.adrdetail}
-                      </View>
-
-                      {isPicker && !item.disabled && (
-                        <View className='address-item__check' onClick={e => handleClickChecked(e, item)}>
-                          {item[ADDRESS_ID] === selectedId ? (
-                            <Text
-                              className='iconfont icon-check address-item__checked'
-                              style={{ color: colors.colorPrimary }}
-                            ></Text>
-                          ) : (
-                            <Text
-                              className='address-item__unchecked'
-                              style={{ borderColor: colors.colorPrimary }}
-                            >
-                              {' '}
-                            </Text>
-                          )}
+                  <View className='address-item__content' style={{ display: 'flex', alignItems: 'center' }} onClick={() => {
+                    !!selectedId && setState(draft => {
+                      draft.editId = item[ADDRESS_ID]
+                    })
+                  }}>
+                    {!!isSelected && <SpCheckboxNew checked={editId == item[ADDRESS_ID]} onChange={e => ''} />}
+                    <View className='' style={{ flex: 1, marginLeft: isSelected ? '50rpx' : 0 }}>
+                      <View className='address-item__title'>
+                        <View className='address-item__info'>
+                          <Text>{item.username}</Text>
+                          {!isSelected && <Text className='address-item__info_edit' onClick={e => handleClickToEdit(e, item)}>编辑</Text>}
+                        </View>
+                        <Text className='address-item__info_tel'>{item.telephone}</Text>
+                      </View>
+                      <View className='address-item__detail_box'>
+                        <View className='address-item__detail'>
+                          {item.province}
+                          {item.city}
+                          {item.county}
+                          {item.adrdetail}
                         </View>
-                      )}
-                    </View>
 
-                    <View className='address-item__footer'>
-                      <View
-                        className='address-item__footer_default'
-                        onClick={(e) => handleChangeDefault(e, item)}
-                      >
-                        {item.is_def ? (
-                          <>
-                            <Text
-                              // className='iconfont icon-check default__icon default__checked'
-                              className='icon-my icon-checkbox-xuanzhong'
-                              style={{ color: colors.colorPrimary }}
-                            >
-                              {' '}
-                            </Text>
-                            <Text className='default-text'>已设为默认</Text>
-                          </>
-                        ) : (
-                          <>
-                            <Text
-                              // className='address-item__unchecked'
-                              className='icon-my icon-checkbox-weixuan'
-                              style={{ borderColor: colors.colorPrimary }}
-                            >
-                              {' '}
-                            </Text>
-                            <Text className='default-text'>设为默认</Text>
-                          </>
+                        {isPicker && !item.disabled && (
+                          <View className='address-item__check' onClick={e => handleClickChecked(e, item)}>
+                            {item[ADDRESS_ID] === selectedId ? (
+                              <Text
+                                className='iconfont icon-check address-item__checked'
+                                style={{ color: colors.colorPrimary }}
+                              ></Text>
+                            ) : (
+                              <Text
+                                className='address-item__unchecked'
+                                style={{ borderColor: colors.colorPrimary }}
+                              >
+                                {' '}
+                              </Text>
+                            )}
+                          </View>
                         )}
                       </View>
-                      {/* <View className='address-item__footer_edit'>
-                        <View className='footer-text' onClick={(e) => handleDelete(e, item, index)}>
-                          <Text className='iconfont icon-trashCan footer-icon'> </Text>
-                          <Text>删除</Text>
+
+                      {!isSelected && <View className='address-item__footer'>
+                        <View
+                          className='address-item__footer_default'
+                          onClick={(e) => handleChangeDefault(e, item)}
+                        >
+                          {item.is_def ? (
+                            <>
+                              <Text
+                                // className='iconfont icon-check default__icon default__checked'
+                                className='icon-my icon-checkbox-xuanzhong'
+                                style={{ color: colors.colorPrimary }}
+                              >
+                                {' '}
+                              </Text>
+                              <Text className='default-text'>已设为默认</Text>
+                            </>
+                          ) : (
+                            <>
+                              <Text
+                                // className='address-item__unchecked'
+                                className='icon-my icon-checkbox-weixuan'
+                                style={{ borderColor: colors.colorPrimary }}
+                              >
+                                {' '}
+                              </Text>
+                              <Text className='default-text'>设为默认</Text>
+                            </>
+                          )}
                         </View>
-                        <View className='footer-text' onClick={(e) => handleClickToEdit(e, item)}>
-                          <Text className='iconfont icon-edit footer-icon'> </Text>
-                          <Text>编辑</Text>
-                        </View>
-                      </View> */}
+                        {/* <View className='address-item__footer_edit'>
+                          <View className='footer-text' onClick={(e) => handleDelete(e, item, index)}>
+                            <Text className='iconfont icon-trashCan footer-icon'> </Text>
+                            <Text>删除</Text>
+                          </View>
+                          <View className='footer-text' onClick={(e) => handleClickToEdit(e, item)}>
+                            <Text className='iconfont icon-edit footer-icon'> </Text>
+                            <Text>编辑</Text>
+                          </View>
+                        </View> */}
+                      </View>}
                     </View>
                   </View>
                 </AtSwipeAction>
@@ -303,6 +369,12 @@ function AddressIndex (props) {
           })}
         </View>
         <SpToast />
+
+        <View className={classNames('toast', {
+          'visible': visible
+        })}>
+          <View>修改成功</View>
+        </View>
       </View>
     </SpPage>
   )
diff --git a/src/marketing/pages/member/address.scss b/src/marketing/pages/member/address.scss
index 68a07c8..352521b 100755
--- a/src/marketing/pages/member/address.scss
+++ b/src/marketing/pages/member/address.scss
@@ -4,11 +4,16 @@
   // background: #f5f5f5;
   padding: 20px;
   .btn-wrap {
-    padding: 0 50px;
+    padding: 20px 50px 0;
     border: transparent 1px solid;
     .at-button__text {
       font-size: 32px;
     }
+    .at-button {
+      &:not(:first-child) {
+        margin: 30px 0 100px;
+      }
+    }
   }
   .member-address-list {
     // /*  #ifdef  h5  */
@@ -63,6 +68,16 @@
       // margin-left: 12px;
       padding: 40px 30px;
       color: #000;
+      .info-icon {
+        width: 26px;
+        height: 26px;
+      }
+      .info__txt {
+        flex: 1;
+        font-size: 18px;
+        line-height: 1.8;
+        margin-left: 20px;
+      }
     }
     &__title {
       color: #010101;
@@ -89,7 +104,7 @@
     }
     &__detail {
       @include multi-ellipsis(2);
-      margin: 0 30px 50px 0;
+      // margin: 0 30px 50px 0;
       color: #959595;
     }
     .at-swipe-action {
@@ -107,6 +122,7 @@
   .address-item__footer {
     display: flex;
     justify-content: space-between;
+    margin-top: 50px;
     // color: #9d9d9d;
     // padding-top: 19px;
     &_default {
@@ -158,4 +174,30 @@
     line-height: 80px;
     font-size: 26px;
   }
+  .toast {
+    position: fixed;
+    z-index: 2;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    opacity: 0;
+    visibility: hidden;
+    transition: all 0.3s ease;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+    width: 400px;
+    height: 120px;
+    background: #666;
+    color: #fff;
+    border-radius: 10px;
+    view {
+      font-size: 30px;
+    }
+    &.visible {
+      visibility: visible;
+      opacity: 1;
+    }
+  }
 }
diff --git a/src/pages/cart/espier-checkout.js b/src/pages/cart/espier-checkout.js
index b394c42..0932d77 100755
--- a/src/pages/cart/espier-checkout.js
+++ b/src/pages/cart/espier-checkout.js
@@ -948,7 +948,7 @@ function CartCheckout (props) {
   //   : ''
 
   return (
-    <SpPage ref={pageRef} className='page-cart-checkout' renderFooter={renderFooter()}>
+    <SpPage ref={pageRef} className='page-cart-checkout' renderFooter={renderFooter()} title="订单结算">
       {isObjectsValue(shoppingGuideData) && (
         <View className='shopping-guide__header'>
           此订单商品来自“{shoppingGuideData.store_name}”导购“ {shoppingGuideData.name}”的推荐
@@ -1022,7 +1022,7 @@ function CartCheckout (props) {
           value={couponText || '请选择'}
         />
       )} */}
-      {/* {isWeixin && !bargain_id && totalInfo.invoice_status && (
+      {isWeixin && !bargain_id && totalInfo.invoice_status && (
         <SpCell
           isLink
           title='开发票'
@@ -1040,7 +1040,7 @@ function CartCheckout (props) {
             </View>
           }
         />
-      )} */}
+      )}
 
       {packInfo.is_open && (
         <SpCell
diff --git a/src/pages/cart/espier-index.js b/src/pages/cart/espier-index.js
index 25632a9..7b6b323 100755
--- a/src/pages/cart/espier-index.js
+++ b/src/pages/cart/espier-index.js
@@ -457,7 +457,8 @@ function CartIndex () {
         </View>
       )}
 
-      {validCart.length == 0 && invalidCart.length == 0 && (
+      {/* && invalidCart.length == 0 */}
+      {validCart.length == 0 && (
         <View className='empty-box'>
           {/* <SpDefault type='cart' message='购物车内暂无商品～'>
             <AtButton type='primary' circle onClick={navigateTo.bind(this, '/pages/index', true)}>
diff --git a/src/pages/recommend/list.js b/src/pages/recommend/list.js
index 8451fa1..1a8f9da 100755
--- a/src/pages/recommend/list.js
+++ b/src/pages/recommend/list.js
@@ -724,7 +724,7 @@ export default class RecommendList extends Component {
               <Video
                 id="recommend-video"
                 src={`${process.env.APP_IMAGE_CDN_NEW}/recommend/162S.mp4`}
-                poster={`${process.env.APP_IMAGE_CDN_NEW}/recommend/02.jpg`}
+                poster={`${process.env.APP_IMAGE_CDN_NEW}/recommend/poster.jpg`}
                 initialTime={0}
                 controls={play}
                 autoplay={false}
@@ -764,14 +764,14 @@ export default class RecommendList extends Component {
               <View className="line"></View>
             </View> */}
               <View className="content-item">
-                <SpImage height={400} width={750} src='recommend/02.jpg' isShowMenuByLongpress={false} lazyLoad isNew />
-                <SpImage height={400} width={750} src='recommend/03.jpg' isShowMenuByLongpress={false} lazyLoad isNew />
-                <SpImage height={400} width={750} src='recommend/04.jpg' isShowMenuByLongpress={false} lazyLoad isNew />
-                <SpImage height={400} width={750} src='recommend/05.jpg' isShowMenuByLongpress={false} lazyLoad isNew />
-                <SpImage height={400} width={750} src='recommend/06.jpg' isShowMenuByLongpress={false} lazyLoad isNew />
-                <SpImage height={400} width={750} src='recommend/07.jpg' isShowMenuByLongpress={false} lazyLoad isNew />
-                <SpImage height={400} width={750} src='recommend/08.jpg' isShowMenuByLongpress={false} lazyLoad isNew />
-                <SpImage height={400} width={750} src='recommend/09.jpg' isShowMenuByLongpress={false} lazyLoad isNew />
+                <SpImage height={400} width={750} mode="aspectFill" src='recommend/02.jpg' isShowMenuByLongpress={false} lazyLoad isNew />
+                <SpImage height={400} width={750} mode="aspectFill" src='recommend/03.jpg' isShowMenuByLongpress={false} lazyLoad isNew />
+                <SpImage height={400} width={750} mode="aspectFill" src='recommend/04.jpg' isShowMenuByLongpress={false} lazyLoad isNew />
+                <SpImage height={400} width={750} mode="aspectFill" src='recommend/05.jpg' isShowMenuByLongpress={false} lazyLoad isNew />
+                <SpImage height={400} width={750} mode="aspectFill" src='recommend/06.jpg' isShowMenuByLongpress={false} lazyLoad isNew />
+                <SpImage height={400} width={750} mode="aspectFill" src='recommend/07.jpg' isShowMenuByLongpress={false} lazyLoad isNew />
+                <SpImage height={400} width={750} mode="aspectFill" src='recommend/08.jpg' isShowMenuByLongpress={false} lazyLoad isNew />
+                <SpImage height={400} width={750} mode="aspectFill" src='recommend/09.jpg' isShowMenuByLongpress={false} lazyLoad isNew />
               </View>
             </View>
           }
diff --git a/src/style/taro-ui-mod.scss b/src/style/taro-ui-mod.scss
index 7570f19..6312c25 100755
--- a/src/style/taro-ui-mod.scss
+++ b/src/style/taro-ui-mod.scss
@@ -191,8 +191,10 @@
   }
   &--normal {
     /* prettier-ignore */
-    border: 1PX solid #E5E5E5;
-    color: #444;
+    // border: 1PX solid #E5E5E5;
+    // color: #444;
+    border: 1px solid #000;
+    color: #000;
   }
   &--default {
     border-color: var(--color-primary) !important;
diff --git a/src/subpage/pages/trade/cancel.scss b/src/subpage/pages/trade/cancel.scss
index a30452d..64fbab7 100755
--- a/src/subpage/pages/trade/cancel.scss
+++ b/src/subpage/pages/trade/cancel.scss
@@ -14,6 +14,9 @@
         border-color: #000;
         background-color: #fff;
       }
+      .at-textarea {
+        border-color: #00000080;
+      }
     }
     .cancel-reason {
       margin: 0 6px 0 0;
diff --git a/src/subpage/pages/trade/comps/new-item.js b/src/subpage/pages/trade/comps/new-item.js
index 095d09d..f32d9c8 100755
--- a/src/subpage/pages/trade/comps/new-item.js
+++ b/src/subpage/pages/trade/comps/new-item.js
@@ -72,6 +72,13 @@ export default class TradeItem extends Component {
     )
   }
 
+  // 修改地址
+  clickToEditAddress (choose) {
+    Taro.navigateTo({
+      url: `/marketing/pages/member/address?isSelected=${choose}`
+    })
+  }
+
   render () {
     const {
       customFooter,
@@ -134,7 +141,7 @@ export default class TradeItem extends Component {
               ) : null}
               <Button
                 className='btn-action'
-                style={`background: ${colors.data[0].primary}`}
+                style={`background: ${colors.data[0].primary};width:120rpx`}
                 onClick={this.handleClickBtn.bind(this, 'pay')}
               >
                 去支付
diff --git a/src/subpage/pages/trade/detail.js b/src/subpage/pages/trade/detail.js
index b751844..712be04 100755
--- a/src/subpage/pages/trade/detail.js
+++ b/src/subpage/pages/trade/detail.js
@@ -1188,7 +1188,7 @@ export default class TradeDetail extends Component {
                 <Button
                   className='trade-detail__footer__btn trade-detail__footer_active trade-detail__footer_allWidthBtn'
                   type='primary'
-                  style={`background: ${colors.data[0].primary}; border-color: ${colors.data[0].primary}`}
+                  style={`background: ${colors.data[0].primary}; border-color: ${colors.data[0].primary}; color: #fff;`}
                   loading={payLoading}
                   onClick={this.handleClickBtn.bind(this, 'pay')}
                 >