商城测试版v6

src/components/LabAndImg/index.module.scss

@@ -7,6 +7,7 @@
         height: 100%;
         border-radius: 20px;
         border:1PX solid #818181;
+        box-sizing: border-box;
     }
     image{
         width: 100%;

src/components/bindSalesmanPopup/index.module.scss

@@ -0,0 +1,76 @@
+.bindSalesman_main{
+    width: 100%;
+    height: 100vh;
+    position: fixed;
+    left:0;
+    top:0;
+    .bindSalesman_pop{
+        width: 598px;
+        height: 654px;
+        background: #ffffff;
+        border-radius: 40px; 
+        display: flex;
+        flex-direction: column;
+        position:absolute;
+        margin:auto;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        top: 0;
+        bottom: 0;
+        z-index: 1999;
+        .bindSalesman_header{
+            height: 300px;
+            width: 100%;
+            image{
+                width: 100%;
+                height: 100%;
+                border-radius: 40px 40px 0 0;
+            }
+        }
+        .bindSalesman_message{
+            color: #707070;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            flex-direction: column;
+            flex:1;
+            font-size: 26px;
+            padding: 0 30px;
+            text{
+                display: block;
+                &:nth-child(1) {
+                    font-size: 28px;
+                    font-weight: 700;
+                    margin-bottom: 20px;
+                }
+            }
+        }
+        .bindSalesman_operation{
+            display: flex;
+            .btns{
+                flex:1;
+                border-top: 1PX solid #dddddd;
+                height: 128px;
+                text-align: center;
+                line-height: 128px;
+                font-size: 26px;
+                color: #707070;
+                &:nth-child(2) {
+                    border-left: 1PX solid #dddddd;
+                    color: #007AFF;
+                }
+            }
+        }
+    }
+    .bindSalesman_mask{
+        z-index: 99;
+        position: absolute;
+        left:0;
+        top:0;
+        width: 100%;
+        height: 100%;
+        opacity: 0.8;
+        background: #000000;
+    }
+}

src/components/bindSalesmanPopup/index.tsx

@@ -0,0 +1,51 @@
+import { Image, Swiper, SwiperItem, Text, View } from "@tarojs/components"
+import styles  from './index.module.scss'
+import { formatImgUrl } from "@/common/fotmat"
+import Taro from "@tarojs/taro";
+import { goLink } from "@/common/common";
+
+type params = {
+    show?: true|false,
+    onClose?: () => void
+}
+export default ({show, onClose}:params) => {
+    const onCustomer = async () => {
+        let res = await Taro.showModal({
+            title: '是否拨打服务热线',
+            confirmText: '拨打',
+            content: '(0757) 8270 6695',
+            cancelText: '取消',
+        })
+        if(res.confirm) {
+            Taro.makePhoneCall({
+                phoneNumber: '(0757)82706695'
+            })
+        }
+    }
+
+    const onConfirm = () => {
+        onClose?.()
+        // goLink('/')
+    }
+    return (
+        <>
+            {show&&<View className={styles.bindSalesman_main}>
+                <View className={styles.bindSalesman_pop}>
+                    <View className={styles.bindSalesman_header}>
+                        <Image src={formatImgUrl('/mall/invite_code_top.png', '!w400')} mode="aspectFill"/>
+                    </View>
+                    <View className={styles.bindSalesman_message}>
+                        <Text>提示</Text>
+                        <Text>暂未开通下单权限功能，稍后有客服联系您，请注意接收电话。</Text>
+                    </View>
+                    <View className={styles.bindSalesman_operation}>
+                        <View className={styles.btns} onClick={() => onConfirm()}>输入邀请码</View>
+                        <View className={styles.btns} onClick={() => onCustomer()}>联系客服</View>
+                    </View>
+                </View>
+                <View className={styles.bindSalesman_mask} onClick={onClose}></View>
+            </View>}
+        </>
+    )
+   
+}

src/components/orderBtns/index.tsx

@@ -111,8 +111,9 @@ export default memo(({orderInfo, onClick}:Param) => {
             validatarFunc: (orderInfo) => {
                 let orderStatus = [
                     SaleOrderStatusAlreadyReceipt.value,
+                    SaleOrderStatusRefund.value
                 ]
-                return orderStatus.includes(orderInfo.status)
+                return orderInfo.av_return_roll&& orderStatus.includes(orderInfo.status)
             }
         },
         {

src/components/shopCart/index.module.scss

@@ -26,6 +26,7 @@
         display: flex;
         justify-content: space-between;
         padding: 0 30px;
+        box-sizing: border-box;
         .search_item{
             width: 200px;
             height: 55px;
@@ -40,6 +41,7 @@
             border: 2px solid $color_main;
             background-color: #ecf5ff;
             color: $color_main;
+            box-sizing: border-box;
         }
     }
     .con{

src/components/shopCart/index.tsx

@@ -220,8 +220,8 @@ export default ({show = false, onClose, intoStatus='shop'}: param) => {
                 all_count += item.sale_mode == 0?item.roll: (item.length)
             }
         })
-        let all_count_text = selectIndex == 0?all_count + '条': (all_count/100) + '米'
-        return {price: Number(formatPriceDiv(estimate_amount)).toFixed(2), countText: `已选${product_list.size}种面料，${color_count}个颜色，共${all_count_text}`, color_count}
+        let all_count_text = selectIndex == 0?all_count + ' 条': (all_count/100) + ' 米'
+        return {price: Number(formatPriceDiv(estimate_amount)).toFixed(2), countText: `已选 ${product_list.size} 种面料，${color_count} 个颜色，共 ${all_count_text}`, color_count}
     },[list, checkboxData])