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

订单售后v2

Browse Source
This commit is contained in:
czm 2022-06-10 10:18:56 +08:00
parent 30efe70995
commit 46357615e9
8 changed files with 55 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/constant.js
View File

@ -9,8 +9,8 @@
// 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:50002/lymarket` // 添
// export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞
export const BASE_URL = `http://192.168.1.224:50001/lymarket` // 添
// export const BASE_URL = `http://192.168.1.15:50001/lymarket` // 杰
// CDN

16
src/components/orderBtns/index.module.scss
View File

@ -2,13 +2,23 @@
display: flex;
justify-content: flex-end;
// margin-top: 30px;
.scroll{
white-space: nowrap;
width: 100%;
}
.list_scroll{
white-space: nowrap;
width: 100%;
display: flex;
justify-content: flex-end;
}
.btns_item{
width: 152px;
height: 72px;
padding: 0 10px;
height: 60px;
border: 2px solid #dddddd;
border-radius: 38px;
text-align: center;
line-height: 72px;
line-height: 60px;
font-size: $font_size;
color: $color_font_three;
&:nth-child(n+2) {

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

@ -3,7 +3,7 @@ import { alert } from "@/common/common"
import { ORDER_STATUS } from "@/common/enum"
import { ScrollView, View } from "@tarojs/components"
import Taro from "@tarojs/taro"
import { useCallback, useRef, memo } from "react"
import { useCallback, useRef, memo, useState, useEffect } from "react"
import styles from './index.module.scss'
type Param = {
@ -72,24 +72,27 @@ export default memo(({orderInfo, onClick}:Param) => {
if(orderInfo) {
if(item.id == 1) {
//取消订单按钮
return( orderInfo.actual_amount == 0 && item.value.includes(orderInfo.status)) //在代发货之前没有付过款
return( orderInfo.actual_amount == 0 && item.value.includes(orderInfo.status)) //在待发货之前没有付过款
} else if (item.id == 2) {
//去付款按钮
return( orderInfo.wait_pay_amount != 0 && item.value.includes(orderInfo.status)) //只要没有付完款就显示
} else if(item.id == 3) {
//申请退款
return (orderInfo.actual_amount != 0 && item.value.includes(orderInfo.status)) //在代发货之前付过款
return (orderInfo.actual_amount != 0 && item.value.includes(orderInfo.status)) //在待发货之前付过款
} else {
//其他按钮
return item.value.includes(orderInfo.status)
}
}
},[orderInfo])
//点击按钮操作
const submitBtns = (val) => {
const submitBtns = (val, index) => {
clickEvent(val, index);
(val == 1)&&cancelOrder(); //取消订单按钮
(val == 2)&&onClick?.(val); //去付款按钮
(val == 2)&&onClick?.(2); //去付款按钮
(val == 6)&&receiveOrder(); //确认收货
}
//取消订单
@ -136,12 +139,28 @@ export default memo(({orderInfo, onClick}:Param) => {
}
//按钮点击滚动
const [selectInfo, setSelectInfo] = useState({
selected: -1, //当前选中的id
tabId: '', //需要滚动到的id
})
const clickEvent = (id, index) => {
console.log(id, index)
const num = index > 0?( index - 1) : 0
console.log('num::',orderBtnsList.current[num].id)
setSelectInfo((e) => ({...e, tabId:orderBtnsList.current[num].id.toString(), selected: id}))
}
return (
<View className={styles.btns_list}>
<ScrollView scrollX >
{orderBtnsList.current.map((item) =>
orderBtnsShow(item)&&<View key={item.id} className={styles.btns_item} onClick={() => submitBtns(item.id)}>{item.label}</View>
)}
<ScrollView scrollX scrollIntoView={`orderBtns_${selectInfo.tabId}`} scrollWithAnimation={true} className={styles.scroll}>
<View className={styles.list_scroll}>
{orderBtnsList.current.map((item, index) =>
orderBtnsShow(item)&&<View key={item.id} className={styles.btns_item} onClick={() => submitBtns(item.id, index)}>{item.label}</View>
// <View key={item.id} id={`orderBtns_${item.id}`} className={styles.btns_item} onClick={() => submitBtns(item.id, index)}>{item.label}</View>
)}
</View>
</ScrollView>
</View>

1
src/pages/order/components/addressInfoDetail/index.tsx
View File

@ -117,7 +117,6 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, defaultValue =
<View className={styles.addressList_con}>
<AddressList onSelect={getAddress}/>
</View>
<View className="common_safe_area_y"></View>
</View>
</Popup>
</View>

6
src/pages/order/index.tsx
View File

@ -142,12 +142,10 @@ import styles from './index.module.scss'
//获取底部按钮点击, 获取按钮状态
const orderStateClick = useCallback((val) => {
console.log('val::', val)
if(val == 1) {
if(val == 1 || val == 6) {
//取消订单
getSaleOrderPreView()
}
if(val == 2) {
}else if(val == 2) {
//待付款
toPay()
}

3
src/pages/orderList/components/order/index.module.scss
View File

@ -42,6 +42,9 @@
border-radius: 0px 20px 0px 20px;
}
}
.product_con{
margin-bottom: 20px;
}
.product_title{
display: flex;
align-items: center;

5
src/pages/orderList/index.tsx
View File

@ -96,7 +96,10 @@ export default () => {
//监听点击的按钮
const clickOrderBtn = useCallback(({status, orderInfo}) => {
if(status == 2) {
console.log('status:::', status)
if(status == 1 || status == 6) {
getOrderList()
} else if(status == 2) {
//去支付
setPayOrderInfo({orderId:orderInfo.should_collect_order_id, payment_method:orderInfo.payment_method})
toPay()

6
src/use/useLogin.ts
View File

@ -24,9 +24,9 @@ export default () => {
//获取用户信息
const {fetchData: useFetchData} = GetAdminUserInfoApi()
const getAdminUserInfo = async (params = {}) => {
const getAdminUserInfo = async () => {
let res = await useFetchData()
setAdminUserInfo({...res.data, ...params})
setAdminUserInfo({...res.data})
getShortCode(res.data.user_id)
}
@ -101,7 +101,7 @@ export default () => {
const res = await fetchDataUserPhone({code})
if(res.success) {
setUserInfo({...userInfo.userInfo, phone:res.data.phone_number})
getAdminUserInfo({phone:res.data.phone_number})
getAdminUserInfo()
reslove(res.data)
} else {
reject(res.msg)