From 9d129112dc9d5e41eb9ab40d0003359ebb0ba035 Mon Sep 17 00:00:00 2001 From: czm <2192718639@qq.com> Date: Tue, 28 Jun 2022 10:35:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=B5=B7=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/constant.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/common/constant.js b/src/common/constant.js index 9a4f083..d044f8e 100644 --- a/src/common/constant.js +++ b/src/common/constant.js @@ -9,13 +9,8 @@ export const BASE_URL = `https://test.zzfzyc.com/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` // 正式环境 -<<<<<<< HEAD -// export const BASE_URL = `http://192.168.1.4:40001/lymarket` // 王霞 -export const BASE_URL = `http://192.168.1.7:50001/lymarket` // 添 -======= // export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞 // export const BASE_URL = `http://192.168.1.7:50002/lymarket` // 添 ->>>>>>> f38df6f9f11edcef0ff8efb9504e2f5df8df4078 // export const BASE_URL = `http://192.168.1.15:50001/lymarket` // 杰 // CDN From 5ebd403866667423ade28c22d55d154383266cd2 Mon Sep 17 00:00:00 2001 From: czm <2192718639@qq.com> Date: Tue, 28 Jun 2022 11:35:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=A4=84=E7=90=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/salesAfterOrder.ts | 2 +- src/common/fotmat.js | 2 +- src/components/afterOrderBtns/index.tsx | 39 +++++-------------- src/pages/details/components/swiper/index.tsx | 2 +- .../advanceOrderState/index.module.scss | 0 .../components/advanceOrderState/index.tsx | 16 ++++++++ src/pages/salesAfter/index.tsx | 1 + src/pages/user/index.tsx | 2 +- 8 files changed, 30 insertions(+), 34 deletions(-) create mode 100644 src/pages/order/components/advanceOrderState/index.module.scss create mode 100644 src/pages/order/components/advanceOrderState/index.tsx diff --git a/src/api/salesAfterOrder.ts b/src/api/salesAfterOrder.ts index 9104042..40dc158 100644 --- a/src/api/salesAfterOrder.ts +++ b/src/api/salesAfterOrder.ts @@ -21,7 +21,7 @@ export const GetSaleOrderListApi = () => { } /** - * 取消退货 + * 取消退货/退款 */ export const ReturnApplyOrderCancelApi = () => { return useRequest({ diff --git a/src/common/fotmat.js b/src/common/fotmat.js index 09b2d01..6fac0e2 100644 --- a/src/common/fotmat.js +++ b/src/common/fotmat.js @@ -142,7 +142,7 @@ export const toDecimal2 = (x) => { * @returns */ export const formatImgUrl = (url, suffix="!w200") => { - return url?IMG_CND_Prefix + url + suffix:IMG_CND_Prefix +'/mall/no_img.png' + return url?url + suffix:IMG_CND_Prefix +'/mall/no_img.png' } /** diff --git a/src/components/afterOrderBtns/index.tsx b/src/components/afterOrderBtns/index.tsx index d3cc84f..3fdacbe 100644 --- a/src/components/afterOrderBtns/index.tsx +++ b/src/components/afterOrderBtns/index.tsx @@ -12,8 +12,9 @@ type Param = { orderInfo: { stage: number, //售后状态 orderId: number, //订单id - sale_mode: number //订单类型 - type: number //1退货，2退款 + sale_mode: number, //订单类型 + type: number, //1退货，2退款 + return_apply_order_id: number //售后申请单 }, onClick?: (val: number) => void, //点击后触发的事件，返回订单状态 onBtnNull?: () => void //所有按钮都为空 @@ -110,22 +111,22 @@ export default memo(({orderInfo, onClick, onBtnNull}:Param) => { //点击按钮操作 const submitBtns = (val, index) => { if (val == 1) { - cancelOrder() + cancelOrder({title:'要取消退货吗？'}) } else if (val == 6) { - receiveOrder() + cancelOrder({title:'要取消退款吗？'}) } else { onClick?.(val) } } - //取消退货 + //取消退货/退款 const {fetchData: returnApplyOrderCancelFetchData} = ReturnApplyOrderCancelApi() - const cancelOrder = () => { + const cancelOrder = ({title = ''}) => { Taro.showModal({ - title: '要取消退货吗？', + title, success: async function (res) { if (res.confirm) { - let res = await returnApplyOrderCancelFetchData({id: orderInfo?.orderId}) + let res = await returnApplyOrderCancelFetchData({id: orderInfo?.return_apply_order_id}) if(res.success) { alert.success('取消成功') onClick?.(1) @@ -136,28 +137,6 @@ export default memo(({orderInfo, onClick, onBtnNull}:Param) => { console.log('用户点击取消') } } - }) - } - - //确认订单 - const {fetchData: receiveOrderFetchData} = ReceiveOrderApi() - const receiveOrder = async () => { - console.log('123456') - Taro.showModal({ - title: '确定收货？', - success: async function (res) { - if (res.confirm) { - let res = await receiveOrderFetchData({sale_order_id: orderInfo?.orderId}) - if(res.success){ - onClick?.(6) - alert.success('收货成功') - } else { - alert.error('收货失败') - } - } else if (res.cancel) { - console.log('用户点击取消') - } - } }) } diff --git a/src/pages/details/components/swiper/index.tsx b/src/pages/details/components/swiper/index.tsx index a0cb48e..501566b 100644 --- a/src/pages/details/components/swiper/index.tsx +++ b/src/pages/details/components/swiper/index.tsx @@ -23,7 +23,7 @@ export default ({list = []}: params) => { return ( swiperChange(e)}> - {list.map((item) => { + {list?.map((item) => { return diff --git a/src/pages/order/components/advanceOrderState/index.module.scss b/src/pages/order/components/advanceOrderState/index.module.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/pages/order/components/advanceOrderState/index.tsx b/src/pages/order/components/advanceOrderState/index.tsx new file mode 100644 index 0000000..a60698b --- /dev/null +++ b/src/pages/order/components/advanceOrderState/index.tsx @@ -0,0 +1,16 @@ +import { Text, View } from "@tarojs/components"; +import { memo } from "react"; +import styles from './index.module.scss' + +export default memo(() => { + return ( + + + + 剩 + + 支付关闭，订单自动取消 + + + ) +}) \ No newline at end of file diff --git a/src/pages/salesAfter/index.tsx b/src/pages/salesAfter/index.tsx index 63b5e20..d84ae04 100644 --- a/src/pages/salesAfter/index.tsx +++ b/src/pages/salesAfter/index.tsx @@ -92,6 +92,7 @@ import styles from './index.module.scss' settle_mode: orderDetail?.settle_mode, type: orderDetail?.type, //退货or退款 sale_mode: orderDetail?.sale_model, //订单类型 + return_apply_order_id: orderDetail?.return_apply_order_id } }, [orderDetail]) diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx index 29dbef6..bf9e1bf 100644 --- a/src/pages/user/index.tsx +++ b/src/pages/user/index.tsx @@ -72,7 +72,7 @@ const Header = memo((props: any) => { const { data } = props; let menu = [{ text: "待配布", icon: "icon-daipeibu", url: "/pages/orderList/index" }, { text: "待付款", icon: "icon-daifukuan", url: "/pages/orderList/index" }, { text: "待发货", icon: "icon-daifahuo", url: "/pages/orderList/index" }, { text: "已发货", icon: "icon-yifahuo", url: "/pages/orderList/index" }, - { text: "退款/售后", icon: "icon-a-tuikuanshouhou", url: "/pages/orderList/index" }]; + { text: "退款/售后", icon: "icon-a-tuikuanshouhou", url: "/pages/salesAfterList/index" }]; const { getPhoneNumber } = useLogin(); const mGetPhoneNumber = (ev) => { if (ev.detail?.code) { From 6cebc55f8509740620792ecf5831af771710faf9 Mon Sep 17 00:00:00 2001 From: czm <2192718639@qq.com> Date: Tue, 28 Jun 2022 14:22:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=A4=84=E7=90=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/constant.js | 4 +- src/common/fotmat.js | 5 +- .../advanceOrderState/index.module.scss | 48 +++++++++++++++++++ .../components/advanceOrderState/index.tsx | 15 ++++-- src/pages/order/index.tsx | 2 + 5 files changed, 67 insertions(+), 7 deletions(-) diff --git a/src/common/constant.js b/src/common/constant.js index 89c5570..154f53c 100644 --- a/src/common/constant.js +++ b/src/common/constant.js @@ -4,13 +4,13 @@ // 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.30:40001/lymarket` // 发 // export const BASE_URL = `http://192.168.1.9:40001/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:50002/lymarket` // 添 +// export const BASE_URL = `http://192.168.1.7:50002/lymarket` // 添 // export const BASE_URL = `http://192.168.1.15:50001/lymarket` // 杰 // CDN diff --git a/src/common/fotmat.js b/src/common/fotmat.js index 6fac0e2..f66140e 100644 --- a/src/common/fotmat.js +++ b/src/common/fotmat.js @@ -139,10 +139,11 @@ export const toDecimal2 = (x) => { /** * 格式化图片路径 * @param {*} url + * @status true|false * @returns */ -export const formatImgUrl = (url, suffix="!w200") => { - return url?url + suffix:IMG_CND_Prefix +'/mall/no_img.png' +export const formatImgUrl = (url, status = false ,suffix="!w200") => { + return url? (status?IMG_CND_Prefix:'') +url + suffix:IMG_CND_Prefix +'/mall/no_img.png' } /** diff --git a/src/pages/order/components/advanceOrderState/index.module.scss b/src/pages/order/components/advanceOrderState/index.module.scss index e69de29..86e995e 100644 --- a/src/pages/order/components/advanceOrderState/index.module.scss +++ b/src/pages/order/components/advanceOrderState/index.module.scss @@ -0,0 +1,48 @@ + +.advance_main{ + width:100%; + height: 238px; + background-color: #007AFF; + border-radius: 20px; + display: flex; + align-items: center; + font-size: 24px; + color: #dddddd; + position: relative; + .time_con{ + padding-left: 30px; + .times{ + margin-bottom: 25px; + display: flex; + align-items: center; + .text{ + margin-right: 15px; + } + .num{ + width: 46px; + height: 50px; + background: #0063ce; + border-radius: 10px; + line-height: 50px; + text-align: center; + font-weight: 700; + color: #fff; + } + .separate{ + padding: 0 10px; + } + } + + } + .cardIcon{ + width: 238px; + height: 178px; + position: absolute; + right: 0; + bottom: 0; + .image{ + width:100%; + height: 100%; + } + } +} \ No newline at end of file diff --git a/src/pages/order/components/advanceOrderState/index.tsx b/src/pages/order/components/advanceOrderState/index.tsx index a60698b..45faaf1 100644 --- a/src/pages/order/components/advanceOrderState/index.tsx +++ b/src/pages/order/components/advanceOrderState/index.tsx @@ -1,4 +1,5 @@ -import { Text, View } from "@tarojs/components"; +import { formatImgUrl } from "@/common/fotmat"; +import { Image, Text, View } from "@tarojs/components"; import { memo } from "react"; import styles from './index.module.scss' @@ -6,11 +7,19 @@ export default memo(() => { return ( - - 剩 + + 剩 + 23 + : + 58 + : + 55 支付关闭，订单自动取消 + + + ) }) \ No newline at end of file diff --git a/src/pages/order/index.tsx b/src/pages/order/index.tsx index 7c678e1..d76edd3 100644 --- a/src/pages/order/index.tsx +++ b/src/pages/order/index.tsx @@ -17,6 +17,7 @@ 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 AdvanceOrderState from "./components/advanceOrderState"; import ApplyRefund from "./components/applyRefund"; import KindList from "./components/kindList"; import OrderState from "./components/orderState"; @@ -250,6 +251,7 @@ import styles from './index.module.scss' return ( + {/* */}