diff --git a/src/common/constant.ts b/src/common/constant.ts
index c4ed910..5bb765d 100644
--- a/src/common/constant.ts
+++ b/src/common/constant.ts
@@ -1,11 +1,11 @@
-export const BASE_URL = CURRENT_BASE_URL
+// export const BASE_URL = CURRENT_BASE_URL
 // export const BASE_URL = `http://192.168.0.75:50001/lymarket`
 // export const BASE_URL = `http://192.168.0.89:50001/lymarket`
 // export const BASE_URL = `http://10.0.0.5:50001/lymarket`
 // export const BASE_URL = `http://192.168.0.89:40001/lymarket`
 // export const BASE_URL = `http://192.168.1.165:40001/lymarket` // 王霞
 // export const BASE_URL = 'https://test.zzfzyc.com/lymarket' // 测试环境
-// export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布
+export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布
 // export const BASE_URL = `http://192.168.1.9:40001/lymarket` // 发
 // export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发
 // export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发
diff --git a/src/components/afterOrderBtns/index.module.scss b/src/components/afterOrderBtns/index.module.scss
index d57e7b0..1b3a232 100644
--- a/src/components/afterOrderBtns/index.module.scss
+++ b/src/components/afterOrderBtns/index.module.scss
@@ -1,124 +1,120 @@
-.submit_order{
+.submit_order {
+  display: flex;
+  justify-content: flex-end;
+  width: 100%;
+  height: 175px;
+  align-items: center;
+  background-color: #fff;
+  box-shadow: 6px 0px 12px 0px rgba(0, 0, 0, 0.16);
+  padding: 20px 20px;
+  box-sizing: border-box;
+  padding-bottom: constant(safe-area-inset-bottom);
+  padding-bottom: env(safe-area-inset-bottom);
+  .order_btn {
+    width: 152px;
+    height: 72px;
+    border: 2px solid #dddddd;
+    border-radius: 46px;
     display: flex;
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    justify-content: flex-end;
-    width: 100%;
-    height: 175px;
+    justify-content: center;
     align-items: center;
-    background-color: #fff;
-    box-shadow: 6px 0px 12px 0px rgba(0,0,0,0.16);
-    padding: 20px 20px;
-    box-sizing: border-box;
-    padding-bottom: constant(safe-area-inset-bottom);
-    padding-bottom: env(safe-area-inset-bottom);
-    .order_btn {
-        width: 152px;
-        height: 72px;
-        border: 2px solid #dddddd;
-        border-radius: 46px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        color: $color_font_three;
-        &:nth-child(n+2) {
-            margin-left: 34px;
-        }
-    }
-    .order_btn_select{
-        color: $color_main;
-        border: 2px solid $color_main;
-    }
-    .order_number_desc{
-        font-size: $font_size_medium;
-        color: $color_font_two;
+    color: $color_font_three;
+    &:nth-child(n + 2) {
+      margin-left: 34px;
     }
+  }
+  .order_btn_select {
+    color: $color_main;
+    border: 2px solid $color_main;
+  }
+  .order_number_desc {
+    font-size: $font_size_medium;
+    color: $color_font_two;
+  }
 }
-.btns_list{
-    width: 100%;
-    // margin-top: 30px;
+.btns_list {
+  width: 100%;
+  // margin-top: 30px;
+  display: flex;
+  align-content: center;
+  .more {
+    font-size: 28px;
+    width: 143px;
     display: flex;
-    align-content: center;
-    .more{
-        font-size: 28px;
-        width: 143px;
-        display: flex;
-        align-items: center;
-        color: $color_font_two;
-        padding-left: 20px;
-        position: relative;
+    align-items: center;
+    color: $color_font_two;
+    padding-left: 20px;
+    position: relative;
 
-        .more_list{
-            position: absolute;
-            background-color: #fff;
-            width: 226px;
-            box-shadow: 0px 0px 20px 0px rgba(0,0,0,0.06);
-            border-radius: 10px;
-            padding: 0 20px;
-            box-sizing: border-box;
-            z-index:999;
-            &::before{
-                z-index: 1;
-                position: absolute;
-                bottom: -7px;
-                left: 50px;
-                width: 15px;
-                height: 15px;
-                content: " ";
-                transform: rotate(45deg);
-                background: #fff;
-                box-sizing: border-box;
-                box-shadow: 0px 0px 20px 0px rgba(0,0,0,0.1);
-            }
-            .more_item{
-                font-size: 28px;
-                height: 70px;
-                line-height: 70px;
-                text-align: center;
-                &:nth-last-child(n+2) {
-                    border-bottom: 1PX solid #F0F0F0;
-                }
-            }
-        }
-        .more_bg{
-            position:fixed;
-            width: 100vw;
-            height: 100vh;
-            top: 0;
-            left: 0;
-        }
-    }
-    .scroll{
-        white-space: nowrap;
-        width: 100%;
-    }
-    .list_scroll{
-        white-space: nowrap;
-        width: 100%;
-        text-align: right;
-    }
-    .btns_item{
-        padding: 0 15px;
-        width: 130px;
-        border: 2px solid #dddddd;
-        border-radius: 38px;
+    .more_list {
+      position: absolute;
+      background-color: #fff;
+      width: 226px;
+      box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.06);
+      border-radius: 10px;
+      padding: 0 20px;
+      box-sizing: border-box;
+      z-index: 999;
+      &::before {
+        z-index: 1;
+        position: absolute;
+        bottom: -7px;
+        left: 50px;
+        width: 15px;
+        height: 15px;
+        content: ' ';
+        transform: rotate(45deg);
+        background: #fff;
+        box-sizing: border-box;
+        box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.1);
+      }
+      .more_item {
+        font-size: 28px;
+        height: 70px;
+        line-height: 70px;
         text-align: center;
-        line-height: 60px;
-        font-size: $font_size;
-        color: $color_font_three;
-        display:inline-block;
-        &:nth-child(n+2) {
-            margin-left: 32px;
+        &:nth-last-child(n + 2) {
+          border-bottom: 1px solid #f0f0f0;
         }
-        &:nth-last-child(1) {
-            border: 2px solid $color_main;
-            color: $color_main;
-        }
-        
+      }
     }
-    .end_btn{
-        border: 2px solid $color_main;
-        color: $color_main;
+    .more_bg {
+      position: fixed;
+      width: 100vw;
+      height: 100vh;
+      top: 0;
+      left: 0;
     }
-}
\ No newline at end of file
+  }
+  .scroll {
+    white-space: nowrap;
+    width: 100%;
+  }
+  .list_scroll {
+    white-space: nowrap;
+    width: 100%;
+    text-align: right;
+  }
+  .btns_item {
+    padding: 0 15px;
+    width: 130px;
+    border: 2px solid #dddddd;
+    border-radius: 38px;
+    text-align: center;
+    line-height: 60px;
+    font-size: $font_size;
+    color: $color_font_three;
+    display: inline-block;
+    &:nth-child(n + 2) {
+      margin-left: 32px;
+    }
+    &:nth-last-child(1) {
+      border: 2px solid $color_main;
+      color: $color_main;
+    }
+  }
+  .end_btn {
+    border: 2px solid $color_main;
+    color: $color_main;
+  }
+}
diff --git a/src/pages/salesAfter/index.module.scss b/src/pages/salesAfter/index.module.scss
index 635ee29..8569fd2 100644
--- a/src/pages/salesAfter/index.module.scss
+++ b/src/pages/salesAfter/index.module.scss
@@ -1,155 +1,164 @@
-.order_main{
-    min-height: 100%;
-    background-color:$color_bg_one;
-    padding: 20px;
-    padding-bottom: 190px;
+page {
+  height: 100vh;
+  display: flex;
+  flex-flow: column nowrap;
+  overflow: hidden;
+}
+.order_main {
+  display: flex;
+  flex-flow: column nowrap;
+  justify-content: space-between;
+  background-color: $color_bg_one;
+  box-sizing: border-box;
+  overflow: hidden;
+  .content {
+    flex: 1 1 auto;
+    overflow-y: scroll;
+  }
+  .button_bar {
+  }
+  .order_title {
+    display: flex;
+    align-items: center;
+    padding: 20px 30px;
     box-sizing: border-box;
+    background-color: #fff;
+    height: 116px;
+    border-radius: 20px;
+    margin-top: 20px;
+    text {
+      flex: 1;
+      font-size: $font_size;
+      font-weight: 700;
+    }
+    .order_status {
+      background-color: #f0f0f0;
+      width: 148px;
+      height: 55px;
+      color: $color_font_three;
+      text-align: center;
+      line-height: 55px;
+      font-size: $font_size_medium;
+      border-radius: 30px;
+      &:nth-last-child(1) {
+        margin-left: 20px;
+      }
+    }
+  }
+  .order_desc {
+    display: flex;
+    align-items: center;
+    background-color: #fff;
+    padding: 20px;
+    min-height: 116px;
+    border-radius: 20px;
+    margin-top: 20px;
+    box-sizing: border-box;
+    .order_desc_con {
+      width: 150px;
+      font-size: $font_size;
+      font-weight: 700;
+    }
+    .order_desc_text,
+    .order_desc_text_hint {
+      font-size: $font_size_medium;
+      color: $color_font_two;
+      margin-right: 10px;
+      flex: 1;
+      word-break: break-all;
+    }
+    .order_desc_text_hint {
+      text-align: right;
+    }
+    .miconfont {
+      font-size: 20px;
+      color: $color_font_two;
+    }
+  }
+  .submit_order {
+    display: flex;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    justify-content: flex-end;
+    width: 100%;
+    height: 175px;
+    align-items: center;
+    background-color: #fff;
+    box-shadow: 6px 0px 12px 0px rgba(0, 0, 0, 0.16);
+    padding: 20px 20px;
+    box-sizing: border-box;
+    padding-bottom: constant(safe-area-inset-bottom);
+    padding-bottom: env(safe-area-inset-bottom);
+    .order_btn {
+      width: 152px;
+      height: 72px;
+      border: 2px solid #dddddd;
+      border-radius: 46px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      color: $color_font_three;
+      &:nth-child(n + 2) {
+        margin-left: 34px;
+      }
+    }
+    .order_btn_select {
+      color: $color_main;
+      border: 2px solid $color_main;
+    }
+    .order_number_desc {
+      font-size: $font_size_medium;
+      color: $color_font_two;
+    }
+  }
+  .order_info {
+    background-color: #fff;
+    margin-top: 20px;
+    border-radius: 20px;
+    padding: 20px;
+    .order_info_title {
+      font-size: $font_size;
+      font-weight: 700;
+      margin-bottom: 20px;
+    }
+    .order_num {
+      display: flex;
+      width: 100%;
+      justify-content: space-between;
+      align-items: center;
+      .order_num_btn {
+        font-size: $font_size_medium;
+        padding: 5px;
+        border: 2px solid #007cf7;
+        border-radius: 10px;
+        color: $color_main;
+      }
+    }
+    text {
+      font-size: $font_size;
+      word-break: break-all;
+    }
+  }
 
-    .order_title{
-        display: flex;
-        align-items: center;
-        padding: 20px 30px;
-        box-sizing: border-box;
-        background-color: #fff;
-        height: 116px;
-        border-radius: 20px;
-        margin-top: 20px;
-        text{
-            flex:1;
-            font-size: $font_size;
-            font-weight: 700;
-        }
-        .order_status{
-            background-color: #F0F0F0;
-            width: 148px;
-            height: 55px;
-            color: $color_font_three;
-            text-align: center;
-            line-height: 55px;
-            font-size: $font_size_medium;
-            border-radius: 30px;
-            &:nth-last-child(1) {
-                margin-left: 20px;
-            }
-        }
-    }
-    .order_desc{
-        display: flex;
-        align-items: center;
-        background-color: #fff;
-        padding: 20px;
-        min-height: 116px;
-        border-radius: 20px;
-        margin-top: 20px;
-        box-sizing: border-box;
-        .order_desc_con{
-            width: 150px;
-            font-size: $font_size;
-            font-weight: 700;
-        }
-        .order_desc_text, .order_desc_text_hint{
-            font-size: $font_size_medium;
-            color: $color_font_two;
-            margin-right: 10px;
-            flex:1;
-            word-break:break-all;
-        }
-        .order_desc_text_hint{
-            text-align: right;
-        }
-        .miconfont{
-            font-size: 20px;
-            color: $color_font_two;
-        }
-    }
-    .submit_order{
-        display: flex;
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        justify-content: flex-end;
+  .after_sale_picture_list {
+    display: grid;
+    grid-template-columns: repeat(5, 102px);
+    justify-items: center;
+    grid-row-gap: 20px;
+    grid-column-gap: calc((100% - 102px * 5) / 4);
+    .after_sale_picture_item {
+      width: 102px;
+      height: 102px;
+      image {
         width: 100%;
-        height: 175px;
-        align-items: center;
-        background-color: #fff;
-        box-shadow: 6px 0px 12px 0px rgba(0,0,0,0.16);
-        padding: 20px 20px;
-        box-sizing: border-box;
-        padding-bottom: constant(safe-area-inset-bottom);
-        padding-bottom: env(safe-area-inset-bottom);
-        .order_btn {
-            width: 152px;
-            height: 72px;
-            border: 2px solid #dddddd;
-            border-radius: 46px;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            color: $color_font_three;
-            &:nth-child(n+2) {
-                margin-left: 34px;
-            }
-        }
-        .order_btn_select{
-            color: $color_main;
-            border: 2px solid $color_main;
-        }
-        .order_number_desc{
-            font-size: $font_size_medium;
-            color: $color_font_two;
-        }
+        height: 100%;
+        border-radius: 10px;
+      }
     }
-    .order_info{
-        background-color: #fff;
-        margin-top: 20px;
-        border-radius: 20px;
-        padding: 20px;
-        .order_info_title{
-            font-size: $font_size;
-            font-weight: 700;
-            margin-bottom: 20px;
-            
-        }
-        .order_num{
-            display: flex;
-            width: 100%;
-            justify-content: space-between;
-            align-items: center;
-            .order_num_btn{
-                font-size: $font_size_medium;
-                padding: 5px;
-                border: 2px solid #007cf7;
-                border-radius: 10px;
-                color: $color_main;
-            }
-        }
-        text{
-            font-size: $font_size;
-            word-break: break-all;
-        }
+  }
 
-    }
-
-    .after_sale_picture_list{
-        display: grid;
-        grid-template-columns: repeat(5, 102px);
-        justify-items: center;
-        grid-row-gap:20px;
-        grid-column-gap: calc((100% - 102px*5)/4);
-        .after_sale_picture_item{
-            width: 102px;
-            height: 102px;
-            image{
-                width:100%;
-                height: 100%;
-                border-radius: 10px;
-            }
-        }
-    }
-    
-
-    .weight_memo_con{
-        margin-bottom: 20px;
-    }
-
-}
\ No newline at end of file
+  .weight_memo_con {
+    margin-bottom: 20px;
+  }
+}
diff --git a/src/pages/salesAfter/index.tsx b/src/pages/salesAfter/index.tsx
index 9594155..a0b1738 100644
--- a/src/pages/salesAfter/index.tsx
+++ b/src/pages/salesAfter/index.tsx
@@ -191,12 +191,16 @@ const SalesAfter = () => {
   return (
     <MoveBtn showList={['order']} messageTitle={orderDetail?.return_order_no} messagePath={`/pages/salesAfter/index?id=${orderDetail?.id}`} showCart>
       <View className={styles.order_main}>
-        <OrderState orderInfo={orderDetail} />
-        <AddressInfoDetail orderInfo={orderDetail} onLogistics={onShowLogistics} />
-        <KindList order={formatPreViewOrderMemo} />
-        <OrderDesWithMemo orderInfo={orderDetail} />
-        <AfterOrderBtns orderInfo={orderInfo} onClick={orderStateClick} />
-        <AfterSalePrictureWithMemo urls={orderDetail?.fabric_piece_accessory_url} />
+        <View className={styles.content} style={{ padding: '20rpx' }}>
+          <OrderState orderInfo={orderDetail} />
+          <AddressInfoDetail orderInfo={orderDetail} onLogistics={onShowLogistics} />
+          <KindList order={formatPreViewOrderMemo} />
+          <OrderDesWithMemo orderInfo={orderDetail} />
+          <AfterSalePrictureWithMemo urls={orderDetail?.fabric_piece_accessory_url} />
+        </View>
+        <View className={styles.button_bar}>
+          <AfterOrderBtns orderInfo={orderInfo} onClick={orderStateClick} />
+        </View>
         <ReturnLogistics
           onlyRead={logistics}
           images={orderDetail?.accessory_url}
@@ -208,7 +212,6 @@ const SalesAfter = () => {
         />
         <ApplyRecord show={applyRecord} id={orderDetail?.id} onClose={() => setApplyRecord(false)} />
         <ReturnPayCheck orderInfo={orderDetail} show={returnCodeShow} onClose={() => setReturnCodeShow(false)} />
-        <View className="common_safe_area_y"></View>
       </View>
     </MoveBtn>
   )
diff --git a/src/pages/salesAfter/salesAfterList/components/order/index.tsx b/src/pages/salesAfter/salesAfterList/components/order/index.tsx
index d59384d..7d0b1dc 100644
--- a/src/pages/salesAfter/salesAfterList/components/order/index.tsx
+++ b/src/pages/salesAfter/salesAfterList/components/order/index.tsx
@@ -83,7 +83,7 @@ export default memo(({ value, onClickBtn }: Param) => {
     if (!value?.is_quality_check) {
       const total_number_new = value?.sale_mode == 0 ? value?.total_number : value?.total_number / 100
       return `${value?.total_fabrics} 种面料，${value?.total_colors} 种颜色，共 ${total_number_new}${value?.sale_mode == 0 ? ' 条' : ' 米'}`
-    }
+    }
     else {
       const total_number_new = value?.sale_mode == 0 ? value?.quality_check_pass_number : value?.quality_check_pass_number / 100
       return `${value?.quality_check_pass_fabrics} 种面料，${value?.quality_check_pass_colors} 种颜色，共 ${total_number_new}${