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

商城测试版v8_1

Browse Source
This commit is contained in:
czm 2022-07-30 17:11:42 +08:00
parent e2b0b0c52b
commit 09e34ecabe
39 changed files with 3360 additions and 3274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
config/index.js
View File

@ -1,9 +1,14 @@
const path = require('path')
const childProcess = require('child_process');
const versions = childProcess.execSync('git rev-parse --abbrev-ref HEAD', { 'encoding': 'utf8' }) != "HEAD\n" ? childProcess.execSync('git rev-parse --abbrev-ref HEAD', { 'encoding': 'utf8' }) : childProcess.execSync('git describe --tags --abbrev=0', { 'encoding': 'utf8' })
const CURRENT_GITHASH = childProcess.execSync('git rev-parse --short HEAD', { 'encoding': 'utf8' })
const CURRENT_VERSION = `Version: ${JSON.stringify(process.env.CODE_BRANCH || versions)} ${CURRENT_GITHASH} ${new Date().toLocaleString()}`.replace(/\"|\\n/g, '');
const childProcess = require('child_process')
const versions =
childProcess.execSync('git rev-parse --abbrev-ref HEAD', { encoding: 'utf8' }) != 'HEAD\n'
? childProcess.execSync('git rev-parse --abbrev-ref HEAD', { encoding: 'utf8' })
: childProcess.execSync('git describe --tags --abbrev=0', { encoding: 'utf8' })
const CURRENT_GITHASH = childProcess.execSync('git rev-parse --short HEAD', { encoding: 'utf8' })
const CURRENT_VERSION = `Version: ${JSON.stringify(process.env.CODE_BRANCH || versions)} ${CURRENT_GITHASH} ${new Date().toLocaleString()}`.replace(
/\"|\\n/g,
'',
)
const config = {
projectName: 'EShop',
@ -12,7 +17,7 @@ const config = {
deviceRatio: {
640: 2.34 / 2,
750: 1,
828: 1.81 / 2
828: 1.81 / 2,
},
sourceRoot: 'src',
outputRoot: 'dist',
@ -20,37 +25,33 @@ const config = {
defineConstants: {
CURRENT_VERSION: JSON.stringify(CURRENT_VERSION),
CURRENT_GITHASH: JSON.stringify(CURRENT_GITHASH),
CURRENT_ENV: JSON.stringify(process.env.NODE_ENV)
CURRENT_ENV: JSON.stringify(process.env.NODE_ENV),
},
copy: {
patterns: [
],
options: {
}
patterns: [],
options: {},
},
framework: 'react',
mini: {
postcss: {
pxtransform: {
enable: true,
config: {
}
config: {},
},
url: {
enable: true,
config: {
limit: 1024 // 设定转换尺寸上限
}
limit: 1024, // 设定转换尺寸上限
},
},
cssModules: {
enable: true, // 默认为 false，如需使用 css modules 功能，则设为 true
config: {
namingPattern: 'module', // 转换模式，取值为 global/module
generateScopedName: '[name]__[local]___[hash:base64:5]'
}
}
}
generateScopedName: '[name]__[local]___[hash:base64:5]',
},
},
},
},
h5: {
publicPath: '/',
@ -58,23 +59,25 @@ const config = {
postcss: {
autoprefixer: {
enable: true,
config: {
}
config: {},
},
cssModules: {
enable: false, // 默认为 false，如需使用 css modules 功能，则设为 true
config: {
namingPattern: 'module', // 转换模式，取值为 global/module
generateScopedName: '[name]__[local]___[hash:base64:5]'
}
}
}
}
generateScopedName: '[name]__[local]___[hash:base64:5]',
},
},
},
},
}
module.exports = function (merge) {
if (process.env.NODE_ENV === 'development') {
return merge({}, config, require('./dev'))
}
if (process.env.NODE_ENV === 'pre') {
return merge({}, config, require('./pre'))
}
return merge({}, config, require('./prod'))
}

51
config/pre.js Normal file
View File

@ -0,0 +1,51 @@
const path = require('path')
module.exports = {
env: {
NODE_ENV: '"pre"',
},
outputRoot: 'pre_dis',
defineConstants: {},
mini: {
optimizeMainPackage: {
enable: true,
},
webpackChain: (chain, webpack) => {
chain.merge({
plugin: {
install: {
plugin: require('terser-webpack-plugin'),
args: [
{
terserOptions: {
// compress: true, // 默认使用terser压缩
compress: {
drop_console: true, // 去掉打印
}, // 默认使用terser压缩
// mangle: false,
keep_classnames: true, // 不改变class名称
keep_fnames: true, // 不改变函数名称
},
},
],
},
},
})
},
},
h5: {
/**
* 如果h5端编译后体积过大，可以使用webpack-bundle-analyzer插件对打包体积进行分析。
* 参考代码如下：
* webpackChain (chain) {
* chain.plugin('analyzer')
* .use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin, [])
* }
*/
},
alias: {
'@': path.resolve(__dirname, '..', 'src'),
},
sass: {
resource: path.resolve(__dirname, '..', 'src/styles/common.scss'),
},
}

28
config/prod.js
View File

@ -1,20 +1,20 @@
const path = require('path')
module.exports = {
env: {
NODE_ENV: '"production"'
},
defineConstants: {
NODE_ENV: '"production"',
},
defineConstants: {},
mini: {
optimizeMainPackage: {
enable: true
enable: true,
},
webpackChain: (chain, webpack) => {
chain.merge({
plugin: {
install: {
plugin: require('terser-webpack-plugin'),
args: [{
args: [
{
terserOptions: {
// compress: true, // 默认使用terser压缩
compress: {
@ -22,14 +22,14 @@ module.exports = {
}, // 默认使用terser压缩
// mangle: false,
keep_classnames: true, // 不改变class名称
keep_fnames: true // 不改变函数名称
}
}]
}
}
keep_fnames: true, // 不改变函数名称
},
},
],
},
},
})
}
},
},
h5: {
/**
@ -45,6 +45,6 @@ module.exports = {
'@': path.resolve(__dirname, '..', 'src'),
},
sass: {
resource: path.resolve(__dirname, '..', 'src/styles/common.scss')
}
resource: path.resolve(__dirname, '..', 'src/styles/common.scss'),
},
}

12
src/api/addressManager.ts
View File

@ -1,4 +1,4 @@
import { useRequest } from "@/use/useHttp"
import { useRequest } from '@/use/useHttp'
/**
* 获取地址列表
@ -7,7 +7,7 @@ import { useRequest } from "@/use/useHttp"
export const addressListApi = () => {
return useRequest({
url: `/v1/mall/address/list`,
method: "get",
method: 'get',
})
}
@ -18,7 +18,7 @@ import { useRequest } from "@/use/useHttp"
export const addressAddApi = () => {
return useRequest({
url: `/v1/mall/address`,
method: "post",
method: 'post',
})
}
@ -29,7 +29,7 @@ import { useRequest } from "@/use/useHttp"
export const addressDetailApi = () => {
return useRequest({
url: `/v1/mall/address`,
method: "get",
method: 'get',
})
}
@ -40,7 +40,7 @@ import { useRequest } from "@/use/useHttp"
export const addressEditApi = () => {
return useRequest({
url: `/v1/mall/address`,
method: "put",
method: 'put',
})
}
@ -51,6 +51,6 @@ import { useRequest } from "@/use/useHttp"
export const addressDeleteApi = () => {
return useRequest({
url: `/v1/mall/address`,
method: "delete",
method: 'delete',
})
}

4
src/api/banner.ts
View File

@ -1,4 +1,4 @@
import { useRequest } from "@/use/useHttp"
import { useRequest } from '@/use/useHttp'
/**
* 获取轮播图列表
@ -7,6 +7,6 @@ import { useRequest } from "@/use/useHttp"
export const GetBannerList = () => {
return useRequest({
url: `/v1/mall/carouselBanner/list`,
method: "get",
method: 'get',
})
}

5
src/api/cdn.ts
View File

@ -1,5 +1,4 @@
import { useRequest } from "@/use/useHttp"
import { useRequest } from '@/use/useHttp'
/**
* 获取cdn 签名/密钥
@ -8,6 +7,6 @@ import { useRequest } from "@/use/useHttp"
export const GetSignApi = () => {
return useRequest({
url: `/v1/mall/cdn/token`,
method: "get"
method: 'get',
})
}

6
src/api/company.ts
View File

@ -1,4 +1,4 @@
import { useRequest } from "@/use/useHttp"
import { useRequest } from '@/use/useHttp'
/**
* 公司获取
@ -7,7 +7,7 @@ import { useRequest } from "@/use/useHttp"
export const companyDetailApi = () => {
return useRequest({
url: `/v1/mall/company/info`,
method: "get",
method: 'get',
})
}
@ -18,6 +18,6 @@ import { useRequest } from "@/use/useHttp"
export const companyUpdateApi = () => {
return useRequest({
url: `/v1/mall/company/info`,
method: "put",
method: 'put',
})
}

6
src/api/creditLine.ts
View File

@ -1,4 +1,4 @@
import { useRequest } from "@/use/useHttp"
import { useRequest } from '@/use/useHttp'
/**
* 额度获取
@ -7,7 +7,7 @@ import { useRequest } from "@/use/useHttp"
export const creditInfoApi = () => {
return useRequest({
url: `/v1/mall/credit`,
method: "get",
method: 'get',
})
}
@ -18,6 +18,6 @@ import { useRequest } from "@/use/useHttp"
export const creditListApi = () => {
return useRequest({
url: `/v1/mall/credit/list`,
method: "get",
method: 'get',
})
}

8
src/api/deposit.ts
View File

@ -1,4 +1,4 @@
import { useRequest } from "@/use/useHttp"
import { useRequest } from '@/use/useHttp'
/**
* 预存款信息获取
@ -7,7 +7,7 @@ import { useRequest } from "@/use/useHttp"
export const depositInfoApi = () => {
return useRequest({
url: `/v1/mall/rechargeApplication`,
method: "get",
method: 'get',
})
}
@ -18,7 +18,7 @@ import { useRequest } from "@/use/useHttp"
export const depositListApi = () => {
return useRequest({
url: `/v1/mall/rechargeApplication/list`,
method: "get",
method: 'get',
})
}
@ -29,6 +29,6 @@ import { useRequest } from "@/use/useHttp"
export const depositDetailApi = () => {
return useRequest({
url: `/v1/mall/rechargeApplication/order`,
method: "get",
method: 'get',
})
}

20
src/api/favorite.ts
View File

@ -1,4 +1,4 @@
import { useRequest } from "@/use/useHttp"
import { useRequest } from '@/use/useHttp'
/**
* 获取收藏夹列表
@ -7,11 +7,10 @@ import { useRequest } from "@/use/useHttp"
export const FavoriteListApi = () => {
return useRequest({
url: `/v1/mall/favorite/list`,
method: "get",
method: 'get',
})
}
/**
* 创建收藏夹列表
* @returns
@ -19,11 +18,10 @@ export const FavoriteListApi = () => {
export const CreateFavoriteApi = () => {
return useRequest({
url: `/v1/mall/favorite`,
method: "post",
method: 'post',
})
}
/**
* 删除收藏夹列表
* @returns
@ -31,7 +29,7 @@ export const CreateFavoriteApi = () => {
export const DelFavoriteApi = () => {
return useRequest({
url: `/v1/mall/favorite`,
method: "delete",
method: 'delete',
})
}
@ -42,7 +40,7 @@ export const DelFavoriteApi = () => {
export const UpdateFavoriteApi = () => {
return useRequest({
url: `/v1/mall/favorite`,
method: "put",
method: 'put',
})
}
@ -53,7 +51,7 @@ export const UpdateFavoriteApi = () => {
export const AddFavoriteApi = () => {
return useRequest({
url: `/v1/mall/favorite/product`,
method: "post",
method: 'post',
})
}
@ -64,7 +62,7 @@ export const AddFavoriteApi = () => {
export const DelFavoriteProductApi = () => {
return useRequest({
url: `/v1/mall/favorite/product`,
method: "delete",
method: 'delete',
})
}
@ -75,7 +73,7 @@ export const DelFavoriteProductApi = () => {
export const DetailFavoriteProductApi = () => {
return useRequest({
url: `/v1/mall/favorite`,
method: "get",
method: 'get',
})
}
@ -86,6 +84,6 @@ export const DetailFavoriteProductApi = () => {
export const MoveFavoriteProductApi = () => {
return useRequest({
url: `/v1/mall/favorite/product`,
method: "put",
method: 'put',
})
}

4
src/api/login.ts
View File

@ -1,4 +1,4 @@
import { useRequest } from "@/use/useHttp"
import { useRequest } from '@/use/useHttp'
/**
* 登录
@ -7,6 +7,6 @@ import { useRequest } from "@/use/useHttp"
export const LoginApi = () => {
return useRequest({
url: `/v1/mall/login`,
method: "post",
method: 'post',
})
}

25
src/api/order.ts
View File

@ -1,4 +1,4 @@
import { useRequest } from "@/use/useHttp"
import { useRequest } from '@/use/useHttp'
/**
* 下单现货销售单
@ -6,7 +6,7 @@ import { useRequest } from "@/use/useHttp"
export const SaleOrderApi = () => {
return useRequest({
url: `/v1/mall/saleOrder`,
method: "post",
method: 'post',
})
}
@ -16,7 +16,7 @@ export const SaleOrderApi = () => {
export const SaleOrderPreViewApi = () => {
return useRequest({
url: `/v1/mall/saleOrder/preView`,
method: "put",
method: 'put',
})
}
@ -26,18 +26,17 @@ export const SaleOrderApi = () => {
export const GetSaleOrderDetailApi = () => {
return useRequest({
url: `/v1/mall/saleOrder/detail`,
method: "get",
method: 'get',
})
}
/**
* 修改销售单备注
*/
export const EditSaleOrderRemarkApi = () => {
return useRequest({
url: `/v1/mall/saleOrder/remark`,
method: "put",
method: 'put',
})
}
@ -47,7 +46,7 @@ export const SaleOrderApi = () => {
export const EditSaleOrderAddressApi = () => {
return useRequest({
url: `/v1/mall/saleOrder/address`,
method: "put",
method: 'put',
})
}
@ -57,7 +56,7 @@ export const SaleOrderApi = () => {
export const EditSaleOrderShipmentModeApi = () => {
return useRequest({
url: `/v1/mall/saleOrder/shipmentMode`,
method: "put",
method: 'put',
})
}
@ -67,7 +66,7 @@ export const SaleOrderApi = () => {
export const GetOrderStatusListApi = () => {
return useRequest({
url: `/v1/mall/enum/sale/order/status`,
method: "get",
method: 'get',
})
}
@ -77,7 +76,7 @@ export const SaleOrderApi = () => {
export const GetOrderListApi = () => {
return useRequest({
url: `/v1/mall/saleOrder/list`,
method: "get",
method: 'get',
})
}
@ -87,7 +86,7 @@ export const SaleOrderApi = () => {
export const CancelOrderApi = () => {
return useRequest({
url: `/v1/mall/saleOrder/cancel`,
method: "put",
method: 'put',
})
}
@ -97,7 +96,7 @@ export const CancelOrderApi = () => {
export const ReceiveOrderApi = () => {
return useRequest({
url: `/v1/mall/saleOrder/receive`,
method: "put",
method: 'put',
})
}
@ -107,6 +106,6 @@ export const ReceiveOrderApi = () => {
export const OrderStatusListApi = () => {
return useRequest({
url: `/v1/mall/enum/filterSaleOrderStatus`,
method: "get",
method: 'get',
})
}

10
src/api/orderPay.ts
View File

@ -1,4 +1,4 @@
import { useRequest } from "@/use/useHttp"
import { useRequest } from '@/use/useHttp'
/**
* 获取应收单订单支付方式信息
@ -6,7 +6,7 @@ import { useRequest } from "@/use/useHttp"
export const GetOrderPayApi = () => {
return useRequest({
url: `/v1/mall/orderPayment/orderPaymentMethodInfo`,
method: "get",
method: 'get',
})
}
@ -16,7 +16,7 @@ import { useRequest } from "@/use/useHttp"
export const SubmitOrderPayApi = () => {
return useRequest({
url: `/v1/mall/orderPayment/orderPaymentSubmission`,
method: "put",
method: 'put',
})
}
@ -26,7 +26,7 @@ import { useRequest } from "@/use/useHttp"
export const GetPrepayOrderPayApi = () => {
return useRequest({
url: `/v1/mall/orderPayment/preCollectOrder/orderPaymentMethodInfo`,
method: "get",
method: 'get',
})
}
@ -36,6 +36,6 @@ import { useRequest } from "@/use/useHttp"
export const SubmitPrepayOrderPayApi = () => {
return useRequest({
url: `/v1/mall/orderPayment/preCollectOrder/orderPaymentSubmission`,
method: "put",
method: 'put',
})
}

10
src/api/shopCart.ts
View File

@ -1,4 +1,4 @@
import { useRequest } from "@/use/useHttp"
import { useRequest } from '@/use/useHttp'
/**
* 获取购物车列表
@ -7,7 +7,7 @@ import { useRequest } from "@/use/useHttp"
export const GetShoppingCartApi = () => {
return useRequest({
url: `/v1/mall/shoppingCart/productColor`,
method: "get",
method: 'get',
})
}
@ -18,7 +18,7 @@ export const GetShoppingCartApi = () => {
export const AddShoppingCartApi = () => {
return useRequest({
url: `/v1/mall/shoppingCart/productColor/list`,
method: "post",
method: 'post',
})
}
@ -29,7 +29,7 @@ export const AddShoppingCartApi = () => {
export const DelShoppingCartApi = () => {
return useRequest({
url: `/v1/mall/shoppingCart/productColor`,
method: "delete",
method: 'delete',
})
}
@ -40,6 +40,6 @@ export const DelShoppingCartApi = () => {
export const UpdateShoppingCartApi = () => {
return useRequest({
url: `/v1/mall/shoppingCart/productColor`,
method: "put",
method: 'put',
})
}

8
src/common/constant.js
View File

@ -21,15 +21,11 @@ export const UPLOAD_CDN_URL = `https://v0.api.upyun.com/`
// cdn
// export const IMG_CND_Prefix = CURRENT_ENV.includes('development')? "https://test.cdn.zzfzyc.com":"https://cdn.zzfzyc.com"
export const IMG_CND_Prefix = CURRENT_ENV.includes('development')
? 'https://test.cdn.zzfzyc.com'
: 'https://test.cdn.zzfzyc.com'
export const IMG_CND_Prefix = CURRENT_ENV.includes('development') ? 'https://test.cdn.zzfzyc.com' : 'https://test.cdn.zzfzyc.com'
//在线支付图片baseUrl
// export const CAP_HTML_TO_IMAGE_BASE_URL = CURRENT_ENV.includes('development')? "https://test.zzfzyc.com":"https://www.zzfzyc.com"
export const CAP_HTML_TO_IMAGE_BASE_URL = CURRENT_ENV.includes('development')
? 'https://test.zzfzyc.com'
: 'https://test.zzfzyc.com'
export const CAP_HTML_TO_IMAGE_BASE_URL = CURRENT_ENV.includes('development') ? 'https://test.zzfzyc.com' : 'https://test.zzfzyc.com'
// 上传图片视频
export const CDN_UPLOAD_IMG = `${UPLOAD_CDN_URL || ''}`

8
src/components/LabAndImg/index.module.scss
View File

@ -1,4 +1,3 @@
.labAndImg_main {
width: 100%;
height: 100%;
@ -6,13 +5,12 @@
width: 100%;
height: 100%;
border-radius: 20px;
border:1PX solid #818181;
border: 1px solid #818181;
box-sizing: border-box;
}
image{
.labAndImg_image {
width: 100%;
height: 100%;
border-radius: 20px;
border-radius: 20px !important;
}
}

33
src/components/LabAndImg/index.tsx
View File

@ -1,20 +1,20 @@
import { formatImgUrl, formatRemoveHashTag } from "@/common/fotmat";
import Preview from "@/pages/details/components/preview";
import { Image, View } from "@tarojs/components";
import { memo, useCallback, useEffect, useMemo, useState } from "react";
import { formatImgUrl, formatRemoveHashTag } from '@/common/fotmat'
import Preview from '@/pages/details/components/preview'
import { Image, View } from '@tarojs/components'
import { memo, useCallback, useEffect, useMemo, useState } from 'react'
import styles from './index.module.scss'
import Taro from "@tarojs/taro";
import LabAndImgShow from "../LabAndImgShow";
import Taro from '@tarojs/taro'
import LabAndImgShow from '../LabAndImgShow'
//该组件宽高为100%需调整外层元素宽高
type Param = {
value?: {
texture_url?: string, //纹理图路径
lab?: {l:number, a:number, b:number}, //lab
rgb?: {r:number, g:number, b:number} //rgb
texture_url?: string //纹理图路径
lab?: { l: number; a: number; b: number } //lab
rgb?: { r: number; g: number; b: number } //rgb
title?: string
},
showStatus?: true|false,
}
showStatus?: true | false
onClick?: (val: Param['value']) => void
}
export default memo(({ value, onClick, showStatus = false }: Param) => {
@ -23,7 +23,7 @@ export default memo(({value, onClick, showStatus = false}:Param) => {
//lab是否都是0
const rgbStyle = useMemo(() => {
if (value?.lab && (value.lab.l || value.lab.a || value.lab.b)) {
return {'backgroundColor':`rgb(${value.rgb?.r} ${value.rgb?.g} ${value.rgb?.b})`}
return { backgroundColor: `rgb(${value.rgb?.r} ${value.rgb?.g} ${value.rgb?.b})` }
} else {
return null
}
@ -31,7 +31,7 @@ export default memo(({value, onClick, showStatus = false}:Param) => {
useEffect(() => {
if (value?.texture_url) {
let res = value.texture_url.split(',').map(item => {
let res = value.texture_url.split(',').map((item) => {
return formatImgUrl(item)
})
setImgs(() => res)
@ -46,15 +46,14 @@ export default memo(({value, onClick, showStatus = false}:Param) => {
onClick?.(value)
if (!showStatus) return false
setLabAndImgShow(true)
}
return (
<>
<View className={styles.labAndImg_main} onClick={() => onShowLabAndImg()}>
{imgs?.length > 0&&<Image mode="aspectFill" src={imgs[0]}></Image>}
{(!imgs?.length&&rgbStyle)&&<View className={styles.boxColor} style={{...rgbStyle}}></View>}
{(!imgs?.length&&!rgbStyle)&&<Image mode="aspectFill" src={formatImgUrl('')}></Image>}
{imgs?.length > 0 && <Image mode='aspectFill' src={imgs[0]} className={styles.labAndImg_image}></Image>}
{!imgs?.length && rgbStyle && <View className={styles.boxColor} style={{ ...rgbStyle }}></View>}
{!imgs?.length && !rgbStyle && <Image mode='aspectFill' src={formatImgUrl('')} className={styles.labAndImg_image}></Image>}
</View>
<LabAndImgShow value={value} show={labAndImgShow} onClose={closeLabAndImgShow} />
</>

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

@ -1,35 +1,34 @@
import { GetAddressListApi } from "@/api/addressList";
import { addressListApi } from "@/api/addressManager";
import { EditSaleOrderAddressApi, EditSaleOrderShipmentModeApi } from "@/api/order";
import { alert, goLink } from "@/common/common";
import { ORDER_STATUS } from "@/common/enum";
import { debounce, throttle } 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, useEffect, useImperativeHandle, useMemo, useRef, useState } from "react";
import Taro from "@tarojs/taro";
import { GetAddressListApi } from '@/api/addressList'
import { addressListApi } from '@/api/addressManager'
import { EditSaleOrderAddressApi, EditSaleOrderShipmentModeApi } from '@/api/order'
import { alert, goLink } from '@/common/common'
import { ORDER_STATUS } from '@/common/enum'
import { debounce, throttle } 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, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react'
import Taro from '@tarojs/taro'
import styles from './index.module.scss'
type Param = {
onSelect?: (val:any) => void, //选择地址
disabled?: false|true, //true禁用后只用于展示
onChangeShipmentMode?: (val: number) => void, //返回收货方式
onLogistics?: () => void, //查看物流
status?: 1|2, //1确认订单时使用， 2订单流程
onSelect?: (val: any) => void //选择地址
disabled?: false | true //true禁用后只用于展示
onChangeShipmentMode?: (val: number) => void //返回收货方式
onLogistics?: () => void //查看物流
status?: 1 | 2 //1确认订单时使用， 2订单流程
orderInfo?: {
id?: number //订单id
shipment_mode?: 1|2, //1自提 2物流
shipment_mode?: 1 | 2 //1自提 2物流
status?: number //订单状态
province_name: string,
city_name: string,
district_name: string,
address_detail: string,
take_goods_address: string,
take_goods_phone: string,
target_user_name: string,
province_name: string
city_name: string
district_name: string
address_detail: string
take_goods_address: string
take_goods_phone: string
target_user_name: string
target_user_phone: string
}
}
@ -48,8 +47,8 @@ const {
SaleOrderStatusCancel,
} = ORDER_STATUS
export default memo(forwardRef(({onSelect, onChangeShipmentMode, orderInfo, status = 2, disabled = false, onLogistics}: Param, ref) => {
export default memo(
forwardRef(({ onSelect, onChangeShipmentMode, orderInfo, status = 2, disabled = false, onLogistics }: Param, ref) => {
const [addressInfo, setAddressInfo] = useState<any>()
useEffect(() => {
if (orderInfo) {
@ -61,13 +60,12 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, orderInfo, stat
//打开地址列表
const [showAddressList, setShowAddressList] = useState(false)
const changeShow = () => {
if(receivingStatus == 2 && !logisticsShow && limitEdit())
setShowAddressList(() => true)
if (receivingStatus == 2 && !logisticsShow && limitEdit()) setShowAddressList(() => true)
}
//把内部方法提供给外部
useImperativeHandle(ref, () => ({
changeShow
changeShow,
}))
//收货方法,1:自提，2物流
@ -76,7 +74,6 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, orderInfo, stat
const onReceivingStatus = async (value, e) => {
e.stopPropagation()
if (limitEdit()) changeReceivingStatus(value)
}
//当没有地址时获取地址列表中的第一个数据
@ -98,12 +95,10 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, orderInfo, stat
} else if (res.cancel) {
console.log('用户点击取消')
}
}
},
})
return false
}
}
const changeReceivingStatus = debounce(async (value) => {
@ -155,18 +150,13 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, orderInfo, stat
//根据订单状态判断是否可修改
const limitEdit = () => {
let res = [
SaleorderstatusWaitingPrePayment.value,
SaleOrderStatusBooking.value,
SaleOrderStatusArranging.value,
SaleOrderStatusArranged.value,
SaleOrderStatusWaitingPayment.value,
].includes(orderInfo?.status as number)
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
}
//根据订单状态判断是否显示物流
const logisticsShowList = [SaleOrderStatusWaitingReceipt.value, SaleOrderStatusAlreadyReceipt.value, SaleOrderStatusComplete.value, SaleOrderStatusRefund.value]
const logisticsShow = useMemo(() => {
@ -189,23 +179,31 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, orderInfo, stat
<View className={styles.order_address_text_con}>
<View className={styles.order_address_text_title}>
<Text className={classnames(styles.address_text, styles.address_text_no)}>{formatAddress || '请选择收货地址及信息'}</Text>
{(receivingStatus == 2 && !logisticsShow)&&<Text className={classnames(styles.moreIconfont,'iconfont icon-a-moreback')}></Text>}
{receivingStatus == 2 && !logisticsShow && <Text className={classnames(styles.moreIconfont, 'iconfont icon-a-moreback')}></Text>}
</View>
<View className={styles.order_address_text_name}>
<Text>{receivingStatus == 1?'管理员':addressInfo?.target_user_name}</Text>
<Text>{receivingStatus == 1 ? '谭先生' : addressInfo?.target_user_name}</Text>
<Text>{receivingStatus == 1 ? addressInfo?.take_goods_phone : addressInfo?.target_user_phone}</Text>
</View>
</View>
{!logisticsShow&&<View className={styles.updateBtn}>
{(!logisticsShow && (
<View className={styles.updateBtn}>
<View className={styles.updateBtn_list}>
<View className={classnames(styles.updateBtn_item, receivingStatus==1&&styles.updateBtn_item_select)} onClick={(e) => onReceivingStatus(1,e)}>自提</View>
<View className={classnames(styles.updateBtn_item, receivingStatus==2&&styles.updateBtn_item_select)} onClick={(e) => onReceivingStatus(2,e)}>物流</View>
<View className={classnames(styles.updateBtn_item, receivingStatus == 1 && styles.updateBtn_item_select)} onClick={(e) => onReceivingStatus(1, e)}>
自提
</View>
<View className={classnames(styles.updateBtn_item, receivingStatus == 2 && styles.updateBtn_item_select)} onClick={(e) => onReceivingStatus(2, e)}>
物流
</View>
</View>
<View style={{ transform: receivingStatus == 1 ? 'translateX(0)' : 'translateX(100%)' }} className={classnames(styles.updateBtn_select)}></View>
</View>||
(orderInfo?.status != SaleOrderStatusRefund.value)&&<View className={styles.logisticsBtn} onClick={onLogistics}>
</View>
)) ||
(orderInfo?.status != SaleOrderStatusRefund.value && (
<View className={styles.logisticsBtn} onClick={onLogistics}>
查看物流
</View>}
</View>
))}
</View>
<Popup show={showAddressList} showTitle={false} onClose={() => setShowAddressList(false)}>
<View className={styles.order_address_list}>
@ -217,4 +215,5 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, orderInfo, stat
</Popup>
</View>
)
}))
}),
)

7
src/pages/order/components/applyRefund/index.module.scss
View File

@ -1,4 +1,3 @@
.apply_after_sales_con {
padding: 20px;
.returnSaleInput_item {
@ -26,6 +25,9 @@
.miconfont {
font-size: 30px;
}
.selected {
color: #000;
}
}
.upload_image {
flex: 1;
@ -45,13 +47,12 @@
margin-bottom: 20px;
.rest_btn {
flex: 1;
border: 1PX solid #007aff;
border: 1px solid #007aff;
border-radius: 40px 0 0 40px;
text-align: center;
line-height: 82px;
color: $color_main;
background-color: #fff;
}
.verify_btn {
flex: 1;

51
src/pages/order/components/applyRefund/index.tsx
View File

@ -1,29 +1,28 @@
import Popup from "@/components/popup";
import TextareaEnhance from "@/components/textareaEnhance";
import { ScrollView, Text, View } from "@tarojs/components";
import { memo, useCallback, useEffect, useRef, useState } from "react";
import ReasonPopup from "../reasonPopup";
import Popup from '@/components/popup'
import TextareaEnhance from '@/components/textareaEnhance'
import { ScrollView, Text, View } from '@tarojs/components'
import { memo, useCallback, useEffect, useRef, useState } from 'react'
import ReasonPopup from '../reasonPopup'
import styles from './index.module.scss'
import classnames from "classnames";
import { ApplyRefundApi, RefundExplainApi } from "@/api/salesAfterOrder";
import { alert } from "@/common/common";
import classnames from 'classnames'
import { ApplyRefundApi, RefundExplainApi } from '@/api/salesAfterOrder'
import { alert } from '@/common/common'
type Param = {
show?: true|false,
onClose?: () => void,
show?: true | false
onClose?: () => void
orderId?: number
onSuccess?: () => void
}
export default memo(({show, onClose, orderId}:Param) => {
export default memo(({ show, onClose, orderId, onSuccess }: Param) => {
//提交的数据
const submitData = useRef({
return_explain: 0,
sale_order_id: 0,
reason_describe: ''
reason_describe: '',
})
useEffect(() => {
console.log('show&&orderId::', show)
if (show && orderId) {
submitData.current.sale_order_id = orderId
refundExplain()
@ -36,7 +35,8 @@ export default memo(({show, onClose, orderId}:Param) => {
if (!submitData.current.return_explain) return alert.error('请选择说明原因')
let res = await fetchData(submitData.current)
if (res.success) {
alert.error('申请成功')
alert.success('申请成功')
onSuccess?.()
} else {
alert.error('申请失败')
}
@ -57,20 +57,17 @@ export default memo(({show, onClose, orderId}:Param) => {
closeReason()
}, [])
//备注
const getOtherReason = useCallback((val) => {
submitData.current.reason_describe = val
}, [])
//显示说明
const [showReason, setShowReason] = useState(false)
const closeReason = useCallback(() => {
setShowReason(false)
}, [])
//提交
const onSubmit = (val) => {
if (val == 2) {
@ -80,32 +77,36 @@ export default memo(({show, onClose, orderId}:Param) => {
submitData.current = {
return_explain: 0,
sale_order_id: 0,
reason_describe: ''
reason_describe: '',
}
}
}
return (
<>
<Popup show={show} title="申请退款" onClose={onClose} >
<Popup show={show} title='申请退款' onClose={onClose}>
<View className={styles.apply_after_sales_con}>
<View className={styles.returnSaleInput_item}>
<View className={styles.title}>退款说明</View>
<View className={styles.select} onClick={() => setShowReason(true)}>
<Text>{reason.name||'请选择'}</Text>
<Text className={reason.name ? styles.selected : ''}>{reason.name || '请选择'}</Text>
<Text className={classnames(styles.miconfont, 'iconfont icon-a-moreback')}></Text>
</View>
</View>
<TextareaEnhance onChange={getOtherReason} title='备注' placeholder="请输入退款备注"/>
<TextareaEnhance onChange={getOtherReason} title='备注' placeholder='请输入退款备注' />
<View className={styles.btns_con}>
<View className={styles.btns_two}>
<View className={styles.rest_btn} onClick={() => onSubmit(1)}>取消</View>
<View className={styles.verify_btn } onClick={() => onSubmit(2)}>确认</View>
<View className={styles.rest_btn} onClick={() => onSubmit(1)}>
取消
</View>
<View className={styles.verify_btn} onClick={() => onSubmit(2)}>
确认
</View>
</View>
</View>
</View>
</Popup>
<ReasonPopup defaultValue={reason.id} show={showReason} onClose={closeReason} list={list} title="退款说明" onSelect={reasonSelect}/>
<ReasonPopup defaultValue={reason.id} show={showReason} onClose={closeReason} list={list} title='退款说明' onSelect={reasonSelect} />
</>
)
})

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

@ -221,6 +221,9 @@ export default () => {
const applyRefundClose = useCallback(() => {
setRefundShow(false)
}, [])
const applyRefundSuccess = useCallback(() => {
getSaleOrderPreView()
}, [])
//查看物流
const getLogistics = useCallback(() => {
@ -281,17 +284,9 @@ export default () => {
return (
<View className={styles.order_main}>
{(orderDetail?.status != SaleorderstatusWaitingPrePayment.value && <OrderState orderInfo={orderDetail} />) || (
<AdvanceOrderState orderInfo={orderDetail} onRefresh={refresh} />
)}
{(orderDetail?.status != SaleorderstatusWaitingPrePayment.value && <OrderState orderInfo={orderDetail} />) || <AdvanceOrderState orderInfo={orderDetail} onRefresh={refresh} />}
<View>
<AddressInfoDetail
orderInfo={defaultAddress}
onLogistics={getLogistics}
onSelect={getAddress}
onChangeShipmentMode={getShipmentMode}
ref={addressRef}
/>
<AddressInfoDetail orderInfo={defaultAddress} onLogistics={getLogistics} onSelect={getAddress} onChangeShipmentMode={getShipmentMode} ref={addressRef} />
</View>
<KindList order={formatPreViewOrderMemo} />
<View className={styles.order_info}>
@ -315,9 +310,7 @@ export default () => {
</View>
<View className={styles.order_desc} onClick={descOpen}>
<View className={styles.order_desc_con}>订单备注</View>
{(orderRemark && <View className={styles.order_desc_text}>{orderDetail?.remark}</View>) || (
<View className={styles.order_desc_text_hint}>填写备注</View>
)}
{(orderRemark && <View className={styles.order_desc_text}>{orderDetail?.remark}</View>) || <View className={styles.order_desc_text_hint}>填写备注</View>}
<View className={classnames(styles.miconfont, 'iconfont icon-a-moreback')}></View>
</View>
{orderDetail?.status != SaleOrderStatusCancel.value && (
@ -331,7 +324,7 @@ export default () => {
</Popup>
<Payment onSubmitSuccess={onPaySuccess} show={payMentShow} onClose={closePayShow} orderInfo={orderDetail} />
<ScanPayCheck show={showScanPayCheck} onClose={() => setShowScanPayCheck(false)} orderInfo={orderDetail} />
<ApplyRefund show={refundShow} onClose={applyRefundClose} orderId={orderDetail?.id} />
<ApplyRefund show={refundShow} onSuccess={applyRefundSuccess} onClose={applyRefundClose} orderId={orderDetail?.id} />
<ShopCart intoStatus='again' show={showCart} onClose={() => setShowCart(false)} />
<ReturnRecord show={returnRecordShow} onClose={closeReturnRecord} id={orderDetail?.id} />
<View className='common_safe_area_y'></View>

127
src/pages/order/orderList/components/order/index.tsx
View File

@ -1,60 +1,68 @@
import { goLink } from "@/common/common";
import { ORDER_STATUS } from "@/common/enum";
import { formatHashTag, formatImgUrl, formatPriceDiv } from "@/common/fotmat";
import LabAndImg from "@/components/LabAndImg";
import OrderBtns from "@/components/orderBtns";
import Payment from "@/pages/order/components/payment";
import { useSelector } from "@/reducers/hooks";
import { Image, Text, View } from "@tarojs/components"
import { useRouter } from "@tarojs/taro";
import classnames from "classnames";
import { memo, useCallback, useMemo, useRef, useState } from "react";
import { goLink } from '@/common/common'
import { ORDER_STATUS } from '@/common/enum'
import { formatHashTag, formatImgUrl, formatPriceDiv } from '@/common/fotmat'
import LabAndImg from '@/components/LabAndImg'
import OrderBtns from '@/components/orderBtns'
import Payment from '@/pages/order/components/payment'
import { useSelector } from '@/reducers/hooks'
import { Image, Text, View } from '@tarojs/components'
import { useRouter } from '@tarojs/taro'
import classnames from 'classnames'
import { memo, useCallback, useMemo, useRef, useState } from 'react'
import styles from './index.module.scss'
type Param = {
value: {
order_no: string,
sale_mode: number,
sale_mode_name: string,
status_name: string,
shipment_mode: number,
shipment_mode_name: string,
product_list: any[],
total_fabrics: number,
total_colors: number,
total_number: number,
status: 0,
id: number,
lab: any,
rgb: any,
texture_url: string,
payment_method: number, //支付方式
actual_amount: number, //实付金额
wait_pay_amount: number, //待付金额
should_collect_order_id: number, //应付单id
av_return_roll: number,
total_sale_price: number,
estimate_amount: number,
order_no: string
sale_mode: number
sale_mode_name: string
status_name: string
shipment_mode: number
shipment_mode_name: string
product_list: any[]
total_fabrics: number
total_colors: number
total_number: number
status: 0
id: number
lab: any
rgb: any
texture_url: string
payment_method: number //支付方式
actual_amount: number //实付金额
wait_pay_amount: number //待付金额
should_collect_order_id: number //应付单id
av_return_roll: number
total_sale_price: number
estimate_amount: number
is_return: true | false
},
onClickBtn?: (val:{status:number, orderInfo:Param['value']}) => void
}
onClickBtn?: (val: { status: number; orderInfo: Param['value'] }) => void
}
export default memo(({ value, onClickBtn }: Param) => {
const userInfo = useSelector(state => state.userInfo)
const userInfo = useSelector((state) => state.userInfo)
//对应数量
const formatCount = useCallback((item, sale_mode) => {
const formatCount = useCallback(
(item, sale_mode) => {
return sale_mode == 0 ? item.roll : Number(item.length / 100)
}, [value])
},
[value],
)
//对应单价
const standardPrice = useCallback((price, sale_mode) => {
const standardPrice = useCallback(
(price, sale_mode) => {
return '¥' + formatPriceDiv(price).toLocaleString() + '/' + (sale_mode == 1 ? 'm' : 'kg')
}, [value])
},
[value],
)
//点击订单按钮
const orderBtnsClick = useCallback((status) => {
const orderBtnsClick = useCallback(
(status) => {
onClickBtn?.({ status, orderInfo: value })
}, [value])
},
[value],
)
let { SaleOrderStatusTaking, SaleOrderStatusWaitingReceipt } = ORDER_STATUS
@ -67,13 +75,13 @@ export default memo(({value, onClickBtn}: Param) => {
const orderInfo = useMemo(() => {
return {
orderId: value?.id,
...value
...value,
}
}, [value])
//总条数
const numText = useMemo(() => {
let total_number_new = value?.sale_mode == 0? value?.total_number:(value?.total_number/100)
let total_number_new = value?.sale_mode == 0 ? value?.total_number : value?.total_number / 100
return `${value?.total_fabrics} 种面料，${value?.total_colors} 种颜色，共 ${total_number_new}${value?.sale_mode == 0 ? ' 条' : ' 米'}`
}, [value])
@ -102,8 +110,6 @@ export default memo(({value, onClickBtn}: Param) => {
<View className={styles.product_status}>{orderStatus}</View>
</View>
</View>
</View>
<View className={styles.product_con} onClick={() => goLink('/pages/order/index', { id: value?.id })}>
<View className={styles.product_title}>
@ -113,34 +119,45 @@ export default memo(({value, onClickBtn}: Param) => {
</View>
<View className={styles.product_list}>
<View className={styles.image}>
<LabAndImg value={{lab:value.lab,rgb:value.rgb,texture_url:value.texture_url}}/>
<LabAndImg
value={{
lab: value?.product_list?.[0].product_colors?.[0].lab,
rgb: value?.product_list?.[0].product_colors?.[0].rgb,
texture_url: value?.product_list?.[0].product_colors?.[0].texture_url,
}}
/>
<View className={styles.color_num}>{value?.product_list?.[0].product_colors?.[0].code}</View>
</View>
<View className={styles.color_list}>
{value?.product_list?.[0].product_colors.map((itemColor, index) => {
return (
(index <= 1)&&<View className={styles.color_item}>
index <= 1 && (
<View className={styles.color_item}>
<View className={styles.color_title}>{formatHashTag(itemColor.code, itemColor.name)}</View>
<View className={styles.color_price}>{standardPrice(itemColor.sale_price, value.sale_mode)}</View>
<View className={styles.color_num}>×{formatCount(itemColor, value.sale_mode) + (value.sale_mode == 0 ? ' 条' : ' 米')}</View>
</View>
)
})
}
{value?.product_list?.[0].length > 2 && <View className={styles.color_item}>
)
})}
{value?.product_list?.[0].length > 2 && (
<View className={styles.color_item}>
<View className={styles.color_more}>……</View>
<View className={styles.color_more}>……</View>
<View className={styles.color_more}>……</View>
</View>}
</View>
)}
</View>
</View>
<View className={styles.color_count_num}>
<Text>{numText}</Text>
<Text className={styles.price}><Text>¥</Text>{value.total_sale_price?formatPriceDiv(value.total_sale_price, 100, true):formatPriceDiv(value.estimate_amount, 100, true)}</Text>
<Text className={styles.price}>
<Text>¥</Text>
{value.total_sale_price ? formatPriceDiv(value.total_sale_price, 100, true) : formatPriceDiv(value.estimate_amount, 100, true)}
</Text>
</View>
</View>
<OrderBtns orderInfo={orderInfo} onClick={orderBtnsClick} showStatus='list' />
</View>
)
})

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

@ -181,6 +181,9 @@ export default () => {
const applyRefundClose = useCallback(() => {
setRefundShow(false)
}, [])
const applyRefundSuccess = useCallback(() => {
getOrderList()
}, [])
//显示售后记录
const [returnRecordShow, setReturnRecordShow] = useState(false)
@ -210,14 +213,13 @@ export default () => {
{orderData?.list?.map((item) => {
return (
<View key={item.id} className={styles.order_item_con}>
{' '}
<Order value={item} onClickBtn={clickOrderBtn} />
</View>
)
})}
</InfiniteScroll>
</View>
<ApplyRefund show={refundShow} onClose={applyRefundClose} orderId={callBackOrderInfo?.id} />
<ApplyRefund show={refundShow} onClose={applyRefundClose} onSuccess={applyRefundSuccess} orderId={callBackOrderInfo?.id} />
<ShopCart intoStatus='again' show={showCart} onClose={() => setShowCart(false)} default_sale_mode={callBackOrderInfo?.sale_mode} />
<ReturnRecord show={returnRecordShow} onClose={closeReturnRecord} id={callBackOrderInfo?.id} />
<Payment onSubmitSuccess={onPaySuccess} show={payMentShow} onClose={closePayShow} orderInfo={callBackOrderInfo} />

57
src/pages/salesAfter/components/addressInfoDetail/index.tsx
View File

@ -1,19 +1,19 @@
import { AFTER_ORDER_STATUS, REFUND_STATUS_ORDER } from "@/common/enum";
import { Text, View } from "@tarojs/components"
import classnames from "classnames";
import {memo, useMemo} from "react";
import { AFTER_ORDER_STATUS, REFUND_STATUS_ORDER } from '@/common/enum'
import { Text, View } from '@tarojs/components'
import classnames from 'classnames'
import { memo, useMemo } from 'react'
import styles from './index.module.scss'
type Param = {
onLogistics?: (val: 1|2) => void, //1 上传物流 2 查看物流
onLogistics?: (val: 1 | 2) => void //1 上传物流 2 查看物流
orderInfo: {
return_user_name?:string,
return_user_phone?: string,
stage?: number,
sale_mode?: 0|1|2, //0 大货 1剪板 2散剪
type?: number, //申请单退款状态
return_user_name?: string
return_user_phone?: string
stage?: number
sale_mode?: 0 | 1 | 2 //0 大货 1剪板 2散剪
type?: number //申请单退款状态
return_address?: string
}
}
export default memo(({ orderInfo, onLogistics }: Param) => {
const {
@ -24,7 +24,7 @@ export default memo(({orderInfo, onLogistics}:Param) => {
ReturnStageCancel,
ReturnStageQualityCheckPendingRefund,
ReturnStageServiceOrderPendingRefund,
ReturnStageRejected
ReturnStageRejected,
} = AFTER_ORDER_STATUS
const {
@ -35,16 +35,9 @@ export default memo(({orderInfo, onLogistics}:Param) => {
//是否显示地址
const showAddress = useMemo(() => {
let after_list = [
ReturnStageApplying.value,
ReturnStageCancel.value,
ReturnStageRejected.value
]
let refurn_list = [
ReturnApplyOrderTypeSalesRefund.value,
ReturnApplyOrderTypeAdvanceReceiptRefund.value
]
return (!after_list.includes(orderInfo?.stage!)) && (orderInfo?.sale_mode != 1) && (!refurn_list.includes(orderInfo?.type!))
let after_list = [ReturnStageApplying.value, ReturnStageCancel.value, ReturnStageRejected.value]
let refurn_list = [ReturnApplyOrderTypeSalesRefund.value, ReturnApplyOrderTypeAdvanceReceiptRefund.value]
return !after_list.includes(orderInfo?.stage!) && orderInfo?.sale_mode != 1 && !refurn_list.includes(orderInfo?.type!)
}, [orderInfo])
//上传物流
@ -52,10 +45,10 @@ export default memo(({orderInfo, onLogistics}:Param) => {
return orderInfo?.stage == ReturnStageWaitCheck.value
}, [orderInfo])
return (
<>
{showAddress&&<View className={styles.address_main}>
{showAddress && (
<View className={styles.address_main}>
<View className={styles.address_title_tag}>
<Text className={classnames(styles.miconfont, 'iconfont icon-zhuyi')}></Text>
请按以下退货地址寄回货物并提供退货物流信息
@ -64,21 +57,25 @@ export default memo(({orderInfo, onLogistics}:Param) => {
<View className={classnames(styles.order_address_icon, 'iconfont', 'icon-fahuo')}></View>
<View className={styles.order_address_text_con}>
<View className={styles.order_address_text_title}>
<Text className={classnames(styles.address_text, styles.address_text_no)}>{orderInfo?.return_user_name}</Text>
<Text className={classnames(styles.address_text, styles.address_text_no)}>{orderInfo?.return_address}</Text>
</View>
<View className={styles.order_address_text_name}>
<Text>管理员</Text>
<Text>谭先生</Text>
<Text>{orderInfo?.return_user_phone}</Text>
{upLogistics&&<View className={styles.updateBtn} onClick={() => onLogistics?.(1)}>
{(upLogistics && (
<View className={styles.updateBtn} onClick={() => onLogistics?.(1)}>
上传物流
</View>
||<View className={styles.updateBtn} onClick={() => onLogistics?.(2)}>
)) || (
<View className={styles.updateBtn} onClick={() => onLogistics?.(2)}>
查看物流
</View>}
</View>
)}
</View>
</View>
</View>
</View>}
</View>
)}
</>
)
})

80
src/pages/salesAfter/components/applyRecord/index.tsx
View File

@ -1,16 +1,16 @@
import { SaleOrderOrderDetailApi } from "@/api/salesAfterOrder";
import { formatHashTag, formatPriceDiv, formatWeightDiv } from "@/common/fotmat";
import LabAndImg from "@/components/LabAndImg";
import Popup from "@/components/popup";
import { ScrollView, Text, View } from "@tarojs/components";
import { memo, useCallback, useEffect, useMemo, useState } from "react";
import Taro from "@tarojs/taro";
import { SaleOrderOrderDetailApi } from '@/api/salesAfterOrder'
import { formatHashTag, formatPriceDiv, formatWeightDiv } from '@/common/fotmat'
import LabAndImg from '@/components/LabAndImg'
import Popup from '@/components/popup'
import { ScrollView, Text, View } from '@tarojs/components'
import { memo, useCallback, useEffect, useMemo, useState } from 'react'
import Taro from '@tarojs/taro'
import styles from './index.module.scss'
type Param = {
show?: true|false,
onClose?: () => void,
onSubmit?: () => void,
show?: true | false
onClose?: () => void
onSubmit?: () => void
id?: number
}
export default memo(({ show, onClose, onSubmit, id }: Param) => {
@ -19,7 +19,6 @@ export default memo(({show, onClose, onSubmit, id}:Param) => {
if (!show) setFormatDetailOrder(() => null)
}, [show, id])
//获取订单详情
const [orderDetail, setOrderDetail] = useState<any>(null) //获取到的原始数据
const { fetchData: saleOrderOrderDetailData } = SaleOrderOrderDetailApi()
@ -54,19 +53,24 @@ export default memo(({show, onClose, onSubmit, id}:Param) => {
//监听获取到的数据
useEffect(() => {
if(orderDetail)
formatData()
if (orderDetail) formatData()
}, [orderDetail])
//对应数量
const formatCount = useCallback((item) => {
const formatCount = useCallback(
(item) => {
return formatDetailOrder?.sale_mode == 0 ? item.roll : Number(item.length / 100)
}, [formatDetailOrder])
},
[formatDetailOrder],
)
//对应单价
const standardPrice = useCallback(price => {
const standardPrice = useCallback(
(price) => {
return formatPriceDiv(price).toLocaleString() + '/' + (formatDetailOrder?.sale_mode == 1 ? 'm' : 'kg')
}, [formatDetailOrder])
},
[formatDetailOrder],
)
//数量格式
const numText = useMemo(() => {
@ -83,23 +87,27 @@ export default memo(({show, onClose, onSubmit, id}:Param) => {
return (
<>
<Popup show={show} title="申请记录" onClose={onClose}>
<Popup show={show} title='申请记录' onClose={onClose}>
<View className={styles.apply_record_main}>
{formatDetailOrder&&<>
<View className={styles.kind_number}><Text>{numText}</Text></View>
{formatDetailOrder && (
<>
<View className={styles.kind_number}>
<Text>{numText}</Text>
</View>
<ScrollView scrollY className={styles.apply_record_scroll}>
<View className={styles.orders_list_con}>
{
formatDetailOrder?.list?.map(item => {
return <View key={item.product_code} className={styles.order_list}>
{formatDetailOrder?.list?.map((item) => {
return (
<View key={item.product_code} className={styles.order_list}>
<View className={styles.order_list_title}>
<View className={styles.tag}>{formatDetailOrder.sale_mode_name}</View>
<View className={styles.title}>{formatHashTag(item.code, item.name)}</View>
<View className={styles.num}>共{item?.product_colors.length}种</View>
</View>
<View className={styles.order_list_scroll}>
{item?.product_colors?.map(colorItem => {
return <View key={colorItem.id} className={styles.order_list_item}>
{item?.product_colors?.map((colorItem) => {
return (
<View key={colorItem.id} className={styles.order_list_item}>
<View className={styles.order_list_item_img}>
<LabAndImg value={labAndRgbAndUrl(colorItem)} />
</View>
@ -112,23 +120,27 @@ export default memo(({show, onClose, onSubmit, id}:Param) => {
</View>
</View>
<View className={styles.order_list_item_count}>
<View className={styles.count_num}>×{formatCount(colorItem)}<text>{formatDetailOrder.unit}</text></View>
<View className={styles.count_price}><text>¥</text>{formatPriceDiv(colorItem.estimate_amount, 100, true)}</View>
<View className={styles.count_num}>
×{formatCount(colorItem)}
<text>{formatDetailOrder.unit}</text>
</View>
<View className={styles.count_price}>
<text>¥</text>
{formatPriceDiv(colorItem.estimate_amount, 100, true)}
</View>
</View>
</View>
</View>
)
})}
</View>
</View>
})
}
{/* <View className={styles.order_total}>
<Text>申请数量</Text>
<Text>×{orderDetail?.total_number}</Text>
</View> */}
)
})}
</View>
</ScrollView>
</>}
</>
)}
</View>
</Popup>
</>

42
src/pages/salesAfter/components/returnLogistics/index.tsx
View File

@ -1,19 +1,19 @@
import Popup from "@/components/popup";
import { Text, View } from "@tarojs/components";
import { memo, useCallback, useEffect, useRef, useState } from "react";
import UploadImage from "@/components/uploadImage"
import Popup from '@/components/popup'
import { Text, View } from '@tarojs/components'
import { memo, useCallback, useEffect, useRef, useState } from 'react'
import UploadImage from '@/components/uploadImage'
import styles from './index.module.scss'
import TextareaEnhance from "@/components/textareaEnhance";
import { ReturnApplyLogisticsApi } from "@/api/salesAfterOrder";
import { alert } from "@/common/common";
import TextareaEnhance from '@/components/textareaEnhance'
import { ReturnApplyLogisticsApi } from '@/api/salesAfterOrder'
import { alert } from '@/common/common'
type Param = {
show?: true|false,
onClose?: () => void,
onSubmit?: () => void,
id?: number, //订单id
images: string[], //图片列表
descValue?: string, //描述
show?: true | false
onClose?: () => void
onSubmit?: () => void
id?: number //订单id
images: string[] //图片列表
descValue?: string //描述
onlyRead?: false | true //true 只读
}
export default memo(({ show = false, onClose, onSubmit, id = 0, images = [], descValue = '', onlyRead = false }: Param) => {
@ -21,7 +21,7 @@ export default memo(({show = false, onClose, onSubmit, id = 0, images = [], desc
const submitData = useRef({
accessory_url: [],
remark: '',
id: 0
id: 0,
})
useEffect(() => {
if (id) submitData.current.id = id
@ -53,7 +53,7 @@ export default memo(({show = false, onClose, onSubmit, id = 0, images = [], desc
return (
<>
<Popup show={show} title={onlyRead?'查看物流':"上传物流"} 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>
@ -62,11 +62,15 @@ export default memo(({show = false, onClose, onSubmit, id = 0, images = [], desc
</View>
</View>
<View className={styles.logistics_desc}>
<TextareaEnhance defaultValue={descValue} onChange={getOtherReason} title="备注：" onlyRead={onlyRead} placeholder="请输入备注信息"/>
<TextareaEnhance defaultValue={descValue} onChange={getOtherReason} title='备注：' onlyRead={onlyRead} placeholder='请输入备注信息' />
</View>
{!onlyRead&&<View className={styles.btns_two}>
<View className={styles.verify_btn } onClick={() => onSubmitEven()}>保存</View>
</View >}
{!onlyRead && (
<View className={styles.btns_two}>
<View className={styles.verify_btn} onClick={() => onSubmitEven()}>
保存
</View>
</View>
)}
</View>
</Popup>
</>

89
src/pages/salesAfter/index.tsx
View File

@ -1,20 +1,19 @@
import { SaleOrderOrderDetailApi } from "@/api/salesAfterOrder";
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";
import { useCallback, useEffect, useMemo, useRef, useState, memo } from "react";
import AddressInfoDetail from "./components/addressInfoDetail";
import ApplyRecord from "./components/applyRecord";
import ContentBox from "./components/contentBox";
import KindList from "./components/kindList";
import OrderState from "./components/orderState";
import ReturnLogistics from "./components/returnLogistics";
import { SaleOrderOrderDetailApi } from '@/api/salesAfterOrder'
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'
import { useCallback, useEffect, useMemo, useRef, useState, memo } from 'react'
import AddressInfoDetail from './components/addressInfoDetail'
import ApplyRecord from './components/applyRecord'
import ContentBox from './components/contentBox'
import KindList from './components/kindList'
import OrderState from './components/orderState'
import ReturnLogistics from './components/returnLogistics'
import styles from './index.module.scss'
export default () => {
@ -38,8 +37,7 @@ import styles from './index.module.scss'
//监听获取到的数据
useEffect(() => {
if(orderDetail)
formatData()
if (orderDetail) formatData()
}, [orderDetail])
//格式化数据格式
@ -54,9 +52,9 @@ import styles from './index.module.scss'
return formatDetailOrder
}, [formatDetailOrder])
//获取底部按钮点击, 获取按钮状态
const orderStateClick = useCallback((val) => {
const orderStateClick = useCallback(
(val) => {
if (val == 1 || val == 6) {
getSaleOrderPreView()
} else if (val == 8) {
@ -65,7 +63,9 @@ import styles from './index.module.scss'
} else if (val == 5) {
onShowLogistics(1)
}
}, [orderDetail])
},
[orderDetail],
)
//页面下拉刷新
usePullDownRefresh(() => {
@ -75,14 +75,12 @@ import styles from './index.module.scss'
//按钮所需数据
const orderInfo = useMemo(() => {
return {
...orderDetail
...orderDetail,
}
}, [orderDetail])
//售后订单状态枚举
const {
} = AFTER_ORDER_STATUS
const {} = AFTER_ORDER_STATUS
//物流显示
const [logisticsShow, setLogisticsShow] = useState(false)
@ -111,9 +109,17 @@ import styles from './index.module.scss'
<OrderDes orderInfo={orderDetail} />
<AfterOrderBtns orderInfo={orderInfo} onClick={orderStateClick} />
<AfterSalePricture urls={orderDetail?.fabric_piece_accessory_url} />
<ReturnLogistics onlyRead={logistics} 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 className='common_safe_area_y'></View>
</View>
)
}
@ -126,9 +132,9 @@ import styles from './index.module.scss'
success: function (res) {
Taro.showToast({
icon: 'none',
title: '复制成功'
title: '复制成功',
})
}
},
})
}
return (
@ -137,13 +143,17 @@ import styles from './index.module.scss'
<SearchInput showBorder={false} title='售后单号' height='50rpx'>
<View className={styles.order_num}>
<Text>{orderInfo?.return_order_no}</Text>
<View className={styles.order_num_btn} onClick={() => clipboardData(orderInfo?.return_order_no)}>复制</View>
<View className={styles.order_num_btn} onClick={() => clipboardData(orderInfo?.return_order_no)}>
复制
</View>
</View>
</SearchInput>
<SearchInput showBorder={false} title='订单号' height='50rpx'>
<View className={styles.order_num}>
<Text>{orderInfo?.order_no}</Text>
<View className={styles.order_num_btn} onClick={() => clipboardData(orderInfo?.order_no)}>复制</View>
<View className={styles.order_num_btn} onClick={() => clipboardData(orderInfo?.order_no)}>
复制
</View>
</View>
</SearchInput>
<SearchInput showBorder={false} title='退货原因' height='50rpx'>
@ -166,10 +176,9 @@ import styles from './index.module.scss'
})
const AfterSalePricture = memo(({ urls = [] }: { urls: string[] }) => {
const showList = useMemo(() => {
let res = urls.map(item => {
return formatImgUrl(item, "!w800")
let res = urls.map((item) => {
return formatImgUrl(item, '!w800')
})
return res
}, [urls])
@ -178,15 +187,17 @@ import styles from './index.module.scss'
const showImage = () => {
Taro.previewImage({
current: showList[0], // 当前显示
urls: showList // 需要预览的图片http链接列表
urls: showList, // 需要预览的图片http链接列表
})
}
return (
<ContentBox title="售后图片">
<ContentBox title='售后图片'>
<View className={styles.after_sale_picture_list}>
{urls?.map(item=> <View className={styles.after_sale_picture_item} onClick={showImage}>
{urls?.map((item) => (
<View className={styles.after_sale_picture_item} onClick={showImage}>
<Image src={formatImgUrl(item)} />
</View>)}
</View>
))}
</View>
</ContentBox>
)

67
src/pages/salesAfter/salesAfterList/index.tsx
View File

@ -1,27 +1,27 @@
import Search from "@/components/search"
import useLogin from "@/use/useLogin"
import {View } from "@tarojs/components"
import Taro, { useDidShow} from "@tarojs/taro"
import { useCallback, useEffect, useMemo, useRef, useState } from "react"
import Search from '@/components/search'
import useLogin from '@/use/useLogin'
import { View } from '@tarojs/components'
import Taro, { useDidShow } from '@tarojs/taro'
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
import styles from './index.module.scss'
import classnames from "classnames";
import Order from "./components/order"
import InfiniteScroll from "@/components/infiniteScroll"
import { dataLoadingStatus, getFilterData } from "@/common/util"
import OrderStatusList from "./components/orderStatusList"
import { GetSaleOrderListApi, RefundOrderSatausApi } from "@/api/salesAfterOrder"
import ApplyRecord from "../components/applyRecord"
import ReturnLogistics from "../components/returnLogistics"
import classnames from 'classnames'
import Order from './components/order'
import InfiniteScroll from '@/components/infiniteScroll'
import { dataLoadingStatus, getFilterData } from '@/common/util'
import OrderStatusList from './components/orderStatusList'
import { GetSaleOrderListApi, RefundOrderSatausApi } from '@/api/salesAfterOrder'
import ApplyRecord from '../components/applyRecord'
import ReturnLogistics from '../components/returnLogistics'
export default () => {
useLogin()
//搜索参数
const [searchField, setSearchField] = useState<{status: number|null, page: number, size: number, name: string}>({
const [searchField, setSearchField] = useState<{ status: number | null; page: number; size: number; name: string }>({
status: null,
page: 1,
size: 10,
name:''
name: '',
})
//获取订单状态
@ -38,7 +38,7 @@ export default () => {
//获取订单列表
const { fetchData: listFetchData, state: orderState } = GetSaleOrderListApi()
const [orderData, setOrderData] = useState<{list:any[], total:number}>({list:[], total:0})
const [orderData, setOrderData] = useState<{ list: any[]; total: number }>({ list: [], total: 0 })
const getOrderList = async () => {
let res = await listFetchData(getFilterData(searchField))
setOrderData({ list: res.data.list, total: res.data.total })
@ -71,7 +71,6 @@ export default () => {
setOrderData(() => ({ list: [], total: 0 }))
}, [])
//数据加载状态
const statusMore = useMemo(() => {
return dataLoadingStatus({ list: orderData.list, total: orderData.total, status: orderState.loading })
@ -84,7 +83,6 @@ export default () => {
setSearchField((val) => ({ ...val, name: e, size: 10 }))
}, [])
//列表下拉刷新
const [refresherTriggeredStatus, setRefresherTriggeredStatus] = useState(false)
const getRefresherRefresh = async () => {
@ -95,7 +93,8 @@ export default () => {
//监听点击的按钮
const [callBackOrderInfo, setCallBackPayOrderInfo] = useState<any>()
const clickOrderBtn = useCallback(({status, orderInfo}) => {
const clickOrderBtn = useCallback(
({ status, orderInfo }) => {
if (status == 1 || status == 6) {
getOrderList()
} else if (status == 8) {
@ -104,7 +103,9 @@ export default () => {
onShowLogistics(() => true)
}
setCallBackPayOrderInfo(orderInfo)
}, [orderData])
},
[orderData],
)
//显示记录
const [applyRecord, setApplyRecord] = useState(false)
@ -126,18 +127,34 @@ export default () => {
return (
<View className={styles.order_list_main}>
<View className={styles.title}>
<Search placeIcon="out" placeholder="搜索商品/名称/颜色/订单号" showBtn={true} changeOnSearch={getSearchData} debounceTime={300}/>
<Search placeIcon='out' placeholder='搜索商品/名称/颜色/订单号' showBtn={true} changeOnSearch={getSearchData} debounceTime={300} />
<OrderStatusList list={statusList} onSelect={changeStatus} defaultId={1} />
</View>
<View className={styles.order_list}>
<InfiniteScroll statusMore={statusMore} selfonScrollToLower={getScrolltolower} refresherEnabled={true} refresherTriggered={refresherTriggeredStatus} selfOnRefresherRefresh={getRefresherRefresh}>
{orderData?.list.map(item => {
return <View key={item.id} className={styles.order_item_con}> <Order value={item} onClickBtn={clickOrderBtn}/></View>
<InfiniteScroll
statusMore={statusMore}
selfonScrollToLower={getScrolltolower}
refresherEnabled={true}
refresherTriggered={refresherTriggeredStatus}
selfOnRefresherRefresh={getRefresherRefresh}>
{orderData?.list.map((item) => {
return (
<View key={item.id} className={styles.order_item_con}>
<Order value={item} onClickBtn={clickOrderBtn} />
</View>
)
})}
</InfiniteScroll>
</View>
<ApplyRecord show={applyRecord} id={callBackOrderInfo?.id} onClose={() => setApplyRecord(false)} />
<ReturnLogistics images={callBackOrderInfo?.accessory_url} descValue={callBackOrderInfo?.take_goods_remark} show={logisticsShow} id={callBackOrderInfo?.return_apply_order_id} onClose={onCloseLogistics} onSubmit={logisticsSuccess}/>
<ReturnLogistics
images={callBackOrderInfo?.accessory_url}
descValue={callBackOrderInfo?.take_goods_remark}
show={logisticsShow}
id={callBackOrderInfo?.return_apply_order_id}
onClose={onCloseLogistics}
onSubmit={logisticsSuccess}
/>
</View>
)
}

16
src/pages/searchList/hightSearchList.module.scss
View File

@ -31,7 +31,8 @@
padding: 20px 130px;
font-size: $font_size_medium;
color: $color_font_three;
.text_zh, .text_sc{
.text_zh,
.text_sc {
color: $color_main;
display: flex;
align-items: center;
@ -57,7 +58,7 @@
content: '';
width: 2px;
height: 32px;
background-color: #C2C2C2;
background-color: #c2c2c2;
position: absolute;
top: 0;
left: -30px;
@ -69,7 +70,6 @@
justify-content: space-between;
align-items: center;
height: 86px;
}
.filter_scroll {
flex: 1;
@ -90,7 +90,7 @@
flex: 1;
view {
font-size: $font_size_medium;
background-color: #F0F0F0;
background-color: #f0f0f0;
border-radius: 24px;
min-width: 126px;
height: 46.93px;
@ -140,7 +140,7 @@
font-size: $font_size_min;
color: $color_font_two;
padding: 10px 38px;
border-bottom: 1PX solid rgb(233, 233, 233);
border-bottom: 1px solid rgb(233, 233, 233);
}
.scroll {
@ -186,14 +186,14 @@
.title {
font-size: $font_size;
color: $color_font_three;
@include common_ellipsis()
@include common_ellipsis();
}
.tag_list {
display: flex;
margin-top: 16px;
.tag {
padding: 3px 10px;
background-color: #CDE5FF;
background-color: #cde5ff;
font-size: $font_size_min;
border-radius: 5px;
color: $color_main;
@ -206,7 +206,7 @@
font-size: $font_size_medium;
color: $color_font_two;
margin-top: 16px;
@include common_ellipsis()
@include common_ellipsis();
}
}
}

16
src/pages/searchList/searchList.module.scss
View File

@ -2,7 +2,7 @@
display: flex;
flex-direction: column;
height: 100vh;
background-color: #F8F8F8;
background-color: #f8f8f8;
.search {
padding: 20px;
}
@ -14,7 +14,8 @@
padding: 20px 50px;
font-size: $font_size_medium;
color: $color_font_three;
.text_zh, .text_sc{
.text_zh,
.text_sc {
color: $color_main;
display: flex;
align-items: center;
@ -40,7 +41,7 @@
content: '';
width: 2px;
height: 32px;
background-color: #C2C2C2;
background-color: #c2c2c2;
position: absolute;
top: 0;
left: -30px;
@ -52,7 +53,6 @@
justify-content: space-between;
align-items: center;
height: 86px;
}
.filter_scroll {
flex: 1;
@ -73,7 +73,7 @@
flex: 1;
view {
font-size: $font_size_medium;
background-color: #F0F0F0;
background-color: #f0f0f0;
border-radius: 24px;
min-width: 126px;
height: 46.93px;
@ -123,7 +123,7 @@
font-size: $font_size_min;
color: $color_font_two;
padding: 10px 38px;
border-bottom: 1PX solid #e9e9e9;
border-bottom: 1px solid #e9e9e9;
}
.scroll {
@ -149,7 +149,7 @@
image {
width: 100%;
height: 100%;
border-radius: 20px 20px 0px 0px;
border-radius: 20px;
}
.color_num {
background: rgba(0, 0, 0, 0.5);
@ -176,7 +176,7 @@
margin-top: 16px;
.tag {
padding: 3px 10px;
background-color: #CDE5FF;
background-color: #cde5ff;
font-size: $font_size_min;
border-radius: 5px;
color: $color_main;

264
src/use/BlueToothCopy.tsx
View File

@ -1,41 +1,40 @@
import React, {useRef, useState } from "react"
import Taro from "@tarojs/taro";
import { Command } from "@/common/bluetooth/command";
import { uint8ArrayToFloat32, uint8ArrayToHex, waitFor } from "@/common/bluetooth/utils";
import React, { useRef, useState } from 'react'
import Taro from '@tarojs/taro'
import { Command } from '@/common/bluetooth/command'
import { uint8ArrayToFloat32, uint8ArrayToHex, waitFor } from '@/common/bluetooth/utils'
interface params {
init: () => void
state: Object,
startScan: () => void,
measureAndGetLab: () => any,
getAdapterState: () => void,
connect: (any) => void,
state: Object
startScan: () => void
measureAndGetLab: () => any
getAdapterState: () => void
connect: (any) => void
disconnect: () => void
}
const Context = React.createContext<params | unknown>(null)
interface stateStype {
listeners: any,
discovering: boolean,
available: boolean,
connected: any,
connecting: any,
serviceRule: any,
serviceId: any,
characteristicRule: any,
characteristicId: any,
listeners: any
discovering: boolean
available: boolean
connected: any
connecting: any
serviceRule: any
serviceId: any
characteristicRule: any
characteristicId: any
/** 正在执行的命令 */
command: any,
responseResolve: any,
responseReject: any,
responseTimer: any,
command: any
responseResolve: any
responseReject: any
responseTimer: any
/** 是否显示蓝牙调试信息 */
debug: any,
debug: any
//搜索到的设备
devices: any,
devices: any
//取色仪主动返回的数据
deviceLab: any
}
@ -68,7 +67,7 @@ let stateObj: stateStype = {
//搜索到的设备
devices: [],
//取色仪主动返回的数据
deviceLab: null
deviceLab: null,
}
export default (props) => {
@ -82,20 +81,20 @@ export default (props) => {
const init = async () => {
try {
await openAdapter();
await openAdapter()
} catch (e) {
changeStatus({ available: false })
}
// 绑定事件通知
Taro.onBluetoothAdapterStateChange(res => {
emit({ type: 'stateUpdate', detail: res });
});
Taro.onBLEConnectionStateChange(res => {
emit({ type: res.connected ? 'connected' : 'disconnect', detail: res });
});
Taro.onBLECharacteristicValueChange(({ value }) => notifySubscriber(value));
subscribe(async ev => {
Taro.onBluetoothAdapterStateChange((res) => {
emit({ type: 'stateUpdate', detail: res })
})
Taro.onBLEConnectionStateChange((res) => {
emit({ type: res.connected ? 'connected' : 'disconnect', detail: res })
})
Taro.onBLECharacteristicValueChange(({ value }) => notifySubscriber(value))
subscribe(async (ev) => {
if (ev.type === 'stateUpdate') {
// 蓝牙状态发生的变化
changeStatus({ discovering: ev.detail.discovering, available: ev.detail.available })
@ -106,19 +105,18 @@ export default (props) => {
serviceId: null,
characteristicId: null,
deviceLab: null,
devices:[]
devices: [],
})
Taro.showToast({ icon: 'none', title: '蓝牙连接已断开' });
Taro.showToast({ icon: 'none', title: '蓝牙连接已断开' })
} else if (ev.type === 'connected' && refStatus.current.connecting) {
// 连接成功
changeStatus({ connected: refStatus.current.connecting, connecting: null })
Taro.showToast({ title: '蓝牙已连接' });
Taro.showToast({ title: '蓝牙已连接' })
} else if (ev.type === 'measure') {
//监听取色仪主动推送lab
await measureAndGetLab()
}
});
})
}
/** 打开蓝牙适配器 */
@ -126,9 +124,9 @@ export default (props) => {
return new Promise((resolve, reject) => {
Taro.openBluetoothAdapter({
success: resolve,
fail: reject
});
});
fail: reject,
})
})
}
/**
@ -136,15 +134,15 @@ export default (props) => {
* @param {{type: string; data: any}} event
*/
const emit = (event) => {
refStatus.current.listeners.forEach(cb => {
cb && cb(event);
});
refStatus.current.listeners.forEach((cb) => {
cb && cb(event)
})
}
const subscribe = (cb) => {
if (cb) {
changeStatus({
listeners: refStatus.current.listeners.add(cb)
listeners: refStatus.current.listeners.add(cb),
})
}
}
@ -157,7 +155,7 @@ export default (props) => {
return new Promise((resolve, reject) => {
Taro.getBluetoothAdapterState({
success: resolve,
fail: reject
fail: reject,
})
})
}
@ -170,32 +168,32 @@ export default (props) => {
const startScan = (duration = 30000) => {
console.log('开始寻找')
changeStatus({ devices: [] })
Taro.onBluetoothDeviceFound(getDevices);
Taro.onBluetoothDeviceFound(getDevices)
return new Promise((resolve, reject) => {
Taro.startBluetoothDevicesDiscovery({
allowDuplicatesKey: true,
success: resolve,
fail: reject
});
fail: reject,
})
if (duration > 0) {
setTimeout(() => {
Taro.offBluetoothDeviceFound(getDevices);
Taro.stopBluetoothDevicesDiscovery();
console.log("停止搜索")
}, duration);
Taro.offBluetoothDeviceFound(getDevices)
Taro.stopBluetoothDevicesDiscovery()
console.log('停止搜索')
}, duration)
}
});
})
}
//获取搜索到的设备
const getDevices = (res) => {
res.devices.forEach(device => {
res.devices.forEach((device) => {
// 排除掉已搜索到的设备和名称不合法的设备, 将新发现的设备添加到列表中
if (/^CM/.test(device.name) && !refStatus.current.devices.find(i => i.deviceId === device.deviceId)) {
if (/^CM/.test(device.name) && !refStatus.current.devices.find((i) => i.deviceId === device.deviceId)) {
changeStatus({ devices: [...refStatus.current.devices, device] })
}
});
})
}
/**
@ -206,34 +204,34 @@ export default (props) => {
try {
changeStatus({ connecting: device })
console.log('connecting::', device)
await createConnection(device.deviceId);
await discoverService(device.deviceId);
await discoverCharacteristic(device.deviceId);
await notifyCharacteristicValueChange(device.deviceId);
await createConnection(device.deviceId)
await discoverService(device.deviceId)
await discoverCharacteristic(device.deviceId)
await notifyCharacteristicValueChange(device.deviceId)
} catch (e) {
changeStatus({ connecting: null })
Taro.showToast({ icon: 'none', title: '蓝牙连接失败' });
throw e;
Taro.showToast({ icon: 'none', title: '蓝牙连接失败' })
throw e
}
}
/** 断开当前连接的设备 */
const disconnect = async () => {
if (!refStatus.current.connected && !refStatus.current.connecting) return;
if (!refStatus.current.connected && !refStatus.current.connecting) return
if (refStatus.current.connected) {
await closeConnection(refStatus.current.connected.deviceId);
resetCommand();
await closeConnection(refStatus.current.connected.deviceId)
resetCommand()
changeStatus({
connected: null,
serviceId: null,
characteristicId: null,
devices: [],
deviceLab: null
deviceLab: null,
})
}
if (refStatus.current.connecting) {
await closeConnection(refStatus.current.connecting.deviceId);
await closeConnection(refStatus.current.connecting.deviceId)
changeStatus({ connecting: null })
}
}
@ -245,9 +243,9 @@ export default (props) => {
deviceId,
timeout: 2000,
success: resolve,
fail: reject
});
});
fail: reject,
})
})
}
/** 关闭 BLE 连接 */
@ -256,9 +254,9 @@ export default (props) => {
Taro.closeBLEConnection({
deviceId,
success: resolve,
fail: reject
});
});
fail: reject,
})
})
}
/** 搜索服务 */
@ -267,17 +265,17 @@ export default (props) => {
Taro.getBLEDeviceServices({
deviceId,
success: ({ services }) => {
const service = services.find(i => refStatus.current.serviceRule.test(i.uuid));
const service = services.find((i) => refStatus.current.serviceRule.test(i.uuid))
if (!service) {
reject(new Error('服务不可用'));
reject(new Error('服务不可用'))
} else {
changeStatus({ serviceId: service.uuid })
resolve(service);
resolve(service)
}
},
fail: reject
});
});
fail: reject,
})
})
}
/** 搜索特征 */
@ -287,17 +285,17 @@ export default (props) => {
deviceId,
serviceId: refStatus.current.serviceId,
success: ({ characteristics }) => {
const characteristic = characteristics.find(i => refStatus.current.characteristicRule.test(i.uuid));
const characteristic = characteristics.find((i) => refStatus.current.characteristicRule.test(i.uuid))
if (!characteristic) {
reject(new Error('特征不可用'));
reject(new Error('特征不可用'))
} else {
changeStatus({ characteristicId: characteristic.uuid })
resolve(characteristic);
resolve(characteristic)
}
},
fail: reject
fail: reject,
})
})
});
}
/** 启动特征通知 */
@ -309,9 +307,9 @@ export default (props) => {
characteristicId: refStatus.current.characteristicId,
state: stateParm,
success: resolve,
fail: reject
});
});
fail: reject,
})
})
}
/**
@ -321,22 +319,22 @@ export default (props) => {
function notifySubscriber(buffer) {
if (refStatus.current.command) {
if (refStatus.current.debug) {
console.log(`[BLE RESP] ${uint8ArrayToHex(new Uint8Array(buffer))}`);
console.log(`[BLE RESP] ${uint8ArrayToHex(new Uint8Array(buffer))}`)
}
refStatus.current.command.fillResponse(buffer);
refStatus.current.command.fillResponse(buffer)
if (refStatus.current.command.isComplete) {
if (refStatus.current.command.isValid && refStatus.current.responseResolve) {
refStatus.current.responseResolve(refStatus.current.command.response);
refStatus.current.responseResolve(refStatus.current.command.response)
} else if (!refStatus.current.command.isValid) {
refStatus.current.responseReject(new Error('无效数据'));
refStatus.current.responseReject(new Error('无效数据'))
}
resetCommand();
resetCommand()
}
} else {
const uint8Array = new Uint8Array(buffer);
const uint8Array = new Uint8Array(buffer)
if (uint8Array[0] === 0xbb && uint8Array[1] === 1 && uint8Array[3] === 0) {
const ev = { type: 'measure', detail: { mode: uint8Array[2] } };
emit(ev);
const ev = { type: 'measure', detail: { mode: uint8Array[2] } }
emit(ev)
}
}
}
@ -349,32 +347,31 @@ export default (props) => {
function exec(command) {
return new Promise(async (resolve, reject) => {
if (refStatus.current.command) {
reject(new Error('正在执行其他命令'));
reject(new Error('正在执行其他命令'))
} else {
try {
refStatus.current.command = command;
const data = command.data;
refStatus.current.command = command
const data = command.data
for (let i = 0; i < data.length; i++) {
await sendData(data[i]);
await sendData(data[i])
}
if (command.responseSize <= 0) {
resolve(true);
resetCommand();
resolve(true)
resetCommand()
} else {
refStatus.current.responseReject = reject;
refStatus.current.responseResolve = resolve;
refStatus.current.responseReject = reject
refStatus.current.responseResolve = resolve
refStatus.current.responseTimer = setTimeout(() => {
reject(new Error('命令响应超时'));
resetCommand();
}, command.timeout);
reject(new Error('命令响应超时'))
resetCommand()
}, command.timeout)
}
} catch (e) {
reject(e);
reject(e)
}
}
});
})
}
/**
@ -383,7 +380,7 @@ export default (props) => {
*/
function sendData(buffer) {
if (refStatus.current.debug) {
console.log(`[BLE SEND] ${uint8ArrayToHex(new Uint8Array(buffer))}`);
console.log(`[BLE SEND] ${uint8ArrayToHex(new Uint8Array(buffer))}`)
}
return new Promise((resolve, reject) => {
console.log('current:::', refStatus.current)
@ -393,20 +390,20 @@ export default (props) => {
characteristicId: refStatus.current.characteristicId,
value: buffer,
success: resolve,
fail: reject
fail: reject,
})
})
});
}
function resetCommand() {
if (refStatus.current.responseTimer) {
clearTimeout(refStatus.current.responseTimer);
clearTimeout(refStatus.current.responseTimer)
}
changeStatus({
command: null,
responseResolve: null,
responseReject: null,
responseTimer: null
responseTimer: null,
})
}
@ -417,11 +414,11 @@ export default (props) => {
*/
async function measure(mode = 0) {
console.log('current1:::', Command.WakeUp)
await exec(Command.WakeUp);
await exec(Command.WakeUp)
console.log('current2:::', Command.WakeUp)
await waitFor(50);
await waitFor(50)
console.log('current3:::', Command.WakeUp)
return await exec(Command.measure(mode));
return await exec(Command.measure(mode))
}
/**
@ -430,14 +427,14 @@ export default (props) => {
* @returns {Promise<{ L: number, a: number, b: number }>}
*/
async function getLab(mode = 0) {
await exec(Command.WakeUp);
await waitFor(50);
const data: any = await exec(Command.getLab(mode));
await exec(Command.WakeUp)
await waitFor(50)
const data: any = await exec(Command.getLab(mode))
return {
L: uint8ArrayToFloat32(data.slice(5, 9)),
a: uint8ArrayToFloat32(data.slice(9, 13)),
b: uint8ArrayToFloat32(data.slice(13, 17)),
};
}
}
/**
@ -446,26 +443,30 @@ export default (props) => {
* @returns {Promise<{L: number, a: number, b: number}>}
*/
async function measureAndGetLab(mode = 0) {
await measure(mode);
await waitFor(50);
const lab = await getLab(mode);
await measure(mode)
await waitFor(50)
const lab = await getLab(mode)
console.log('lab2::', lab)
changeStatus({ deviceLab: lab })
return lab
}
return <Context.Provider children={props.children} value={{
return (
<Context.Provider
children={props.children}
value={{
init,
state,
startScan,
measureAndGetLab,
getAdapterState,
connect,
disconnect
}} />
disconnect,
}}
/>
)
}
export const useBluetoothTwo = () => {
const res = React.useContext<any>(Context)
if (res) {
@ -473,5 +474,4 @@ export const useBluetoothTwo = () => {
} else {
return {}
}
}

264
src/use/contextBlueTooth.tsx
View File

@ -1,41 +1,40 @@
import React, {useRef, useState } from "react"
import Taro from "@tarojs/taro";
import { Command } from "@/common/bluetooth/command";
import { uint8ArrayToFloat32, uint8ArrayToHex, waitFor } from "@/common/bluetooth/utils";
import React, { useRef, useState } from 'react'
import Taro from '@tarojs/taro'
import { Command } from '@/common/bluetooth/command'
import { uint8ArrayToFloat32, uint8ArrayToHex, waitFor } from '@/common/bluetooth/utils'
interface params {
init: () => void
state: Object,
startScan: () => void,
measureAndGetLab: () => any,
getAdapterState: () => void,
connect: (any) => void,
state: Object
startScan: () => void
measureAndGetLab: () => any
getAdapterState: () => void
connect: (any) => void
disconnect: () => void
}
const Context = React.createContext<params | unknown>(null)
interface stateStype {
listeners: any,
discovering: boolean,
available: boolean,
connected: any,
connecting: any,
serviceRule: any,
serviceId: any,
characteristicRule: any,
characteristicId: any,
listeners: any
discovering: boolean
available: boolean
connected: any
connecting: any
serviceRule: any
serviceId: any
characteristicRule: any
characteristicId: any
/** 正在执行的命令 */
command: any,
responseResolve: any,
responseReject: any,
responseTimer: any,
command: any
responseResolve: any
responseReject: any
responseTimer: any
/** 是否显示蓝牙调试信息 */
debug: any,
debug: any
//搜索到的设备
devices: any,
devices: any
//取色仪主动返回的数据
deviceLab: any
}
@ -68,7 +67,7 @@ let stateObj: stateStype = {
//搜索到的设备
devices: [],
//取色仪主动返回的数据
deviceLab: null
deviceLab: null,
}
export default (props) => {
@ -82,20 +81,20 @@ export default (props) => {
const init = async () => {
try {
await openAdapter();
await openAdapter()
} catch (e) {
changeStatus({ available: false })
}
// 绑定事件通知
Taro.onBluetoothAdapterStateChange(res => {
emit({ type: 'stateUpdate', detail: res });
});
Taro.onBLEConnectionStateChange(res => {
emit({ type: res.connected ? 'connected' : 'disconnect', detail: res });
});
Taro.onBLECharacteristicValueChange(({ value }) => notifySubscriber(value));
subscribe(async ev => {
Taro.onBluetoothAdapterStateChange((res) => {
emit({ type: 'stateUpdate', detail: res })
})
Taro.onBLEConnectionStateChange((res) => {
emit({ type: res.connected ? 'connected' : 'disconnect', detail: res })
})
Taro.onBLECharacteristicValueChange(({ value }) => notifySubscriber(value))
subscribe(async (ev) => {
if (ev.type === 'stateUpdate') {
// 蓝牙状态发生的变化
changeStatus({ discovering: ev.detail.discovering, available: ev.detail.available })
@ -106,19 +105,18 @@ export default (props) => {
serviceId: null,
characteristicId: null,
deviceLab: null,
devices:[]
devices: [],
})
Taro.showToast({ icon: 'none', title: '蓝牙连接已断开' });
Taro.showToast({ icon: 'none', title: '蓝牙连接已断开' })
} else if (ev.type === 'connected' && refStatus.current.connecting) {
// 连接成功
changeStatus({ connected: refStatus.current.connecting, connecting: null })
Taro.showToast({ title: '蓝牙已连接' });
Taro.showToast({ title: '蓝牙已连接' })
} else if (ev.type === 'measure') {
//监听取色仪主动推送lab
await measureAndGetLab()
}
});
})
}
/** 打开蓝牙适配器 */
@ -126,9 +124,9 @@ export default (props) => {
return new Promise((resolve, reject) => {
Taro.openBluetoothAdapter({
success: resolve,
fail: reject
});
});
fail: reject,
})
})
}
/**
@ -136,15 +134,15 @@ export default (props) => {
* @param {{type: string; data: any}} event
*/
const emit = (event) => {
refStatus.current.listeners.forEach(cb => {
cb && cb(event);
});
refStatus.current.listeners.forEach((cb) => {
cb && cb(event)
})
}
const subscribe = (cb) => {
if (cb) {
changeStatus({
listeners: refStatus.current.listeners.add(cb)
listeners: refStatus.current.listeners.add(cb),
})
}
}
@ -157,7 +155,7 @@ export default (props) => {
return new Promise((resolve, reject) => {
Taro.getBluetoothAdapterState({
success: resolve,
fail: reject
fail: reject,
})
})
}
@ -170,32 +168,32 @@ export default (props) => {
const startScan = (duration = 30000) => {
console.log('开始寻找')
changeStatus({ devices: [] })
Taro.onBluetoothDeviceFound(getDevices);
Taro.onBluetoothDeviceFound(getDevices)
return new Promise((resolve, reject) => {
Taro.startBluetoothDevicesDiscovery({
allowDuplicatesKey: true,
success: resolve,
fail: reject
});
fail: reject,
})
if (duration > 0) {
setTimeout(() => {
Taro.offBluetoothDeviceFound(getDevices);
Taro.stopBluetoothDevicesDiscovery();
console.log("停止搜索")
}, duration);
Taro.offBluetoothDeviceFound(getDevices)
Taro.stopBluetoothDevicesDiscovery()
console.log('停止搜索')
}, duration)
}
});
})
}
//获取搜索到的设备
const getDevices = (res) => {
res.devices.forEach(device => {
res.devices.forEach((device) => {
// 排除掉已搜索到的设备和名称不合法的设备, 将新发现的设备添加到列表中
if (/^CM/.test(device.name) && !refStatus.current.devices.find(i => i.deviceId === device.deviceId)) {
if (/^CM/.test(device.name) && !refStatus.current.devices.find((i) => i.deviceId === device.deviceId)) {
changeStatus({ devices: [...refStatus.current.devices, device] })
}
});
})
}
/**
@ -206,34 +204,34 @@ export default (props) => {
try {
changeStatus({ connecting: device })
console.log('connecting::', device)
await createConnection(device.deviceId);
await discoverService(device.deviceId);
await discoverCharacteristic(device.deviceId);
await notifyCharacteristicValueChange(device.deviceId);
await createConnection(device.deviceId)
await discoverService(device.deviceId)
await discoverCharacteristic(device.deviceId)
await notifyCharacteristicValueChange(device.deviceId)
} catch (e) {
changeStatus({ connecting: null })
Taro.showToast({ icon: 'none', title: '蓝牙连接失败' });
throw e;
Taro.showToast({ icon: 'none', title: '蓝牙连接失败' })
throw e
}
}
/** 断开当前连接的设备 */
const disconnect = async () => {
if (!refStatus.current.connected && !refStatus.current.connecting) return;
if (!refStatus.current.connected && !refStatus.current.connecting) return
if (refStatus.current.connected) {
await closeConnection(refStatus.current.connected.deviceId);
resetCommand();
await closeConnection(refStatus.current.connected.deviceId)
resetCommand()
changeStatus({
connected: null,
serviceId: null,
characteristicId: null,
devices: [],
deviceLab: null
deviceLab: null,
})
}
if (refStatus.current.connecting) {
await closeConnection(refStatus.current.connecting.deviceId);
await closeConnection(refStatus.current.connecting.deviceId)
changeStatus({ connecting: null })
}
}
@ -245,9 +243,9 @@ export default (props) => {
deviceId,
timeout: 2000,
success: resolve,
fail: reject
});
});
fail: reject,
})
})
}
/** 关闭 BLE 连接 */
@ -256,9 +254,9 @@ export default (props) => {
Taro.closeBLEConnection({
deviceId,
success: resolve,
fail: reject
});
});
fail: reject,
})
})
}
/** 搜索服务 */
@ -267,17 +265,17 @@ export default (props) => {
Taro.getBLEDeviceServices({
deviceId,
success: ({ services }) => {
const service = services.find(i => refStatus.current.serviceRule.test(i.uuid));
const service = services.find((i) => refStatus.current.serviceRule.test(i.uuid))
if (!service) {
reject(new Error('服务不可用'));
reject(new Error('服务不可用'))
} else {
changeStatus({ serviceId: service.uuid })
resolve(service);
resolve(service)
}
},
fail: reject
});
});
fail: reject,
})
})
}
/** 搜索特征 */
@ -287,17 +285,17 @@ export default (props) => {
deviceId,
serviceId: refStatus.current.serviceId,
success: ({ characteristics }) => {
const characteristic = characteristics.find(i => refStatus.current.characteristicRule.test(i.uuid));
const characteristic = characteristics.find((i) => refStatus.current.characteristicRule.test(i.uuid))
if (!characteristic) {
reject(new Error('特征不可用'));
reject(new Error('特征不可用'))
} else {
changeStatus({ characteristicId: characteristic.uuid })
resolve(characteristic);
resolve(characteristic)
}
},
fail: reject
fail: reject,
})
})
});
}
/** 启动特征通知 */
@ -309,9 +307,9 @@ export default (props) => {
characteristicId: refStatus.current.characteristicId,
state: stateParm,
success: resolve,
fail: reject
});
});
fail: reject,
})
})
}
/**
@ -321,22 +319,22 @@ export default (props) => {
function notifySubscriber(buffer) {
if (refStatus.current.command) {
if (refStatus.current.debug) {
console.log(`[BLE RESP] ${uint8ArrayToHex(new Uint8Array(buffer))}`);
console.log(`[BLE RESP] ${uint8ArrayToHex(new Uint8Array(buffer))}`)
}
refStatus.current.command.fillResponse(buffer);
refStatus.current.command.fillResponse(buffer)
if (refStatus.current.command.isComplete) {
if (refStatus.current.command.isValid && refStatus.current.responseResolve) {
refStatus.current.responseResolve(refStatus.current.command.response);
refStatus.current.responseResolve(refStatus.current.command.response)
} else if (!refStatus.current.command.isValid) {
refStatus.current.responseReject(new Error('无效数据'));
refStatus.current.responseReject(new Error('无效数据'))
}
resetCommand();
resetCommand()
}
} else {
const uint8Array = new Uint8Array(buffer);
const uint8Array = new Uint8Array(buffer)
if (uint8Array[0] === 0xbb && uint8Array[1] === 1 && uint8Array[3] === 0) {
const ev = { type: 'measure', detail: { mode: uint8Array[2] } };
emit(ev);
const ev = { type: 'measure', detail: { mode: uint8Array[2] } }
emit(ev)
}
}
}
@ -349,32 +347,31 @@ export default (props) => {
function exec(command) {
return new Promise(async (resolve, reject) => {
if (refStatus.current.command) {
reject(new Error('正在执行其他命令'));
reject(new Error('正在执行其他命令'))
} else {
try {
refStatus.current.command = command;
const data = command.data;
refStatus.current.command = command
const data = command.data
for (let i = 0; i < data.length; i++) {
await sendData(data[i]);
await sendData(data[i])
}
if (command.responseSize <= 0) {
resolve(true);
resetCommand();
resolve(true)
resetCommand()
} else {
refStatus.current.responseReject = reject;
refStatus.current.responseResolve = resolve;
refStatus.current.responseReject = reject
refStatus.current.responseResolve = resolve
refStatus.current.responseTimer = setTimeout(() => {
reject(new Error('命令响应超时'));
resetCommand();
}, command.timeout);
reject(new Error('命令响应超时'))
resetCommand()
}, command.timeout)
}
} catch (e) {
reject(e);
reject(e)
}
}
});
})
}
/**
@ -383,7 +380,7 @@ export default (props) => {
*/
function sendData(buffer) {
if (refStatus.current.debug) {
console.log(`[BLE SEND] ${uint8ArrayToHex(new Uint8Array(buffer))}`);
console.log(`[BLE SEND] ${uint8ArrayToHex(new Uint8Array(buffer))}`)
}
return new Promise((resolve, reject) => {
console.log('current:::', refStatus.current)
@ -393,20 +390,20 @@ export default (props) => {
characteristicId: refStatus.current.characteristicId,
value: buffer,
success: resolve,
fail: reject
fail: reject,
})
})
});
}
function resetCommand() {
if (refStatus.current.responseTimer) {
clearTimeout(refStatus.current.responseTimer);
clearTimeout(refStatus.current.responseTimer)
}
changeStatus({
command: null,
responseResolve: null,
responseReject: null,
responseTimer: null
responseTimer: null,
})
}
@ -417,11 +414,11 @@ export default (props) => {
*/
async function measure(mode = 0) {
console.log('current1:::', Command.WakeUp)
await exec(Command.WakeUp);
await exec(Command.WakeUp)
console.log('current2:::', Command.WakeUp)
await waitFor(50);
await waitFor(50)
console.log('current3:::', Command.WakeUp)
return await exec(Command.measure(mode));
return await exec(Command.measure(mode))
}
/**
@ -430,14 +427,14 @@ export default (props) => {
* @returns {Promise<{ L: number, a: number, b: number }>}
*/
async function getLab(mode = 0) {
await exec(Command.WakeUp);
await waitFor(50);
const data: any = await exec(Command.getLab(mode));
await exec(Command.WakeUp)
await waitFor(50)
const data: any = await exec(Command.getLab(mode))
return {
L: uint8ArrayToFloat32(data.slice(5, 9)),
a: uint8ArrayToFloat32(data.slice(9, 13)),
b: uint8ArrayToFloat32(data.slice(13, 17)),
};
}
}
/**
@ -446,26 +443,30 @@ export default (props) => {
* @returns {Promise<{L: number, a: number, b: number}>}
*/
async function measureAndGetLab(mode = 0) {
await measure(mode);
await waitFor(50);
const lab = await getLab(mode);
await measure(mode)
await waitFor(50)
const lab = await getLab(mode)
console.log('lab2::', lab)
changeStatus({ deviceLab: lab })
return lab
}
return <Context.Provider children={props.children} value={{
return (
<Context.Provider
children={props.children}
value={{
init,
state,
startScan,
measureAndGetLab,
getAdapterState,
connect,
disconnect
}} />
disconnect,
}}
/>
)
}
export const useBluetooth = () => {
const res = React.useContext<any>(Context)
if (res) {
@ -473,5 +474,4 @@ export const useBluetooth = () => {
} else {
return {}
}
}

31
src/use/useCheckAuthorize.tsx
View File

@ -1,10 +1,23 @@
import { alert } from "@/common/common";
import Taro from "@tarojs/taro";
import { memo, useCallback, useState } from "react";
import { alert } from '@/common/common'
import Taro from '@tarojs/taro'
import { memo, useCallback, useState } from 'react'
type Scope = 'scope.userLocation'|'scope.userLocation'|'scope.record'|'scope.camera'|'scope.bluetooth'|'scope.writePhotosAlbum'|'scope.addPhoneContact'|'scope.addPhoneCalendar'|'scope.werun'|'scope.address'|'scope.invoiceTitle'|'scope.invoice'|'scope.userInfo'
type Scope =
| 'scope.userLocation'
| 'scope.userLocation'
| 'scope.record'
| 'scope.camera'
| 'scope.bluetooth'
| 'scope.writePhotosAlbum'
| 'scope.addPhoneContact'
| 'scope.addPhoneCalendar'
| 'scope.werun'
| 'scope.address'
| 'scope.invoiceTitle'
| 'scope.invoice'
| 'scope.userInfo'
type Param = {
scope: Scope,
scope: Scope
msg: string //检查不通过时警告
}
export default ({ scope, msg }: Param) => {
@ -24,7 +37,7 @@ export default ({scope, msg}: Param) => {
fail() {
alert.none(msg)
reject(false)
}
},
})
} else {
Taro.openSetting({
@ -35,17 +48,15 @@ export default ({scope, msg}: Param) => {
alert.none(msg)
reject(false)
}
}
},
})
}
}
},
})
})
}, [scope])
return {
check,
}
}

48
src/use/useCommon.ts
View File

@ -1,7 +1,7 @@
import { SubscriptionMessageApi } from "@/api/user"
import Taro from "@tarojs/taro"
import dayjs from "dayjs"
import { useEffect, useRef, useState } from "react"
import { SubscriptionMessageApi } from '@/api/user'
import Taro from '@tarojs/taro'
import dayjs from 'dayjs'
import { useEffect, useRef, useState } from 'react'
//倒计时hook
export const useTimeCountDown = () => {
@ -9,7 +9,7 @@ export const useTimeCountDown = () => {
DD: '',
HH: '',
MM: '',
SS: ''
SS: '',
})
const [timeStatus, setTimeStatus] = useState<0 | 1 | 2>(0) //倒计时状体 0:倒计时未开始 1:倒计时中， 2：倒计时已结束
const timeObj: any = useRef()
@ -30,8 +30,8 @@ export const useTimeCountDown = () => {
}
}, [])
const count_down = () => {
var startData = dayjs();
var endDate = dayjs(endTime.current);
var startData = dayjs()
var endDate = dayjs(endTime.current)
setTimeStatus(() => 1)
if (startData >= endDate) {
clearInterval(timeObj.current)
@ -39,36 +39,35 @@ export const useTimeCountDown = () => {
setTimeStatus(() => 2)
return false
}
var _dd = endDate.diff(startData,'day');
var _hh = endDate.diff(startData,'hour');
var _mm = endDate.diff(startData,'minute');
var _ss = endDate.diff(startData,'second');
var _dd = endDate.diff(startData, 'day')
var _hh = endDate.diff(startData, 'hour')
var _mm = endDate.diff(startData, 'minute')
var _ss = endDate.diff(startData, 'second')
// 转换
var hh = _hh - (_dd*24);
var mm = _mm - (_hh*60);
var ss = _ss - (_mm*60);
var hh = _hh - _dd * 24
var mm = _mm - _hh * 60
var ss = _ss - _mm * 60
// 格式化
var DD = ('00'+_dd).slice(-2);
var HH = ('00'+hh).slice(-2);
var MM = ('00'+mm).slice(-2);
var SS = ('00'+ss).slice(-2);
var DD = ('00' + _dd).slice(-2)
var HH = ('00' + hh).slice(-2)
var MM = ('00' + mm).slice(-2)
var SS = ('00' + ss).slice(-2)
console.log('endTime::', `${DD}-${HH}-${MM}-${SS}`)
setShowTime((e) => ({ ...e, DD, HH, MM, SS }))
}
return {
showTime,
onStart,
timeStatus
timeStatus,
}
}
//订阅消息hook
export const UseSubscriptionMessage = () => {
const { fetchData: fetchDataMessage } = SubscriptionMessageApi()
const openSubscriptionMessage = ({orderId = 0, scenes = 0}:{orderId?: number, scenes: number}) => {
const openSubscriptionMessage = ({ orderId = 0, scenes = 0 }: { orderId?: number; scenes: number }) => {
return new Promise(async (resolve) => {
let params:{sale_order_id?: number, scenes?: number} = {}
let params: { sale_order_id?: number; scenes?: number } = {}
orderId && (params.sale_order_id = orderId)
params.scenes = scenes
let res = await fetchDataMessage(params)
@ -77,7 +76,7 @@ export const UseSubscriptionMessage = () => {
tmplIds: res.data.TemplateID,
complete: function (res) {
resolve(res)
}
},
})
} else {
resolve(true)
@ -86,7 +85,6 @@ export const UseSubscriptionMessage = () => {
}
return {
openSubscriptionMessage
openSubscriptionMessage,
}
}

4
src/use/useCommonData.ts
View File

@ -5,7 +5,7 @@ import { useCallback, useState } from 'react'
import { GetShoppingCartApi } from '@/api/shopCart'
import { useSelector } from '@/reducers/hooks'
export default () => {
const commonData = useSelector(state => state.commonData)
const commonData = useSelector((state) => state.commonData)
const dispatch = useDispatch()
const setShopCount = (shopCount: number) => {
@ -28,6 +28,6 @@ export default () => {
setShopCount,
removeShopCount,
getShopCount,
commonData
commonData,
}
}

103
src/use/useHttp.ts
View File

@ -1,41 +1,38 @@
import Taro, { useRouter } from '@tarojs/taro'
import { useEffect, useRef, useState } from 'react'
import { BASE_URL, WX_APPID } from '@/common/constant'
import useUserInfo from "./useUserInfo"
import qs from 'qs';
import useLogin from './useLogin';
import useLoginRequest from './useLoginRequest';
import useUserInfo from './useUserInfo'
import qs from 'qs'
import useLogin from './useLogin'
import useLoginRequest from './useLoginRequest'
type Params = {
code: string | null
success: true | false
data: any,
msg: string,
loading: true|false,
error: any,
query: any,
filter: any,
sort: any,
total: number,
multiple: true|false, // 请求多次
count: number, // 第几次请求
token: string, // token
page?: number,
data: any
msg: string
loading: true | false
error: any
query: any
filter: any
sort: any
total: number
multiple: true | false // 请求多次
count: number // 第几次请求
token: string // token
page?: number
pageSize?: number
}
type option = {
url?: string,
method?: 'get'|'post'|'put'|'delete',
type?: string,
data?: any,
page?: number,
pageSize?: number,
pagination?: true|false,
base_url?: string,
url?: string
method?: 'get' | 'post' | 'put' | 'delete'
type?: string
data?: any
page?: number
pageSize?: number
pagination?: true | false
base_url?: string
apiMsgStatus?: true | false
}
@ -94,7 +91,8 @@ const showStatus = (status) => {
* @param {Object} options.data 请求的参数
* @returns {Object} 返回fetch(), loading, error, code, msg
*/
export const useRequest = (options:option = {
export const useRequest = (
options: option = {
url: '/',
method: 'get',
type: 'json',
@ -103,9 +101,9 @@ export const useRequest = (options:option = {
pageSize: 24,
pagination: false, // 是否分页
base_url: '',
apiMsgStatus: true //是否直接弹出后端错误
}) => {
apiMsgStatus: true, //是否直接弹出后端错误
},
) => {
options.url = `${options.base_url || BASE_URL}${options.url}`
let params: Params = {
code: null, // 业务码
@ -134,12 +132,12 @@ export const useRequest = (options:option = {
setState((e) => ({ ...e, loading: true }))
stateRef.current.query = {
...sub_options,
...options.pagination && {
...(options.pagination && {
page: stateRef.current.page,
size: stateRef.current.pageSize,
},
}),
...stateRef.current.filter,
...stateRef.current.sort
...stateRef.current.sort,
}
try {
let token = Taro.getStorageSync('token')
@ -147,39 +145,37 @@ export const useRequest = (options:option = {
...options,
...{
header: {
"Platform": 6,
"Appid": WX_APPID,
"Authorization": token || stateRef.current.token,
}
Platform: 6,
Appid: WX_APPID,
Authorization: token || stateRef.current.token,
},
...options.method?.toUpperCase() == 'GET' ? {
data: stateRef.current.query
} : {
data: options.type?.toUpperCase() == 'FORMDATA' ? qs.stringify(stateRef.current.query) : stateRef.current.query
},
...(options.method?.toUpperCase() == 'GET'
? {
data: stateRef.current.query,
}
: {
data: options.type?.toUpperCase() == 'FORMDATA' ? qs.stringify(stateRef.current.query) : stateRef.current.query,
}),
}
const result = await Taro.request(q as any)
const { statusCode } = result
const {
code,
msg,
data
} = result.data
const { code, msg, data } = result.data
if (statusCode === 200) {
stateRef.current.success = (code === 0 ? true : false)
stateRef.current.success = code === 0 ? true : false
stateRef.current.code = code
stateRef.current.msg = msg
stateRef.current.data = data
stateRef.current.total = data?.list ? data?.total : 0
if (code !== 0) {
options.apiMsgStatus !== false &&Taro.showToast({
options.apiMsgStatus !== false &&
Taro.showToast({
title: `${msg}`,
icon: 'none'
icon: 'none',
})
console.log('错误：：', msg)
}
} else {
if (statusCode === 401) {
removeToken()
removeSessionKey()
@ -188,17 +184,15 @@ export const useRequest = (options:option = {
} else {
Taro.showToast({
title: `错误：${showStatus(statusCode)}`,
icon: 'none'
icon: 'none',
})
}
}
} catch (e) {
stateRef.current.success = false
stateRef.current.error = true
stateRef.current.msg = e.errMsg
console.log('后台错误信息：：', e.errMsg)
}
stateRef.current.error = false
stateRef.current.loading = false
@ -210,5 +204,4 @@ export const useRequest = (options:option = {
fetchData,
state,
}
}

29
src/use/useLogin.ts
View File

@ -1,12 +1,12 @@
import useUserInfo from "./useUserInfo"
import Taro, { useDidShow, useRouter } from "@tarojs/taro"
import { GetWxUserInfoApi, GetAdminUserInfoApi, GetPhoneNumberApi, BindingCompanyApi } from "@/api/user"
import useLoginRequest from "./useLoginRequest"
import { SHARE_SCENE } from "@/common/enum"
import { GetShortCodeApi } from "@/api/share"
import { alert } from "@/common/common"
import { LoginApi } from "@/api/login"
import { IMG_CND_Prefix } from "@/common/constant"
import useUserInfo from './useUserInfo'
import Taro, { useDidShow, useRouter } from '@tarojs/taro'
import { GetWxUserInfoApi, GetAdminUserInfoApi, GetPhoneNumberApi, BindingCompanyApi } from '@/api/user'
import useLoginRequest from './useLoginRequest'
import { SHARE_SCENE } from '@/common/enum'
import { GetShortCodeApi } from '@/api/share'
import { alert } from '@/common/common'
import { LoginApi } from '@/api/login'
import { IMG_CND_Prefix } from '@/common/constant'
export default () => {
const { setUserInfo, setAdminUserInfo, setSortCode, userInfo } = useUserInfo()
@ -76,7 +76,7 @@ export default () => {
raw_data: res.rawData,
signature: res.signature,
encrypted_data: res.encryptedData,
iv: res.iv
iv: res.iv,
})
if (user_res.success) {
setUserInfo({ ...user_res.data })
@ -89,11 +89,9 @@ export default () => {
fail: (e) => {
console.log('授权失败：：', e)
reject(e.errMsg)
}
},
})
})
}
//获取手机号码
@ -114,7 +112,6 @@ export default () => {
} else {
reject(res.msg)
}
})
}
@ -122,7 +119,7 @@ export default () => {
const { SharePage } = SHARE_SCENE
const { fetchData: fetchDataShortCode } = GetShortCodeApi()
const getShortCode = async (user_id) => {
const {data: resPage} = await fetchDataShortCode({"share_user_id": user_id, type:SharePage.value})
const { data: resPage } = await fetchDataShortCode({ share_user_id: user_id, type: SharePage.value })
setSortCode({ ...userInfo.sort_code, shareShortPage: { title: '打造面料爆品 专注客户服务', code: resPage.md5_key, img: IMG_CND_Prefix + '/mall/share_img_01.png' } })
}
@ -132,6 +129,6 @@ export default () => {
getSelfUserInfo,
getPhoneNumber,
userInfo,
getAdminUserInfo
getAdminUserInfo,
}
}

76
src/use/useUploadImage.ts
View File

@ -1,11 +1,8 @@
import Taro from '@tarojs/taro';
import Taro from '@tarojs/taro'
import { UPLOAD_CDN_URL } from '@/common/constant'
import { GetSignApi } from '@/api/cdn'
export default () => {
const { fetchData: GetSign, state } = GetSignApi()
// 上传图片 获取auth，Policy
@ -15,12 +12,11 @@ export default () => {
*/
const getSecret = (scene, type) => {
return new Promise(async (resolve, reject) => {
const SAVE_PATH = `/${scene}/{filemd5}{day}{hour}{min}{sec}{.suffix}`;
const SAVE_PATH = `/${scene}/{filemd5}{day}{hour}{min}{sec}{.suffix}`
let params = {
'method': 'post',
'save_key': SAVE_PATH
method: 'post',
save_key: SAVE_PATH,
}
// 获取签名
let res = await GetSign(params)
@ -29,23 +25,22 @@ export default () => {
} else {
reject({
code: res.code || '9999',
msg: res.msg
});
msg: res.msg,
})
}
})
}
const getFileType = (name) => {
if (!name) return false;
var imgType = ["gif", "jpeg", "jpg", "bmp", "png"];
var videoType = ["avi", "wmv", "mkv", "mp4", "mov", "rm", "3gp", "flv", "mpg", "rmvb", "quicktime"];
if (!name) return false
var imgType = ['gif', 'jpeg', 'jpg', 'bmp', 'png']
var videoType = ['avi', 'wmv', 'mkv', 'mp4', 'mov', 'rm', '3gp', 'flv', 'mpg', 'rmvb', 'quicktime']
if (RegExp("\.?(" + imgType.join("|") + ")$", "i").test(name.toLowerCase())) {
return 'image';
} else if (RegExp("\.(" + videoType.join("|") + ")$", "i").test(name.toLowerCase())) {
return 'video';
if (RegExp('.?(' + imgType.join('|') + ')$', 'i').test(name.toLowerCase())) {
return 'image'
} else if (RegExp('.(' + videoType.join('|') + ')$', 'i').test(name.toLowerCase())) {
return 'video'
} else {
return false;
return false
}
}
@ -61,21 +56,21 @@ export default () => {
console.log('filetype::', filetype)
if (!getFileType(filetype)) {
Taro.showToast({
title: "上传文件类型错误",
icon: "none",
duration: 3800
title: '上传文件类型错误',
icon: 'none',
duration: 3800,
})
return false
}
return new Promise((resolve, reject) => {
getSecret(secene, type)
.then(result => {
.then((result) => {
let res: any = result
console.log('bucket', res.bucket);
console.log('bucket', res.bucket)
var formdata = {
'authorization': res.authorization,
'policy': res.policy,
authorization: res.authorization,
policy: res.policy,
}
const uploadTask = Taro.uploadFile({
@ -83,38 +78,37 @@ export default () => {
formData: formdata,
filePath: file.path,
name: 'file',
success: res => {
success: (res) => {
resolve(JSON.parse(`${res.data}`))
},
fail: err => {
fail: (err) => {
console.log(err)
reject(err)
}
},
})
uploadTask.progress(res => {
console.log('上传进度', res.progress);
uploadTask.progress((res) => {
console.log('上传进度', res.progress)
if (res.progress < 100) {
Taro.showLoading({
title: '上传中...'
title: '上传中...',
})
} else {
Taro.hideLoading()
}
})
})
.catch(result => {
.catch((result) => {
reject(result)
Taro.showToast({
title: "获取密钥失败！",
icon: "none",
duration: 3800
title: '获取密钥失败！',
icon: 'none',
duration: 3800,
})
})
})
}
// product 产品相关，图片、纹理图等 全平台
// after-sale 售后（申请退货、退款）相关的、图片、视频 全平台
// mall 电子商城相关的 全平台
@ -146,20 +140,16 @@ export default () => {
let data = await uploadCDNImg(res.tempFiles[0], cdn_upload_type, cdn_upload_type)
resolve(data)
}
} catch (res) {
reject(res)
}
}
},
})
})
}
return {
uploadCDNImg,
getWxPhoto
getWxPhoto,
}
}