xuan/TestRestructureWechatLymarketDist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

线上测试

Browse Source
This commit is contained in:
czm 2022-08-11 19:05:14 +08:00
parent 78ed044c49
commit 76dca1ef45
5 changed files with 436 additions and 424 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
global.d.ts vendored
View File

@ -16,3 +16,7 @@ declare namespace NodeJS {
TARO_ENV: 'weapp' | 'swan' | 'alipay' | 'h5' | 'rn' | 'tt' | 'quickapp' | 'qq' | 'jd'
}
}
declare const CURRENT_VERSION: string
declare const CURRENT_GITHASH: string
declare const CURRENT_ENV: string

2
src/components/banner/index.tsx
View File

@ -28,7 +28,7 @@ export default (props: params) => {
}
const skipTo = (item) => {
if (item.jump_type == 2) {
if (item.jump_type == 2 || item.jump_type == 0) {
goLink(item.link + '&title=' + item.title)
} else {
goLink(item.link)

184
src/components/orderBtns/index.tsx
View File

@ -1,33 +1,32 @@
import { CancelOrderApi, ReceiveOrderApi } from "@/api/order"
import { alert, goLink } from "@/common/common"
import { ORDER_STATUS, SALE_MODE, SUBSCRIPTION_MESSAGE_SCENE } from "@/common/enum"
import {Text, View } from "@tarojs/components"
import Taro from "@tarojs/taro"
import {useRef, memo, useState, useMemo } from "react"
import classnames from "classnames";
import { CancelOrderApi, ReceiveOrderApi } from '@/api/order'
import { alert, goLink } from '@/common/common'
import { ORDER_STATUS, SALE_MODE, SUBSCRIPTION_MESSAGE_SCENE } from '@/common/enum'
import { Text, View } from '@tarojs/components'
import Taro from '@tarojs/taro'
import { useRef, memo, useState, useMemo } from 'react'
import classnames from 'classnames'
import styles from './index.module.scss'
import { AddShoppingCartApi } from "@/api/shopCart"
import { ApplyRefundApi } from "@/api/salesAfterOrder"
import { UseSubscriptionMessage } from "@/use/useCommon"
import { throttle } from "@/common/util"
import { AddShoppingCartApi } from '@/api/shopCart'
import { ApplyRefundApi } from '@/api/salesAfterOrder'
import { UseSubscriptionMessage } from '@/use/useCommon'
import { throttle } from '@/common/util'
type Param = {
orderInfo: {
status: number, //订单状态
orderId: number, //订单id
actual_amount: number, //实付金额
wait_pay_amount: number, //待付金额
sale_mode: number, //订单类型
av_return_roll?: number, //可退数量
is_return?: true|false, //是否申请了售后
is_should_collect_audit?: true|false, //应收单是否审核
},
showStatus?: 'detail'|'list', //订单详情，订单列表
status: number //订单状态
orderId: number //订单id
actual_amount: number //实付金额
wait_pay_amount: number //待付金额
sale_mode: number //订单类型
av_return_roll?: number //可退数量
is_return?: true | false //是否申请了售后
is_should_collect_audit?: true | false //应收单是否审核
}
showStatus?: 'detail' | 'list' //订单详情，订单列表
onClick?: (val: number) => void //点击后触发的事件，返回订单状态
}
export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
export default memo(({ orderInfo, showStatus = 'detail', onClick }: Param) => {
//订单状态枚举
const {
SaleOrderStatusBooking,
@ -40,18 +39,14 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
SaleOrderStatusWaitingReceipt,
SaleOrderStatusAlreadyReceipt,
SaleorderstatusWaitingPrePayment,
SaleOrderStatusTaking
SaleOrderStatusTaking,
} = ORDER_STATUS
//订单类型
const {
SaLeModeBulk,
SaleModeLengthCut,
SaLeModeWeightCut,
} = SALE_MODE
const { SaLeModeBulk, SaleModeLengthCut, SaLeModeWeightCut } = SALE_MODE
//注册按钮, id:按钮id唯一，label：按钮名称，sort：排序数字越大越靠后，validatarFunc：验证
type orderBtnsListParams = {id: number, label: string, sort: number, validatarFunc: (val: typeof orderInfo) => any}
type orderBtnsListParams = { id: number; label: string; sort: number; validatarFunc: (val: typeof orderInfo) => any }
const orderBtnsList = useRef<orderBtnsListParams[]>([
{
id: 1,
@ -66,10 +61,10 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
SaleOrderStatusArranged.value,
SaleOrderStatusWaitingPayment.value,
SaleOrderStatusTaking.value,
SaleOrderStatusWaitingDelivery.value
SaleOrderStatusWaitingDelivery.value,
]
return orderInfo.actual_amount == 0 && orderStatus.includes(orderInfo.status)
}
},
},
{
id: 2,
@ -84,10 +79,10 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
SaleOrderStatusWaitingDelivery.value,
SaleOrderStatusWaitingReceipt.value,
SaleOrderStatusAlreadyReceipt.value,
SaleOrderStatusComplete.value
SaleOrderStatusComplete.value,
]
return orderInfo.wait_pay_amount > 0 && orderStatus.includes(orderInfo.status)
}
},
},
{
id: 3,
@ -95,35 +90,27 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
sort: 5,
validatarFunc: (orderInfo) => {
//大货在待发货付过款
let orderStatus = [
SaleOrderStatusWaitingDelivery.value,
SaleOrderStatusTaking.value
]
let orderStatus = [SaleOrderStatusWaitingDelivery.value, SaleOrderStatusTaking.value]
return orderInfo.sale_mode == SaLeModeBulk.value && orderInfo.actual_amount > 0 && orderInfo.av_return_roll && orderStatus.includes(orderInfo.status)
}
},
},
{
id: 5,
label: '申请退货',
sort: 5,
validatarFunc: (orderInfo) => {
let orderStatus = [
SaleOrderStatusAlreadyReceipt.value,
SaleOrderStatusRefund.value
]
let orderStatus = [SaleOrderStatusAlreadyReceipt.value, SaleOrderStatusRefund.value]
return orderInfo.av_return_roll && orderStatus.includes(orderInfo.status)
}
},
},
{
id: 6,
label: '确认收货',
sort: 10,
validatarFunc: (orderInfo) => {
let orderStatus = [
SaleOrderStatusWaitingReceipt.value
]
let orderStatus = [SaleOrderStatusWaitingReceipt.value]
return orderStatus.includes(orderInfo.status)
}
},
},
{
id: 7,
@ -131,7 +118,7 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
sort: 6,
validatarFunc: () => {
return true
}
},
},
{
id: 8,
@ -139,11 +126,9 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
sort: 5,
validatarFunc: (orderInfo) => {
//散剪和剪板在待接单时付过款
let orderStatus = [
SaleOrderStatusBooking.value
]
let orderStatus = [SaleOrderStatusBooking.value]
return orderInfo.sale_mode != SaLeModeBulk.value && orderInfo.actual_amount > 0 && orderStatus.includes(orderInfo.status)
}
},
},
{
id: 9,
@ -151,29 +136,30 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
sort: 6,
validatarFunc: (orderInfo) => {
return orderInfo.is_return
}
},
},
{
id: 10,
label: '销售码单',
sort: 9,
validatarFunc: (orderInfo) => {
return orderInfo.is_should_collect_audit && showStatus == 'detail'
}
if (orderInfo.sale_mode === 1 && showStatus == 'detail') return true
if (orderInfo.sale_mode !== 1 && showStatus == 'detail') return orderInfo.is_should_collect_audit
},
},
])
//显示的按钮数组
const orderBtnsShowList: orderBtnsListParams[] = useMemo(() => {
let list = orderBtnsList.current.filter(item => {
let list = orderBtnsList.current.filter((item) => {
return item.validatarFunc(orderInfo)
})
return list.sort((a, b) => a.sort - b.sort)
}, [orderInfo])
//小程序订阅
const {ApplyGoods} = SUBSCRIPTION_MESSAGE_SCENE
const {openSubscriptionMessage} = UseSubscriptionMessage()
const { ApplyGoods } = SUBSCRIPTION_MESSAGE_SCENE
const { openSubscriptionMessage } = UseSubscriptionMessage()
//点击按钮操作
const submitBtns = throttle(async (val, index) => {
@ -181,11 +167,11 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
cancelOrder()
} else if (val == 6) {
receiveOrder()
} else if(val == 5) {
} else if (val == 5) {
applyProduct()
} else if (val == 3) {
bigApplyRefurn()
} else if(val == 8) {
} else if (val == 8) {
applyRefund()
} else {
onClick?.(val)
@ -197,25 +183,25 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
Taro.showModal({
title: '要申请退款吗？',
success: async function (res) {
if(res.confirm) {
await openSubscriptionMessage({orderId: orderInfo?.orderId, scenes: ApplyGoods.value})
if (res.confirm) {
await openSubscriptionMessage({ orderId: orderInfo?.orderId, scenes: ApplyGoods.value })
onClick?.(3)
} else {
console.log('用户点击取消')
}
}
},
})
}
//取消订单
const {fetchData: cancelFetchData} = CancelOrderApi()
const { fetchData: cancelFetchData } = CancelOrderApi()
const cancelOrder = () => {
Taro.showModal({
title: '要取消该订单吗？',
success: async function (res) {
if (res.confirm) {
let res = await cancelFetchData({id: orderInfo?.orderId})
if(res.success) {
let res = await cancelFetchData({ id: orderInfo?.orderId })
if (res.success) {
alert.success('取消成功')
onClick?.(1)
} else {
@ -224,20 +210,20 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
} else if (res.cancel) {
console.log('用户点击取消')
}
}
},
})
}
//确认订单
const {fetchData: receiveOrderFetchData} = ReceiveOrderApi()
const { fetchData: receiveOrderFetchData } = ReceiveOrderApi()
const receiveOrder = async () => {
Taro.showModal({
title: '确定收货？',
success: async function (res) {
if (res.confirm) {
alert.showLoading('收货中', true)
let res = await receiveOrderFetchData({sale_order_id: orderInfo?.orderId})
if(res.success){
let res = await receiveOrderFetchData({ sale_order_id: orderInfo?.orderId })
if (res.success) {
onClick?.(6)
alert.success('收货成功')
} else {
@ -247,21 +233,21 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
} else if (res.cancel) {
console.log('用户点击取消')
}
}
},
})
}
//退款
const {fetchData: fetchDataApplyRefund} = ApplyRefundApi()
const { fetchData: fetchDataApplyRefund } = ApplyRefundApi()
const applyRefund = async () => {
Taro.showModal({
title: '确定退款？',
success: async function async (res) {
if(res.confirm) {
await openSubscriptionMessage({orderId: orderInfo?.orderId, scenes: ApplyGoods.value})
success: async function async(res) {
if (res.confirm) {
await openSubscriptionMessage({ orderId: orderInfo?.orderId, scenes: ApplyGoods.value })
alert.showLoading('申请中', true)
let res = await fetchDataApplyRefund({sale_order_id: orderInfo?.orderId})
if(res.success) {
let res = await fetchDataApplyRefund({ sale_order_id: orderInfo?.orderId })
if (res.success) {
alert.success('申请成功')
} else {
alert.error('申请失败')
@ -271,40 +257,54 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => {
} else if (res.cancel) {
console.log('用户点击取消')
}
}
},
})
}
//申请退货
const applyProduct = async () => {
if(!orderInfo?.av_return_roll) return alert.none('该订单没有可退条数')
await openSubscriptionMessage({orderId: orderInfo?.orderId, scenes: ApplyGoods.value})
goLink('/pages/applyAfterSales/index',{id:orderInfo?.orderId})
if (!orderInfo?.av_return_roll) return alert.none('该订单没有可退条数')
await openSubscriptionMessage({ orderId: orderInfo?.orderId, scenes: ApplyGoods.value })
goLink('/pages/applyAfterSales/index', { id: orderInfo?.orderId })
}
//显示更多按钮
const [showMore, setShowMore] = useState(false)
const styleTop = useMemo(() => {
return {top:`-${(orderBtnsShowList.length - 3)*70 + 10}rpx`, left: `-${10}rpx`}
return { top: `-${(orderBtnsShowList.length - 3) * 70 + 10}rpx`, left: `-${10}rpx` }
}, [orderBtnsShowList])
return (
<View className={styles.btns_list}>
{(orderBtnsShowList.length > 3)&&<View className={styles.more}>
<Text onClick={() => setShowMore(!showMore)}>{!showMore?'更多':'关闭'}</Text>
{showMore&&<View className={styles.more_con}>
{orderBtnsShowList.length > 3 && (
<View className={styles.more}>
<Text onClick={() => setShowMore(!showMore)}>{!showMore ? '更多' : '关闭'}</Text>
{showMore && (
<View className={styles.more_con}>
<View className={styles.more_list} style={styleTop}>
{orderBtnsShowList.map((item, index) => {
return ((index < (orderBtnsShowList.length - 3)) &&<View className={styles.more_item} key={item.id} onClick={() => submitBtns(item.id, index)}>{item.label}</View>)
return (
index < orderBtnsShowList.length - 3 && (
<View className={styles.more_item} key={item.id} onClick={() => submitBtns(item.id, index)}>
{item.label}
</View>
)
)
})}
</View>
{/* <View className={styles.more_bg} catchMove onClick={() => setShowMore(false)}></View> */}
</View>}
</View>}
</View>
)}
</View>
)}
<View className={styles.list_scroll}>
{orderBtnsShowList.map((item, index) =>
((orderBtnsShowList.length - 3) <= index)&&<View key={item.id} className={classnames(styles.btns_item)} onClick={() => submitBtns(item.id, index)}>{item.label}</View>
{orderBtnsShowList.map(
(item, index) =>
orderBtnsShowList.length - 3 <= index && (
<View key={item.id} className={classnames(styles.btns_item)} onClick={() => submitBtns(item.id, index)}>
{item.label}
</View>
),
)}
</View>
</View>

102
src/pages/classList/index.tsx
View File

@ -1,45 +1,53 @@
import { Input, ScrollView, Text, Textarea, View } from "@tarojs/components"
import classnames from "classnames";
import { Input, ScrollView, Text, Textarea, View } from '@tarojs/components'
import classnames from 'classnames'
import Search from '@/components/search'
import Product from '@/components/product'
import InfiniteScroll from '@/components/infiniteScroll'
import styles from './index.module.scss'
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import Filter from "@/components/filter";
import SortBtn from "@/components/sortBtn";
import SelectData, {ListProps} from "../searchList/components/selectData";
import {GetProductListApi} from '@/api/material'
import { useRouter } from "@tarojs/taro";
import { dataLoadingStatus, getFilterData } from "@/common/util";
import LoadingCard from "@/components/loadingCard";
import useLogin from "@/use/useLogin";
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
import Filter from '@/components/filter'
import SortBtn from '@/components/sortBtn'
import SelectData, { ListProps } from '../searchList/components/selectData'
import { GetProductListApi } from '@/api/material'
import { useRouter } from '@tarojs/taro'
import { dataLoadingStatus, getFilterData } from '@/common/util'
import LoadingCard from '@/components/loadingCard'
import Taro from '@tarojs/taro'
import useLogin from '@/use/useLogin'
export default () => {
useLogin()
const [showPopup, setShowPopup] = useState(false)
const router = useRouter()
useEffect(() => {
Taro.setNavigationBarTitle({
title: router.params.title || '分类页面',
})
}, [router])
//搜索参数
const [searchField, setSearchField] = useState({
code_or_name: '',
product_category_id: router.params.id,
page : 1,
size : 10,
page: 1,
size: 10,
width: '',
weight_density: '',
product_kind_id: '',
component: ''
component: '',
})
//获取列表
const [categoryList, setCategoryList] = useState<{list:any[], total:number}>({
list:[],
total:0
const [categoryList, setCategoryList] = useState<{ list: any[]; total: number }>({
list: [],
total: 0,
})
const {fetchData, state} = GetProductListApi()
const { fetchData, state } = GetProductListApi()
const getSubjectList = async () => {
let res = await fetchData(getFilterData(searchField))
setCategoryList({...categoryList, list:res.data.list, total: res.data.total})
setCategoryList({ ...categoryList, list: res.data.list, total: res.data.total })
}
//监听筛选数据变化
@ -48,43 +56,43 @@ export default () => {
}, [searchField])
//上拉加载数据
const pageNum = useRef({size: searchField.size, page: searchField.page})
const pageNum = useRef({ size: searchField.size, page: searchField.page })
const getScrolltolower = () => {
if(categoryList.list.length < categoryList.total) {
if (categoryList.list.length < categoryList.total) {
pageNum.current.page++
const size = pageNum.current.size * pageNum.current.page
setSearchField({...searchField, size })
setSearchField({ ...searchField, size })
}
}
//数据加载状态
const statusMore = useMemo(() => {
return dataLoadingStatus({list:categoryList.list, total: categoryList.total, status: state.loading})
return dataLoadingStatus({ list: categoryList.list, total: categoryList.total, status: state.loading })
}, [categoryList, state])
//获取筛选条件
const getFiltr = (e) => {
pageNum.current.page = 1
setCategoryList(() => ({list:[], total:0}))
const {data} = e
setCategoryList(() => ({ list: [], total: 0 }))
const { data } = e
setSearchField({
...searchField,
width: data?.width,
weight_density: data?.weight,
size: 10,
component: data?.element,
product_kind_id: data?.seriesId
product_kind_id: data?.seriesId,
})
formatSelectList(e)
}
//筛选条件格式化
const [selectList , setSelectList] = useState<ListProps[]>()
const formatSelectList = (val = {data:{}, field:{}}) => {
let data:ListProps[] = []
for(let key in val.data) {
if(key !== 'seriesId'&& val.data[key] != '') {
data.push({title:val.field[key], value:val.data[key]})
const [selectList, setSelectList] = useState<ListProps[]>()
const formatSelectList = (val = { data: {}, field: {} }) => {
let data: ListProps[] = []
for (let key in val.data) {
if (key !== 'seriesId' && val.data[key] != '') {
data.push({ title: val.field[key], value: val.data[key] })
}
}
setSelectList([...data])
@ -93,34 +101,34 @@ export default () => {
//输入了搜索关键字
const getSearchData = useCallback((e) => {
pageNum.current.page = 1
setCategoryList(() => ({list:[], total:0}))
setSearchField((val) => ({...val, code_or_name:e, size:10}))
setCategoryList(() => ({ list: [], total: 0 }))
setSearchField((val) => ({ ...val, code_or_name: e, size: 10 }))
}, [])
//排序
type sortParam = 'none'|'top'|'bottom'
type sortParam = 'none' | 'top' | 'bottom'
const sortComprehensiveRef = useRef<any>(null)
const [sortStatus, setSortStatus] = useState<{comprehensive:sortParam}>({
comprehensive: 'none'
const [sortStatus, setSortStatus] = useState<{ comprehensive: sortParam }>({
comprehensive: 'none',
})
const changeSort = () => {
setCategoryList(() => ({list:[], total:0}))
const {status, value} = sortComprehensiveRef.current.changeSort()
setSortStatus((e) => ({...e, comprehensive: status, collection: 'none'}))
setSearchField((e) => ({...e, abstract_sort_key: value, size:10, page:1}))
pageNum.current = {size: 10, page: 1}
setCategoryList(() => ({ list: [], total: 0 }))
const { status, value } = sortComprehensiveRef.current.changeSort()
setSortStatus((e) => ({ ...e, comprehensive: status, collection: 'none' }))
setSearchField((e) => ({ ...e, abstract_sort_key: value, size: 10, page: 1 }))
pageNum.current = { size: 10, page: 1 }
}
return (
<View className={styles.main}>
<View className={styles.search}>
<Search placeIcon="out" showBtn={true} btnStyle={{color: '#007AFF'}} changeOnSearch={getSearchData} debounceTime={300}/>
<Search placeIcon='out' showBtn={true} btnStyle={{ color: '#007AFF' }} changeOnSearch={getSearchData} debounceTime={300} />
</View>
<View className={styles.filter}>
<View className={styles.filter_all}>
<View className={styles.text_one} onClick={() => changeSort()}>
<Text>综合</Text>
<SortBtn status={sortStatus.comprehensive} ref={sortComprehensiveRef} sortValue={{desc: '1', asc: '-1'}}/>
<SortBtn status={sortStatus.comprehensive} ref={sortComprehensiveRef} sortValue={{ desc: '1', asc: '-1' }} />
</View>
<View className={styles.text_two} onClick={() => setShowPopup(true)}>
<Text>筛选</Text>
@ -128,15 +136,15 @@ export default () => {
</View>
</View>
<View className={styles.filter_btns}>
<SelectData list={selectList}/>
<SelectData list={selectList} />
</View>
</View>
<View className={styles.list}>
<InfiniteScroll selfonScrollToLower={() => getScrolltolower()} statusMore={statusMore}>
<Product desStatus={false} productList={categoryList.list}/>
<Product desStatus={false} productList={categoryList.list} />
</InfiniteScroll>
</View>
<Filter show={showPopup} onClose={() => setShowPopup(false)} onFiltr={getFiltr}/>
<Filter show={showPopup} onClose={() => setShowPopup(false)} onFiltr={getFiltr} />
</View>
)
}

2
src/pages/order/components/scanPay/index.tsx
View File

@ -46,7 +46,7 @@ export default memo(({ show = true, onClose, company, orderInfo }: Param) => {
length: (citem.length / 100).toString(),
weight: formatWeightDiv(citem.actual_weight || citem.estimate_weight).toString(),
sale_price: formatPriceDiv(citem.sale_price).toString(),
total_price: formatPriceDiv(citem.estimate_amount).toString(),
total_price: formatPriceDiv(citem.total_sale_price || citem.estimate_amount).toString(), //小计
weight_error: formatWeightDiv(citem.weight_error).toString(),
})
})