商城测试版v7

src/pages/order/comfirm.tsx

@@ -151,7 +151,8 @@ import { throttle } from "@/common/util";
             return false
         }
         let showModalRes = await Taro.showModal({
-            content: '确定提交订单?',
+            title: '确定提交订单?',
+            content: `发货方式为${submitOrderData?.shipment_mode == 1?'自提':'物流'}`,
             confirmText: '确定',
             cancelText: '取消',
         })

src/pages/order/components/returnRecord/index.module.scss

@@ -1,10 +1,7 @@
 .returnRecord_main{
     height: 70vh;
     .returnRecord_con{
-        padding: 0 20px;
-    }
-    .returnRecord_con{
-        padding-top: 20px;
+        padding:  20px;
     }
     .order_item{
         background-color: #fff;
@@ -12,6 +9,7 @@
         padding: 20px;
         box-sizing: border-box;
         box-shadow: 0px 0px 12px 0px rgba(0,0,0,0.16); 
+        margin-bottom: 20px;;
         .header{
             display: flex;
             align-items: center;

src/pages/order/components/returnRecord/index.tsx

@@ -36,11 +36,10 @@ export default memo(({show, onClose, onSubmit, id}:Param) => {
 
     const userInfo = useSelector(state => state.userInfo)
 
-    //获取订单列表
+    //获取售后订单列表
     const {fetchData: listFetchData, state:orderState} = ReturnRecordApi()
     const [orderData, setOrderData] = useState<{list:any[], total:number}>({list:[], total:0})
     const getOrderList = async () => {
-        console.log('ida::', id)
         let res = await listFetchData(getFilterData(searchField.current))
         setOrderData({list: res.data.list, total: res.data.total})
     }
@@ -134,19 +133,19 @@ export default memo(({show, onClose, onSubmit, id}:Param) => {
                                         <View className={styles.color_list}>
                                             {item?.product_list?.[0].product_colors?.map((itemColor, index) => {
                                                     return (
-                                                        (index <= 1)&&<View className={styles.color_item}>
+                                                        (index <= 1)&&<View key={itemColor.id} className={styles.color_item}>
                                                             <View className={styles.color_title}>{formatHashTag(itemColor.code, itemColor.name)}</View>
                                                             <View className={styles.color_price}>{standardPrice(itemColor.sale_price, item.sale_mode)}</View>
-                                                            <View className={styles.color_num}>×{formatCount(itemColor, itemColor.sale_mode)}</View>
+                                                            <View className={styles.color_num}>×{formatCount(itemColor, item.sale_mode)}</View>
                                                         </View>
                                                     )
                                                 })
                                             }
-                                            <View className={styles.color_item}>
+                                            {(item?.product_list?.[0].product_colors.length > 2) && <View className={styles.color_item}>
                                                 <View className={styles.color_more}>……</View>
                                                 <View className={styles.color_more}>……</View>
                                                 <View className={styles.color_more}>……</View>
-                                            </View>
+                                            </View>}
                                         </View>
                                     </View>
                                     <View className={styles.color_count_num}>{numText(item)}</View>

src/pages/order/components/scanPay/index.tsx

@@ -74,7 +74,8 @@ export default memo(({show = true, onClose, company, orderInfo}:Param) => {
                 order_total_num: (orderInfo.total_number) + '',
                 qrcode:"",  //跳转链接
                 order_total_weight: formatWeightDiv(orderInfo.total_estimate_weight).toString(),  //订单布匹重量
-                list: lists 
+                list: lists ,
+                show_qrcode: true //是否显示码单
             }))
         }
     }, [orderInfo])
@@ -171,7 +172,7 @@ export default memo(({show = true, onClose, company, orderInfo}:Param) => {
                     <View className={styles.scanPay_list}>
                         {(state.loading)&&<LoadingCard/>||
                         <ScrollView scrollY className={styles.scanPay_list}>
-                            <Image mode="widthFix" src={payCodeImage} onClick={showImage}></Image>
+                            <Image mode="widthFix" src={payCodeImage} showMenuByLongpress={true} onClick={showImage}></Image>
                         </ScrollView>}
                     </View>
                     <View className={styles.btns} onClick={saveImageCheck}>保存电子确认单</View>