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

电子商城测试版v4

Browse Source
This commit is contained in:
cheng
2022-07-06 20:29:48 +08:00
parent bbc485ee3f
commit f05389ced7
48 changed files with 358 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/addressAdd/index.tsx
+2
View File
@@ -7,8 +7,10 @@ import Taro, { setNavigationBarTitle, useRouter } from "@tarojs/taro"
import { useEffect, useState } from "react"
import "./index.scss"
import {addressAddApi, addressDetailApi,addressEditApi} from "@/api/addressManager"
import useLogin from "@/use/useLogin"
export default ()=>{
useLogin()
const [showSiteModal, setShowSiteModal] = useState(false);
const {type,id} = useRouter().params;
useEffect(()=>{
src/pages/addressManager/index.tsx
+2 -1
View File
@@ -1,12 +1,13 @@
import AddressList from "@/components/AddressList"
import useLogin from "@/use/useLogin"
import { Button, ScrollView, Text, View } from "@tarojs/components"
import { stopPullDownRefresh, usePullDownRefresh } from "@tarojs/taro"
import { useState } from "react"
import "./index.scss"
export default ()=>{
useLogin()
return (
<View className="address-manager">
<AddressList refresherEnabled={true}/>
src/pages/applyAfterSales/index.tsx
+2 -1
View File
@@ -11,6 +11,7 @@ import { ReturnApplyOrderApi, ReturnExplainApi, ReturnGoodsStatusApi, ReturnReas
import { alert, goLink } from "@/common/common";
import UploadImage from "@/components/uploadImage"
import TextareaEnhance from "@/components/textareaEnhance";
import useLogin from "@/use/useLogin";
enum returnStatus {
return_reason = 1, //原因
@@ -19,7 +20,7 @@ enum returnStatus {
}
export default () => {
useLogin()
useDidShow(() => {
getSaleOrderPreView()
})
src/pages/classList/index.tsx
+2
View File
@@ -12,8 +12,10 @@ 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";
export default () => {
useLogin()
const [showPopup, setShowPopup] = useState(false)
const router = useRouter()
src/pages/collection/collectionClass/index.tsx
+29 -11
View File
@@ -4,7 +4,7 @@ import { getFilterData } from "@/common/util";
import Product from "../components/product";
import Search from "@/components/search"
import { Text, View } from "@tarojs/components"
import Taro from "@tarojs/taro";
import Taro, { useRouter } from "@tarojs/taro";
import classnames from "classnames";
import { useCallback, useEffect, useRef, useState } from "react";
import CreatePopup from "../components/createPopup";
@@ -16,6 +16,8 @@ import AddCollection from "@/components/addCollection";
export default () => {
const router = useRouter()
//获取收藏夹面料
const [list, setList] = useState<any[]>([])
const getFavoriteInfo = () => {
@@ -43,24 +45,40 @@ export default () => {
}, [])
//全选反选
const [selectStatus, setSelectStatus] = useState(false)
const [allSelectStatus, setAllSelectStatus] = useState(false)
const selectCallBack = useCallback(() => {
setSelectStatus(() => true)
setAllSelectStatus(() => true)
setSelectStatus(1)
}, [])
const colseCallBack = useCallback(() => {
setSelectStatus(() => false)
setAllSelectStatus(() => false)
setSelectStatus(3)
}, [])
// useEffect(() => {
// if(list.length)
// setSelectStatus(ids.length == list.length)
// }, [ids, list])
const [selectStatus, setSelectStatus] = useState<1|2|3>(3)
useEffect(() => {
if(list.length) {
if(ids.length == list.length) {
setSelectStatus(1)
setAllSelectStatus(true)
} else if ( 0 < ids.length && ids.length < list.length){
setSelectStatus(2)
setAllSelectStatus(false)
} else {
setSelectStatus(3)
setAllSelectStatus(false)
}
}
}, [ids, list])
const [collectionShow, setCollectionShow] = useState(false)
const closeCollection = useCallback(() => {
setCollectionShow(false)
}, [])
const onAdd = () => {
}
return (
@@ -70,7 +88,7 @@ export default () => {
</View>
<View className={styles.operation}>
<View className={styles.operation_check}>
<MCheckbox status={selectStatus} onSelect={() => selectCallBack()} onClose={() => colseCallBack()}/>
<MCheckbox status={allSelectStatus} onSelect={() => selectCallBack()} onClose={() => colseCallBack()}/>
<Text>全选</Text>
</View>
<View className={styles.operation_check_right}>
@@ -79,7 +97,7 @@ export default () => {
</View>
</View>
<View className={styles.class_list}>
<Product productList={list} onSelectIds={getSelectIds} selectStatus={selectStatus}/>
<Product productList={list} onSelectIds={getSelectIds} selectStatus={selectStatus} openCheckBox={true}/>
</View>
<AddCollection show={collectionShow} onAdd={onAdd} onClose={closeCollection}/>
</View>
src/pages/collection/components/product/index.tsx
+12 -10
View File
@@ -9,22 +9,24 @@ import { useCallback, useEffect, useRef, useState } from "react"
type Params = {
productList?: any[],
onSelectIds?: (val: number[]) => void
selectStatus?: false|true
onSelectIds?: (val: number[]) => void,
selectStatus?: 1|2|3, //1全选，2不做处理，3全清空
openCheckBox?: true|false //是否开启选择
}
export default ({productList = [], onSelectIds, selectStatus = false}:Params) => {
export default ({productList = [], onSelectIds, selectStatus = 2, openCheckBox = false}:Params) => {
const [list, setList] = useState<any[]>([])
useEffect(() => {
setList(() => [...productList])
},[productList])
useEffect(() => {
if(list.length) {
if(list.length && selectStatus != 2) {
list.map(item => {
item.check = selectStatus
item.check = (selectStatus == 1)
})
setList(() => [...list])
}
setList(() => [...list])
}, [selectStatus])
const onChangeSelect = (item) => {
@@ -57,13 +59,13 @@ export default ({productList = [], onSelectIds, selectStatus = false}:Params) =>
return (
<View className={styles.products_list}>
{list?.map(item => {
return <View className={styles.products_item} onClick={() => onChangeSelect(item)}>
<View className={styles.checkbox} onClick={(e) => e.stopPropagation()}>
return <View className={styles.products_item} onClick={() => openCheckBox?onChangeSelect(item):goLink(`/pages/details/index?id=${item.product_id}`)}>
{openCheckBox&&<View className={styles.checkbox} onClick={(e) => e.stopPropagation()}>
<MCheckbox status={item.check} onSelect={() => onSelect(item)} onClose={() => onClose(item)}/>
</View>
</View>}
<View className={styles.item_img}>
<LabAndImg value={{lab:item.lab,rgb:item.rgb,texture_url:item.texture_url}}/>
<View className={styles.num}>{item.product_color_count}色</View>
<View className={styles.num}>{item.enable_product_color_count}色</View>
</View>
<View className={styles.item_con}>
<View className={styles.title}><text>{formatHashTag(item.product_code, '')} </text>{item.product_name}</View>
src/pages/collection/index.tsx
+8 -3
View File
@@ -1,5 +1,5 @@
import { CreateFavoriteApi, DelFavoriteApi, FavoriteListApi, UpdateFavoriteApi } from "@/api/favorite";
import { alert } from "@/common/common";
import { alert, goLink } from "@/common/common";
import { getFilterData } from "@/common/util";
import Product from "./components/product";
import Search from "@/components/search"
@@ -10,8 +10,9 @@ import { useCallback, useEffect, useRef, useState } from "react";
import CreatePopup from "./components/createPopup";
import UpdatePopup from "./components/updatePopup";
import styles from './index.module.scss'
import useLogin from "@/use/useLogin";
export default () => {
useLogin()
const changeOpenCon = (item) => {
item.openStatus = !item.openStatus
setList((e) => [...e])
@@ -117,6 +118,10 @@ export default () => {
}
}
const onBatchManagement = useCallback(() => {
// goLink('pages/collection/collectionClass/index', {id: })
}, [])
//操作文件夹
const onCreatSuccess = (submitData) => {
if (!initData.id) {
@@ -147,7 +152,7 @@ export default () => {
</View>
</View>)}
</View>
<UpdatePopup show={updateShow} onClose={closeUpdate} onDelete={onDeleteCollect} onUpdate={onUpdateShow}/>
<UpdatePopup show={updateShow} onClose={closeUpdate} onDelete={onDeleteCollect} onUpdate={onUpdateShow} onBatchManagement={onBatchManagement}/>
<CreatePopup defaultValue={initData} show={collectioinShow} onClose={closeCollection} onSuccess={onCreatSuccess}/>
</View>
)
src/pages/company/index.tsx
+2
View File
@@ -7,8 +7,10 @@ import { useEffect, useState } from "react"
import { alert, retrieval } from "@/common/common";
import { companyDetailApi, companyUpdateApi } from "@/api/company"
import "./index.scss"
import useLogin from "@/use/useLogin"
export default ()=>{
useLogin()
const [showSiteModal, setShowSiteModal] = useState(false);
const handleSelectSite = ()=>{
setShowSiteModal(true);
src/pages/creditLine/index.tsx
+2 -1
View File
@@ -8,9 +8,10 @@ import "./index.scss"
import { useSelector } from "@/reducers/hooks";
import { formatDateTime, formatPriceDiv } from "@/common/fotmat"
import Message from "@/components/Message"
import useLogin from "@/use/useLogin"
export default ()=>{
useLogin()
const userInfo = useSelector(state => state.userInfo);
useEffect(()=>{
getData()
src/pages/creditUsed/index.tsx
+2
View File
@@ -6,8 +6,10 @@ import {creditListApi} from "@/api/creditLine"
import "./index.scss"
import { formatDateTime, formatPriceDiv, toDecimal2 } from "@/common/fotmat"
import { dataLoadingStatus, getFilterData } from "@/common/util";
import useLogin from "@/use/useLogin"
export default ()=>{
useLogin()
const {fetchData, state} = creditListApi();
// 渲染（数据）
const [data, setData] = useState({
src/pages/depositBeforehand/index.tsx
+2
View File
@@ -7,8 +7,10 @@ import { useEffect } from "react";
import { formatPriceDiv, toDecimal2 } from "@/common/fotmat";
import { setClipboardData } from "@tarojs/taro";
import Message from "@/components/Message";
import useLogin from "@/use/useLogin";
export default ()=>{
useLogin()
const {fetchData, state} = depositInfoApi();
const getData = async ()=>{
fetchData();
src/pages/depositBeforehandDetail/index.tsx
+2 -1
View File
@@ -6,9 +6,10 @@ import Taro, { useReady } from "@tarojs/taro"
import { useEffect, useState } from "react"
import {creditListApi} from "@/api/creditLine"
import "./index.scss"
import useLogin from "@/use/useLogin"
export default ()=>{
useLogin()
return (
<View className="deposit-detail">
<View className="deposit-detail-tips">
src/pages/depositList/index.tsx
+2
View File
@@ -7,8 +7,10 @@ import { useCallback, useEffect, useState } from "react"
import { depositListApi } from "@/api/deposit"
import "./index.scss"
import { formatDateTime, formatPriceDiv } from "@/common/fotmat"
import useLogin from "@/use/useLogin"
export default ()=>{
useLogin()
const {fetchData, state} = depositListApi();
// 渲染（数据）
const [data, setData] = useState({
src/pages/details/components/preview/index.module.scss
+4 -1
View File
@@ -14,7 +14,10 @@
align-items: center;
flex-direction: column;
width: 100%;
margin-top: 200px;
height: 60vh;
margin-top: 100px;
padding: 20px;
box-sizing: border-box;
image{
width:100%;
border-radius: 10px;
src/pages/details/components/preview/index.tsx
+5 -2
View File
@@ -1,9 +1,12 @@
import LabAndImg from "@/components/LabAndImg"
import { Image, View } from "@tarojs/components"
import styles from './index.module.scss'
export type colorItem = {
title: string,
img: string
lab: {l:number, a:number, b:number},
rgb: {r:number, g:number, b:number},
texture_url: string
}
export type colorParams = {
value?: colorItem,
@@ -15,7 +18,7 @@ export default ({value, show = false, onClose}: colorParams) => {
<>
{show&&<View className={styles.main} catch-move="true" onClick={() => onClose?.()}>
<View className={styles.con}>
<Image mode="aspectFill" src={value?.img as string}/>
<LabAndImg value={{lab:value?.lab,rgb:value?.rgb,texture_url:value?.texture_url}}/>
<View className={styles.name}>{value?.title}</View>
</View>
</View>}
src/pages/details/index.module.scss
+17
View File
@@ -125,16 +125,33 @@
background-color: #fff;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
.buy_cart{
width: 150px;
color: $color_font_three;
text-align: center;
position: relative;
.text{
font-size: $font_size_min;
}
.miconfont{
font-size: 36px;
}
.product_num{
position: absolute;
font-size: 23px;
background-color: red;
color: #fff;
height: 36px;
line-height: 36px;
padding: 0 6px;
border-radius: 72px;
min-width: 25px;
text-align: center;
top: 0;
right: 20px;
}
}
.buy_btn{
display: flex;
src/pages/details/index.tsx
+16 -5
View File
@@ -18,6 +18,7 @@ import LabAndImg from '@/components/LabAndImg';
import { alert } from '@/common/common';
import AddCollection from '@/components/addCollection';
import { AddFavoriteApi } from '@/api/favorite';
import { GetShoppingCartApi } from '@/api/shopCart';
type item = {title:string, img:string, url:string, id:number}
@@ -27,7 +28,7 @@ type Params = {
style?: Object
}
export default (props:Params) => {
const {checkLogin, getPhoneNumber, userInfo} = useLogin()
const {getPhoneNumber, userInfo} = useLogin()
//获取参数(有两种参数：1.商品id, 2.页面分享)
const router = useRouter()
@@ -50,9 +51,9 @@ export default (props:Params) => {
}
useDidShow(() => {
checkLogin()
judgeParam()
setShowCart(false)
getShoppingCart()
})
useEffect(() => {
@@ -96,7 +97,9 @@ export default (props:Params) => {
const getColorItem = (item) => {
setColorInfo({
title: item.code,
img: item.texture_url,
texture_url: item.texture_url,
lab: item.lab,
rgb: item.rgb
})
setShowPreview(true)
}
@@ -149,7 +152,14 @@ export default (props:Params) => {
setCollectionShow(false)
}, [])
//获取购物车数据数量
const [shopCount, setShopCount] = useState<number>(0)
const {fetchData: fetchDataShopCount} = GetShoppingCartApi()
const getShoppingCart = async () => {
const {data} = await fetchDataShopCount()
let color_list = data.color_list||[]
setShopCount(color_list.length)
}
//页面下拉刷新
@@ -163,7 +173,7 @@ export default (props:Params) => {
<DesSwiper list={productInfo.texture_url||[]}/>
<View className={styles.product_header}>
<View className={styles.title}>
<View className={styles.name}>{productName}</View>
{productInfo.code&&<View className={styles.name}>{productName}</View>}
<View className={styles.des}>{productInfo.describe}</View>
</View>
<View className={styles.share}>
@@ -205,6 +215,7 @@ export default (props:Params) => {
<View className={styles.buy_cart} onClick={() => setShowCart(true)}>
<View className={classnames('iconfont icon-gouwuche', styles.miconfont)}></View>
<View className={styles.text}>购物车</View>
{(shopCount > 0)&&<View className={styles.product_num}>{shopCount > 99?'99+':shopCount}</View>}
</View>
{
(!userInfo.adminUserInfo?.is_authorize_phone)&&<View className={styles.buy_btn} >
src/pages/editOrder/index.tsx
+2 -1
View File
@@ -8,9 +8,10 @@ import { alert, goLink } from "@/common/common";
import { getParam } from "@/common/system";
import {EditSaleOrderAddressApi, EditSaleOrderShipmentModeApi} from "@/api/order";
import Taro from "@tarojs/taro";
import useLogin from "@/use/useLogin";
export default () => {
useLogin()
//获取临时传递的数据
const params = getParam()
const [paramsData, setParamsData] = useState<any>(params)
src/pages/index/index.tsx
+1 -14
View File
@@ -15,11 +15,7 @@ import { dataLoadingStatus } from '@/common/util'
export default () => {
const { checkLogin } = useLogin()
useDidShow(async () => {
await checkLogin()
})
useLogin()
useEffect(() => {
categoryList()
}, [])
@@ -87,21 +83,12 @@ export default () => {
setRefresherTriggeredStatus(true)
}
//页面下拉刷新
// const res = useManualPullDownRefresh()
// usePullDownRefresh(() => {
// console.log('123')
// })
//数据加载状态
const statusMore = useMemo(() => {
return dataLoadingStatus({ list: productData.list, total: productData.total, status: productState.loading })
}, [productData, productState.loading])
return (
<MoveBtn onClick={() => setShowShopCart(!showShopCart)}>
<View className={styles.main}>
src/pages/order/components/addressInfoDetail/index.tsx
+29 -10
View File
@@ -37,6 +37,20 @@ type Param = {
}
}
//订单状态
const {
SaleorderstatusWaitingPrePayment,
SaleOrderStatusBooking,
SaleOrderStatusArranging,
SaleOrderStatusArranged,
SaleOrderStatusWaitingPayment,
SaleOrderStatusWaitingReceipt,
SaleOrderStatusAlreadyReceipt,
SaleOrderStatusComplete,
SaleOrderStatusRefund,
SaleOrderStatusCancel,
} = ORDER_STATUS
export default memo(forwardRef(({onSelect, onChangeShipmentMode, orderInfo, status = 2, disabled = false, onLogistics}: Param, ref) => {
const [addressInfo, setAddressInfo] = useState<any>()
@@ -53,7 +67,7 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, orderInfo, stat
//打开地址列表
const [showAddressList, setShowAddressList] = useState(false)
const changeShow = () => {
if(receivingStatus == 2 && !logisticsShow)
if(receivingStatus == 2 && !logisticsShow && limitEdit())
setShowAddressList(() => true)
}
@@ -67,7 +81,8 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, orderInfo, stat
const {fetchData: shipmentModeFetchData} = EditSaleOrderShipmentModeApi()
const onReceivingStatus = (value, e) => {
e.stopPropagation()
changeReceivingStatus(value)
if(limitEdit()) changeReceivingStatus(value)
}
const changeReceivingStatus = debounce(async (value) => {
if(!orderInfo) return false
@@ -112,14 +127,18 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, orderInfo, stat
}
}
//订单状态
const {
SaleOrderStatusWaitingReceipt,
SaleOrderStatusAlreadyReceipt,
SaleOrderStatusComplete,
SaleOrderStatusRefund,
SaleOrderStatusCancel,
} = ORDER_STATUS
//根据订单状态判断是否可用修改
const limitEdit = () => {
let res = [
SaleorderstatusWaitingPrePayment.value,
SaleOrderStatusBooking.value,
SaleOrderStatusArranging.value,
SaleOrderStatusArranged.value,
SaleOrderStatusWaitingPayment.value,
].includes(orderInfo?.status as number)
if(!res && status != 1) alert.none('该订单状态不能修改地址！')
return status == 1? true : res
}
//根据订单状态判断是否显示物流
src/pages/order/index.tsx
+15 -4
View File
@@ -13,6 +13,7 @@ import OrderBtns from "@/components/orderBtns";
import Popup from "@/components/popup";
import SearchInput from "@/components/searchInput";
import ShopCart from "@/components/shopCart";
import useLogin from "@/use/useLogin";
import { Text, Textarea, View } from "@tarojs/components"
import Taro, { useDidShow, usePullDownRefresh, useRouter } from "@tarojs/taro";
import classnames from "classnames";
@@ -28,6 +29,7 @@ import Remark from "./components/remark";
import styles from './index.module.scss'
export default () => {
useLogin()
const [showDesc, setShowDesc] = useState(false)
const router = useRouter()
const orderId = useRef<number>(Number(router.params.id))
@@ -37,6 +39,8 @@ import styles from './index.module.scss'
//订单状态枚举
const {
SaleOrderStatusTaking,
SaleOrderStatusWaitingDelivery,
SaleOrderStatusWaitingReceipt, // 待收货
SaleOrderStatusAlreadyReceipt, // 已收货
SaleOrderStatusComplete, // 已完成
@@ -46,6 +50,7 @@ import styles from './index.module.scss'
} = ORDER_STATUS
//获取订单详情
const firstOpen = useRef(true)
const [orderDetail, setOrderDetail] = useState<any>() //获取到的原始数据
const {fetchData: getOrderFetchData} = GetSaleOrderDetailApi()
const getSaleOrderPreView = async () => {
@@ -53,7 +58,10 @@ import styles from './index.module.scss'
let res = await getOrderFetchData({id: orderId.current})
setOrderDetail(res.data)
setOrderRemark(res.data.remark)
if(res.data.status == SaleorderstatusWaitingPrePayment.value) toPay()
if(firstOpen.current) {
firstOpen.current = false
toPay()
}
}
Taro.stopPullDownRefresh()
Taro.hideToast()
@@ -115,7 +123,9 @@ import styles from './index.module.scss'
shipment_mode: orderDetail?.shipment_mode,
id: orderDetail?.id,
sale_mode: orderDetail?.sale_mode,
status: orderDetail?.status
status: orderDetail?.status,
take_goods_address: orderDetail?.take_goods_address,
take_goods_phone: orderDetail?.take_goods_phone
}
}, [orderDetail])
@@ -135,6 +145,8 @@ import styles from './index.module.scss'
setShowDesc(() => false)
}, [])
const noCanOpenDescList = useRef([
SaleOrderStatusTaking.value, //提货中
SaleOrderStatusWaitingDelivery.value, //待发货
SaleOrderStatusWaitingReceipt.value, // 待收货
SaleOrderStatusAlreadyReceipt.value, // 已收货
SaleOrderStatusComplete.value, // 已完成
@@ -142,7 +154,7 @@ import styles from './index.module.scss'
SaleOrderStatusCancel.value, // 已取消
])
const descOpen = () => {
if(noCanOpenDescList.current.includes(orderDetail?.status)) return false
if(noCanOpenDescList.current.includes(orderDetail?.status)) return alert.none('该订单状态不能修改备注')
setShowDesc(() => true)
}
@@ -167,7 +179,6 @@ import styles from './index.module.scss'
//获取底部按钮点击, 获取按钮状态
const orderStateClick = useCallback((val) => {
console.log('123456789',val)
if(val == 1 || val == 6) {
//取消订单
getSaleOrderPreView()
src/pages/salesAfter/components/addressInfoDetail/index.tsx
+1 -1
View File
@@ -7,7 +7,7 @@ import styles from './index.module.scss'
type Param = {
return_address?:string,
return_phone?: string,
onLogistics?: (val: number) => void,
onLogistics?: (val: 1|2) => void, //1 上传物流 2 查看物流
stage?: number,
}
export default memo(({return_address = '', return_phone = '', onLogistics, stage}:Param) => {
src/pages/salesAfter/components/kindList/index.tsx
+1 -1
View File
@@ -118,7 +118,7 @@ export default memo(({order, comfirm = false}:Param) => {
cut_value: [ReturnStageReturned.value],
model_value: [ReturnStageReturned.value],
label:'退款去向',
field: 'actual_amount'
field: 'refund_flow_name'
},
]
src/pages/salesAfter/components/returnLogistics/index.tsx
+7 -6
View File
@@ -14,8 +14,9 @@ type Param = {
id?: number, //订单id
images: string[], //图片列表
descValue?: string, //描述
onlyRead?: false|true //true 只读
}
export default memo(({show = false, onClose, onSubmit, id = 0, images = [], descValue = ''}: Param) => {
export default memo(({show = false, onClose, onSubmit, id = 0, images = [], descValue = '', onlyRead = false}: Param) => {
//需要提交的数据
const submitData = useRef({
accessory_url: [],
@@ -52,20 +53,20 @@ export default memo(({show = false, onClose, onSubmit, id = 0, images = [], desc
return (
<>
<Popup show={show} title="上传物流" onClose={onClose}>
<Popup show={show} title={onlyRead?'查看物流':"上传物流"} onClose={onClose}>
<View className={styles.logistics_main}>
<View className={styles.logistics_image}>
<Text className={styles.title_desc}>上传附件：</Text>
<View className={styles.upload_image}>
<UploadImage onChange={getImageList} defaultList={images}/>
<UploadImage onChange={getImageList} defaultList={images} onlyRead={onlyRead}/>
</View>
</View>
<View className={styles.logistics_desc}>
<TextareaEnhance defaultValue={descValue} onChange={getOtherReason} title="备注：" placeholder="请输入备注信息"/>
<TextareaEnhance defaultValue={descValue} onChange={getOtherReason} title="备注：" onlyRead={onlyRead} placeholder="请输入备注信息"/>
</View>
<View className={styles.btns_two}>
{!onlyRead&&<View className={styles.btns_two}>
<View className={styles.verify_btn } onClick={() => onSubmitEven()}>保存</View>
</View >
</View >}
</View>
</Popup>
</>
src/pages/salesAfter/index.tsx
+23 -16
View File
@@ -4,6 +4,7 @@ import { AFTER_ORDER_STATUS, ORDER_STATUS } from "@/common/enum";
import { formatDateTime, formatImgUrl, formatPriceDiv } from "@/common/fotmat";
import AfterOrderBtns from "@/components/afterOrderBtns";
import SearchInput from "@/components/searchInput";
import useLogin from "@/use/useLogin";
import { Image, Text, Textarea, View } from "@tarojs/components"
import Taro, {useDidShow, usePullDownRefresh, useRouter } from "@tarojs/taro";
import classnames from "classnames";
@@ -17,7 +18,7 @@ import ReturnLogistics from "./components/returnLogistics";
import styles from './index.module.scss'
export default () => {
useLogin()
const router = useRouter()
const orderId = useRef<number>(Number(router.params.id))
useDidShow(() => {
@@ -63,7 +64,8 @@ import styles from './index.module.scss'
other_deduction_amount: orderDetail.other_deduction_amount, //其他扣除金额
total_refund_amount: orderDetail.total_refund_amount, //合计金额
refund_amount: orderDetail.refund_amount, //退款金额
refund_type: orderDetail.refund_type //退款状态
refund_type: orderDetail.refund_type, //退款状态
refund_flow_name: orderDetail.refund_flow_name //退款去向
})
}
@@ -74,7 +76,9 @@ import styles from './index.module.scss'
//获取底部按钮点击, 获取按钮状态
const orderStateClick = useCallback((val) => {
if(val == 8) {
if(val == 1 || val == 6) {
getSaleOrderPreView()
} else if(val == 8) {
//申请记录
setApplyRecord(true)
}
@@ -105,19 +109,22 @@ import styles from './index.module.scss'
//物流显示
const [logisticsShow, setLogisticsShow] = useState(false)
const [logistics, setLogistics] = useState(false)
const onShowLogistics = useCallback((val) => {
if(val == 1) {
setLogisticsShow(true)
} else {
const list = orderDetail?.accessory_url.map(item => {
return formatImgUrl(item)
})
Taro.previewImage({
current: list[0], // 当前显示
urls: list // 需要预览的图片http链接列表
})
}
}, [orderDetail])
setLogisticsShow(true)
if(val != 1) setLogistics(true)
// if(val == 1) {
// setLogisticsShow(true)
// } else {
// const list = orderDetail?.accessory_url.map(item => {
// return formatImgUrl(item)
// })
// Taro.previewImage({
// current: list[0], // 当前显示
// urls: list // 需要预览的图片http链接列表
// })
// }
}, [])
const onCloseLogistics = useCallback(() => {
setLogisticsShow(false)
}, [])
@@ -139,7 +146,7 @@ import styles from './index.module.scss'
<OrderDes orderInfo={orderDetail}/>
<AfterOrderBtns orderInfo={orderInfo} onClick={orderStateClick}/>
<AfterSalePricture urls={orderDetail?.fabric_piece_accessory_url}/>
<ReturnLogistics images={orderDetail?.accessory_url} descValue={orderDetail?.take_goods_remark} show={logisticsShow} id={orderDetail?.return_apply_order_id} onClose={onCloseLogistics} onSubmit={logisticsSuccess}/>
<ReturnLogistics onlyRead={logistics} images={orderDetail?.accessory_url} descValue={orderDetail?.take_goods_remark} show={logisticsShow} id={orderDetail?.return_apply_order_id} onClose={onCloseLogistics} onSubmit={logisticsSuccess}/>
<ApplyRecord show={applyRecord} id={orderDetail?.id} onClose={() => setApplyRecord(false)}/>
<View className="common_safe_area_y"></View>
</View>
src/pages/salesAfterList/components/order/index.tsx
+9 -4
View File
@@ -1,4 +1,5 @@
import { goLink } from "@/common/common";
import { REFUND_STATUS_ORDER } from "@/common/enum";
import { formatHashTag, formatImgUrl, formatPriceDiv } from "@/common/fotmat";
import AfterOrderBtns from "@/components/afterOrderBtns";
import LabAndImg from "@/components/LabAndImg";
@@ -26,7 +27,7 @@ type Param = {
lab: {l:number, a:number, b:number},
rgb: {r:number, g:number, b:number},
texturl_url: string,
type: number //1 退货 2退款
type: number //2 退货 1 预收退款 3 销售
return_apply_order_id: number //退款申请单
},
onClickBtn?: (val:{status:number, orderInfo:Param['value']}) => void
@@ -63,6 +64,10 @@ export default memo(({value, onClickBtn}: Param) => {
return {lab:{...value?.lab}, rgb:{...value?.rgb}, texturl_url: value?.texturl_url}
}, [value])
const {
ReturnApplyOrderTypeReturnForRefund, // 退货退款
} = REFUND_STATUS_ORDER
return (
<View className={styles.order_item}>
<View className={styles.header} onClick={() => goLink('/pages/salesAfter/index', {id: value?.id})}>
@@ -71,8 +76,8 @@ export default memo(({value, onClickBtn}: Param) => {
<Text className={styles.name}>{userInfo?.adminUserInfo?.user_name}</Text>
</View>
<View className={styles.order_num}>
<Text>售后单号：{value?.return_order_no}</Text>
<Text className={classnames(styles.miconfont, 'iconfont, icon-a-moreback')}></Text>
<Text>售后单号：{value?.return_order_no}</Text>
<Text className={classnames(styles.miconfont, 'iconfont, icon-a-moreback')}></Text>
</View>
<OrderStatusTag status={value?.type}/>
</View>
@@ -107,7 +112,7 @@ export default memo(({value, onClickBtn}: Param) => {
</View>
<View className={styles.color_count_num}>{`${value?.total_fabrics}种面料，${value?.total_colors}种颜色，共${value?.total_number}条`}</View>
<View className={styles.order_number}>
<Text>{value?.type == 1?'已申请退货':'已申请退款'}</Text>
<Text>{value?.type == ReturnApplyOrderTypeReturnForRefund.value?'已申请退货':'已申请退款'}</Text>
<Text>订单号：{value?.order_no}</Text>
</View>
</View>
src/pages/salesAfterList/components/orderStatusTag/index.tsx
+9 -3
View File
@@ -2,17 +2,23 @@ import { Text, View } from "@tarojs/components"
import { memo } from "react"
import classnames from "classnames";
import styles from './index.module.scss'
import { REFUND_STATUS_ORDER } from "@/common/enum";
type Param = {
status?: number //0默认不处理, 1退货，2退款
status?: number
}
export default memo(({status = 0}:Param) => {
const {
ReturnApplyOrderTypeAdvanceReceiptRefund, // 预收退款
ReturnApplyOrderTypeReturnForRefund, // 退货退款
ReturnApplyOrderTypeSalesRefund // 销售退款
} = REFUND_STATUS_ORDER
return (
<>
{(status !== 0)&&<View className={classnames(styles.tag, status == 2?styles.refund_tag :styles.saleReturn_tag)}>
{(status !== 0)&&<View className={classnames(styles.tag, status != ReturnApplyOrderTypeReturnForRefund.value?styles.refund_tag :styles.saleReturn_tag)}>
<View className={classnames(styles.miconfont, 'iconfont icon-yucunkuan')}></View>
<Text>{ status == 1?'退货':'退款'}</Text>
<Text>{ status == ReturnApplyOrderTypeReturnForRefund.value?'退货':'退款'}</Text>
</View>}
</>
)
src/pages/salesAfterList/index.tsx
+5 -6
View File
@@ -14,9 +14,9 @@ import { GetSaleOrderListApi, RefundOrderSatausApi } from "@/api/salesAfterOrder
import ReturnLogistics from "./components/returnLogistics"
export default () => {
const {checkLogin} = useLogin()
useDidShow(async () => {
await checkLogin()
useLogin()
useDidShow(() => {
getOrderList()
})
//搜索参数
@@ -94,9 +94,8 @@ export default () => {
//监听点击的按钮
const clickOrderBtn = useCallback(({status, orderInfo}) => {
if(status == 2) {
//退货物流
if(status == 1 || status == 6) {
getOrderList()
}
}, [orderData])
src/pages/search/index.tsx
+2
View File
@@ -5,8 +5,10 @@ import { goLink } from '@/common/common';
import classnames from "classnames";
import styles from './index.module.scss'
import { useEffect } from 'react';
import useLogin from '@/use/useLogin';
export default () => {
useLogin()
return (
<View className={styles.main}>
<View className={styles.search}>
src/pages/searchList/hightSearchList.tsx
+1 -4
View File
@@ -20,10 +20,7 @@ import SelectData, {ListProps} from "./components/selectData";
import LabAndImg from "@/components/LabAndImg";
export default () => {
const {checkLogin} = useLogin()
useDidShow(async () => {
await checkLogin()
})
useLogin()
const [showFilter, setShowFilter] = useState(false)
src/pages/searchList/search.tsx
+1 -4
View File
@@ -12,10 +12,7 @@ import Taro, { useDidShow, useShareAppMessage } from '@tarojs/taro';
type searchDataParam = {'search_key':''}
export default () => {
const {checkLogin} = useLogin()
useDidShow(async () => {
await checkLogin()
})
useLogin()
const [searchData, setSearchData] = useState<{hotField: searchDataParam[], historyField: searchDataParam[]}>({
hotField: [],
src/pages/searchList/searchList.tsx
+1 -4
View File
@@ -16,10 +16,7 @@ import useLogin from "@/use/useLogin";
import LabAndImg from "@/components/LabAndImg";
export default () => {
const {checkLogin} = useLogin()
useDidShow(async () => {
await checkLogin()
})
useLogin()
const [showFilter, setShowFilter] = useState(false)
const router = useRouter()
src/pages/user/index.tsx
+48 -35
View File
@@ -10,7 +10,17 @@ import Taro from "@tarojs/taro";
import { userassets, userorderStatistics } from "@/api/mine"
import { formatPriceDiv } from "@/common/fotmat"
import { useDidShow, } from '@tarojs/taro'
import { GetAdminUserInfoApi } from "@/api/user";
export default () => {
//重新获取用户信息
const {fetchData: useFetchData} = GetAdminUserInfoApi()
const [userDataAgain, setUserDataAgain] = useState<any>({})
const getUserData = async () => {
let res = await useFetchData()
setUserDataAgain(res.data)
}
// 用户信息
const { getSelfUserInfo } = useLogin();
const { adminUserInfo } = useSelector(state => state.userInfo);
@@ -31,6 +41,7 @@ export default () => {
}, [])
useDidShow(() => {
ApigetTotal()
getUserData()
})
const checkGo = () => {
if (adminUserInfo?.authentication_status === 0 || adminUserInfo?.authentication_status === 1 || adminUserInfo?.authentication_status === 2 || adminUserInfo?.authentication_status === 3) {
@@ -55,13 +66,13 @@ export default () => {
}
return (
<View className={styles.main}>
<Header data={adminUserInfo} MenuData={stateData} />
<Assets data={state} checkShow={() => checkGo()} />
<Header data={userDataAgain} MenuData={stateData} />
<Assets data={state} checkShow={() => checkGo()} userInfo={userDataAgain}/>
<Main />
{/* {(adminUserInfo as any)?.authentication_status==1&&<Modal data={adminUserInfo}/>} */}
{/* 测试暂时添加 */}
<View style={{ fontSize: '26rpx', textAlign: 'center' }}>{BASE_URL}</View>
{!adminUserInfo.is_authorize_name && <View onClick={handleAuth} className={styles["auth-suspension"]}></View>}
{!userDataAgain?.is_authorize_name && <View onClick={handleAuth} className={styles["auth-suspension"]}></View>}
</View>
)
}
@@ -143,7 +154,7 @@ const Header = memo((props: any) => {
</View>
</View>
<View className={styles['auth']}>
{(data?.authentication_status == 0 || data?.authentication_status == 1) &&
{((data?.authentication_status == 0 || data?.authentication_status == 1) && data?.order_access_status == 3) &&
<View className={styles['auth-box']} onClick={() => navTo()}>
<View className={styles['auth-left-box']}>
<View className={styles['auth-tag']}>
@@ -156,7 +167,7 @@ const Header = memo((props: any) => {
<Text className="iconfont icon-a-moreback"></Text>
</View>
}
{(data?.authentication_status == 3) &&
{(data?.authentication_status == 3 && data?.order_access_status == 3) &&
<View className={styles['auth-box']} onClick={() => navTo()}>
<View className={styles['auth-left-box']}>
<View className={styles['auth-tagthree']}>
@@ -169,7 +180,7 @@ const Header = memo((props: any) => {
<Text className="iconfont icon-a-moreback"></Text>
</View>
}
{data?.authentication_status == 2 &&
{(data?.authentication_status == 2 && data?.order_access_status == 3) &&
<View className={styles['auth-box']} onClick={() => navTo()}>
<View className={styles['auth-left-box']}>
<View className={styles['auth-tagone']}>
@@ -182,7 +193,7 @@ const Header = memo((props: any) => {
<Text className="iconfont icon-a-moreback"></Text>
</View>
}
{data?.authentication_status == 4 &&
{(data?.authentication_status == 4 && data?.order_access_status == 3) &&
<View className={styles['auth-box']} onClick={() => navTo()}>
<View className={styles['auth-left-box']}>
<View className={styles['auth-tagtwo']}>
@@ -274,34 +285,36 @@ const Header = memo((props: any) => {
// 我的资产
const Assets = (props: any) => {
return (
<View className={`${styles.assets} ${styles.crad} ${styles['main-card']}`}>
<View className={`${styles['assets-title']}`}>我的资产</View>
<View className={`${styles['assets-content']}`}>
<Navigator hoverClass="none" url="/pages/depositBeforehand/index">
<View className={`${styles['assets-content-item-top']}`}>
<Text className={`${styles['assets-content-item-top-before']}`}>¥</Text>
<Text className={`${styles['assets-content-item-top-content']}`}>{formatPriceDiv(props.data.data.wallet_money || 0)}</Text>
{/* <Text className={`${styles['assets-content-item-top-after']}`}>{props.wallet_money || 0}</Text> */}
</View>
<Text className={`${styles['assets-content-item-tips']}`}>预存款</Text>
</Navigator>
{/* <View>
<View className={`${styles['assets-content-item-top']}`}>
<Text className={`${styles['assets-content-item-top-content']}`}>{props.data.data.coupon_count || 0}</Text>
<Text className={`${styles['assets-content-item-top-after']}`}>张</Text>
</View>
<Text className={`${styles['assets-content-item-tips']}`}>优惠券</Text>
</View> */}
<Navigator hoverClass="none" onClick={() => props.checkShow()}>
<View className={`${styles['assets-content-item-top']}`} >
<Text className={`${styles['assets-content-item-top-before']}`}>¥</Text>
<Text className={`${styles['assets-content-item-top-content']}`}>{formatPriceDiv(props.data.data.credit_line || 0)}</Text>
{/* <Text className={`${styles['assets-content-item-top-after']}`}>.-00</Text> */}
</View>
<Text className={`${styles['assets-content-item-tips']}`}>授信额度</Text>
</Navigator>
</View>
</View>
<>
{(props.userInfo.order_access_status == 3) &&<View className={`${styles.assets} ${styles.crad} ${styles['main-card']}`}>
<View className={`${styles['assets-title']}`}>我的资产</View>
<View className={`${styles['assets-content']}`}>
<Navigator hoverClass="none" url="/pages/depositBeforehand/index">
<View className={`${styles['assets-content-item-top']}`}>
<Text className={`${styles['assets-content-item-top-before']}`}>¥</Text>
<Text className={`${styles['assets-content-item-top-content']}`}>{formatPriceDiv(props.data.data.wallet_money || 0)}</Text>
{/* <Text className={`${styles['assets-content-item-top-after']}`}>{props.wallet_money || 0}</Text> */}
</View>
<Text className={`${styles['assets-content-item-tips']}`}>预存款</Text>
</Navigator>
{/* <View>
<View className={`${styles['assets-content-item-top']}`}>
<Text className={`${styles['assets-content-item-top-content']}`}>{props.data.data.coupon_count || 0}</Text>
<Text className={`${styles['assets-content-item-top-after']}`}>张</Text>
</View>
<Text className={`${styles['assets-content-item-tips']}`}>优惠券</Text>
</View> */}
<Navigator hoverClass="none" onClick={() => props.checkShow()}>
<View className={`${styles['assets-content-item-top']}`} >
<Text className={`${styles['assets-content-item-top-before']}`}>¥</Text>
<Text className={`${styles['assets-content-item-top-content']}`}>{formatPriceDiv(props.data.data.credit_line || 0)}</Text>
{/* <Text className={`${styles['assets-content-item-top-after']}`}>.-00</Text> */}
</View>
<Text className={`${styles['assets-content-item-tips']}`}>授信额度</Text>
</Navigator>
</View>
</View>||<View className={styles['main-card']}></View>}
</>
)
};
src/pages/weightList/index.tsx
+2
View File
@@ -5,7 +5,9 @@ import {weightListApi,weightDeleteApi} from "@/api/weightList"
import "./index.scss"
import Taro, { showModal } from "@tarojs/taro"
import { alert } from "@/common/common"
import useLogin from "@/use/useLogin"
const weightListManager = ()=>{
useLogin()
return(
<View className="weight-list-manager">
<WeightList />
src/pages/weightListAdd/index.tsx
+2
View File
@@ -6,8 +6,10 @@ import {weightAddApi, weightDetailApi,weightEditApi} from "@/api/weightList"
import { useEffect, useState } from "react"
import { alert, retrieval } from "@/common/common"
import "./index.scss"
import useLogin from "@/use/useLogin"
export default ()=>{
useLogin()
const {type,id} = useRouter().params;
useEffect(()=>{
if(type=="add"){