商城测试版v8

src/app.config.ts

@@ -98,7 +98,7 @@ export default {
       pages: [
         "index",
         "comfirm",
-        "cutOrder/index",
+        "orderList/index"
       ]
     },
     {
@@ -107,12 +107,6 @@ export default {
         "index",
       ]
     },
-    {
-      root: "pages/orderList",
-      pages: [
-        "index",
-      ]
-    },
     {
       root: "pages/subjectList",
       pages: [
@@ -149,16 +143,11 @@ export default {
         "index"
       ]
     },
-    {
-      root: "pages/salesAfterList",
-      pages: [
-        "index",
-      ]
-    },
     {
       root: "pages/salesAfter",
       pages: [
         "index",
+        "salesAfterList/index"
       ]
     },
     {

src/common/constant.js

@@ -4,15 +4,15 @@
 // 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://test.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` // 发
 // export const BASE_URL = `https://dev.zzfzyc.com/lymarket`  // 开发环境
 // export const BASE_URL = `https://www.zzfzyc.com/lymarket`  // 正式环境
 // export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞
-// export const BASE_URL = `http://192.168.1.7:50001/lymarket` // 添
-export const BASE_URL = `http://192.168.1.42:50001/lymarket` // 杰
+// export const BASE_URL = `http://192.168.1.7:50001/lymarket` // 添=[A14578YY]
+// export const BASE_URL = `http://192.168.1.42:50001/lymarket` // 杰
 
 // CDN
 // 生成密钥

src/pages/applyAfterSales/index.tsx

@@ -120,7 +120,7 @@ export default () => {
         let res = await fetchDataReturnApply(submitData)
         if(res.success) {
             alert.success('申请成功')
-            goLink('/pages/salesAfterList/index',{}, 'reLaunch')
+            goLink('/pages/salesAfter/salesAfterList/index',{}, 'reLaunch')
         } else {
             alert.error(res.msg)
         }

src/pages/bindSalesman/index.module.scss

@@ -65,7 +65,7 @@
         margin-top: 50px;
     }
     .select_btns{
-        background: #0071ec;
+        opacity: 1;
     }
     .message{
         padding: 150px 30px 20px 30px;

src/pages/bindSalesman/index.tsx

@@ -13,9 +13,9 @@ import { debounce, getFilterData, throttle } from '@/common/util';
 export default () => {
   useLogin()
 
-  useDidShow(() => {
+  useEffect(() => {
     onClipboardData()
-  })
+  }, [])
 
   const [submitData, setSubmitData] = useState({
     invitation_code: '',

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

@@ -69,22 +69,22 @@ export default memo(({show = true, onClose, company, orderInfo}:Param) => {
                 client: orderInfo.purchaser_name, //客户名称
                 phone: userPhone(orderInfo), //收货手机号码
                 order_total_length: (orderInfo.total_number/100).toString(), //订单布匹长度
-                order_total_price: formatPriceDiv(orderInfo.total_should_collect_money).toString(), //订单价格
+                order_total_price: formatPriceDiv(orderInfo.bill_total_sale_price).toString(), //订单价格
                 order_total_num: (orderInfo.total_number) + '',
                 qrcode:"",  //跳转链接
                 order_total_weight: formatWeightDiv(orderInfo.total_weight||orderInfo.total_estimate_weight).toString(),  //订单布匹重量
                 list: lists ,
                 show_qrcode: true, //是否显示码单
 
-                estimate_amount: orderInfo.estimate_amount,
-                show_estimate_amount: orderInfo.estimate_amount > 0,
-                total_sale_price: orderInfo.total_sale_price,
+                estimate_amount: formatPriceDiv(orderInfo.estimate_amount).toString(),
+                show_estimate_amount: orderInfo.estimate_amount > 0 && orderInfo.total_sale_price <= 0,
+                total_sale_price: formatPriceDiv(orderInfo.total_sale_price).toString(),
                 show_total_sale_price: orderInfo.total_sale_price > 0,
-                total_weight_error_discount:  orderInfo.total_weight_error_discount,
+                total_weight_error_discount:  formatPriceDiv(orderInfo.total_weight_error_discount).toString(),
                 show_total_weight_error_discount: orderInfo.total_weight_error_discount > 0,
-                actual_amount: orderInfo.actual_amount,
+                actual_amount: formatPriceDiv(orderInfo.actual_amount).toString(),
                 show_actual_amount: orderInfo.actual_amount > 0,
-                wait_pay_amount: orderInfo.wait_pay_amount,
+                wait_pay_amount: formatPriceDiv(orderInfo.wait_pay_amount).toString(),
                 show_wait_pay_amount: orderInfo.wait_pay_amount > 0
             }))
         }

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

@@ -74,21 +74,21 @@ export default memo(({show = true, onClose, company, orderInfo}:Param) => {
                 client: orderInfo.purchaser_name, //客户名称
                 phone: userPhone(orderInfo), //收货手机号码
                 order_total_length: (orderInfo.total_number/100).toString(), //订单布匹长度
-                order_total_price: formatPriceDiv(orderInfo.total_should_collect_money).toString(), //订单价格
+                order_total_price: formatPriceDiv(orderInfo.bill_total_sale_price).toString(), //订单价格
                 order_total_num: (orderInfo.total_number).toString(),
                 qrcode:"",  //跳转链接
                 order_total_weight: formatWeightDiv(orderInfo.total_weight||orderInfo.total_estimate_weight).toString(),  //订单布匹重量
                 list: lists,
 
-                estimate_amount: orderInfo.estimate_amount,
-                show_estimate_amount: orderInfo.estimate_amount > 0,
-                total_sale_price: orderInfo.total_sale_price,
+                estimate_amount: formatPriceDiv(orderInfo.estimate_amount).toString(),
+                show_estimate_amount: orderInfo.estimate_amount > 0 && orderInfo.total_sale_price <= 0,
+                total_sale_price: formatPriceDiv(orderInfo.total_sale_price).toString(),
                 show_total_sale_price: orderInfo.total_sale_price > 0,
-                total_weight_error_discount:  orderInfo.total_weight_error_discount,
+                total_weight_error_discount:  formatPriceDiv(orderInfo.total_weight_error_discount).toString(),
                 show_total_weight_error_discount: orderInfo.total_weight_error_discount > 0,
-                actual_amount: orderInfo.actual_amount,
+                actual_amount: formatPriceDiv(orderInfo.actual_amount).toString(),
                 show_actual_amount: orderInfo.actual_amount > 0,
-                wait_pay_amount: orderInfo.wait_pay_amount,
+                wait_pay_amount: formatPriceDiv(orderInfo.wait_pay_amount).toString(),
                 show_wait_pay_amount: orderInfo.wait_pay_amount > 0
             }))
         }

src/pages/order/cutOrder/index.config.ts

@@ -1,6 +0,0 @@
-export default {
-  navigationBarTitleText: '订单详情',
-  enablePullDownRefresh: true,
-  backgroundTextStyle: 'dark',
-  enableShareAppMessage: true,
-}

src/pages/order/cutOrder/index.module.scss

@@ -1,133 +0,0 @@
-.order_main{
-    min-height: 100%;
-    background-color:$color_bg_one;
-    padding: 20px;
-    padding-bottom: 190px;
-    box-sizing: border-box;
-
-    .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%;
-        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;
-            justify-content: space-between;
-            align-items: center;
-            .order_num_btn{
-                font-size: $font_size_medium;
-                padding: 5px 10px;
-                border: 2px solid #007cf7;
-                border-radius: 10px;
-                color: $color_main;
-            }
-        }
-        text{
-            font-size: $font_size;
-        }
-
-    }
-    .weight_memo_con{
-        margin-bottom: 20px;
-    }
-
-}

src/pages/order/cutOrder/index.tsx

@@ -1,228 +0,0 @@
-import { 
-    GetSaleOrderDetailApi, 
-    EditSaleOrderRemarkApi, 
-    CancelOrderApi
-} from "@/api/order";
-import { GetOrderPayApi } from "@/api/orderPay";
-import { alert, goLink } from "@/common/common";
-import { ORDER_STATUS } from "@/common/enum";
-import { formatDateTime, formatPriceDiv } from "@/common/fotmat";
-import OrderBtns from "@/components/orderBtns";
-import Popup from "@/components/popup";
-import SearchInput from "@/components/searchInput";
-import { Text, Textarea, View } from "@tarojs/components"
-import Taro, { useDidShow, usePullDownRefresh, useRouter } from "@tarojs/taro";
-import classnames from "classnames";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import AddressInfoDetail from "../components/addressInfoDetail";
-import KindList from "../components/kindList";
-import OrderState from "../components/orderState";
-import Payment from "../components/payment";
-import Remark from "../components/remark";
-import styles  from '../index.module.scss'
- 
- export default () => {
-    const [showDesc, setShowDesc] = useState(false)
-    const router = useRouter()
-    const orderId = useRef<number>(Number(router.params.id))
-    useDidShow(() => {
-        getSaleOrderPreView()
-    })
-
-    //获取订单详情
-    const [orderDetail, setOrderDetail] = useState<any>() //获取到的原始数据
-    const {fetchData: getOrderFetchData} = GetSaleOrderDetailApi()
-    const getSaleOrderPreView = async () => {
-        if(orderId.current) {
-            let res = await getOrderFetchData({id: orderId.current})
-            setOrderDetail(res.data)
-            setOrderRemark(res.data.remark)
-        }
-        Taro.stopPullDownRefresh()       
-    }
-
-    //监听获取到的数据
-    useEffect(() => {
-        if(orderDetail)
-            formatData()
-    }, [orderDetail])
-
-    //格式化数据格式
-    const [formatDetailOrder, setFormatDetailOrder] = useState<any>() //格式化后的数据
-    const formatData = () => {  
-        setFormatDetailOrder({
-            estimate_amount: orderDetail.estimate_amount, //预估金额
-            sale_mode: orderDetail.sale_mode,
-            sale_mode_name: orderDetail.sale_mode_name, 
-            total_colors: orderDetail.total_colors, //总颜色数量
-            total_number: orderDetail.total_number, //总数量
-            total_fabrics: orderDetail.total_fabrics, //面料数量
-            unit: orderDetail.sale_mode == 0?'条':'m', //单位
-            list: orderDetail.product_list,
-            status: orderDetail.status, //订单状态
-            total_sale_price: orderDetail.total_sale_price, //销售金额
-            total_should_collect_money: orderDetail.total_should_collect_money, //应收金额
-            total_weight_error_discount: orderDetail.total_weight_error_discount, //空差优惠
-            actual_amount: orderDetail.actual_amount, //实付金额
-            the_previous_status: orderDetail.the_previous_status, //取消订单时的订单状态
-
-        })
-    }
-    const formatPreViewOrderMemo = useMemo(() => {
-        return formatDetailOrder
-    }, [formatDetailOrder])
-
-    //复制功能
-    const clipboardData = () => {
-        Taro.setClipboardData({
-            data: orderDetail?.order_no||'',
-            success: function (res) {
-                Taro.showToast({
-                    icon: 'none',
-                    title: '复制成功'
-                })
-            }
-        })
-    }
-
-    //格式化初始地址
-    const defaultAddress = useMemo(() => {
-        return  {
-            province_name: orderDetail?.province_name,
-            city_name: orderDetail?.city_name,
-            district_name: orderDetail?.district_name,
-            address_detail: orderDetail?.address_detail,
-            // id: address.id,
-            name: orderDetail?.target_user_name,
-            phone: orderDetail?.target_user_phone
-        }
-       
-    }, [orderDetail])
-
-    //订单备注
-    const {fetchData: remarkFetchData} = EditSaleOrderRemarkApi()
-    const [orderRemark, setOrderRemark] = useState('')
-    const getRemark = useCallback(async (e) => {
-        setOrderRemark(() => e)
-        let res = await remarkFetchData({remark:e, id: orderId.current})
-        if(res.success) {
-            getSaleOrderPreView()
-            alert.success('提交成功')
-        } else {
-            alert.error(res.msg)
-        }
-        setShowDesc(() => false)
-    }, [])
-
-    //支付所需数据
-    const payOrderInfo = useMemo(() => {
-        if(orderDetail)
-            return {orderId: orderDetail.should_collect_order_id,  payment_method:orderDetail.payment_method }
-    }, [orderDetail])
-
-    //去付款
-    const [payMentShow, setPayMentShow] = useState(false)
-    const toPay = () => {
-        setPayMentShow(true)
-    }
-
-    //打开地址修改
-    const addressRef = useRef<any>(null)
-
-    //修改收货方式
-    const getShipmentMode = useCallback(() => {
-        getSaleOrderPreView()
-    }, [orderDetail])
-
-    //修改地址
-    const getAddress = useCallback(() => {
-        getSaleOrderPreView()
-    }, [orderDetail])
-
-    //获取底部按钮点击, 获取按钮状态
-    const orderStateClick = useCallback((val) => {
-        if(val == 1 || val == 6) {
-            //取消订单
-            getSaleOrderPreView()
-        }else if(val == 2) {
-            //待付款
-            toPay()
-        }
-    }, [orderDetail])
-
-    //页面下拉刷新
-    usePullDownRefresh(() => {
-        getSaleOrderPreView()
-    })
-
-    //支付成功
-    const onPaySuccess = useCallback(() => {
-        getSaleOrderPreView()
-        closePayShow()
-    }, [orderDetail])
-
-    //关闭支付弹窗
-    const closePayShow = useCallback(() => {
-        setPayMentShow(() => false)
-    }, [orderDetail])
-
-    //按钮所需数据
-    const orderInfo = useMemo(() => {
-        return {
-            status: orderDetail?.status, //订单状态
-            orderId: orderDetail?.id,
-            settle_mode: orderDetail?.settle_mode,
-            actual_amount: orderDetail?.actual_amount, //实付金额
-            wait_pay_amount: orderDetail?.wait_pay_amount, //待付金额
-        }
-    }, [orderDetail])
-
-    //订单状态枚举
-    const {SaleOrderStatusCancel} = ORDER_STATUS
-
-    
-
-    return (
-        <View className={styles.order_main}>
-            {/* <View className={styles.weight_memo_con}>
-                <WeightMemo/>
-            </View> */}
-            <OrderState list={orderDetail?.logistics_details} payment_method={orderDetail?.payment_method}/>
-            <View >
-                <AddressInfoDetail orderId={orderDetail?.id} onSelect={getAddress} onChangeShipmentMode={getShipmentMode} ref={addressRef} defaultValue={defaultAddress} shipment_mode={orderDetail?.shipment_mode}/>
-            </View>
-            <KindList order={formatPreViewOrderMemo} />
-            <View className={styles.order_info} >
-                <View className={styles.order_info_title}>订单信息</View>
-                <SearchInput showBorder={false} title='单号' height={50}>
-                    <View className={styles.order_num}>
-                        <Text>{orderDetail?.order_no}</Text>
-                        <View className={styles.order_num_btn} onClick={() => clipboardData()}>复制</View>
-                    </View>
-                </SearchInput>
-                <SearchInput showBorder={false} title='下单时间' height={50}>
-                    <Text>{formatDateTime(orderDetail?.create_time)}</Text>
-                </SearchInput>
-                <SearchInput showBorder={false} title='付款时间' height={50}>
-                    <Text>{formatDateTime(orderDetail?.create_time)}</Text>
-                </SearchInput>
-            </View>
-            <View className={styles.order_desc} onClick={() => setShowDesc(true)}>
-                <View className={styles.order_desc_con}>订单备注</View>
-                {
-                    orderRemark&&<View className={styles.order_desc_text}>{orderDetail?.remark}</View>||
-                    <View className={styles.order_desc_text_hint}>填写备注</View>
-                }
-                <View className={classnames(styles.miconfont, 'iconfont icon-a-moreback')}></View>
-            </View>
-            {(orderDetail?.status != SaleOrderStatusCancel.value)&&<View className={styles.submit_order}>
-                <OrderBtns orderInfo={orderInfo} onClick={orderStateClick}/>
-            </View> }       
-            <Popup show={showDesc} showTitle={false} onClose={() => setShowDesc(false)} >
-                <Remark onSave={(e) => getRemark(e)}/>
-            </Popup>
-            <Payment onSubmitSuccess={onPaySuccess} show={payMentShow} onClose={closePayShow} orderInfo={payOrderInfo} />
-            <View className="common_safe_area_y"></View>
-        </View>
-    )
- }

src/pages/order/orderList/index.tsx

@@ -13,9 +13,9 @@ import { AddShoppingCartApi } from "@/api/shopCart"
 import ShopCart from "@/components/shopCart"
 import { alert } from "@/common/common"
 import { useRouter } from "@tarojs/runtime"
-import Payment from "../order/components/payment"
-import ApplyRefund from "../order/components/applyRefund"
-import ReturnRecord from "../order/components/returnRecord"
+import Payment from "../components/payment"
+import ApplyRefund from "../components/applyRefund"
+import ReturnRecord from "../components/returnRecord"
 
 export default () => {
   const {checkLogin} = useLogin()

src/pages/salesAfter/salesAfterList/index.tsx

@@ -10,13 +10,12 @@ import InfiniteScroll from "@/components/infiniteScroll"
 import { dataLoadingStatus, getFilterData } from "@/common/util"
 import OrderStatusList from "./components/orderStatusList"
 import { GetSaleOrderListApi, RefundOrderSatausApi } from "@/api/salesAfterOrder"
-import ApplyRecord from "../salesAfter/components/applyRecord"
-import ReturnLogistics from "../salesAfter/components/returnLogistics"
+import ApplyRecord from "../components/applyRecord"
+import ReturnLogistics from "../components/returnLogistics"
 
 export default () => {
   useLogin()
 
-
   //搜索参数
   const [searchField, setSearchField] = useState<{status: number|null, page: number, size: number, name: string}>({
     status: null,

src/pages/user/index.tsx

@@ -108,9 +108,9 @@ const Modal = memo((props: any) => {
 const Header = memo((props: any) => {
 	const { data } = props;
 	console.log(props, 'propsprops')
-	let menu = [{ text: "待配布", icon: "icon-daipeibu", url: "/pages/orderList/index?status=0" }, { text: "待付款", icon: "icon-daifukuan", url: "/pages/orderList/index?status=1" },
-	{ text: "待发货", icon: "icon-daifahuo", url: "/pages/orderList/index?status=2" }, { text: "待收货", icon: "icon-yifahuo", url: "/pages/orderList/index?status=3" },
-	{ text: "退款/售后", icon: "icon-a-tuikuanshouhou", url: "/pages/salesAfterList/index" }];
+	let menu = [{ text: "待配布", icon: "icon-daipeibu", url: "/pages/order/orderList/index?status=0" }, { text: "待付款", icon: "icon-daifukuan", url: "/pages/order/orderList/index?status=1" },
+	{ text: "待发货", icon: "icon-daifahuo", url: "/pages/order/orderList/index?status=2" }, { text: "待收货", icon: "icon-yifahuo", url: "/pages/order/orderList/index?status=3" },
+	{ text: "退款/售后", icon: "icon-a-tuikuanshouhou", url: "/pages/salesAfter/salesAfterList/index" }];
 	const { getPhoneNumber } = useLogin();
 	const mGetPhoneNumber = (ev) => {
 		if (ev.detail?.code) {
@@ -232,7 +232,7 @@ const Header = memo((props: any) => {
 				<View className={styles['card-main']}>
 					<View className={styles['card-main-title']}>
 						<View className={styles.card_main_title_order}>订单</View>
-						<View className={styles.order_more} onClick={() => goLink('/pages/orderList/index')}>全部<Text className="iconfont icon-a-moreback"></Text></View>
+						<View className={styles.order_more} onClick={() => goLink('/pages/order/orderList/index')}>全部<Text className="iconfont icon-a-moreback"></Text></View>
 					</View>
 					<View className={styles['card-main-title-content']}>
 						{