订单售后v3

src/components/orderBtns/index.module.scss

@@ -74,6 +74,11 @@
         &: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;

src/components/orderBtns/index.tsx

@@ -1,9 +1,10 @@
 import { CancelOrderApi, ReceiveOrderApi } from "@/api/order"
 import { alert } from "@/common/common"
 import { ORDER_STATUS, SALE_MODE } from "@/common/enum"
-import { ScrollView, Text, View } from "@tarojs/components"
+import {Text, View } from "@tarojs/components"
 import Taro from "@tarojs/taro"
-import { useCallback, useRef, memo, useState, useEffect, useMemo } from "react"
+import {useRef, memo, useState, useMemo } from "react"
+import classnames from "classnames";
 import styles  from './index.module.scss'
 
 type Param = {
@@ -194,7 +195,7 @@ export default memo(({orderInfo, onClick}:Param) => {
 
             <View className={styles.list_scroll}>
                 {orderBtnsShowList.map((item, index) => 
-                    (index < 3)&&<View key={item.id} className={styles.btns_item} onClick={() => submitBtns(item.id, index)}>{item.label}</View>
+                    (index < 3)&&<View key={item.id} className={classnames(styles.btns_item)} onClick={() => submitBtns(item.id, index)}>{item.label}</View>
                 )}
             </View>
             

src/components/product/index.module.scss

@@ -25,7 +25,7 @@
             border-radius: 10px;
         }
         .num{
-            padding: 5px 10px;
+            padding: 5px 10px 5px 20px;
             font-size: $font_size_min;
             position: absolute;
             right:0;
@@ -51,7 +51,7 @@
         .tag_list{
             display: flex;
             margin-top: 16px;
-            .tag{
+            .tag, .tag_g{
                 padding: 3px 10px;
                 background-color: #CDE5FF;
                 font-size: $font_size_min;
@@ -61,6 +61,10 @@
                     margin-left: 10px;
                 }
             }
+            .tag_g{
+                background-color: #FFE6CE;
+                color: #EE7500;
+            }
         }
         .introduce{
             font-size: $font_size_medium;

src/components/product/index.tsx

@@ -22,7 +22,7 @@ export default ({desStatus = true, productList = []}:Params) => {
                     <View className={styles.title}><text>{formatHashTag(item.code, '')} </text>{item.name}</View>
                     <View className={styles.tag_list}>
                         <View className={styles.tag}>{item.width}</View>
-                        <View className={styles.tag}>{item.weight_density}</View>
+                        <View className={styles.tag_g}>{item.weight_density}</View>
                     </View>
                     <View className={styles.introduce}>{item.component}</View>
                         {desStatus&&<View className={styles.des}>{item.describe}</View>}

src/components/shopCart/index.tsx

@@ -56,6 +56,7 @@ export default ({show = false, onClose}: param) => {
         setLoading(true)
         const {data} = await fetchData()
         let color_list = data.color_list||[]
+        color_list.reverse()
         initList(color_list)
         setList(color_list)
         setLoading(false)

src/components/sideBar/index.module.scss

@@ -29,8 +29,9 @@
             
         }
         .sideBar_select_title_select{
-            background-color: $color_bg_one;
-            color: $color_font_one;
+            background-color: #007AFF;
+            color: #fff;
+            border-radius: 0px 14px 14px 0px;
         }
     }
     .sideBar_con{

src/components/sideBar/index.tsx

@@ -104,7 +104,6 @@ export default memo(({list = [],
                             )
                         })
                     }
-                    <View className="common_safe_area_y"></View>
                 </ScrollView>
                 <View className={styles.sideBar_con}>
                     <InfiniteScroll statusMore={statusMore} hasMore={hasMore} selfonScrollToLower={() => selfOnScrolltolower?.()} refresherTriggered={refresherTriggered} refresherEnabled={true} selfOnRefresherRefresh={() => selfOnRefresherRefresh?.()}>