From 3e5b19a1242f5baba13b60c0e3c70001cba121bd Mon Sep 17 00:00:00 2001 From: czm <2192718639@qq.com> Date: Fri, 10 Jun 2022 19:02:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=AA=E6=9D=BF=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.config.ts | 3 +- src/common/constant.js | 4 +- src/common/enum.ts | 9 +- src/components/orderBtns/index.tsx | 6 +- src/pages/cutOrder/comfirm.config.ts | 4 - src/pages/cutOrder/comfirm.module.scss | 130 ------------ src/pages/cutOrder/comfirm.tsx | 188 ------------------ .../components/addressInfo/index.module.scss | 71 ------- .../cutOrder/components/addressInfo/index.tsx | 76 ------- .../addressInfoDetail/index.module.scss | 117 ----------- .../components/addressInfoDetail/index.tsx | 126 ------------ .../components/amountShow/index.module.scss | 35 ---- .../cutOrder/components/amountShow/index.tsx | 28 --- .../estimatedAmount/index.module.scss | 70 ------- .../components/estimatedAmount/index.tsx | 29 --- .../components/kindList/index.module.scss | 108 ---------- .../cutOrder/components/kindList/index.tsx | 169 ---------------- .../components/offlinePay/index.module.scss | 46 ----- .../cutOrder/components/offlinePay/index.tsx | 52 ----- .../orderState copy/index.module.scss | 18 -- .../components/orderState copy/index.tsx | 14 -- .../components/orderState/index.module.scss | 105 ---------- .../cutOrder/components/orderState/index.tsx | 63 ------ .../components/payment/index.module.scss | 126 ------------ .../cutOrder/components/payment/index.tsx | 185 ----------------- .../components/remark/index.module.scss | 48 ----- .../cutOrder/components/remark/index.tsx | 38 ---- .../components/scanPay/index.module.scss | 54 ----- .../cutOrder/components/scanPay/index.tsx | 161 --------------- .../components/shipmentMode/index.module.scss | 33 --- .../components/shipmentMode/index.tsx | 28 --- .../submitOrderBtn/index.module.scss | 69 ------- .../components/submitOrderBtn/index.tsx | 40 ---- .../components/weightMemo/index.module.scss | 39 ---- .../cutOrder/components/weightMemo/index.tsx | 36 ---- src/pages/order/comfirm.tsx | 11 +- src/pages/order/components/kindList/index.tsx | 13 +- .../order/components/submitOrderBtn/index.tsx | 10 +- .../{ => order}/cutOrder/index.config.ts | 0 .../{ => order}/cutOrder/index.module.scss | 0 src/pages/{ => order}/cutOrder/index.tsx | 15 +- src/pages/order/index.tsx | 1 - 42 files changed, 43 insertions(+), 2335 deletions(-) delete mode 100644 src/pages/cutOrder/comfirm.config.ts delete mode 100644 src/pages/cutOrder/comfirm.module.scss delete mode 100644 src/pages/cutOrder/comfirm.tsx delete mode 100644 src/pages/cutOrder/components/addressInfo/index.module.scss delete mode 100644 src/pages/cutOrder/components/addressInfo/index.tsx delete mode 100644 src/pages/cutOrder/components/addressInfoDetail/index.module.scss delete mode 100644 src/pages/cutOrder/components/addressInfoDetail/index.tsx delete mode 100644 src/pages/cutOrder/components/amountShow/index.module.scss delete mode 100644 src/pages/cutOrder/components/amountShow/index.tsx delete mode 100644 src/pages/cutOrder/components/estimatedAmount/index.module.scss delete mode 100644 src/pages/cutOrder/components/estimatedAmount/index.tsx delete mode 100644 src/pages/cutOrder/components/kindList/index.module.scss delete mode 100644 src/pages/cutOrder/components/kindList/index.tsx delete mode 100644 src/pages/cutOrder/components/offlinePay/index.module.scss delete mode 100644 src/pages/cutOrder/components/offlinePay/index.tsx delete mode 100644 src/pages/cutOrder/components/orderState copy/index.module.scss delete mode 100644 src/pages/cutOrder/components/orderState copy/index.tsx delete mode 100644 src/pages/cutOrder/components/orderState/index.module.scss delete mode 100644 src/pages/cutOrder/components/orderState/index.tsx delete mode 100644 src/pages/cutOrder/components/payment/index.module.scss delete mode 100644 src/pages/cutOrder/components/payment/index.tsx delete mode 100644 src/pages/cutOrder/components/remark/index.module.scss delete mode 100644 src/pages/cutOrder/components/remark/index.tsx delete mode 100644 src/pages/cutOrder/components/scanPay/index.module.scss delete mode 100644 src/pages/cutOrder/components/scanPay/index.tsx delete mode 100644 src/pages/cutOrder/components/shipmentMode/index.module.scss delete mode 100644 src/pages/cutOrder/components/shipmentMode/index.tsx delete mode 100644 src/pages/cutOrder/components/submitOrderBtn/index.module.scss delete mode 100644 src/pages/cutOrder/components/submitOrderBtn/index.tsx delete mode 100644 src/pages/cutOrder/components/weightMemo/index.module.scss delete mode 100644 src/pages/cutOrder/components/weightMemo/index.tsx rename src/pages/{ => order}/cutOrder/index.config.ts (100%) rename src/pages/{ => order}/cutOrder/index.module.scss (100%) rename src/pages/{ => order}/cutOrder/index.tsx (93%) diff --git a/src/app.config.ts b/src/app.config.ts index 6c40fff..27b804e 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -96,7 +96,8 @@ export default { root: "pages/order", pages: [ "index", - "comfirm" + "comfirm", + "cutOrder/index", ] }, { diff --git a/src/common/constant.js b/src/common/constant.js index dc069fb..71c3838 100644 --- a/src/common/constant.js +++ b/src/common/constant.js @@ -5,12 +5,12 @@ // 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 = `http://192.168.1.30:40001/lymarket` // 发 +export const BASE_URL = `http://192.168.1.30:40001/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.4:40001/lymarket` // 王霞 -export const BASE_URL = `http://192.168.1.224:50001/lymarket` // 添 +// export const BASE_URL = `http://192.168.1.224:50001/lymarket` // 添 // export const BASE_URL = `http://192.168.1.15:50001/lymarket` // 杰 // CDN diff --git a/src/common/enum.ts b/src/common/enum.ts index 00a8ec1..8e8da01 100644 --- a/src/common/enum.ts +++ b/src/common/enum.ts @@ -1,6 +1,7 @@ //订单状态枚举 export const ORDER_STATUS = { + SaleOrderStatusCancel : {value:10, label:'预付款'}, // SaleOrderStatusBooking : {value:0, label:'待接单'}, // 待接单 SaleOrderStatusArranging : {value:1, label:'配布中'}, // 配布中 SaleOrderStatusArranged : {value:2, label:'已配布'}, // 已配布 @@ -34,8 +35,14 @@ export const PAYMENT_METHOD = { } export type PAYMENT_METHOD_PARAM = 1|2|3|4|5 + +//订单模式 +export const SALE_MODE = { + +} + //分享场景枚举 export const SHARE_SCENE = { ShareDetail: {value:1, label:'详情分享'}, SharePage : {value:2, label:'页面分享'}, -} \ No newline at end of file +} diff --git a/src/components/orderBtns/index.tsx b/src/components/orderBtns/index.tsx index 8720675..ee7228b 100644 --- a/src/components/orderBtns/index.tsx +++ b/src/components/orderBtns/index.tsx @@ -12,6 +12,7 @@ type Param = { orderId: number, //订单id actual_amount: number, //实付金额 wait_pay_amount: number, //待付金额 + sale_mode: number, //订单类型 }|null, onClick?: (val: number) => void //点击后触发的事件，返回订单状态 } @@ -67,6 +68,8 @@ export default memo(({orderInfo, onClick}:Param) => { label: '再次购买' } ]) + + //判断是否显示该按钮 const orderBtnsShow = useCallback((item) => { if(orderInfo) { @@ -136,10 +139,7 @@ export default memo(({orderInfo, onClick}:Param) => { } } }) - } - - //按钮点击滚动 const [selectInfo, setSelectInfo] = useState({ selected: -1, //当前选中的id diff --git a/src/pages/cutOrder/comfirm.config.ts b/src/pages/cutOrder/comfirm.config.ts deleted file mode 100644 index 67ce23e..0000000 --- a/src/pages/cutOrder/comfirm.config.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default { - navigationBarTitleText: '确认订单', - enableShareAppMessage: true, -} diff --git a/src/pages/cutOrder/comfirm.module.scss b/src/pages/cutOrder/comfirm.module.scss deleted file mode 100644 index 2858dec..0000000 --- a/src/pages/cutOrder/comfirm.module.scss +++ /dev/null @@ -1,130 +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_status_selected{ - color: $color_main; - border: 1px solid $color_main; - } - } - .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; - } - .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: space-between; - width: 100%; - height: 175px; - align-items: center; - background-color: #fff; - box-shadow: 6px 0px 12px 0px rgba(0,0,0,0.16); - padding: 20px 50px; - box-sizing: border-box; - padding-bottom: constant(safe-area-inset-bottom); - padding-bottom: env(safe-area-inset-bottom); - .order_btn { - width: 250px; - height: 90px; - opacity: 0.6; - background: linear-gradient(38deg,#007aff, #4fa6ff 100%, #68b4ff 100%); - border-radius: 46px; - display: flex; - justify-content: center; - align-items: center; - color: #fff; - } - .ok_order_btn { - opacity: 1; - } - .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; - } - - } -} \ No newline at end of file diff --git a/src/pages/cutOrder/comfirm.tsx b/src/pages/cutOrder/comfirm.tsx deleted file mode 100644 index e8a8a45..0000000 --- a/src/pages/cutOrder/comfirm.tsx +++ /dev/null @@ -1,188 +0,0 @@ -import { SaleOrderPreViewApi, SaleOrderApi } from "@/api/order"; -import { formatPriceDiv } from "@/common/fotmat"; -import Popup from "@/components/popup"; -import SearchInput from "@/components/searchInput"; -import { Text, Textarea, View } from "@tarojs/components" -import Taro, { useDidShow, useRouter } from "@tarojs/taro"; -import classnames from "classnames"; -import { useCallback, useEffect, useMemo, useRef, useState } from "react"; -import AddressInfo,{AddressInfoParam} from "./components/addressInfo"; -import EstimatedAmount from "./components/estimatedAmount"; -import KindList from "./components/kindList"; -import OrderState from "./components/orderState"; -import Remark from "./components/remark"; -import styles from './comfirm.module.scss' -import { getParam } from "@/common/system"; -import useLogin from "@/use/useLogin"; -import { alert, goLink } from "@/common/common"; -import ShipmentMode from "../editOrder/components/shipmentMode"; -import SubmitOrderBtn from "./components/submitOrderBtn"; - - export default () => { - const {checkLogin} = useLogin() - - const [showDesc, setShowDesc] = useState(false) - //下单信息 - type OrderParams = {address_id?: number, remark?: string, sale_mode?: number, shipment_mode?: number, list?: any[]} - const [submitOrderData, setSubmitOrderData] = useState() - - //获取购物车传过来的id - type orderPreParam = {shopping_cart_product_color_list:{shopping_cart_product_color_id:number}[], sale_mode:number} - const param = getParam() - const idsAndSaleModel = useRef({shopping_cart_product_color_list:[], sale_mode:0}) - useDidShow(async () => { - idsAndSaleModel.current = {shopping_cart_product_color_list:[], sale_mode:0} //初始化 - idsAndSaleModel.current.sale_mode = Number(param?.sale_mode) - param?.ids?.split('-')?.map(item => { - return idsAndSaleModel.current.shopping_cart_product_color_list?.push({ - shopping_cart_product_color_id: Number(item) - }) - }) - getSaleOrderPreView() - setSubmitOrderData((val) => ({...val, sale_mode:param?.sale_mode})) - }) - - //获取销售预览订单 - const [preViewOrder, setPreViewOrder] = useState() //获取到的原始数据 - const {fetchData} = SaleOrderPreViewApi() - const getSaleOrderPreView = async () => { - if(idsAndSaleModel.current.shopping_cart_product_color_list?.length > 0) { - let res = await fetchData(idsAndSaleModel.current) - setPreViewOrder(res.data) - } - } - - //监听获取到的数据 - useEffect(() => { - if(preViewOrder) { - formatData() - getDataList() - //当有默认地址时设置默认地址id - preViewOrder.default_address&&setSubmitOrderData((val) => ({...val, address_id:preViewOrder.default_address.id})) - } - }, [preViewOrder]) - - //格式化数据格式 - const [formatPreViewOrder, setFormatPreViewOrder] = useState() //格式化后的数据 - const formatData = () => { - setFormatPreViewOrder({ - estimate_amount: preViewOrder.estimate_amount, //预估金额 - sale_mode: preViewOrder.sale_mode, - sale_mode_name: preViewOrder.sale_mode_name, - total_colors: preViewOrder.total_colors, //总颜色数量 - total_number: preViewOrder.total_number, //总数量 - total_fabrics: preViewOrder.total_fabrics, //面料数量 - unit: preViewOrder.sale_mode == 0?'条':'m', //单位 - list: preViewOrder.product_list - }) - } - const formatPreViewOrderMemo = useMemo(() => { - return formatPreViewOrder - }, [formatPreViewOrder]) - - //格式化初始地址 - const defaultAddress = useMemo(() => { - const address = preViewOrder?.default_address - if(address) { - return { - province_name: address.province_name, - city_name: address.city_name, - district_name: address.district_name, - address_detail: address.address_detail, - id: address.id, - name: address.name, - phone: address.phone - } - } - return null - }, [preViewOrder]) - - //获取提交格式数据列表 - const getDataList = () => { - let list:{shopping_cart_product_color_id:number}[] = [] - preViewOrder.product_list?.map(item => { - item.product_colors?.map(colorItem => { - list.push({shopping_cart_product_color_id:colorItem.id}) - }) - }) - setSubmitOrderData((val) => ({...val, list})) - } - - //获取地址 - const getAddress = (e) => { - setSubmitOrderData((val) => ({...val, address_id:e.id})) - } - - const selectShipmentMode = useCallback((value) => { - setSubmitOrderData((val) => ({...val, shipment_mode:value})) - }, []) - - //获取备注 - const getRemark = useCallback((e) => { - setSubmitOrderData((val) => ({...val, remark:e})) - setShowDesc(() => false) - }, []) - - //提交按钮是否可用 - const btnStatus = useMemo(() => { - if( submitOrderData?.list?.length == 0 || !submitOrderData?.shipment_mode || (submitOrderData?.shipment_mode == 2 && !submitOrderData?.address_id)) { - return false - } else { - return true - } - }, [submitOrderData]) - - //提交订单 - const {fetchData: saleOrderFetchData} = SaleOrderApi() - const submitOrderEven = () => { - if(!submitOrderData?.address_id) { - alert.error('请选择地址') - return false - } - if(!submitOrderData?.shipment_mode) { - alert.error('请选择收货方式') - return false - } - Taro.showModal({ - title: '确定提交？', - success: async function (res) { - if (res.confirm) { - const res = await saleOrderFetchData(submitOrderData) - if(res.success) { - goLink('/pages/order/index',{id: res.data.id}, 'redirectTo') - } else { - alert.none(res.msg) - } - } else if (res.cancel) { - console.log('用户点击取消') - } - } - }) - } - return ( - - - getAddress(e)} defaultValue={defaultAddress}/> - - setShowDesc(true)}> - 订单备注 - { - submitOrderData?.remark&&{submitOrderData?.remark}|| - 填写备注 - } - - - - - - {`${formatPreViewOrder?.total_fabrics}种面料，${formatPreViewOrder?.total_colors}种颜色，共${formatPreViewOrder?.total_number + formatPreViewOrder?.unit}`} - - submitOrderEven()}>提交订单 - - setShowDesc(false)} > - getRemark(e)}/> - - - - ) - } diff --git a/src/pages/cutOrder/components/addressInfo/index.module.scss b/src/pages/cutOrder/components/addressInfo/index.module.scss deleted file mode 100644 index 4e9ea21..0000000 --- a/src/pages/cutOrder/components/addressInfo/index.module.scss +++ /dev/null @@ -1,71 +0,0 @@ -.order_address{ - height: 178px; - background: #ffffff; - border-radius: 20px; - display: flex; - align-items: center; - padding: 30px; - box-sizing: border-box; - margin-top: 20px; - .order_address_icon{ - font-size: 76px; - color: $color_main; - } - .order_address_text_con{ - flex:1; - padding: 0 30px; - box-sizing: border-box; - .order_address_text_title{ - font-size: $font_size_medium; - margin-top: 10px; - @include common_ellipsis; - } - .order_address_text_name{ - - align-items: center; - text{ - &:nth-child(1) { - color: #000; - font-weight: 700; - font-size: $color_font_one; - margin-right: 40px; - } - &:nth-child(2) { - color: $color_font_one; - font-size: $font_size_medium; - } - } - } - } - .updateBtn{ - font-size: $font_size_medium; - color: $color_font_three; - width: 96px; - height: 52px; - border: 2px solid #dddddd; - border-radius: 28px; - text-align: center; - line-height: 52px; - } - .order_address_text_no{ - flex: 1; - font-size: $font_size; - font-weight: 700; - margin-left: 30px; - } - .order_address_more_icon{ - color: $color_font_three; - font-size: $font_size; - } - -} -.order_address_list { - height: 900px; - .order_address_title{ - font-size: $font_size; - font-weight: 700; - width: 100%; - text-align: center; - padding: 20px 0 30px 0; - } -} \ No newline at end of file diff --git a/src/pages/cutOrder/components/addressInfo/index.tsx b/src/pages/cutOrder/components/addressInfo/index.tsx deleted file mode 100644 index 4225fea..0000000 --- a/src/pages/cutOrder/components/addressInfo/index.tsx +++ /dev/null @@ -1,76 +0,0 @@ -import AddressList from "@/components/AddressList"; -import Popup from "@/components/popup"; -import { Text, View } from "@tarojs/components" -import classnames from "classnames"; -import { memo, useCallback, useEffect, useMemo, useState } from "react"; -import styles from './index.module.scss' - -export type AddressInfoParam = { - province_name: string, - city_name: string, - district_name: string, - address_detail: string, - id?: number, - name: string, - phone: string -} -type Param = { - onSelect?: (val:any) => void, //选择 - defaultValue?: AddressInfoParam|null //默认值 - disabled?: false|true //true禁用后只用于展示 -} - -export default memo(({onSelect, defaultValue = null, disabled = false}: Param) => { - const [showAddressList, setShowAddressList] = useState(false) - - useEffect(() => { - setUserInfo(() => defaultValue) - }, [defaultValue]) - - //选择地址 - const [userInfo, setUserInfo] = useState() - const getAddress = useCallback((val) => { - setShowAddressList(() => false) - setUserInfo(() => val) - onSelect?.(val) - }, []) - - //地址格式 - const formatAddress = useMemo(() => { - if(userInfo) - return userInfo.province_name + userInfo.city_name + userInfo.district_name + userInfo.address_detail - }, [userInfo]) - - const changeShow = () => { - if(!disabled) - setShowAddressList(() => true) - } - return ( - - changeShow()}> - - {!userInfo&& - <> - 请选择收货地址及信息 - - - ||<> - - - {userInfo?.name} - {userInfo?.phone} - - {formatAddress} - - 修改 - } - - {!disabled&& setShowAddressList(false)}> - - 请选择收货地址 - getAddress(item)}/> - - } - - ) -}) \ No newline at end of file diff --git a/src/pages/cutOrder/components/addressInfoDetail/index.module.scss b/src/pages/cutOrder/components/addressInfoDetail/index.module.scss deleted file mode 100644 index 2d6c306..0000000 --- a/src/pages/cutOrder/components/addressInfoDetail/index.module.scss +++ /dev/null @@ -1,117 +0,0 @@ -.order_address{ - height: 178px; - background: #ffffff; - border-radius: 20px; - display: flex; - align-items: center; - padding: 30px; - box-sizing: border-box; - margin-top: 20px; - position: relative; - .order_address_icon{ - font-size: 50px; - color: $color_main; - position: absolute; - top: 35px; - left: 20px; - } - .order_address_text_con{ - flex:1; - padding-left: 50px; - box-sizing: border-box; - height: 100%; - display: flex; - flex-direction: column; - justify-content: space-between; - .order_address_text_title{ - font-size: $font_size_medium; - margin-top: 10px; - @include common_ellipsis; - display: flex; - align-items: center; - justify-content: space-between; - .moreIconfont{ - font-size: 20px; - } - } - .order_address_text_name{ - - align-items: center; - text{ - &:nth-child(1) { - color: #000; - font-weight: 700; - font-size: $color_font_one; - margin-right: 40px; - } - &:nth-child(2) { - color: $color_font_one; - font-size: $font_size_medium; - } - } - } - } - .updateBtn{ - width:200px; - font-size: $font_size_min; - background-color: #F0F0F0; - height: 64px; - border-radius: 24px; - color: $color_font_two; - position: absolute; - bottom: 10px; - right: 10px; - z-index: 999; - .updateBtn_list{ - position: absolute; - display: flex; - z-index: 5; - width: 100%; - .updateBtn_item_select{ - color: #fff; - } - } - .updateBtn_item{ - flex:1; - text-align: center; - line-height: 64px; - } - .updateBtn_select{ - color: #fff; - background-color: $color_main; - border-radius: 24px; - position: absolute; - width: 100px; - height: 61px; - z-index: 1; - transition: all 0.3s ease-in-out; - } - - } - .order_address_text_no{ - flex: 1; - font-size: $font_size; - font-weight: 700; - margin-left: 30px; - } - .order_address_more_icon{ - color: $color_font_three; - font-size: $font_size; - } - -} -.order_address_list { - height:80vh; - .order_address_title{ - font-size: $font_size; - font-weight: 700; - width: 100%; - text-align: center; - padding: 20px 0 30px 0; - height: 100px; - } - .addressList_con{ - padding-bottom: 20px; - height: calc(100% - 160px); - } -} \ No newline at end of file diff --git a/src/pages/cutOrder/components/addressInfoDetail/index.tsx b/src/pages/cutOrder/components/addressInfoDetail/index.tsx deleted file mode 100644 index bc915ed..0000000 --- a/src/pages/cutOrder/components/addressInfoDetail/index.tsx +++ /dev/null @@ -1,126 +0,0 @@ -import { EditSaleOrderAddressApi, EditSaleOrderShipmentModeApi } from "@/api/order"; -import { alert } from "@/common/common"; -import { debounce } from "@/common/util"; -import AddressList from "@/components/AddressList"; -import Popup from "@/components/popup"; -import { Text, View } from "@tarojs/components" -import classnames from "classnames"; -import { forwardRef, memo, useCallback, useEffect, useImperativeHandle, useMemo, useState } from "react"; -import styles from './index.module.scss' - -export type AddressInfoParam = { - province_name: string, - city_name: string, - district_name: string, - address_detail: string, - id?: number, - name: string, - phone: string, -} -type Param = { - onSelect?: (val:any) => void, //选择 - defaultValue?: AddressInfoParam|null, //默认值 - disabled?: false|true, //true禁用后只用于展示 - shipment_mode?: 1|2, //1自提 2物流 - onChangeShipmentMode?: (val: number) => void, //返回收货方式 - orderId?: number //订单id -} - -export default memo(forwardRef(({onSelect, onChangeShipmentMode, defaultValue = null, orderId = 0, shipment_mode = 1}: Param, ref) => { - const [showAddressList, setShowAddressList] = useState(false) - - useEffect(() => { - setUserInfo(() => defaultValue) - }, [defaultValue]) - - const [userInfo, setUserInfo] = useState() - - //地址格式 - const formatAddress = useMemo(() => { - if(userInfo) - return userInfo.province_name + userInfo.city_name + userInfo.district_name + userInfo.address_detail - }, [userInfo]) - - const changeShow = () => { - if(receivingStatus == 2) - setShowAddressList(() => true) - } - - useEffect(() => { - setReceivingStatus(() => shipment_mode) - }, [shipment_mode]) - - //把内部方法提供给外部 - useImperativeHandle(ref, () => ({ - changeShow - })) - - //收货方法,1:自提，2物流 - const [receivingStatus, setReceivingStatus] = useState(1) - const {fetchData: shipmentModeFetchData} = EditSaleOrderShipmentModeApi() - const onReceivingStatus = (value, e) => { - e.stopPropagation() - changeReceivingStatus(value) - } - const changeReceivingStatus = debounce(async (value) => { - alert.loading('正在修改') - const res = await shipmentModeFetchData({id: orderId, shipment_mode:value}) - if(res.success) { - alert.success('收货方式修改成功') - onChangeShipmentMode?.(value) - setReceivingStatus(value) - } else { - alert.none(res.msg) - } - }, 10) - - //修改地址 - const [addressId, setAddressId] = useState(0) - const {fetchData: addressFetchData} = EditSaleOrderAddressApi() - const getAddress = async (value) => { - alert.loading('正在修改') - const res = await addressFetchData({id: orderId, address_id: value.id}) - if(res.success) { - alert.success('地址修改成功') - onSelect?.(value) - setShowAddressList(() => false) - setAddressId(value.id) - setUserInfo(() => value) - } else { - alert.none(res.msg) - } - } - - return ( - - changeShow()}> - - - - {formatAddress} - {(receivingStatus == 2)&&} - - - {userInfo?.name} - {userInfo?.phone} - - - - - onReceivingStatus(1,e)}>自提 - onReceivingStatus(2,e)}>物流 - - - - - setShowAddressList(false)}> - - 请选择收货地址 - - - - - - - ) -})) \ No newline at end of file diff --git a/src/pages/cutOrder/components/amountShow/index.module.scss b/src/pages/cutOrder/components/amountShow/index.module.scss deleted file mode 100644 index 647e203..0000000 --- a/src/pages/cutOrder/components/amountShow/index.module.scss +++ /dev/null @@ -1,35 +0,0 @@ -.order_price_num{ - color: $color_main; - font-weight: 700; - text{ - &:nth-child(1) { - font-size: $font_size_min; - } - &:nth-child(2) { - font-size: $font_size; - } - &:nth-child(3) { - font-size: $font_size_medium; - } - } -} -.emphasis_num{ - .price_text{ - &:nth-child(2) { - font-size: $font_size_big; - } - } -} -.emphasis_num_big{ - .price_text{ - &:nth-child(1) { - font-size: $font_size_big; - } - &:nth-child(2) { - font-size: 60px; - } - &:nth-child(1) { - font-size: $font_size_big; - } - } -} \ No newline at end of file diff --git a/src/pages/cutOrder/components/amountShow/index.tsx b/src/pages/cutOrder/components/amountShow/index.tsx deleted file mode 100644 index 877f7df..0000000 --- a/src/pages/cutOrder/components/amountShow/index.tsx +++ /dev/null @@ -1,28 +0,0 @@ -import { Text, View } from "@tarojs/components"; -import { memo, useCallback } from "react"; -import styles from './index.module.scss' -import classnames from "classnames"; - -type Param = { - number: number, //数字 - status: 0|1|2 //0 小型，1中型，2大 -} -export default memo(({number = 0, status = 1}:Param) => { - const priceDom = useCallback(() => { - let res = number.toFixed(2).split('.') - let int_num = parseInt(res[0]) + '' - let decimals_num = res[1] - return ( - <> - ¥ - {Number(int_num).toLocaleString()} - .{decimals_num} - - ) - }, [number]) - return ( - - {priceDom()} - - ) -}) \ No newline at end of file diff --git a/src/pages/cutOrder/components/estimatedAmount/index.module.scss b/src/pages/cutOrder/components/estimatedAmount/index.module.scss deleted file mode 100644 index 4b4a958..0000000 --- a/src/pages/cutOrder/components/estimatedAmount/index.module.scss +++ /dev/null @@ -1,70 +0,0 @@ -.order_price{ - display: flex; - align-items: center; - justify-content: space-between; - width: 100%; - &:nth-last-child(n+2) { - margin-bottom: 30px; - } - .order_price_text{ - font-size: $font_size_medium; - // margin-right: 10px; - display: flex; - .iconfont_msg{ - position: relative; - } - .miconfont{ - font-size: 26px; - font-weight: normal; - margin-left: 5px; - } - .message{ - position: absolute; - top: -50px; - background: #A8B3BD; - z-index: 9; - min-height: 50px; - border-radius: 10px; - padding: 10px; - box-sizing: border-box; - &::before{ - z-index: 1; - position: absolute; - bottom: -7px; - left: 10px; - width: 15px; - height: 15px; - content: " "; - transform: rotate(45deg); - background: #A8B3BD; - box-sizing: border-box; - } - } - } - .emphasis{ - font-weight: 700; - } - .order_price_num{ - color: $color_main; - font-weight: 700; - text{ - &:nth-child(1) { - font-size: $font_size_min; - } - &:nth-child(2) { - font-size: 26px; - } - &:nth-child(3) { - font-size: $font_size_medium; - } - } - } - .emphasis_num{ - text{ - &:nth-child(2) { - font-size: $font_size_big; - } - } - } - -} \ No newline at end of file diff --git a/src/pages/cutOrder/components/estimatedAmount/index.tsx b/src/pages/cutOrder/components/estimatedAmount/index.tsx deleted file mode 100644 index 04bc49a..0000000 --- a/src/pages/cutOrder/components/estimatedAmount/index.tsx +++ /dev/null @@ -1,29 +0,0 @@ -import { Text, View } from "@tarojs/components" -import { memo, useCallback, useEffect, useMemo } from "react" -import {formatKbPrice} from '@/common/common' -import classnames from "classnames"; -import styles from './index.module.scss' -import AmountShow from "../amountShow"; -type Param = { - style?: Object, - number?: number, - title?: string, - titleStatus?: true|false, //true 标题加大加深 - numberStatus?: 0|1|2, //数字尺寸 -} -export default memo(({style, number = 0, titleStatus = true, title = '', numberStatus = 1}:Param) => { - return ( - <> - - - {title} - - - {/* 123123123121212312312312312 */} - - - - - - ) -}) \ No newline at end of file diff --git a/src/pages/cutOrder/components/kindList/index.module.scss b/src/pages/cutOrder/components/kindList/index.module.scss deleted file mode 100644 index 2d9b040..0000000 --- a/src/pages/cutOrder/components/kindList/index.module.scss +++ /dev/null @@ -1,108 +0,0 @@ - -.orders_list_title{ - padding: 20px 20px 10px 20px; - color: $color_font_two; - font-size: $font_size_medium; -} -.orders_list_con{ - - background-color: #fff; - border-radius: 20px; - padding: 20px; - .order_list{ - &:nth-child(n+2) { - margin-top: 30px; - } - .order_list_title{ - display: flex; - align-items: center; - .tag{ - font-size: $font_size_min; - background-color: #CDE5FF; - padding: 5px 10px; - border-radius: 6px; - color: $color_main; - } - .title{ - font-weight: 700; - font-size: $font_size; - margin-left: 20px; - flex:1; - } - .num{ - color: $color_font_two; - font-size: $font_size_min; - } - } - } - .order_list_scroll{ - margin-top: 30px; - - .order_list_item { - display: flex; - &:nth-child(2) { - margin-top: 30px; - } - .order_list_item_img{ - width: 126px; - height: 126px; - border-radius: 20px; - } - .order_list_item_con{ - display: flex; - width: 100%; - flex:1; - border-bottom: 1px solid #f0f0f0; - height: 150px; - padding-top: 20px; - box-sizing: border-box; - } - .order_list_item_des{ - flex:1; - box-sizing: border-box; - padding-left: 30px; - .order_list_item_title{ - font-weight: 700; - font-size: $font_size; - margin-bottom: 15px; - } - .order_list_item_price{ - font-size: 26px; - color: $color_font_three; - } - } - .order_list_item_count{ - display: flex; - flex-direction: column; - justify-content: center; - align-items: flex-end; - .count_num{ - color: $color_main; - font-size: $font_size; - margin-bottom: 15px; - font-weight: 400; - text{ - font-size: $font_size_min; - } - } - .count_price { - font-size: $font_size; - font-weight: 700; - text{ - font-size: $font_size_min; - } - } - } - } - } - .order_estimated_amount{ - display: flex; - align-items: flex-end; - flex-direction: column; - padding: 30px 0; - .order_price_des{ - font-size: $font_size_medium; - color: $color_font_two; - } - } -} diff --git a/src/pages/cutOrder/components/kindList/index.tsx b/src/pages/cutOrder/components/kindList/index.tsx deleted file mode 100644 index b2491f8..0000000 --- a/src/pages/cutOrder/components/kindList/index.tsx +++ /dev/null @@ -1,169 +0,0 @@ -import { ORDER_STATUS } from "@/common/enum" -import { formatHashTag, formatPriceDiv } from "@/common/fotmat" -import LabAndImg from "@/components/LabAndImg" -import { View } from "@tarojs/components" -import { memo, useCallback, useMemo } from "react" -import EstimatedAmount from "../estimatedAmount" -import styles from './index.module.scss' - -type OrderParam = { - estimate_amount: number, //预估金额 - list: any[], - sale_mode: number, - sale_mode_name: string, - unit: string, - total_colors: number, - total_fabrics: number, - total_number: number, - status: number, //订单状态 - total_sale_price: number, //销售金额 - total_should_collect_money: number, //应收金额 - total_weight_error_discount: number, //空差优惠 - the_previous_status: number, //取消订单时的订单状态 - actual_amount: number //实付金额 -} - -type Param = { - order: OrderParam, - comfirm?: boolean //是否是确认订单页面使用 -} - -export default memo(({order, comfirm = false}:Param) => { - //对应数量 - const formatCount = useCallback((item) => { - return order?.sale_mode == 0? item.roll : Number(item.length / 100) - }, [order]) - //对应单价 - const standardPrice = useCallback(price => { - return formatPriceDiv(price).toLocaleString() + '/' + (order?.sale_mode == 1?'m':'kg') - }, [order]) - - //数量格式 - const numText = useMemo(() => { - if(order) - return `${order?.total_fabrics}种面料，${order?.total_colors}种颜色，共${order?.total_number}${order?.unit}` - }, [order]) - - const { - SaleOrderStatusBooking, // 待接单 - SaleOrderStatusArranging, // 配布中 - SaleOrderStatusArranged, // 已配布 - SaleOrderStatusWaitingPayment, // 待付款 - SaleOrderStatusWaitingDelivery, // 待发货 - SaleOrderStatusWaitingReceipt, // 待收货 - SaleOrderStatusAlreadyReceipt, // 已收货 - SaleOrderStatusComplete, // 已完成 - SaleOrderStatusRefund, // 已退款 - SaleOrderStatusCancel, // 已取消 - } = ORDER_STATUS - - //金额列表枚举 - const priceList = [ - { - id:1, - value:[SaleOrderStatusBooking.value, SaleOrderStatusArranging.value], - label:'预估金额', - field: 'estimate_amount' - }, - { - id:2, - value:[SaleOrderStatusArranged.value, SaleOrderStatusWaitingPayment.value, SaleOrderStatusWaitingDelivery.value, SaleOrderStatusWaitingReceipt.value, SaleOrderStatusAlreadyReceipt.value, SaleOrderStatusComplete.value, SaleOrderStatusRefund.value, SaleOrderStatusCancel.value], - label:'合计金额', - field: 'total_sale_price' - }, - { - id:3, - value:[SaleOrderStatusWaitingPayment.value, SaleOrderStatusWaitingDelivery.value, SaleOrderStatusWaitingReceipt.value, SaleOrderStatusAlreadyReceipt.value, SaleOrderStatusComplete.value, SaleOrderStatusRefund.value, SaleOrderStatusCancel.value], - label:'空差优惠', - field: 'total_weight_error_discount' - }, - { - id:4, - value:[ SaleOrderStatusWaitingPayment.value], - label:'应付金额', - field: 'total_should_collect_money' - }, - { - id:5, - value:[SaleOrderStatusWaitingDelivery.value, SaleOrderStatusWaitingReceipt.value, SaleOrderStatusAlreadyReceipt.value, SaleOrderStatusComplete.value, SaleOrderStatusRefund.value, SaleOrderStatusCancel.value], - label:'实付金额', - field: 'actual_amount' - } - ] - - //是否显示价格 - const showPrice = useCallback((priceInfo, status) => { - return priceInfo.value.includes(status) - }, [order]) - - const priceConDom = useMemo(() => { - if(!order) return - //确认订单 - if(comfirm == true) { - return - } - //订单为取消订单状态 - if(order?.status == SaleOrderStatusCancel.value) { - return ( - <> - { - priceList.map(item => { - return <>{showPrice(item, order?.the_previous_status)&&} - }) - } - - ) - } else { - return ( - <> - { - priceList.map(item => { - return <>{showPrice(item, order?.status)&&} - }) - } - - ) - } - }, [order]) - - return ( - <> - {numText} - - { - order?.list?.map(item => { - return - - {order.sale_mode_name} - {formatHashTag(item.code, item.name)} - 共{item?.product_colors.length}种 - - - {item?.product_colors?.map(colorItem => { - return - - - - - - {colorItem.code + ' ' + colorItem.name} - ¥{standardPrice(colorItem.sale_price)} - - - ×{formatCount(colorItem)}{order.unit} - ¥{formatPriceDiv(colorItem.estimate_amount).toLocaleString()} - - - - })} - - - }) - } - - {priceConDom} - - - - ) -}) \ No newline at end of file diff --git a/src/pages/cutOrder/components/offlinePay/index.module.scss b/src/pages/cutOrder/components/offlinePay/index.module.scss deleted file mode 100644 index f84e995..0000000 --- a/src/pages/cutOrder/components/offlinePay/index.module.scss +++ /dev/null @@ -1,46 +0,0 @@ -$top:170px; -.offlinePay_main{ - .offlinePay_con{ - padding: 20px; - background-color: #F6F6F6; - border-radius: 20px; - .miconfont_title{ - transform: rotate(-180deg); - position: absolute; - left: 20px; - top: 27px; - font-size: 37px; - color: $color_font_three; - z-index: 99; - } - } - .title{ - font-size: $font_size_big; - color: #000000; - text-align: center; - font-weight: 700; - position: relative; - - } - - .offlinePay_list{ - border-radius: 10px; - padding: 60px 0; - .offlinePay_con_text{ - font-size: $font_size; - font-weight: 700; - } - } - .btns{ - background: #007aff; - border-radius: 40px; - width: 668px; - height: 82px; - text-align: center; - line-height: 80px; - width: 100%; - color: #fff; - font-size: 32px; - margin-top: 30px; - } -} \ No newline at end of file diff --git a/src/pages/cutOrder/components/offlinePay/index.tsx b/src/pages/cutOrder/components/offlinePay/index.tsx deleted file mode 100644 index 4022374..0000000 --- a/src/pages/cutOrder/components/offlinePay/index.tsx +++ /dev/null @@ -1,52 +0,0 @@ -import { Text, View } from "@tarojs/components"; -import { memo } from "react"; -import AmountShow from "../amountShow"; -import classnames from "classnames"; -import styles from './index.module.scss' - -import MCheckbox from "@/components/checkbox"; -import Popup from "@/components/popup"; -import SearchInput from "@/components/searchInput"; -import Taro from "@tarojs/taro"; - -type Param = { - show?: true|false, - onClose?: () => void -} -export default memo(({show = true, onClose}:Param) => { - //复制功能 - const clipboardData = () => { - Taro.setClipboardData({ - data: '开户名称:佛山市浩川盛世科技有限公司; 开户银行:招商银行汾江支行; 转账汇款账号:62062342120001221231212', - success: function (res) { - Taro.showToast({ - icon: 'none', - title: '复制成功' - }) - } - }) - } - return ( - - - - - 线下汇款 - - - 佛山市浩川盛世科技有限公司 - - - 招商银行汾江支行 - - - 62062342120001221231212 - - - 复制信息 - - - - - ) -}) \ No newline at end of file diff --git a/src/pages/cutOrder/components/orderState copy/index.module.scss b/src/pages/cutOrder/components/orderState copy/index.module.scss deleted file mode 100644 index 78bda44..0000000 --- a/src/pages/cutOrder/components/orderState copy/index.module.scss +++ /dev/null @@ -1,18 +0,0 @@ -.order_flow_state{ - display: flex; - align-items: center; - padding: 0 30px; - height: 116px; - background-color: #fff; - border-radius: 20px; - .order_flow_state_text{ - color: $color_main; - font-size:$font_size; - font-weight: 700; - } - .order_flow_state_desc{ - color: $color_font_three; - font-size: $font_size_medium; - margin-left: 50px; - } -} \ No newline at end of file diff --git a/src/pages/cutOrder/components/orderState copy/index.tsx b/src/pages/cutOrder/components/orderState copy/index.tsx deleted file mode 100644 index 58fec4d..0000000 --- a/src/pages/cutOrder/components/orderState copy/index.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import { View } from "@tarojs/components" -import styles from './index.module.scss' - -export default ({ - state = '', - desc = '' -}) => { - return ( - - {state} - {desc} - - ) -} \ No newline at end of file diff --git a/src/pages/cutOrder/components/orderState/index.module.scss b/src/pages/cutOrder/components/orderState/index.module.scss deleted file mode 100644 index 90dbcbb..0000000 --- a/src/pages/cutOrder/components/orderState/index.module.scss +++ /dev/null @@ -1,105 +0,0 @@ -.order_flow_state{ - background-color: #fff; - border-radius: 20px; - padding: 20px; - box-sizing:border-box; - position: relative; - overflow: hidden; - .order_status_list{ - max-height: 250px; - overflow: hidden; - transition: all 0.3s ease-in-out; - } - .order_status_list_show { - max-height: 1000px !important; - } - .order_status_item{ - position: relative; - padding-left: 50px; - &:nth-last-child(n+2) { - padding-bottom: 30px; - } - .order_status_tail_end, .order_status_tail{ - width: 15px; - height: 15px; - border: 2px solid $color_main; - background-color: #fff; - border-radius: 50%; - position:absolute; - left: 0; - top: 10px; - z-index: 10; - } - .order_status_tail_end{ - background-color: $color_main; - } - .order_status_line{ - border-left: 2px solid $color_main; - height: 100%; - top: 10px; - left: 9px; - position: absolute; - z-index: 1; - } - .order_status_content{ - display: flex; - align-items: center; - .order_status_title{ - color: $color_font_two; - font-size: $font_size; - font-weight: 700; - } - .order_status_time{ - color: $color_font_two; - font-size: $font_size_medium; - padding: 0 20px; - } - .order_status_tag{ - font-size: $font_size_min; - background: #F0F0F0; - border-radius: 6px; - padding: 5px 10px; - color: $color_font_two; - } - .order_status_select{ - color: $color_main; - } - .order_status_tag_select{ - color: $color_main; - } - } - .order_status_des{ - color: $color_font_two; - font-size: $font_size_medium; - } - .order_status_des_select{ - color: $color_font_one; - } - } - .more{ - width: 100%; - text-align: center; - font-size: $font_size_min; - color: $color_font_one; - padding-top: 20px; - .miconfonts{ - display: inline-block; - font-size: 25px; - transform:rotate(90deg); - } - .open_miconfonts{ - transform:rotate(-90deg); - } - } - .image_tag{ - width: 140px; - height: 144px; - .image{ - width: 140px; - height: 144px; - } - position: absolute; - top: -10px; - right: -10px; - } -} \ No newline at end of file diff --git a/src/pages/cutOrder/components/orderState/index.tsx b/src/pages/cutOrder/components/orderState/index.tsx deleted file mode 100644 index 18ac43d..0000000 --- a/src/pages/cutOrder/components/orderState/index.tsx +++ /dev/null @@ -1,63 +0,0 @@ -import { Image, Text, View } from "@tarojs/components" -import { memo, useMemo, useState } from "react" -import styles from './index.module.scss' -import classnames from "classnames"; -import { formatDateTime, formatImgUrl } from "@/common/fotmat"; -import { PAYMENT_METHOD, PAYMENT_METHOD_PARAM } from "@/common/enum"; - - - -type Param = { - list: { - status: string, - time: string, - tag: string, - desc: string - }[], - payment_method: 0|PAYMENT_METHOD_PARAM, - -} - -//支付方式枚举 -const { - PaymentMethodAccountPeriod, - PaymentMethodCashOnDelivery, -} = PAYMENT_METHOD - -export default memo(({list = [], payment_method = 0}:Param) => { - - const [showMore, setShowMore] = useState(false) - const changeMore = () => { - setShowMore(() => !showMore) - } - const dataList = useMemo(() => { - return list.reverse() - }, [list]) - - return ( - <> - {(dataList.length > 0)&& - - {dataList.map((item, index) => - {(dataList.length > 1)&&} - {(dataList.length != (index + 1))&&} - - {item.status} - {formatDateTime(item.time)} - {/* {item.tag} */} - - {item.desc} - )} - - {(dataList.length > 2) && changeMore()}> - {showMore&&'收起详情'||'点击查看详情'} - - } - - {(payment_method == PaymentMethodCashOnDelivery.value)&&} - {(payment_method == PaymentMethodAccountPeriod.value)&&} - - } - - ) -}) \ No newline at end of file diff --git a/src/pages/cutOrder/components/payment/index.module.scss b/src/pages/cutOrder/components/payment/index.module.scss deleted file mode 100644 index 340b0ed..0000000 --- a/src/pages/cutOrder/components/payment/index.module.scss +++ /dev/null @@ -1,126 +0,0 @@ -$top:190px; -.payment_main{ - .payment_con{ - padding: 20px; - background-color: #F6F6F6; - border-radius: 20px; - .miconfont_title{ - transform: rotate(-180deg); - position: absolute; - left: 20px; - top: 27px; - font-size: 37px; - color: $color_font_three; - z-index: 99; - } - - } - .title{ - font-size: $font_size_big; - color: #000000; - text-align: center; - font-weight: 700; - position: relative; - - } - .amount{ - text-align: center; - padding: 25px 0; - } - - .payment_list{ - background-color: #fff; - // box-shadow: 2px 2px 6px 0px rgba(0,0,0,0.16); - min-height: 300px; - border-radius: 10px; - padding-bottom: 100px; - position: relative; - background: radial-gradient(circle 20px at left $top, transparent 20px, #fff 20px + 3px) left 0px/60% no-repeat , - radial-gradient(circle 20px at right $top, transparent 20px, #fff 20px + 3px) right 0px/60% no-repeat; - filter: drop-shadow(2px 2px 6px rgba(0, 0, 0, .16)); - position: relative; - &::before{ - content: ''; - position: absolute; - border-bottom: 3px dashed #ccc; - top: $top; - width: calc(100% - 100px); - left:0; - right: 0; - margin: auto; - - } - .payment_list_top_border{ - height: 32px; - width: 100%; - background: linear-gradient(215deg,#cde5ff 2%, #cde5ff 2%, #68b4ff 72%); - border-radius: 10px 10px 0px 0px; - } - .payment_list_title{ - text-align: center; - padding: 30px 0 50px 0; - font-size: $font_size; - color: $color_font_three; - .payment_list_title_price_item{ - display: flex; - justify-content: space-between; - padding: 0 90px; - &:nth-child(1) { - margin-bottom: 15px; - } - } - text{ - &:nth-child(2) { - color: $color_main; - } - } - } - .payment_list_con{ - padding: 20px 30px 0 30px; - .payment_list_item{ - display: flex; - justify-content: space-between; - align-items: center; - height: 123px; - &:nth-last-child(n+2) { - border-bottom: 2px solid #F3F3F3; - } - } - .payment_list_item_left{ - display: flex; - flex-direction: column; - font-size: $font_size; - .payment_list_item_left_name{ - display: flex; - align-items: center; - } - .miconfont{ - font-size: 30px; - color: #FFC300; - padding-right: 10px; - } - .payment_list_item_left_price{ - font-size: $font_size_min; - color: $color_font_two; - padding-left: 35px; - padding-top: 5px; - } - } - .miconfont_more{ - font-size: 20px; - } - } - } - .btns{ - background: #007aff; - border-radius: 40px; - width: 668px; - height: 82px; - text-align: center; - line-height: 80px; - width: 100%; - color: #fff; - font-size: 32px; - margin-top: 30px; - } -} \ No newline at end of file diff --git a/src/pages/cutOrder/components/payment/index.tsx b/src/pages/cutOrder/components/payment/index.tsx deleted file mode 100644 index 86d4306..0000000 --- a/src/pages/cutOrder/components/payment/index.tsx +++ /dev/null @@ -1,185 +0,0 @@ -import { Text, View } from "@tarojs/components"; -import { memo, useCallback, useEffect, useMemo, useState } from "react"; -import AmountShow from "../amountShow"; -import classnames from "classnames"; -import styles from './index.module.scss' - -import MCheckbox from "@/components/checkbox"; -import Popup from "@/components/popup"; -import OfflinePay from "../offlinePay"; -import ScanPay from "../scanPay"; -import { GetOrderPayApi, SubmitOrderPayApi } from "@/api/orderPay"; -import { formatPriceDiv } from "@/common/fotmat"; -import {alert} from "@/common/common" -import { PAYMENT_METHOD, PAYMENT_METHOD_PARAM } from "@/common/enum"; - -type Param = { - show?: true|false, - onClose?: () => void, - onSubmitSuccess?: () => void, //支付成功 - orderInfo?: OrderInfo -} - -type OrderInfo = { - orderId: number, //应付单id - payment_method: 0|PAYMENT_METHOD_PARAM //支付方式 -} - -type PayStatus = 1|2|3|4|5|null //1:预存款， 2:账期，3：线下汇款， 4：扫码支付, 5:货到付款 -export default memo(({show = false, onClose, orderInfo, onSubmitSuccess}:Param) => { - - //提交参数 - const [submitData, setSubmitData] = useState<{id:number, payment_method: PayStatus}>({ - id:0, - payment_method: null - }) - - //线下付款 - const [offlinePayShow, setofflinePayShow] = useState(false) - const onShowOfflinePay = () => { - setofflinePayShow(true) - onClose?.() - } - - //扫码支付 - const [scanPayShow, setScanPayShow] = useState(false) - const onShowScanPay = () => { - setScanPayShow(true) - onClose?.() - } - - //获取支付方式数据 - const [payInfo, setPayInfo] = useState() - const {fetchData: orderFetchData} = GetOrderPayApi() - const getOrderPay = async () => { - let {data} = await orderFetchData({id: orderInfo?.orderId}) - setPayInfo(() => data) - } - useEffect(() => { - if(show&&orderInfo?.orderId) { - setSubmitData((val) => ({...val, id:orderInfo.orderId})) - getOrderPay() - } - }, [show, orderInfo]) - - //预存款选择 - const advanceSelectData = useCallback((val) => { - setSubmitData((e) => ({...e, payment_method:val})) - }, []) - - //账期选择 - const periodSelectData = (val) => { - setSubmitData((e) => ({...e, payment_method:val})) - } - - //提交支付 - const {fetchData: submitFetchData} = SubmitOrderPayApi() - const submitPay = async () => { - if(submitData.payment_method === null) { - alert.error('请选择支付方式') - return false - } - alert.loading('正在支付') - let res = await submitFetchData(submitData) - if(res.success) { - alert.success('支付成功') - onSubmitSuccess?.() - } else { - alert.none(res.msg) - } - } - - //预付款 - const advance_payment = useMemo(() => { - const price = payInfo?.should_collect_money - payInfo?.amount_paid - return ( - {(payInfo?.advance_deposit_balance < price)&&'余额不足，' }剩余 ¥{formatPriceDiv(payInfo?.advance_deposit_balance)} - ) - }, [payInfo]) - - //账期 - const account_peyment = useMemo(() => { - const price = payInfo?.should_collect_money - payInfo?.amount_paid - return ( - {(payInfo?.account_period_credit_available_line < price)&&'额度不足, '}剩余 ¥{formatPriceDiv(payInfo?.account_period_credit_available_line)} - ) - }, [payInfo]) - - //支付方式枚举 - const {PaymentMethodPreDeposit, PaymentMethodAccountPeriod} = PAYMENT_METHOD - - return ( - - - - - 订单支付 - - - - - - - {/* 向商家发起支付 */} - - - 订单金额 - ¥{formatPriceDiv(payInfo?.should_collect_money)} - - - 已付金额 - ¥{formatPriceDiv(payInfo?.amount_paid)} - - - - - - - - - 预存款 - - {advance_payment} - - advanceSelectData(PaymentMethodPreDeposit.value)} onClose={() => advanceSelectData(null)}/> - - {(orderInfo?.payment_method != PaymentMethodAccountPeriod.value)&& - - - - {payInfo?.account_period}天账期 - - {/* 可用额度 ¥{formatPriceDiv(payInfo?.account_period_credit_available_line)} */} - {account_peyment} - - periodSelectData(PaymentMethodAccountPeriod.value)} onClose={() => periodSelectData(null)}/> - } - - - - - 线下汇款 - - - - - - - - - 扫码支付 - - - - - - - 确认交易 - - - setofflinePayShow(false)}/> - setScanPayShow(false)}/> - - - ) -}) \ No newline at end of file diff --git a/src/pages/cutOrder/components/remark/index.module.scss b/src/pages/cutOrder/components/remark/index.module.scss deleted file mode 100644 index d624050..0000000 --- a/src/pages/cutOrder/components/remark/index.module.scss +++ /dev/null @@ -1,48 +0,0 @@ -.order_popup{ - display: flex; - flex-direction: column; - align-items: center; - padding: 20px 0; - .order_popup_title{ - color: $font_size_big; - font-weight: 700; - color: #000000; - padding-bottom: 20px; - } - .order_popup_input{ - width: 100%; - padding: 0 25px; - box-sizing: border-box; - margin-top: 43px; - position: relative; - .descDataNum{ - position: absolute; - right: 40px; - bottom: 10px; - height: 39px; - font-size: $font_size_medium; - color: $color_font_two; - } - textarea{ - background-color: #f3f3f3; - border-radius: 10px; - width: 100%; - height: 313px; - padding: 20px; - padding-bottom: 50px; - box-sizing: border-box; - font-size: $font_size; - border: 2px solid #e6e6e6; - } - } - .order_save_address{ - height: 82px; - background: #007aff; - border-radius: 40px; - width: 668px; - text-align: center; - line-height: 82px; - color: #fff; - margin-top: 60px; - } -} \ No newline at end of file diff --git a/src/pages/cutOrder/components/remark/index.tsx b/src/pages/cutOrder/components/remark/index.tsx deleted file mode 100644 index 14d981b..0000000 --- a/src/pages/cutOrder/components/remark/index.tsx +++ /dev/null @@ -1,38 +0,0 @@ -import Popup from "@/components/popup" -import { Textarea, View } from "@tarojs/components" -import { useCallback, useState } from "react" -import styles from './index.module.scss' - -type Param = { - onBlur?: (val:any) => void - onSave?: (val: string) => void -} -export default ({onBlur, onSave}:Param) => { - const [descData, setDescData] = useState({ - number: 0, - value: '', - count: 200 - }) - const getDesc = useCallback((e) => { - let value = e.detail.value - let res = value - if(value.length > descData.count) { - res = value.slice(0, descData.count) - } - setDescData({...descData, number:res.length, value: res}) - },[]) - - const setSave = () => { - onSave?.(descData.value) - } - return ( - - 编辑备注 - - - {descData.number}/{descData.count} - - setSave()}>保存 - - ) -} \ No newline at end of file diff --git a/src/pages/cutOrder/components/scanPay/index.module.scss b/src/pages/cutOrder/components/scanPay/index.module.scss deleted file mode 100644 index dcb356d..0000000 --- a/src/pages/cutOrder/components/scanPay/index.module.scss +++ /dev/null @@ -1,54 +0,0 @@ -$top:170px; -.scanPay_main{ - .scanPay_con{ - padding: 20px; - background-color: #F6F6F6; - border-radius: 20px; - .miconfont_title{ - transform: rotate(-180deg); - position: absolute; - left: 20px; - top: 27px; - font-size: 37px; - color: $color_font_three; - z-index: 99; - - } - } - .title{ - font-size: $font_size_big; - color: #000000; - text-align: center; - font-weight: 700; - position: relative; - } - .desc{ - font-size: $font_size_min; - color: $color_main; - text-align: center; - padding: 10px 0; - .miconfont{ - font-size: 25px; - } - } - - .scanPay_list{ - border-radius: 10px; - height: 900px; - image{ - width: 100%; - } - } - .btns{ - background: #007aff; - border-radius: 40px; - width: 668px; - height: 82px; - text-align: center; - line-height: 80px; - width: 100%; - color: #fff; - font-size: 32px; - margin-top: 30px; - } -} \ No newline at end of file diff --git a/src/pages/cutOrder/components/scanPay/index.tsx b/src/pages/cutOrder/components/scanPay/index.tsx deleted file mode 100644 index d6fb06e..0000000 --- a/src/pages/cutOrder/components/scanPay/index.tsx +++ /dev/null @@ -1,161 +0,0 @@ -import { Image, ScrollView, Text, View } from "@tarojs/components"; -import { memo, useEffect, useRef, useState } from "react"; -import classnames from "classnames"; -import styles from './index.module.scss' -import Popup from "@/components/popup"; -import Taro from "@tarojs/taro"; -import { alert } from "@/common/common"; -import { formatImgUrl } from "@/common/fotmat"; -import useCheckAuthorize from "@/use/useCheckAuthorize"; -import { GetPayCode } from "@/api/onlinePay"; -import LoadingCard from "@/components/loadingCard"; - - -type Param = { - show?: true|false, - onClose?: () => void -} - - -type Item = { - product_code: string, - product_name: string, - product_color_code: string, - product_color_name: string, - num: string, - weight: string, - sale_price: string, - total_price: string -} -type CodeParam = { - title: string, - company: string, - order_type: string, - sale_user: string, - order_created_time: string, - order_no: string, - department: string, - shipment_mode: string, - target_user_name: string, - target_address: string, - target_description: string, - pay_account: string, - bank_account_name: string, - bank_name: string, - pay_type: string, - client: string, - phone: string, - order_total_length: string, - order_total_price: string, - qrcode: string, - order_total_weight: string, - list: Item[] -} -export default memo(({show = true, onClose}:Param) => { - - //获取支付二维码 - const [payCodeImage, setPayCodeImage] = useState('') - const fileData = useRef({ - filePath: '', - base64: '' - }) - const {fetchData, state} = GetPayCode() - const getCore = async () => { - let res = await fetchData({ - title: "面料销售电子确认单", - company: "什么什么公司123", - order_type: "散剪", - sale_user: "小崔", - order_created_time:"2022/02/01 12:32:13", - order_no:"XS-211005888", - department:"嘻嘻嘻", - shipment_mode:"自提", - target_user_name:"大崔", - target_address:"阿斯顿发斯蒂芬", - target_description:"无", - pay_account:"1234567890123450001", - bank_account_name:"佛山市浩川长盛科技有限公司", - bank_name:"招商银行佛山分行禅城支行", - pay_type:"现结", - client:"客户名称", - phone:"15818085802", - order_total_length:"12", - order_total_price:"63000", - qrcode:"https://www.zzfzyc.com/checkorder/XS-211005888", - order_total_weight:"300.00", - list: [{product_code:'5215',product_name:'26S双纱亲水滑爽棉',product_color_code:'053',product_color_name:'洋红',num:'4',weight:'123.23',sale_price:'43',total_price:'4510.7'}] - }) - const base64 = res.data.base64 - setPayCodeImage(() => base64) - const time = new Date().valueOf() - const [, format, bodyData] = /data:image\/(\w+);base64,(.*)/.exec(base64) || []; - let filePath = Taro.env.USER_DATA_PATH + '/img' + time +'.'+ format - fileData.current.filePath = filePath - fileData.current.base64 = bodyData - const save = Taro.getFileSystemManager() - save.writeFile({ - filePath: fileData.current.filePath, - data: fileData.current.base64, - encoding: 'base64', - }) - - } - useEffect(() => { - if(show) - getCore() - }, [show]) - - //检查是否开启保存图片权限 - const {check} = useCheckAuthorize({scope:'scope.writePhotosAlbum', msg:'您没授权，无法保存图片'}) - const saveImageCheck = async () => { - const res = await check() - res&&saveImage() - } - - //保存图片 - const saveImage = () => { - alert.loading('正在保存图片') - Taro.saveImageToPhotosAlbum({ - filePath: fileData.current.filePath, - success: function (res) { - alert.success('图片保存成功') - }, - fail: function (err) { - console.log('err::', err) - } - }) - } - - //预览图片 - const showImage = () => { - console.log('fileData.current.filePath::', fileData.current.filePath) - Taro.previewImage({ - current: fileData.current.filePath, // 当前显示 - urls: [fileData.current.filePath] // 需要预览的图片http链接列表 - }) - } - - //复制功能 - return ( - - - - - 扫码支付 - - - 扫码支付成功后，自动更新状态 - - - {(state.loading)&&|| - - - } - - 保存电子确认单 - - - - - ) -}) \ No newline at end of file diff --git a/src/pages/cutOrder/components/shipmentMode/index.module.scss b/src/pages/cutOrder/components/shipmentMode/index.module.scss deleted file mode 100644 index 5f818f9..0000000 --- a/src/pages/cutOrder/components/shipmentMode/index.module.scss +++ /dev/null @@ -1,33 +0,0 @@ - - .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_status_selected{ - color: $color_main; - border: 1px solid $color_main; - } - } \ No newline at end of file diff --git a/src/pages/cutOrder/components/shipmentMode/index.tsx b/src/pages/cutOrder/components/shipmentMode/index.tsx deleted file mode 100644 index 235591c..0000000 --- a/src/pages/cutOrder/components/shipmentMode/index.tsx +++ /dev/null @@ -1,28 +0,0 @@ -import { Text, View } from "@tarojs/components" -import styles from './index.module.scss' -import classnames from "classnames"; -import { memo, useRef, useState } from "react"; - -type Param = { - onSelect?:(val:number) => void -} -export default memo(({onSelect}: Param) => { - //收货方法 1:自提，2：物流 - const shipmentMode = useRef([ - {value:1, label:'上门自提', selected:false}, - {value:2, label:'物流', selected:false} - ]) - const [selectValue, setSelectValue] = useState() - const selectShipmentMode = (value) => { - setSelectValue(() => value) - onSelect?.(value) - } - return ( - - 收货方式 - {shipmentMode.current.map(item => { - return selectShipmentMode(item.value)}>{item.label} - })} - - ) -}) \ No newline at end of file diff --git a/src/pages/cutOrder/components/submitOrderBtn/index.module.scss b/src/pages/cutOrder/components/submitOrderBtn/index.module.scss deleted file mode 100644 index c5ac9ed..0000000 --- a/src/pages/cutOrder/components/submitOrderBtn/index.module.scss +++ /dev/null @@ -1,69 +0,0 @@ -.order_price{ - display: flex; - align-items: center; - justify-content: space-between; - width: 100%; - &:nth-last-child(n+2) { - margin-bottom: 30px; - } - .order_price_text{ - font-size: $font_size_medium; - // margin-right: 10px; - display: flex; - .iconfont_msg{ - position: relative; - } - .miconfont{ - font-size: 30px; - font-weight: normal; - } - .message{ - position: absolute; - top: -50px; - background: #A8B3BD; - z-index: 9; - min-height: 50px; - border-radius: 10px; - padding: 10px; - box-sizing: border-box; - &::before{ - z-index: 1; - position: absolute; - bottom: -7px; - left: 10px; - width: 15px; - height: 15px; - content: " "; - transform: rotate(45deg); - background: #A8B3BD; - box-sizing: border-box; - } - } - } - .emphasis{ - font-weight: 700; - } - .order_price_num{ - color: $color_main; - font-weight: 700; - text{ - &:nth-child(1) { - font-size: $font_size_min; - } - &:nth-child(2) { - font-size: 26px; - } - &:nth-child(3) { - font-size: $font_size_medium; - } - } - } - .emphasis_num{ - text{ - &:nth-child(2) { - font-size: $font_size_big; - } - } - } - -} \ No newline at end of file diff --git a/src/pages/cutOrder/components/submitOrderBtn/index.tsx b/src/pages/cutOrder/components/submitOrderBtn/index.tsx deleted file mode 100644 index 20ed202..0000000 --- a/src/pages/cutOrder/components/submitOrderBtn/index.tsx +++ /dev/null @@ -1,40 +0,0 @@ -import { Text, View } from "@tarojs/components" -import { memo, useCallback, useEffect, useMemo } from "react" -import {formatKbPrice} from '@/common/common' -import classnames from "classnames"; -import styles from './index.module.scss' -type Param = { - style?: Object, - number?: number -} -export default memo(({style, number = 0}:Param) => { - const priceDom = useCallback(() => { - let res = number.toFixed(2).split('.') - let int_num = parseInt(res[0]) + '' - let decimals_num = res[1] - return ( - <> - ¥ - {Number(int_num).toLocaleString()} - .{decimals_num} - - ) - }, [number]) - return ( - <> - - - 预估金额 - - - {/* 123123123121212312312312312 */} - - - - {priceDom()} - - - - - ) -}) \ No newline at end of file diff --git a/src/pages/cutOrder/components/weightMemo/index.module.scss b/src/pages/cutOrder/components/weightMemo/index.module.scss deleted file mode 100644 index 3c74511..0000000 --- a/src/pages/cutOrder/components/weightMemo/index.module.scss +++ /dev/null @@ -1,39 +0,0 @@ - -.weight_memo{ - background-color: #fff; - border-radius: 20px; - padding: 0 20px; - .weight_memo_item{ - display: flex; - justify-content: space-between; - height: 130px; - &:nth-child(1) { - border-bottom: 1px solid #f3f3f3; - } - .title, .desc{ - display: flex; - align-items: center; - } - .title { - font-size: $font_size; - font-weight: 700; - } - .desc{ - color: $color_font_two; - font-size: $font_size_medium; - } - .miconfont_check, .miconfont_custom{ - font-size: 37px; - color: $color_main; - font-weight: normal; - padding-right: 10px; - } - .miconfont_custom{ - color:#FFC300; - } - .miconfont_more{ - font-size: 30px; - padding-left: 10px; - } - } -} \ No newline at end of file diff --git a/src/pages/cutOrder/components/weightMemo/index.tsx b/src/pages/cutOrder/components/weightMemo/index.tsx deleted file mode 100644 index 7cbfd13..0000000 --- a/src/pages/cutOrder/components/weightMemo/index.tsx +++ /dev/null @@ -1,36 +0,0 @@ -import Popup from "@/components/popup" -import { Text, Textarea, View } from "@tarojs/components" -import { memo, useCallback, useState } from "react" -import styles from './index.module.scss' -import classnames from "classnames"; - -type Param = { - onCheck?: () => void - onCustom?: () => void -} -export default memo(({onCheck, onCustom}:Param) => { - return ( - - onCheck?.()}> - - - 陆盈纺织 - - - 查看原码单 - - - - onCustom?.()}> - - - 我的码单 - - - 自定义 - - - - - ) -}) \ No newline at end of file diff --git a/src/pages/order/comfirm.tsx b/src/pages/order/comfirm.tsx index e8a8a45..d3feb71 100644 --- a/src/pages/order/comfirm.tsx +++ b/src/pages/order/comfirm.tsx @@ -73,7 +73,8 @@ import SubmitOrderBtn from "./components/submitOrderBtn"; total_number: preViewOrder.total_number, //总数量 total_fabrics: preViewOrder.total_fabrics, //面料数量 unit: preViewOrder.sale_mode == 0?'条':'m', //单位 - list: preViewOrder.product_list + list: preViewOrder.product_list, + total_should_collect_money: preViewOrder.total_should_collect_money //应收金额 }) } const formatPreViewOrderMemo = useMemo(() => { @@ -149,7 +150,11 @@ import SubmitOrderBtn from "./components/submitOrderBtn"; if (res.confirm) { const res = await saleOrderFetchData(submitOrderData) if(res.success) { - goLink('/pages/order/index',{id: res.data.id}, 'redirectTo') + if(preViewOrder?.sale_mode == 0) { + goLink('/pages/order/index',{id: res.data.id}, 'redirectTo') + } else if (preViewOrder?.sale_mode == 1) { + goLink('/pages/order/cutOrder/index',{id: res.data.id}, 'redirectTo') + } } else { alert.none(res.msg) } @@ -174,7 +179,7 @@ import SubmitOrderBtn from "./components/submitOrderBtn"; - + {`${formatPreViewOrder?.total_fabrics}种面料，${formatPreViewOrder?.total_colors}种颜色，共${formatPreViewOrder?.total_number + formatPreViewOrder?.unit}`} submitOrderEven()}>提交订单 diff --git a/src/pages/order/components/kindList/index.tsx b/src/pages/order/components/kindList/index.tsx index b2491f8..01b7628 100644 --- a/src/pages/order/components/kindList/index.tsx +++ b/src/pages/order/components/kindList/index.tsx @@ -24,7 +24,7 @@ type OrderParam = { } type Param = { - order: OrderParam, + order: OrderParam, comfirm?: boolean //是否是确认订单页面使用 } @@ -96,14 +96,14 @@ export default memo(({order, comfirm = false}:Param) => { return priceInfo.value.includes(status) }, [order]) + //金额展示 const priceConDom = useMemo(() => { if(!order) return - //确认订单 if(comfirm == true) { - return - } - //订单为取消订单状态 - if(order?.status == SaleOrderStatusCancel.value) { + //确认订单时 + return (order.sale_mode == 1)? : + } else if(order?.status == SaleOrderStatusCancel.value) { + //订单状态为取消订单时 return ( <> { @@ -114,6 +114,7 @@ export default memo(({order, comfirm = false}:Param) => { ) } else { + //其他订单状态 return ( <> { diff --git a/src/pages/order/components/submitOrderBtn/index.tsx b/src/pages/order/components/submitOrderBtn/index.tsx index 20ed202..d84e61e 100644 --- a/src/pages/order/components/submitOrderBtn/index.tsx +++ b/src/pages/order/components/submitOrderBtn/index.tsx @@ -4,10 +4,12 @@ import {formatKbPrice} from '@/common/common' import classnames from "classnames"; import styles from './index.module.scss' type Param = { - style?: Object, - number?: number + style?: Object, + number?: number, //数量 + priceTitle: string //描述 + } -export default memo(({style, number = 0}:Param) => { +export default memo(({style, number = 0, priceTitle = ''}:Param) => { const priceDom = useCallback(() => { let res = number.toFixed(2).split('.') let int_num = parseInt(res[0]) + '' @@ -24,7 +26,7 @@ export default memo(({style, number = 0}:Param) => { <> - 预估金额 + {priceTitle} {/* 123123123121212312312312312 */} diff --git a/src/pages/cutOrder/index.config.ts b/src/pages/order/cutOrder/index.config.ts similarity index 100% rename from src/pages/cutOrder/index.config.ts rename to src/pages/order/cutOrder/index.config.ts diff --git a/src/pages/cutOrder/index.module.scss b/src/pages/order/cutOrder/index.module.scss similarity index 100% rename from src/pages/cutOrder/index.module.scss rename to src/pages/order/cutOrder/index.module.scss diff --git a/src/pages/cutOrder/index.tsx b/src/pages/order/cutOrder/index.tsx similarity index 93% rename from src/pages/cutOrder/index.tsx rename to src/pages/order/cutOrder/index.tsx index 582f333..c1b1bee 100644 --- a/src/pages/cutOrder/index.tsx +++ b/src/pages/order/cutOrder/index.tsx @@ -14,13 +14,12 @@ 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 order from "../orderList/components/order"; -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' +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) @@ -192,7 +191,7 @@ import styles from './index.module.scss' - + 订单信息 diff --git a/src/pages/order/index.tsx b/src/pages/order/index.tsx index 582f333..3cecfc4 100644 --- a/src/pages/order/index.tsx +++ b/src/pages/order/index.tsx @@ -14,7 +14,6 @@ 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 order from "../orderList/components/order"; import AddressInfoDetail from "./components/addressInfoDetail"; import KindList from "./components/kindList"; import OrderState from "./components/orderState";