diff --git a/.eslintrc b/.eslintrc
index c311d0c..943159f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,6 +4,9 @@
     "no-console": "off",
     "@typescript-eslint/no-shadow": "off",
     "@typescript-eslint/no-unused-vars": "off",
-    "eqeqeq": "off"
+    "eqeqeq": "off",
+    "no-prototype-builtins": "off",
+    "import/first": "off",
+    "react/no-children-prop": "off"
   }
 }
diff --git a/project.private.config.json b/project.private.config.json
index ce8d630..04498e7 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -236,5 +236,5 @@
       ]
     }
   },
-  "libVersion": "2.27.3"
+  "libVersion": "2.28.0"
 }
\ No newline at end of file
diff --git a/src/api/addressList.ts b/src/api/addressList.ts
index c95ca2b..5592606 100644
--- a/src/api/addressList.ts
+++ b/src/api/addressList.ts
@@ -12,35 +12,35 @@ export const GetAddressListApi = () => {
 }
 
 // 获取客户地址
-export const mppurchaseraddresslist = () => {
+export const MpPurchaserAddressList = () => {
   return useRequest({
     url: '/v2/mp/purchaser/address/list',
     method: 'get',
   })
 }
 // 新增客户地址
-export const mppurchaseraddress = () => {
+export const MpPurchaserAddress = () => {
   return useRequest({
     url: '/v2/mp/purchaser/address',
     method: 'post',
   })
 }
 // 获取编辑地址信息
-export const mppurchaseraddressget = () => {
+export const MpPurchaserAddressGet = () => {
   return useRequest({
     url: '/v2/mp/purchaser/address',
     method: 'get',
   })
 }
 // 编辑收货地址信息
-export const mppurchaseraddressput = () => {
+export const MpPurchaserAddressPut = () => {
   return useRequest({
     url: '/v2/mp/purchaser/address',
     method: 'put',
   })
 }
 // 删除收货地址信息
-export const mppurchaseraddressdelect = () => {
+export const MpPurchaserAddressDelete = () => {
   return useRequest({
     url: '/v2/mp/purchaser/address',
     method: 'delete',
diff --git a/src/api/customer.ts b/src/api/customer.ts
index 9afde1f..ee34004 100644
--- a/src/api/customer.ts
+++ b/src/api/customer.ts
@@ -1,35 +1,35 @@
 import { useRequest } from '@/use/useHttp'
 
 // 获取客户信息
-export const mppurchaser = () => {
+export const MpPurchaser = () => {
   return useRequest({
     url: '/v2/mp/purchaser',
     method: 'get',
   })
 }
 // 新建客户
-export const mppurchaserpost = () => {
+export const MpPurchaserPost = () => {
   return useRequest({
     url: '/v2/mp/purchaser',
     method: 'post',
   })
 }
 // 编辑客户
-export const mppurchaserput = () => {
+export const MpPurchaserPut = () => {
   return useRequest({
     url: '/v2/mp/purchaser',
     method: 'put',
   })
 }
 // 获取标签列表
-export const mppurchaserlist = () => {
+export const MpPurchaserList = () => {
   return useRequest({
     url: '/v2/mp/purchaser/label/list',
     method: 'get',
   })
 }
 // 保存标签
-export const mppurchaserlabeladd = () => {
+export const MpPurchaserLabelAdd = () => {
   return useRequest({
     url: '/v2/mp/purchaser/label/add',
     method: 'post',
diff --git a/src/api/index.ts b/src/api/index.ts
index 41f4077..fc037d6 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -54,7 +54,7 @@ export {
  *  系列列表
  * @returns
  */
-export const kindListApi = () => {
+export const KindListApi = () => {
   return useRequest({
     url: '/v2/mp/product/kind/list',
     method: 'get',
diff --git a/src/api/newCollection.ts b/src/api/newCollection.ts
index a36f25d..3f7f30f 100644
--- a/src/api/newCollection.ts
+++ b/src/api/newCollection.ts
@@ -1,35 +1,35 @@
 import { useRequest } from '@/use/useHttp'
 
 // 收款单列表
-export const mpcashManagementOrderlist = () => {
+export const MpCashManagementOrderList = () => {
   return useRequest({
     url: '/v2/mp/cashManagementOrder/list',
     method: 'get',
   })
 }
 // 收款单详情
-export const mpcashManagementOrder = () => {
+export const MpCashManagementOrder = () => {
   return useRequest({
     url: '/v2/mp/cashManagementOrder',
     method: 'get',
   })
 }
 // 收款账号
-export const mpcashManagementOrderaccount = () => {
+export const MpCashManagementOrderAccount = () => {
   return useRequest({
     url: '/v2/mp/cashManagementOrder/account',
     method: 'get',
   })
 }
 // 新建收款单
-export const mpcashManagementOrderpost = () => {
+export const MpCashManagementOrderPost = () => {
   return useRequest({
     url: '/v2/mp/cashManagementOrder',
     method: 'post',
   })
 }
 // 扫描获取应收单的客户信息
-export const mpshouldCollectOrderpurchaser = () => {
+export const MpShouldCollectOrderPurchaser = () => {
   return useRequest({
     url: '/v2/mp/shouldCollectOrder/purchaser',
     method: 'get',
diff --git a/src/api/order.ts b/src/api/order.ts
index f3c0a50..d005496 100644
--- a/src/api/order.ts
+++ b/src/api/order.ts
@@ -1,7 +1,7 @@
 import { useRequest } from '@/use/useHttp'
 import { CAP_HTML_TO_IMAGE_BASE_URL } from '@/common/constant'
 
-export const mpenumsaleorderstatus = () => {
+export const MpEnumSaleOrderStatus = () => {
   return useRequest({
     url: '/v2/mp/enum/filterMPSaleOrderStatus',
     method: 'get',
@@ -30,70 +30,70 @@ export const ClientListApi = () => {
   })
 }
 // 面料种类列表
-export const mpproductcolorlist = () => {
+export const MpProductColorList = () => {
   return useRequest({
     url: '/v2/mp/product/color/list',
     method: 'get',
   })
 }
 // 购物车提交
-export const mpsaleOrderpreView = () => {
+export const MpSaleOrderPreview = () => {
   return useRequest({
     url: '/v2/mp/saleOrder/preView',
     method: 'put',
   })
 }
 // 业务员枚举
-export const mpenumsaleUserlist = () => {
+export const MpEnumSaleUserList = () => {
   return useRequest({
     url: '/v2/mp/enum/saleUser/list',
     method: 'get',
   })
 }
 // 订单详情
-export const mpsaleOrder = () => {
+export const MpSaleOrder = () => {
   return useRequest({
     url: '/v2/mp/saleOrder',
     method: 'get',
   })
 }
 // 取消订单
-export const mpsaleOrdercancel = () => {
+export const MpSaleOrderCancel = () => {
   return useRequest({
     url: '/v2/mp/saleOrder/cancel',
     method: 'put',
   })
 }
 // 再次购买
-export const mpshoppingCartproductColorlist = () => {
+export const MpShoppingCartProductColorList = () => {
   return useRequest({
     url: '/v2/mp/shoppingCart/productColor/list',
     method: 'post',
   })
 }
 // 获取账期付款
-export const orderPaymentorderPaymentMethodInfo = () => {
+export const OrderPaymentOrderPaymentMethodInfo = () => {
   return useRequest({
     url: '/v2/mp/orderPayment/orderPaymentMethodInfo',
     method: 'get',
   })
 }
 // 预收单获取接口信息
-export const orderPaymentpreCollectOrderorderPaymentMethodInfo = () => {
+export const OrderPaymentPreCollectOrderOrderPaymentMethodInfo = () => {
   return useRequest({
     url: '/v2/mp/orderPayment/preCollectOrder/orderPaymentMethodInfo',
     method: 'get',
   })
 }
 // 确认交易
-export const orderPaymentorderPaymentSubmission = () => {
+export const OrderPaymentOrderPaymentSubmission = () => {
   return useRequest({
     url: '/v2/mp/orderPayment/orderPaymentSubmission',
     method: 'put',
   })
 }
 // 订单预支付提交
-export const orderPaymentpreCollectOrderorderPaymentSubmission = () => {
+export const OrderPaymentPreCollectOrderOrderPaymentSubmission = () => {
   return useRequest({
     url: '/v2/mp/orderPayment/preCollectOrder/orderPaymentSubmission',
     method: 'put',
@@ -120,70 +120,70 @@ export const GetReturnPayCode = () => {
   })
 }
 // 编辑备注信息
-export const mpsaleOrderput = () => {
+export const MpSaleOrderPut = () => {
   return useRequest({
     url: '/v2/mp/saleOrder',
     method: 'put',
   })
 }
 // 修改销售单的收货地址
-export const mpsaleOrderaddress = () => {
+export const MpSaleOrderAddress = () => {
   return useRequest({
     url: '/v2/mp/saleOrder/address',
     method: 'put',
   })
 }
 // 关键字搜索历史
-export const mpsearchHistorylist = () => {
+export const MpSearchHistoryList = () => {
   return useRequest({
     url: '/v2/mp/searchHistory/list',
     method: 'get',
   })
 }
 // 添加关键字搜索
-export const mpsearchHistory = () => {
+export const MpSearchHistory = () => {
   return useRequest({
     url: '/v2/mp/searchHistory',
     method: 'post',
   })
 }
 // 确认收货
-export const mpsaleOrderreceive = () => {
+export const MpSaleOrderReceive = () => {
   return useRequest({
     url: '/v2/mp/saleOrder/receive',
     method: 'put',
   })
 }
 // 退货原因
-export const mpenumreturnOrderreturnReason = () => {
+export const MpEnumReturnOrderReturnReason = () => {
   return useRequest({
     url: '/v2/mp/enum/returnOrder/returnReason',
     method: 'get',
   })
 }
 // 二次选择退货原因
-export const mpenumreturnExplain = () => {
+export const MpEnumReturnExplain = () => {
   return useRequest({
     url: '/v2/mp/enum/returnExplain',
     method: 'get',
   })
 }
 // 货物状况
-export const mpenumreturngoodsStatus = () => {
+export const MpEnumReturnGoodsStatus = () => {
   return useRequest({
     url: '/v2/mp/enum/return/goodsStatus',
     method: 'get',
   })
 }
 // 申请退货
-export const mpreturnApplyOrder = () => {
+export const MpReturnApplyOrder = () => {
   return useRequest({
     url: '/v2/mp/returnApplyOrder',
     method: 'put',
   })
 }
 // 退款说明
-export const mpenumrefundExplainone = () => {
+export const MpEnumRefundExplainOne = () => {
   return useRequest({
     url: '/v2/mp/enum/refundExplain',
     method: 'get',
@@ -191,14 +191,14 @@ export const mpenumrefundExplainone = () => {
 }
 
 // 提交订单
-export const mpsaleOrderpost = () => {
+export const MpSaleOrderPost = () => {
   return useRequest({
     url: '/v2/mp/saleOrder',
     method: 'post',
   })
 }
 // 修改销售单物流方式
-export const mpsaleOrdershipmentMode = () => {
+export const MpSaleOrderShipmentMode = () => {
   return useRequest({
     url: '/v2/mp/saleOrder/shipmentMode',
     method: 'put',
diff --git a/src/api/refound.ts b/src/api/refound.ts
index 93b01b8..2aa0245 100644
--- a/src/api/refound.ts
+++ b/src/api/refound.ts
@@ -1,42 +1,42 @@
 import { useRequest } from '@/use/useHttp'
 
 // 售后订单列表
-export const mpreturnApplyOrderlist = () => {
+export const MpReturnApplyOrderList = () => {
   return useRequest({
     url: '/v2/mp/returnApplyOrder/list',
     method: 'get',
   })
 }
 // 售后状态枚举
-export const mpenumreturnStage = () => {
+export const MpEnumReturnStage = () => {
   return useRequest({
     url: '/v2/mp/enum/returnStage',
     method: 'get',
   })
 }
 // 退款类型枚举
-export const mpenumreturnType = () => {
+export const MpEnumReturnType = () => {
   return useRequest({
     url: '/v2/mp/enum/returnType',
     method: 'get',
   })
 }
 // 售后详情
-export const mpreturnApplyOrder = () => {
+export const MpReturnApplyOrder = () => {
   return useRequest({
     url: '/v2/mp/returnApplyOrder',
     method: 'get',
   })
 }
 // 取消退货
-export const returnApplyOrdercancel = () => {
+export const ReturnApplyOrderCancel = () => {
   return useRequest({
     url: '/v2/mp/returnApplyOrder/cancel',
     method: 'post',
   })
 }
 // 售后确认上传附件
-export const returnApplyOrderuploadAccessory = () => {
+export const ReturnApplyOrderUploadAccessory = () => {
   return useRequest({
     url: '/v2/mp/returnApplyOrder/uploadAccessory',
     method: 'put',
diff --git a/src/api/search.ts b/src/api/search.ts
index 2710845..a4848a2 100644
--- a/src/api/search.ts
+++ b/src/api/search.ts
@@ -1,6 +1,6 @@
 import { useRequest } from '@/use/useHttp'
 // 搜索商品
-export const mpproductlist = () => {
+export const MpProductList = () => {
   return useRequest({
     url: '/v2/mp/product/list',
     method: 'get',
diff --git a/src/app.tsx b/src/app.tsx
index 6dbceb6..57276e3 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -1,10 +1,10 @@
+import Taro, { onAppShow } from '@tarojs/taro'
 import type { FC } from 'react'
 import { Provider } from 'react-redux'
 import configStore from './store'
+import { shareShop } from './common/util'
 import ContextBlueTooth from '@/use/contextBlueTooth'
 import './app.scss'
-import Taro, { onAppShow, useDidShow } from '@tarojs/taro'
-import { shareShop } from './common/util'
 
 interface ParamsType {
   children?: React.ReactNode
diff --git a/src/common/bluetooth/color/colorDiff.js b/src/common/bluetooth/color/colorDiff.js
index ae8066d..57d5da4 100644
--- a/src/common/bluetooth/color/colorDiff.js
+++ b/src/common/bluetooth/color/colorDiff.js
@@ -1,4 +1,4 @@
-module.exports = function(lab1, lab2) {
+module.exports = function(lab1, lab2) {
   const rgb2labArray1 = lab1
   const rgb2labArray2 = lab2
 
@@ -10,35 +10,35 @@ module.exports = function(lab1, lab2) {
   const a2 = rgb2labArray2[1]
   const b2 = rgb2labArray2[2]
 
-  const avg_lp 		= (l1 + l2) / 2
-  const c1 			= Math.sqrt(Math.pow(a1, 2) + Math.pow(b1, 2))
-  const c2 			= Math.sqrt(Math.pow(a2, 2) + Math.pow(b2, 2))
-  const avg_c 		= (c1 + c2) / 2
-  const g 			= (1 - Math.sqrt(Math.pow(avg_c, 7) / (Math.pow(avg_c, 7) + Math.pow(25, 7)))) / 2
+  const avg_lp = (l1 + l2) / 2
+  const c1 = Math.sqrt(Math.pow(a1, 2) + Math.pow(b1, 2))
+  const c2 = Math.sqrt(Math.pow(a2, 2) + Math.pow(b2, 2))
+  const avg_c = (c1 + c2) / 2
+  const g = (1 - Math.sqrt(Math.pow(avg_c, 7) / (Math.pow(avg_c, 7) + Math.pow(25, 7)))) / 2
 
-  const a1p 		= a1 * (1 + g)
-  const a2p 		= a2 * (1 + g)
+  const a1p = a1 * (1 + g)
+  const a2p = a2 * (1 + g)
 
-  const c1p 		= Math.sqrt(Math.pow(a1p, 2) + Math.pow(b1, 2))
-  const c2p 		= Math.sqrt(Math.pow(a2p, 2) + Math.pow(b2, 2))
+  const c1p = Math.sqrt(Math.pow(a1p, 2) + Math.pow(b1, 2))
+  const c2p = Math.sqrt(Math.pow(a2p, 2) + Math.pow(b2, 2))
 
-  const avg_cp 		= (c1p + c2p) / 2
+  const avg_cp = (c1p + c2p) / 2
 
-  let h1p 		= rad2deg(Math.atan2(b1, a1p))
-  if (h1p < 0) {
+  let h1p = rad2deg(Math.atan2(b1, a1p))
+  if (h1p < 0) {
     h1p = h1p + 360
   }
 
-  let h2p 		= rad2deg(Math.atan2(b2, a2p))
-  if (h2p < 0) {
+  let h2p = rad2deg(Math.atan2(b2, a2p))
+  if (h2p < 0) {
     h2p = h2p + 360
   }
 
-  const avg_hp 		= Math.abs(h1p - h2p) > 180 ? (h1p + h2p + 360) / 2 : (h1p + h1p) / 2
+  const avg_hp = Math.abs(h1p - h2p) > 180 ? (h1p + h2p + 360) / 2 : (h1p + h1p) / 2
 
-  const t 			= 1 - 0.17 * Math.cos(deg2rad(avg_hp - 30)) + 0.24 * Math.cos(deg2rad(2 * avg_hp)) + 0.32 * Math.cos(deg2rad(3 * avg_hp + 6)) - 0.2 * Math.cos(deg2rad(4 * avg_hp - 63))
+  const t = 1 - 0.17 * Math.cos(deg2rad(avg_hp - 30)) + 0.24 * Math.cos(deg2rad(2 * avg_hp)) + 0.32 * Math.cos(deg2rad(3 * avg_hp + 6)) - 0.2 * Math.cos(deg2rad(4 * avg_hp - 63))
 
-  let delta_hp 	= h2p - h1p
+  let delta_hp = h2p - h1p
   if (Math.abs(delta_hp) > 180) {
     if (h2p <= h1p) {
       delta_hp += 360
@@ -48,18 +48,18 @@ module.exports = function(lab1, lab2) {
     }
   }
 
-  const delta_lp 	= l2 - l1
-  const delta_cp 	= c2p - c1p
+  const delta_lp = l2 - l1
+  const delta_cp = c2p - c1p
 
-  delta_hp 		= 2 * Math.sqrt(c1p * c2p) * Math.sin(deg2rad(delta_hp) / 2)
+  delta_hp = 2 * Math.sqrt(c1p * c2p) * Math.sin(deg2rad(delta_hp) / 2)
 
-  const s_l 		= 1 + ((0.015 * Math.pow(avg_lp - 50, 2)) / Math.sqrt(20 + Math.pow(avg_lp - 50, 2)))
-  const s_c 		= 1 + 0.045 * avg_cp
-  const s_h 		= 1 + 0.015 * avg_cp * t
+  const s_l = 1 + ((0.015 * Math.pow(avg_lp - 50, 2)) / Math.sqrt(20 + Math.pow(avg_lp - 50, 2)))
+  const s_c = 1 + 0.045 * avg_cp
+  const s_h = 1 + 0.015 * avg_cp * t
 
-  const delta_ro 	= 30 * Math.exp(-(Math.pow((avg_hp - 275) / 25, 2)))
-  const r_c 		= 2 * Math.sqrt(Math.pow(avg_cp, 7) / (Math.pow(avg_cp, 7) + Math.pow(25, 7)))
-  const r_t			= -r_c * Math.sin(2 * deg2rad(delta_ro))
+  const delta_ro = 30 * Math.exp(-(Math.pow((avg_hp - 275) / 25, 2)))
+  const r_c = 2 * Math.sqrt(Math.pow(avg_cp, 7) / (Math.pow(avg_cp, 7) + Math.pow(25, 7)))
+  const r_t = -r_c * Math.sin(2 * deg2rad(delta_ro))
 
   const kl = 1; const kc = 1; const kh = 1
 
@@ -67,10 +67,10 @@ module.exports = function(lab1, lab2) {
 
   return delta_e
 
-  function rad2deg(rad) {
+  function rad2deg(rad) {
     return 360 * rad / (2 * Math.PI)
   }
-  function deg2rad(deg) {
+  function deg2rad(deg) {
     return (2 * Math.PI * deg) / 360
   }
 }
diff --git a/src/common/bluetooth/color/lab.js b/src/common/bluetooth/color/lab.js
index 6741df7..d2bb0a3 100644
--- a/src/common/bluetooth/color/lab.js
+++ b/src/common/bluetooth/color/lab.js
@@ -1,4 +1,6 @@
 
+/* eslint-disable import/no-commonjs */
+
 const xyz = require('./xyz')
 
 module.exports = {
@@ -17,7 +19,7 @@ module.exports = {
     if (l <= 8) {
       y = (l * 100) / 903.3
       y2 = (7.787 * (y / 100)) + (16 / 116)
-    }
+    }
     else {
       y = 100 * Math.pow((l + 16) / 116, 3)
       y2 = Math.pow(y / 100, 1 / 3)
@@ -32,11 +34,10 @@ module.exports = {
 }
 
 // extend xyz
-xyz.lab = function(xyz) {
-  let x = xyz[0]
-  let y = xyz[1]
-  let z = xyz[2]
-  let l; let a; let b
+xyz.lab = function(xyz1) {
+  let x = xyz1[0]
+  let y = xyz1[1]
+  let z = xyz1[2]
 
   x /= 95.047
   y /= 100
@@ -46,9 +47,9 @@ xyz.lab = function(xyz) {
   y = y > 0.008856 ? Math.pow(y, 1 / 3) : (7.787 * y) + (16 / 116)
   z = z > 0.008856 ? Math.pow(z, 1 / 3) : (7.787 * z) + (16 / 116)
 
-  l = (116 * y) - 16
-  a = 500 * (x - y)
-  b = 200 * (y - z)
+  const l = (116 * y) - 16
+  const a = 500 * (x - y)
+  const b = 200 * (y - z)
 
   return [l, a, b]
 }
diff --git a/src/common/bluetooth/color/rgb.js b/src/common/bluetooth/color/rgb.js
index 0aba252..c0c9ea8 100644
--- a/src/common/bluetooth/color/rgb.js
+++ b/src/common/bluetooth/color/rgb.js
@@ -1,3 +1,4 @@
+/* eslint-disable import/no-commonjs */
 
 module.exports = {
   name: 'rgb',
diff --git a/src/common/bluetooth/color/xyz.js b/src/common/bluetooth/color/xyz.js
index f25cb3b..6c1dee0 100644
--- a/src/common/bluetooth/color/xyz.js
+++ b/src/common/bluetooth/color/xyz.js
@@ -1,4 +1,6 @@
 
+/* eslint-disable import/no-commonjs */
+
 const rgb = require('./rgb')
 
 const xyz = {
@@ -86,15 +88,15 @@ xyz.rgb = function(_xyz, white) {
   g = (x * -0.96924363628087) + (y * 1.87596750150772) + (z * 0.041555057407175)
   b = (x * 0.055630079696993) + (y * -0.20397695888897) + (z * 1.056971514242878)
 
-  r = r > 0.0031308
+  r = r > 0.0031308
     ? ((1.055 * Math.pow(r, 1.0 / 2.4)) - 0.055)
     : r = (r * 12.92)
 
-  g = g > 0.0031308
+  g = g > 0.0031308
     ? ((1.055 * Math.pow(g, 1.0 / 2.4)) - 0.055)
     : g = (g * 12.92)
 
-  b = b > 0.0031308
+  b = b > 0.0031308
     ? ((1.055 * Math.pow(b, 1.0 / 2.4)) - 0.055)
     : b = (b * 12.92)
 
@@ -112,10 +114,10 @@ xyz.rgb = function(_xyz, white) {
  *
  * @return {Array} XYZ channels
  */
-rgb.xyz = function(rgb, white) {
-  let r = rgb[0] / 255
-  let g = rgb[1] / 255
-  let b = rgb[2] / 255
+rgb.xyz = function(rgb1, white) {
+  let r = rgb1[0] / 255
+  let g = rgb1[1] / 255
+  let b = rgb1[2] / 255
 
   // assume sRGB
   r = r > 0.04045 ? Math.pow(((r + 0.055) / 1.055), 2.4) : (r / 12.92)
diff --git a/src/common/bluetooth/utils.js b/src/common/bluetooth/utils.js
index d6b0ab2..15c9da6 100644
--- a/src/common/bluetooth/utils.js
+++ b/src/common/bluetooth/utils.js
@@ -55,11 +55,11 @@ export function uint8ArrayToHex(raw) {
 }
 
 // 二进制转字符串(ascii)
-export function bufferToString(buffer) {
-  let str = ''
-  for (const code of buffer) {
-    if (code === 0) { break }
-    str += utf82string(code)
-  }
-  return str
-}
+// export function bufferToString(buffer) {
+//   let str = ''
+//   for (const code of buffer) {
+//     if (code === 0) { break }
+//     str += utf82string(code)
+//   }
+//   return str
+// }
diff --git a/src/common/format.js b/src/common/format.js
index 2dcf9eb..bd68e9a 100644
--- a/src/common/format.js
+++ b/src/common/format.js
@@ -1,5 +1,27 @@
 import { IMG_CND_Prefix } from './constant'
-
+/**
+ *  精度
+ * @param {*} num
+ * @param {*} precision
+ * @returns
+ */
+export const strip = (num, precision = 12) => {
+  return +parseFloat(num.toPrecision(precision))
+}
+/**
+ *
+ * @param {千位分割付} number
+ * @returns
+ */
+export const numberWithCommas = ({ number = 0, digit = 2 }) => {
+  if (!Number.isNaN(Number(number))) {
+    // return parseFloat(number).toFixed(digit).replace(/^\B(?<!\.\d*)(?=(\d{3})+(?!\d))$/g, ",");
+    return parseFloat(number).toLocaleString('zh', { minimumFractionDigits: digit })
+  }
+  else {
+    return 0.0
+  }
+}
 /**
  * 移除井号
  * @param {String} val code 编码
@@ -118,26 +140,6 @@ export const formatDateTime = (val, fmt = 'YYYY-MM-DD HH:mm:ss') => {
   }
 }
 
-/**
- *  精度
- * @param {*} num
- * @param {*} precision
- * @returns
- */
-export const strip = (num, precision = 12) => {
-  return +parseFloat(num.toPrecision(precision))
-}
-
-/**
- * 转换金额单位
- * @param {*} num 金额 / 数值
- * @param {*} digit 转换单位
- * @returns
- */
-export const formatMillionYuan = (num, digit = 10000) => {
-  return num / digit > 1 ? { num: toDecimal2(num / digit), million: true } : { num, million: false }
-}
-
 /**
  * 数值保留两位小数
  * @param {*} x
@@ -145,7 +147,7 @@ export const formatMillionYuan = (num, digit = 10000) => {
  */
 export const toDecimal2 = (x) => {
   let f = parseFloat(x)
-  if (isNaN(f)) {
+  if (Number.isNaN(f)) {
     return 0
   }
   f = `${f}`
@@ -162,6 +164,16 @@ export const toDecimal2 = (x) => {
   return f
 }
 
+/**
+ * 转换金额单位
+ * @param {*} num 金额 / 数值
+ * @param {*} digit 转换单位
+ * @returns
+ */
+export const formatMillionYuan = (num, digit = 10000) => {
+  return num / digit > 1 ? { num: toDecimal2(num / digit), million: true } : { num, million: false }
+}
+
 // 匹配前缀 例如：//xxx.com  或者 http://xxx.com 或者 https://xxx.com
 // eslint-disable-next-line no-useless-escape
 const URL_REGEXP = /(https?:)?\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()!@:%_\+.~#?&=]*)/gi
@@ -231,21 +243,6 @@ export const isLabImage = (imgurl, rgb, suffix = '!w200') => {
   }
 }
 
-/**
- *
- * @param {千位分割付} number
- * @returns
- */
-export const numberWithCommas = ({ number = 0, digit = 2 }) => {
-  if (!isNaN(Number(number))) {
-    // return parseFloat(number).toFixed(digit).replace(/^\B(?<!\.\d*)(?=(\d{3})+(?!\d))$/g, ",");
-    return parseFloat(number).toLocaleString('zh', { minimumFractionDigits: digit })
-  }
-  else {
-    return 0.0
-  }
-}
-
 // 计算数值大于指定值
 export const setPriceUnit = (num, cls) => {
   if (cls) {
diff --git a/src/common/shortCode/index.js b/src/common/shortCode/index.js
index 22d6dc5..af2ac37 100644
--- a/src/common/shortCode/index.js
+++ b/src/common/shortCode/index.js
@@ -1,6 +1,20 @@
 import Taro from '@tarojs/taro'
 import { BASE_URL } from '../constant'
 
+// 绑定上下级
+const bindParent = (share_user_id) => {
+  // 绑定上下级
+  Taro.request({
+    url: `${BASE_URL}/v1/mall/shortCode/bind`,
+    method: 'POST',
+    data: { share_user_id },
+    success: (res) => {
+      if (res.data.code == 0) {
+        // 绑定上下级
+      }
+    },
+  })
+}
 // 解析短码（主要用于右上角按钮分享）
 export const analysisShortCodeApi = (val) => {
   // 解析短码
@@ -16,18 +30,3 @@ export const analysisShortCodeApi = (val) => {
     },
   })
 }
-
-// 绑定上下级
-const bindParent = (share_user_id) => {
-  // 绑定上下级
-  Taro.request({
-    url: `${BASE_URL}/v1/mall/shortCode/bind`,
-    method: 'POST',
-    data: { share_user_id },
-    success: (res) => {
-      if (res.data.code == 0) {
-        // 绑定上下级
-      }
-    },
-  })
-}
diff --git a/src/components/AddressList/index.tsx b/src/components/AddressList/index.tsx
index 2bc0af2..45f6ab9 100644
--- a/src/components/AddressList/index.tsx
+++ b/src/components/AddressList/index.tsx
@@ -2,11 +2,11 @@
 import { Button, Navigator, ScrollView, Text, View } from '@tarojs/components'
 import { forwardRef, memo, useEffect, useImperativeHandle, useState } from 'react'
 import './index.scss'
-import { mppurchaseraddresslist } from '@/api/addressList'
+import { MpPurchaserAddressList } from '@/api/addressList'
 import { alert } from '@/common/common'
 import Taro, { showModal, useDidShow, useRouter } from '@tarojs/taro'
 import IconFont from '@/components/iconfont/iconfont'
-import { mpsaleOrderaddress } from '@/api/order'
+import { MpSaleOrderAddress } from '@/api/order'
 
 interface Params {
   refresherEnabled?: boolean// 是否开启刷新
@@ -19,12 +19,14 @@ interface Params {
 }
 
 // 地址列表
-const AddressList = memo(forwardRef((props: Params, AddressListRef) => {
+const AddressList = (props: Params, AddressListRef) => {
   const pages = Taro.getCurrentPages() // 获取当前的页面栈
   const prevPage = pages[pages.length - 2]
 
+  // 焦点
+  const [focusId, setFocusId] = useState()
   const { addButtonEnabled = true, focusBorderEnabled = false } = props
-  const { fetchData, state } = mppurchaseraddresslist()
+  const { fetchData, state } = MpPurchaserAddressList()
   // 获取数据
   const getData = async() => {
     const result = await fetchData({ purchaser_id: props.purchaser_id })
@@ -64,12 +66,10 @@ const AddressList = memo(forwardRef((props: Params, AddressListRef) => {
     setRefreshState(false)
   }
   const data = Array.from({ length: 15 })
-  // 焦点
-  const [focusId, setFocusId] = useState()
   const router = useRouter()
   const [addressObj, setAddressObj] = useState<any>({})
   // 列表选择
-  const { fetchData: selectFetch } = mpsaleOrderaddress()
+  const { fetchData: selectFetch } = MpSaleOrderAddress()
   const handleSelect = async(item: any, index: number) => {
     if (router.params.orderId && router.params.orderId != '-100') {
       console.log(typeof (router.params.orderId) != 'undefined', 'router.params.orderId')
@@ -126,7 +126,7 @@ const AddressList = memo(forwardRef((props: Params, AddressListRef) => {
                 // data.length>0?
                 // data.map((item,index)=>{
                 return (
-                  <View onClick={() => handleSelect(item, index)} className={`address-list ${focusId == item.id && 'address-active'}`}>
+                  <View key={index} onClick={() => handleSelect(item, index)} className={`address-list ${focusId == item.id && 'address-active'}`}>
                     <View className="address-user">
                       {item.name}
                       <Text className="address-list-phone">{item.phone}</Text>
@@ -164,6 +164,6 @@ const AddressList = memo(forwardRef((props: Params, AddressListRef) => {
       {addButtonEnabled && <Navigator url={`/pages/addAddress/index?type=add&purchaser_id=${Number(props.purchaser_id)}`} hoverClass="none" className="add-address">添加收货地址</Navigator>}
     </View>
   )
-}))
+}
 
-export default AddressList
+export default memo(forwardRef(AddressList))
diff --git a/src/components/BottomBtns/index.tsx b/src/components/BottomBtns/index.tsx
index e638e8c..2bc8316 100644
--- a/src/components/BottomBtns/index.tsx
+++ b/src/components/BottomBtns/index.tsx
@@ -20,8 +20,7 @@ interface prosObj {
   showDetail?: boolean
   goodsObj?: any
 }
-
-export default memo(forwardRef((props: prosObj, ref) => {
+const BottomBtns = (props: prosObj, ref) => {
   const {
     obj = {
       sale_mode: 0,
@@ -192,4 +191,5 @@ export default memo(forwardRef((props: prosObj, ref) => {
 
     </View>
   )
-}))
+}
+export default memo(forwardRef(BottomBtns))
diff --git a/src/components/BottomCustomer/index.tsx b/src/components/BottomCustomer/index.tsx
index d75e8af..d245ebd 100644
--- a/src/components/BottomCustomer/index.tsx
+++ b/src/components/BottomCustomer/index.tsx
@@ -10,8 +10,7 @@ interface prosObj {
   clientId?: Number
   clientName?: string
 }
-
-export default memo((props: prosObj) => {
+const BottomCustomer = (props: prosObj) => {
   const {
     isDisabled = true,
     handSure,
@@ -32,4 +31,5 @@ export default memo((props: prosObj) => {
       <Button className={classnames(isDisabled ? styles.activeButton : styles.button)} disabled={isDisabled} onClick={() => { handSure?.() }}> 加入购物车</Button >
     </View >
   )
-})
+}
+export default memo(BottomCustomer)
diff --git a/src/components/FromList/index.tsx b/src/components/FromList/index.tsx
index 794c0c1..83102b6 100644
--- a/src/components/FromList/index.tsx
+++ b/src/components/FromList/index.tsx
@@ -19,7 +19,7 @@ interface ListParams{
 }
 
 // 表单列表
-const FromList = memo((props: ListParams) => {
+const FromList = (props: ListParams) => {
   const { type = 'input', value = '', style = {}, labelStyle = {}, contentStyle = {}, required = false } = props
 
   return (
@@ -37,11 +37,11 @@ const FromList = memo((props: ListParams) => {
                   && <View><Text onClick={() => props.onInput && props.onInput({ detail: { value: '' } })} className="iconfont icon-qingkong" /></View>
                   }
                 </View>
-                : type == 'textarea'
+                : type == 'textarea'
                   ? <Textarea value={value} placeholder-class="phcolor" onInput={props?.onInput} placeholder={props.placeholder} />
                   : <>
                     {
-                      props.value
+                      props.value
                         ? <View>{value}</View>
                         : <View className="form-list-right-placeholder">
                           {props.placeholder}
@@ -55,9 +55,5 @@ const FromList = memo((props: ListParams) => {
       </View>
     </View>
   )
-})
-
-const A = () => {
-
 }
-export default FromList
+export default memo(FromList)
diff --git a/src/components/FromListCertification/index.tsx b/src/components/FromListCertification/index.tsx
index 0c2d4a7..fedfddd 100644
--- a/src/components/FromListCertification/index.tsx
+++ b/src/components/FromListCertification/index.tsx
@@ -17,9 +17,7 @@ interface ListParams{
   required?: boolean
   showIcon?: boolean // 是否显示右边的箭头，type=select
 }
-
-// 表单列表
-const FromList = memo((props: ListParams) => {
+const FromListCertification = (props: ListParams) => {
   const { type = 'input', value = '', style = {}, labelStyle = {}, contentStyle = {}, required = false, showIcon = true } = props
 
   return (
@@ -37,11 +35,11 @@ const FromList = memo((props: ListParams) => {
                   && <View><Text onClick={() => props.onInput && props.onInput({ detail: { value: '' } })} className="iconfont icon-qingkong" /></View>
                   }
                 </View>
-                : type == 'textarea'
+                : type == 'textarea'
                   ? <Textarea value={value} placeholder-class="phcolor" onInput={props?.onInput} placeholder={props.placeholder} />
                   : <>
                     {
-                      props.value
+                      props.value
                         ? <View>{value}</View>
                         : <View className="From-list-certification-right-placeholder">
                           {props.placeholder}
@@ -57,9 +55,8 @@ const FromList = memo((props: ListParams) => {
       </View>
     </View>
   )
-})
-
-const A = () => {
-
 }
-export default FromList
+// 表单列表
+const FromList = memo(FromListCertification)
+
+export default FromList
diff --git a/src/components/InfiniteScrollPaging/index.tsx b/src/components/InfiniteScrollPaging/index.tsx
index b91411e..dc61153 100644
--- a/src/components/InfiniteScrollPaging/index.tsx
+++ b/src/components/InfiniteScrollPaging/index.tsx
@@ -1,4 +1,4 @@
-import type { ReactNode } from 'react'
+import type { ReactNode } from 'react'
 import { useEffect, useMemo, useRef, useState } from 'react'
 import InfiniteScroll from '@/components/infiniteScroll'
 import { dataLoadingStatus, getFilterData } from '@/common/util'
@@ -10,20 +10,23 @@ interface Params {
   fetchData: (data: object) => any
   change?: (data: any) => void
 }
-
-export default (props: Params) => {
+const InfiniteScrollPaging = (props: Params) => {
   const { query = {} } = props
-  useEffect(() => {
-    refreshDataRef.current = refreshData
-    dataRef.current = data
-    getData({ moreStatus: true }, { moreStatus: true })
-  }, [])
-  useEffect(() => {
-    if (!isEmptyObject(query)) {
-      setData({ list: [], total: 0 })
-      getData({ moreStatus: true }, { moreStatus: true })
-    }
-  }, [query])
+
+  // 加载刷新数据
+  const [refreshData, setRefreshData] = useState({
+    refreshStatus: false,
+    moreStatus: false,
+    page: 1,
+    size: 10,
+    loading: false,
+  })
+  const refreshDataRef = useRef({})
+  // 渲染（数据）
+  const [data, setData] = useState({
+    list: [],
+    total: 0,
+  })
   const getData = async(startStatus, endStatus) => {
     const tRefreshDataRef = refreshDataRef.current as any
     setRefreshData({
@@ -45,7 +48,7 @@ export default (props: Params) => {
           ...endStatus,
           loading: false,
         })
-      }
+      }
       else {
         setData({
           list: result.data.list,
@@ -59,7 +62,7 @@ export default (props: Params) => {
           loading: false,
         })
       }
-    }
+    }
     else {
       alert.none(result.msg)
       setRefreshData({
@@ -70,20 +73,6 @@ export default (props: Params) => {
       })
     }
   }
-  // 加载刷新数据
-  const [refreshData, setRefreshData] = useState({
-    refreshStatus: false,
-    moreStatus: false,
-    page: 1,
-    size: 10,
-    loading: false,
-  })
-  const refreshDataRef = useRef({})
-  // 渲染（数据）
-  const [data, setData] = useState({
-    list: [],
-    total: 0,
-  })
   const dataRef = useRef({})
   // 下拉刷新
   const handleRefresh = async() => {
@@ -119,7 +108,17 @@ export default (props: Params) => {
   const statusMore = useMemo(() => {
     return dataLoadingStatus({ list: data.list, total: data.total, status: refreshData.loading })
   }, [refreshData.loading])
-
+  useEffect(() => {
+    refreshDataRef.current = refreshData
+    dataRef.current = data
+    getData({ moreStatus: true }, { moreStatus: true })
+  }, [])
+  useEffect(() => {
+    if (!isEmptyObject(query)) {
+      setData({ list: [], total: 0 })
+      getData({ moreStatus: true }, { moreStatus: true })
+    }
+  }, [query])
   return (
     <InfiniteScroll
       refresherEnabled
@@ -127,9 +126,11 @@ export default (props: Params) => {
       moreStatus={refreshData.moreStatus}
       selfOnRefresherRefresh={handleRefresh}
       selfonScrollToLower={handleMoreLoad}
-      statusMore={statusMore}
+      statusMore={statusMore}
     >
       {props.children}
     </InfiniteScroll>
   )
 }
+
+export default InfiniteScrollPaging
diff --git a/src/components/LabAndImg/index.tsx b/src/components/LabAndImg/index.tsx
index 861cca4..e9c51f4 100644
--- a/src/components/LabAndImg/index.tsx
+++ b/src/components/LabAndImg/index.tsx
@@ -1,10 +1,8 @@
 import { Image, View } from '@tarojs/components'
-import Taro from '@tarojs/taro'
 import { memo, useCallback, useEffect, useMemo, useState } from 'react'
 import LabAndImgShow from '../LabAndImgShow'
 import styles from './index.module.scss'
-import Preview from '@/pages/details/components/preview'
-import { formatImgUrl, formatRemoveHashTag } from '@/common/format'
+import { formatImgUrl } from '@/common/format'
 
 // 该组件宽高为100%需调整外层元素宽高
 interface Param {
@@ -17,14 +15,14 @@ interface Param {
   showStatus?: true | false
   onClick?: (val: Param['value']) => void
 }
-export default memo(({ value, onClick, showStatus = false }: Param) => {
+const LabAndImg = ({ value, onClick, showStatus = false }: Param) => {
   const [imgs, setImgs] = useState<string[]>([])
 
   // 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})` }
-    }
+    }
     else {
       return null
     }
@@ -63,4 +61,5 @@ export default memo(({ value, onClick, showStatus = false }: Param) => {
       <LabAndImgShow value={value} show={labAndImgShow} onClose={closeLabAndImgShow} />
     </>
   )
-})
+}
+export default memo(LabAndImg)
diff --git a/src/components/LabAndImgShow/index.tsx b/src/components/LabAndImgShow/index.tsx
index 5b70abc..7b7e3e3 100644
--- a/src/components/LabAndImgShow/index.tsx
+++ b/src/components/LabAndImgShow/index.tsx
@@ -15,20 +15,14 @@ export interface colorParams {
   onClose?: () => void
   showNumber?: number // 图片显示张数，0不限制
 }
-export default ({ value, show = false, onClose, showNumber = 1 }: colorParams) => {
-  useEffect(() => {
-    if (show && rgbStyle) { setLabShow(() => true) }
-    if (show && value?.texture_url) { onShowImage() }
-    if (!show) { setLabShow(() => false) }
-  }, [show])
-
+const LabAndImgShow = ({ value, show = false, onClose, showNumber = 1 }: colorParams) => {
   // 显示颜色
   const [labShow, setLabShow] = useState(false)
   // 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})` }
-    }
+    }
     else {
       return null
     }
@@ -49,7 +43,11 @@ export default ({ value, show = false, onClose, showNumber = 1 }: colorParams) =
       urls: n_res,
     })
   }
-
+  useEffect(() => {
+    if (show && rgbStyle) { setLabShow(() => true) }
+    if (show && value?.texture_url) { onShowImage() }
+    if (!show) { setLabShow(() => false) }
+  }, [show])
   return (
     <>
       {labShow && (
@@ -63,3 +61,5 @@ export default ({ value, show = false, onClose, showNumber = 1 }: colorParams) =
     </>
   )
 }
+
+export default LabAndImgShow
diff --git a/src/components/Message/index.tsx b/src/components/Message/index.tsx
index ad92c9f..de113ee 100644
--- a/src/components/Message/index.tsx
+++ b/src/components/Message/index.tsx
@@ -8,12 +8,12 @@ interface Params{
 }
 
 // 消息提示
-const Message = memo((props: Params) => {
+const Message = (props: Params) => {
   return (
     <View className="message-custom-tips">
       <Text className="iconfont icon-zhuyi"></Text> {props.text}
     </View>
   )
-})
+}
 
-export default Message
+export default memo(Message)
diff --git a/src/components/RefundCodelist/index.tsx b/src/components/RefundCodelist/index.tsx
index d2bb5c4..fccd8fb 100644
--- a/src/components/RefundCodelist/index.tsx
+++ b/src/components/RefundCodelist/index.tsx
@@ -17,15 +17,9 @@ interface Props {
   showPopup: boolean
   popupClose: () => void
 }
-
-export default memo((props: Props) => {
+const RefundCodelist = (props: Props) => {
   const { fetchData: payFetch } = GetReturnPayCode()
   const [PicUrl, setPicUrl] = useState<string>('')
-  useEffect(() => {
-    // 判断进来的是否是空对象，减少性能问题
-    const length = Object.keys(props.obj)
-    if (length.length > 0) { getPic() }
-  }, [props.obj])
 
   const getPic = async() => {
     Taro.showLoading({
@@ -142,11 +136,12 @@ export default memo((props: Props) => {
 
   // 检查是否开启保存图片权限
   const { check } = useCheckAuthorize({ scope: 'scope.writePhotosAlbum', msg: '您没授权，无法保存图片' })
-  const saveImageCheck = async() => {
-    const res = await check()
-    res && saveImage()
-  }
 
+  useEffect(() => {
+    // 判断进来的是否是空对象，减少性能问题
+    const length = Object.keys(props.obj)
+    if (length.length > 0) { getPic() }
+  }, [props.obj])
   // 保存图片
   const saveImage = () => {
     const time = new Date().valueOf()
@@ -171,7 +166,10 @@ export default memo((props: Props) => {
       },
     })
   }
-
+  const saveImageCheck = async() => {
+    const res = await check()
+    res && saveImage()
+  }
   return (
     <Popup show={props.showPopup} title="退款码单" onClose={() => props.popupClose?.()}>
       <View className={styles.popupBox}>
@@ -184,4 +182,5 @@ export default memo((props: Props) => {
       </View>
     </Popup>
   )
-})
+}
+export default memo(RefundCodelist)
diff --git a/src/components/SegmentedControl/index.tsx b/src/components/SegmentedControl/index.tsx
index 5261f7a..1f1be48 100644
--- a/src/components/SegmentedControl/index.tsx
+++ b/src/components/SegmentedControl/index.tsx
@@ -15,7 +15,7 @@ interface PropsType {
   onSelect?: (data: { id: number; name: string }) => void
 }
 
-const segmentedControl: FC<PropsType> = (props) => {
+const SegmentedControl: FC<PropsType> = (props) => {
   const [selectInfo, setSelectInfo] = useState({
     selected: -1, // 当前选中的id
     tabId: '', // 需要滚动到的id
@@ -69,4 +69,4 @@ const segmentedControl: FC<PropsType> = (props) => {
     </View>
   )
 }
-export default segmentedControl
+export default SegmentedControl
diff --git a/src/components/SelectMarketingDepartment/index.tsx b/src/components/SelectMarketingDepartment/index.tsx
index f6eeeac..b030a48 100644
--- a/src/components/SelectMarketingDepartment/index.tsx
+++ b/src/components/SelectMarketingDepartment/index.tsx
@@ -18,20 +18,20 @@ interface EnumList {
   name: string
 }
 // 营销部门
-const SelectSaleType = memo(forwardRef((props: SelectSaleTypeProps, ref) => {
+const SelectSaleType = (props: SelectSaleTypeProps, ref) => {
   const selectName = '营销部门'
 
   const { onChange, onCloseOverlay } = props
   console.log(props)
   const { fetchData } = EnumMarketingDepartmentApi()
 
+  const [enumList, setEnumList] = useState<EnumList[]>([])
+
   const getData = async() => {
     const res = await fetchData()
     setEnumList([{ id: -1, code: '', name: '全部' }, ...res.data.list])
   }
 
-  const [enumList, setEnumList] = useState<EnumList[]>([])
-
   useEffect(() => {
     getData()
   }, [])
@@ -67,9 +67,9 @@ const SelectSaleType = memo(forwardRef((props: SelectSaleTypeProps, ref) => {
     <DropDownItem title={displayTitle} value={currentValue} activeColor="#337fff" ref={dropDownRef} onCloseOverlay={onCloseOverlay}>
       <View className={styles.grid}>
         {!!enumList.length
-          && enumList.map((item: EnumList) => {
+          && enumList.map((item: EnumList, key) => {
             return (
-              <FilterButton isActive={item.id === currentValue} onClick={() => handleClick(item.id)}>
+              <FilterButton key={key} isActive={item.id === currentValue} onClick={() => handleClick(item.id)}>
                 {item.name}
               </FilterButton>
             )
@@ -77,5 +77,5 @@ const SelectSaleType = memo(forwardRef((props: SelectSaleTypeProps, ref) => {
       </View>
     </DropDownItem>
   )
-}))
-export default SelectSaleType
+}
+export default memo(forwardRef(SelectSaleType))
diff --git a/src/components/SelectSaleRankingIndicators/index.tsx b/src/components/SelectSaleRankingIndicators/index.tsx
index 40ede5e..559ba51 100644
--- a/src/components/SelectSaleRankingIndicators/index.tsx
+++ b/src/components/SelectSaleRankingIndicators/index.tsx
@@ -22,20 +22,19 @@ interface EnumList {
   name: string
 }
 // 销售排行指标
-const SelectSaleRankingIndicators: FC<SelectSaleTypeProps> = memo((props) => {
+const SelectSaleRankingIndicators: FC<SelectSaleTypeProps> = (props) => {
   const selectName = '排行指标'
 
   const { onChange, dropDownStyle, dropDownClassName } = props
   console.log(props)
   const { fetchData } = SaleOrderDataFormdataFormStatus()
 
+  const [enumList, setEnumList] = useState<EnumList[]>([])
   const getData = async() => {
     const res = await fetchData()
     setEnumList([{ id: -1, code: '', name: '全部' }, ...res.data.list])
   }
 
-  const [enumList, setEnumList] = useState<EnumList[]>([])
-
   useEffect(() => {
     getData()
   }, [])
@@ -58,9 +57,9 @@ const SelectSaleRankingIndicators: FC<SelectSaleTypeProps> = memo((props) => {
     <DropDownItem title={displayTitle} customClassName={dropDownClassName} customStyle={dropDownStyle} value={currentValue} activeColor="#337fff" showOverlay={false}>
       <View className={classnames(styles.grid)}>
         {!!enumList.length
-          && enumList.map((item: EnumList) => {
+          && enumList.map((item: EnumList, key) => {
             return (
-              <FilterButton isActive={item.id === currentValue} onClick={() => handleClick(item.id)}>
+              <FilterButton key={key} isActive={item.id === currentValue} onClick={() => handleClick(item.id)}>
                 {item.name}
               </FilterButton>
             )
@@ -68,5 +67,5 @@ const SelectSaleRankingIndicators: FC<SelectSaleTypeProps> = memo((props) => {
       </View>
     </DropDownItem>
   )
-})
-export default SelectSaleRankingIndicators
+}
+export default memo(SelectSaleRankingIndicators)
diff --git a/src/components/SelectSaleType/index.tsx b/src/components/SelectSaleType/index.tsx
index 82de9b8..ba70c74 100644
--- a/src/components/SelectSaleType/index.tsx
+++ b/src/components/SelectSaleType/index.tsx
@@ -19,19 +19,18 @@ interface EnumList {
   name: string
 }
 // 销售类型
-const SelectSaleType = memo(forwardRef((props: SelectSaleTypeProps, ref) => {
+const SelectSaleType = (props: SelectSaleTypeProps, ref) => {
   const selectName = '销售类型'
   const { onChange, defaultValue = 0, onCloseOverlay } = props
   console.log(props)
   const { fetchData } = EnumSalesTypeApi()
+  const [enumList, setEnumList] = useState<EnumList[]>([])
 
   const getData = async() => {
     const res = await fetchData()
     setEnumList([{ id: -1, code: '', name: '全部' }, ...res.data.list])
   }
 
-  const [enumList, setEnumList] = useState<EnumList[]>([])
-
   useEffect(() => {
     getData()
   }, [])
@@ -68,9 +67,9 @@ const SelectSaleType = memo(forwardRef((props: SelectSaleTypeProps, ref) => {
     <DropDownItem title={displayTitle} value={currentValue} activeColor="#337fff" ref={dropDownRef} onCloseOverlay={onCloseOverlay}>
       <View className={styles.grid}>
         {!!enumList.length
-          && enumList.map((item: EnumList) => {
+          && enumList.map((item: EnumList, key) => {
             return (
-              <FilterButton isActive={item.id === currentValue} onClick={() => handleClick(item.id)}>
+              <FilterButton key={key} isActive={item.id === currentValue} onClick={() => handleClick(item.id)}>
                 {item.name}
               </FilterButton>
             )
@@ -78,5 +77,5 @@ const SelectSaleType = memo(forwardRef((props: SelectSaleTypeProps, ref) => {
       </View>
     </DropDownItem>
   )
-}))
-export default SelectSaleType
+}
+export default memo(forwardRef(SelectSaleType))
diff --git a/src/components/SelectTimePicker/index.tsx b/src/components/SelectTimePicker/index.tsx
index 82376d7..b12adf2 100644
--- a/src/components/SelectTimePicker/index.tsx
+++ b/src/components/SelectTimePicker/index.tsx
@@ -78,7 +78,7 @@ const FilterTimeOptions = {
 type Key = keyof typeof FilterTimeOptions
 type Value = typeof FilterTimeOptions[Key]
 
-const SelectTimePicker = memo(forwardRef((props: SelectSaleTypeProps, ref) => {
+const SelectTimePicker = (props: SelectSaleTypeProps, ref) => {
   const { onChange: change, onCloseOverlay, defaultValue = '0', timeOptions = FilterTimeOptions } = props
   // rerender 的时候需要更新 ref 的值
   const Options = useRef({ ...timeOptions, custom: FilterTimeOptions.custom })
@@ -98,6 +98,7 @@ const SelectTimePicker = memo(forwardRef((props: SelectSaleTypeProps, ref) => {
   const handClose = () => {
     setShowTime(false)
   }
+  const customFilterButtonText = useRef('自定义时间')
 
   const handleClick = (key: Key) => {
     setCurrentValue(key)
@@ -118,7 +119,6 @@ const SelectTimePicker = memo(forwardRef((props: SelectSaleTypeProps, ref) => {
   }
 
   // const [customFilterButtonText, setCustomFilterButtonText] = useState('自定义时间')
-  const customFilterButtonText = useRef('自定义时间')
 
   // 点击自定义时间
   const handleCustomTime = () => {
@@ -151,9 +151,9 @@ const SelectTimePicker = memo(forwardRef((props: SelectSaleTypeProps, ref) => {
         <View className={styles.grid} style={{ paddingBottom: '24rpx' }}>
           {Object.entries(Options.current)
             .slice(0, -1)
-            .map(([key, value]) => {
+            .map(([key, value], index) => {
               return (
-                <FilterButton isActive={key === currentValue} onClick={() => handleClick(key as Key)}>
+                <FilterButton key={index} isActive={key === currentValue} onClick={() => handleClick(key as Key)}>
                   {value.name}
                 </FilterButton>
               )
@@ -167,5 +167,5 @@ const SelectTimePicker = memo(forwardRef((props: SelectSaleTypeProps, ref) => {
       <TimePickerPopup start={currentDate.start} end={currentDate.end} showTime={showTime} closePopup={handClose} onSelectDate={onSelectDate}></TimePickerPopup>
     </>
   )
-}))
-export default SelectTimePicker
+}
+export default memo(forwardRef(SelectTimePicker))
diff --git a/src/components/afterOrderBtns/index.tsx b/src/components/afterOrderBtns/index.tsx
index 520688a..377e3a4 100644
--- a/src/components/afterOrderBtns/index.tsx
+++ b/src/components/afterOrderBtns/index.tsx
@@ -20,8 +20,7 @@ interface Param {
   fixedBottom?: true|false // 是否固定在底部
 
 }
-
-export default memo(({ orderInfo, onClick, fixedBottom = true }: Param) => {
+const AfterOrderBtns = ({ orderInfo, onClick, fixedBottom = true }: Param) => {
   // 售后订单状态
   const {
     ReturnStageApplying,
@@ -92,10 +91,10 @@ export default memo(({ orderInfo, onClick, fixedBottom = true }: Param) => {
   const submitBtns = throttle((val, index) => {
     if (val == 1) {
       cancelOrder({ title: '要取消退货吗？', val })
-    }
+    }
     else if (val == 6) {
       cancelOrder({ title: '要取消退款吗？', val })
-    }
+    }
     else {
       onClick?.(val)
     }
@@ -112,11 +111,11 @@ export default memo(({ orderInfo, onClick, fixedBottom = true }: Param) => {
           if (res.success) {
             alert.success('取消成功')
             onClick?.(val)
-          }
+          }
           else {
             alert.none(res.msg)
           }
-        }
+        }
         else if (res.cancel) {
           console.log('用户点击取消')
         }
@@ -155,4 +154,5 @@ export default memo(({ orderInfo, onClick, fixedBottom = true }: Param) => {
       </View>}
     </>
   )
-})
+}
+export default memo(AfterOrderBtns)
diff --git a/src/components/amountShow/index.tsx b/src/components/amountShow/index.tsx
index 2c4b250..1839246 100644
--- a/src/components/amountShow/index.tsx
+++ b/src/components/amountShow/index.tsx
@@ -8,7 +8,7 @@ interface Param {
   number: number // 数字
   status: 0 | 1 | 2 // 0 小型，1中型，2大
 }
-export default memo(({ number = 0, status = 1 }: Param) => {
+const AmountShow = ({ number = 0, status = 1 }: Param) => {
   const priceDom = useCallback(() => {
     const res = number.toFixed(2).split('.')
     const int_num = `${parseInt(res[0])}`
@@ -22,4 +22,5 @@ export default memo(({ number = 0, status = 1 }: Param) => {
     )
   }, [number])
   return <View className={classnames(styles.order_price_num, status == 1 && styles.emphasis_num, status == 2 && styles.emphasis_num_big)}>{priceDom()}</View>
-})
+}
+export default memo(AmountShow)
diff --git a/src/components/banner/index.tsx b/src/components/banner/index.tsx
index 6b0c1c4..4de317c 100644
--- a/src/components/banner/index.tsx
+++ b/src/components/banner/index.tsx
@@ -12,25 +12,23 @@ interface params {
   swiperOnClick?: (val: item) => void
   style?: Object
 }
-export default (props: params) => {
+const Banner = (props: params) => {
   const { swiperOnClick, style = {} } = props
 
   const [list, setList] = useState<any[]>([])
   const { fetchData, state } = GetBannerList()
-
-  useEffect(() => {
-    getData()
-  }, [])
-
   const getData = async() => {
     const res = await fetchData()
     setList(res.data?.list)
   }
+  useEffect(() => {
+    getData()
+  }, [])
 
   const skipTo = (item) => {
     if (item.jump_type == 2 || item.jump_type == 0) {
       goLink(`${item.link}&title=${item.title}`)
-    }
+    }
     else {
       goLink(item.link)
     }
@@ -52,3 +50,5 @@ export default (props: params) => {
     </View>
   )
 }
+
+export default Banner
diff --git a/src/components/bindSalesmanPopup/index.tsx b/src/components/bindSalesmanPopup/index.tsx
index 61b4f3a..6732313 100644
--- a/src/components/bindSalesmanPopup/index.tsx
+++ b/src/components/bindSalesmanPopup/index.tsx
@@ -8,7 +8,7 @@ interface params {
   show?: true | false
   onClose?: () => void
 }
-export default ({ show, onClose }: params) => {
+const BindSalesManPopUp = ({ show, onClose }: params) => {
   const onCustomer = async() => {
     const res = await Taro.showModal({
       title: '是否拨打服务热线',
@@ -54,3 +54,5 @@ export default ({ show, onClose }: params) => {
     </>
   )
 }
+
+export default BindSalesManPopUp
diff --git a/src/components/bluetooth/Popup.tsx b/src/components/bluetooth/Popup.tsx
index f812289..cb935a5 100644
--- a/src/components/bluetooth/Popup.tsx
+++ b/src/components/bluetooth/Popup.tsx
@@ -12,8 +12,7 @@ interface params {
   onOff: () => void
   onFind: () => void
 }
-
-export default memo(({ state, show = false, onClose, onLink, onOff, onFind }: params) => {
+const Popup = ({ state, show = false, onClose, onLink, onOff, onFind }: params) => {
   const [popupShow, setPopupShow] = useState(show)
   useEffect(() => {
     setPopupShow(show)
@@ -31,38 +30,44 @@ export default memo(({ state, show = false, onClose, onLink, onOff, onFind }: pa
             <View className={style.list}>
               <ScrollView scrollY className={style.scroll}>
                 {
-                  (state.devices && state.devices.length > 0) && state?.devices.map((item) => {
-                    return (
-                      <View className={style.item} onClick={() => onLink(item)}>
-                        <View>{item.name}</View>
-                        {
-                          (!state.connecting && !state.connected) && <View >链接</View>
-                                                    || (state.connecting && item.deviceId == state.connecting.deviceId) && <View className={style.link_ing}>正在链接...</View>
-                                                    || (state.connected && item.deviceId == state.connected.deviceId) && <View className={style.link_success}>链接成功</View>
-                        }
-                      </View>
-                    )
-                  })
-                                    || <View className={style.noDevice}>
-                                      {
-                                        (!state.discovering) && <>
-                                          <View>暂无设备,请按以下条件检查</View>
-                                          <View className={style.n_item}>1.请确保取色仪处于激活状态</View>
-                                          <View className={style.n_item}>2.请确保取色仪没有链接其他设备</View>
-                                          <View className={style.n_item}>3.请打开手机定位</View>
-                                        </>
-                                            || <View>设备搜索中</View>
-                                      }
+                  (state.devices && state.devices.length > 0)
+                    ? state?.devices.map((item, key) => {
+                      return (
+                        <View className={style.item} onClick={() => onLink(item)} key={key}>
+                          <View>{item.name}</View>
+                          {
+                            (!state.connecting && !state.connected)
+                              ? <View >链接</View>
+                              : (state.connecting && (item.deviceId == state.connecting.deviceId))
+                                ? <View className={style.link_ing}>正在链接...</View>
+                                : (state.connected && (item.deviceId == state.connected.deviceId)) ? <View className={style.link_success}>链接成功</View> : null
+                          }
+                        </View>
+                      )
+                    })
+                    : <View className={style.noDevice}>
+                      {
+                        (!state.discovering)
+                          ? <>
+                            <View>暂无设备,请按以下条件检查</View>
+                            <View className={style.n_item}>1.请确保取色仪处于激活状态</View>
+                            <View className={style.n_item}>2.请确保取色仪没有链接其他设备</View>
+                            <View className={style.n_item}>3.请打开手机定位</View>
+                          </>
+                          : <View>设备搜索中</View>
+                      }
 
-                                    </View>
+                    </View>
 
                 }
               </ScrollView>
             </View>
             {
-              state.connected && <View className={`${style.footer} ${style.footer_off}`} onClick={onOff}>断开链接</View>
-                            || (!state.connected && state.discovering) && <View className={`${style.footer} ${style.finding}`}>搜索中<Loading width={30} color="orange" /></View>
-                            || <View className={style.footer} onClick={onFind}>重新搜索</View>
+              state.connected
+                ? <View className={`${style.footer} ${style.footer_off}`} onClick={onOff}>断开链接</View>
+                : (!state.connected && state.discovering)
+                  ? <View className={`${style.footer} ${style.finding}`}>搜索中<Loading width={30} color="orange" /></View>
+                  : <View className={style.footer} onClick={onFind}>重新搜索</View>
             }
           </View>
           <View className={style.mask} onClick={onCloseListener}></View>
@@ -70,4 +75,5 @@ export default memo(({ state, show = false, onClose, onLink, onOff, onFind }: pa
       }
     </>
   )
-})
+}
+export default memo(Popup)
diff --git a/src/components/checkbox/index.tsx b/src/components/checkbox/index.tsx
index 850f0c4..237d133 100644
--- a/src/components/checkbox/index.tsx
+++ b/src/components/checkbox/index.tsx
@@ -22,7 +22,7 @@ interface params {
   customClassName?: string
   customTextClass?: string
 }
-export default forwardRef((props: params, ref) => {
+const Checkbox = (props: params, ref) => {
   const {
     onSelect,
     onClose,
@@ -61,7 +61,7 @@ export default forwardRef((props: params, ref) => {
     const res = !selected
     if (res) {
       onSelect?.()
-    }
+    }
     else {
       onClose?.()
     }
@@ -116,4 +116,5 @@ export default forwardRef((props: params, ref) => {
       )}
     </View>
   )
-})
+}
+export default forwardRef(Checkbox)
diff --git a/src/components/counter/index.tsx b/src/components/counter/index.tsx
index 4045509..83de8c9 100644
--- a/src/components/counter/index.tsx
+++ b/src/components/counter/index.tsx
@@ -16,7 +16,7 @@ interface params {
   unit?: string
   disable?: boolean // 是否禁用
 }
-export default ({ minNum = 0, maxNum = 10000, step = 1, digits = 0, defaultNum = 0, onChange: onValueChange, onBlue, onClickBtn, unit = '', disable = false }: params) => {
+const Counter = ({ minNum = 0, maxNum = 10000, step = 1, digits = 0, defaultNum = 0, onChange: onValueChange, onBlue, onClickBtn, unit = '', disable = false }: params) => {
   const [value, setValue] = usePropsValue<number>({
     value: defaultNum,
     defaultValue: defaultNum,
@@ -24,6 +24,19 @@ export default ({ minNum = 0, maxNum = 10000, step = 1, digits = 0, defaultNum =
       onValueChange && onValueChange(nextValue)
     },
   })
+
+  // 保留小数
+  const formatDigits = (num) => {
+    num = `${num}`
+    if (num.includes('.') && digits > 0) {
+      console.log('num::', num.includes('.'))
+      const res = num.split('.')
+      const last_num = res[1].substr(0, digits)
+      return `${res[0]}.${last_num}`
+    }
+    return parseFloat(num)
+  }
+
   // 加号
   const onPlus = (event) => {
     event.stopPropagation()
@@ -44,18 +57,6 @@ export default ({ minNum = 0, maxNum = 10000, step = 1, digits = 0, defaultNum =
     onClickBtn?.(parseFloat(num_res))
   }
 
-  // 保留小数
-  const formatDigits = (num) => {
-    num = `${num}`
-    if (num.includes('.') && digits > 0) {
-      console.log('num::', num.includes('.'))
-      const res = num.split('.')
-      const last_num = res[1].substr(0, digits)
-      return `${res[0]}.${last_num}`
-    }
-    return parseFloat(num)
-  }
-
   // 检查数据
   const checkData = (val) => {
     const num = parseFloat(val)
@@ -70,24 +71,24 @@ export default ({ minNum = 0, maxNum = 10000, step = 1, digits = 0, defaultNum =
       setValue(minNum)
       return minNum
     }
-    else if (!isNaN(Number(res))) {
+    else if (!Number.isNaN(Number(res))) {
       let count = formatDigits(res)
       count = checkData(count)
       setValue(count as number)
       return count
-    }
+    }
     else {
       const num = parseFloat(res)
-      if (!isNaN(num)) {
+      if (!Number.isNaN(num)) {
         let count = formatDigits(num)
         count = checkData(count)
         setValue(count as number)
         return count
-      }
+      }
       else {
         setValue(defaultNum)
         return defaultNum
-      }
+      }
     }
   }
 
@@ -95,13 +96,13 @@ export default ({ minNum = 0, maxNum = 10000, step = 1, digits = 0, defaultNum =
     const num = parseFloat(String(value))
     console.log('onInputEven res===>', num)
 
-    if (!isNaN(num)) {
+    if (!Number.isNaN(num)) {
       let count = formatDigits(num)
       count = checkData(count)
       setValue(count as number)
       onBlue?.(count as number)
       return count
-    }
+    }
     else {
       setValue(defaultNum)
       onBlue?.(defaultNum)
@@ -109,7 +110,7 @@ export default ({ minNum = 0, maxNum = 10000, step = 1, digits = 0, defaultNum =
     }
   }
   const noop = (e) => {
-    e.stopPropagation()
+    e.stopPropagation()
   }
   return (
     <View className={styles.main}>
@@ -126,3 +127,5 @@ export default ({ minNum = 0, maxNum = 10000, step = 1, digits = 0, defaultNum =
     </View>
   )
 }
+
+export default Counter
diff --git a/src/components/dotLoading/index.tsx b/src/components/dotLoading/index.tsx
index 3d4dda4..adb16dc 100644
--- a/src/components/dotLoading/index.tsx
+++ b/src/components/dotLoading/index.tsx
@@ -2,7 +2,7 @@ import { View } from '@tarojs/components'
 import { memo } from 'react'
 import styles from './index.module.scss'
 
-export default memo(() => {
+const DotLoading = () => {
   return (
     <>
       <View className={styles.load_box}>
@@ -14,4 +14,5 @@ export default memo(() => {
       </View>
     </>
   )
-})
+}
+export default memo(DotLoading)
diff --git a/src/components/dropDown-item/index.tsx b/src/components/dropDown-item/index.tsx
index d336bc5..f391fae 100644
--- a/src/components/dropDown-item/index.tsx
+++ b/src/components/dropDown-item/index.tsx
@@ -10,7 +10,6 @@ import Iconfont from '../iconfont/iconfont'
 import Popup from '../popup'
 import Cell from '../cell'
 import styles from './index.module.scss'
-import { usePropsValue } from '@/use/useCommon'
 // 弹窗选择向上弹窗还是向下弹窗
 type Direction = 'up' | 'down'
 // 配置 菜单可选项
@@ -36,8 +35,7 @@ interface PropsType extends DropDownEvent {
   customStyle?: React.CSSProperties
   hasBottomBtn?: boolean // 底部有按钮不允许点击蒙层关闭
 }
-
-export default forwardRef((props: PropsType, ref) => {
+const DropDownItem = (props: PropsType, ref) => {
   const { children, direction = 'down', title = '', value, options = [], change, activeColor, showOverlay = true, hasBottomBtn = false, customClassName, customStyle, onCloseOverlay } = props
 
   const [showPopup, setShowPopup] = useState(false)
@@ -61,9 +59,9 @@ export default forwardRef((props: PropsType, ref) => {
 
   const defaultOptions = useMemo(() => {
     const currentValue = value
-    return options?.map(({ text, value }) => {
+    return options?.map(({ text, value }, key) => {
       currentValue === value && setText(text)
-      return <Cell title={text} desc="" isLink onClick={() => handleClickOption(value)}></Cell>
+      return <Cell key={key} title={text} desc="" isLink onClick={() => handleClickOption(value)}></Cell>
     })
   }, [value])
 
@@ -144,4 +142,5 @@ export default forwardRef((props: PropsType, ref) => {
       </Popup>
     </View>
   )
-})
+}
+export default forwardRef(DropDownItem)
diff --git a/src/components/empty/index.tsx b/src/components/empty/index.tsx
index 2b9b6f5..1eb51ab 100644
--- a/src/components/empty/index.tsx
+++ b/src/components/empty/index.tsx
@@ -6,8 +6,7 @@ interface PropsObj {
   picUrl?: string
   text?: string
 }
-
-export default memo((pros: PropsObj) => {
+const Empty = (pros: PropsObj) => {
   const {
     picUrl = '',
     text = '无搜索历史',
@@ -19,4 +18,5 @@ export default memo((pros: PropsObj) => {
       <View className={styles.text}>{text}</View>
     </View>
   )
-})
+}
+export default memo(Empty)
diff --git a/src/components/estimatedAmount/index.tsx b/src/components/estimatedAmount/index.tsx
index 721cdce..46a540b 100644
--- a/src/components/estimatedAmount/index.tsx
+++ b/src/components/estimatedAmount/index.tsx
@@ -4,7 +4,6 @@ import { memo, useCallback, useEffect, useLayoutEffect, useMemo, useState } from
 import classnames from 'classnames'
 import AmountShow from '../amountShow'
 import styles from './index.module.scss'
-import { formatKbPrice } from '@/common/common'
 
 interface Param {
   style?: Object
@@ -17,7 +16,7 @@ interface Param {
   messageShow?: true|false
   numberFormat?: 'number'|'text' // 数字还是字符串
 }
-export default memo(({ number = 0, titleStatus = true, title = '', messageTitle = '', numberStatus = 1, messageWidth = 430, messageShow = false, numberFormat = 'number' }: Param) => {
+const EstimatedAmount = ({ number = 0, titleStatus = true, title = '', messageTitle = '', numberStatus = 1, messageWidth = 430, messageShow = false, numberFormat = 'number' }: Param) => {
   const [show, setShow] = useState(messageShow)
   const onClose = () => {
     setShow(false)
@@ -28,14 +27,6 @@ export default memo(({ number = 0, titleStatus = true, title = '', messageTitle
 
   const [style, setStyle] = useState<{ top: string }>()
 
-  useEffect(() => {
-    if (show) {
-      getDomDes('#message')
-    }
-    else {
-      setStyle(() => ({ top: '0' }))
-    }
-  }, [show])
   // 设置弹出层高度
   const getDomDes = (id) => {
     setTimeout(() => {
@@ -46,6 +37,15 @@ export default memo(({ number = 0, titleStatus = true, title = '', messageTitle
       }).exec()
     }, 0)
   }
+
+  useEffect(() => {
+    if (show) {
+      getDomDes('#message')
+    }
+    else {
+      setStyle(() => ({ top: '0' }))
+    }
+  }, [show])
   return (
     <>
       <View className={styles.order_price}>
@@ -62,4 +62,5 @@ export default memo(({ number = 0, titleStatus = true, title = '', messageTitle
       </View>
     </>
   )
-})
+}
+export default memo(EstimatedAmount)
diff --git a/src/components/filter/index.tsx b/src/components/filter/index.tsx
index 3dcd6fd..788ea6d 100644
--- a/src/components/filter/index.tsx
+++ b/src/components/filter/index.tsx
@@ -4,14 +4,15 @@ import classnames from 'classnames'
 import { memo, useEffect, useRef, useState } from 'react'
 import styles from './index.module.scss'
 import Popup from '@/components/popup'
-import type { Params as PopuParams } from '@/components/popup'
+import type { Params as PopuParams } from '@/components/popup'
 import { GetProductKindListApi } from '@/api/material'
 
 type params = {
   onFiltr?: (val: object) => void // 确定搜索
   onRest?: (val: Object) => void // 重置
 } & PopuParams
-export default memo(({ onClose, onFiltr, show = false, onRest }: params) => {
+
+const Filter = ({ onClose, onFiltr, show = false, onRest }: params) => {
   // 搜索条件
   const [filterObj, setFilterObj] = useState({
     seriesName: '',
@@ -115,4 +116,5 @@ export default memo(({ onClose, onFiltr, show = false, onRest }: params) => {
       </View>
     </Popup>
   )
-})
+}
+export default memo(Filter)
diff --git a/src/components/filterV2/index.tsx b/src/components/filterV2/index.tsx
index 5886544..5e6bf16 100644
--- a/src/components/filterV2/index.tsx
+++ b/src/components/filterV2/index.tsx
@@ -4,13 +4,14 @@ import classnames from 'classnames'
 import { useEffect, useState } from 'react'
 import styles from './index.module.scss'
 import Popup from '@/components/popup'
-import type { Params as PopuParams } from '@/components/popup'
+import type { Params as PopuParams } from '@/components/popup'
 import { GetProductKindListApi } from '@/api/material'
 
 type params = {
   onFiltr?: (val: object) => void
 } & PopuParams
-export default ({ onClose, onFiltr, show = false }: params) => {
+
+const FilterV2 = ({ onClose, onFiltr, show = false }: params) => {
   // 搜索条件
   const [filterObj, setFilterObj] = useState({
     seriesId: '',
@@ -64,9 +65,9 @@ export default ({ onClose, onFiltr, show = false }: params) => {
   const setNumber = (e, field) => {
     console.log(e)
     const num = parseFloat(e.detail.value)
-    if (isNaN(num)) {
+    if (Number.isNaN(num)) {
       filterObj[field] = null
-    }
+    }
     else {
       filterObj[field] = parseFloat(num.toFixed(2))
     }
@@ -126,4 +127,6 @@ export default ({ onClose, onFiltr, show = false }: params) => {
     </Popup>
 
   )
-}
+}
+
+export default FilterV2
diff --git a/src/components/goodsItem/index.tsx b/src/components/goodsItem/index.tsx
index 29518a9..af2b8a5 100644
--- a/src/components/goodsItem/index.tsx
+++ b/src/components/goodsItem/index.tsx
@@ -26,8 +26,7 @@ interface props {
   goodList?: any[]
   onBlur?: (a: any, c: any) => void
 }
-
-export default memo((props: props) => {
+const GoodsItem = (props: props) => {
   const [value, setValue] = useState<any>({ count: props.value.nums })
 
   const onInputEven = (e) => {
@@ -99,5 +98,6 @@ export default memo((props: props) => {
       </View>
     </View>
   )
-})
+}
+export default memo(GoodsItem)
 // ($event) => onInputEven($event, props.value)
diff --git a/src/components/iconfont/iconfont.tsx b/src/components/iconfont/iconfont.tsx
index e2a13e7..26547db 100644
--- a/src/components/iconfont/iconfont.tsx
+++ b/src/components/iconfont/iconfont.tsx
@@ -9,7 +9,7 @@ const SystemWidth = Taro.getSystemInfoSync().windowWidth
 const quot = '"'
 
 function hex2rgb(hex) {
-  const rgb = []
+  const rgb: number[] = []
 
   hex = hex.substr(1)
 
diff --git a/src/components/infiniteScroll/index.tsx b/src/components/infiniteScroll/index.tsx
index 067f276..2b51a2a 100644
--- a/src/components/infiniteScroll/index.tsx
+++ b/src/components/infiniteScroll/index.tsx
@@ -1,5 +1,5 @@
 import { ScrollView, View } from '@tarojs/components'
-import type { ReactNode } from 'react'
+import type { ReactNode } from 'react'
 import React, { memo, useMemo, useState } from 'react'
 import LoadingCard from '../loadingCard'
 import style from './index.module.scss'
@@ -30,126 +30,127 @@ interface Params {
   enableBackToTop?: boolean
   emptySlot?: React.ReactNode
 }
-export default memo(
-  ({
-    styleObj,
-    selfonScrollToLower,
-    selfOnScrollToUpper,
-    selfOnScroll,
-    selfOnRefresherPulling,
-    selfOnRefresherRefresh,
-    selfOnRefresherRestore,
-    selfOnRefresherAbort,
-    safeAreaInsetBottom = true,
-    enableLoadMoreStatus = true,
-    children,
-    lowerThresholdNum = 5,
-    paddingBottom = 0,
-    refresherTriggered = false,
-    refresherEnabled = false,
-    moreStatus = true,
-    statusMore = 0,
-    enableBackToTop = true,
-    emptySlot,
-  }: Params) => {
-    const scrollToLower = () => {
-      selfonScrollToLower?.()
-    }
-    const scrollToUpper = () => {
-      selfOnScrollToUpper?.()
-    }
-    const scroll = (e) => {
-      selfOnScroll?.(e)
-    }
-    const refresherPulling = () => {
-      selfOnRefresherPulling?.()
-    }
-    const refresherRefresh = () => {
-      selfOnRefresherRefresh?.()
-    }
-    const refresherRestore = () => {
-      selfOnRefresherRestore?.()
-    }
-    const refresherAbort = () => {
-      selfOnRefresherAbort?.()
-    }
+const InfiniteScroll = ({
+  styleObj,
+  selfonScrollToLower,
+  selfOnScrollToUpper,
+  selfOnScroll,
+  selfOnRefresherPulling,
+  selfOnRefresherRefresh,
+  selfOnRefresherRestore,
+  selfOnRefresherAbort,
+  safeAreaInsetBottom = true,
+  enableLoadMoreStatus = true,
+  children,
+  lowerThresholdNum = 5,
+  paddingBottom = 0,
+  refresherTriggered = false,
+  refresherEnabled = false,
+  moreStatus = true,
+  statusMore = 0,
+  enableBackToTop = true,
+  emptySlot,
+}: Params) => {
+  const scrollToLower = () => {
+    selfonScrollToLower?.()
+  }
+  const scrollToUpper = () => {
+    selfOnScrollToUpper?.()
+  }
+  const scroll = (e) => {
+    selfOnScroll?.(e)
+  }
+  const refresherPulling = () => {
+    selfOnRefresherPulling?.()
+  }
+  const refresherRefresh = () => {
+    selfOnRefresherRefresh?.()
+  }
+  const refresherRestore = () => {
+    selfOnRefresherRestore?.()
+  }
+  const refresherAbort = () => {
+    selfOnRefresherAbort?.()
+  }
 
-    // 返回顶部
-    const scrollTop = useMemo(() => {
-      if (statusMore == 0) {
-        return 0.1
-      }
-    }, [statusMore])
+  // 返回顶部
+  const scrollTop = useMemo(() => {
+    if (statusMore == 0) {
+      return 0.1
+    }
+  }, [statusMore])
 
-    const component = () => {
-      if (enableLoadMoreStatus) {
-        if (!moreStatus) {
-          return (
-            <View style={{ paddingBottom: `${paddingBottom}rpx` }} className={style.scrollViewCon}>
-              {children}
-            </View>
-          )
-        }
-        else {
-          return (
-            <>
-              {(statusMore == 2 || statusMore == 3) && (
-                <View style={{ paddingBottom: `${paddingBottom}rpx` }} className={style.scrollViewCon}>
-                  {children}
-                  <View className={style.infinite_scroll}>
-                    {statusMore == 2
-                      ? (
-                        <View className={style.loading_more}>
-                        加载中
-                          <DotLoading />
-                        </View>
-                      )
-                      : (
-                        <View className={style.noMore}>没有更多数据了</View>
-                      )}
-                  </View>
-                </View>
-              )}
-              {statusMore == 0 && <LoadingCard />}
-              {statusMore == 1 && (emptySlot || <Empty picUrl={SEARCH_EMPTY_IMAGE} text="暂无数据" />)}
-            </>
-          )
-        }
-      }
-      else {
+  const component = () => {
+    if (enableLoadMoreStatus) {
+      if (!moreStatus) {
         return (
           <View style={{ paddingBottom: `${paddingBottom}rpx` }} className={style.scrollViewCon}>
             {children}
           </View>
         )
       }
+      else {
+        return (
+          <>
+            {(statusMore == 2 || statusMore == 3) && (
+              <View style={{ paddingBottom: `${paddingBottom}rpx` }} className={style.scrollViewCon}>
+                {children}
+                <View className={style.infinite_scroll}>
+                  {statusMore == 2
+                    ? (
+                      <View className={style.loading_more}>
+                        加载中
+                        <DotLoading />
+                      </View>
+                    )
+                    : (
+                      <View className={style.noMore}>没有更多数据了</View>
+                    )}
+                </View>
+              </View>
+            )}
+            {statusMore == 0 && <LoadingCard />}
+            {statusMore == 1 && (emptySlot || <Empty picUrl={SEARCH_EMPTY_IMAGE} text="暂无数据" />)}
+          </>
+        )
+      }
     }
+    else {
+      return (
+        <View style={{ paddingBottom: `${paddingBottom}rpx` }} className={style.scrollViewCon}>
+          {children}
+        </View>
+      )
+    }
+  }
 
-    return (
-      <>
-        <ScrollView
-          id="infiniteScroll"
-          style={styleObj}
-          className={style.scroll_main}
-          scrollY
-          onScrollToLower={() => scrollToLower()}
-          onScrollToUpper={() => scrollToUpper()}
-          onScroll={e => scroll(e)}
-          lowerThreshold={lowerThresholdNum}
-          refresherEnabled={refresherEnabled}
-          refresherTriggered={refresherTriggered}
-          onRefresherPulling={() => refresherPulling()}
-          onRefresherRefresh={() => refresherRefresh()}
-          onRefresherRestore={() => refresherRestore()}
-          onRefresherAbort={() => refresherAbort()}
-          refresherBackground="#F8F8F8"
-          enableBackToTop={enableBackToTop}
-          scrollTop={scrollTop}
-        >
-          {component()}
-          {safeAreaInsetBottom && <View className="common_safe_area_y"></View>}
-        </ScrollView>
-      </>
-    )
-  },
+  return (
+    <>
+      <ScrollView
+        id="infiniteScroll"
+        style={styleObj}
+        className={style.scroll_main}
+        scrollY
+        onScrollToLower={() => scrollToLower()}
+        onScrollToUpper={() => scrollToUpper()}
+        onScroll={e => scroll(e)}
+        lowerThreshold={lowerThresholdNum}
+        refresherEnabled={refresherEnabled}
+        refresherTriggered={refresherTriggered}
+        onRefresherPulling={() => refresherPulling()}
+        onRefresherRefresh={() => refresherRefresh()}
+        onRefresherRestore={() => refresherRestore()}
+        onRefresherAbort={() => refresherAbort()}
+        refresherBackground="#F8F8F8"
+        enableBackToTop={enableBackToTop}
+        scrollTop={scrollTop}
+      >
+        {component()}
+        {safeAreaInsetBottom && <View className="common_safe_area_y"></View>}
+      </ScrollView>
+    </>
+  )
+}
+export default memo(
+  InfiniteScroll,
 )
diff --git a/src/components/loading/index.tsx b/src/components/loading/index.tsx
index 988971c..257d041 100644
--- a/src/components/loading/index.tsx
+++ b/src/components/loading/index.tsx
@@ -1,13 +1,13 @@
 import { View } from '@tarojs/components'
 import { memo, useMemo } from 'react'
-import style from './index.module.scss'
+import style from './index.module.scss'
 
-export default memo(({ width = 60, color = '#6190e8' }: { width?: number; color?: string }) => {
+const Loading = ({ width = 60, color = '#6190e8' }: { width?: number; color?: string }) => {
   const styleObj = useMemo(() => {
     let obj = {}
     if (width > 0) { obj = { width: `${width}rpx`, height: `${width}rpx` } }
     if (color) { obj = { ...obj, borderColor: `${color} transparent transparent` } }
-    return obj
+    return obj
   }, [width, color])
   console.log('loading:::')
   return (
@@ -18,5 +18,6 @@ export default memo(({ width = 60, color = '#6190e8' }: { width?: number; color?
       <View style={styleObj} className={style.loading__ring}></View>
       <View style={styleObj} className={style.loading__ring}></View>
     </View>
-  )
-})
+  )
+}
+export default memo(Loading)
diff --git a/src/components/loadingCard/index.tsx b/src/components/loadingCard/index.tsx
index 7a28627..63c2ebc 100644
--- a/src/components/loadingCard/index.tsx
+++ b/src/components/loadingCard/index.tsx
@@ -8,7 +8,7 @@ interface Params {
   title?: string
   loadingIcon?: boolean
 }
-export default memo((props: Params) => {
+const LoadingCard = (props: Params) => {
   console.log(props)
   const {
     title = '加载中...', // 显示的文字
@@ -24,4 +24,5 @@ export default memo((props: Params) => {
       </View>
     </>
   )
-})
+}
+export default memo(LoadingCard)
diff --git a/src/components/moveBtn/index.tsx b/src/components/moveBtn/index.tsx
index 9f8ed8f..a4ca924 100644
--- a/src/components/moveBtn/index.tsx
+++ b/src/components/moveBtn/index.tsx
@@ -1,6 +1,6 @@
 import { MovableArea, MovableView, View } from '@tarojs/components'
 import Taro, { useReady } from '@tarojs/taro'
-import type { ReactElement } from 'react'
+import type { ReactElement } from 'react'
 import { useEffect, useRef, useState } from 'react'
 import classnames from 'classnames'
 import styles from './index.module.scss'
@@ -12,7 +12,7 @@ interface param {
   children?: ReactElement|null
   onClick?: () => void
 }
-export default ({ children = null, onClick }: param) => {
+const MoveBtn = ({ children = null, onClick }: param) => {
   // 获取购物车数据数量
   const { getShopCount, commonData } = useCommonData()
 
@@ -46,4 +46,5 @@ export default ({ children = null, onClick }: param) => {
       </MovableView>}
     </MovableArea>
   )
-}
+}
+export default MoveBtn
diff --git a/src/components/orderBtns/index.tsx b/src/components/orderBtns/index.tsx
index 97335c5..1c5f53c 100644
--- a/src/components/orderBtns/index.tsx
+++ b/src/components/orderBtns/index.tsx
@@ -25,8 +25,7 @@ interface Param {
   showStatus?: 'detail' | 'list' // 订单详情，订单列表
   onClick?: (val: number) => void // 点击后触发的事件，返回订单状态
 }
-
-export default memo(({ orderInfo, showStatus = 'detail', onClick }: Param) => {
+const OrderBtns = ({ orderInfo, showStatus = 'detail', onClick }: Param) => {
   // 订单状态枚举
   const {
     SaleOrderStatusBooking,
@@ -161,28 +160,6 @@ export default memo(({ orderInfo, showStatus = 'detail', onClick }: Param) => {
   const { ApplyGoods } = SUBSCRIPTION_MESSAGE_SCENE
   const { openSubscriptionMessage } = UseSubscriptionMessage()
 
-  // 点击按钮操作
-  const submitBtns = throttle(async(val, index) => {
-    if (val == 1) {
-      cancelOrder()
-    }
-    else if (val == 6) {
-      receiveOrder()
-    }
-    else if (val == 5) {
-      applyProduct()
-    }
-    else if (val == 3) {
-      bigApplyRefurn()
-    }
-    else if (val == 8) {
-      applyRefund()
-    }
-    else {
-      onClick?.(val)
-    }
-  }, 800)
-
   // 大货申请退款
   const bigApplyRefurn = () => {
     Taro.showModal({
@@ -191,7 +168,7 @@ export default memo(({ orderInfo, showStatus = 'detail', onClick }: Param) => {
         if (res.confirm) {
           await openSubscriptionMessage({ orderId: orderInfo?.orderId, scenes: ApplyGoods.value })
           onClick?.(3)
-        }
+        }
         else {
           console.log('用户点击取消')
         }
@@ -210,11 +187,11 @@ export default memo(({ orderInfo, showStatus = 'detail', onClick }: Param) => {
           if (res.success) {
             alert.success('取消成功')
             onClick?.(1)
-          }
+          }
           else {
             alert.none(res.msg)
           }
-        }
+        }
         else if (res.cancel) {
           console.log('用户点击取消')
         }
@@ -234,12 +211,12 @@ export default memo(({ orderInfo, showStatus = 'detail', onClick }: Param) => {
           if (res.success) {
             onClick?.(6)
             alert.success('收货成功')
-          }
+          }
           else {
             alert.error('收货失败')
           }
           alert.hideLoading()
-        }
+        }
         else if (res.cancel) {
           console.log('用户点击取消')
         }
@@ -259,13 +236,13 @@ export default memo(({ orderInfo, showStatus = 'detail', onClick }: Param) => {
           const res = await fetchDataApplyRefund({ sale_order_id: orderInfo?.orderId })
           if (res.success) {
             alert.success('申请成功')
-          }
+          }
           else {
             alert.error('申请失败')
           }
           alert.hideLoading()
           onClick?.(8)
-        }
+        }
         else if (res.cancel) {
           console.log('用户点击取消')
         }
@@ -286,6 +263,28 @@ export default memo(({ orderInfo, showStatus = 'detail', onClick }: Param) => {
     return { top: `-${(orderBtnsShowList.length - 3) * 70 + 10}rpx`, left: `-${10}rpx` }
   }, [orderBtnsShowList])
 
+  // 点击按钮操作
+  const submitBtns = throttle(async(val, index) => {
+    if (val == 1) {
+      cancelOrder()
+    }
+    else if (val == 6) {
+      receiveOrder()
+    }
+    else if (val == 5) {
+      applyProduct()
+    }
+    else if (val == 3) {
+      bigApplyRefurn()
+    }
+    else if (val == 8) {
+      applyRefund()
+    }
+    else {
+      onClick?.(val)
+    }
+  }, 800)
+
   return (
     <View className={styles.btns_list}>
       {orderBtnsShowList.length > 3 && (
@@ -321,4 +320,5 @@ export default memo(({ orderInfo, showStatus = 'detail', onClick }: Param) => {
       </View>
     </View>
   )
-})
+}
+export default memo(OrderBtns)
diff --git a/src/components/popup/index.tsx b/src/components/popup/index.tsx
index ee800b4..fb8ae5f 100644
--- a/src/components/popup/index.tsx
+++ b/src/components/popup/index.tsx
@@ -1,7 +1,7 @@
 import { RootPortal, View } from '@tarojs/components'
 import Taro from '@tarojs/taro'
 import classnames from 'classnames'
-import type { ReactNode } from 'react'
+import type { ReactNode } from 'react'
 import { memo, useEffect, useMemo, useRef, useState } from 'react'
 import style from './index.module.scss'
 import CloseBtnIcon from '@/components/closeBtn'
@@ -25,73 +25,73 @@ export interface Params extends PopupEvent {
   safeAreaInsetBottom?: boolean // 是否为iphoneX提供小黑条适配
   showOverLay?: boolean // 是否显示遮罩层
 }
-export default memo(
-  ({
-    title = '标题',
-    show = false,
-    showTitle = true,
-    onClose,
-    isFixed = false,
-    showIconButton = false,
-    children,
-    position = 'bottom',
-    animationEnd,
-    customStyle = {},
-    safeAreaInsetBottom = true,
-    showOverLay = true,
-    overlayStyle,
-  }: Params) => {
-    const animationTime = useRef<any>(null)
-    useEffect(() => {
-      if (show) {
-        animationTime.current = setTimeout(() => {
-          animationEnd?.()
-          customStyle.overflow = 'unset'
-        }, 260)
-      }
-      else {
-        clearTimeout(animationTime.current)
-      }
-    }, [show])
+const Popup = ({
+  title = '标题',
+  show = false,
+  showTitle = true,
+  onClose,
+  isFixed = false,
+  showIconButton = false,
+  children,
+  position = 'bottom',
+  animationEnd,
+  customStyle = {},
+  safeAreaInsetBottom = true,
+  showOverLay = true,
+  overlayStyle,
+}: Params) => {
+  const animationTime = useRef<any>(null)
+  useEffect(() => {
+    if (show) {
+      animationTime.current = setTimeout(() => {
+        animationEnd?.()
+        customStyle.overflow = 'unset'
+      }, 260)
+    }
+    else {
+      clearTimeout(animationTime.current)
+    }
+  }, [show])
 
-    useEffect(() => {
-      return () => {
-        clearTimeout(animationTime.current)
-      }
-    }, [])
+  useEffect(() => {
+    return () => {
+      clearTimeout(animationTime.current)
+    }
+  }, [])
 
-    return (
-      <View className={style.drawer_main}>
-        <View catchMove className={classnames(style.drawer, show ? style.drawer_active : '')} style={customStyle}>
-          {/* 遮罩层 start */}
-          <View
-            className={classnames(style.drawer_mask, { [style.drawer_mask_active]: show, [style['drawer_mask--hidden']]: !showOverLay })}
-            onClick={onClose}
-            style={overlayStyle}
-          ></View>
-          {/* 遮罩层 end */}
-          <View
-            style={{ position: `${isFixed == true ? 'fixed' : 'absolute'}` }}
-            className={classnames(style.drawer_container, style[`drawer_container_${position}`], {
-              [style.drawer_container_active]: show,
-              [style[`drawer_container_${position}-withShadow`]]: !showOverLay,
-            })}
-            onClick={e => e.stopPropagation()}
-          >
-            {showTitle && <View className={style.drawer_container_title}>{title}</View>}
-            {showIconButton && (
-              <View className={style.common_close_btn_icon}>
-                <CloseBtnIcon onClose={onClose} />
-              </View>
-            )}
-
-            <View id="drawerContainerContext" className={style.drawer_container_context}>
-              {children}
+  return (
+    <View className={style.drawer_main}>
+      <View catchMove className={classnames(style.drawer, show ? style.drawer_active : '')} style={customStyle}>
+        {/* 遮罩层 start */}
+        <View
+          className={classnames(style.drawer_mask, { [style.drawer_mask_active]: show, [style['drawer_mask--hidden']]: !showOverLay })}
+          onClick={onClose}
+          style={overlayStyle}
+        ></View>
+        {/* 遮罩层 end */}
+        <View
+          style={{ position: `${isFixed == true ? 'fixed' : 'absolute'}` }}
+          className={classnames(style.drawer_container, style[`drawer_container_${position}`], {
+            [style.drawer_container_active]: show,
+            [style[`drawer_container_${position}-withShadow`]]: !showOverLay,
+          })}
+          onClick={e => e.stopPropagation()}
+        >
+          {showTitle && <View className={style.drawer_container_title}>{title}</View>}
+          {showIconButton && (
+            <View className={style.common_close_btn_icon}>
+              <CloseBtnIcon onClose={onClose} />
             </View>
-            {safeAreaInsetBottom && <View className="common_safe_area_y"></View>}
+          )}
+
+          <View id="drawerContainerContext" className={style.drawer_container_context}>
+            {children}
           </View>
+          {safeAreaInsetBottom && <View className="common_safe_area_y"></View>}
         </View>
       </View>
-    )
-  },
-)
+    </View>
+  )
+}
+
+export default memo(Popup)
diff --git a/src/components/product/index.tsx b/src/components/product/index.tsx
index 19f9014..55b92b0 100644
--- a/src/components/product/index.tsx
+++ b/src/components/product/index.tsx
@@ -11,7 +11,7 @@ interface Params {
   productList?: any[]
   popupShow?: (any) => void
 }
-export default ({ desStatus = true, productList = [], popupShow }: Params) => {
+const Product = ({ desStatus = true, productList = [], popupShow }: Params) => {
   const labAndImgObj = useCallback(
     (item) => {
       return { lab: item.lab, rgb: item.rgb, texture_url: item.texture_url }
@@ -20,9 +20,9 @@ export default ({ desStatus = true, productList = [], popupShow }: Params) => {
   )
   return (
     <View className={styles.products_list}>
-      {productList?.map((item) => {
+      {productList?.map((item, key) => {
         return (
-          <View className={styles.products_item} onClick={() => popupShow?.(item)}>
+          <View key={key} className={styles.products_item} onClick={() => popupShow?.(item)}>
             <View className={styles.item_img}>
               <LabAndImg value={labAndImgObj(item)} />
               <View className={styles.num}>{item.product_color_count}色</View>
@@ -45,3 +45,5 @@ export default ({ desStatus = true, productList = [], popupShow }: Params) => {
     </View>
   )
 }
+
+export default Product
diff --git a/src/components/search/index.tsx b/src/components/search/index.tsx
index 129956b..b007322 100644
--- a/src/components/search/index.tsx
+++ b/src/components/search/index.tsx
@@ -1,6 +1,6 @@
 import { View } from '@tarojs/components'
 import classnames from 'classnames'
-import type { ReactNode } from 'react'
+import type { ReactNode } from 'react'
 import { forwardRef, memo, useEffect, useImperativeHandle, useState } from 'react'
 import IconFont from '../iconfont/iconfont'
 import InputX from '../InputX/index'
@@ -26,104 +26,102 @@ interface Params {
   handScan?: () => void
   cursorSpacing?: Number
 }
+const Search = (
+  {
+    clickOnSearch, // 点击筛选按钮触发
+    changeOnSearch, // 输入文字触发
+    adjustPosition = false,
+    disabled = false, // 是否禁用
+    placeholder = '输入搜索内容',
+    showIcon = true, // 是否显示关闭图标
+    showBtn = false, // 是否显示搜索按钮
+    btnStyle = {},
+    placeIcon = 'inner', // 搜索图标位置：inner在里面，out在外面
+    btnTitle = '搜索', // 搜索文字
+    defaultValue = '', // 默认值
+    children,
+    customRightSlot,
+    showScan = false,
+    handScan,
+    cursorSpacing = 0,
+  }: Params,
+  ref,
+) => {
+  const [inputCon, setInputCon] = useState('')
+  useEffect(() => {
+    setInputCon(defaultValue)
+  }, [defaultValue])
 
-export default memo(
-  forwardRef(
-    (
-      {
-        clickOnSearch, // 点击筛选按钮触发
-        changeOnSearch, // 输入文字触发
-        adjustPosition = false,
-        disabled = false, // 是否禁用
-        placeholder = '输入搜索内容',
-        showIcon = true, // 是否显示关闭图标
-        showBtn = false, // 是否显示搜索按钮
-        btnStyle = {},
-        placeIcon = 'inner', // 搜索图标位置：inner在里面，out在外面
-        btnTitle = '搜索', // 搜索文字
-        defaultValue = '', // 默认值
-        children,
-        customRightSlot,
-        showScan = false,
-        handScan,
-        cursorSpacing = 0,
-      }: Params,
-      ref,
-    ) => {
-      const [inputCon, setInputCon] = useState('')
-      useEffect(() => {
-        setInputCon(defaultValue)
-      }, [defaultValue])
+  const onInputEven = (e) => {
+    const value = e.detail.value
+    setInputCon(value)
+    changeOnSearch?.(value)
+  }
 
-      const onInputEven = (e) => {
-        const value = e.detail.value
-        setInputCon(value)
-        changeOnSearch?.(value)
-      }
+  const clearInput = () => {
+    setInputCon('')
+    changeOnSearch?.('')
+  }
+  useImperativeHandle(ref, () => ({
+    clearInput,
+  }))
+  const onSearch = () => {
+    clickOnSearch?.(inputCon)
+  }
 
-      useImperativeHandle(ref, () => ({
-        clearInput,
-      }))
-
-      const clearInput = () => {
-        setInputCon('')
-        changeOnSearch?.('')
-      }
-
-      const onSearch = () => {
-        clickOnSearch?.(inputCon)
-      }
-
-      return (
-        <>
-          <View className={styles.search_main}>
-            <View className={styles.search_con}>
-              {showIcon && (
-                <IconFont
-                  name="icon-sousuo"
-                  size={37}
-                  color="#ababac"
-                  customClassName={classnames(styles.icon_a_sousuo1_self, placeIcon == 'inner' ? styles.icon_inner : styles.icon_out)}
-                ></IconFont>
-              )}
-              <View className={styles.input_bar}>
-                <InputX
-                  cursorSpacing={cursorSpacing as any}
-                  adjustPosition={adjustPosition}
-                  placeholderStyle="color:#ABABAB; font-size:26rpx"
-                  onConfirm={onSearch}
-                  disabled={disabled}
-                  value={inputCon}
-                  placeholder={placeholder}
-                  onInput={e => onInputEven(e)}
-                  customClassName={classnames(placeIcon == 'out' && styles.input_out)}
-                  customStyle={{ width: '100%' }}
-                />
-                <View className={styles.search_closeBtn}>
-                  {!!inputCon && <CloseBtn onClose={() => clearInput()} styleObj={{ width: '20rpx', height: '20rpx', backgroundColor: '#fff', border: '0' }} />}
-                </View>
-                {showScan && (
-                  <View
-                    onClick={() => {
-                      handScan?.()
-                    }}
-                  >
-                    <IconFont name="icon-saomiao" size={40} color="#337FFF"></IconFont>
-                  </View>
-                )}
-
-                <View className={styles.customRightSlot}>{customRightSlot}</View>
-              </View>
+  return (
+    <>
+      <View className={styles.search_main}>
+        <View className={styles.search_con}>
+          {showIcon && (
+            <IconFont
+              name="icon-sousuo"
+              size={37}
+              color="#ababac"
+              customClassName={classnames(styles.icon_a_sousuo1_self, placeIcon == 'inner' ? styles.icon_inner : styles.icon_out)}
+            ></IconFont>
+          )}
+          <View className={styles.input_bar}>
+            <InputX
+              cursorSpacing={cursorSpacing as any}
+              adjustPosition={adjustPosition}
+              placeholderStyle="color:#ABABAB; font-size:26rpx"
+              onConfirm={onSearch}
+              disabled={disabled}
+              value={inputCon}
+              placeholder={placeholder}
+              onInput={e => onInputEven(e)}
+              customClassName={classnames(placeIcon == 'out' && styles.input_out)}
+              customStyle={{ width: '100%' }}
+            />
+            <View className={styles.search_closeBtn}>
+              {!!inputCon && <CloseBtn onClose={() => clearInput()} styleObj={{ width: '20rpx', height: '20rpx', backgroundColor: '#fff', border: '0' }} />}
             </View>
-            {showBtn && (
-              <View style={btnStyle} className={styles.btn} onClick={onSearch}>
-                {btnTitle}
+            {showScan && (
+              <View
+                onClick={() => {
+                  handScan?.()
+                }}
+              >
+                <IconFont name="icon-saomiao" size={40} color="#337FFF"></IconFont>
               </View>
             )}
-            {children}
+
+            <View className={styles.customRightSlot}>{customRightSlot}</View>
           </View>
-        </>
-      )
-    },
+        </View>
+        {showBtn && (
+          <View style={btnStyle} className={styles.btn} onClick={onSearch}>
+            {btnTitle}
+          </View>
+        )}
+        {children}
+      </View>
+    </>
+  )
+}
+export default memo(
+  forwardRef(
+    Search,
   ),
 )
diff --git a/src/components/searchInput/index.tsx b/src/components/searchInput/index.tsx
index 02feb5e..9af9010 100644
--- a/src/components/searchInput/index.tsx
+++ b/src/components/searchInput/index.tsx
@@ -1,5 +1,5 @@
 import { View } from '@tarojs/components'
-import type { ReactNode } from 'react'
+import type { ReactNode } from 'react'
 import { memo, useMemo } from 'react'
 import IconFont from '../iconfont/iconfont'
 import InputX from '../InputX'
@@ -19,8 +19,7 @@ interface Params {
   titleStyle?: Object
   styleObj?: Object
 }
-
-export default memo((props: Params) => {
+const SearchInput = (props: Params) => {
   const {
     showTitle = true,
     title = '标题',
@@ -55,4 +54,5 @@ export default memo((props: Params) => {
       {showIcon && <IconFont customClassName={styles.icon_more_self} name="icon-chakanquanbukehu" size={36} color="#333"></IconFont>}
     </View>
   )
-})
+}
+export default memo(SearchInput)
diff --git a/src/components/selectProduct/index.tsx b/src/components/selectProduct/index.tsx
index f71c95c..207c86a 100644
--- a/src/components/selectProduct/index.tsx
+++ b/src/components/selectProduct/index.tsx
@@ -23,7 +23,7 @@ interface productType {
   name: string
 }
 
-const SelectProduct = forwardRef((params: PropsType, ref) => {
+const SelectProduct = (params: PropsType, ref) => {
   const { selectColorId, noAll, onSelect } = params
 
   const [selectId, setSelectId] = useState(selectColorId)
@@ -34,6 +34,19 @@ const SelectProduct = forwardRef((params: PropsType, ref) => {
 
   const [productList, setProductList] = useState<productType[]>([])
 
+  const [showPopup, setShowPopup] = useState(false)
+
+  const changeName = (item) => {
+    console.log('changeName', item)
+    if (item) {
+      if (item.id) {
+        return formatHashTag(item.code, item.name)
+      }
+      else {
+        return item.name
+      }
+    }
+  }
   const clickEvent = () => {
     setShowPopup(true)
   }
@@ -53,22 +66,6 @@ const SelectProduct = forwardRef((params: PropsType, ref) => {
     onSelect && onSelect(item)
   }
 
-  const changeName = (item) => {
-    console.log('changeName', item)
-    if (item) {
-      if (item.id) {
-        return formatHashTag(item.code, item.name)
-      }
-      else {
-        return item.name
-      }
-    }
-  }
-
-  useEffect(() => {
-    getProductList()
-  }, [])
-
   const getProductList = async() => {
     const res = await fetchData()
     // !noAll && res.data.list?.unshift({ name: '全部', id: 0 })
@@ -76,7 +73,9 @@ const SelectProduct = forwardRef((params: PropsType, ref) => {
     originList.current = [{ name: '全部', id: 0 }, ...res.data.list]
   }
 
-  const [showPopup, setShowPopup] = useState(false)
+  useEffect(() => {
+    getProductList()
+  }, [])
 
   const closeEven = () => {
     setShowPopup(false)
@@ -118,7 +117,7 @@ const SelectProduct = forwardRef((params: PropsType, ref) => {
       </View>
       <Popup title="请选择面料名称" showTitle show={showPopup} onClose={closeEven} position="bottom" customStyle={{ zIndex: 9999 }}>
         <View style={{ padding: '0 24rpx' }}>
-          <Search placeholder="请输入编号/面料" showBtn={false} changeOnSearch={getSearchData} debounceTime={350}></Search>
+          <Search placeholder="请输入编号/面料" showBtn={false} changeOnSearch={getSearchData}></Search>
         </View>
         <View className={styles.selectList}>
           <ScrollView className={styles['selectList-scroll-view']} scrollY>
@@ -134,5 +133,5 @@ const SelectProduct = forwardRef((params: PropsType, ref) => {
       </Popup>
     </>
   )
-})
-export default SelectProduct
+}
+export default forwardRef(SelectProduct)
diff --git a/src/components/shopCart/index.tsx b/src/components/shopCart/index.tsx
index 19c631d..8481b9e 100644
--- a/src/components/shopCart/index.tsx
+++ b/src/components/shopCart/index.tsx
@@ -25,18 +25,52 @@ interface param {
   intoStatus?: 'again' | 'shop'
   default_sale_mode?: number // 面料类型（0：大货， 1：剪版，2：散剪
 }
-export default ({ show = false, onClose, intoStatus = 'shop', default_sale_mode }: param) => {
+const ShopCart = ({ show = false, onClose, intoStatus = 'shop', default_sale_mode }: param) => {
   const selectList = [
     { value: 0, title: '大货', unit: '条', eunit: 'kg', step: 1, digits: 0, minNum: 1, maxNum: 100000, defaultNum: 1 },
     { value: 1, title: '剪板', unit: '米', eunit: 'm', step: 1, digits: 2, minNum: 0.5, maxNum: 9.99, defaultNum: 1 },
     { value: 2, title: '散剪', unit: '米', eunit: 'kg', step: 1, digits: 2, minNum: 3, maxNum: 100000, defaultNum: 3 },
   ]
-
+  // 获取数据
+  const [list, setList] = useState<any[]>([])
+  const [loading, setLoading] = useState(false)
+  const { fetchData } = GetShoppingCartApi()
   // 切换面料类型
   const [selectIndex, setSelectIndex] = useState(default_sale_mode || 0)
   const selectProduct = (index: number) => {
     setSelectIndex(index)
   }
+
+  // 初始化全部数据默认勾选
+  const [checkboxData, setCheckboxData] = useState<Record<number, true | false>>({})
+  const initStatus = useRef(false)
+
+  // 全选反选
+  const [selectStatus, setSelectStatus] = useState(false)
+
+  const initList = (color_list) => {
+    if (initStatus.current) {
+      color_list?.forEach((item) => {
+        if (selectIndex == item.sale_mode) { checkboxData[item.id] = true }
+      })
+      initStatus.current = false
+    }
+    setCheckboxData(() => checkboxData)
+  }
+
+  // 重置勾选数据
+  const resetList = () => {
+    list?.forEach((item) => {
+      if (selectIndex == item.sale_mode || selectIndex == -1) {
+        checkboxData[item.id] = true
+      }
+      else {
+        checkboxData[item.id] = false
+      }
+    })
+    setCheckboxData(() => ({ ...checkboxData }))
+  }
+
   useEffect(() => {
     setSelectIndex(() => default_sale_mode!)
   }, [default_sale_mode])
@@ -46,26 +80,11 @@ export default ({ show = false, onClose, intoStatus = 'shop', default_sale_mode
     setSelectStatus(true)
   }, [selectIndex])
 
+  // 绑定业务员和电话号码
+  const [showBindSalesman, setShowBindSalesman] = useState(false)
   // 获取购物车数据数量
   const { setShopCount } = useCommonData()
 
-  // 重置勾选数据
-  const resetList = () => {
-    list?.map((item) => {
-      if (selectIndex == item.sale_mode || selectIndex == -1) {
-        checkboxData[item.id] = true
-      }
-      else {
-        checkboxData[item.id] = false
-      }
-    })
-    setCheckboxData(() => ({ ...checkboxData }))
-  }
-
-  // 获取数据
-  const [list, setList] = useState<any[]>([])
-  const [loading, setLoading] = useState(false)
-  const { fetchData } = GetShoppingCartApi()
   const getShoppingCart = async() => {
     const { data } = await fetchData()
     const color_list = data.color_list || []
@@ -75,25 +94,12 @@ export default ({ show = false, onClose, intoStatus = 'shop', default_sale_mode
     setLoading(false)
   }
 
-  // 初始化全部数据默认勾选
-  const [checkboxData, setCheckboxData] = useState<Record<number, true | false>>({})
-  const initStatus = useRef(false)
-  const initList = (color_list) => {
-    if (initStatus.current) {
-      color_list?.map((item) => {
-        if (selectIndex == item.sale_mode) { checkboxData[item.id] = true }
-      })
-      initStatus.current = false
-    }
-    setCheckboxData(() => checkboxData)
-  }
-
   // 显示是展示数据
   useEffect(() => {
     if (!show) {
       setList([])
       setSelectIndex(default_sale_mode || 0)
-    }
+    }
     else {
       setLoading(true)
       initStatus.current = true
@@ -113,28 +119,19 @@ export default ({ show = false, onClose, intoStatus = 'shop', default_sale_mode
     setShowPopup(show)
   }, [show])
 
-  // 全选反选
-  const [selectStatus, setSelectStatus] = useState(false)
   const selectAll = () => {
-    list.map((item) => {
+    list.forEach((item) => {
       if (selectIndex == item.sale_mode || selectIndex == -1) { checkboxData[item.id] = !selectStatus }
     })
     setSelectStatus(!selectStatus)
     setCheckboxData(() => ({ ...checkboxData }))
   }
 
-  // checkbox选中回调
-  const selectCallBack = (item) => {
-    checkboxData[item.id] = true
-    checkSelect()
-    setCheckboxData(() => ({ ...checkboxData }))
-  }
-
   // checkbox选中判断是否全部选中，全部选中后是全选，否则反选
   const checkSelect = () => {
     let list_count = 0
     let select_count = 0
-    list?.map((item) => {
+    list?.forEach((item) => {
       if (selectIndex == -1 || selectIndex == item.sale_mode) {
         list_count++
         if (checkboxData[item.id]) { select_count++ }
@@ -142,6 +139,12 @@ export default ({ show = false, onClose, intoStatus = 'shop', default_sale_mode
     })
     setSelectStatus(select_count == list_count)
   }
+  // checkbox选中回调
+  const selectCallBack = (item) => {
+    checkboxData[item.id] = true
+    checkSelect()
+    setCheckboxData(() => ({ ...checkboxData }))
+  }
 
   // checkbox关闭回调
   const colseCallBack = (item) => {
@@ -156,6 +159,17 @@ export default ({ show = false, onClose, intoStatus = 'shop', default_sale_mode
     setShowPopup(false)
   }
 
+  // 获取面料选中的id
+  const selectIds = useRef<number[]>([])
+  const getSelectId = () => {
+    selectIds.current = []
+    list?.forEach((item) => {
+      if (selectIndex == -1 || selectIndex == item.sale_mode) {
+        checkboxData[item.id] && selectIds.current.push(item.id)
+      }
+    })
+  }
+
   // 删除购物车内容
   const { fetchData: delShopFetchData } = DelShoppingCartApi()
   const delSelect = () => {
@@ -172,14 +186,14 @@ export default ({ show = false, onClose, intoStatus = 'shop', default_sale_mode
               title: '成功',
               icon: 'success',
             })
-          }
+          }
           else {
             Taro.showToast({
               title: res.msg,
               icon: 'none',
             })
           }
-        }
+        }
         else if (res.cancel) {
           console.log('用户点击取消')
         }
@@ -187,17 +201,6 @@ export default ({ show = false, onClose, intoStatus = 'shop', default_sale_mode
     })
   }
 
-  // 获取面料选中的id
-  const selectIds = useRef<number[]>([])
-  const getSelectId = () => {
-    selectIds.current = []
-    list?.map((item) => {
-      if (selectIndex == -1 || selectIndex == item.sale_mode) {
-        checkboxData[item.id] && selectIds.current.push(item.id)
-      }
-    })
-  }
-
   // 格式化金额
   const formatPirce = useCallback((price) => {
     return Number(formatPriceDiv(price))
@@ -219,7 +222,7 @@ export default ({ show = false, onClose, intoStatus = 'shop', default_sale_mode
     const product_list = new Set() // 面料
     let color_count = 0 // 颜色数量
     let all_count = 0 // 总数量
-    list.map((item) => {
+    list.forEach((item) => {
       if (checkboxData[item.id]) {
         estimate_amount += item.estimate_amount
         product_list.add(item.product_id)
@@ -236,10 +239,10 @@ export default ({ show = false, onClose, intoStatus = 'shop', default_sale_mode
   }, [list, checkboxData])
 
   // 去结算
-  const { fetchData: useFetchData } = GetAdminUserInfoApi()
+  const { fetchData: FetchData } = GetAdminUserInfoApi()
   const { fetchData: applyOrderAccessFetchData } = ApplyOrderAccessApi()
   const orderDetail = throttle(async() => {
-    const res = await useFetchData()
+    const res = await FetchData()
     if (res.data.order_access_status !== 3) {
       if (res.data.order_access_status == 1) { applyOrderAccessFetchData() }
       setShowBindSalesman(() => true)
@@ -249,14 +252,14 @@ export default ({ show = false, onClose, intoStatus = 'shop', default_sale_mode
     getSelectId()
     if (selectIds.current.length == 0) {
       alert.error('请选择面料')
-    }
+    }
     else {
       const ids = selectIds.current.join('-')
       setParam({ ids, sale_mode: selectIndex }) // 临时存储
       closePopup()
       if (intoStatus == 'again') {
         goLink('/pages/order/comfirm', {}, 'redirectTo')
-      }
+      }
       else {
         goLink('/pages/order/comfirm')
       }
@@ -277,9 +280,6 @@ export default ({ show = false, onClose, intoStatus = 'shop', default_sale_mode
     }
   }, 300)
 
-  // 绑定业务员和电话号码
-  const [showBindSalesman, setShowBindSalesman] = useState(false)
-
   // 显示图片弹窗
   const [showLabImage, setShowLabImage] = useState(false)
   const [labImageValue, setLabImageValue] = useState()
@@ -309,7 +309,7 @@ export default ({ show = false, onClose, intoStatus = 'shop', default_sale_mode
                 <View
                   key={item.value}
                   onClick={() => selectProduct(item.value)}
-                  className={classnames(styles.search_item, selectIndex == item.value && styles.search_item_select)}
+                  className={classnames(styles.search_item, selectIndex == item.value && styles.search_item_select)}
                 >
                   {item.title}
                 </View>
@@ -325,7 +325,7 @@ export default ({ show = false, onClose, intoStatus = 'shop', default_sale_mode
                     return (
                       <View
                         key={item}
-                        className={classnames(styles.product_item, selectIndex != -1 && selectIndex != item.sale_mode && styles.no_product_item_select)}
+                        className={classnames(styles.product_item, selectIndex != -1 && selectIndex != item.sale_mode && styles.no_product_item_select)}
                       >
                         <View className={styles.checkbox}>
                           <MCheckbox
@@ -412,3 +412,5 @@ export default ({ show = false, onClose, intoStatus = 'shop', default_sale_mode
     </View>
   )
 }
+
+export default ShopCart
diff --git a/src/components/shoppingCart/index.tsx b/src/components/shoppingCart/index.tsx
index 4cf97c7..0d3cc00 100644
--- a/src/components/shoppingCart/index.tsx
+++ b/src/components/shoppingCart/index.tsx
@@ -34,7 +34,7 @@ interface prosObj {
   hasBottom?: true | false // 默认不占位底部
   onBlur?: (e: string, res: object) => void
 }
-export default memo(forwardRef((props: prosObj, ref) => {
+const ShoppingCart = (props: prosObj, ref) => {
   const {
     showPopup = false,
     closePopup,
@@ -105,7 +105,7 @@ export default memo(forwardRef((props: prosObj, ref) => {
     return s
   }
 
-  const rows = memo(({ id, index, style, data }: any) => {
+  const rows = ({ id, index, style, data }: any) => {
     const item = data[index]
     return (
       <>
@@ -120,7 +120,8 @@ export default memo(forwardRef((props: prosObj, ref) => {
         ></Goods>
       </>
     )
-  })
+  }
+  const Rows = memo(rows)
 
   return (
     <Popup showTitle={false} show={showPopup} onClose={() => closePopup?.()}>
@@ -164,7 +165,6 @@ export default memo(forwardRef((props: prosObj, ref) => {
                 placeholder="请输入搜索布料"
                 showBtn={false}
                 changeOnSearch={getSearchData}
-                debounceTime={300}
                 adjustPosition
               />
             </View>
@@ -181,7 +181,7 @@ export default memo(forwardRef((props: prosObj, ref) => {
                   itemSize={100} /* 列表单项的高度  */
                   overscanCount={1}
                 >
-                  {rows}
+                  {Rows}
                 </VirtualList>
               </View>
 
@@ -212,4 +212,5 @@ export default memo(forwardRef((props: prosObj, ref) => {
       </ScrollView>
     </Popup>
   )
-}))
+}
+export default memo(forwardRef(ShoppingCart))
diff --git a/src/components/sideBar/index.tsx b/src/components/sideBar/index.tsx
index d5927fd..3451dcf 100644
--- a/src/components/sideBar/index.tsx
+++ b/src/components/sideBar/index.tsx
@@ -1,9 +1,9 @@
 import { ScrollView, View } from '@tarojs/components'
 import Taro, { useReady } from '@tarojs/taro'
-import type { ReactNode } from 'react'
+import type { ReactNode } from 'react'
 import React, { memo, useEffect, useMemo, useRef, useState } from 'react'
 import classnames from 'classnames'
-import type { StatusParam } from '../infiniteScroll'
+import type { StatusParam } from '../infiniteScroll'
 import InfiniteScroll from '../infiniteScroll'
 import LoadingCard from '../loadingCard'
 import styles from './index.module.scss'
@@ -21,8 +21,7 @@ interface Params {
   hasMore?: true | false
   statusMore?: StatusParam
 }
-
-export default memo(({
+const SideBar = ({
   list = [],
   defaultValue = 0,
   height = '100vh',
@@ -34,7 +33,7 @@ export default memo(({
   selfOnScrolltolower,
   hasMore = true,
   statusMore = 0,
-}: Params) => {
+}: Params) => {
   const num_half = useRef(0)
 
   const [selected, setSelected] = useState(defaultValue)
@@ -44,6 +43,15 @@ export default memo(({
     setSelected(defaultValue)
   }, [defaultValue])
 
+  const computeSelectTab = (index) => {
+    if ((index + 1) > num_half.current) {
+      const num = index + 1 - num_half.current
+      setTabId(list[num].id.toString())
+    }
+    else {
+      setTabId(list[0].id.toString())
+    }
+  }
   const init = () => {
     const index = list?.findIndex((item) => {
       return item.id == defaultValue
@@ -59,16 +67,6 @@ export default memo(({
     computeSelectTab(index)
   }
 
-  const computeSelectTab = (index) => {
-    if ((index + 1) > num_half.current) {
-      const num = index + 1 - num_half.current
-      setTabId(list[num].id.toString())
-    }
-    else {
-      setTabId(list[0].id.toString())
-    }
-  }
-
   useEffect(() => {
     Taro.nextTick(() => {
       const query = Taro.createSelectorQuery()
@@ -127,4 +125,5 @@ export default memo(({
 
     </>
   )
-})
+}
+export default memo(SideBar)
diff --git a/src/components/sortBtn/index.tsx b/src/components/sortBtn/index.tsx
index 6c7a60c..782ba3d 100644
--- a/src/components/sortBtn/index.tsx
+++ b/src/components/sortBtn/index.tsx
@@ -9,7 +9,7 @@ interface params {
   sortValue?: { desc: string; asc: string } // 排序规则，后端制定
 }
 type sortParam = 'none'|'top'|'bottom'
-export default forwardRef(({ status = 'none', onChange, sortValue }: params, ref) => {
+const SortBtn = ({ status = 'none', onChange, sortValue }: params, ref) => {
   const [sortStatus, setSortStatus] = useState<sortParam>()
   useEffect(() => {
     setSortStatus(() => status)
@@ -19,11 +19,11 @@ export default forwardRef(({ status = 'none', onChange, sortValue }: params, ref
     let value = ''
     if (sortStatus == 'none') {
       status = 'top'
-      value = sortValue?.asc!
+      value = sortValue?.asc as string
     }
     if (sortStatus == 'top') {
       status = 'bottom'
-      value = sortValue?.desc!
+      value = sortValue?.desc as string
     }
     if (sortStatus == 'bottom') { status = 'none' }
     setSortStatus(() => status)
@@ -42,4 +42,5 @@ export default forwardRef(({ status = 'none', onChange, sortValue }: params, ref
       </View>
     </>
   )
-})
+}
+export default forwardRef(SortBtn)
diff --git a/src/components/table/index.tsx b/src/components/table/index.tsx
index 2018731..e2b2214 100644
--- a/src/components/table/index.tsx
+++ b/src/components/table/index.tsx
@@ -73,10 +73,10 @@ const Table: FC<TablePropsType> = (props) => {
           && dataSource.list.map((source) => {
             return (
               <View className={classnames(styles.tr, styles['bg-line'])} key={source.key}>
-                {columns.map((column) => {
+                {columns.map((column, key) => {
                   if (column.render) {
                     return (
-                      <View className={styles.td} style={{ width: column.width }}>
+                      <View key={key} className={styles.td} style={{ width: column.width }}>
                         {/* 判断表头是不是有render 有就执行render */}
                         {column.render(source[column.dataIndex])}
                       </View>
@@ -84,7 +84,7 @@ const Table: FC<TablePropsType> = (props) => {
                   }
                   else {
                     return (
-                      <View className={classnames(styles.td, getColumnStyle(column))} style={{ width: column.width }}>
+                      <View key={key} className={classnames(styles.td, getColumnStyle(column))} style={{ width: column.width }}>
                         {
                           source[column.dataIndex] // 根据表头填数据
                         }
diff --git a/src/components/tabs/index.tsx b/src/components/tabs/index.tsx
index 127feb3..e8b7b31 100644
--- a/src/components/tabs/index.tsx
+++ b/src/components/tabs/index.tsx
@@ -1,5 +1,5 @@
 import { ScrollView, View } from '@tarojs/components'
-import type { ReactNode } from 'react'
+import type { ReactNode } from 'react'
 import { memo, useEffect, useState } from 'react'
 import classnames from 'classnames'
 import styles from './index.module.scss'
@@ -17,8 +17,7 @@ interface Params {
   style?: Object
 
 }
-
-export default memo(({ list = [], defaultValue = 0, tabsOnClick, style = {} }: Params) => {
+const Tabs = ({ list = [], defaultValue = 0, tabsOnClick, style = {} }: Params) => {
   const [selected, setSelected] = useState(defaultValue)
   const [tabId, setTabId] = useState('')
 
@@ -57,4 +56,5 @@ export default memo(({ list = [], defaultValue = 0, tabsOnClick, style = {} }: P
       </View>
     </>
   )
-})
+}
+export default memo(Tabs)
diff --git a/src/components/textareaEnhance/index.tsx b/src/components/textareaEnhance/index.tsx
index 752c257..3c3a8cf 100644
--- a/src/components/textareaEnhance/index.tsx
+++ b/src/components/textareaEnhance/index.tsx
@@ -11,7 +11,7 @@ interface Param {
   defaultValue?: string
   onlyRead?: false|true
 }
-export default memo(({ onChange, title = '', placeholder = '请输入', defaultValue, onlyRead = false }: Param) => {
+const TextareaEnhance = ({ onChange, title = '', placeholder = '请输入', defaultValue, onlyRead = false }: Param) => {
   const [descData, setDescData] = useState({
     number: 0,
     value: '',
@@ -38,11 +38,13 @@ export default memo(({ onChange, title = '', placeholder = '请输入', defaultV
     <View className={styles.other_desc}>
       <View className={styles.title}>{title}</View>
       <View className={styles.textarea}>
-        {(descData.show && !onlyRead) && <Textarea autoFocus value={descData.value} onBlur={() => toggleShowRealTextarea(false)} className={styles.textarea_con} cursorSpacing={100} maxlength={descData.count} onInput={e => getDesc(e.detail.value)}></Textarea>
-                    || <View className={classnames(styles.textarea_con_pretend, descData.value && styles.textarea_con_pretend_ed)} onClick={() => toggleShowRealTextarea(true)}>{descData.value || placeholder}</View>
+        {(descData.show && !onlyRead)
+          ? <Textarea autoFocus value={descData.value} onBlur={() => toggleShowRealTextarea(false)} className={styles.textarea_con} cursorSpacing={100} maxlength={descData.count} onInput={e => getDesc(e.detail.value)}></Textarea>
+          : <View className={classnames(styles.textarea_con_pretend, descData.value && styles.textarea_con_pretend_ed)} onClick={() => toggleShowRealTextarea(true)}>{descData.value || placeholder}</View>
         }
         <View className={styles.descDataNum}>{`${descData.number}/${descData.count}`}</View>
       </View>
     </View>
   )
-})
+}
+export default memo(TextareaEnhance)
diff --git a/src/components/timePicker/index.tsx b/src/components/timePicker/index.tsx
index 8bb0a56..7d36b9f 100644
--- a/src/components/timePicker/index.tsx
+++ b/src/components/timePicker/index.tsx
@@ -12,8 +12,7 @@ interface Props {
   start?: DateArg
   onSelectDate?: (any) => void
 }
-
-export default memo((props: Props) => {
+const TimePicker = (props: Props) => {
   const { start = '', end = '', onSelectDate } = props
   const [time, setTime] = useState<any>({})
 
@@ -49,4 +48,5 @@ export default memo((props: Props) => {
       </View> */}
     </>
   )
-})
+}
+export default memo(TimePicker)
diff --git a/src/components/timePickerPopup/index.tsx b/src/components/timePickerPopup/index.tsx
index 32c3f43..edc9c7d 100644
--- a/src/components/timePickerPopup/index.tsx
+++ b/src/components/timePickerPopup/index.tsx
@@ -11,8 +11,7 @@ interface Props {
   start?: DateArg
   onSelectDate?: (any) => void
 }
-
-export default memo((props: Props) => {
+const TimePickerPopup = (props: Props) => {
   const { showTime = false, closePopup, start = '', end = '', onSelectDate } = props
 
   return (
@@ -20,4 +19,5 @@ export default memo((props: Props) => {
       <TimePicker start={start} end={end} onSelectDate={onSelectDate}></TimePicker>
     </Popup>
   )
-})
+}
+export default memo(TimePickerPopup)
diff --git a/src/components/toolTips/index.tsx b/src/components/toolTips/index.tsx
index b8d393b..48bfb33 100644
--- a/src/components/toolTips/index.tsx
+++ b/src/components/toolTips/index.tsx
@@ -54,7 +54,7 @@ const popoverStyle = {
   color: '#333333',
 }
 
-const ToolTip = forwardRef<ToolTipRef, ToolTipPropsType>((props, ref) => {
+const ToolTip = (props: ToolTipPropsType, ref) => {
   const id = useId()
   const [, setForceUpdate] = useState({})
   const { placement = 'top-start', defaultVisible = false, onVisibleChange, children, content = '请填入提示信息', customClassName, customStyle, customContentStyle } = props
@@ -326,6 +326,6 @@ const ToolTip = forwardRef<ToolTipRef, ToolTipPropsType>((props, ref) => {
       </View>
     </>
   )
-})
+}
 
-export default ToolTip
+export default forwardRef<ToolTipRef, ToolTipPropsType>(ToolTip)
diff --git a/src/components/uploadImage/index.tsx b/src/components/uploadImage/index.tsx
index 0d78b51..65f34f2 100644
--- a/src/components/uploadImage/index.tsx
+++ b/src/components/uploadImage/index.tsx
@@ -13,11 +13,13 @@ interface ImageParam {
   defaultList?: string[]
   onlyRead?: boolean
 }
-const PictureItem = memo<ImageParam>(({ onChange, defaultList, onlyRead = false }) => {
+const PictureItem = ({ onChange, defaultList, onlyRead = false }: ImageParam) => {
   const { getWxPhoto, getChatPhoto } = useUploadCDNImg()
 
   const [imageList, setImageLise] = useState<string[]>([])
-
+  // 筛选内容展示
+  const [showPopup, setshowPopup] = useState(false)
+  const [List, setList] = useState<any[]>([{ id: 1, name: '手机相册', check: false }, { id: 2, name: '从微信对话选择', check: false }])
   useEffect(() => {
     setImageLise(defaultList || [])
   }, [defaultList])
@@ -29,17 +31,18 @@ const PictureItem = memo<ImageParam>(({ onChange, defaultList, onlyRead = false
 
   // 上传图片逻辑
   const handPic = async(id) => {
+    let list: any
     // let resArr = List.filter(item => {
     //   return item.check
     // })
     if (id == 1) {
-      var list: any = await getWxPhoto('after-sale', 5)
-    }
+      list = await getWxPhoto('after-sale', 5)
+    }
     else {
-      var list: any = await getChatPhoto('after-sale', 5)
+      list = await getChatPhoto('after-sale', 5)
     }
     const images: any[] = []
-    list?.map((item) => {
+    list?.forEach((item) => {
       images.push(item.url)
     })
     setImageLise([...imageList, ...images])
@@ -67,15 +70,12 @@ const PictureItem = memo<ImageParam>(({ onChange, defaultList, onlyRead = false
     })
   }
 
-  // 筛选内容展示
-  const [showPopup, setshowPopup] = useState(false)
-  const [List, setList] = useState<any[]>([{ id: 1, name: '手机相册', check: false }, { id: 2, name: '从微信对话选择', check: false }])
   // 点击选择的方式
   const handItem = (item) => {
     List.map((it) => {
       if (item.id == it.id) {
         it.check = true
-      }
+      }
       else {
         it.check = false
       }
@@ -89,7 +89,7 @@ const PictureItem = memo<ImageParam>(({ onChange, defaultList, onlyRead = false
     <>
       <View className={styles.image_main}>
         {imageList?.map((item, index) => (
-          <View className={styles.ImgItem}>
+          <View className={styles.ImgItem} key={index}>
             <Image mode="aspectFill" src={formatImgUrl(item)} onClick={showImage}></Image>
             {!onlyRead && <View onClick={() => delImage(index)}>
               <IconFont name="icon-guanbi" size={30} customClassName={styles.miconfont_close} color="#ffffff"></IconFont>
@@ -119,6 +119,6 @@ const PictureItem = memo<ImageParam>(({ onChange, defaultList, onlyRead = false
       </Popup>
     </>
   )
-})
+}
 
-export default PictureItem
+export default memo<ImageParam>(PictureItem)
diff --git a/src/custom-tab-bar/index.tsx b/src/custom-tab-bar/index.tsx
index 47d1562..f24aef5 100644
--- a/src/custom-tab-bar/index.tsx
+++ b/src/custom-tab-bar/index.tsx
@@ -35,16 +35,15 @@ const CustomTabBar: FC = () => {
   console.log('selectedId', selectedId)
 
   const dispatch = useDispatch<Dispatch<TabBarAction>>()
-
+  const setSelected = (id: TabBarIndexMap[number]['id']) => {
+    dispatch({ type: TabBarType.SET_SELECTED, data: { tabItem, selectedId: id } })
+  }
   const handleSelectTabItem = (id: TabBarIndexMap[number]['id']) => {
     return () => {
       setSelected(id)
-      Taro.switchTab({ url: tabItem?.find(item => item.id === id)?.pagePath! })
+      Taro.switchTab({ url: tabItem?.find(item => item.id === id)?.pagePath as string })
     }
   }
-  const setSelected = (id: TabBarIndexMap[number]['id']) => {
-    dispatch({ type: TabBarType.SET_SELECTED, data: { tabItem, selectedId: id } })
-  }
 
   return (
     <View className={styles.customTabBar}>
diff --git a/src/index.html b/src/index.html
index ec38302..5716178 100644
--- a/src/index.html
+++ b/src/index.html
@@ -10,7 +10,8 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" >
   <title></title>
   <script>
-    !function(n){function e(){var e=n.document.documentElement,t=e.getBoundingClientRect().width;e.style.fontSize=t>=640?"40px":t<=320?"20px":t/320*20+"px"}n.addEventListener("resize",(function(){e()})),e()}(window);
+    // eslint-disable-next-line no-unused-expressions, no-shadow, no-sequences
+    !(function(n) { function e() { const e = n.document.documentElement; const t = e.getBoundingClientRect().width; e.style.fontSize = t >= 640 ? '40px' : t <= 320 ? '20px' : `${t / 320 * 20}px` }n.addEventListener('resize', () => { e() }), e() }(window))
   </script>
 </head>
 <body>
diff --git a/src/pages/accountPage/index.tsx b/src/pages/accountPage/index.tsx
index 0ca4d59..e4a4d6b 100644
--- a/src/pages/accountPage/index.tsx
+++ b/src/pages/accountPage/index.tsx
@@ -4,11 +4,11 @@ import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import classnames from 'classnames'
 import styles from './index.module.scss'
 import Search from '@/components/search'
-import { mpcashManagementOrderaccount } from '@/api/newCollection'
+import { MpCashManagementOrderAccount } from '@/api/newCollection'
 import InfiniteScroll from '@/components/infiniteScroll'
 import { dataLoadingStatus, getFilterData } from '@/common/util'
 
-export default () => {
+const AccountPage = () => {
   const [search, setSearch] = useState({
     search_name: null,
     page: 1,
@@ -16,7 +16,7 @@ export default () => {
   })
   const [clentList, setClientlist] = useState<{ list: any[]; total: number }>({ list: [], total: 0 })
 
-  const { fetchData: clitentFetch, state: orderState } = mpcashManagementOrderaccount()
+  const { fetchData: clitentFetch, state: orderState } = MpCashManagementOrderAccount()
   // 数据加载状态
   const statusMore = useMemo(() => {
     return dataLoadingStatus({ list: clentList.list, total: clentList.total, status: orderState.loading! })
@@ -27,22 +27,8 @@ export default () => {
     bankName: '',
   })
 
-  // 输入了搜索关键字
-  const getSearchData = useCallback((eq) => {
-    pageNum.current.page = 1
-    setClientlist(() => ({ list: [], total: 0 }))
-    setSearch(e => ({ ...e, search_name: eq, size: 10 }))
-  }, [])
-
   const router = useRouter()
 
-  useEffect(() => {
-    if (search.search_name === '') {
-      setSearch(e => ({ ...e, search_name: null }))
-    }
-    if (search.search_name !== '') { getCuss() }
-  }, [search])
-
   // 上拉加载数据
   const pageNum = useRef({ size: search.size, page: search.page })
   const getScrolltolower = useCallback(() => {
@@ -54,6 +40,13 @@ export default () => {
     }
   }, [clentList])
 
+  // 输入了搜索关键字
+  const getSearchData = useCallback((eq) => {
+    pageNum.current.page = 1
+    setClientlist(() => ({ list: [], total: 0 }))
+    setSearch(e => ({ ...e, search_name: eq, size: 10 }))
+  }, [])
+
   // 列表下拉刷新
   const [refresherTriggeredStatus, setRefresherTriggeredStatus] = useState(false)
   const getRefresherRefresh = async() => {
@@ -77,6 +70,12 @@ export default () => {
     setClientlist(e => ({ ...e, list: res.data?.list, total: res.data?.total }))
     setRefresherTriggeredStatus(() => false)
   }
+  useEffect(() => {
+    if (search.search_name === '') {
+      setSearch(e => ({ ...e, search_name: null }))
+    }
+    if (search.search_name !== '') { getCuss() }
+  }, [search])
   // 选择业务员
   const selectClient = (item) => {
     clentList.list.map((it) => {
@@ -146,3 +145,5 @@ export default () => {
     </View>
   )
 }
+
+export default AccountPage
diff --git a/src/pages/addAddress/index.tsx b/src/pages/addAddress/index.tsx
index 2f880bd..f63d540 100644
--- a/src/pages/addAddress/index.tsx
+++ b/src/pages/addAddress/index.tsx
@@ -6,11 +6,10 @@ import styles from './index.module.scss'
 import FromList from '@/components/FromList'
 import Address from '@/components/address'
 import { alert } from '@/common/common'
-import { mppurchaseraddress, mppurchaseraddressdelect, mppurchaseraddressget, mppurchaseraddressput } from '@/api/addressList'
-import { getFilterData } from '@/common/util'
+import { MpPurchaserAddress, MpPurchaserAddressDelete, MpPurchaserAddressGet, MpPurchaserAddressPut } from '@/api/addressList'
 import IconFont from '@/components/iconfont/iconfont'
 
-export default () => {
+const AddAddress = () => {
   const [itemList, setItemList] = useState<any[]>(
     [
       {
@@ -54,22 +53,6 @@ export default () => {
   )
 
   const [ischecked, setIsChecked] = useState(false)
-  const onChange = (eq) => {
-    setIsChecked(eq.detail.value)
-    setFormData(e => ({ ...e, is_default: eq.detail.value, address_detail: itemList[4].value }))
-  }
-
-  const router = useRouter()
-  useDidShow(() => {
-    if (router.params.type === 'add') {
-      setNavigationBarTitle({ title: '新增收货地址' })
-    }
-    else {
-      setFormData(e => ({ ...e, id: router.params.id as any }))
-      getInfo()
-      setNavigationBarTitle({ title: '编辑收货地址' })
-    }
-  })
   const [formData, setFormData] = useState({
     name: '',
     phone: '',
@@ -81,8 +64,15 @@ export default () => {
     id: '',
     factory: '',
   })
+  const onChange = (eq) => {
+    setIsChecked(eq.detail.value)
+    setFormData(e => ({ ...e, is_default: eq.detail.value, address_detail: itemList[4].value }))
+  }
+
+  const router = useRouter()
+
   // 获取相应id的信息
-  const { fetchData: infoFetch } = mppurchaseraddressget()
+  const { fetchData: infoFetch } = MpPurchaserAddressGet()
   const [infoObj, setinfoObj] = useState<any>()
   const getInfo = async() => {
     const res = await infoFetch({
@@ -116,7 +106,7 @@ export default () => {
           item.value = res.data.phone
         }
         if (item.title === '收货地址') {
-          item.value = res.data.province_name, res.data.city_name, res.data.district_name
+          item.value = `${res.data.province_name}${res.data.city_name}${res.data.district_name}`
         }
         if (item.title === '详细地址') {
           item.value = res.data.address_detail
@@ -131,13 +121,20 @@ export default () => {
     }
   }
   // `${res.data.province_name} + ${res.data.city_name} + ${res.data.district_name}`
-
+  useDidShow(() => {
+    if (router.params.type === 'add') {
+      setNavigationBarTitle({ title: '新增收货地址' })
+    }
+    else {
+      setFormData(e => ({ ...e, id: router.params.id as any }))
+      getInfo()
+      setNavigationBarTitle({ title: '编辑收货地址' })
+    }
+  })
   const btnDisabled = useMemo(() => {
     let canShow = false
     const obj = itemList.filter((item) => {
-      if (item.require) {
-        return item.value !== ''
-      }
+      return item.require && (item.value !== '')
     })
     if (obj.length < 4) {
       canShow = true
@@ -214,7 +211,7 @@ export default () => {
     })
   }
   // 新增地址
-  const { fetchData: addAddressFetch } = mppurchaseraddress()
+  const { fetchData: addAddressFetch } = MpPurchaserAddress()
   const handAdd = async() => {
     // if (!btnDisabled) return false
     const res = await addAddressFetch({ ...formData, purchaser_id: Number(router.params.purchaser_id) })
@@ -233,7 +230,7 @@ export default () => {
   }
 
   // 编辑地址
-  const { fetchData: putFetch } = mppurchaseraddressput()
+  const { fetchData: putFetch } = MpPurchaserAddressPut()
   const handEdit = async() => {
     // if (!btnDisabled) return false
     const res = await putFetch({ ...formData, purchaser_id: Number(router.params.purchaser_id), id: Number(infoObj?.id) })
@@ -251,7 +248,7 @@ export default () => {
     }
   }
   // 删除地址
-  const { fetchData: deleteFetch } = mppurchaseraddressdelect()
+  const { fetchData: deleteFetch } = MpPurchaserAddressDelete()
   const handleDelete = async() => {
     Taro.showModal(({
       title: '提示',
@@ -334,3 +331,5 @@ export default () => {
     </>
   )
 }
+
+export default AddAddress
diff --git a/src/pages/addCollection/components/form/index.tsx b/src/pages/addCollection/components/form/index.tsx
index 8655696..e0119f9 100644
--- a/src/pages/addCollection/components/form/index.tsx
+++ b/src/pages/addCollection/components/form/index.tsx
@@ -30,8 +30,7 @@ interface Params {
   bigMoney?: any // 展示的大写金额,
   isOpen?: boolean // 是否展开状态
 }
-
-export default memo((pros: Params) => {
+const Form = (pros: Params) => {
   return (
     <>
       {
@@ -98,4 +97,5 @@ export default memo((pros: Params) => {
       }
     </>
   )
-})
+}
+export default memo(Form)
diff --git a/src/pages/addCollection/index.tsx b/src/pages/addCollection/index.tsx
index ec30d6b..4154ae4 100644
--- a/src/pages/addCollection/index.tsx
+++ b/src/pages/addCollection/index.tsx
@@ -5,26 +5,17 @@ import classnames from 'classnames'
 import styles from './index.module.scss'
 import Form from './components/form'
 import {
-  mpcashManagementOrderaccount, mpcashManagementOrderpost,
-  mpshouldCollectOrderpurchaser,
+  MpCashManagementOrderAccount, MpCashManagementOrderPost,
+  MpShouldCollectOrderPurchaser,
 } from '@/api/newCollection'
 import { alert } from '@/common/common'
 import smallToBig from '@/common/money'
 import IconFont from '@/components/iconfont/iconfont'
 
-export default () => {
+const AddCollection = () => {
   // 获取选择的客户
   const pages = Taro.getCurrentPages()
   const currPage = pages[pages.length - 1] // 获取当前页面
-  useDidShow(() => {
-    setQuery(e => ({
-      ...e,
-      purchaser_id: currPage.data?.clientId ? currPage.data?.clientId : Query.purchaser_id,
-      clientName: currPage.data?.clientName ? currPage.data?.clientName : Query.clientName,
-      bankId: currPage.data?.bankId ? currPage.data?.bankId : Query.bankId,
-      bankName: currPage.data?.bankName ? currPage.data?.bankName : Query.bankName,
-    }))
-  })
 
   const [Query, setQuery] = useState<any>({})
 
@@ -35,12 +26,8 @@ export default () => {
     setQuery(val => ({ ...val, picList: list }))
   }, [])
 
-  useEffect(() => {
-    getCuss()
-  }, [])
-
   // 获取首个银行账号
-  const { fetchData: clitentFetch } = mpcashManagementOrderaccount()
+  const { fetchData: clitentFetch } = MpCashManagementOrderAccount()
   const getCuss = async() => {
     const res = await clitentFetch({ page: 1, size: 10 })
     if (res.data) {
@@ -48,7 +35,7 @@ export default () => {
     }
   }
 
-  const { fetchData: scanFetch } = mpshouldCollectOrderpurchaser()
+  const { fetchData: scanFetch } = MpShouldCollectOrderPurchaser()
   // 扫描
   const handScan = (e) => {
     e.stopPropagation()
@@ -81,7 +68,18 @@ export default () => {
       }
     }
   }
-
+  useDidShow(() => {
+    setQuery(e => ({
+      ...e,
+      purchaser_id: currPage.data?.clientId ? currPage.data?.clientId : Query.purchaser_id,
+      clientName: currPage.data?.clientName ? currPage.data?.clientName : Query.clientName,
+      bankId: currPage.data?.bankId ? currPage.data?.bankId : Query.bankId,
+      bankName: currPage.data?.bankName ? currPage.data?.bankName : Query.bankName,
+    }))
+  })
+  useEffect(() => {
+    getCuss()
+  }, [])
   // 判断是否可以提交
   const isDisabled = useMemo(() => {
     if (Query.clientName == ''
@@ -125,7 +123,7 @@ export default () => {
   }
 
   // 确认新建
-  const { fetchData: sureFetch } = mpcashManagementOrderpost()
+  const { fetchData: sureFetch } = MpCashManagementOrderPost()
   const handSure = () => {
     const query = {
       payment_credential_url: picUrl.current,
@@ -279,3 +277,5 @@ export default () => {
     </>
   )
 }
+
+export default AddCollection
diff --git a/src/pages/addressManager/index.tsx b/src/pages/addressManager/index.tsx
index 9a7ebeb..5cd8cc8 100644
--- a/src/pages/addressManager/index.tsx
+++ b/src/pages/addressManager/index.tsx
@@ -5,7 +5,7 @@ import { useState } from 'react'
 import AddressList from '@/components/AddressList'
 import './index.scss'
 
-export default () => {
+const AddressManager = () => {
   const router = useRouter()
   return (
     <View className="address-manager">
@@ -13,3 +13,4 @@ export default () => {
     </View>
   )
 }
+export default AddressManager
diff --git a/src/pages/applyGoods/index.tsx b/src/pages/applyGoods/index.tsx
index 7cbc8a1..33ddef5 100644
--- a/src/pages/applyGoods/index.tsx
+++ b/src/pages/applyGoods/index.tsx
@@ -5,21 +5,99 @@ import classnames from 'classnames'
 import styles from './index.module.scss'
 import { formatDateTime, formatHashTag, formatImgUrl, formatPriceDiv, formatWeightDiv } from '@/common/format'
 import {
-  mpenumreturnExplain,
-  mpenumreturnOrderreturnReason,
-  mpenumreturngoodsStatus,
-  mpreturnApplyOrder,
-  mpsaleOrder,
+  MpEnumReturnExplain,
+  MpEnumReturnGoodsStatus,
+  MpEnumReturnOrderReturnReason,
+  MpReturnApplyOrder,
+  MpSaleOrder,
 } from '@/api/order'
 import Popup from '@/components/popup'
 import UploadImage from '@/components/uploadImage'
 
-export default () => {
+// 产品商品元素
+interface PropGoods {
+  list: any[]
+  obj: {
+    sale_mode?: number | string
+  }
+  handTui?: (any) => void
+  handCancel?: (any) => void
+  onBlur?: (e: any, obj: any) => void
+  onInputEven?: (e: any, obj: any) => void
+  handReduce?: (any) => void
+  handAdd?: (any) => void
+}
+const GoodsItem = (porps: PropGoods) => {
+  const { list = [], obj = {}, handTui, handCancel, onBlur, handReduce, handAdd, onInputEven } = porps
+  // const [value, setValue] = useState<any>({ count: 1 })
+  // const onInputEven = (e) => {
+  //     let res = Number(e.detail.value)
+  //     if (res < 1) {
+  //         setValue({ count: 1 })
+  //     } else {
+  //         setValue({ count: res })
+  //     }
+  // }
+
+  return (
+    <>
+      {
+        list.map((item, index) => {
+          return (
+            <View className={styles.goodsBox} key={index}>
+              <View className={styles.goodsProduct}>{item.product_code}# {item.product_name}</View>
+              <View className={styles.goodsLine}></View>
+              {
+                item.av_product_color.map((it, inx) => {
+                  return (
+                    <View className={styles.itemGoods} key={inx}>
+                      <Image className={styles.itemPic} mode="aspectFill" src="https://test.cdn.zzfzyc.com/mall/no_img.png"></Image>
+                      {/* <View className={styles.itemPic} style={{ backgroundColor: `rgb(${it?.rgb?.r} ${it?.rgb?.g} ${it?.rgb?.b})` }}></View> */}
+                      <View className={styles.itemRight}>
+                        <View className={styles.item_right_top}>
+                          <View className={styles.itemName}>{it.product_color_code} {it.product_color_name}</View>
+                        </View>
+                        <View className={styles.item_right_Bottom}>
+                          <View className={styles.itemMoney}>x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'}</View>
+                          {
+                            !it.isTui && <View className={styles.btn} onClick={() => handTui?.(it)}>退货</View>
+                          }
+                          {
+                            (it.sale_mode != 0 && it.isTui) && <View className={styles.btnOne} onClick={() => handCancel?.(it)}>已选择退货</View>
+                          }
+                          {
+                            (it.sale_mode == 0 && it.isTui) && <View className={styles.inputBox} >
+                              <View className={styles.redceBox} onClick={() => handReduce?.(it)}>
+                                <View className={styles.reduce}></View>
+                              </View>
+                              <View className={styles.inputBig}>
+                                <Input type="number" value={it.nums} onInput={e => onInputEven?.(e, it)} maxlength={it.roll} onBlur={e => onBlur?.(e, it)}></Input>
+                              </View>
+                              <View className={styles.addBox} onClick={() => handAdd?.(it)}>
+                                                                +
+                              </View>
+                            </View>
+                          }
+                        </View>
+                      </View>
+                    </View>
+                  )
+                })
+              }
+            </View>
+          )
+        })
+      }
+    </>
+
+  )
+}
+const GoodsItemWithMemo = memo(GoodsItem)
+
+const ApplyGoods = () => {
   const router = useRouter()
-  useEffect(() => {
-    getDetail()
-  }, [])
-  const { fetchData: infoFetch } = mpsaleOrder()
+
+  const { fetchData: infoFetch } = MpSaleOrder()
   const [infoObj, setInfoObj] = useState<any>({})
   const [ListArr, setListArr] = useState<any[]>([])
   // 获取订单详情
@@ -31,7 +109,7 @@ export default () => {
     const res = await infoFetch({ id: router.params.orderId })
     if (res.data) {
       res.data.av_return_product.forEach((item) => {
-        item.av_product_color.map((it) => {
+        item.av_product_color.forEach((it) => {
           it.isTui = false
           it.nums = 1
         })
@@ -132,16 +210,12 @@ export default () => {
   // 点击加
   const handAdd = (val) => {
     ListArr.forEach((item) => {
-      item.av_product_color.map((it) => {
+      item.av_product_color.forEach((it) => {
         if (it.sale_order_detail_id === val.sale_order_detail_id) {
           if (it.nums < it.roll) {
             it.nums++
           }
-          else {
-            return
-          }
         }
-        return it
       })
     })
     setListArr([...ListArr])
@@ -159,6 +233,10 @@ export default () => {
     return arr.length
   }, [ListArr])
 
+  useEffect(() => {
+    getDetail()
+  }, [])
+
   // 获取图片列表
   const picUrl = useRef([])
   const getImageList = useCallback((list) => {
@@ -168,11 +246,6 @@ export default () => {
   // 筛选内容展示
   const [showPopup, setshowPopup] = useState(false)
 
-  useEffect(() => {
-    getReason()
-    getReasonTwo()
-  }, [])
-
   const queryRef = useRef(
     {
       return_reason: 1, // 退货原因
@@ -210,7 +283,7 @@ export default () => {
   }, [Query, totalNums])
 
   /// 获取退货原因
-  const { fetchData: resonFetch } = mpenumreturnOrderreturnReason()
+  const { fetchData: resonFetch } = MpEnumReturnOrderReturnReason()
   const [ReasonList, setReasonList] = useState<any[]>([])
   const getReason = async() => {
     const res = await resonFetch()
@@ -220,7 +293,7 @@ export default () => {
   }
 
   // 获取退货原因2
-  const { fetchData: resonTwoFetch } = mpenumreturnExplain()
+  const { fetchData: resonTwoFetch } = MpEnumReturnExplain()
   const [ReasonListTwo, setReasonListTwo] = useState<any[]>([])
   const getReasonTwo = async() => {
     const res = await resonTwoFetch({ return_reason: queryRef.current.return_reason })
@@ -264,7 +337,18 @@ export default () => {
 
     // queryRef.current.return_explain = item.id
   }
-
+  useEffect(() => {
+    getReason()
+    getReasonTwo()
+  }, [])
+  // 数组重置
+  const resetArr = (arr) => {
+    arr.map((it) => {
+      it.default = false
+      return it
+    })
+    return arr
+  }
   // 重置
   const handReset = () => {
     queryRef.current.return_reason = 1
@@ -279,15 +363,6 @@ export default () => {
     setReasonListTwo([...arrTwo])
   }
 
-  // 数组重置
-  const resetArr = (arr) => {
-    arr.map((it) => {
-      it.default = false
-      return it
-    })
-    return arr
-  }
-
   // 判断选择原因
   const selectIsDisabled = useMemo(() => {
     if (Query.return_explain !== '') {
@@ -327,18 +402,18 @@ export default () => {
 
   // 货物情况
   const [DescPopup, setDescPopup] = useState(false)
-  const { fetchData: statusFetch } = mpenumreturngoodsStatus()
+  const { fetchData: statusFetch } = MpEnumReturnGoodsStatus()
   const [GoodStatusList, setGoodStatusList] = useState<any[]>([])
-  useEffect(() => {
-    getGoodStatus()
-  }, [])
+
   const getGoodStatus = async() => {
     const res = await statusFetch()
     if (res.data) {
       setGoodStatusList(res.data.list)
     }
   }
-
+  useEffect(() => {
+    getGoodStatus()
+  }, [])
   const handStatus = (item) => {
     GoodStatusList.map((it) => {
       if (it.id === item.id) {
@@ -389,9 +464,10 @@ export default () => {
       delta: 1,
     })
   }
-
+  // 备注信息
+  const [TextareaValue, setTextareaValue] = useState('')
   // 确认退货
-  const { fetchData: sureFetch } = mpreturnApplyOrder()
+  const { fetchData: sureFetch } = MpReturnApplyOrder()
   const handSure = () => {
     if (Query.reasonNameTwo == '其他问题' && TextareaValue == '') {
       Taro.showToast({
@@ -458,15 +534,13 @@ export default () => {
     setQuery(Query)
   }, [Query])
 
-  // 备注信息
-  const [TextareaValue, setTextareaValue] = useState('')
   const getDesc = (e) => {
     setTextareaValue(e)
   }
   return (
     <View className={styles.main}>
       <View className={styles.bgBox}>
-        <GoodsItem
+        <GoodsItemWithMemo
           list={ListArr}
           obj={infoObj}
           handTui={item => handTui(item)}
@@ -475,7 +549,7 @@ export default () => {
           handReduce={item => handReduce(item)}
           handAdd={item => handAdd(item)}
           onInputEven={(e, item) => onInputEven(e, item)}
-        ></GoodsItem>
+        ></GoodsItemWithMemo>
         <View className={styles.hasSelect}>汇总：已选{totalNums}种商品</View>
       </View>
       <View className={styles.resonBig}>
@@ -589,82 +663,4 @@ export default () => {
     </View>
   )
 }
-
-// 产品商品元素
-interface PropGoods {
-  list: any[]
-  obj: {
-    sale_mode?: number | string
-  }
-  handTui?: (any) => void
-  handCancel?: (any) => void
-  onBlur?: (e: any, obj: any) => void
-  onInputEven?: (e: any, obj: any) => void
-  handReduce?: (any) => void
-  handAdd?: (any) => void
-}
-const GoodsItem = memo((porps: PropGoods) => {
-  const { list = [], obj = {}, handTui, handCancel, onBlur, handReduce, handAdd, onInputEven } = porps
-  // const [value, setValue] = useState<any>({ count: 1 })
-  // const onInputEven = (e) => {
-  //     let res = Number(e.detail.value)
-  //     if (res < 1) {
-  //         setValue({ count: 1 })
-  //     } else {
-  //         setValue({ count: res })
-  //     }
-  // }
-
-  return (
-    <>
-      {
-        list.map((item, index) => {
-          return (
-            <View className={styles.goodsBox} key={index}>
-              <View className={styles.goodsProduct}>{item.product_code}# {item.product_name}</View>
-              <View className={styles.goodsLine}></View>
-              {
-                item.av_product_color.map((it, inx) => {
-                  return (
-                    <View className={styles.itemGoods} key={inx}>
-                      <Image className={styles.itemPic} mode="aspectFill" src="https://test.cdn.zzfzyc.com/mall/no_img.png"></Image>
-                      {/* <View className={styles.itemPic} style={{ backgroundColor: `rgb(${it?.rgb?.r} ${it?.rgb?.g} ${it?.rgb?.b})` }}></View> */}
-                      <View className={styles.itemRight}>
-                        <View className={styles.item_right_top}>
-                          <View className={styles.itemName}>{it.product_color_code} {it.product_color_name}</View>
-                        </View>
-                        <View className={styles.item_right_Bottom}>
-                          <View className={styles.itemMoney}>x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'}</View>
-                          {
-                            !it.isTui && <View className={styles.btn} onClick={() => handTui?.(it)}>退货</View>
-                          }
-                          {
-                            (it.sale_mode != 0 && it.isTui) && <View className={styles.btnOne} onClick={() => handCancel?.(it)}>已选择退货</View>
-                          }
-                          {
-                            (it.sale_mode == 0 && it.isTui) && <View className={styles.inputBox} >
-                              <View className={styles.redceBox} onClick={() => handReduce?.(it)}>
-                                <View className={styles.reduce}></View>
-                              </View>
-                              <View className={styles.inputBig}>
-                                <Input type="number" value={it.nums} onInput={e => onInputEven?.(e, it)} maxlength={it.roll} onBlur={e => onBlur?.(e, it)}></Input>
-                              </View>
-                              <View className={styles.addBox} onClick={() => handAdd?.(it)}>
-                                                                +
-                              </View>
-                            </View>
-                          }
-                        </View>
-                      </View>
-                    </View>
-                  )
-                })
-              }
-            </View>
-          )
-        })
-      }
-    </>
-
-  )
-})
+export default ApplyGoods
diff --git a/src/pages/applyMoney/index.tsx b/src/pages/applyMoney/index.tsx
index 79d8c40..c2179d3 100644
--- a/src/pages/applyMoney/index.tsx
+++ b/src/pages/applyMoney/index.tsx
@@ -5,19 +5,96 @@ import classnames from 'classnames'
 import styles from './index.module.scss'
 import { formatDateTime, formatHashTag, formatImgUrl, formatPriceDiv, formatWeightDiv } from '@/common/format'
 import {
-  mpenumrefundExplainone,
-  mpreturnApplyOrder,
-  mpsaleOrder,
+  MpEnumRefundExplainOne,
+  MpReturnApplyOrder,
+  MpSaleOrder,
 } from '@/api/order'
 import Popup from '@/components/popup'
 
-export default () => {
-  useEffect(() => {
-    getDetail()
-    getEnum()
-  }, [])
+// 产品商品元素
+interface PropGoods {
+  list: any[]
+  obj: {
+    sale_mode?: number | string
+  }
+  handTui?: (any) => void
+  handCancel?: (any) => void
+  onBlur?: (e: any, obj: any) => void
+  onInputEven?: (e: any, obj: any) => void
+  handReduce?: (any) => void
+  handAdd?: (any) => void
+}
+
+const GoodsItem = (porps: PropGoods) => {
+  const { list = [], obj = {}, handTui, handCancel, onBlur, handReduce, handAdd, onInputEven } = porps
+  // const [value, setValue] = useState<any>({ count: 1 })
+  // const onInputEven = (e) => {
+  //     let res = Number(e.detail.value)
+  //     if (res < 1) {
+  //         setValue({ count: 1 })
+  //     } else {
+  //         setValue({ count: res })
+  //     }
+  // }
+
+  return (
+    <>
+      {
+        list.map((item, index) => {
+          return (
+            <View className={styles.goodsBox} key={index}>
+              <View className={styles.goodsProduct}>{item.product_code}# {item.product_name}</View>
+              <View className={styles.goodsLine}></View>
+              {
+                item.av_product_color.map((it, inx) => {
+                  return (
+                    <View className={styles.itemGoods} key={inx}>
+                      <Image className={styles.itemPic} mode="aspectFill" src="https://test.cdn.zzfzyc.com/mall/no_img.png"></Image>
+                      {/* <View className={styles.itemPic} style={{ backgroundColor: `rgb(${it?.rgb?.r} ${it?.rgb?.g} ${it?.rgb?.b})` }}></View> */}
+                      <View className={styles.itemRight}>
+                        <View className={styles.item_right_top}>
+                          <View className={styles.itemName}>{it.product_color_code} {it.product_color_name}</View>
+                        </View>
+                        <View className={styles.item_right_Bottom}>
+                          <View className={styles.itemMoney}>x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'}</View>
+                          {
+                            !it.isTui && <View className={styles.btn} onClick={() => handTui?.(it)}>退货</View>
+                          }
+                          {
+                            (it.sale_mode != 0 && it.isTui) && <View className={styles.btnOne} onClick={() => handCancel?.(it)}>已选择退货</View>
+                          }
+                          {
+                            (it.sale_mode == 0 && it.isTui) && <View className={styles.inputBox} >
+                              <View className={styles.redceBox} onClick={() => handReduce?.(it)}>
+                                <View className={styles.reduce}></View>
+                              </View>
+                              <View className={styles.inputBig}>
+                                <Input type="number" value={it.nums} onInput={e => onInputEven?.(e, it)} maxlength={it.roll} onBlur={e => onBlur?.(e, it)}></Input>
+                              </View>
+                              <View className={styles.addBox} onClick={() => handAdd?.(it)}>
+                                                                +
+                              </View>
+                            </View>
+                          }
+                        </View>
+                      </View>
+                    </View>
+                  )
+                })
+              }
+            </View>
+          )
+        })
+      }
+    </>
+
+  )
+}
+const GoodsItemWithMemo = memo(GoodsItem)
+
+const ApplyMoney = () => {
   const Router = useRouter()
-  const { fetchData: infoFetch } = mpsaleOrder()
+  const { fetchData: infoFetch } = MpSaleOrder()
   const [ListArr, setListArr] = useState<any[]>([])
   const [infoObj, setInfoObj] = useState<any>({})
 
@@ -30,7 +107,7 @@ export default () => {
     const res = await infoFetch({ id: Router.params.orderId })
     if (res.data) {
       res.data.av_return_product.forEach((item) => {
-        item.av_product_color.map((it) => {
+        item.av_product_color.forEach((it) => {
           it.isTui = false
           it.nums = 1
         })
@@ -132,16 +209,12 @@ export default () => {
   // 点击加
   const handAdd = (val) => {
     ListArr.forEach((item) => {
-      item.av_product_color.map((it) => {
+      item.av_product_color.forEach((it) => {
         if (it.sale_order_detail_id === val.sale_order_detail_id) {
           if (it.nums < it.roll) {
             it.nums++
           }
-          else {
-            return
-          }
         }
-        return it
       })
     })
     setListArr([...ListArr])
@@ -149,14 +222,20 @@ export default () => {
 
   // 获取枚举
   const [List, setList] = useState<any[]>([])
-  const { fetchData: explanFetch } = mpenumrefundExplainone()
+  const { fetchData: explanFetch } = MpEnumRefundExplainOne()
   const getEnum = async() => {
     const res = await explanFetch()
     if (res.data) {
       setList(res.data.list)
     }
   }
-
+  const queryRef = useRef({
+    reasonName: '请选择',
+  })
+  const [Query, setQuery] = useState<any>({
+    reasonId: '',
+    reasonName: '请选择',
+  })
   // 选择退货原因
   const handReasonOne = (item) => {
     List.map((it) => {
@@ -176,14 +255,6 @@ export default () => {
   // 筛选内容展示
   const [showPopup, setshowPopup] = useState(false)
 
-  const queryRef = useRef({
-    reasonName: '请选择',
-  })
-  const [Query, setQuery] = useState<any>({
-    reasonId: '',
-    reasonName: '请选择',
-  })
-
   // 备注信息
   const [TextareaValue, setTextareaValue] = useState('')
   const getDesc = (e) => {
@@ -214,7 +285,14 @@ export default () => {
     })
     return arr.length
   }, [ListArr])
-
+  // 数组重置
+  const resetArr = (arr) => {
+    arr.map((it) => {
+      it.default = false
+      return it
+    })
+    return arr
+  }
   // 重置
   const handReset = () => {
     setQuery(({ reasonId: '', reasonName: '请选择' }))
@@ -251,17 +329,13 @@ export default () => {
       return true
     }
   }, [Query])
+  useEffect(() => {
+    getDetail()
+    getEnum()
+  }, [])
 
-  // 数组重置
-  const resetArr = (arr) => {
-    arr.map((it) => {
-      it.default = false
-      return it
-    })
-    return arr
-  }
   // 确认退款
-  const { fetchData: sureFetch } = mpreturnApplyOrder()
+  const { fetchData: sureFetch } = MpReturnApplyOrder()
   const handSure = () => {
     if (queryRef.current.reasonName == '其他问题' && TextareaValue == '') {
       Taro.showToast({
@@ -354,7 +428,7 @@ export default () => {
     <View className={styles.main}>
       {
         showItem && <View className={styles.bgBox}>
-          <GoodsItem
+          <GoodsItemWithMemo
             list={ListArr}
             obj={infoObj}
             handTui={item => handTui(item)}
@@ -363,7 +437,7 @@ export default () => {
             handReduce={item => handReduce(item)}
             handAdd={item => handAdd(item)}
             onInputEven={(e, item) => onInputEven(e, item)}
-          ></GoodsItem>
+          ></GoodsItemWithMemo>
           <View className={styles.hasSelect}>汇总：已选{totalNums}种商品</View>
         </View>
       }
@@ -435,82 +509,4 @@ export default () => {
     </View>
   )
 }
-
-// 产品商品元素
-interface PropGoods {
-  list: any[]
-  obj: {
-    sale_mode?: number | string
-  }
-  handTui?: (any) => void
-  handCancel?: (any) => void
-  onBlur?: (e: any, obj: any) => void
-  onInputEven?: (e: any, obj: any) => void
-  handReduce?: (any) => void
-  handAdd?: (any) => void
-}
-const GoodsItem = memo((porps: PropGoods) => {
-  const { list = [], obj = {}, handTui, handCancel, onBlur, handReduce, handAdd, onInputEven } = porps
-  // const [value, setValue] = useState<any>({ count: 1 })
-  // const onInputEven = (e) => {
-  //     let res = Number(e.detail.value)
-  //     if (res < 1) {
-  //         setValue({ count: 1 })
-  //     } else {
-  //         setValue({ count: res })
-  //     }
-  // }
-
-  return (
-    <>
-      {
-        list.map((item, index) => {
-          return (
-            <View className={styles.goodsBox} key={index}>
-              <View className={styles.goodsProduct}>{item.product_code}# {item.product_name}</View>
-              <View className={styles.goodsLine}></View>
-              {
-                item.av_product_color.map((it, inx) => {
-                  return (
-                    <View className={styles.itemGoods} key={inx}>
-                      <Image className={styles.itemPic} mode="aspectFill" src="https://test.cdn.zzfzyc.com/mall/no_img.png"></Image>
-                      {/* <View className={styles.itemPic} style={{ backgroundColor: `rgb(${it?.rgb?.r} ${it?.rgb?.g} ${it?.rgb?.b})` }}></View> */}
-                      <View className={styles.itemRight}>
-                        <View className={styles.item_right_top}>
-                          <View className={styles.itemName}>{it.product_color_code} {it.product_color_name}</View>
-                        </View>
-                        <View className={styles.item_right_Bottom}>
-                          <View className={styles.itemMoney}>x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'}</View>
-                          {
-                            !it.isTui && <View className={styles.btn} onClick={() => handTui?.(it)}>退货</View>
-                          }
-                          {
-                            (it.sale_mode != 0 && it.isTui) && <View className={styles.btnOne} onClick={() => handCancel?.(it)}>已选择退货</View>
-                          }
-                          {
-                            (it.sale_mode == 0 && it.isTui) && <View className={styles.inputBox} >
-                              <View className={styles.redceBox} onClick={() => handReduce?.(it)}>
-                                <View className={styles.reduce}></View>
-                              </View>
-                              <View className={styles.inputBig}>
-                                <Input type="number" value={it.nums} onInput={e => onInputEven?.(e, it)} maxlength={it.roll} onBlur={e => onBlur?.(e, it)}></Input>
-                              </View>
-                              <View className={styles.addBox} onClick={() => handAdd?.(it)}>
-                                                                +
-                              </View>
-                            </View>
-                          }
-                        </View>
-                      </View>
-                    </View>
-                  )
-                })
-              }
-            </View>
-          )
-        })
-      }
-    </>
-
-  )
-})
+export default ApplyMoney
diff --git a/src/pages/collectionDetail/components/form/index.tsx b/src/pages/collectionDetail/components/form/index.tsx
index 96b4a81..8744cb0 100644
--- a/src/pages/collectionDetail/components/form/index.tsx
+++ b/src/pages/collectionDetail/components/form/index.tsx
@@ -29,8 +29,7 @@ interface Params {
   showSizeFont?: boolean // 展示金额的大写
   bigMoney?: any // 展示的大写金额
 }
-
-export default memo((pros: Params) => {
+const Form = (pros: Params) => {
   return (
     <View className={styles.itemBox}
       style={{ justifyContent: `${pros.styleNone ? 'space-between' : ''}`, alignItems: `${pros.styleNone ? 'center' : ''}` }}
@@ -98,4 +97,5 @@ export default memo((pros: Params) => {
 
     </View>
   )
-})
+}
+export default memo(Form)
diff --git a/src/pages/collectionDetail/index.tsx b/src/pages/collectionDetail/index.tsx
index 8c9a323..7b90526 100644
--- a/src/pages/collectionDetail/index.tsx
+++ b/src/pages/collectionDetail/index.tsx
@@ -11,20 +11,15 @@ import Popup from '@/components/popup'
 import InfiniteScroll from '@/components/infiniteScroll'
 import { formatDateTime, formatHashTag, formatImgUrl, formatPriceDiv, formatWeightDiv } from '@/common/format'
 import {
-  mpcashManagementOrder,
+  MpCashManagementOrder,
 } from '@/api/newCollection'
-import TimePicker from '@/components/timePicker'
-import { alert } from '@/common/common'
 import smallToBig from '@/common/money'
-import { IMG_CND_Prefix } from '@/common/constant'
 
-export default () => {
+const CollectionDetail = () => {
   const router = useRouter()
   const [Query, setQuery] = useState<any>({})
-  const { fetchData: getFetch } = mpcashManagementOrder()
-  useEffect(() => {
-    getDetail()
-  }, [])
+  const { fetchData: getFetch } = MpCashManagementOrder()
+
   const getDetail = async() => {
     Taro.showLoading({
       title: '请稍等',
@@ -50,7 +45,9 @@ export default () => {
     res = Query.receipt_amount / 100
     return res
   }, [Query])
-
+  useEffect(() => {
+    getDetail()
+  }, [])
   return (
     <>
       <View className={styles.topBox}>
@@ -152,3 +149,5 @@ export default () => {
     </>
   )
 }
+
+export default CollectionDetail
diff --git a/src/pages/colorRelated/components/bluetooth/LinkBlueTooth.tsx b/src/pages/colorRelated/components/bluetooth/LinkBlueTooth.tsx
index 96918bd..78d935d 100644
--- a/src/pages/colorRelated/components/bluetooth/LinkBlueTooth.tsx
+++ b/src/pages/colorRelated/components/bluetooth/LinkBlueTooth.tsx
@@ -7,7 +7,7 @@ import Popup from './Popup'
 import { useBluetooth } from '@/use/contextBlueTooth'
 import SearchInput from '@/components/searchInput'
 
-export default memo(() => {
+const LinkBlueTooth = () => {
   const { state, init, startScan, connect, disconnect } = useBluetooth()
 
   useEffect(() => {
@@ -36,7 +36,9 @@ export default memo(() => {
   const onLinkListen = (item) => {
     if (!state.connected && !state.connecting) { connect(item) }
   }
-
+  const onFindEven = () => {
+    if (!state.discovering && !state.connected && !state.connecting) { startScan() }
+  }
   const [popupShow, setPopupShow] = useState(false)
   // 显示设备列表
   const onFindDevice = () => {
@@ -52,9 +54,6 @@ export default memo(() => {
       onFindEven()
     }
   }
-  const onFindEven = () => {
-    if (!state.discovering && !state.connected && !state.connecting) { startScan() }
-  }
 
   // 断开链接
   const onDisconnect = () => {
@@ -84,4 +83,5 @@ export default memo(() => {
       </View>
     </>
   )
-})
+}
+export default memo(LinkBlueTooth)
diff --git a/src/pages/colorRelated/components/bluetooth/Popup.tsx b/src/pages/colorRelated/components/bluetooth/Popup.tsx
index d6190bc..8eb06a7 100644
--- a/src/pages/colorRelated/components/bluetooth/Popup.tsx
+++ b/src/pages/colorRelated/components/bluetooth/Popup.tsx
@@ -12,8 +12,7 @@ interface params {
   onOff: () => void
   onFind: () => void
 }
-
-export default memo(({ state, show = false, onClose, onLink, onOff, onFind }: params) => {
+const Popup = ({ state, show = false, onClose, onLink, onOff, onFind }: params) => {
   const [popupShow, setPopupShow] = useState(show)
   useEffect(() => {
     setPopupShow(show)
@@ -32,9 +31,9 @@ export default memo(({ state, show = false, onClose, onLink, onOff, onFind }: pa
               <ScrollView scrollY className={style.scroll}>
                 {(state.devices
                   && state.devices.length > 0
-                  && state?.devices.map((item) => {
+                  && state?.devices.map((item, key) => {
                     return (
-                      <View className={style.item} onClick={() => onLink(item)}>
+                      <View key={key} className={style.item} onClick={() => onLink(item)}>
                         <View>{item.name}</View>
                         {(!state.connecting && !state.connected && <View>链接</View>)
                           || (state.connecting && item.deviceId == state.connecting.deviceId && <View className={style.link_ing}>正在链接...</View>)
@@ -76,4 +75,5 @@ export default memo(({ state, show = false, onClose, onLink, onOff, onFind }: pa
       )}
     </>
   )
-})
+}
+export default memo(Popup)
diff --git a/src/pages/colorRelated/findColor/components/DrawerCenter/index.tsx b/src/pages/colorRelated/findColor/components/DrawerCenter/index.tsx
index 2daf39c..6592ada 100644
--- a/src/pages/colorRelated/findColor/components/DrawerCenter/index.tsx
+++ b/src/pages/colorRelated/findColor/components/DrawerCenter/index.tsx
@@ -8,7 +8,7 @@ interface PropsType {
   children?: React.ReactNode
 }
 
-const DrawerCenter: FC<PropsType> = memo((props) => {
+const DrawerCenter: FC<PropsType> = (props) => {
   const { children, showModal } = props
 
   const [show, setShow] = useState(false)
@@ -29,5 +29,5 @@ const DrawerCenter: FC<PropsType> = memo((props) => {
       </View>
     )
     : null
-})
-export default DrawerCenter
+}
+export default memo(DrawerCenter)
diff --git a/src/pages/colorRelated/findColor/components/HistoryColor/index.tsx b/src/pages/colorRelated/findColor/components/HistoryColor/index.tsx
index 027b61d..9b20e9d 100644
--- a/src/pages/colorRelated/findColor/components/HistoryColor/index.tsx
+++ b/src/pages/colorRelated/findColor/components/HistoryColor/index.tsx
@@ -19,7 +19,7 @@ interface HistoryListItem {
   code: string
   name: string
 }
-const HistoryColor: FC<PropsType> = forwardRef((props, ref) => {
+const HistoryColor = (props: PropsType, ref) => {
   const { onColor, showModal, onVisibleChange } = props
 
   const [visible, setVisible] = usePropsValue({
@@ -28,12 +28,6 @@ const HistoryColor: FC<PropsType> = forwardRef((props, ref) => {
     onChange: onVisibleChange,
   })
 
-  useEffect(() => {
-    if (visible) {
-      getList()
-    }
-  }, [visible])
-
   useImperativeHandle(
     ref,
     () => {
@@ -50,6 +44,7 @@ const HistoryColor: FC<PropsType> = forwardRef((props, ref) => {
     console.log('closeEven')
     setVisible(false)
   }
+  const [list, setList] = useState<HistoryListItem[]>([])
 
   // 获取本地列表（无差别存储版本）
   const getList = () => {
@@ -57,8 +52,11 @@ const HistoryColor: FC<PropsType> = forwardRef((props, ref) => {
     console.log('historyColorList==>', historyColorList)
     setList(historyColorList || [])
   }
-
-  const [list, setList] = useState<HistoryListItem[]>([])
+  useEffect(() => {
+    if (visible) {
+      getList()
+    }
+  }, [visible])
 
   // 保留1位小数
   const noScale = (val, num = 1) => {
@@ -116,5 +114,5 @@ const HistoryColor: FC<PropsType> = forwardRef((props, ref) => {
       </Popup>
     </View>
   )
-})
-export default HistoryColor
+}
+export default forwardRef(HistoryColor)
diff --git a/src/pages/colorRelated/findColor/index.tsx b/src/pages/colorRelated/findColor/index.tsx
index c2d5263..bed71cf 100644
--- a/src/pages/colorRelated/findColor/index.tsx
+++ b/src/pages/colorRelated/findColor/index.tsx
@@ -68,13 +68,12 @@ const FindColor: FC = () => {
     })
     getData(val.lab)
   }
+  const [showHistory, setShowHistory] = useState(false)
 
   const handleVisibleChange = (visible) => {
     setShowHistory(visible)
   }
 
-  const [showHistory, setShowHistory] = useState(false)
-
   const ResultContainer = useMemo(() => {
     if (!colorState.loading && list?.length > 0) {
       return <RecommendColor customStyle={{ flex: 1 }} list={list} />
@@ -94,7 +93,18 @@ const FindColor: FC = () => {
   const historyShowEven = () => {
     setShowHistory(true)
   }
-
+  // 本地存储取色记录(无差别存储版本)
+  const localSave = (lab) => {
+    const historyColorList = Taro.getStorageSync('historyColor') || []
+    const obj = {
+      ...product,
+      p_time: +new Date(),
+      lab,
+    }
+    historyColorList.unshift(obj)
+    if (historyColorList.length > 30) { historyColorList.pop() }
+    Taro.setStorageSync('historyColor', historyColorList)
+  }
   useEffect(() => {
     if (!product) {
       Taro.showToast({ title: '请选择面料', icon: 'none' })
@@ -109,19 +119,6 @@ const FindColor: FC = () => {
     }
   }, [bluetoothState.deviceLab])
 
-  // 本地存储取色记录(无差别存储版本)
-  const localSave = (lab) => {
-    const historyColorList = Taro.getStorageSync('historyColor') || []
-    const obj = {
-      ...product,
-      p_time: +new Date(),
-      lab,
-    }
-    historyColorList.unshift(obj)
-    if (historyColorList.length > 30) { historyColorList.pop() }
-    Taro.setStorageSync('historyColor', historyColorList)
-  }
-
   return (
     <View className={styles.findColor_main}>
       <View className={styles.findColor_main_search}>
diff --git a/src/pages/colorRelated/sampleComparison/index.tsx b/src/pages/colorRelated/sampleComparison/index.tsx
index e9ddb41..e1e3f1b 100644
--- a/src/pages/colorRelated/sampleComparison/index.tsx
+++ b/src/pages/colorRelated/sampleComparison/index.tsx
@@ -10,7 +10,7 @@ import { toRgb } from '@/common/bluetooth/color/colorSpace'
 import { productabsorbcontrast } from '@/api/index'
 import { alert } from '@/common/common'
 
-export default () => {
+const SampleComparison = () => {
   // 搜索参数
   const [searchField, setSearchField] = useState({
     l1: '',
@@ -79,15 +79,7 @@ export default () => {
       }
     }
   }, [colorList])
-  const reset = () => {
-    setColorList({})
-    setBlueToothColor('')
-    setBlueToothColorTwo('')
-    setTime('')
-    setTimeTwo('')
-    setData('')
-    setResult('')
-  }
+
   const [data, setData] = useState('')
   const [result, setResult] = useState('')
   const { fetchData } = productabsorbcontrast()
@@ -126,6 +118,15 @@ export default () => {
     }
     alert.hideLoading()
   }
+  const reset = () => {
+    setColorList({})
+    setBlueToothColor('')
+    setBlueToothColorTwo('')
+    setTime('')
+    setTimeTwo('')
+    setData('')
+    setResult('')
+  }
   return (
     <View className={styles.body}>
       <View className={styles.topBox}>
@@ -186,3 +187,4 @@ export default () => {
     </View>
   )
 }
+export default SampleComparison
diff --git a/src/pages/colorRelated/takeColor/components/Upload/index.tsx b/src/pages/colorRelated/takeColor/components/Upload/index.tsx
index 2868c24..8831ce3 100644
--- a/src/pages/colorRelated/takeColor/components/Upload/index.tsx
+++ b/src/pages/colorRelated/takeColor/components/Upload/index.tsx
@@ -13,7 +13,7 @@ interface PropsType extends UploadColorEvent {
   uploadConfirmState: boolean
 }
 
-const UploadColor = forwardRef((params: PropsType, ref) => {
+const UploadColor = (params: PropsType, ref) => {
   const { onUploadConfirm, uploadConfirmState } = params
   const [showModal, setShowModal] = useState(false)
   const [filePath, setFilePath] = useState('')
@@ -31,13 +31,6 @@ const UploadColor = forwardRef((params: PropsType, ref) => {
     })
   }
 
-  useEffect(() => {
-    if (uploadConfirmState) {
-      setFilePath('')
-      handleTriggerUploadModal(false)
-    }
-  }, [uploadConfirmState])
-
   const handleTriggerUploadModal = (bool: boolean) => {
     setShowModal(bool)
   }
@@ -55,7 +48,12 @@ const UploadColor = forwardRef((params: PropsType, ref) => {
   const handleUploadConfirm = () => {
     onUploadConfirm && onUploadConfirm(file)
   }
-
+  useEffect(() => {
+    if (uploadConfirmState) {
+      setFilePath('')
+      handleTriggerUploadModal(false)
+    }
+  }, [uploadConfirmState])
   return (
     <View className={styles['upload-container']}>
       <Popup title="上传纹理" show={showModal} onClose={() => handleTriggerUploadModal(false)}>
@@ -75,5 +73,5 @@ const UploadColor = forwardRef((params: PropsType, ref) => {
       </Popup>
     </View>
   )
-})
-export default UploadColor
+}
+export default forwardRef(UploadColor)
diff --git a/src/pages/colorRelated/takeColor/index.tsx b/src/pages/colorRelated/takeColor/index.tsx
index 01bb99a..19b7d07 100644
--- a/src/pages/colorRelated/takeColor/index.tsx
+++ b/src/pages/colorRelated/takeColor/index.tsx
@@ -23,6 +23,7 @@ const TakeColor: FC = () => {
   const { measureAndGetLab, state: bluetoothState } = useBluetooth()
   const [searchValue, setSearchValue] = useState('')
   const [selectedProduct, setSelectedProduct] = useState<Record<string, any>>({})
+  const [listData, setListData] = useState<Record<string, any>[]>([])
 
   const selectInput = async(event) => {
     if (event) {
@@ -30,7 +31,7 @@ const TakeColor: FC = () => {
       setSelectedProduct(event)
       const res = await fetchData({ id: event.id })
       if (res.success) {
-        res.data?.list.map((item, index) => {
+        res.data?.list.forEach((item, index) => {
           item.currnetRgb = item.rgb
           item.currentLab = item.lab
           item.sampling = !(item.currentLab?.l == 0 && item.currentLab?.a == 0 && item.currentLab?.b == 0)
@@ -53,18 +54,12 @@ const TakeColor: FC = () => {
     setSearchValue('')
   }
 
-  const handlePrViewRgb = useCallback((event) => {
-    setLabPreview(event)
-    setShowLabPreview(true)
-  }, [])
-
   const [currentTakeColorIndex, setCurrentTakeColorIndex] = useState<number | null>(null)
 
   const handleTakeColor = (index: number) => {
     setCurrentTakeColorIndex(index)
   }
 
-  const [listData, setListData] = useState<Record<string, any>[]>([])
   // const listData = useMemo(() => {
   //   return state.data?.list?.filter(item => {
   //     if (searchValue) {
@@ -73,6 +68,7 @@ const TakeColor: FC = () => {
   //     return true
   //   })
   // }, [state.data?.list, state])
+  const productSelectEl = useRef<any>(null)
 
   const onSearchInput = (event) => {
     const current = event.detail.value
@@ -149,8 +145,6 @@ const TakeColor: FC = () => {
 
   const [showLabPreview, setShowLabPreview] = useState(false)
 
-  const productSelectEl = useRef<any>(null)
-
   const [uploadConfirmState, setUploadConfirmState] = useState(false)
 
   const handleUploadConfirm = async(file) => {
@@ -185,7 +179,10 @@ const TakeColor: FC = () => {
       alert.none('请选择图片')
     }
   }
-
+  const handlePrViewRgb = useCallback((event) => {
+    setLabPreview(event)
+    setShowLabPreview(true)
+  }, [])
   return (
     <>
       <View className={styles.card}>
diff --git a/src/pages/customerDetails/components/form/index.tsx b/src/pages/customerDetails/components/form/index.tsx
index 2b332b7..92223d0 100644
--- a/src/pages/customerDetails/components/form/index.tsx
+++ b/src/pages/customerDetails/components/form/index.tsx
@@ -13,8 +13,7 @@ interface Props {
   isPhone?: boolean
   isBorder?: boolean
 }
-
-export default memo((props: Props) => {
+const Form = (props: Props) => {
   const {
     isPhone = false,
     isBorder = true,
@@ -35,4 +34,5 @@ export default memo((props: Props) => {
       }
     </View>
   )
-})
+}
+export default memo(Form)
diff --git a/src/pages/customerDetails/components/tabs/index.tsx b/src/pages/customerDetails/components/tabs/index.tsx
index 7ce8be6..4bf6cf6 100644
--- a/src/pages/customerDetails/components/tabs/index.tsx
+++ b/src/pages/customerDetails/components/tabs/index.tsx
@@ -7,7 +7,7 @@ interface Props {
   list: any[]
   handChose?: (any) => void
 }
-export default memo((props: Props) => {
+const Tabs = (props: Props) => {
   const { list = [], handChose } = props
 
   return (
@@ -29,4 +29,5 @@ export default memo((props: Props) => {
       }
     </View >
   )
-})
+}
+export default memo(Tabs)
diff --git a/src/pages/customerDetails/components/tagPopup/index.tsx b/src/pages/customerDetails/components/tagPopup/index.tsx
index ad78e66..c9f70f7 100644
--- a/src/pages/customerDetails/components/tagPopup/index.tsx
+++ b/src/pages/customerDetails/components/tagPopup/index.tsx
@@ -7,7 +7,7 @@ import { alert, goLink } from '@/common/common'
 import { formatDateTime, formatPriceDiv, formatWeightDiv } from '@/common/format'
 import IconFont from '@/components/iconfont/iconfont'
 import Popup from '@/components/popup'
-import { mppurchaserlabeladd, mppurchaserlist } from '@/api/customer'
+import { MpPurchaserLabelAdd, MpPurchaserList } from '@/api/customer'
 
 interface Props {
   showPopup: boolean
@@ -15,12 +15,12 @@ interface Props {
   purchaser_id?: string | number
   diseShow?: () => void
 }
-export default memo(forwardRef((props: Props, ref) => {
+const TagPopup = (props: Props, ref) => {
   const router = useRouter()
-  useEffect(() => {
-    getList()
-  }, [])
-  const { fetchData } = mppurchaserlist()
+
+  const { fetchData } = MpPurchaserList()
+  // 标签
+  const [modeList, setModeList] = useState<any[]>([])
   const getList = async() => {
     const res = await fetchData()
     if (res.data) {
@@ -28,8 +28,6 @@ export default memo(forwardRef((props: Props, ref) => {
     }
   }
 
-  // 标签
-  const [modeList, setModeList] = useState<any[]>([])
   // 选择标签
   const handCheckMode = (item) => {
     modeList.map((it) => {
@@ -48,7 +46,7 @@ export default memo(forwardRef((props: Props, ref) => {
     })
     setModeList([...modeList])
   }
-  const { fetchData: addFetch } = mppurchaserlabeladd()
+  const { fetchData: addFetch } = MpPurchaserLabelAdd()
   const handSure = async() => {
     const arr: any[] = []
     const fltArr = modeList.filter((item) => { return item.checked })
@@ -98,6 +96,9 @@ export default memo(forwardRef((props: Props, ref) => {
     modeList,
     setModeList,
   }))
+  useEffect(() => {
+    getList()
+  }, [])
   return (
     <Popup title="选择标签" show={props.showPopup} onClose={() => { props.handClose() }}>
       <ScrollView scrollY className={styles.scrollView}>
@@ -142,4 +143,5 @@ export default memo(forwardRef((props: Props, ref) => {
       </View>
     </Popup>
   )
-}))
+}
+export default memo(forwardRef(TagPopup))
diff --git a/src/pages/customerDetails/index.tsx b/src/pages/customerDetails/index.tsx
index 5c78338..ef2513a 100644
--- a/src/pages/customerDetails/index.tsx
+++ b/src/pages/customerDetails/index.tsx
@@ -11,34 +11,21 @@ import { debounce } from '@/common/util'
 import { alert, goLink } from '@/common/common'
 import { formatDateTime, formatPriceDiv, formatWeightDiv } from '@/common/format'
 import AddressList from '@/components/AddressList'
-import { mppurchaser } from '@/api/customer'
+import { MpPurchaser } from '@/api/customer'
 
-export default () => {
+const CustomerDetails = () => {
   const router = useRouter()
 
   const [status, setstatus] = useState<number>(1)
 
-  useDidShow(() => {
-    getInfo()
-  })
   const [infoObj, setinfoObj] = useState<any>()
-  const { fetchData: getDesc } = mppurchaser()
-  const getInfo = async() => {
-    Taro.showLoading({
-      title: '请稍等...',
-      mask: true,
-    })
-    const res = await getDesc({ id: router.params.purchaser_id })
-    setinfoObj(res.data)
-    Taro.hideLoading()
-    setshowPopup(false)
-  }
+  const { fetchData: getDesc } = MpPurchaser()
 
   // 顶部栏
   const AddressListRef = useRef<any>()
   const [TarBarList, setTarBarList] = useState<any[]>([{ id: 1, name: '基础信息', showBorder: true }, { id: 2, name: '收货地址', showBorder: false }])
   const handChose = (item) => {
-    TarBarList.map((it) => {
+    TarBarList.forEach((it) => {
       if (it.id === item.id) {
         it.showBorder = true
       }
@@ -72,6 +59,19 @@ export default () => {
     TagPopupRef.current.setModeList([...TagPopupRef.current.modeList])
     setshowPopup(true)
   }
+  const getInfo = async() => {
+    Taro.showLoading({
+      title: '请稍等...',
+      mask: true,
+    })
+    const res = await getDesc({ id: router.params.purchaser_id })
+    setinfoObj(res.data)
+    Taro.hideLoading()
+    setshowPopup(false)
+  }
+  useDidShow(() => {
+    getInfo()
+  })
   return (
     <View className={styles.mainBox}>
       <View className={styles.mainTop}>
@@ -133,3 +133,4 @@ export default () => {
     </View>
   )
 }
+export default CustomerDetails
diff --git a/src/pages/customerEditor/index.tsx b/src/pages/customerEditor/index.tsx
index 1eaee74..d642dfd 100644
--- a/src/pages/customerEditor/index.tsx
+++ b/src/pages/customerEditor/index.tsx
@@ -11,14 +11,45 @@ import { debounce } from '@/common/util'
 import { alert, goLink } from '@/common/common'
 import { formatDateTime, formatPriceDiv, formatWeightDiv } from '@/common/format'
 import Address from '@/components/address'
-import { mppurchaser, mppurchaserpost, mppurchaserput } from '@/api/customer'
+import { MpPurchaser, MpPurchaserPost, MpPurchaserPut } from '@/api/customer'
+// 卡片盒子元素
+interface Obs {
+  title?: string
+  modeName?: string
+  showMode?: boolean
+  children?: ReactNode
+  clickNode?: () => void
+}
+
+const DefaultBox = (props: Obs) => {
+  const {
+    title = '标题',
+    modeName = '大货',
+    showMode = false,
+    children,
+    clickNode,
+  } = props
+
+  return (
+    <View className={styles.defaltBox}>
+      <View className={styles.titleBox}>
+        <View className={styles.title}>{title}</View>
+        {
+          showMode && <View className={styles.modeName} onClick={() => clickNode?.()}>{modeName}</View>
+        }
+      </View>
+      <View className={styles.modeLine}></View>
+      {children}
+    </View>
+  )
+}
+const DefaultBoxWithMemo = memo(DefaultBox)
 
 interface AddressParms {
   id: number
   name: string
 }
-
-export default () => {
+const CustomerEditor = () => {
   const router = useRouter()
 
   const [infoObj, setinfoObj] = useState<any>()
@@ -26,11 +57,6 @@ export default () => {
   const [formData, setformData] = useState<any>()
 
   const [addressArr, setaddressArr] = useState<AddressParms[]>([])
-  useEffect(() => {
-    if (router.params.type === 'edit') {
-      getInfo()
-    }
-  }, [])
 
   // 默认业务员
   useDidShow(() => {
@@ -62,46 +88,7 @@ export default () => {
     }
   })
 
-  const { fetchData: getDesc } = mppurchaser()
-  const getInfo = async() => {
-    Taro.showLoading({
-      title: '请稍等...',
-      mask: true,
-    })
-    const res = await getDesc({ id: router.params.id })
-    setinfoObj(res.data)
-    list.map((item) => {
-      if (item.id == res.data.purchaser_type) {
-        item.check = true
-      }
-      else {
-        item.check = false
-      }
-      return item
-    })
-    setlist([...list])
-    setformData({
-      sale_user_id: res.data?.sale_user_id,
-      sale_user_name: res.data?.sale_user_name,
-      name: res.data?.name,
-      short_name: res.data?.short_name,
-      director: res.data?.director,
-      phone: res.data?.phone,
-      addressName: res.data?.province_name + res.data?.city_name + res.data?.district_name,
-      address_detail: res.data?.address_detail,
-      purchaser_type: res.data?.purchaser_type,
-      district_id: res.data?.district_id,
-    })
-    setremarkDesc(res.data?.remark)
-    let arr: any[] = []
-    arr = [
-      { id: res.data.province_id, name: res.data.province_name },
-      { id: res.data.city_id, name: res.data.city_name },
-      { id: res.data.district_id, name: res.data.district_name },
-    ]
-    setaddressArr([...arr])
-    Taro.hideLoading()
-  }
+  const { fetchData: getDesc } = MpPurchaser()
 
   const handTitle = useCallback((e) => {
     setformData(val => ({ ...val, name: e }))
@@ -156,9 +143,48 @@ export default () => {
     setlist([...list])
     setformData(val => ({ ...val, purchaser_type: item.id }))
   }
-
   // 备注操作
   const [remarkDesc, setremarkDesc] = useState('')
+  const getInfo = async() => {
+    Taro.showLoading({
+      title: '请稍等...',
+      mask: true,
+    })
+    const res = await getDesc({ id: router.params.id })
+    setinfoObj(res.data)
+    list.map((item) => {
+      if (item.id == res.data.purchaser_type) {
+        item.check = true
+      }
+      else {
+        item.check = false
+      }
+      return item
+    })
+    setlist([...list])
+    setformData({
+      sale_user_id: res.data?.sale_user_id,
+      sale_user_name: res.data?.sale_user_name,
+      name: res.data?.name,
+      short_name: res.data?.short_name,
+      director: res.data?.director,
+      phone: res.data?.phone,
+      addressName: res.data?.province_name + res.data?.city_name + res.data?.district_name,
+      address_detail: res.data?.address_detail,
+      purchaser_type: res.data?.purchaser_type,
+      district_id: res.data?.district_id,
+    })
+    setremarkDesc(res.data?.remark)
+    let arr: any[] = []
+    arr = [
+      { id: res.data.province_id, name: res.data.province_name },
+      { id: res.data.city_id, name: res.data.city_name },
+      { id: res.data.district_id, name: res.data.district_name },
+    ]
+    setaddressArr([...arr])
+    Taro.hideLoading()
+  }
+
   const [showDesc, setShowDesc] = useState(false)
   const getRemark = useCallback(async(e) => {
     setShowDesc(false)
@@ -183,12 +209,16 @@ export default () => {
   const onClose = () => {
     setShowSiteModal(false)
   }
-
+  useEffect(() => {
+    if (router.params.type === 'edit') {
+      getInfo()
+    }
+  }, [])
   const isDisabled = useMemo(() => {
     let empty: any = null
     if (typeof (formData) == 'undefined') { return }
     for (const key in formData) {
-      if (formData.hasOwnProperty(key)) {
+      if (key in formData) {
         if (formData[key] !== '' && typeof (formData[key]) !== 'undefined') {
           empty = false
         }
@@ -218,8 +248,8 @@ export default () => {
     })
   }
 
-  const { fetchData: postFetch } = mppurchaserpost()
-  const { fetchData: putFetch } = mppurchaserput()
+  const { fetchData: postFetch } = MpPurchaserPost()
+  const { fetchData: putFetch } = MpPurchaserPut()
   // 提交
   const handSure = async() => {
     // if (!isDisabled) return false
@@ -284,9 +314,9 @@ export default () => {
         >
           <View className={styles.flexBox}>
             {
-              list.map((item) => {
+              list.map((item, key) => {
                 return (
-                  <View className={classnames(item.check ? styles.activeBox : styles.itemBox)} onClick={() => handItem(item)}>{item.name}</View>
+                  <View key={key} className={classnames(item.check ? styles.activeBox : styles.itemBox)} onClick={() => handItem(item)}>{item.name}</View>
                 )
               })
             }
@@ -330,9 +360,9 @@ export default () => {
           inputValue={formData?.sale_user_name}
         ></Form>
       </View>
-      <DefaultBox title="备注信息" showMode modeName={`${'填写/修改备注'} >`} clickNode={() => setShowDesc(true)}>
+      <DefaultBoxWithMemo title="备注信息" showMode modeName={`${'填写/修改备注'} >`} clickNode={() => setShowDesc(true)}>
         <View className={classnames(remarkDesc === '' ? styles.remarkFontactive : styles.remarkFont)}>{remarkDesc === '' ? '尚未备注信息' : remarkDesc}</View>
-      </DefaultBox>
+      </DefaultBoxWithMemo>
       <Popup show={showDesc} showTitle={false} onClose={() => setShowDesc(false)}>
         <Remark onSave={e => getRemark(e)} defaultValue={infoObj?.remark} showInput={!!showDesc} />
       </Popup>
@@ -345,35 +375,4 @@ export default () => {
     </>
   )
 }
-
-// 卡片盒子元素
-interface Obs {
-  title?: string
-  modeName?: string
-  showMode?: boolean
-  children?: ReactNode
-  clickNode?: () => void
-}
-
-const DefaultBox = memo((props: Obs) => {
-  const {
-    title = '标题',
-    modeName = '大货',
-    showMode = false,
-    children,
-    clickNode,
-  } = props
-
-  return (
-    <View className={styles.defaltBox}>
-      <View className={styles.titleBox}>
-        <View className={styles.title}>{title}</View>
-        {
-          showMode && <View className={styles.modeName} onClick={() => clickNode?.()}>{modeName}</View>
-        }
-      </View>
-      <View className={styles.modeLine}></View>
-      {children}
-    </View>
-  )
-})
+export default CustomerEditor
diff --git a/src/pages/customerManagement/components/ChoseCity/index.tsx b/src/pages/customerManagement/components/ChoseCity/index.tsx
index d26b472..1dd6f31 100644
--- a/src/pages/customerManagement/components/ChoseCity/index.tsx
+++ b/src/pages/customerManagement/components/ChoseCity/index.tsx
@@ -15,8 +15,7 @@ interface Props {
   value?: any
   onCloseOverlay?: () => void
 }
-
-export default memo(forwardRef((props: Props, ref) => {
+const ChoseCity = (props: Props, ref) => {
   const DropDownItemRef = useRef<any>()
   const close = () => {
     DropDownItemRef.current.closePopup()
@@ -35,17 +34,6 @@ export default memo(forwardRef((props: Props, ref) => {
 
   // 获取地址
   const { fetchData } = GetAddressListApi()
-  useEffect(() => {
-    getProvince()
-  }, [])
-
-  // 获取省
-  const getProvince = async() => {
-    const res = await fetchData({ parent_id: 1 })
-    if (res.data) {
-      setlist([...res.data.list])
-    }
-  }
 
   // 已选的集合市
   // const [choseCityArr, setchoseCityArr] = useState<any[]>([])
@@ -55,14 +43,23 @@ export default memo(forwardRef((props: Props, ref) => {
   const [list, setlist] = useState<any[]>([])
   // 区数组
   const [cityList, setcityList] = useState<any[]>([])
-
+  // 获取省
+  const getProvince = async() => {
+    const res = await fetchData({ parent_id: 1 })
+    if (res.data) {
+      setlist([...res.data.list])
+    }
+  }
+  useEffect(() => {
+    getProvince()
+  }, [])
   // 区分在哪一栏
   const [currentValue, setCurrentValue] = useState<number>(1)
 
   // 顶部栏
   const [TarBarList, setTarBarList] = useState<any[]>([{ id: 1, name: '选择省', showBorder: true }, { id: 2, name: '选择市', showBorder: false }])
   const handChose = (item) => {
-    TarBarList.map((it) => {
+    TarBarList.forEach((it) => {
       if (it.id === item.id) {
         it.showBorder = true
       }
@@ -74,6 +71,23 @@ export default memo(forwardRef((props: Props, ref) => {
     })
   }
 
+  // 获取市
+  const getCity = async(id) => {
+    const res = await fetchData({ parent_id: id })
+    if (res.data) {
+      res.data.list.map((item) => {
+        choseCityArr.current.list.forEach((it) => {
+          if (item.id == it.id) {
+            item.check = true
+          }
+        })
+        return item
+      })
+      setcityList([...res.data.list])
+    }
+    const provinceArr = list.filter((next) => { return next.check })
+    props.handCity?.(provinceArr, choseCityArr.current.list)
+  }
   // 选择省
   const handProvince = (item) => {
     list.map((it) => {
@@ -98,25 +112,6 @@ export default memo(forwardRef((props: Props, ref) => {
     })
     setTarBarList([...TarBarList])
   }
-
-  // 获取市
-  const getCity = async(id) => {
-    const res = await fetchData({ parent_id: id })
-    if (res.data) {
-      res.data.list.map((item) => {
-        choseCityArr.current.list.forEach((it) => {
-          if (item.id == it.id) {
-            item.check = true
-          }
-        })
-        return item
-      })
-      setcityList([...res.data.list])
-    }
-    const provinceArr = list.filter((next) => { return next.check })
-    props.handCity?.(provinceArr, choseCityArr.current.list)
-  }
-
   // 选择市
   const handCity = (item) => {
     cityList.map((it) => {
@@ -197,9 +192,9 @@ export default memo(forwardRef((props: Props, ref) => {
         {
           currentValue == 1 && <ScrollView scrollY className={styles.scrollView}>
             {
-              list.map((item) => {
+              list.map((item, key) => {
                 return (
-                  <View className={styles.itemBox} onClick={() => handProvince(item)}>
+                  <View key={key} className={styles.itemBox} onClick={() => handProvince(item)}>
                     <View className={classnames(item.check ? styles.activeitemProvince : styles.itemProvince)}>{item.name}</View>
                     <IconFont name="icon-chakanquanbukehu" size={50} color="#d8d8d8"></IconFont>
                   </View>
@@ -211,9 +206,9 @@ export default memo(forwardRef((props: Props, ref) => {
         {
           currentValue == 2 && <ScrollView scrollY className={styles.scrollView}>
             {
-              cityList.map((item) => {
+              cityList.map((item, key) => {
                 return (
-                  <View className={styles.itemBox} onClick={() => handCity(item)}>
+                  <View key={key} className={styles.itemBox} onClick={() => handCity(item)}>
                     <View className={classnames(item.check ? styles.activeitemProvince : styles.itemProvince)}>{item.name}</View>
                     {/* <IconFont name={'icon-chakanquanbukehu'} size={50} color={'#d8d8d8'}></IconFont> */}
                   </View>
@@ -225,4 +220,5 @@ export default memo(forwardRef((props: Props, ref) => {
       </View>
     </DropDownItem>
   )
-}))
+}
+export default memo(forwardRef(ChoseCity))
diff --git a/src/pages/customerManagement/components/ItemList/index.tsx b/src/pages/customerManagement/components/ItemList/index.tsx
index 59a96ed..d1d1408 100644
--- a/src/pages/customerManagement/components/ItemList/index.tsx
+++ b/src/pages/customerManagement/components/ItemList/index.tsx
@@ -11,8 +11,7 @@ interface Props {
   obj: any
   sortId: number | string
 }
-
-export default memo((props: Props) => {
+const ItemList = (props: Props) => {
   const handPhone = (e) => {
     e.stopPropagation()
     Taro.makePhoneCall({
@@ -72,9 +71,9 @@ export default memo((props: Props) => {
               <View className={styles.item_tagItem}>{props.obj.purchaser_type_name || '暂无'}</View>
               <View className={styles.item_tagItem}>{props.obj.sale_user_name || '暂无'}</View>
               {
-                props.obj?.label_list?.map((item) => {
+                props.obj?.label_list?.map((item, key) => {
                   return (
-                    <View className={styles.item_tagItem}>{item.label_name}</View>
+                    <View key={key} className={styles.item_tagItem}>{item.label_name}</View>
                   )
                 })
               }
@@ -94,4 +93,5 @@ export default memo((props: Props) => {
       </View>
     </View >
   )
-})
+}
+export default memo(ItemList)
diff --git a/src/pages/customerManagement/components/Sort/index.tsx b/src/pages/customerManagement/components/Sort/index.tsx
index 6c119ca..05dad1d 100644
--- a/src/pages/customerManagement/components/Sort/index.tsx
+++ b/src/pages/customerManagement/components/Sort/index.tsx
@@ -18,8 +18,7 @@ interface ListType {
   id: string
   checked: boolean
 }
-
-export default memo(forwardRef((props: Props, ref) => {
+const Sort = (props: Props, ref) => {
   const DropDownItemRef = useRef<any>()
   useImperativeHandle(
     ref,
@@ -98,11 +97,12 @@ export default memo(forwardRef((props: Props, ref) => {
         {
           list.map((item, index) => {
             return (
-              <View className={classnames(item.checked ? styles.itemactiveFlex : styles.itemFlex)} onClick={() => handItem?.(item)}>{item.name}</View>
+              <View key={index} className={classnames(item.checked ? styles.itemactiveFlex : styles.itemFlex)} onClick={() => handItem?.(item)}>{item.name}</View>
             )
           })
         }
       </View>
     </DropDownItem>
   )
-}))
+}
+export default memo(forwardRef(Sort))
diff --git a/src/pages/customerManagement/components/Tag/index.tsx b/src/pages/customerManagement/components/Tag/index.tsx
index a9358f9..04f6f27 100644
--- a/src/pages/customerManagement/components/Tag/index.tsx
+++ b/src/pages/customerManagement/components/Tag/index.tsx
@@ -7,7 +7,7 @@ import { alert } from '@/common/common'
 import { formatDateTime, formatPriceDiv, formatWeightDiv } from '@/common/format'
 import { EnumPurchaserType } from '@/api/order'
 import DropDownItem from '@/components/dropDown-item'
-import { mppurchaserlist } from '@/api/customer'
+import { MpPurchaserList } from '@/api/customer'
 
 interface Props {
   handType: (any) => void
@@ -15,8 +15,7 @@ interface Props {
   value?: any
   onCloseOverlay?: () => void
 }
-
-export default memo(forwardRef((props: Props, ref) => {
+const Tag = (props: Props, ref) => {
   const DropDownItemRef = useRef<any>()
   useImperativeHandle(
     ref,
@@ -49,11 +48,9 @@ export default memo(forwardRef((props: Props, ref) => {
     },
   ])
 
-  useEffect(() => {
-    getList()
-  }, [])
   const { fetchData: fetchPurchaserType } = EnumPurchaserType()
-  const { fetchData } = mppurchaserlist()
+  const { fetchData } = MpPurchaserList()
+  const [taglist, settaglist] = useState<any[]>([])
   const getList = async() => {
     const res = await fetchData()
     const purchaserType = await fetchPurchaserType()
@@ -62,8 +59,9 @@ export default memo(forwardRef((props: Props, ref) => {
       setlist([...purchaserType.data.list])
     }
   }
-
-  const [taglist, settaglist] = useState<any[]>([])
+  useEffect(() => {
+    getList()
+  }, [])
 
   const handItem = (it) => {
     list.map((item) => {
@@ -98,7 +96,7 @@ export default memo(forwardRef((props: Props, ref) => {
           {
             list.map((item, index) => {
               return (
-                <View className={classnames(item.checked ? styles.itemactiveFlex : styles.itemFlex)} onClick={() => handItem?.(item)}>{item.name}</View>
+                <View key={index} className={classnames(item.checked ? styles.itemactiveFlex : styles.itemFlex)} onClick={() => handItem?.(item)}>{item.name}</View>
               )
             })
           }
@@ -108,7 +106,7 @@ export default memo(forwardRef((props: Props, ref) => {
           {
             taglist.map((item, index) => {
               return (
-                <View className={classnames(item.checked ? styles.itemactiveFlex : styles.itemFlex)} onClick={() => handTag?.(item)}>{item.name}</View>
+                <View key={index} className={classnames(item.checked ? styles.itemactiveFlex : styles.itemFlex)} onClick={() => handTag?.(item)}>{item.name}</View>
               )
             })
           }
@@ -116,4 +114,5 @@ export default memo(forwardRef((props: Props, ref) => {
       </View>
     </DropDownItem>
   )
-}))
+}
+export default memo(forwardRef(Tag))
diff --git a/src/pages/customerManagement/components/tabs/index.tsx b/src/pages/customerManagement/components/tabs/index.tsx
index 4a7d148..a745b5b 100644
--- a/src/pages/customerManagement/components/tabs/index.tsx
+++ b/src/pages/customerManagement/components/tabs/index.tsx
@@ -8,7 +8,7 @@ interface Props {
   handChose?: (any) => void
   handReset?: () => void
 }
-export default memo((props: Props) => {
+const Tabs = (props: Props) => {
   const { list = [], handChose } = props
 
   return (
@@ -34,4 +34,5 @@ export default memo((props: Props) => {
       <View className={styles.resetBox} onClick={() => props?.handReset?.()}>重置</View>
     </View>
   )
-})
+}
+export default memo(Tabs)
diff --git a/src/pages/customerManagement/index.tsx b/src/pages/customerManagement/index.tsx
index 359c56f..ce1cd85 100644
--- a/src/pages/customerManagement/index.tsx
+++ b/src/pages/customerManagement/index.tsx
@@ -16,7 +16,7 @@ import InfiniteScroll from '@/components/infiniteScroll'
 import { ClientListApi } from '@/api/order'
 import SelectGroup from '@/components/SelectGroup'
 
-export default () => {
+const CustomerManagement = () => {
   const [searchField, setSearchField] = useState<
   {
     page: number
@@ -41,6 +41,9 @@ export default () => {
 
   const [orderData, setOrderData] = useState<{ list: any[]; total: number }>({ list: [], total: 0 })
   const { fetchData: listFetchData, state: orderState } = ClientListApi()
+
+  // 列表下拉刷新
+  const [refresherTriggeredStatus, setRefresherTriggeredStatus] = useState(false)
   const getOrderList = async() => {
     const res = await listFetchData({
       ...getFilterData(searchField),
@@ -54,13 +57,6 @@ export default () => {
     getOrderList()
   }, [searchField])
 
-  // 输入了搜索关键字
-  const getSearchData = useCallback((e) => {
-    pageNum.current.page = 1
-    setOrderData(() => ({ list: [], total: 0 }))
-    setSearchField(val => ({ ...val, name_phone_or_sale_user: e, size: 10 }))
-  }, [])
-
   // 数据加载状态
   const statusMore = useMemo(() => {
     return dataLoadingStatus({ list: orderData.list, total: orderData.total, status: orderState.loading! })
@@ -68,6 +64,12 @@ export default () => {
 
   // 上拉加载数据
   const pageNum = useRef({ size: searchField.size, page: searchField.page })
+  // 输入了搜索关键字
+  const getSearchData = useCallback((e) => {
+    pageNum.current.page = 1
+    setOrderData(() => ({ list: [], total: 0 }))
+    setSearchField(val => ({ ...val, name_phone_or_sale_user: e, size: 10 }))
+  }, [])
   const getScrolltolower = useCallback(() => {
     if (orderData.list.length < orderData.total) {
       pageNum.current.page++
@@ -76,8 +78,6 @@ export default () => {
     }
   }, [orderData])
 
-  // 列表下拉刷新
-  const [refresherTriggeredStatus, setRefresherTriggeredStatus] = useState(false)
   const getRefresherRefresh = async() => {
     pageNum.current.size = 1
     setRefresherTriggeredStatus(true)
@@ -137,7 +137,7 @@ export default () => {
     <View className={styles.mainBox}>
       <View className={styles.topBox}>
         <View className={styles.search_input}>
-          <Search placeholder="搜索客户名称、电话、业务员" showBtn={false} changeOnSearch={getSearchData} debounceTime={300} />
+          <Search placeholder="搜索客户名称、电话、业务员" showBtn={false} changeOnSearch={getSearchData} />
         </View>
         <View className={styles.menuBox} >
           <SelectGroup>
@@ -158,7 +158,7 @@ export default () => {
         >
           {orderData?.list?.map((item, index) => {
             return (
-              <ItemLiist sortId={sortRefRef.current} obj={item}></ItemLiist>
+              <ItemLiist key={index} sortId={sortRefRef.current} obj={item}></ItemLiist>
             )
           })}
         </InfiniteScroll>
@@ -169,3 +169,5 @@ export default () => {
     </View >
   )
 }
+
+export default CustomerManagement
diff --git a/src/pages/customerPage/index.tsx b/src/pages/customerPage/index.tsx
index bad64eb..f7e527c 100644
--- a/src/pages/customerPage/index.tsx
+++ b/src/pages/customerPage/index.tsx
@@ -8,7 +8,7 @@ import { ClientListApi } from '@/api/order'
 import InfiniteScroll from '@/components/infiniteScroll'
 import { dataLoadingStatus, getFilterData } from '@/common/util'
 
-export default () => {
+const CustomerPage = () => {
   const [search, setSearch] = useState({
     name_phone_or_sale_user: null,
     page: 1,
@@ -26,7 +26,8 @@ export default () => {
     clientId: null,
     clientName: '',
   })
-
+  // 上拉加载数据
+  const pageNum = useRef({ size: search.size, page: search.page })
   // 输入了搜索关键字
   const getSearchData = useCallback((eq) => {
     pageNum.current.page = 1
@@ -36,15 +37,6 @@ export default () => {
 
   const router = useRouter()
 
-  useEffect(() => {
-    if (search.name_phone_or_sale_user === '') {
-      setSearch(e => ({ ...e, name_phone_or_sale_user: null }))
-    }
-    if (search.name_phone_or_sale_user !== '') { getCuss() }
-  }, [search])
-
-  // 上拉加载数据
-  const pageNum = useRef({ size: search.size, page: search.page })
   const getScrolltolower = useCallback(() => {
     if (clentList.list.length < clentList.total) {
       pageNum.current.page++
@@ -77,7 +69,12 @@ export default () => {
     setClientlist(e => ({ ...e, list: res.data?.list, total: res.data?.total }))
     setRefresherTriggeredStatus(() => false)
   }
-
+  useEffect(() => {
+    if (search.name_phone_or_sale_user === '') {
+      setSearch(e => ({ ...e, name_phone_or_sale_user: null }))
+    }
+    if (search.name_phone_or_sale_user !== '') { getCuss() }
+  }, [search])
   // 选择客户
   const selectClient = (item) => {
     clentList.list.map((it) => {
@@ -118,7 +115,7 @@ export default () => {
     <View className={styles.cussBox}>
       <View className={styles.searchBox}>
         <View className={styles.two}>
-          <Search placeholder="请输入客户名称或手机号码" showBtn={false} changeOnSearch={getSearchData} debounceTime={300} />
+          <Search placeholder="请输入客户名称或手机号码" showBtn={false} changeOnSearch={getSearchData} />
         </View>
 
       </View>
@@ -147,3 +144,5 @@ export default () => {
     </View>
   )
 }
+
+export default CustomerPage
diff --git a/src/pages/delivery/components/DeliveryStatusList/index.tsx b/src/pages/delivery/components/DeliveryStatusList/index.tsx
index 4d4cc96..4dbfb5a 100644
--- a/src/pages/delivery/components/DeliveryStatusList/index.tsx
+++ b/src/pages/delivery/components/DeliveryStatusList/index.tsx
@@ -6,7 +6,7 @@ interface PropsType {
   onChangeStatus?: (data: { id: number; name: string }) => void
 }
 
-const DeliveryStatusList = memo<PropsType>((props) => {
+const DeliveryStatusList = (props: PropsType) => {
   const { onChangeStatus } = props
   const { fetchData } = EnumSaleorderStatus()
   const [statusList, setStatusList] = useState([
@@ -38,5 +38,5 @@ const DeliveryStatusList = memo<PropsType>((props) => {
     [onChangeStatus],
   )
   return <SegmentedControl list={statusList} onSelect={changeStatus} defaultId={statusList[0].id} />
-})
-export default DeliveryStatusList
+}
+export default memo<PropsType>(DeliveryStatusList)
diff --git a/src/pages/delivery/components/Filter/index.tsx b/src/pages/delivery/components/Filter/index.tsx
index def817c..f3bfb8a 100644
--- a/src/pages/delivery/components/Filter/index.tsx
+++ b/src/pages/delivery/components/Filter/index.tsx
@@ -12,6 +12,23 @@ import IconFont from '@/components/iconfont/iconfont'
 import { EnumDeliveryNoticeTypeList } from '@/api/index'
 import { getFilterData } from '@/common/util'
 
+interface ButtonPropsType {
+  isActive: boolean
+  onClick?: Function
+  children?: React.ReactNode
+  customClassName?: string
+}
+const FilterButton: FC<ButtonPropsType> = (props) => {
+  const { onClick, children, isActive = false, customClassName } = props
+  const handleClick = () => {
+    onClick?.()
+  }
+  return (
+    <View className={classnames(styles.filterButton, isActive && styles['filterButton--active'], customClassName)} onClick={handleClick}>
+      <View className={classnames(styles['filterButton--text'])}>{children}</View>
+    </View>
+  )
+}
 interface SearchFilter {
   type?: number
   timeKey?: string
@@ -29,13 +46,6 @@ interface DeliveryPropsType {
   onReset?: () => void
 }
 
-interface ButtonPropsType {
-  isActive: boolean
-  onClick?: Function
-  children?: React.ReactNode
-  customClassName?: string
-}
-
 export const filterTimeOptions = {
   0: {
     name: '不限',
@@ -69,7 +79,7 @@ export const filterTimeOptions = {
   },
 } as const
 
-const DeliveryFilter = memo<DeliveryPropsType>((props) => {
+const DeliveryFilter = (props: DeliveryPropsType) => {
   const { onSearchTime, onConfirm, onCancal, onReset } = props
 
   const { fetchData, state } = EnumDeliveryNoticeTypeList()
@@ -92,17 +102,15 @@ const DeliveryFilter = memo<DeliveryPropsType>((props) => {
     return state.data.list
   }, [state])
 
+  const getEnumData = async() => {
+    await fetchData()
+  }
   useEffect(() => {
     if (!typeList?.length) {
       getEnumData()
       console.log('getEnumData')
     }
   }, [typeList])
-
-  const getEnumData = async() => {
-    await fetchData()
-  }
-
   const [customTime, setCustomTime] = useState({
     date_min: undefined,
     date_max: undefined,
@@ -144,9 +152,9 @@ const DeliveryFilter = memo<DeliveryPropsType>((props) => {
             不限
           </FilterButton>
           {!!typeList?.length
-            && typeList?.map((item) => {
+            && typeList?.map((item, key) => {
               return (
-                <FilterButton isActive={searchFilter.type === item?.id} onClick={() => handleSelectedType(item?.id)}>
+                <FilterButton key={key} isActive={searchFilter.type === item?.id} onClick={() => handleSelectedType(item?.id)}>
                   {item.name}
                 </FilterButton>
               )
@@ -157,9 +165,9 @@ const DeliveryFilter = memo<DeliveryPropsType>((props) => {
       <View className={styles.filterItem}>
         <View className={styles['filterItem--title']}>查询日期</View>
         <View className={classnames(styles['filterItem--wrapper'], styles['filter--time'])}>
-          {Object.entries(filterTimeOptions).map(([key, value]) => {
+          {Object.entries(filterTimeOptions).map(([key, value], index) => {
             return (
-              <FilterButton isActive={searchFilter.timeKey === key} onClick={() => handleSelectedTime(key)}>
+              <FilterButton key={index} isActive={searchFilter.timeKey === key} onClick={() => handleSelectedTime(key)}>
                 {value.name}
               </FilterButton>
             )
@@ -179,18 +187,6 @@ const DeliveryFilter = memo<DeliveryPropsType>((props) => {
       </View>
     </>
   )
-})
-
-const FilterButton: FC<ButtonPropsType> = (props) => {
-  const { onClick, children, isActive = false, customClassName } = props
-  const handleClick = () => {
-    onClick?.()
-  }
-  return (
-    <View className={classnames(styles.filterButton, isActive && styles['filterButton--active'], customClassName)} onClick={handleClick}>
-      <View className={classnames(styles['filterButton--text'])}>{children}</View>
-    </View>
-  )
 }
 
-export default DeliveryFilter
+export default memo<DeliveryPropsType>(DeliveryFilter)
diff --git a/src/pages/delivery/index.tsx b/src/pages/delivery/index.tsx
index c74714e..f605c54 100644
--- a/src/pages/delivery/index.tsx
+++ b/src/pages/delivery/index.tsx
@@ -51,16 +51,6 @@ const Delivery: FC = () => {
     console.log('searchValue==>', searchValue)
   }, [])
 
-  useEffect(() => {
-    if (!isFirst.current) {
-      getData()
-    }
-  }, [search])
-
-  useDidShow(() => {
-    getData()
-  })
-
   // 上拉加载数据
   const pageNum = useRef({ size: search.size, page: search.page })
 
@@ -173,11 +163,19 @@ const Delivery: FC = () => {
       </View>
     )
   }
+  useEffect(() => {
+    if (!isFirst.current) {
+      getData()
+    }
+  }, [search])
 
+  useDidShow(() => {
+    getData()
+  })
   return (
     <View className={styles.delivery}>
       <View className={styles.searchBox}>
-        <Search placeholder="请输入或扫描条形码" showBtn={false} changeOnSearch={getSearchData} debounceTime={300} customRightSlot={scanIcon()}>
+        <Search placeholder="请输入或扫描条形码" showBtn={false} changeOnSearch={getSearchData} customRightSlot={scanIcon()}>
           <View onClick={onShowFilter} className={styles.icon__filter}>
             <IconText svg iconName="icon-shaixuan" text="筛选" customClass={styles['icon--filter']} />
           </View>
diff --git a/src/pages/deliveryDetail/index.tsx b/src/pages/deliveryDetail/index.tsx
index 5f228bb..7fd9cf2 100644
--- a/src/pages/deliveryDetail/index.tsx
+++ b/src/pages/deliveryDetail/index.tsx
@@ -41,9 +41,9 @@ const DeliveryDetail: FC = () => {
   const DetailItem = useMemo(() => {
     const element
       = !!detailInfo?.weight_list?.length
-      && detailInfo?.weight_list.map((weightItem) => {
+      && detailInfo?.weight_list.map((weightItem, index) => {
         return (
-          <View className={styles.detailInfo}>
+          <View key={index} className={styles.detailInfo}>
             <Divider direction="horizontal" customClassName={styles.divider}></Divider>
             <View className={styles.detailInfoItem}>
               <View className={styles['detailInfoItem--title']}>
diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx
index 17686c8..97e2874 100644
--- a/src/pages/index/index.tsx
+++ b/src/pages/index/index.tsx
@@ -7,21 +7,23 @@ import SideBar from '@/components/sideBar'
 import Product from '@/components/product'
 import ShopCart from '@/components/shoppingCart'
 import { goLink } from '@/common/common'
-import { ProductListApi, kindListApi } from '@/api/index'
+import { KindListApi, ProductListApi } from '@/api/index'
 // import useLogin from '@/use/useLogin'
-import { mpproductcolorlist, mpshoppingCartproductColorlist } from '@/api/order'
+import { MpProductColorList, MpShoppingCartProductColorList } from '@/api/order'
 import { dataLoadingStatus, getFilterData } from '@/common/util'
 import { ClientListApi } from '@/api/order'
 
-export default () => {
-  useEffect(() => {
-    categoryList()
-    getClient()
-  }, [])
-
+const Index = () => {
   // 获取客户
   const [clienList, setclienList] = useState<any[]>([])
   const { fetchData: listFetchData } = ClientListApi()
+  // 列表下拉刷新
+  const [refresherTriggeredStatus, setRefresherTriggeredStatus] = useState(false)
+
+  const [clientObj, setclientObj] = useState({
+    clientId: -1,
+    clientName: '',
+  })
   const getClient = async() => {
     const res = await listFetchData({
       page: 1, size: 10,
@@ -33,9 +35,10 @@ export default () => {
     setclienList([...res.data.list])
   }
 
+  const [filtrate, setFiltrate] = useState({ product_kind_id: 0, size: 5, page: 1 })
   // 获取面料种类
   const [kindData, setKindData] = useState<any>({ list: [], defaultId: 0 })
-  const { fetchData } = kindListApi()
+  const { fetchData } = KindListApi()
   const categoryList = async() => {
     const res = await fetchData()
     if (res.data?.list) {
@@ -47,7 +50,6 @@ export default () => {
   // 获取面料列表
   const [productData, setProductData] = useState({ list: [], total: 0 })
   const [hasMore, setHasMore] = useState(true)
-  const [filtrate, setFiltrate] = useState({ product_kind_id: 0, size: 5, page: 1 })
   const pageNum = useRef({ size: filtrate.size, page: filtrate.page })
   const { fetchData: productFetchData, state: productState } = ProductListApi()
   // 获取数据方法
@@ -82,15 +84,16 @@ export default () => {
 
   const [showShopCart, setShowShopCart] = useState(false)
 
-  // 列表下拉刷新
-  const [refresherTriggeredStatus, setRefresherTriggeredStatus] = useState(false)
   const getRefresherRefresh = async() => {
     pageNum.current.page = 1
     setFiltrate({ ...filtrate, size: 5 })
     setHasMore(true)
     setRefresherTriggeredStatus(true)
   }
-
+  useEffect(() => {
+    categoryList()
+    getClient()
+  }, [])
   const onj = JSON.parse(Taro.getStorageSync('userInfo') || '{}')
   const [search, setSearchObj] = useState({
     modeId: 0,
@@ -102,6 +105,8 @@ export default () => {
 
   // 选择的类型
   const [typeList, setTypeList] = useState<any[]>([{ id: 0, name: '大货', checked: true }, { id: 1, name: '剪版', checked: false }, { id: 2, name: '散剪', checked: false }])
+
+  const [goodList, setGoodlist] = useState<any[]>([])
   // 选择类型
   const handCheckMode = (item) => {
     typeList.map((it) => {
@@ -117,8 +122,7 @@ export default () => {
     setTypeList([...typeList])
     setGoodlist([])
   }
-  const [goodList, setGoodlist] = useState<any[]>([])
-  const { fetchData: colorlistFetch } = mpproductcolorlist()
+  const { fetchData: colorlistFetch } = MpProductColorList()
   const ShopCartRef = useRef<any>(null)
 
   const [goodObj, setGoodsobj] = useState({})
@@ -162,7 +166,7 @@ export default () => {
   }
   // 数据加载状态
   const statusMore = useMemo(() => {
-    return dataLoadingStatus({ list: productData.list, total: productData.total, status: productState.loading })
+    return dataLoadingStatus({ list: productData.list, total: productData.total, status: productState.loading! })
   }, [productData, productState.loading])
 
   // 点击加展示输入框
@@ -181,13 +185,22 @@ export default () => {
       if (item.id === it.id) {
         item.nums--
         if (search.modeId == 0) {
-          if (item.nums < 1) { it.showInput = false, it.nums = 1 }
+          if (item.nums < 1) {
+            it.showInput = false
+            it.nums = 1
+          }
         }
         if (search.modeId == 1) {
-          if (item.nums < 0.5) { it.showInput = false, it.nums = 0.5 }
+          if (item.nums < 0.5) {
+            it.showInput = false
+            it.nums = 0.5
+          }
         }
         if (search.modeId == 2) {
-          if (item.nums < 3) { it.showInput = false, it.nums = 3 }
+          if (item.nums < 3) {
+            it.showInput = false
+            it.nums = 3
+          }
         }
       }
       return item
@@ -211,13 +224,8 @@ export default () => {
     setSearchObj(e => ({ ...e, code_or_name: eq }))
   }, [])
 
-  const [clientObj, setclientObj] = useState({
-    clientId: -1,
-    clientName: '',
-  })
-
   // 加入购物车
-  const { fetchData: preViewFetch } = mpshoppingCartproductColorlist()
+  const { fetchData: preViewFetch } = MpShoppingCartProductColorList()
   const handSure = async() => {
     const arr = goodList.filter((item) => {
       return item.showInput
@@ -368,4 +376,5 @@ export default () => {
   // </MoveBtn>
   )
 }
+export default Index
 // oninputEvent={(e, item) => { oninputEvent(e, item) }}
diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx
index b2747b9..66b78cd 100644
--- a/src/pages/login/index.tsx
+++ b/src/pages/login/index.tsx
@@ -12,6 +12,19 @@ import { LoginApi } from '@/api'
 import { alert } from '@/common/common'
 import useUserInfo from '@/use/useUserInfo'
 
+const QuickLogin: FC = () => {
+  return (
+    <View className={styles['quick-login']}>
+      <Divider direction="horizontal" customClassName={styles['quick-login--divider']}>
+        或通过以下方式登录
+      </Divider>
+      <View className={styles['quick-login--options']}>
+        <IconCard iconName="icon-weixindenglu" title="微信登录" customClass={styles['quick-login--iconCard']}></IconCard>
+      </View>
+    </View>
+  )
+}
+const QuickLoginWithMemo = memo(QuickLogin)
 const Login: FC = () => {
   const [isRemember, setRemember] = useState(false)
 
@@ -115,23 +128,10 @@ const Login: FC = () => {
         <NormalButton circle onClick={handleLogin} customClassName={styles['login-button']} disabled={account === '' || password === ''}>
           登录
         </NormalButton>
-        <QuickLogin />
+        <QuickLoginWithMemo />
       </View>
     </View>
   )
 }
 
-const QuickLogin: FC = memo(() => {
-  return (
-    <View className={styles['quick-login']}>
-      <Divider direction="horizontal" customClassName={styles['quick-login--divider']}>
-        或通过以下方式登录
-      </Divider>
-      <View className={styles['quick-login--options']}>
-        <IconCard iconName="icon-weixindenglu" title="微信登录" customClass={styles['quick-login--iconCard']}></IconCard>
-      </View>
-    </View>
-  )
-})
-
 export default Login
diff --git a/src/pages/newCollection/components/itemList/index.tsx b/src/pages/newCollection/components/itemList/index.tsx
index 4568125..072e554 100644
--- a/src/pages/newCollection/components/itemList/index.tsx
+++ b/src/pages/newCollection/components/itemList/index.tsx
@@ -10,8 +10,7 @@ import { formatDateTime, formatPriceDiv } from '@/common/format'
 interface Params {
   obj: any
 }
-
-export default memo((pros: Params) => {
+const ItemList = (pros: Params) => {
   const navTo = () => {
     Taro.navigateTo({
       url: `/pages/collectionDetail/index?id=${pros.obj.id}`,
@@ -51,4 +50,5 @@ export default memo((pros: Params) => {
       <View className={styles.btnAnd} onClick={() => navTo()}>查看详情</View>
     </View>
   )
-})
+}
+export default memo(ItemList)
diff --git a/src/pages/newCollection/index.tsx b/src/pages/newCollection/index.tsx
index c6be1d6..b3b89e8 100644
--- a/src/pages/newCollection/index.tsx
+++ b/src/pages/newCollection/index.tsx
@@ -11,12 +11,12 @@ import Popup from '@/components/popup'
 import InfiniteScroll from '@/components/infiniteScroll'
 import { formatDateTime, formatHashTag, formatImgUrl, formatPriceDiv, formatWeightDiv } from '@/common/format'
 import {
-  mpcashManagementOrderlist,
+  MpCashManagementOrderList,
 } from '@/api/newCollection'
 import TimePickerPopup from '@/components/timePickerPopup'
 import IconFont from '@/components/iconfont/iconfont'
 
-export default () => {
+const NewCollection = () => {
   const myDate = new Date()
   const [searchField, setSearchField] = useState<
   {
@@ -34,24 +34,18 @@ export default () => {
   })
   const pageNum = useRef({ size: searchField.size, page: searchField.page })
 
-  useDidShow(() => {
-    getOrderList()
-  })
+  // 获取订单列表
+  const { fetchData: listFetchData, state: orderState } = MpCashManagementOrderList()
+  const [orderData, setOrderData] = useState<{ list: any[]; total: number; summary?: any }>({ list: [], total: 0, summary: {} })
 
-  // 监听筛选条件变化
-  useEffect(() => {
-    getOrderList()
-  }, [searchField.size, searchField.search_name])
   // 输入了搜索关键字
   const getSearchData = useCallback((e) => {
     pageNum.current.page = 1
     setOrderData(() => ({ list: [], total: 0 }))
     setSearchField(val => ({ ...val, search_name: e, size: 10 }))
   }, [])
-
-  // 获取订单列表
-  const { fetchData: listFetchData, state: orderState } = mpcashManagementOrderlist()
-  const [orderData, setOrderData] = useState<{ list: any[]; total: number; summary?: any }>({ list: [], total: 0, summary: {} })
+  // 列表下拉刷新
+  const [refresherTriggeredStatus, setRefresherTriggeredStatus] = useState(false)
   const getOrderList = async() => {
     const res = await listFetchData({
       ...searchField,
@@ -60,9 +54,6 @@ export default () => {
     // setshowPopup(false)
     setRefresherTriggeredStatus(false)
   }
-
-  // 列表下拉刷新
-  const [refresherTriggeredStatus, setRefresherTriggeredStatus] = useState(false)
   const getRefresherRefresh = async() => {
     pageNum.current.page = 1
     // pageNum.current.size = 10
@@ -132,6 +123,65 @@ export default () => {
     ],
   )
 
+  // 弹窗确认选择
+  const handSureSelect = () => {
+    pageNum.current.size = 10
+    setSearchField({ ...searchField, size: 10 })
+    getOrderList()
+    setSelectPopup(false)
+  }
+
+  // 展示时间筛选
+  const [showTime, setShowTime] = useState(false)
+  // 关闭时间筛选
+  const handClose = () => {
+    setShowTime(false)
+  }
+
+  const [start, setStart] = useState<any>(myDate.toLocaleDateString())
+  const [end, setEnd] = useState<any>('')
+  // 选择时间
+  const handTime = (eq) => {
+    // 直接进来点确定的时候做处理
+    if (Object.keys(eq).length === 0) {
+      const obj = {
+        start: '',
+        end: '',
+      }
+      obj.start = `${dayjs(new Date(`${myDate?.toLocaleDateString()} ` + '00:00:00')).format('YYYY-MM-DD')} 00:00:00`
+      obj.end = `${dayjs(new Date(obj?.start)).add(1, 'day').format('YYYY-MM-DD')} 00:00:00`
+      eq.value = obj
+    }
+    setSearchField(val => ({ ...val, start_time: eq?.value?.start, end_time: eq?.value?.end }))
+    setStart(eq?.value?.start)
+    setEnd(eq?.value?.end)
+    setShowTime(false)
+    pageNum.current.size = 10
+  }
+  useDidShow(() => {
+    getOrderList()
+  })
+
+  // 监听筛选条件变化
+  useEffect(() => {
+    getOrderList()
+  }, [searchField.size, searchField.search_name])
+  const timeArea = useMemo(() => {
+    // const res = TimeList.filter(item => {
+    //     return item.checked
+    // })
+    // && res.length > 0
+    if (end !== '') {
+      return `${start}   ` + '-' + `  ${end}`
+    }
+    else {
+      return '自定义起始时间'
+    }
+  }, [end])
+
+  useEffect(() => {
+    setSearchField(searchField)
+  }, [searchField])
   // 选择时间item
   const handSelect = (it) => {
     TimeList.map((item) => {
@@ -171,64 +221,10 @@ export default () => {
     setStart(myDate.toLocaleDateString())
     setEnd('')
   }
-
-  // 弹窗确认选择
-  const handSureSelect = () => {
-    pageNum.current.size = 10
-    setSearchField({ ...searchField, size: 10 })
-    getOrderList()
-    setSelectPopup(false)
-  }
-
-  // 展示时间筛选
-  const [showTime, setShowTime] = useState(false)
-  // 关闭时间筛选
-  const handClose = () => {
-    setShowTime(false)
-  }
-
-  const [start, setStart] = useState<any>(myDate.toLocaleDateString())
-  const [end, setEnd] = useState<any>('')
-  // 选择时间
-  const handTime = (eq) => {
-    // 直接进来点确定的时候做处理
-    if (Object.keys(eq).length === 0) {
-      const obj = {
-        start: '',
-        end: '',
-      }
-      obj.start = `${dayjs(new Date(`${myDate?.toLocaleDateString()} ` + '00:00:00')).format('YYYY-MM-DD')} 00:00:00`,
-      obj.end = `${dayjs(new Date(obj?.start)).add(1, 'day').format('YYYY-MM-DD')} 00:00:00`
-      eq.value = obj
-    }
-    setSearchField(val => ({ ...val, start_time: eq?.value?.start, end_time: eq?.value?.end }))
-    setStart(eq?.value?.start)
-    setEnd(eq?.value?.end)
-    setShowTime(false)
-    pageNum.current.size = 10
-  }
-
-  const timeArea = useMemo(() => {
-    // const res = TimeList.filter(item => {
-    //     return item.checked
-    // })
-    // && res.length > 0
-    if (end !== '') {
-      return `${start}   ` + '-' + `  ${end}`
-    }
-    else {
-      return '自定义起始时间'
-    }
-  }, [end])
-
-  useEffect(() => {
-    setSearchField(searchField)
-  }, [searchField])
-
   return (
     <>
       <View style={{ background: '#FFFFFF', paddingLeft: '20rpx', paddingBottom: '20rpx', position: 'sticky', top: '0', zIndex: '99' }}>
-        <Search placeholder="请输入客户或客户跟进人" showBtn={false} changeOnSearch={getSearchData} debounceTime={300} >
+        <Search placeholder="请输入客户或客户跟进人" showBtn={false} changeOnSearch={getSearchData} >
           <View className={styles.flexBox} onClick={() => { setSelectPopup(true) }}>
             <IconFont name="icon-shaixuan" size={35} color={!isDisabled ? '#0D7CFF' : ''} customClassName={styles.activeshaixuan} />
             {/* <View className={classnames('iconfont', 'icon-shaixuan', !isDisabled ? styles.icon_shaixuan : styles.activeshaixuan)}></View> */}
@@ -303,3 +299,4 @@ export default () => {
     </>
   )
 }
+export default NewCollection
diff --git a/src/pages/order/components/PayPopup/index.tsx b/src/pages/order/components/PayPopup/index.tsx
index 6ea9010..aa46f6c 100644
--- a/src/pages/order/components/PayPopup/index.tsx
+++ b/src/pages/order/components/PayPopup/index.tsx
@@ -29,8 +29,7 @@ interface Props {
   title: string
   picUrl?: string
 }
-
-export default memo((props: Props) => {
+const PayPopup = (props: Props) => {
   const {
     showSide = true,
     showPopup = false,
@@ -73,10 +72,6 @@ export default memo((props: Props) => {
 
   // 检查是否开启保存图片权限
   const { check } = useCheckAuthorize({ scope: 'scope.writePhotosAlbum', msg: '您没授权，无法保存图片' })
-  const saveImageCheck = async() => {
-    const res = await check()
-    res && saveImage()
-  }
 
   // 保存图片
   const saveImage = () => {
@@ -102,7 +97,10 @@ export default memo((props: Props) => {
       },
     })
   }
-
+  const saveImageCheck = async() => {
+    const res = await check()
+    res && saveImage()
+  }
   return (
     <View className={styles.popupBox}>
       <Popup show={showPopup} title={title} onClose={() => popupClose?.()}>
@@ -190,4 +188,5 @@ export default memo((props: Props) => {
       </Popup >
     </View >
   )
-})
+}
+export default memo(PayPopup)
diff --git a/src/pages/order/components/itemList/index.tsx b/src/pages/order/components/itemList/index.tsx
index 51a9ccc..bb5adea 100644
--- a/src/pages/order/components/itemList/index.tsx
+++ b/src/pages/order/components/itemList/index.tsx
@@ -13,8 +13,7 @@ interface propsObj {
   nextBuy?: (arg: any, obj: any) => void
   toPay?: (arg: any, obj: any) => void
 }
-
-export default memo((props: propsObj) => {
+const ItemList = (props: propsObj) => {
   const navTo = (e) => {
     Taro.navigateTo({
       url: `/pages/orderDetails/index?id=${props?.obj?.id}`,
@@ -105,4 +104,5 @@ export default memo((props: propsObj) => {
       </View>
     </View >
   )
-})
+}
+export default memo(ItemList)
diff --git a/src/pages/order/components/offlinePay/index.tsx b/src/pages/order/components/offlinePay/index.tsx
index bfeb881..d6f1b09 100644
--- a/src/pages/order/components/offlinePay/index.tsx
+++ b/src/pages/order/components/offlinePay/index.tsx
@@ -18,7 +18,7 @@ interface Param {
   }
   showKong?: true | false
 }
-export default memo(({ show = true, onClose, offlineInfo, showKong = true }: Param) => {
+const OfflinePay = ({ show = true, onClose, offlineInfo, showKong = true }: Param) => {
   // 复制功能
   const clipboardData = () => {
     Taro.setClipboardData({
@@ -98,4 +98,5 @@ export default memo(({ show = true, onClose, offlineInfo, showKong = true }: Par
     </View>
 
   )
-})
+}
+export default memo(OfflinePay)
diff --git a/src/pages/order/components/orderStatusList/index.tsx b/src/pages/order/components/orderStatusList/index.tsx
index ed46c5e..e5da965 100644
--- a/src/pages/order/components/orderStatusList/index.tsx
+++ b/src/pages/order/components/orderStatusList/index.tsx
@@ -8,11 +8,17 @@ interface Param {
   defaultId?: number | null
   onSelect?: (val: number) => void
 }
-export default memo(({ list = [], defaultId = null, onSelect }: Param) => {
+const OrderStatusList = ({ list = [], defaultId = null, onSelect }: Param) => {
   const [selectInfo, setSelectInfo] = useState({
     selected: -1, // 当前选中的id
     tabId: '', // 需要滚动到的id
   })
+
+  const clickEvent = ({ item, index }: { item: any; index: number }) => {
+    const num = index > 0 ? index - 1 : 0
+    setSelectInfo(e => ({ ...e, tabId: list[num].id.toString(), selected: item.id }))
+    onSelect?.(item.id)
+  }
   useEffect(() => {
     if (typeof defaultId === 'number' && defaultId >= 0) {
       console.log('defaultId:::', defaultId)
@@ -26,12 +32,6 @@ export default memo(({ list = [], defaultId = null, onSelect }: Param) => {
     }
     setSelectInfo(e => ({ ...e, selected: defaultId || -1 }))
   }, [defaultId])
-  const clickEvent = ({ item, index }: { item: any; index: number }) => {
-    const num = index > 0 ? index - 1 : 0
-    setSelectInfo(e => ({ ...e, tabId: list[num].id.toString(), selected: item.id }))
-    onSelect?.(item.id)
-  }
-
   return (
     <View className={styles.order_status_list}>
       <ScrollView scrollX scrollIntoView={`tabs_${selectInfo.tabId}`} scrollWithAnimation>
@@ -52,4 +52,5 @@ export default memo(({ list = [], defaultId = null, onSelect }: Param) => {
       </ScrollView>
     </View>
   )
-})
+}
+export default memo(OrderStatusList)
diff --git a/src/pages/order/index.tsx b/src/pages/order/index.tsx
index ef7f26b..d94c0eb 100644
--- a/src/pages/order/index.tsx
+++ b/src/pages/order/index.tsx
@@ -8,14 +8,14 @@ import ItemList from './components/itemList'
 import OfflinePay from './components/offlinePay'
 import PayPopup from './components/PayPopup'
 import {
-  GetPayCode, OrderListApi,
-  mpenumsaleorderstatus,
-  mpsaleOrdercancel,
-  mpshoppingCartproductColorlist,
-  orderPaymentorderPaymentMethodInfo,
-  orderPaymentorderPaymentSubmission,
-  orderPaymentpreCollectOrderorderPaymentMethodInfo,
-  orderPaymentpreCollectOrderorderPaymentSubmission,
+  GetPayCode, MpEnumSaleOrderStatus,
+  MpSaleOrderCancel,
+  MpShoppingCartProductColorList,
+  OrderListApi,
+  OrderPaymentOrderPaymentMethodInfo,
+  OrderPaymentOrderPaymentSubmission,
+  OrderPaymentPreCollectOrderOrderPaymentMethodInfo,
+  OrderPaymentPreCollectOrderOrderPaymentSubmission,
 } from '@/api/order'
 import Search from '@/components/search'
 import { dataLoadingStatus, getFilterData } from '@/common/util'
@@ -81,7 +81,7 @@ export default () => {
   }, [orderData])
 
   // //获取订单状态
-  const { fetchData: orderStatusListFetchData } = mpenumsaleorderstatus()
+  const { fetchData: orderStatusListFetchData } = MpEnumSaleOrderStatus()
   const [statusList, setStatusList] = useState<any[]>([{ id: -1, name: '全部' }])
   const getOrderStatusList = async() => {
     const res = await orderStatusListFetchData()
@@ -247,7 +247,7 @@ export default () => {
     getOrderStatusList()
   }, [])
 
-  const { fetchData: cancelFetch } = mpsaleOrdercancel()
+  const { fetchData: cancelFetch } = MpSaleOrderCancel()
   // 取消订单
   const cancle = async(e, item) => {
     e.stopPropagation()
@@ -280,7 +280,7 @@ export default () => {
     })
   }
   // 再次购买
-  const { fetchData: buyFetch } = mpshoppingCartproductColorlist()
+  const { fetchData: buyFetch } = MpShoppingCartProductColorList()
   const nextBuy = async(e, item) => {
     e.stopPropagation()
     Taro.showLoading({
@@ -318,8 +318,8 @@ export default () => {
     }
   }
   // 去支付逻辑
-  const { fetchData: infoOneFetch } = orderPaymentorderPaymentMethodInfo()
-  const { fetchData: infoTwoFetch } = orderPaymentpreCollectOrderorderPaymentMethodInfo()
+  const { fetchData: infoOneFetch } = OrderPaymentOrderPaymentMethodInfo()
+  const { fetchData: infoTwoFetch } = OrderPaymentPreCollectOrderOrderPaymentMethodInfo()
   const [itemObj, setItemObj] = useState<any>({})
   const [payList, setPayList] = useState<any[]>([
     {
@@ -539,8 +539,8 @@ export default () => {
   }
 
   // 确认交易
-  const { fetchData: payOneFetch } = orderPaymentorderPaymentSubmission()
-  const { fetchData: payTwoFetch } = orderPaymentpreCollectOrderorderPaymentSubmission()
+  const { fetchData: payOneFetch } = OrderPaymentOrderPaymentSubmission()
+  const { fetchData: payTwoFetch } = OrderPaymentPreCollectOrderOrderPaymentSubmission()
   const handsurePay = (obj) => {
     let arr: any = []
     // if (obj.status !== 10) {
diff --git a/src/pages/orderDetails/components/BottomApply/index.tsx b/src/pages/orderDetails/components/BottomApply/index.tsx
index 3008a20..9699130 100644
--- a/src/pages/orderDetails/components/BottomApply/index.tsx
+++ b/src/pages/orderDetails/components/BottomApply/index.tsx
@@ -16,8 +16,7 @@ interface prosObj {
   goodsObj?: any
   // handSureGoods?: () => void,
 }
-
-export default memo((props: prosObj) => {
+const BottomApply = (props: prosObj) => {
   const {
     obj = {
       sale_mode: 0,
@@ -86,4 +85,5 @@ export default memo((props: prosObj) => {
       }
     </>
   )
-})
+}
+export default memo(BottomApply)
diff --git a/src/pages/orderDetails/components/addressDetailBox/index.tsx b/src/pages/orderDetails/components/addressDetailBox/index.tsx
index 3bbd1ce..32647b9 100644
--- a/src/pages/orderDetails/components/addressDetailBox/index.tsx
+++ b/src/pages/orderDetails/components/addressDetailBox/index.tsx
@@ -11,7 +11,7 @@ interface propsObj {
   obj?: any
   navSelect?: (any) => void
 }
-export default memo((props: propsObj) => {
+const AddressDetailBox = (props: propsObj) => {
   const {
     receivingStatus = null,
     onReceivingStatus,
@@ -61,4 +61,5 @@ export default memo((props: propsObj) => {
       </View>
     </View >
   )
-})
+}
+export default memo(AddressDetailBox)
diff --git a/src/pages/orderDetails/components/advanceOrderState/index.tsx b/src/pages/orderDetails/components/advanceOrderState/index.tsx
index 7ef9d78..5f6efee 100644
--- a/src/pages/orderDetails/components/advanceOrderState/index.tsx
+++ b/src/pages/orderDetails/components/advanceOrderState/index.tsx
@@ -23,8 +23,7 @@ interface Param {
     status: number // 订单状态
   }
 }
-
-export default memo(({ orderInfo, onRefresh }: Param) => {
+const AdvanceOrderState = ({ orderInfo, onRefresh }: Param) => {
   const { showTime, onStart, timeStatus } = useTimeCountDown()
 
   // 订单状态枚举
@@ -68,4 +67,5 @@ export default memo(({ orderInfo, onRefresh }: Param) => {
       </View>
     </View>
   )
-})
+}
+export default memo(AdvanceOrderState)
diff --git a/src/pages/orderDetails/components/orderState/index.tsx b/src/pages/orderDetails/components/orderState/index.tsx
index a4d187d..7c86530 100644
--- a/src/pages/orderDetails/components/orderState/index.tsx
+++ b/src/pages/orderDetails/components/orderState/index.tsx
@@ -24,8 +24,7 @@ interface Param {
     account_period_time?: string // 还款日期
   }
 }
-
-export default memo(({ orderInfo = { logistics_details: [], payment_method: 0, status: 0 }, onRefresh }: Param) => {
+const OrderState = ({ orderInfo = { logistics_details: [], payment_method: 0, status: 0 }, onRefresh }: Param) => {
   useEffect(() => {
     console.log('orderInfo33::', orderInfo)
   }, [orderInfo])
@@ -51,7 +50,7 @@ export default memo(({ orderInfo = { logistics_details: [], payment_method: 0, s
     <>
       {(dataList?.length > 0) && <View className={styles.order_flow_state}>
         <View className={classnames(styles.order_status_list, showMore && styles.order_status_list_show)}>
-          {dataList.map((item, index) => <View className={styles.order_status_item}>
+          {dataList.map((item, index) => <View className={styles.order_status_item} key={index}>
             {(dataList.length > 1) && <View className={classnames(styles.order_status_tail, (index == 0) && styles.order_status_tail_end)}></View>}
             {(dataList.length != (index + 1)) && <View className={styles.order_status_line}></View>}
             <View className={styles.order_status_content}>
@@ -62,7 +61,7 @@ export default memo(({ orderInfo = { logistics_details: [], payment_method: 0, s
           </View>)}
         </View>
         {(dataList.length > 2) && <View className={styles.more} onClick={() => changeMore()}>
-          <Text>{showMore && '收起详情' || '点击查看详情'}</Text>
+          <Text>{showMore ? '收起详情' : '点击查看详情'}</Text>
           <Text className={classnames('iconfont icon-a-moreback', styles.miconfonts, showMore && styles.open_miconfonts)}></Text>
         </View>}
         <View className={styles.image_tag}>
@@ -76,4 +75,5 @@ export default memo(({ orderInfo = { logistics_details: [], payment_method: 0, s
       </View>}
     </>
   )
-})
+}
+export default memo(OrderState)
diff --git a/src/pages/orderDetails/components/remark/index.tsx b/src/pages/orderDetails/components/remark/index.tsx
index 16c0c92..5ee6d7d 100644
--- a/src/pages/orderDetails/components/remark/index.tsx
+++ b/src/pages/orderDetails/components/remark/index.tsx
@@ -9,17 +9,13 @@ interface Param {
   defaultValue?: string
   showInput: boolean
 }
-export default ({ onBlur, onSave, defaultValue = '', showInput = false }: Param) => {
+const Remark = ({ onBlur, onSave, defaultValue = '', showInput = false }: Param) => {
   const [descData, setDescData] = useState({
     number: 0,
     value: '',
     count: 200,
   })
 
-  useEffect(() => {
-    getDesc(defaultValue)
-  }, [defaultValue])
-
   const getDesc = (value) => {
     let res = value
     if (value.length > descData.count) {
@@ -31,6 +27,9 @@ export default ({ onBlur, onSave, defaultValue = '', showInput = false }: Param)
   const setSave = () => {
     onSave?.(descData.value)
   }
+  useEffect(() => {
+    getDesc(defaultValue)
+  }, [defaultValue])
   return (
     <View className={styles.order_popup}>
       <View className={styles.order_popup_title}>编辑备注</View>
@@ -45,3 +44,5 @@ export default ({ onBlur, onSave, defaultValue = '', showInput = false }: Param)
     </View>
   )
 }
+
+export default Remark
diff --git a/src/pages/orderDetails/index.tsx b/src/pages/orderDetails/index.tsx
index f23668c..182c32a 100644
--- a/src/pages/orderDetails/index.tsx
+++ b/src/pages/orderDetails/index.tsx
@@ -16,40 +16,165 @@ import BottomBtns from '@/components/BottomBtns'
 import { debounce } from '@/common/util'
 import {
   GetPayCode,
-  mpsaleOrder,
-  mpsaleOrderaddress,
-  mpsaleOrdercancel,
-  mpsaleOrderput,
-  mpsaleOrderreceive,
-  mpsaleOrdershipmentMode,
-  mpshoppingCartproductColorlist,
-  orderPaymentorderPaymentMethodInfo,
-  orderPaymentorderPaymentSubmission,
-  orderPaymentpreCollectOrderorderPaymentMethodInfo,
-  orderPaymentpreCollectOrderorderPaymentSubmission,
+  MpSaleOrder,
+  MpSaleOrderAddress,
+  MpSaleOrderCancel,
+  MpSaleOrderPut,
+  MpSaleOrderReceive,
+  MpSaleOrderShipmentMode,
+  MpShoppingCartProductColorList,
+  OrderPaymentOrderPaymentMethodInfo,
+  OrderPaymentOrderPaymentSubmission,
+  OrderPaymentPreCollectOrderOrderPaymentMethodInfo,
+  OrderPaymentPreCollectOrderOrderPaymentSubmission,
 } from '@/api/order'
 import { alert, goLink } from '@/common/common'
 import { formatDateTime, formatPriceDiv, formatWeightDiv } from '@/common/format'
 import IconFont from '@/components/iconfont/iconfont'
 import { PAY_H5_CODE_URL } from '@/common/constant'
 
-export default () => {
+// 卡片盒子元素
+interface Obs {
+  title?: string
+  modeName?: string
+  showMode?: boolean
+  children?: ReactNode
+  clickNode?: () => void
+}
+
+const DefaultBox = (props: Obs) => {
+  const {
+    title = '标题',
+    modeName = '大货',
+    showMode = false,
+    children,
+    clickNode,
+  } = props
+
+  return (
+    <View className={styles.defaltBox}>
+      <View className={styles.titleBox}>
+        <View className={styles.title}>{title}</View>
+        {
+          showMode && <View className={styles.modeName} onClick={() => clickNode?.()}>{modeName}</View>
+        }
+      </View>
+      <View className={styles.modeLine}></View>
+      {children}
+    </View>
+  )
+}
+const DefaultBoxWithMemo = memo(DefaultBox)
+
+// 产品商品元素
+interface PropGoods {
+  // item?: {
+  //     code?: string | number
+  // }
+  list: any[]
+  obj: {
+    sale_mode?: number | string
+  }
+}
+const GoodsItem = (porps: PropGoods) => {
+  const { list = [], obj = {} } = porps
+  return (
+    <>
+      {
+        list.map((item, index) => {
+          return (
+            <View className={styles.goodsBox} key={index}>
+              <View className={styles.goodsProduct}>{item.code}# {item.name}</View>
+              <View className={styles.goodsLine}></View>
+              {
+                item.product_colors.map((it, inx) => {
+                  return (
+                    <View className={styles.itemGoods} key={inx}>
+                      <View className={styles.itemPic} style={{ backgroundColor: `rgb(${it?.rgb?.r} ${it?.rgb?.g} ${it?.rgb?.b})` }}></View>
+                      <View className={styles.itemRight}>
+                        <View className={styles.item_right_top}>
+                          <View className={styles.itemName}>{it.code}# {it.name}</View>
+                          <View className={styles.itemNums}>x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'}</View>
+                        </View>
+                        <View className={styles.item_right_Bottom}>
+                          <View className={styles.itemMoney}>¥{it.sale_price / 100}/{obj?.sale_mode === 1 ? 'm' : 'kg'}</View>
+                          <View className={styles.itemMoneyOne}>¥{formatPriceDiv(it.total_sale_price)}</View>
+                        </View>
+                      </View>
+                    </View>
+                  )
+                })
+              }
+            </View>
+          )
+        })
+      }
+    </>
+
+  )
+}
+const GoodsItemWithMemo = memo(GoodsItem)
+
+const OrderDetails = () => {
   const router = useRouter()
   // useEffect(() => {
   //     getDetail()
   // }, [])
-  useDidShow(() => {
-    getDetail()
-  })
-  // 页面下拉刷新
-  usePullDownRefresh(() => {
-    getDetail()
-  })
 
   // 收货方法,1:自提，2物流
   const [receivingStatus, setReceivingStatus] = useState(null)
   // 切换自提或者物流
-  const { fetchData: selectFetch } = mpsaleOrdershipmentMode()
+  const { fetchData: selectFetch } = MpSaleOrderShipmentMode()
+  // 订单信息文字数组
+  const [orderMsg, setOrderMsg] = useState<any[]>([
+    {
+      leftTitle: '订单编号：',
+      rightTitle: '------',
+      showBtn: true,
+    },
+    {
+      leftTitle: '创建时间：',
+      rightTitle: '------',
+    },
+    {
+      leftTitle: '发货时间：',
+      rightTitle: '------',
+    },
+    {
+      leftTitle: '业务员：',
+      rightTitle: '------',
+    },
+  ])
+  const { fetchData: infoFetch } = MpSaleOrder()
+  const [infoObj, setInfoObj] = useState<any>({})
+  // 获取订单详情
+  const getDetail = async() => {
+    Taro.showLoading({
+      title: '加载中...',
+      mask: true,
+    })
+    const res = await infoFetch({ id: router.params.id })
+    setInfoObj(res.data)
+    orderMsg.forEach((it) => {
+      if (it.leftTitle === '订单编号：') {
+        it.rightTitle = res.data.order_no
+      }
+      if (it.leftTitle === '创建时间：') {
+        it.rightTitle = formatDateTime(res.data.create_time)
+      }
+      if (it.leftTitle === '发货时间：') {
+        it.rightTitle = formatDateTime(res.data.delivery_time)
+      }
+      if (it.leftTitle === '业务员：') {
+        it.rightTitle = res.data.sale_user_name
+      }
+    })
+    setOrderMsg([...orderMsg])
+    setReceivingStatus(res.data.shipment_mode)
+    // 小程序提供的api，通知页面停止下拉刷新效果
+    Taro.stopPullDownRefresh()
+    Taro.hideLoading()
+  }
   const onReceivingStatus = debounce(async(e, value) => {
     if (infoObj.status === 8 || infoObj.status === 9 || infoObj.status === 4 || infoObj.status === 5 || infoObj.status === 3 || infoObj.status === 11) {
       alert.error('不允许更改')
@@ -92,36 +217,6 @@ export default () => {
     }
   }, 300)
 
-  const { fetchData: infoFetch } = mpsaleOrder()
-  const [infoObj, setInfoObj] = useState<any>({})
-  // 获取订单详情
-  const getDetail = async() => {
-    Taro.showLoading({
-      title: '加载中...',
-      mask: true,
-    })
-    const res = await infoFetch({ id: router.params.id })
-    setInfoObj(res.data)
-    orderMsg.map((it) => {
-      if (it.leftTitle === '订单编号：') {
-        it.rightTitle = res.data.order_no
-      }
-      if (it.leftTitle === '创建时间：') {
-        it.rightTitle = formatDateTime(res.data.create_time)
-      }
-      if (it.leftTitle === '发货时间：') {
-        it.rightTitle = formatDateTime(res.data.delivery_time)
-      }
-      if (it.leftTitle === '业务员：') {
-        it.rightTitle = res.data.sale_user_name
-      }
-    })
-    setOrderMsg([...orderMsg])
-    setReceivingStatus(res.data.shipment_mode)
-    // 小程序提供的api，通知页面停止下拉刷新效果
-    Taro.stopPullDownRefresh()
-    Taro.hideLoading()
-  }
   // 复制功能
   const clipboardData = () => {
     Taro.setClipboardData({
@@ -138,30 +233,10 @@ export default () => {
   // useEffect(() => {
   //     setReceivingStatus(receivingStatus)
   // }, [receivingStatus])
-  // 订单信息文字数组
-  const [orderMsg, setOrderMsg] = useState<any[]>([
-    {
-      leftTitle: '订单编号：',
-      rightTitle: '------',
-      showBtn: true,
-    },
-    {
-      leftTitle: '创建时间：',
-      rightTitle: '------',
-    },
-    {
-      leftTitle: '发货时间：',
-      rightTitle: '------',
-    },
-    {
-      leftTitle: '业务员：',
-      rightTitle: '------',
-    },
-  ])
 
   // 备注操作
   const [showDesc, setShowDesc] = useState(false)
-  const { fetchData: remarkFetch } = mpsaleOrderput()
+  const { fetchData: remarkFetch } = MpSaleOrderPut()
   const getRemark = async() => {
     const res = await remarkFetch({ remark: infoObj.remark, id: Number(router.params.id) })
     if (res.msg === 'success') {
@@ -183,7 +258,7 @@ export default () => {
     getDetail()
   }, [])
 
-  const { fetchData: cancelFetch } = mpsaleOrdercancel()
+  const { fetchData: cancelFetch } = MpSaleOrderCancel()
   // 取消订单
   const cancle = async(e, item) => {
     e.stopPropagation()
@@ -216,7 +291,7 @@ export default () => {
     })
   }
   // 再次购买
-  const { fetchData: buyFetch } = mpshoppingCartproductColorlist()
+  const { fetchData: buyFetch } = MpShoppingCartProductColorList()
   const nextBuy = async(e, item) => {
     e.stopPropagation()
     Taro.showLoading({
@@ -254,8 +329,8 @@ export default () => {
     }
   }
   // 去支付逻辑
-  const { fetchData: infoOneFetch } = orderPaymentorderPaymentMethodInfo()
-  const { fetchData: infoTwoFetch } = orderPaymentpreCollectOrderorderPaymentMethodInfo()
+  const { fetchData: infoOneFetch } = OrderPaymentOrderPaymentMethodInfo()
+  const { fetchData: infoTwoFetch } = OrderPaymentPreCollectOrderOrderPaymentMethodInfo()
   const [payList, setPayList] = useState<any[]>([
     {
       id: 2,
@@ -290,6 +365,138 @@ export default () => {
       name: '扫码支付',
     },
   ])
+
+  useDidShow(() => {
+    getDetail()
+  })
+  // 页面下拉刷新
+  usePullDownRefresh(() => {
+    getDetail()
+  })
+
+  // 扫码支付
+  const [showSide, setShowSide] = useState(true)
+  const [title, setTitle] = useState('')
+  const [picUrl, setPicUrl] = useState('')
+  const { fetchData: payFetch } = GetPayCode()
+  const handScanpay = async() => {
+    const list: any = []
+    infoObj.product_list.forEach((item) => {
+      item.product_colors.forEach((it) => {
+        list.push({
+          product_code: item.code,
+          product_name: item.name,
+          product_color_code: it.product_color_code,
+          product_color_name: it.product_color_name,
+          num: it.roll.toString(),
+          weight: formatWeightDiv(it.actual_weight).toString(),
+          sale_price: (it.sale_price / 100).toString(),
+          total_price:
+                        it.total_sale_price !== 0
+                          ? (it.total_sale_price / 100).toString()
+                          : (it.estimate_amount / 100).toString(),
+          length: (it.length / 100).toString(),
+          weight_error: formatWeightDiv(it.weight_error).toString(),
+        })
+      })
+    })
+    const query = {
+      list,
+      title: '面料销售电子确认单',
+      show_qrcode: true,
+      show_barcode: true,
+      show_wait_pay_amount: true,
+      order_type: infoObj.sale_mode_name,
+      shipment_mode: infoObj.shipment_mode_name,
+      company: infoObj.title_purchaser_name,
+      sale_user: infoObj.sale_user_name,
+      order_created_time: formatDateTime(infoObj.create_time),
+      order_no: infoObj.order_no,
+      target_user_name: infoObj.target_user_name,
+      target_address: infoObj.address_detail,
+      target_description: infoObj.remark,
+      pay_account: infoObj.transfer_remittance_account,
+      bank_account_name: infoObj.account_name,
+      bank_name: infoObj.bank_of_deposit,
+      pay_type: infoObj.settle_mode_name,
+      client: infoObj.purchaser_name,
+      phone: infoObj.target_user_phone,
+      order_total_length: (infoObj.total_number / 100).toString(),
+      order_total_price: (
+        infoObj.bill_total_sale_price / 100
+      ).toString(),
+      total_weight_error_discount: (
+        infoObj.total_weight_error_discount / 100
+      ).toString(),
+      order_total_num: infoObj.total_number.toString(),
+      qrcode: `${PAY_H5_CODE_URL}?sale_order_no=${infoObj.order_no}`,
+      order_total_weight: (infoObj.total_weight / 1000).toString(),
+      estimate_amount: (infoObj.estimate_amount / 100).toString(),
+      total_sale_price: (infoObj.total_sale_price / 100).toString(),
+      show_total_sale_price: true,
+      show_total_weight_error_discount: true,
+      actual_amount: (infoObj.actual_amount / 100).toString(),
+      wait_pay_amount: (infoObj.wait_pay_amount / 100).toString(),
+      order_total_weight_error: (
+        infoObj.total_weight_error / 1000
+      ).toString(),
+    }
+    const res = await payFetch(query)
+    if (res.data) {
+      console.log(res.data.base64)
+      setShowSide(false)
+      setTitle('查看销售码单')
+      setPicUrl(res.data.base64)
+    }
+  }
+
+  // 确认交易
+  const { fetchData: payOneFetch } = OrderPaymentOrderPaymentSubmission()
+  const { fetchData: payTwoFetch } = OrderPaymentPreCollectOrderOrderPaymentSubmission()
+
+  // 显示支付
+  const [showPay, setShowPay] = useState(false)
+  // 显示线下汇款
+  const [showOffline, setShowOffine] = useState(false)
+  // 选择地址
+  const handSelect = (obj) => {
+    if (receivingStatus === 1 || (infoObj.status === 8 || infoObj.status === 9 || infoObj.status === 4 || infoObj.status === 5 || infoObj.status === 11 || infoObj.status === 3)) {
+      alert.error('不允许更改')
+      return false
+    }
+    Taro.navigateTo({
+      url: `/pages/addressManager/index?orderId=${obj.id}&purchaser_id=${obj.purchaser_id}`,
+    })
+  }
+
+  // 申请退货
+  const handApplyGood = () => {
+    if (infoObj.av_return_product.length == 0) {
+      return alert.error('暂无货物退')
+    }
+    else {
+      Taro.navigateTo({
+        url: `/pages/applyGoods/index?orderId=${infoObj.id}`,
+      })
+      setShowMore(false)
+    }
+  }
+
+  // 申请退款
+  const handApplyMoney = () => {
+    // 三种类型的   待收货，已收货后申请退货退款，需要选择质量/非质量问题
+    if (infoObj?.status == 8 || infoObj?.status == 9) {
+      Taro.navigateTo({
+        url: `/pages/applyGoods/index?orderId=${infoObj.id}`,
+      })
+    }
+    else {
+      Taro.navigateTo({
+        url: `/pages/applyMoney/index?orderId=${infoObj.id}`,
+      })
+    }
+    setShowMore(false)
+  }
   const toPay = async(e, item) => {
     e.stopPropagation()
 
@@ -372,102 +579,43 @@ export default () => {
     setTitle('待支付款项')
     setShowPay(true)
   }
-
-  // 选择支付方式
-  const clickItem = (item) => {
-    if (item.name === '扫码支付') { handScanpay() }
-    if (item.name === '线下汇款') { setShowOffine(true) }
-    payList.map((it) => {
-      if (item.id === it.id) {
-        it.checked = true
-      }
-      else {
-        it.checked = false
-      }
-      return it
+  // 确认收货
+  const { fetchData: receveFetch } = MpSaleOrderReceive()
+  const handSureGoods = async() => {
+    Taro.showModal({
+      content: '确认收货吗？',
+      confirmText: '确认',
+      cancelText: '取消',
+      async success(res) {
+        if (res.confirm) {
+          Taro.showLoading({
+            title: '请稍等...',
+            mask: true,
+          })
+          const res = await receveFetch({ sale_order_id: Number(infoObj.id) })
+          if (res?.msg === 'success') {
+            Taro.showToast({
+              title: '成功',
+            })
+            Taro.hideLoading()
+            setShowMore(false)
+            getDetail()
+          }
+          else {
+            Taro.hideLoading()
+            Taro.showToast({
+              title: res?.msg,
+              icon: 'error',
+            })
+          }
+        }
+      },
     })
-    setPayList([...payList])
   }
 
-  // 扫码支付
-  const [showSide, setShowSide] = useState(true)
-  const [title, setTitle] = useState('')
-  const [picUrl, setPicUrl] = useState('')
-  const { fetchData: payFetch } = GetPayCode()
-  const handScanpay = async() => {
-    const list: any = []
-    infoObj.product_list.forEach((item) => {
-      item.product_colors.forEach((it) => {
-        list.push({
-          product_code: item.code,
-          product_name: item.name,
-          product_color_code: it.product_color_code,
-          product_color_name: it.product_color_name,
-          num: it.roll.toString(),
-          weight: formatWeightDiv(it.actual_weight).toString(),
-          sale_price: (it.sale_price / 100).toString(),
-          total_price:
-                        it.total_sale_price !== 0
-                          ? (it.total_sale_price / 100).toString()
-                          : (it.estimate_amount / 100).toString(),
-          length: (it.length / 100).toString(),
-          weight_error: formatWeightDiv(it.weight_error).toString(),
-        })
-      })
-    })
-    const query = {
-      list,
-      title: '面料销售电子确认单',
-      show_qrcode: true,
-      show_barcode: true,
-      show_wait_pay_amount: true,
-      order_type: infoObj.sale_mode_name,
-      shipment_mode: infoObj.shipment_mode_name,
-      company: infoObj.title_purchaser_name,
-      sale_user: infoObj.sale_user_name,
-      order_created_time: formatDateTime(infoObj.create_time),
-      order_no: infoObj.order_no,
-      target_user_name: infoObj.target_user_name,
-      target_address: infoObj.address_detail,
-      target_description: infoObj.remark,
-      pay_account: infoObj.transfer_remittance_account,
-      bank_account_name: infoObj.account_name,
-      bank_name: infoObj.bank_of_deposit,
-      pay_type: infoObj.settle_mode_name,
-      client: infoObj.purchaser_name,
-      phone: infoObj.target_user_phone,
-      order_total_length: (infoObj.total_number / 100).toString(),
-      order_total_price: (
-        infoObj.bill_total_sale_price / 100
-      ).toString(),
-      total_weight_error_discount: (
-        infoObj.total_weight_error_discount / 100
-      ).toString(),
-      order_total_num: infoObj.total_number.toString(),
-      qrcode: `${PAY_H5_CODE_URL}?sale_order_no=${infoObj.order_no}`,
-      order_total_weight: (infoObj.total_weight / 1000).toString(),
-      estimate_amount: (infoObj.estimate_amount / 100).toString(),
-      total_sale_price: (infoObj.total_sale_price / 100).toString(),
-      show_total_sale_price: true,
-      show_total_weight_error_discount: true,
-      actual_amount: (infoObj.actual_amount / 100).toString(),
-      wait_pay_amount: (infoObj.wait_pay_amount / 100).toString(),
-      order_total_weight_error: (
-        infoObj.total_weight_error / 1000
-      ).toString(),
-    }
-    const res = await payFetch(query)
-    if (res.data) {
-      console.log(res.data.base64)
-      setShowSide(false)
-      setTitle('查看销售码单')
-      setPicUrl(res.data.base64)
-    }
+  const onChange = (e) => {
+    setInfoObj(val => ({ ...val, remark: e }))
   }
-
-  // 确认交易
-  const { fetchData: payOneFetch } = orderPaymentorderPaymentSubmission()
-  const { fetchData: payTwoFetch } = orderPaymentpreCollectOrderorderPaymentSubmission()
   const handsurePay = (obj) => {
     let arr: any = []
     // if (obj.status !== 10) {
@@ -514,89 +662,6 @@ export default () => {
 
     // }
   }
-
-  // 显示支付
-  const [showPay, setShowPay] = useState(false)
-  // 显示线下汇款
-  const [showOffline, setShowOffine] = useState(false)
-  // 选择地址
-  const handSelect = (obj) => {
-    if (receivingStatus === 1 || (infoObj.status === 8 || infoObj.status === 9 || infoObj.status === 4 || infoObj.status === 5 || infoObj.status === 11 || infoObj.status === 3)) {
-      alert.error('不允许更改')
-      return false
-    }
-    Taro.navigateTo({
-      url: `/pages/addressManager/index?orderId=${obj.id}&purchaser_id=${obj.purchaser_id}`,
-    })
-  }
-
-  // 申请退货
-  const handApplyGood = () => {
-    if (infoObj.av_return_product.length == 0) {
-      return alert.error('暂无货物退')
-    }
-    else {
-      Taro.navigateTo({
-        url: `/pages/applyGoods/index?orderId=${infoObj.id}`,
-      })
-      setShowMore(false)
-    }
-  }
-
-  // 申请退款
-  const handApplyMoney = () => {
-    // 三种类型的   待收货，已收货后申请退货退款，需要选择质量/非质量问题
-    if (infoObj?.status == 8 || infoObj?.status == 9) {
-      Taro.navigateTo({
-        url: `/pages/applyGoods/index?orderId=${infoObj.id}`,
-      })
-    }
-    else {
-      Taro.navigateTo({
-        url: `/pages/applyMoney/index?orderId=${infoObj.id}`,
-      })
-    }
-    setShowMore(false)
-  }
-
-  // 确认收货
-  const { fetchData: receveFetch } = mpsaleOrderreceive()
-  const handSureGoods = async() => {
-    Taro.showModal({
-      content: '确认收货吗？',
-      confirmText: '确认',
-      cancelText: '取消',
-      async success(res) {
-        if (res.confirm) {
-          Taro.showLoading({
-            title: '请稍等...',
-            mask: true,
-          })
-          const res = await receveFetch({ sale_order_id: Number(infoObj.id) })
-          if (res?.msg === 'success') {
-            Taro.showToast({
-              title: '成功',
-            })
-            Taro.hideLoading()
-            setShowMore(false)
-            getDetail()
-          }
-          else {
-            Taro.hideLoading()
-            Taro.showToast({
-              title: res?.msg,
-              icon: 'error',
-            })
-          }
-        }
-      },
-    })
-  }
-
-  const onChange = (e) => {
-    setInfoObj(val => ({ ...val, remark: e }))
-  }
-
   useEffect(() => {
     setInfoObj(infoObj)
   }, [infoObj])
@@ -632,7 +697,21 @@ export default () => {
       return '合计金额'
     }
   }, [infoObj])
-
+  // 选择支付方式
+  const clickItem = (item) => {
+    if (item.name === '扫码支付') { handScanpay() }
+    if (item.name === '线下汇款') { setShowOffine(true) }
+    payList.map((it) => {
+      if (item.id === it.id) {
+        it.checked = true
+      }
+      else {
+        it.checked = false
+      }
+      return it
+    })
+    setPayList([...payList])
+  }
   return (
     <View className={styles.mainBox}>
       {(infoObj?.status != 10 && <OrderState orderInfo={infoObj} />)}
@@ -645,7 +724,7 @@ export default () => {
         receivingStatus={receivingStatus}
         onReceivingStatus={(e, value) => onReceivingStatus(e, value)}
       ></AddressDetailBox>
-      <DefaultBox
+      <DefaultBoxWithMemo
         showMode
         title="客户信息"
         modeName={infoObj.sale_mode_name}
@@ -654,10 +733,10 @@ export default () => {
           <View className={styles.pussName}>{infoObj.purchaser_name}</View>
           <View className={styles.pussPhone}>{infoObj.purchaser_phone}</View>
         </View>
-      </DefaultBox>
+      </DefaultBoxWithMemo>
       <View className={styles.total}> {infoObj.total_fabrics} 种面料，{infoObj.total_colors} 个颜色，共 {infoObj.sale_mode === 0 ? infoObj.total_number : infoObj.total_number / 100} {infoObj.sale_mode === 0 ? '条' : 'm'}</View>
       <View className={styles.productBox}>
-        <GoodsItem list={infoObj?.product_list} obj={infoObj}></GoodsItem>
+        <GoodsItemWithMemo list={infoObj?.product_list} obj={infoObj}></GoodsItemWithMemo>
         <View className={styles.flexMoney}>
           <View className={styles.flexTotalBox}>
             <View className={styles.totalFont}>{payFont}</View>
@@ -692,7 +771,7 @@ export default () => {
         }
 
       </View>
-      <DefaultBox title="订单信息">
+      <DefaultBoxWithMemo title="订单信息">
         {
           orderMsg.map((item, index) => {
             return (
@@ -710,7 +789,7 @@ export default () => {
           })
         }
 
-      </DefaultBox>
+      </DefaultBoxWithMemo>
       <DefaultBox title="备注信息" showMode modeName={showRemarkFont} clickNode={() => setShowDesc(showRemarkFont != '')}>
         <View className={styles.remarkFont}>{infoObj.remark === '' ? '暂无' : infoObj.remark}</View>
       </DefaultBox>
@@ -779,83 +858,4 @@ export default () => {
     </View >
   )
 }
-
-// 卡片盒子元素
-interface Obs {
-  title?: string
-  modeName?: string
-  showMode?: boolean
-  children?: ReactNode
-  clickNode?: () => void
-}
-
-const DefaultBox = memo((props: Obs) => {
-  const {
-    title = '标题',
-    modeName = '大货',
-    showMode = false,
-    children,
-    clickNode,
-  } = props
-
-  return (
-    <View className={styles.defaltBox}>
-      <View className={styles.titleBox}>
-        <View className={styles.title}>{title}</View>
-        {
-          showMode && <View className={styles.modeName} onClick={() => clickNode?.()}>{modeName}</View>
-        }
-      </View>
-      <View className={styles.modeLine}></View>
-      {children}
-    </View>
-  )
-})
-
-// 产品商品元素
-interface PropGoods {
-  // item?: {
-  //     code?: string | number
-  // }
-  list: any[]
-  obj: {
-    sale_mode?: number | string
-  }
-}
-const GoodsItem = memo((porps: PropGoods) => {
-  const { list = [], obj = {} } = porps
-  return (
-    <>
-      {
-        list.map((item, index) => {
-          return (
-            <View className={styles.goodsBox} key={index}>
-              <View className={styles.goodsProduct}>{item.code}# {item.name}</View>
-              <View className={styles.goodsLine}></View>
-              {
-                item.product_colors.map((it, inx) => {
-                  return (
-                    <View className={styles.itemGoods}>
-                      <View className={styles.itemPic} style={{ backgroundColor: `rgb(${it?.rgb?.r} ${it?.rgb?.g} ${it?.rgb?.b})` }}></View>
-                      <View className={styles.itemRight}>
-                        <View className={styles.item_right_top}>
-                          <View className={styles.itemName}>{it.code}# {it.name}</View>
-                          <View className={styles.itemNums}>x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'}</View>
-                        </View>
-                        <View className={styles.item_right_Bottom}>
-                          <View className={styles.itemMoney}>¥{it.sale_price / 100}/{obj?.sale_mode === 1 ? 'm' : 'kg'}</View>
-                          <View className={styles.itemMoneyOne}>¥{formatPriceDiv(it.total_sale_price)}</View>
-                        </View>
-                      </View>
-                    </View>
-                  )
-                })
-              }
-            </View>
-          )
-        })
-      }
-    </>
-
-  )
-})
+export default OrderDetails
diff --git a/src/pages/refundDetail/components/addressDetailBox/index.tsx b/src/pages/refundDetail/components/addressDetailBox/index.tsx
index ade546a..878800a 100644
--- a/src/pages/refundDetail/components/addressDetailBox/index.tsx
+++ b/src/pages/refundDetail/components/addressDetailBox/index.tsx
@@ -10,7 +10,7 @@ interface propsObj {
   obj: any
   handUp?: (any) => void
 }
-export default memo((props: propsObj) => {
+const AddressDetailBox = (props: propsObj) => {
   const {
     obj = {},
     handUp,
@@ -46,4 +46,5 @@ export default memo((props: propsObj) => {
       </View>
     </View >
   )
-})
+}
+export default memo(AddressDetailBox)
diff --git a/src/pages/refundDetail/components/orderState/index.tsx b/src/pages/refundDetail/components/orderState/index.tsx
index d7a721b..97ce19f 100644
--- a/src/pages/refundDetail/components/orderState/index.tsx
+++ b/src/pages/refundDetail/components/orderState/index.tsx
@@ -24,8 +24,7 @@ interface Param {
     account_period_time?: string // 还款日期
   }
 }
-
-export default memo(({ orderInfo = { logistics_details: [], payment_method: 0, status: 0 }, onRefresh }: Param) => {
+const OrderState = ({ orderInfo = { logistics_details: [], payment_method: 0, status: 0 }, onRefresh }: Param) => {
   useEffect(() => {
     console.log('orderInfo33::', orderInfo)
   }, [orderInfo])
@@ -48,7 +47,7 @@ export default memo(({ orderInfo = { logistics_details: [], payment_method: 0, s
     <>
       {(dataList?.length > 0) && <View className={styles.order_flow_state}>
         <View className={classnames(styles.order_status_list, showMore && styles.order_status_list_show)}>
-          {dataList.map((item, index) => <View className={styles.order_status_item}>
+          {dataList.map((item, index) => <View className={styles.order_status_item} key={index}>
             {(dataList.length > 1) && <View className={classnames(styles.order_status_tail, (index == 0) && styles.order_status_tail_end)}></View>}
             {(dataList.length != (index + 1)) && <View className={styles.order_status_line}></View>}
             <View className={styles.order_status_content}>
@@ -59,10 +58,11 @@ export default memo(({ orderInfo = { logistics_details: [], payment_method: 0, s
           </View>)}
         </View>
         {(dataList.length > 2) && <View className={styles.more} onClick={() => changeMore()}>
-          <Text>{showMore && '收起详情' || '点击查看详情'}</Text>
+          <Text>{showMore ? '收起详情' : '点击查看详情'}</Text>
           <Text className={classnames('iconfont icon-a-moreback', styles.miconfonts, showMore && styles.open_miconfonts)}></Text>
         </View>}
       </View>}
     </>
   )
-})
+}
+export default memo(OrderState)
diff --git a/src/pages/refundDetail/index.tsx b/src/pages/refundDetail/index.tsx
index b2315f0..290f437 100644
--- a/src/pages/refundDetail/index.tsx
+++ b/src/pages/refundDetail/index.tsx
@@ -9,9 +9,9 @@ import OrderState from './components/orderState'
 import AddressDetailBox from './components/addressDetailBox'
 import { formatDateTime, formatHashTag, formatImgUrl, formatPriceDiv, formatWeightDiv } from '@/common/format'
 import {
-  mpreturnApplyOrder,
-  returnApplyOrdercancel,
-  returnApplyOrderuploadAccessory,
+  MpReturnApplyOrder,
+  ReturnApplyOrderCancel,
+  ReturnApplyOrderUploadAccessory,
 } from '@/api/refound'
 import { IMG_CND_Prefix } from '@/common/constant'
 import Popup from '@/components/popup'
@@ -20,17 +20,150 @@ import { alert } from '@/common/common'
 import RefundCodelist from '@/components/RefundCodelist'
 import LabAndImg from '@/components/LabAndImg'
 
-export default () => {
-  // 页面下拉刷新
-  usePullDownRefresh(() => {
-    getDetail()
-  })
-  const router = useRouter()
-  useEffect(() => {
-    getDetail()
+interface Obs {
+  title?: string
+  modeName?: string
+  showMode?: boolean
+  children?: ReactNode
+  clickNode?: () => void
+}
+
+const DefaultBox = (props: Obs) => {
+  const {
+    title = '标题',
+    modeName = '大货',
+    showMode = false,
+    children,
+    clickNode,
+  } = props
+
+  return (
+    <View className={styles.defaltBox}>
+      <View className={styles.titleBox}>
+        <View className={styles.title}>{title}</View>
+        {
+          showMode && <View className={styles.modeName} onClick={() => clickNode?.()}>{modeName}</View>
+        }
+      </View>
+      <View className={styles.modeLine}></View>
+      {children}
+    </View>
+  )
+}
+const DefaultBoxWithMemo = memo(DefaultBox)
+
+interface PropGoods {
+  // item?: {
+  //     code?: string | number
+  // }
+  list: any[]
+  obj: any
+}
+
+const GoodsItem = (porps: PropGoods) => {
+  const { list = [], obj = {} } = porps
+
+  const labAndImgObj = useCallback((item) => {
+    return { lab: item.lab, rgb: item.rgb, texture_url: item.texture_url }
   }, [])
+  return (
+    <>
+      {
+        list.map((item, index) => {
+          return (
+            <View className={styles.goodsBox} key={index}>
+              <View className={styles.goodsProduct}>{item.code}# {item.name}</View>
+              {
+                item.product_colors.map((it, inx) => {
+                  return (
+                    <View className={styles.itemGoods} key={inx}>
+                      {
+                        it.texture_url === ''
+                                                && <Image className={styles.itemPic} mode="aspectFill" src="https://test.cdn.zzfzyc.com/mall/no_img.png"></Image>
+                      }
+                      {
+                        it.texture_url !== ''
+                                                && <View className={styles.itemPic}>
+                                                  <LabAndImg value={labAndImgObj(it)} />
+                                                </View>
+                      }
+                      <View className={styles.clear}> </View>
+                      <View className={styles.itemRight}>
+                        <View className={styles.item_right_top}>
+                          <View className={styles.itemName}>{it.code}# {it.name}</View>
+                          {/* <View className={styles.itemNums}>x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'}</View> */}
+                          {
+                            obj.sale_mode == 0 && <View className={styles.itemNums}>x{obj.stage == 0 || obj.stage == 1 || obj.stage == 2
+                              ? it.roll
+                              : obj.stage == 5 || obj.stage == 6 || obj.stage == 3
+                                ? it.return_roll
+                                : it.roll}{obj?.sale_mode == 0 ? '条' : 'm'}</View>
+                          }
+                          {
+                            obj.sale_mode != 0 && <View className={styles.itemNums}>x{it.length / 100}m</View>
+                          }
+                        </View>
+                        <View className={styles.item_right_Bottom}>
+                          <View className={styles.itemMoney}>¥{it.sale_price / 100}/{obj?.sale_mode == 0 ? 'kg' : 'm'}</View>
+                          {/* <View className={styles.itemMoneyOne}>¥{formatPriceDiv(it.total_sale_price)}</View> */}
+                        </View>
+                      </View>
+                    </View>
+                  )
+                })
+              }
+            </View>
+          )
+        })
+      }
+    </>
+
+  )
+}
+const GoodsItemWithMemo = memo(GoodsItem)
+
+const RefundDetail = () => {
+  // 页面下拉刷新
+  const router = useRouter()
+  // 查看图片
+  const [ShowPic, setShowPic] = useState(false)
+
+  const [PicList, setPicList] = useState<any[]>([])
+  // 订单信息文字数组
+  const [orderMsg, setOrderMsg] = useState<any[]>([
+    {
+      leftTitle: '售后编号：',
+      rightTitle: '------',
+      showBtn: true,
+    },
+    {
+      leftTitle: '订单号：',
+      rightTitle: '------',
+      showBtn: true,
+    },
+    {
+      leftTitle: '退货原因：',
+      rightTitle: '------',
+    },
+    {
+      leftTitle: '退货说明：',
+      rightTitle: '------',
+    },
+    {
+      leftTitle: '其他说明：',
+      rightTitle: '------',
+    },
+    {
+      leftTitle: '货物状况：',
+      rightTitle: '------',
+    },
+    {
+      leftTitle: '申请时间：',
+      rightTitle: '------',
+    },
+  ])
   // 获取详情
-  const { fetchData: detailFetch } = mpreturnApplyOrder()
+  const { fetchData: detailFetch } = MpReturnApplyOrder()
   const [DeatailObj, setDeatailObj] = useState<any>({})
   const getDetail = async() => {
     Taro.showLoading({
@@ -40,7 +173,7 @@ export default () => {
     const res = await detailFetch({ id: Number(router.params.id) })
     if (res.data) {
       setDeatailObj(res.data)
-      orderMsg.map((it) => {
+      orderMsg.forEach((it) => {
         if (it.leftTitle === '售后编号：') {
           it.rightTitle = res.data.return_order_no
         }
@@ -82,40 +215,6 @@ export default () => {
     }
   }, [DeatailObj])
 
-  // 订单信息文字数组
-  const [orderMsg, setOrderMsg] = useState<any[]>([
-    {
-      leftTitle: '售后编号：',
-      rightTitle: '------',
-      showBtn: true,
-    },
-    {
-      leftTitle: '订单号：',
-      rightTitle: '------',
-      showBtn: true,
-    },
-    {
-      leftTitle: '退货原因：',
-      rightTitle: '------',
-    },
-    {
-      leftTitle: '退货说明：',
-      rightTitle: '------',
-    },
-    {
-      leftTitle: '其他说明：',
-      rightTitle: '------',
-    },
-    {
-      leftTitle: '货物状况：',
-      rightTitle: '------',
-    },
-    {
-      leftTitle: '申请时间：',
-      rightTitle: '------',
-    },
-  ])
-
   // 复制功能
   const clipboardData = (val) => {
     Taro.setClipboardData({
@@ -130,7 +229,7 @@ export default () => {
   }
 
   // 取消退货
-  const { fetchData: cancelFetch } = returnApplyOrdercancel()
+  const { fetchData: cancelFetch } = ReturnApplyOrderCancel()
   const handCancle = async() => {
     Taro.showModal({
       content: '确定要取消吗？',
@@ -160,10 +259,6 @@ export default () => {
       },
     })
   }
-  // 查看图片
-  const [ShowPic, setShowPic] = useState(false)
-
-  const [PicList, setPicList] = useState<any[]>([])
 
   const handUp = (value) => {
     setShowPic(true)
@@ -185,7 +280,7 @@ export default () => {
   }, [])
 
   // 提交附件
-  const { fetchData: sureFetch } = returnApplyOrderuploadAccessory()
+  const { fetchData: sureFetch } = ReturnApplyOrderUploadAccessory()
   const handSure = () => {
     let arr: any = []
     arr = [...picUrl.current]
@@ -234,7 +329,12 @@ export default () => {
   const handSee = () => {
     setShowCode(true)
   }
-
+  usePullDownRefresh(() => {
+    getDetail()
+  })
+  useEffect(() => {
+    getDetail()
+  }, [])
   return (
     <View className={styles.main}>
       <OrderState orderInfo={DeatailObj} />
@@ -242,7 +342,7 @@ export default () => {
         obj={DeatailObj}
         handUp={() => handUp(DeatailObj)}
       ></AddressDetailBox>
-      <DefaultBox
+      <DefaultBoxWithMemo
         showMode
         title="客户信息"
         modeName={DeatailObj.sale_mode_name}
@@ -251,9 +351,9 @@ export default () => {
           <View className={styles.pussName}>{DeatailObj.purchaser_name}</View>
           <View className={styles.pussPhone}>{DeatailObj.purchaser_phone}</View>
         </View>
-      </DefaultBox>
-      <DefaultBox title="退款信息">
-        <GoodsItem list={productList} obj={DeatailObj}></GoodsItem>
+      </DefaultBoxWithMemo>
+      <DefaultBoxWithMemo title="退款信息">
+        <GoodsItemWithMemo list={productList} obj={DeatailObj}></GoodsItemWithMemo>
         <View className={styles.totalBox}>
           <View className={styles.totalLeft}>总计</View>
           <View className={styles.totalRight}>{DeatailObj.total_fabrics} 种面料，{DeatailObj?.total_colors} 种颜色，共 {
@@ -270,8 +370,8 @@ export default () => {
                     </View>
 
         }
-      </DefaultBox>
-      <DefaultBox title="订单信息">
+      </DefaultBoxWithMemo>
+      <DefaultBoxWithMemo title="订单信息">
         {
           orderMsg.map((item, index) => {
             return (
@@ -289,8 +389,8 @@ export default () => {
           })
         }
 
-      </DefaultBox>
-      <DefaultBox title="售后图片">
+      </DefaultBoxWithMemo>
+      <DefaultBoxWithMemo title="售后图片">
         <View className={styles.picBox}>
           {
             DeatailObj?.fabric_piece_accessory_url?.length > 0 && DeatailObj?.fabric_piece_accessory_url.map((item, index) => {
@@ -305,7 +405,7 @@ export default () => {
             DeatailObj?.fabric_piece_accessory_url?.length === 0 && <View className={styles.noPic}>暂无图片</View>
           }
         </View>
-      </DefaultBox>
+      </DefaultBoxWithMemo>
       <View className={styles.safeBox}></View>
 
       <View className={styles.bottomMuck}>
@@ -336,102 +436,4 @@ export default () => {
     </View>
   )
 }
-
-interface Obs {
-  title?: string
-  modeName?: string
-  showMode?: boolean
-  children?: ReactNode
-  clickNode?: () => void
-}
-
-const DefaultBox = memo((props: Obs) => {
-  const {
-    title = '标题',
-    modeName = '大货',
-    showMode = false,
-    children,
-    clickNode,
-  } = props
-
-  return (
-    <View className={styles.defaltBox}>
-      <View className={styles.titleBox}>
-        <View className={styles.title}>{title}</View>
-        {
-          showMode && <View className={styles.modeName} onClick={() => clickNode?.()}>{modeName}</View>
-        }
-      </View>
-      <View className={styles.modeLine}></View>
-      {children}
-    </View>
-  )
-})
-
-interface PropGoods {
-  // item?: {
-  //     code?: string | number
-  // }
-  list: any[]
-  obj: any
-}
-const GoodsItem = memo((porps: PropGoods) => {
-  const { list = [], obj = {} } = porps
-
-  const labAndImgObj = useCallback((item) => {
-    return { lab: item.lab, rgb: item.rgb, texture_url: item.texture_url }
-  }, [])
-  return (
-    <>
-      {
-        list.map((item, index) => {
-          return (
-            <View className={styles.goodsBox} key={index}>
-              <View className={styles.goodsProduct}>{item.code}# {item.name}</View>
-              {
-                item.product_colors.map((it, inx) => {
-                  return (
-                    <View className={styles.itemGoods}>
-                      {
-                        it.texture_url === ''
-                                                && <Image className={styles.itemPic} mode="aspectFill" src="https://test.cdn.zzfzyc.com/mall/no_img.png"></Image>
-                      }
-                      {
-                        it.texture_url !== ''
-                                                && <View className={styles.itemPic}>
-                                                  <LabAndImg value={labAndImgObj(it)} />
-                                                </View>
-                      }
-                      <View className={styles.clear}> </View>
-                      <View className={styles.itemRight}>
-                        <View className={styles.item_right_top}>
-                          <View className={styles.itemName}>{it.code}# {it.name}</View>
-                          {/* <View className={styles.itemNums}>x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'}</View> */}
-                          {
-                            obj.sale_mode == 0 && <View className={styles.itemNums}>x{obj.stage == 0 || obj.stage == 1 || obj.stage == 2
-                              ? it.roll
-                              : obj.stage == 5 || obj.stage == 6 || obj.stage == 3
-                                ? it.return_roll
-                                : it.roll}{obj?.sale_mode == 0 ? '条' : 'm'}</View>
-                          }
-                          {
-                            obj.sale_mode != 0 && <View className={styles.itemNums}>x{it.length / 100}m</View>
-                          }
-                        </View>
-                        <View className={styles.item_right_Bottom}>
-                          <View className={styles.itemMoney}>¥{it.sale_price / 100}/{obj?.sale_mode == 0 ? 'kg' : 'm'}</View>
-                          {/* <View className={styles.itemMoneyOne}>¥{formatPriceDiv(it.total_sale_price)}</View> */}
-                        </View>
-                      </View>
-                    </View>
-                  )
-                })
-              }
-            </View>
-          )
-        })
-      }
-    </>
-
-  )
-})
+export default RefundDetail
diff --git a/src/pages/refundMoneyDetail/components/addressDetailBox/index.tsx b/src/pages/refundMoneyDetail/components/addressDetailBox/index.tsx
index 98a0518..343a1c5 100644
--- a/src/pages/refundMoneyDetail/components/addressDetailBox/index.tsx
+++ b/src/pages/refundMoneyDetail/components/addressDetailBox/index.tsx
@@ -9,7 +9,7 @@ interface propsObj {
   obj: any
   handUp?: (any) => void
 }
-export default memo((props: propsObj) => {
+const AddressDetailBox = (props: propsObj) => {
   const {
     obj = {},
     handUp,
@@ -46,4 +46,5 @@ export default memo((props: propsObj) => {
       </View>
     </View >
   )
-})
+}
+export default memo(AddressDetailBox)
diff --git a/src/pages/refundMoneyDetail/components/orderState/index.tsx b/src/pages/refundMoneyDetail/components/orderState/index.tsx
index d7a721b..97ce19f 100644
--- a/src/pages/refundMoneyDetail/components/orderState/index.tsx
+++ b/src/pages/refundMoneyDetail/components/orderState/index.tsx
@@ -24,8 +24,7 @@ interface Param {
     account_period_time?: string // 还款日期
   }
 }
-
-export default memo(({ orderInfo = { logistics_details: [], payment_method: 0, status: 0 }, onRefresh }: Param) => {
+const OrderState = ({ orderInfo = { logistics_details: [], payment_method: 0, status: 0 }, onRefresh }: Param) => {
   useEffect(() => {
     console.log('orderInfo33::', orderInfo)
   }, [orderInfo])
@@ -48,7 +47,7 @@ export default memo(({ orderInfo = { logistics_details: [], payment_method: 0, s
     <>
       {(dataList?.length > 0) && <View className={styles.order_flow_state}>
         <View className={classnames(styles.order_status_list, showMore && styles.order_status_list_show)}>
-          {dataList.map((item, index) => <View className={styles.order_status_item}>
+          {dataList.map((item, index) => <View className={styles.order_status_item} key={index}>
             {(dataList.length > 1) && <View className={classnames(styles.order_status_tail, (index == 0) && styles.order_status_tail_end)}></View>}
             {(dataList.length != (index + 1)) && <View className={styles.order_status_line}></View>}
             <View className={styles.order_status_content}>
@@ -59,10 +58,11 @@ export default memo(({ orderInfo = { logistics_details: [], payment_method: 0, s
           </View>)}
         </View>
         {(dataList.length > 2) && <View className={styles.more} onClick={() => changeMore()}>
-          <Text>{showMore && '收起详情' || '点击查看详情'}</Text>
+          <Text>{showMore ? '收起详情' : '点击查看详情'}</Text>
           <Text className={classnames('iconfont icon-a-moreback', styles.miconfonts, showMore && styles.open_miconfonts)}></Text>
         </View>}
       </View>}
     </>
   )
-})
+}
+export default memo(OrderState)
diff --git a/src/pages/refundMoneyDetail/index.tsx b/src/pages/refundMoneyDetail/index.tsx
index 9bf836a..c2aa4ff 100644
--- a/src/pages/refundMoneyDetail/index.tsx
+++ b/src/pages/refundMoneyDetail/index.tsx
@@ -8,65 +8,122 @@ import ItemList from './components/itemList'
 import OrderState from './components/orderState'
 import { formatDateTime, formatHashTag, formatImgUrl, formatPriceDiv, formatWeightDiv } from '@/common/format'
 import {
-  mpreturnApplyOrder,
-  returnApplyOrdercancel,
-  returnApplyOrderuploadAccessory,
+  MpReturnApplyOrder,
+  ReturnApplyOrderCancel,
+  ReturnApplyOrderUploadAccessory,
 } from '@/api/refound'
 // import AddressDetailBox from './components/addressDetailBox'
 import { IMG_CND_Prefix } from '@/common/constant'
 import RefundCodelist from '@/components/RefundCodelist'
 import LabAndImg from '@/components/LabAndImg'
 
-export default () => {
-  const router = useRouter()
-  useEffect(() => {
-    getDetail()
+interface Obs {
+  title?: string
+  modeName?: string
+  showMode?: boolean
+  children?: ReactNode
+  clickNode?: () => void
+}
+
+const DefaultBox = (props: Obs) => {
+  const {
+    title = '标题',
+    modeName = '大货',
+    showMode = false,
+    children,
+    clickNode,
+  } = props
+
+  return (
+    <View className={styles.defaltBox}>
+      <View className={styles.titleBox}>
+        <View className={styles.title}>{title}</View>
+        {
+          showMode && <View className={styles.modeName} onClick={() => clickNode?.()}>{modeName}</View>
+        }
+      </View>
+      <View className={styles.modeLine}></View>
+      {children}
+    </View>
+  )
+}
+const DefaultBoxWithMemo = memo(DefaultBox)
+
+interface PropGoods {
+  // item?: {
+  //     code?: string | number
+  // }
+  list: any[]
+  obj: any
+}
+const GoodsItem = (porps: PropGoods) => {
+  const { list = [], obj = {} } = porps
+  const labAndImgObj = useCallback((item) => {
+    return { lab: item.lab, rgb: item.rgb, texture_url: item.texture_url }
   }, [])
-  // 页面下拉刷新
-  usePullDownRefresh(() => {
-    getDetail()
-  })
+  return (
+    <>
+      {
+        list.map((item, index) => {
+          return (
+            <View className={styles.goodsBox} key={index}>
+              <View className={styles.goodsProduct}>{item.code}# {item.name}</View>
+              {
+                item?.product_colors.map((it, inx) => {
+                  return (
+                    <View className={styles.itemGoods} key={inx}>
+                      {
+                        it.texture_url === ''
+                                                && <Image className={styles.itemPic} mode="aspectFill" src="https://test.cdn.zzfzyc.com/mall/no_img.png"></Image>
+                      }
+                      {
+                        it.texture_url !== ''
+                                                && <View className={styles.itemPic}>
+                                                  <LabAndImg value={labAndImgObj(it)} />
+                                                </View>
+                      }
+                      {/* <View className={styles.itemPic} style={{ backgroundColor: `rgb(${it?.rgb?.r} ${it?.rgb?.g} ${it?.rgb?.b})` }}></View> */}
+                      <View className={styles.clear}> </View>
+                      <View className={styles.itemRight}>
+                        <View className={styles.item_right_top}>
+                          <View className={styles.itemName}>{it.code}# {it.name}</View>
+                          {/* <View className={styles.itemNums}>x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'}</View> */}
+                          {
+                            obj.sale_mode == 0 && <View className={styles.itemNums}>x{obj.stage == 0 || obj.stage == 1 || obj.stage == 2
+                              ? it.roll
+                              : obj.stage == 5 || obj.stage == 6 || obj.stage == 3
+                                ? it.return_roll
+                                : it.roll}{obj?.sale_mode == 0 ? '条' : 'm'}</View>
+                          }
+                          {
+                            obj.sale_mode != 0 && <View className={styles.itemNums}>x{it.length / 100}m</View>
+                          }
+                        </View>
+                        <View className={styles.item_right_Bottom}>
+                          <View className={styles.itemMoney}>¥{it.sale_price / 100}/{obj?.sale_mode == 0 ? 'kg' : 'm'}</View>
+                          {/* <View className={styles.itemMoneyOne}>¥{formatPriceDiv(it.total_sale_price)}</View> */}
+                        </View>
+                      </View>
+                    </View>
+                  )
+                })
+              }
+            </View>
+          )
+        })
+      }
+    </>
+
+  )
+}
+const GoodsItemWithMemo = memo(GoodsItem)
+
+const RefundMoneyDetail = () => {
+  const router = useRouter()
 
   // 获取详情
-  const { fetchData: detailFetch } = mpreturnApplyOrder()
+  const { fetchData: detailFetch } = MpReturnApplyOrder()
   const [DeatailObj, setDeatailObj] = useState<any>({})
-  const getDetail = async() => {
-    Taro.showLoading({
-      title: '加载中...',
-      mask: true,
-    })
-    const res = await detailFetch({ id: Number(router.params.id) })
-    if (res.data) {
-      setDeatailObj(res.data)
-      orderMsg.map((it) => {
-        if (it.leftTitle === '售后编号：') {
-          it.rightTitle = res.data.return_order_no
-        }
-        if (it.leftTitle === '订单号：') {
-          it.rightTitle = res.data.order_no
-        }
-        if (it.leftTitle === '退货原因：') {
-          it.rightTitle = res.data.return_reason_name
-        }
-        if (it.leftTitle === '退货说明：') {
-          it.rightTitle = res.data.return_explain_name
-        }
-        if (it.leftTitle === '其他说明：') {
-          it.rightTitle = res.data.reason_describe
-        }
-        // if (it.leftTitle === '货物状况：') {
-        //     it.rightTitle = res.data.goods_status_name
-        // }
-        if (it.leftTitle === '申请时间：') {
-          it.rightTitle = formatDateTime(res.data.apply_time)
-        }
-      })
-      setOrderMsg([...orderMsg])
-      Taro.stopPullDownRefresh()
-      // setPicList([...res.data?.accessory_url !== null ? res.data?.accessory_url : []])
-      Taro.hideLoading()
-    }
-  }
 
   // 分辨用质检中还是质检前的数组
   const productList = useMemo(() => {
@@ -124,9 +181,45 @@ export default () => {
       },
     })
   }
-
+  const getDetail = async() => {
+    Taro.showLoading({
+      title: '加载中...',
+      mask: true,
+    })
+    const res = await detailFetch({ id: Number(router.params.id) })
+    if (res.data) {
+      setDeatailObj(res.data)
+      orderMsg.forEach((it) => {
+        if (it.leftTitle === '售后编号：') {
+          it.rightTitle = res.data.return_order_no
+        }
+        if (it.leftTitle === '订单号：') {
+          it.rightTitle = res.data.order_no
+        }
+        if (it.leftTitle === '退货原因：') {
+          it.rightTitle = res.data.return_reason_name
+        }
+        if (it.leftTitle === '退货说明：') {
+          it.rightTitle = res.data.return_explain_name
+        }
+        if (it.leftTitle === '其他说明：') {
+          it.rightTitle = res.data.reason_describe
+        }
+        // if (it.leftTitle === '货物状况：') {
+        //     it.rightTitle = res.data.goods_status_name
+        // }
+        if (it.leftTitle === '申请时间：') {
+          it.rightTitle = formatDateTime(res.data.apply_time)
+        }
+      })
+      setOrderMsg([...orderMsg])
+      Taro.stopPullDownRefresh()
+      // setPicList([...res.data?.accessory_url !== null ? res.data?.accessory_url : []])
+      Taro.hideLoading()
+    }
+  }
   // 取消退货
-  const { fetchData: cancelFetch } = returnApplyOrdercancel()
+  const { fetchData: cancelFetch } = ReturnApplyOrderCancel()
   const handCancle = async() => {
     Taro.showModal({
       content: '确定要取消吗？',
@@ -193,6 +286,13 @@ export default () => {
     setShowCode(true)
   }
 
+  useEffect(() => {
+    getDetail()
+  }, [])
+  // 页面下拉刷新
+  usePullDownRefresh(() => {
+    getDetail()
+  })
   return (
     <View className={styles.main}>
       <OrderState orderInfo={DeatailObj} />
@@ -200,7 +300,7 @@ export default () => {
                 obj={DeatailObj}
                 handUp={() => handUp(DeatailObj)}
             ></AddressDetailBox> */}
-      <DefaultBox
+      <DefaultBoxWithMemo
         showMode
         title="客户信息"
         modeName={DeatailObj.sale_mode_name}
@@ -209,9 +309,9 @@ export default () => {
           <View className={styles.pussName}>{DeatailObj.purchaser_name}</View>
           <View className={styles.pussPhone}>{DeatailObj.purchaser_phone}</View>
         </View>
-      </DefaultBox>
-      <DefaultBox title="退款信息">
-        <GoodsItem list={productList} obj={DeatailObj}></GoodsItem>
+      </DefaultBoxWithMemo>
+      <DefaultBoxWithMemo title="退款信息">
+        <GoodsItemWithMemo list={productList} obj={DeatailObj}></GoodsItemWithMemo>
         <View className={styles.totalBox}>
           <View className={styles.totalLeft}>总计</View>
           <View className={styles.totalRight}>{DeatailObj.total_fabrics} 种面料，{DeatailObj?.total_colors} 种颜色，共 {
@@ -251,8 +351,8 @@ export default () => {
             }</View>
           </View>
         }
-      </DefaultBox>
-      <DefaultBox title="订单信息">
+      </DefaultBoxWithMemo>
+      <DefaultBoxWithMemo title="订单信息">
         {
           orderMsg.map((item, index) => {
             return (
@@ -270,8 +370,8 @@ export default () => {
           })
         }
 
-      </DefaultBox>
-      <DefaultBox title="售后图片">
+      </DefaultBoxWithMemo>
+      <DefaultBoxWithMemo title="售后图片">
         <View className={styles.picBox}>
           {
             DeatailObj?.fabric_piece_accessory_url?.length > 0 && DeatailObj?.fabric_piece_accessory_url.map((item, index) => {
@@ -286,7 +386,7 @@ export default () => {
             DeatailObj?.fabric_piece_accessory_url?.length === 0 && <View className={styles.noPic}>暂无图片</View>
           }
         </View>
-      </DefaultBox>
+      </DefaultBoxWithMemo>
       <View className={styles.safeBox}></View>
       <View className={styles.bottomMuck}>
         {
@@ -307,102 +407,4 @@ export default () => {
     </View>
   )
 }
-
-interface Obs {
-  title?: string
-  modeName?: string
-  showMode?: boolean
-  children?: ReactNode
-  clickNode?: () => void
-}
-
-const DefaultBox = memo((props: Obs) => {
-  const {
-    title = '标题',
-    modeName = '大货',
-    showMode = false,
-    children,
-    clickNode,
-  } = props
-
-  return (
-    <View className={styles.defaltBox}>
-      <View className={styles.titleBox}>
-        <View className={styles.title}>{title}</View>
-        {
-          showMode && <View className={styles.modeName} onClick={() => clickNode?.()}>{modeName}</View>
-        }
-      </View>
-      <View className={styles.modeLine}></View>
-      {children}
-    </View>
-  )
-})
-
-interface PropGoods {
-  // item?: {
-  //     code?: string | number
-  // }
-  list: any[]
-  obj: any
-}
-const GoodsItem = memo((porps: PropGoods) => {
-  const { list = [], obj = {} } = porps
-  const labAndImgObj = useCallback((item) => {
-    return { lab: item.lab, rgb: item.rgb, texture_url: item.texture_url }
-  }, [])
-  return (
-    <>
-      {
-        list.map((item, index) => {
-          return (
-            <View className={styles.goodsBox} key={index}>
-              <View className={styles.goodsProduct}>{item.code}# {item.name}</View>
-              {
-                item?.product_colors.map((it, inx) => {
-                  return (
-                    <View className={styles.itemGoods}>
-                      {
-                        it.texture_url === ''
-                                                && <Image className={styles.itemPic} mode="aspectFill" src="https://test.cdn.zzfzyc.com/mall/no_img.png"></Image>
-                      }
-                      {
-                        it.texture_url !== ''
-                                                && <View className={styles.itemPic}>
-                                                  <LabAndImg value={labAndImgObj(it)} />
-                                                </View>
-                      }
-                      {/* <View className={styles.itemPic} style={{ backgroundColor: `rgb(${it?.rgb?.r} ${it?.rgb?.g} ${it?.rgb?.b})` }}></View> */}
-                      <View className={styles.clear}> </View>
-                      <View className={styles.itemRight}>
-                        <View className={styles.item_right_top}>
-                          <View className={styles.itemName}>{it.code}# {it.name}</View>
-                          {/* <View className={styles.itemNums}>x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'}</View> */}
-                          {
-                            obj.sale_mode == 0 && <View className={styles.itemNums}>x{obj.stage == 0 || obj.stage == 1 || obj.stage == 2
-                              ? it.roll
-                              : obj.stage == 5 || obj.stage == 6 || obj.stage == 3
-                                ? it.return_roll
-                                : it.roll}{obj?.sale_mode == 0 ? '条' : 'm'}</View>
-                          }
-                          {
-                            obj.sale_mode != 0 && <View className={styles.itemNums}>x{it.length / 100}m</View>
-                          }
-                        </View>
-                        <View className={styles.item_right_Bottom}>
-                          <View className={styles.itemMoney}>¥{it.sale_price / 100}/{obj?.sale_mode == 0 ? 'kg' : 'm'}</View>
-                          {/* <View className={styles.itemMoneyOne}>¥{formatPriceDiv(it.total_sale_price)}</View> */}
-                        </View>
-                      </View>
-                    </View>
-                  )
-                })
-              }
-            </View>
-          )
-        })
-      }
-    </>
-
-  )
-})
+export default RefundMoneyDetail
diff --git a/src/pages/refundPage/components/itemList/index.tsx b/src/pages/refundPage/components/itemList/index.tsx
index 1cca9ab..b7190de 100644
--- a/src/pages/refundPage/components/itemList/index.tsx
+++ b/src/pages/refundPage/components/itemList/index.tsx
@@ -14,8 +14,7 @@ interface propsObj {
   toPay?: (arg: any, obj: any) => void
   handSee?: (any) => void
 }
-
-export default memo((props: propsObj) => {
+const ItemList = (props: propsObj) => {
   const navTo = (e) => {
     if (e.type == 1) {
       Taro.navigateTo({
@@ -124,4 +123,5 @@ export default memo((props: propsObj) => {
       }
     </View>
   )
-})
+}
+export default memo(ItemList)
diff --git a/src/pages/refundPage/components/tabs/index.tsx b/src/pages/refundPage/components/tabs/index.tsx
index 7ce8be6..4bf6cf6 100644
--- a/src/pages/refundPage/components/tabs/index.tsx
+++ b/src/pages/refundPage/components/tabs/index.tsx
@@ -7,7 +7,7 @@ interface Props {
   list: any[]
   handChose?: (any) => void
 }
-export default memo((props: Props) => {
+const Tabs = (props: Props) => {
   const { list = [], handChose } = props
 
   return (
@@ -29,4 +29,5 @@ export default memo((props: Props) => {
       }
     </View >
   )
-})
+}
+export default memo(Tabs)
diff --git a/src/pages/refundPage/index.tsx b/src/pages/refundPage/index.tsx
index 2b5a6de..b195022 100644
--- a/src/pages/refundPage/index.tsx
+++ b/src/pages/refundPage/index.tsx
@@ -12,15 +12,15 @@ import Popup from '@/components/popup'
 import InfiniteScroll from '@/components/infiniteScroll'
 import { formatDateTime, formatHashTag, formatImgUrl, formatPriceDiv, formatWeightDiv } from '@/common/format'
 import {
-  mpenumreturnStage,
-  mpenumreturnType,
-  mpreturnApplyOrderlist,
+  MpEnumReturnStage,
+  MpEnumReturnType,
+  MpReturnApplyOrderList,
 } from '@/api/refound'
 import TimePickerPopup from '@/components/timePickerPopup'
 import IconFont from '@/components/iconfont/iconfont'
 import RefundCodelist from '@/components/RefundCodelist'
 
-export default () => {
+const RefundPage = () => {
   // 页码和页数
 
   const [searchField, setSearchField] = useState<
@@ -47,24 +47,9 @@ export default () => {
   })
   const pageNum = useRef({ size: searchField.size, page: searchField.page })
 
-  // 监听筛选条件变化
-  useEffect(() => {
-    getOrderList()
-  }, [searchField.size, searchField.name, searchField.status])
-
   // 获取订单列表
-  const { fetchData: listFetchData, state: orderState } = mpreturnApplyOrderlist()
+  const { fetchData: listFetchData, state: orderState } = MpReturnApplyOrderList()
   const [orderData, setOrderData] = useState<{ list: any[]; total: number }>({ list: [], total: 0 })
-  const getOrderList = async() => {
-    const res = await listFetchData({
-      ...searchField,
-      // ...getFilterData(searchField),
-      // ...getFilterData(searchObj)
-    })
-    setOrderData(e => ({ ...e, list: res.data?.list, total: res.data?.total }))
-    // setshowPopup(false)
-    setRefresherTriggeredStatus(false)
-  }
 
   // 输入了搜索关键字
   const getSearchData = useCallback((e) => {
@@ -75,12 +60,7 @@ export default () => {
 
   // 列表下拉刷新
   const [refresherTriggeredStatus, setRefresherTriggeredStatus] = useState(false)
-  const getRefresherRefresh = async() => {
-    pageNum.current.size = 1
-    setRefresherTriggeredStatus(true)
-    setSearchField(val => ({ ...val, size: 10 }))
-    getOrderList()
-  }
+
   // 数据加载状态
   const statusMore = useMemo(() => {
     return dataLoadingStatus({ list: orderData.list, total: orderData.total, status: orderState.loading! })
@@ -99,7 +79,7 @@ export default () => {
   const [TarBarList, setTarBarList] = useState<any[]>([{ id: 1, name: '售后申请', showBorder: true }, { id: 2, name: '申请记录', showBorder: false }])
   const handChose = (item) => {
     if (item.id === searchField.status) { return }
-    TarBarList.map((it) => {
+    TarBarList.forEach((it) => {
       if (it.id === item.id) {
         it.showBorder = true
       }
@@ -141,14 +121,10 @@ export default () => {
     setModeList([...modeList])
     setSearchField(e => ({ ...e, sale_mode: item.id }))
   }
-  useEffect(() => {
-    getStagelist()
-    getTypeList()
-  }, [])
 
   // 售后状态
   const [stageList, setStageList] = useState<any[]>([])
-  const { fetchData: stageFetch } = mpenumreturnStage()
+  const { fetchData: stageFetch } = MpEnumReturnStage()
   const getStagelist = async() => {
     const res = await stageFetch()
     if (res.data) {
@@ -178,7 +154,7 @@ export default () => {
 
   // 退款类型
   const [typeList, setTypeList] = useState<any[]>([])
-  const { fetchData: typeFetch } = mpenumreturnType()
+  const { fetchData: typeFetch } = MpEnumReturnType()
   const getTypeList = async() => {
     const res = await typeFetch()
     if (res.data) {
@@ -221,6 +197,59 @@ export default () => {
     }
   }, [searchField])
 
+  // 数组重置
+  const resetArr = (arr) => {
+    arr.map((it) => {
+      it.checked = false
+      return it
+    })
+    return arr
+  }
+
+  // 展示时间筛选
+  const [showTime, setShowTime] = useState(false)
+  // 关闭时间筛选
+  const handClose = () => {
+    setShowTime(false)
+  }
+  const myDate = new Date()
+  const [start, setStart] = useState<any>(myDate.toLocaleDateString())
+  const [end, setEnd] = useState<any>('')
+  // 选择时间
+  const handTime = (eq) => {
+    // 直接进来点确定的时候做处理
+    if (Object.keys(eq).length === 0) {
+      const obj = {
+        start: '',
+        end: '',
+      }
+      obj.start = `${dayjs(new Date(`${myDate?.toLocaleDateString()} ` + '00:00:00')).format('YYYY-MM-DD')} 00:00:00`
+      obj.end = `${dayjs(new Date(obj?.start)).add(1, 'day').format('YYYY-MM-DD')} 00:00:00`
+      eq.value = obj
+    }
+    setSearchField(val => ({ ...val, sale_start_time: eq?.value?.start, sale_end_time: eq?.value?.end, size: 10 }))
+    setStart(eq?.value?.start)
+    setEnd(eq?.value?.end)
+    setShowTime(false)
+  }
+  const getOrderList = async() => {
+    const res = await listFetchData({
+      ...searchField,
+      // ...getFilterData(searchField),
+      // ...getFilterData(searchObj)
+    })
+    setOrderData(e => ({ ...e, list: res.data?.list, total: res.data?.total }))
+    // setshowPopup(false)
+    setRefresherTriggeredStatus(false)
+  }
+  const timeArea = useMemo(() => {
+    if (end !== '') {
+      return `${start}   ` + '-' + `  ${end}`
+    }
+    else {
+      return '自定义起始时间'
+    }
+  }, [end])
   // 重置
   const handReset = () => {
     const arrOne = resetArr(modeList)
@@ -241,59 +270,18 @@ export default () => {
     getOrderList()
     setEnd('')
   }
-
-  // 数组重置
-  const resetArr = (arr) => {
-    arr.map((it) => {
-      it.checked = false
-      return it
-    })
-    return arr
-  }
-
-  // 展示时间筛选
-  const [showTime, setShowTime] = useState(false)
-  // 关闭时间筛选
-  const handClose = () => {
-    setShowTime(false)
-  }
-  let myDate = new Date()
-  const [start, setStart] = useState<any>(myDate.toLocaleDateString())
-  const [end, setEnd] = useState<any>('')
-  // 选择时间
-  const handTime = (eq) => {
-    // 直接进来点确定的时候做处理
-    if (Object.keys(eq).length === 0) {
-      const obj = {
-        start: '',
-        end: '',
-      }
-      obj.start = `${dayjs(new Date(`${myDate?.toLocaleDateString()} ` + '00:00:00')).format('YYYY-MM-DD')} 00:00:00`,
-      obj.end = `${dayjs(new Date(obj?.start)).add(1, 'day').format('YYYY-MM-DD')} 00:00:00`
-      eq.value = obj
-    }
-    setSearchField(val => ({ ...val, sale_start_time: eq?.value?.start, sale_end_time: eq?.value?.end, size: 10 }))
-    setStart(eq?.value?.start)
-    setEnd(eq?.value?.end)
-    setShowTime(false)
-  }
-
-  const timeArea = useMemo(() => {
-    if (end !== '') {
-      return `${start}   ` + '-' + `  ${end}`
-    }
-    else {
-      return '自定义起始时间'
-    }
-  }, [end])
-
   const handSure = () => {
     pageNum.current.page = 1
     setSearchField(val => ({ ...val, size: 10 }))
     setshowPopup?.(false)
     getOrderList()
   }
-
+  const getRefresherRefresh = async() => {
+    pageNum.current.size = 1
+    setRefresherTriggeredStatus(true)
+    setSearchField(val => ({ ...val, size: 10 }))
+    getOrderList()
+  }
   useEffect(() => {
     setSearchField(searchField)
   }, [searchField])
@@ -305,7 +293,14 @@ export default () => {
     setItemInfo(item)
     setShowCode(true)
   }
-
+  useEffect(() => {
+    getStagelist()
+    getTypeList()
+  }, [])
+  // 监听筛选条件变化
+  useEffect(() => {
+    getOrderList()
+  }, [searchField.size, searchField.name, searchField.status])
   return (
     <>
       <View style={{ background: '#FFFFFF', paddingLeft: '20rpx', paddingBottom: '20rpx', position: 'sticky', top: '0', zIndex: '99' }}>
@@ -416,3 +411,5 @@ export default () => {
     </>
   )
 }
+
+export default RefundPage
diff --git a/src/pages/saleStatistic/index.tsx b/src/pages/saleStatistic/index.tsx
index 3eab592..b792d6e 100644
--- a/src/pages/saleStatistic/index.tsx
+++ b/src/pages/saleStatistic/index.tsx
@@ -77,8 +77,278 @@ const FilterTimeOptions = {
   },
 }
 
+// 需要传进来的数据示例
+
+// 需要传进来的表头数据示例
+const productRankingColumns = [
+  {
+    key: 'index',
+    title: '编号',
+    dataIndex: 'index',
+    width: '20%',
+  },
+  {
+    key: 'product_name',
+    title: '面料名称',
+    dataIndex: 'product_name',
+    width: '20%',
+    ellipsis: {
+      isEllipsis: true,
+      rows: 2,
+    },
+  },
+  {
+    key: 'roll',
+    title: '匹数',
+    dataIndex: 'roll',
+    width: '30%',
+  },
+  {
+    key: 'sales_amount',
+    title: '交易金额',
+    dataIndex: 'sales_amount',
+    width: '30%',
+    render: (text: string) => <Text className={styles.amount}>{text}</Text>,
+  },
+]
+
+// 需要传进来的表头数据示例
+const purchaserRankingColumns = [
+  {
+    key: 'index',
+    title: '编号',
+    dataIndex: 'index',
+    width: '20%',
+  },
+  {
+    key: 'purchaser_name',
+    title: '客户名称',
+    dataIndex: 'purchaser_name',
+    width: '20%',
+    ellipsis: {
+      isEllipsis: true,
+      rows: 2,
+    },
+  },
+  {
+    key: 'roll',
+    title: '交易匹数',
+    dataIndex: 'roll',
+    width: '30%',
+  },
+  {
+    key: 'sales_amount',
+    title: '交易金额',
+    dataIndex: 'sales_amount',
+    width: '30%',
+    render: (text: string) => <Text className={styles.amount}>{text}</Text>,
+  },
+]
+
+// 需要传进来的表头数据示例
+const salesmanRankingColumns = [
+  {
+    key: 'index',
+    title: '编号',
+    dataIndex: 'index',
+    width: '20%',
+  },
+  {
+    key: 'sale_user_name',
+    title: '业务员名称',
+    dataIndex: 'sale_user_name',
+    width: '25%',
+    ellipsis: {
+      isEllipsis: true,
+      rows: 2,
+    },
+  },
+  {
+    key: 'roll',
+    title: '销售匹数',
+    dataIndex: 'roll',
+    width: '25%',
+  },
+  {
+    key: 'sales_amount',
+    title: '销售金额',
+    dataIndex: 'sales_amount',
+    width: '30%',
+    render: (text: string) => <Text className={styles.amount}>{text}</Text>,
+  },
+]
+
+const tabsConfig = [
+  {
+    name: '面料',
+    key: 0,
+  },
+  {
+    name: '客户',
+    key: 1,
+  },
+  {
+    name: '业务员',
+    key: 2,
+  },
+]
+
+interface RankingBlockPropsType {
+  saleType?: number | null
+  saleDepartmentId?: number | null
+  date_min?: string
+  date_max?: string
+}
+// 销售排行
+const RankingBlock = (props: RankingBlockPropsType) => {
+  const { saleType, saleDepartmentId, date_min, date_max } = props
+
+  const { fetchData: fetchProductRank } = ProductRankApi()
+  const { fetchData: fetchPurchaserRank } = PurchaserRankApi()
+  const { fetchData: fetchSalesmanRank } = SalesmanRankApi()
+
+  const [limit, setLimit] = useState(defaultLimit)
+
+  const [indicator, setIndicator] = useState<number | null>(null)
+
+  // 切换排行指标
+  const onChangeIndicators = useCallback((indicators: number) => {
+    console.log('indicators', indicators)
+    if (indicators === -1) {
+      setIndicator(null)
+    }
+    else {
+      setIndicator(indicators)
+    }
+  }, [])
+
+  const [currentKey, setCurrentKey] = useState(tabsConfig[0].key)
+
+  const handleClickTab = (event) => {
+    const key = event.target.dataset.key
+    if (key === currentKey) { return }
+    setCurrentKey(key)
+    setLimit(defaultLimit)
+  }
+  const [currentTable, setCurrentTable] = useState<TablePropsType>({
+    columns: productRankingColumns,
+  })
+  const getData = useCallback(
+    async(tabKey: number) => {
+      let res: any
+      const payload = {
+        limit,
+        saleType,
+        saleDepartmentId,
+        date_min,
+        date_max,
+        data_form_status: indicator,
+      }
+      if (tabKey === 0) {
+        res = await fetchProductRank(getFilterData(payload))
+      }
+      else if (tabKey === 1) {
+        res = await fetchPurchaserRank(getFilterData(payload))
+      }
+      else {
+        res = await fetchSalesmanRank(getFilterData(payload))
+      }
+      if (res.data) {
+        console.log('排名', res.data)
+        if (tabKey === 0) {
+          setCurrentTable(() => ({
+            columns: productRankingColumns,
+            dataSource: {
+              list: res.data.list.map((item, index: number) => ({
+                key: index,
+                index: index + 1,
+                product_name: item.product_name || '--',
+                sales_amount: `￥${priceformat(item.sales_amount)}`,
+                roll: dataUnit(item.roll),
+              })),
+              total: res.data.total,
+            },
+          }))
+        }
+        else if (tabKey === 1) {
+          setCurrentTable(() => ({
+            columns: purchaserRankingColumns,
+            dataSource: {
+              list: res.data.list.map((item, index: number) => ({
+                key: index,
+                index: index + 1,
+                purchaser_name: item.purchaser_name || '--',
+                sales_amount: `￥${priceformat(item.sales_amount)}`,
+                roll: dataUnit(item.roll),
+              })),
+              total: res.data.total,
+            },
+          }))
+        }
+        else {
+          setCurrentTable(() => ({
+            columns: salesmanRankingColumns,
+            dataSource: {
+              list: res.data.list.map((item, index: number) => ({
+                key: index,
+                index: index + 1,
+                sale_user_name: item.sale_user_name || '--',
+                sales_amount: `￥${priceformat(item.sales_amount)}`,
+                roll: dataUnit(item.roll),
+              })),
+              total: res.data.total,
+            },
+          }))
+        }
+      }
+    },
+    [limit, saleType, saleDepartmentId, date_min, date_max, indicator],
+  )
+
+  useEffect(() => {
+    getData(currentKey)
+  }, [currentKey, getData])
+
+  const handleLoadMore = () => {
+    console.log('loadmore')
+    // TODO（优化）：结合接口的offset 和 limit 分段请求接口然后通过 push 将旧数据和新数据拼接起来
+    setLimit(v => v + defaultLimit)
+  }
+
+  return (
+    <>
+      {/* 销售排行 */}
+      <LayoutBlock circle flexDirection="col" customStyle={{ padding: 0 }}>
+        <View className={classnames(styles.rankingIndicatorTitle, 'flex-row justify-between')} style={{ position: 'relative' }}>
+          <View className="flex-row items-center">
+            <Iconfont name="icon-paiming" size={32}></Iconfont>
+            <Text className={styles.title}>销售排行</Text>
+          </View>
+          <View style={{ width: '90px' }}>
+            <SelectSaleRankingIndicators onChange={onChangeIndicators} dropDownStyle={{ padding: '16rpx 0' }}></SelectSaleRankingIndicators>
+          </View>
+        </View>
+        <View style={{ padding: '0 32rpx' }}>
+          <Divider direction="horizontal" customStyles={{ margin: '10rpx 0 20rpx 0' }}></Divider>
+          <View className={styles.rankingTabs} onClick={handleClickTab}>
+            {tabsConfig.map((item) => {
+              return (
+                <View data-key={item.key} className={classnames(styles.rankingTab, item.key === currentKey ? styles.active : '')} key={item.key}>
+                  {item.name}
+                </View>
+              )
+            })}
+          </View>
+          <Table columns={currentTable.columns} dataSource={currentTable.dataSource} onLoadMore={handleLoadMore}></Table>
+        </View>
+      </LayoutBlock>
+    </>
+  )
+}
+const RankingBlockWithMemo = memo<RankingBlockPropsType>(RankingBlock)
+
 // 销售统计
-const saleStatistic = () => {
+const SaleStatistic = () => {
   const { fetchData } = SaleOrderDataFormApi()
 
   const [saleType, setSaleType] = useState<number | null>(null)
@@ -88,10 +358,6 @@ const saleStatistic = () => {
     date_max: FilterTimeOptions[0].date_max,
   })
 
-  useEffect(() => {
-    getData()
-  }, [saleType, saleDepartmentId, dateRange])
-
   const getData = async() => {
     const res = await fetchData(
       getFilterData({
@@ -164,14 +430,16 @@ const saleStatistic = () => {
   const selectSaleTypeRef = useRef<any>(null)
   const selectMarketingDepartmentRef = useRef<any>(null)
   const selectTimePickerRef = useRef<any>(null)
-
+  useEffect(() => {
+    getData()
+  }, [saleType, saleDepartmentId, dateRange])
   return (
     <View className={styles.saleStatistic}>
       <View className={styles['saleStatistic--filterBar']}>
         <SelectGroup>
           <SelectSaleType onChange={onChangeSaleType} defaultValue={-1} onCloseOverlay={() => true} ref={selectSaleTypeRef}></SelectSaleType>
           <SelectMarketingDepartment onChange={onChangeDepartment} onCloseOverlay={() => true} ref={selectMarketingDepartmentRef}></SelectMarketingDepartment>
-          <SelectTimePicker onChange={onChangeTimePicker} onCloseOverlay={() => true} defaultValue="0" timeOptions={FilterTimeOptions} ref={selectTimePickerRef}></SelectTimePicker>
+          <SelectTimePicker onChange={onChangeTimePicker} onCloseOverlay={() => true} defaultValue={0} timeOptions={FilterTimeOptions} ref={selectTimePickerRef}></SelectTimePicker>
         </SelectGroup>
       </View>
       <View className={styles['saleStatistic--content']}>
@@ -319,281 +587,10 @@ const saleStatistic = () => {
             )
           })}
         </LayoutBlock>
-        <RankingBlock saleType={saleType} saleDepartmentId={saleDepartmentId} date_min={dateRange.date_min} date_max={dateRange.date_max}></RankingBlock>
+        <RankingBlockWithMemo saleType={saleType} saleDepartmentId={saleDepartmentId} date_min={dateRange.date_min} date_max={dateRange.date_max}></RankingBlockWithMemo>
       </View>
     </View>
   )
 }
 
-// 需要传进来的数据示例
-
-// 需要传进来的表头数据示例
-const productRankingColumns = [
-  {
-    key: 'index',
-    title: '编号',
-    dataIndex: 'index',
-    width: '20%',
-  },
-  {
-    key: 'product_name',
-    title: '面料名称',
-    dataIndex: 'product_name',
-    width: '20%',
-    ellipsis: {
-      isEllipsis: true,
-      rows: 2,
-    },
-  },
-  {
-    key: 'roll',
-    title: '匹数',
-    dataIndex: 'roll',
-    width: '30%',
-  },
-  {
-    key: 'sales_amount',
-    title: '交易金额',
-    dataIndex: 'sales_amount',
-    width: '30%',
-    render: (text: string) => <Text className={styles.amount}>{text}</Text>,
-  },
-]
-
-// 需要传进来的表头数据示例
-const purchaserRankingColumns = [
-  {
-    key: 'index',
-    title: '编号',
-    dataIndex: 'index',
-    width: '20%',
-  },
-  {
-    key: 'purchaser_name',
-    title: '客户名称',
-    dataIndex: 'purchaser_name',
-    width: '20%',
-    ellipsis: {
-      isEllipsis: true,
-      rows: 2,
-    },
-  },
-  {
-    key: 'roll',
-    title: '交易匹数',
-    dataIndex: 'roll',
-    width: '30%',
-  },
-  {
-    key: 'sales_amount',
-    title: '交易金额',
-    dataIndex: 'sales_amount',
-    width: '30%',
-    render: (text: string) => <Text className={styles.amount}>{text}</Text>,
-  },
-]
-
-// 需要传进来的表头数据示例
-const salesmanRankingColumns = [
-  {
-    key: 'index',
-    title: '编号',
-    dataIndex: 'index',
-    width: '20%',
-  },
-  {
-    key: 'sale_user_name',
-    title: '业务员名称',
-    dataIndex: 'sale_user_name',
-    width: '25%',
-    ellipsis: {
-      isEllipsis: true,
-      rows: 2,
-    },
-  },
-  {
-    key: 'roll',
-    title: '销售匹数',
-    dataIndex: 'roll',
-    width: '25%',
-  },
-  {
-    key: 'sales_amount',
-    title: '销售金额',
-    dataIndex: 'sales_amount',
-    width: '30%',
-    render: (text: string) => <Text className={styles.amount}>{text}</Text>,
-  },
-]
-
-const tabsConfig = [
-  {
-    name: '面料',
-    key: 0,
-  },
-  {
-    name: '客户',
-    key: 1,
-  },
-  {
-    name: '业务员',
-    key: 2,
-  },
-]
-
-interface RankingBlockPropsType {
-  saleType?: number | null
-  saleDepartmentId?: number | null
-  date_min?: string
-  date_max?: string
-}
-// 销售排行
-const RankingBlock = memo<RankingBlockPropsType>((props) => {
-  const { saleType, saleDepartmentId, date_min, date_max } = props
-
-  const { fetchData: fetchProductRank } = ProductRankApi()
-  const { fetchData: fetchPurchaserRank } = PurchaserRankApi()
-  const { fetchData: fetchSalesmanRank } = SalesmanRankApi()
-
-  const [limit, setLimit] = useState(defaultLimit)
-
-  const [indicator, setIndicator] = useState<number | null>(null)
-
-  // 切换排行指标
-  const onChangeIndicators = useCallback((indicators: number) => {
-    console.log('indicators', indicators)
-    if (indicators === -1) {
-      setIndicator(null)
-    }
-    else {
-      setIndicator(indicators)
-    }
-  }, [])
-
-  const [currentKey, setCurrentKey] = useState(tabsConfig[0].key)
-
-  const handleClickTab = (event) => {
-    const key = event.target.dataset.key
-    if (key === currentKey) { return }
-    setCurrentKey(key)
-    setLimit(defaultLimit)
-  }
-
-  const getData = useCallback(
-    async(tabKey: number) => {
-      let res: any
-      const payload = {
-        limit,
-        saleType,
-        saleDepartmentId,
-        date_min,
-        date_max,
-        data_form_status: indicator,
-      }
-      if (tabKey === 0) {
-        res = await fetchProductRank(getFilterData(payload))
-      }
-      else if (tabKey === 1) {
-        res = await fetchPurchaserRank(getFilterData(payload))
-      }
-      else {
-        res = await fetchSalesmanRank(getFilterData(payload))
-      }
-      if (res.data) {
-        console.log('排名', res.data)
-        if (tabKey === 0) {
-          setCurrentTable(() => ({
-            columns: productRankingColumns,
-            dataSource: {
-              list: res.data.list.map((item, index: number) => ({
-                key: index,
-                index: index + 1,
-                product_name: item.product_name || '--',
-                sales_amount: `￥${priceformat(item.sales_amount)}`,
-                roll: dataUnit(item.roll),
-              })),
-              total: res.data.total,
-            },
-          }))
-        }
-        else if (tabKey === 1) {
-          setCurrentTable(() => ({
-            columns: purchaserRankingColumns,
-            dataSource: {
-              list: res.data.list.map((item, index: number) => ({
-                key: index,
-                index: index + 1,
-                purchaser_name: item.purchaser_name || '--',
-                sales_amount: `￥${priceformat(item.sales_amount)}`,
-                roll: dataUnit(item.roll),
-              })),
-              total: res.data.total,
-            },
-          }))
-        }
-        else {
-          setCurrentTable(() => ({
-            columns: salesmanRankingColumns,
-            dataSource: {
-              list: res.data.list.map((item, index: number) => ({
-                key: index,
-                index: index + 1,
-                sale_user_name: item.sale_user_name || '--',
-                sales_amount: `￥${priceformat(item.sales_amount)}`,
-                roll: dataUnit(item.roll),
-              })),
-              total: res.data.total,
-            },
-          }))
-        }
-      }
-    },
-    [limit, saleType, saleDepartmentId, date_min, date_max, indicator],
-  )
-
-  useEffect(() => {
-    getData(currentKey)
-  }, [currentKey, getData])
-
-  const handleLoadMore = () => {
-    console.log('loadmore')
-    // TODO（优化）：结合接口的offset 和 limit 分段请求接口然后通过 push 将旧数据和新数据拼接起来
-    setLimit(v => v + defaultLimit)
-  }
-
-  const [currentTable, setCurrentTable] = useState<TablePropsType>({
-    columns: productRankingColumns,
-  })
-
-  return (
-    <>
-      {/* 销售排行 */}
-      <LayoutBlock circle flexDirection="col" customStyle={{ padding: 0 }}>
-        <View className={classnames(styles.rankingIndicatorTitle, 'flex-row justify-between')} style={{ position: 'relative' }}>
-          <View className="flex-row items-center">
-            <Iconfont name="icon-paiming" size={32}></Iconfont>
-            <Text className={styles.title}>销售排行</Text>
-          </View>
-          <View style={{ width: '90px' }}>
-            <SelectSaleRankingIndicators onChange={onChangeIndicators} dropDownStyle={{ padding: '16rpx 0' }}></SelectSaleRankingIndicators>
-          </View>
-        </View>
-        <View style={{ padding: '0 32rpx' }}>
-          <Divider direction="horizontal" customStyles={{ margin: '10rpx 0 20rpx 0' }}></Divider>
-          <View className={styles.rankingTabs} onClick={handleClickTab}>
-            {tabsConfig.map((item) => {
-              return (
-                <View data-key={item.key} className={classnames(styles.rankingTab, item.key === currentKey ? styles.active : '')} key={item.key}>
-                  {item.name}
-                </View>
-              )
-            })}
-          </View>
-          <Table columns={currentTable.columns} dataSource={currentTable.dataSource} onLoadMore={handleLoadMore}></Table>
-        </View>
-      </LayoutBlock>
-    </>
-  )
-})
-
-export default saleStatistic
+export default SaleStatistic
diff --git a/src/pages/saleuserPage/index.tsx b/src/pages/saleuserPage/index.tsx
index d66da09..296d921 100644
--- a/src/pages/saleuserPage/index.tsx
+++ b/src/pages/saleuserPage/index.tsx
@@ -4,11 +4,11 @@ import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import classnames from 'classnames'
 import styles from './index.module.scss'
 import Search from '@/components/search'
-import { mpenumsaleUserlist } from '@/api/order'
+import { MpEnumSaleUserList } from '@/api/order'
 import InfiniteScroll from '@/components/infiniteScroll'
 import { dataLoadingStatus, getFilterData } from '@/common/util'
 
-export default () => {
+const SaleUserPage = () => {
   const [search, setSearch] = useState({
     name: null,
     page: 1,
@@ -16,7 +16,7 @@ export default () => {
   })
   const [clentList, setClientlist] = useState<{ list: any[]; total: number }>({ list: [], total: 0 })
 
-  const { fetchData: clitentFetch, state: orderState } = mpenumsaleUserlist()
+  const { fetchData: clitentFetch, state: orderState } = MpEnumSaleUserList()
   // 数据加载状态
   const statusMore = useMemo(() => {
     return dataLoadingStatus({ list: clentList.list, total: clentList.total, status: orderState.loading! })
@@ -27,6 +27,7 @@ export default () => {
     saleuserName: '',
   })
 
+  const pageNum = useRef({ size: search.size, page: search.page })
   // 输入了搜索关键字
   const getSearchData = useCallback((eq) => {
     pageNum.current.page = 1
@@ -36,15 +37,7 @@ export default () => {
 
   const router = useRouter()
 
-  useEffect(() => {
-    if (search.name === '') {
-      setSearch(e => ({ ...e, name: null }))
-    }
-    if (search.name !== '') { getCuss() }
-  }, [search])
-
   // 上拉加载数据
-  const pageNum = useRef({ size: search.size, page: search.page })
   const getScrolltolower = useCallback(() => {
     if (clentList.list.length < clentList.total) {
       pageNum.current.page++
@@ -113,6 +106,13 @@ export default () => {
       })
     }
   }, [clientObj])
+
+  useEffect(() => {
+    if (search.name === '') {
+      setSearch(e => ({ ...e, name: null }))
+    }
+    if (search.name !== '') { getCuss() }
+  }, [search])
   return (
     <View className={styles.cussBox}>
       <View className={styles.searchBox}>
@@ -146,3 +146,5 @@ export default () => {
     </View>
   )
 }
+
+export default SaleUserPage
diff --git a/src/pages/searchPage/index.tsx b/src/pages/searchPage/index.tsx
index ece313a..c9ba099 100644
--- a/src/pages/searchPage/index.tsx
+++ b/src/pages/searchPage/index.tsx
@@ -6,15 +6,15 @@ import styles from './index.module.scss'
 import Goods from './components/goods'
 import Search from '@/components/search'
 import Empty from '@/components/empty'
-import { mpproductlist } from '@/api/search'
+import { MpProductList } from '@/api/search'
 import { debounce, getFilterData } from '@/common/util'
 import ShopCart from '@/components/shoppingCart'
 import {
   ClientListApi,
-  mpproductcolorlist,
-  mpsearchHistory,
-  mpsearchHistorylist
-  , mpshoppingCartproductColorlist,
+  MpProductColorList,
+  MpSearchHistory,
+  MpSearchHistoryList
+  , MpShoppingCartProductColorList,
 } from '@/api/order'
 
 const SearchPage = () => {
@@ -78,7 +78,7 @@ const SearchPage = () => {
   const [showShopCart, setShowShopCart] = useState(false)
 
   // 获取商品
-  const { fetchData: colorlistFetch } = mpproductcolorlist()
+  const { fetchData: colorlistFetch } = MpProductColorList()
   const getGoodList = async() => {
     const res = await colorlistFetch({ product_id: search.goodsId, sale_mode: search.modeId, code_or_name: search.code_or_name, physical_warehouse: search?.physical_warehouse, purchaser_id: clientObj?.clientId })
     res.data.list.map((item) => {
@@ -107,7 +107,7 @@ const SearchPage = () => {
   }, [search])
 
   // 加入购物车
-  const { fetchData: preViewFetch } = mpshoppingCartproductColorlist()
+  const { fetchData: preViewFetch } = MpShoppingCartProductColorList()
   const handSure = async() => {
     const arr = goodList.filter((item) => {
       return item.showInput
@@ -199,13 +199,22 @@ const SearchPage = () => {
       if (item.id === it.id) {
         item.nums--
         if (search.modeId == 0) {
-          if (item.nums < 1) { it.showInput = false, it.nums = 1 }
+          if (item.nums < 1) {
+            it.showInput = false
+            it.nums = 1
+          }
         }
         if (search.modeId == 1) {
-          if (item.nums < 0.5) { it.showInput = false, it.nums = 0.5 }
+          if (item.nums < 0.5) {
+            it.showInput = false
+            it.nums = 0.5
+          }
         }
         if (search.modeId == 2) {
-          if (item.nums < 3) { it.showInput = false, it.nums = 3 }
+          if (item.nums < 3) {
+            it.showInput = false
+            it.nums = 3
+          }
         }
       }
       return item
@@ -236,7 +245,7 @@ const SearchPage = () => {
 
   // 获取关键字数据
   const [histroyList, setHistroyList] = useState<any[]>([])
-  const { fetchData: historyFetch } = mpsearchHistorylist()
+  const { fetchData: historyFetch } = MpSearchHistoryList()
   const getHistory = async() => {
     Taro.showLoading({
       title: '加载中...',
@@ -258,8 +267,8 @@ const SearchPage = () => {
   }, [])
 
   // 搜索获取商品数据
-  const { fetchData: productFetch } = mpproductlist()
-  const { fetchData: historyputFetch } = mpsearchHistory()
+  const { fetchData: productFetch } = MpProductList()
+  const { fetchData: historyputFetch } = MpSearchHistory()
   const getProduct = debounce(async(e) => {
     Taro.showLoading({
       title: '加载中...',
diff --git a/src/pages/shopping/components/bottomEditBar/index.tsx b/src/pages/shopping/components/bottomEditBar/index.tsx
index 56c7e82..12fd75d 100644
--- a/src/pages/shopping/components/bottomEditBar/index.tsx
+++ b/src/pages/shopping/components/bottomEditBar/index.tsx
@@ -11,8 +11,7 @@ interface PropsType {
   disabled?: boolean
   isSelectAll?: boolean
 }
-
-export default (props: PropsType) => {
+const BottomEditBar = (props: PropsType) => {
   const { onDelete, onSelectCheckbox, disabled = false, isSelectAll: selectAll = false } = props
   const dispatch = useShoppingDispatch()
   console.log('isSelectAll==>', selectAll)
@@ -57,3 +56,5 @@ export default (props: PropsType) => {
     </View>
   )
 }
+
+export default BottomEditBar
diff --git a/src/pages/shopping/components/bottomSettleBar/index.tsx b/src/pages/shopping/components/bottomSettleBar/index.tsx
index 3ff555c..0912520 100644
--- a/src/pages/shopping/components/bottomSettleBar/index.tsx
+++ b/src/pages/shopping/components/bottomSettleBar/index.tsx
@@ -8,8 +8,7 @@ interface PropsType {
   amount?: number
   onSettleAccount?: Function
 }
-
-export default (props: PropsType) => {
+const BottomSettleBar = (props: PropsType) => {
   const { onSettleAccount, amount = 0 } = props
 
   const handleSettle = () => {
@@ -36,3 +35,5 @@ export default (props: PropsType) => {
     </View>
   )
 }
+
+export default BottomSettleBar
diff --git a/src/pages/shopping/components/colorKindItem/index.tsx b/src/pages/shopping/components/colorKindItem/index.tsx
index 2d51f8f..2121c87 100644
--- a/src/pages/shopping/components/colorKindItem/index.tsx
+++ b/src/pages/shopping/components/colorKindItem/index.tsx
@@ -43,11 +43,6 @@ const ColorKindItem: FC<PropsType> = (props) => {
     return itemData.sale_mode == EnumSaleMode.Bulk ? itemData.roll : formatMeterDiv(itemData.length)
   }
 
-  useEffect(() => {
-    console.log('itemData==>', itemData)
-    setCount(formatCount(itemData))
-  }, [itemData.roll, itemData.length])
-
   const [count, setCount] = useState(formatCount(itemData))
 
   // 格式化金额
@@ -111,7 +106,10 @@ const ColorKindItem: FC<PropsType> = (props) => {
   const labAndImgObj = useCallback((item) => {
     return { lab: item.lab, rgb: item.rgb, texture_url: item.product_color_texture_url }
   }, [])
-
+  useEffect(() => {
+    console.log('itemData==>', itemData)
+    setCount(formatCount(itemData))
+  }, [itemData.roll, itemData.length])
   return (
     <MCheckbox
       status={isChecked}
diff --git a/src/pages/shopping/components/shoppingCartItem/index.tsx b/src/pages/shopping/components/shoppingCartItem/index.tsx
index baa2b94..d1c6c8d 100644
--- a/src/pages/shopping/components/shoppingCartItem/index.tsx
+++ b/src/pages/shopping/components/shoppingCartItem/index.tsx
@@ -23,6 +23,11 @@ import LoadingCard from '@/components/loadingCard'
 import { ShoppingCartListApi } from '@/api'
 import { usePropsValue } from '@/use/useCommon'
 
+enum BackEndSaleModeListFieldMap {
+  bulk_color_list = 0,
+  length_cut_color_list = 1,
+  weight_cut_color_list = 2,
+}
 interface ButtonPropsType {
   isActive: boolean
   onClick?: Function
@@ -43,19 +48,138 @@ const SaleModeButton: FC<ButtonPropsType> = (props) => {
   )
 }
 
-const DrawerButton = memo<{ isOpen: boolean }>(({ isOpen }) => {
+const DrawerButton = ({ isOpen }: { isOpen: boolean }) => {
   return (
     <View className={styles.drawerButton}>
       {isOpen ? <IconFont name="icon-shouqi" size={52}></IconFont> : <IconFont name="icon-zhankai" size={52}></IconFont>}
     </View>
   )
-})
-
-enum BackEndSaleModeListFieldMap {
-  bulk_color_list = 0,
-  length_cut_color_list = 1,
-  weight_cut_color_list = 2,
 }
+const DrawerButtonWithMemo = memo(DrawerButton)
+
+interface GoodsListPropType {
+  itemData?: ShoppingCartData
+  multipleSelection?: GoodsMeta['multipleSelection']
+  selected: EnumSaleMode
+  isPending: boolean
+  startTransition: React.TransitionStartFunction
+}
+const GoodsList = (props: GoodsListPropType) => {
+  const { itemData, selected, isPending, startTransition, multipleSelection } = props
+  const prevMultipleSelection = useRef(multipleSelection)
+  const currentSelected = useRef<EnumSaleMode | null>(null)
+
+  const dispatch = useShoppingDispatch()
+
+  const [component, setComponent] = useState<JSX.Element | null>(null)
+  // 使用 produce 更新特定的 ColorKindItem
+  const updateSpecifiedComponent = () => {
+    let newId
+    if (multipleSelection && prevMultipleSelection.current !== multipleSelection) {
+      for (const key in multipleSelection) {
+        if (!prevMultipleSelection.current?.hasOwnProperty(key)) {
+          newId = key
+          break
+        }
+      }
+    }
+    console.log('multipleSelection==+>', multipleSelection)
+    console.log('currentSelected', currentSelected.current, selected)
+    console.log('component', component)
+    if (component) {
+      if (itemData?.[BackEndSaleModeListFieldMap[selected]].length !== 0) {
+        setComponent(produce(component, (draft) => {
+          console.log('prev', component)
+          const index = (draft as unknown as any[]).findIndex(item => item.key === newId)
+          console.log('index', index)
+          if (index !== -1) {
+            const item = itemData?.[BackEndSaleModeListFieldMap[selected]].find((item) => {
+              return item.id === Number(newId)
+            })
+            console.log('item', item, newId)
+            draft![index] = <ColorKindItem checked={multipleSelection?.hasOwnProperty(newId)} purchaserId={itemData?.purchaser_id} key={newId} itemData={item}></ColorKindItem>
+          }
+        }))
+      }
+      else {
+        setComponent(<View className={styles.noList}>暂无数据</View>)
+      }
+    }
+    prevMultipleSelection.current = multipleSelection
+  }
+  // 更新 GoodsList 组件
+  const updateComponent = () => {
+    setComponent(
+      () => itemData?.[BackEndSaleModeListFieldMap[selected]].length !== 0
+        ? (
+          itemData?.[BackEndSaleModeListFieldMap[selected]].map((item) => {
+            console.log('item===>', item, multipleSelection?.hasOwnProperty(item.id))
+            return <ColorKindItem checked={multipleSelection?.hasOwnProperty(item.id)} purchaserId={itemData.purchaser_id} key={item.id} itemData={item}></ColorKindItem>
+          })
+        )
+        : (
+          <View className={styles.noList}>暂无数据</View>
+        ),
+    )
+    prevMultipleSelection.current = multipleSelection
+  }
+
+  useEffect(() => {
+    const newGoodsKind = Object.fromEntries(
+      itemData?.[BackEndSaleModeListFieldMap[selected]].map(item => [
+        item?.id,
+        {
+          id: item?.id,
+          estimate_amount: item.estimate_amount,
+          product_code: item.product_code,
+          product_color_code: item.product_color_code,
+          sale_mode: item.sale_mode,
+          count: selected === EnumSaleMode.Bulk ? item.roll : Number(formatMeterDiv(item.length)),
+        },
+      ]),
+    )
+    // 这里做一层比较是为了 重新渲染的时候如果没有切换订单类型的话就不让面料的选中状态初始化
+    if (currentSelected.current === selected) {
+      dispatch({
+        type: ShoppingDispatchType.UPDATE_CHANGED_CHECKBOX,
+        data: {
+          purchaserId: itemData?.purchaser_id as number,
+          goodsKind: newGoodsKind,
+          multipleSelection,
+        },
+      })
+      updateComponent()
+    }
+    else {
+      currentSelected.current = selected
+      // 重新把当前的选中状态赋值给ref 作为下一次比较的旧状态
+      dispatch({
+        type: ShoppingDispatchType.UPDATE_CHANGED_CHECKBOX,
+        data: {
+          purchaserId: itemData?.purchaser_id as number,
+          goodsKind: newGoodsKind,
+          multipleSelection: {},
+        },
+      })
+      startTransition(updateComponent)
+    }
+  }, [itemData, selected, multipleSelection])
+
+  return (
+    <>
+      {isPending
+        ? (
+          <View className={styles.noList} style={{ margin: '60rpx 0' }}>
+            <LoadingCard />
+          </View>
+        )
+        : (
+          component
+        )}
+    </>
+  )
+}
+const GoodsListWithMemo = memo<GoodsListPropType>(GoodsList)
 
 interface PropsType {
   itemData?: ShoppingCartData
@@ -79,13 +203,9 @@ const ShoppingCartItem: FC<PropsType> = (props) => {
 
   const [openDetail, setOpenDetail] = useState(false)
 
-  const handleOpenDetail = () => {
-    setOpenDetail(isOpen => !isOpen)
-    handleClickLayout()
-  }
-
   const [selected, setSelect] = useState<EnumSaleMode>(0)
 
+  const [isPending, startTransition] = useTransition()
   const onSelectOrderType = (type: EnumSaleMode) => {
     if (isPending) { return }
     setSelect(type)
@@ -107,7 +227,10 @@ const ShoppingCartItem: FC<PropsType> = (props) => {
     })
     dispatch({ type: ShoppingDispatchType.UPDATE_MULTIPLE_SELECTION_STATUS, data: false })
   }
-
+  const handleOpenDetail = () => {
+    setOpenDetail(isOpen => !isOpen)
+    handleClickLayout()
+  }
   // 统计已选面料
   const materialChecked = useMemo(() => {
     if (!multipleSelection || isEmptyObject(multipleSelection)) { return 0 }
@@ -146,7 +269,6 @@ const ShoppingCartItem: FC<PropsType> = (props) => {
     )
   }, [multipleSelection, currentCheckedPurchaserId, selected, itemData])
 
-  const [isPending, startTransition] = useTransition()
   const { fetchData } = ShoppingCartListApi()
   // 更新当前客户的多选项
   const updatePurchaserMultipleSelection = (purchaserId, payload, operationType: OperationType, goodsId: number) => {
@@ -268,7 +390,7 @@ const ShoppingCartItem: FC<PropsType> = (props) => {
             </Text>
           </View>
         </View>
-        <DrawerButton isOpen={openDetail} />
+        <DrawerButtonWithMemo isOpen={openDetail} />
       </View>
       {/* 减少节点渲染 */}
       {openDetail && (
@@ -313,7 +435,7 @@ const ShoppingCartItem: FC<PropsType> = (props) => {
               </View>
             </View>
             <View className={styles.orderContainer}>
-              <GoodsList
+              <GoodsListWithMemo
                 multipleSelection={multipleSelection}
                 itemData={itemData}
                 selected={selected}
@@ -328,128 +450,6 @@ const ShoppingCartItem: FC<PropsType> = (props) => {
   )
 }
 
-interface GoodsListPropType {
-  itemData?: ShoppingCartData
-  multipleSelection?: GoodsMeta['multipleSelection']
-  selected: EnumSaleMode
-  isPending: boolean
-  startTransition: React.TransitionStartFunction
-}
-const GoodsList = memo<GoodsListPropType>((props) => {
-  const { itemData, selected, isPending, startTransition, multipleSelection } = props
-  const prevMultipleSelection = useRef(multipleSelection)
-  const currentSelected = useRef<EnumSaleMode | null>(null)
-
-  const dispatch = useShoppingDispatch()
-
-  const [component, setComponent] = useState<JSX.Element | null>(null)
-  // 使用 produce 更新特定的 ColorKindItem
-  const updateSpecifiedComponent = () => {
-    let newId
-    if (multipleSelection && prevMultipleSelection.current !== multipleSelection) {
-      for (const key in multipleSelection) {
-        if (!prevMultipleSelection.current?.hasOwnProperty(key)) {
-          newId = key
-          break
-        }
-      }
-    }
-    console.log('multipleSelection==+>', multipleSelection)
-    console.log('currentSelected', currentSelected.current, selected)
-    console.log('component', component)
-    if (component) {
-      if (itemData?.[BackEndSaleModeListFieldMap[selected]].length !== 0) {
-        setComponent(produce(component, (draft) => {
-          console.log('prev', component)
-          const index = (draft as unknown as any[]).findIndex(item => item.key === newId)
-          console.log('index', index)
-          if (index !== -1) {
-            const item = itemData?.[BackEndSaleModeListFieldMap[selected]].find((item) => {
-              return item.id === Number(newId)
-            })
-            console.log('item', item, newId)
-            draft![index] = <ColorKindItem checked={multipleSelection?.hasOwnProperty(newId)} purchaserId={itemData?.purchaser_id} key={newId} itemData={item}></ColorKindItem>
-          }
-        }))
-      }
-      else {
-        setComponent(<View className={styles.noList}>暂无数据</View>)
-      }
-    }
-    prevMultipleSelection.current = multipleSelection
-  }
-  // 更新 GoodsList 组件
-  const updateComponent = () => {
-    setComponent(
-      () => itemData?.[BackEndSaleModeListFieldMap[selected]].length !== 0
-        ? (
-          itemData?.[BackEndSaleModeListFieldMap[selected]].map((item) => {
-            console.log('item===>', item, multipleSelection?.hasOwnProperty(item.id))
-            return <ColorKindItem checked={multipleSelection?.hasOwnProperty(item.id)} purchaserId={itemData.purchaser_id} key={item.id} itemData={item}></ColorKindItem>
-          })
-        )
-        : (
-          <View className={styles.noList}>暂无数据</View>
-        ),
-    )
-    prevMultipleSelection.current = multipleSelection
-  }
-
-  useEffect(() => {
-    const newGoodsKind = Object.fromEntries(
-      itemData?.[BackEndSaleModeListFieldMap[selected]].map(item => [
-        item?.id,
-        {
-          id: item?.id,
-          estimate_amount: item.estimate_amount,
-          product_code: item.product_code,
-          product_color_code: item.product_color_code,
-          sale_mode: item.sale_mode,
-          count: selected === EnumSaleMode.Bulk ? item.roll : Number(formatMeterDiv(item.length)),
-        },
-      ]),
-    )
-    // 这里做一层比较是为了 重新渲染的时候如果没有切换订单类型的话就不让面料的选中状态初始化
-    if (currentSelected.current === selected) {
-      dispatch({
-        type: ShoppingDispatchType.UPDATE_CHANGED_CHECKBOX,
-        data: {
-          purchaserId: itemData?.purchaser_id!,
-          goodsKind: newGoodsKind,
-          multipleSelection,
-        },
-      })
-      updateComponent()
-    }
-    else {
-      currentSelected.current = selected
-      // 重新把当前的选中状态赋值给ref 作为下一次比较的旧状态
-      dispatch({
-        type: ShoppingDispatchType.UPDATE_CHANGED_CHECKBOX,
-        data: {
-          purchaserId: itemData?.purchaser_id!,
-          goodsKind: newGoodsKind,
-          multipleSelection: {},
-        },
-      })
-      startTransition(updateComponent)
-    }
-  }, [itemData, selected, multipleSelection])
-
-  return (
-    <>
-      {isPending
-        ? (
-          <View className={styles.noList} style={{ margin: '60rpx 0' }}>
-            <LoadingCard />
-          </View>
-        )
-        : (
-          component
-        )}
-    </>
-  )
-})
 // State 分割组件 思路就是把 context 直接通过 props 的形式传给组件，这样的话就解决了 context 强制刷新 memo 的问题了
 // 那么当 context 内的 value 被更新的时候，react 只会强制渲染 Wrapper
 const withStateSlice = (comp, slice) => {
diff --git a/src/pages/shopping/index.tsx b/src/pages/shopping/index.tsx
index 5be4970..3524374 100644
--- a/src/pages/shopping/index.tsx
+++ b/src/pages/shopping/index.tsx
@@ -18,29 +18,6 @@ import IconText from '@/components/iconText'
 import Search from '@/components/search'
 import { alert, goLink, isEmptyObject } from '@/common/common'
 
-export const Shopping: FC = memo(() => {
-  // 计算总的预估金额
-  const handleTriggerCheckbox = ({ multipleSelection, setSelectedAmount }) => {
-    console.log('handleTriggerCheckbox==>', multipleSelection)
-
-    if (multipleSelection) {
-      const result = Object.values(multipleSelection).reduce((prev: number, value: Goods) => {
-        return prev + Number(formatPriceDiv(value.estimate_amount))
-      }, 0) as number
-      // 同步修改上下文的 预估金额
-      setSelectedAmount(result)
-    }
-    else {
-      setSelectedAmount(0)
-    }
-  }
-  return (
-    <ShoppingProvider onTriggerCheckbox={handleTriggerCheckbox}>
-      <ShoppingCartContainer />
-    </ShoppingProvider>
-  )
-})
-
 interface SearchOptions {
   short_name_or_phone?: string
 }
@@ -272,5 +249,27 @@ const ShoppingCartContainer: FC = () => {
     </View>
   )
 }
+export const Shopping: FC = () => {
+  // 计算总的预估金额
+  const handleTriggerCheckbox = ({ multipleSelection, setSelectedAmount }) => {
+    console.log('handleTriggerCheckbox==>', multipleSelection)
 
-export default Shopping
+    if (multipleSelection) {
+      const result = Object.values(multipleSelection).reduce((prev: number, value: Goods) => {
+        return prev + Number(formatPriceDiv(value.estimate_amount))
+      }, 0) as number
+      // 同步修改上下文的 预估金额
+      setSelectedAmount(result)
+    }
+    else {
+      setSelectedAmount(0)
+    }
+  }
+  return (
+    <ShoppingProvider onTriggerCheckbox={handleTriggerCheckbox}>
+      <ShoppingCartContainer />
+    </ShoppingProvider>
+  )
+}
+
+export default memo(Shopping)
diff --git a/src/pages/submitOrder/index.tsx b/src/pages/submitOrder/index.tsx
index 7d20bec..6d8fbed 100644
--- a/src/pages/submitOrder/index.tsx
+++ b/src/pages/submitOrder/index.tsx
@@ -9,57 +9,99 @@ import styles from './index.module.scss'
 import Popup from '@/components/popup'
 import { debounce } from '@/common/util'
 import {
-  mpsaleOrderpost,
-  mpsaleOrderpreView,
+  MpSaleOrderPost,
+  MpSaleOrderPreview,
 } from '@/api/order'
 import { alert } from '@/common/common'
 import { formatDateTime, formatPriceDiv, formatWeightDiv } from '@/common/format'
 import IconFont from '@/components/iconfont/iconfont'
 
-export default () => {
+// 卡片盒子元素
+interface Obs {
+  title?: string
+  modeName?: string
+  showMode?: boolean
+  children?: ReactNode
+  clickNode?: () => void
+}
+
+const DefaultBox = (props: Obs) => {
+  const {
+    title = '标题',
+    modeName = '大货',
+    showMode = false,
+    children,
+    clickNode,
+  } = props
+
+  return (
+    <View className={styles.defaltBox}>
+      <View className={styles.titleBox}>
+        <View className={styles.title}>{title}</View>
+        {
+          showMode && <View className={styles.modeName} onClick={() => clickNode?.()}>{modeName}</View>
+        }
+      </View>
+      <View className={styles.modeLine}></View>
+      {children}
+    </View>
+  )
+}
+const DefaultBoxWithMemo = memo(DefaultBox)
+
+// 产品商品元素
+interface PropGoods {
+  // item?: {
+  //     code?: string | number
+  // }
+  list: any[]
+  obj: {
+    sale_mode?: number | string
+  }
+}
+const GoodsItem = (porps: PropGoods) => {
+  const { list = [], obj = {} } = porps
+  return (
+    <>
+      {
+        list.map((item, index) => {
+          return (
+            <View className={styles.goodsBox} key={index}>
+              <View className={styles.goodsProduct}>{item.code}# {item.name}</View>
+              <View className={styles.goodsLine}></View>
+              {
+                item.product_colors.map((it, inx) => {
+                  return (
+                    <View className={styles.itemGoods} key={inx}>
+                      <View className={styles.itemPic} style={{ backgroundColor: `rgb(${it?.rgb?.r} ${it?.rgb?.g} ${it?.rgb?.b})` }}></View>
+                      <View className={styles.itemRight}>
+                        <View className={styles.item_right_top}>
+                          <View className={styles.itemName}>{it.code} {it.name}</View>
+                          <View className={styles.itemNums}>x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'}</View>
+                        </View>
+                        <View className={styles.item_right_Bottom}>
+                          <View className={styles.itemMoney}>¥{it.sale_price / 100}/{obj?.sale_mode === 1 ? 'm' : 'kg'}</View>
+                          <View className={styles.itemMoneyOne}>¥{formatPriceDiv(it.estimate_amount)}</View>
+                        </View>
+                      </View>
+                    </View>
+                  )
+                })
+              }
+            </View>
+          )
+        })
+      }
+    </>
+
+  )
+}
+const GoodsItemWithMemo = memo(GoodsItem)
+
+const SubmitOrder = () => {
   const router: any = useRouter()
   const [infoObj, setInfoObj] = useState<any>({})
   let selectId = -1
-  useDidShow(() => {
-    // 获取选择的地址
-    const pages = Taro.getCurrentPages()
-    const currPage = pages[pages.length - 1] // 获取当前页面
-    setInfoObj(val => ({
-      ...val,
-      sale_mode: Number(router.params.sale_mode),
-      province_name: currPage.data?.addressObj?.province_name ? currPage.data?.addressObj?.province_name : '',
-      address_id: currPage.data?.addressObj?.id ? currPage.data?.addressObj?.id : '',
-      city_name: currPage.data?.addressObj?.city_name ? currPage.data?.addressObj?.city_name : '',
-      address_detail: currPage.data?.addressObj?.address_detail ? currPage.data?.addressObj?.address_detail : '',
-      district_name: currPage.data?.addressObj?.district_name ? currPage.data?.addressObj?.district_name : '',
-      target_user_name: currPage.data?.addressObj?.name ? currPage.data?.addressObj?.name : '',
-      purchaser_phone: currPage.data?.addressObj?.phone ? currPage.data?.addressObj?.phone : '',
-    }))
-    selectId = currPage.data?.addressObj?.id
-    const obj = currPage?.data?.ids?.filter((item) => { return item == selectId })
-    if (currPage?.data?.ids && obj.length === 0) {
-      setInfoObj(val => ({
-        ...val,
-        sale_mode: Number(router.params.sale_mode),
-        province_name: '',
-        address_id: '',
-        city_name: '',
-        address_detail: '',
-        district_name: '',
-        target_user_name: '',
-        purchaser_phone: '',
-      }))
-    }
-    if (!currPage.data?.addressObj) {
-      setReceivingStatus(1)
-    }
-    else {
-      setReceivingStatus(2)
-    }
-  })
-  useEffect(() => {
-    getDetail()
-  }, [])
 
   // 收货方法,1:自提，2物流
   const [receivingStatus, setReceivingStatus] = useState<any>(null)
@@ -78,7 +120,7 @@ export default () => {
     Taro.hideLoading()
   }, 300)
 
-  const { fetchData: infoFetch } = mpsaleOrderpreView()
+  const { fetchData: infoFetch } = MpSaleOrderPreview()
   const [pussName, setPusername] = useState<String>('')
   // 获取订单详情
   const getDetail = async() => {
@@ -116,7 +158,7 @@ export default () => {
   }
 
   // 提交订单
-  const { fetchData: postFetch } = mpsaleOrderpost()
+  const { fetchData: postFetch } = MpSaleOrderPost()
   const handSure = () => {
     if (receivingStatus == 2 && !infoObj.address_id) {
       return alert.error('请选择地址')
@@ -174,6 +216,46 @@ export default () => {
   useEffect(() => {
     setInfoObj(infoObj)
   }, [infoObj])
+  useDidShow(() => {
+    // 获取选择的地址
+    const pages = Taro.getCurrentPages()
+    const currPage = pages[pages.length - 1] // 获取当前页面
+    setInfoObj(val => ({
+      ...val,
+      sale_mode: Number(router.params.sale_mode),
+      province_name: currPage.data?.addressObj?.province_name ? currPage.data?.addressObj?.province_name : '',
+      address_id: currPage.data?.addressObj?.id ? currPage.data?.addressObj?.id : '',
+      city_name: currPage.data?.addressObj?.city_name ? currPage.data?.addressObj?.city_name : '',
+      address_detail: currPage.data?.addressObj?.address_detail ? currPage.data?.addressObj?.address_detail : '',
+      district_name: currPage.data?.addressObj?.district_name ? currPage.data?.addressObj?.district_name : '',
+      target_user_name: currPage.data?.addressObj?.name ? currPage.data?.addressObj?.name : '',
+      purchaser_phone: currPage.data?.addressObj?.phone ? currPage.data?.addressObj?.phone : '',
+    }))
+    selectId = currPage.data?.addressObj?.id
+    const obj = currPage?.data?.ids?.filter((item) => { return item == selectId })
+    if (currPage?.data?.ids && obj.length === 0) {
+      setInfoObj(val => ({
+        ...val,
+        sale_mode: Number(router.params.sale_mode),
+        province_name: '',
+        address_id: '',
+        city_name: '',
+        address_detail: '',
+        district_name: '',
+        target_user_name: '',
+        purchaser_phone: '',
+      }))
+    }
+    if (!currPage.data?.addressObj) {
+      setReceivingStatus(1)
+    }
+    else {
+      setReceivingStatus(2)
+    }
+  })
+  useEffect(() => {
+    getDetail()
+  }, [])
   return (
     <View className={styles.mainBox}>
       <AddressDetailBox
@@ -182,7 +264,7 @@ export default () => {
         receivingStatus={receivingStatus}
         onReceivingStatus={(e, value) => onReceivingStatus(e, value)}
       ></AddressDetailBox>
-      <DefaultBox
+      <DefaultBoxWithMemo
         showMode
         title="客户信息"
         modeName={infoObj.sale_mode_name}
@@ -191,10 +273,10 @@ export default () => {
           <View className={styles.pussName}>{pussName}</View>
           {/* <View className={styles.pussPhone}>{infoObj.purchaser_phone}</View> */}
         </View>
-      </DefaultBox>
+      </DefaultBoxWithMemo>
       {/* <View className={styles.total}> {infoObj.product_list?.length} 种面料，{infoObj.total_colors} 个颜色，共 {infoObj.sale_mode === 0 ? infoObj.total_number : infoObj.total_number / 100} {infoObj.sale_mode === 0 ? '条' : 'm'}</View> */}
       <View className={styles.productBox}>
-        <GoodsItem list={infoObj?.product_list} obj={infoObj}></GoodsItem>
+        <GoodsItemWithMemo list={infoObj?.product_list} obj={infoObj}></GoodsItemWithMemo>
         <View className={styles.flexMoney}>
           <View className={styles.flexTotalBox}>
             <View className={styles.totalFont}>合计金额</View>
@@ -204,9 +286,9 @@ export default () => {
           <View className={styles.shoudPay}>¥{formatPriceDiv(infoObj.estimate_amount)}</View>
         </View>
       </View>
-      <DefaultBox title="备注信息" showMode modeName={`${'填写/修改备注'} >`} clickNode={() => setShowDesc(true)}>
+      <DefaultBoxWithMemo title="备注信息" showMode modeName={`${'填写/修改备注'} >`} clickNode={() => setShowDesc(true)}>
         <View className={styles.remarkFont}>{infoObj.remark === '' ? '暂无' : infoObj.remark}</View>
-      </DefaultBox>
+      </DefaultBoxWithMemo>
       <Popup show={showDesc} showTitle={false} onClose={() => setShowDesc(false)}>
         <Remark onSave={e => getRemark(e)} defaultValue={infoObj.remark} showInput={!!showDesc} />
       </Popup>
@@ -224,83 +306,4 @@ export default () => {
     </View>
   )
 }
-
-// 卡片盒子元素
-interface Obs {
-  title?: string
-  modeName?: string
-  showMode?: boolean
-  children?: ReactNode
-  clickNode?: () => void
-}
-
-const DefaultBox = memo((props: Obs) => {
-  const {
-    title = '标题',
-    modeName = '大货',
-    showMode = false,
-    children,
-    clickNode,
-  } = props
-
-  return (
-    <View className={styles.defaltBox}>
-      <View className={styles.titleBox}>
-        <View className={styles.title}>{title}</View>
-        {
-          showMode && <View className={styles.modeName} onClick={() => clickNode?.()}>{modeName}</View>
-        }
-      </View>
-      <View className={styles.modeLine}></View>
-      {children}
-    </View>
-  )
-})
-
-// 产品商品元素
-interface PropGoods {
-  // item?: {
-  //     code?: string | number
-  // }
-  list: any[]
-  obj: {
-    sale_mode?: number | string
-  }
-}
-const GoodsItem = memo((porps: PropGoods) => {
-  const { list = [], obj = {} } = porps
-  return (
-    <>
-      {
-        list.map((item, index) => {
-          return (
-            <View className={styles.goodsBox} key={index}>
-              <View className={styles.goodsProduct}>{item.code}# {item.name}</View>
-              <View className={styles.goodsLine}></View>
-              {
-                item.product_colors.map((it, inx) => {
-                  return (
-                    <View className={styles.itemGoods}>
-                      <View className={styles.itemPic} style={{ backgroundColor: `rgb(${it?.rgb?.r} ${it?.rgb?.g} ${it?.rgb?.b})` }}></View>
-                      <View className={styles.itemRight}>
-                        <View className={styles.item_right_top}>
-                          <View className={styles.itemName}>{it.code} {it.name}</View>
-                          <View className={styles.itemNums}>x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'}</View>
-                        </View>
-                        <View className={styles.item_right_Bottom}>
-                          <View className={styles.itemMoney}>¥{it.sale_price / 100}/{obj?.sale_mode === 1 ? 'm' : 'kg'}</View>
-                          <View className={styles.itemMoneyOne}>¥{formatPriceDiv(it.estimate_amount)}</View>
-                        </View>
-                      </View>
-                    </View>
-                  )
-                })
-              }
-            </View>
-          )
-        })
-      }
-    </>
-
-  )
-})
+export default SubmitOrder
diff --git a/src/pages/takeDelivery/components/DeliveryStatusList/index.tsx b/src/pages/takeDelivery/components/DeliveryStatusList/index.tsx
index 2929646..1aff9af 100644
--- a/src/pages/takeDelivery/components/DeliveryStatusList/index.tsx
+++ b/src/pages/takeDelivery/components/DeliveryStatusList/index.tsx
@@ -6,7 +6,7 @@ interface PropsType {
   onChangeStatus?: (data: { id: number; name: string }) => void
 }
 
-const DeliveryStatusList = memo<PropsType>((props) => {
+const DeliveryStatusList = (props: PropsType) => {
   const { onChangeStatus } = props
   const { fetchData } = EnumTakeGoodsOrderStatus()
   const [statusList, setStatusList] = useState([
@@ -38,5 +38,5 @@ const DeliveryStatusList = memo<PropsType>((props) => {
     [onChangeStatus],
   )
   return <SegmentedControl list={statusList} onSelect={changeStatus} defaultId={statusList[0].id} />
-})
-export default DeliveryStatusList
+}
+export default memo<PropsType>(DeliveryStatusList)
diff --git a/src/pages/takeDelivery/components/Filter/index.tsx b/src/pages/takeDelivery/components/Filter/index.tsx
index 035785f..4c4b21f 100644
--- a/src/pages/takeDelivery/components/Filter/index.tsx
+++ b/src/pages/takeDelivery/components/Filter/index.tsx
@@ -60,7 +60,7 @@ export const filterTimeOptions = {
   },
 } as const
 
-const DeliveryFilter = memo<DeliveryPropsType>((props) => {
+const DeliveryFilter = (props: DeliveryPropsType) => {
   const { onSearchTime, onConfirm, onCancal, onReset } = props
 
   const { fetchData, state } = EnumTakeGoodsOrderTypeList()
@@ -83,17 +83,15 @@ const DeliveryFilter = memo<DeliveryPropsType>((props) => {
     return state.data.list
   }, [state])
 
+  const getEnumData = async() => {
+    await fetchData()
+  }
   useEffect(() => {
     if (!typeList?.length) {
       getEnumData()
       console.log('getEnumData')
     }
   }, [typeList])
-
-  const getEnumData = async() => {
-    await fetchData()
-  }
-
   const [customTime, setCustomTime] = useState({
     date_min: undefined,
     date_max: undefined,
@@ -135,9 +133,9 @@ const DeliveryFilter = memo<DeliveryPropsType>((props) => {
             不限
           </FilterButton>
           {!!typeList?.length
-            && typeList?.map((item) => {
+            && typeList?.map((item, key) => {
               return (
-                <FilterButton isActive={searchFilter.take_goods_order_type === item?.id} onClick={() => handleSelectedType(item?.id)}>
+                <FilterButton key={key} isActive={searchFilter.take_goods_order_type === item?.id} onClick={() => handleSelectedType(item?.id)}>
                   {item.name}
                 </FilterButton>
                 // <NormalButton type='info' circle onClick={() => handleSelectedType(item?.id)}>
@@ -151,9 +149,9 @@ const DeliveryFilter = memo<DeliveryPropsType>((props) => {
       <View className={styles.filterItem}>
         <View className={styles['filterItem--title']}>查询日期</View>
         <View className={classnames(styles['filterItem--wrapper'], styles['filter--time'])}>
-          {Object.entries(filterTimeOptions).map(([key, value]) => {
+          {Object.entries(filterTimeOptions).map(([key, value], index) => {
             return (
-              <FilterButton isActive={searchFilter.timeKey === key} onClick={() => handleSelectedTime(key)}>
+              <FilterButton key={index} isActive={searchFilter.timeKey === key} onClick={() => handleSelectedTime(key)}>
                 {value.name}
               </FilterButton>
             )
@@ -173,6 +171,6 @@ const DeliveryFilter = memo<DeliveryPropsType>((props) => {
       </View>
     </>
   )
-})
+}
 
-export default DeliveryFilter
+export default memo<DeliveryPropsType>(DeliveryFilter)
diff --git a/src/pages/takeDelivery/components/remark/index.tsx b/src/pages/takeDelivery/components/remark/index.tsx
index 4b64487..c4a1d9d 100644
--- a/src/pages/takeDelivery/components/remark/index.tsx
+++ b/src/pages/takeDelivery/components/remark/index.tsx
@@ -8,17 +8,13 @@ interface Param {
   onSave?: (val: string) => void
   defaultValue?: string
 }
-export default ({ onBlur, onSave, defaultValue = '' }: Param) => {
+const Remark = ({ onBlur, onSave, defaultValue = '' }: Param) => {
   const [descData, setDescData] = useState({
     number: 0,
     value: '',
     count: 200,
   })
 
-  useEffect(() => {
-    getDesc(defaultValue)
-  }, [defaultValue])
-
   const getDesc = (value) => {
     let res = value
     if (value.length > descData.count) {
@@ -30,6 +26,9 @@ export default ({ onBlur, onSave, defaultValue = '' }: Param) => {
   const setSave = () => {
     onSave?.(descData.value)
   }
+  useEffect(() => {
+    getDesc(defaultValue)
+  }, [defaultValue])
   return (
     <View className={styles.order_popup}>
       <View className={styles.order_popup_title}>编辑备注</View>
@@ -41,3 +40,5 @@ export default ({ onBlur, onSave, defaultValue = '' }: Param) => {
     </View>
   )
 }
+
+export default Remark
diff --git a/src/pages/takeDelivery/index.tsx b/src/pages/takeDelivery/index.tsx
index 475d083..cb00aae 100644
--- a/src/pages/takeDelivery/index.tsx
+++ b/src/pages/takeDelivery/index.tsx
@@ -53,19 +53,6 @@ const Delivery: FC = () => {
     console.log('searchValue==>', searchValue)
   }, [])
 
-  useEffect(() => {
-    console.log('useEffect ===> search', search)
-    //  已经不是第一次加载该页面了
-    if (!isFirst.current) {
-      getData()
-    }
-  }, [search])
-
-  useDidShow(() => {
-    getData()
-    isFirst.current = false
-  })
-
   // 上拉加载数据
   const pageNum = useRef({ size: search.size, page: search.page })
 
@@ -172,11 +159,22 @@ const Delivery: FC = () => {
       </View>
     )
   }
+  useEffect(() => {
+    console.log('useEffect ===> search', search)
+    //  已经不是第一次加载该页面了
+    if (!isFirst.current) {
+      getData()
+    }
+  }, [search])
 
+  useDidShow(() => {
+    getData()
+    isFirst.current = false
+  })
   return (
     <View className={styles.delivery}>
       <View className={styles.searchBox}>
-        <Search placeholder="请输入或扫描条形码" showBtn={false} changeOnSearch={getSearchData} debounceTime={300} customRightSlot={scanIcon()}>
+        <Search placeholder="请输入或扫描条形码" showBtn={false} changeOnSearch={getSearchData} customRightSlot={scanIcon()}>
           <View onClick={onShowFilter} className={styles.icon__filter}>
             <IconText svg iconName="icon-shaixuan" text="筛选" customClass={styles['icon--filter']} />
           </View>
diff --git a/src/pages/takeDeliveryDetail/index.tsx b/src/pages/takeDeliveryDetail/index.tsx
index afede8e..4764a4a 100644
--- a/src/pages/takeDeliveryDetail/index.tsx
+++ b/src/pages/takeDeliveryDetail/index.tsx
@@ -44,9 +44,9 @@ const TakeDeliveryDetail: FC = () => {
   const DetailItem = useMemo(() => {
     const element
       = !!detailInfo?.dyelot_number_list?.length
-      && detailInfo?.dyelot_number_list.map((weightItem) => {
+      && detailInfo?.dyelot_number_list.map((weightItem, key) => {
         return (
-          <View className={styles.detailInfo}>
+          <View className={styles.detailInfo} key={key}>
             <Divider direction="horizontal" customClassName={styles.divider}></Divider>
             <View className={styles.detailInfoItem}>
               <View className={styles['detailInfoItem--title']}>
diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx
index 589f5ae..eef6295 100644
--- a/src/pages/user/index.tsx
+++ b/src/pages/user/index.tsx
@@ -6,6 +6,10 @@ import { useDispatch } from 'react-redux'
 import type { Dispatch } from 'redux'
 import defaultAvatar from '../../styles/image/defaultAvatar.png'
 import styles from './index.module.scss'
+import { checkKey, goLink } from '@/common/common'
+import type { TabBarAction } from '@/reducers/tabBar'
+import { TabBarIndex } from '@/reducers/tabBar'
+import { TabBarType } from '@/constants/tabbar'
 import NormalButton from '@/components/normalButton'
 import Tag from '@/components/tag'
 import Divider from '@/components/Divider'
@@ -13,11 +17,16 @@ import LayoutBlock from '@/components/layoutBlock'
 import IconCard from '@/components/iconCard'
 import type { IconNames } from '@/components/iconfont/iconfont'
 import useUserInfo from '@/use/useUserInfo'
-import { checkKey, goLink } from '@/common/common'
-import type { TabBarAction } from '@/reducers/tabBar'
-import { TabBarIndex } from '@/reducers/tabBar'
-import { TabBarType } from '@/constants/tabbar'
 
+// 用户头像
+const UserAvatar = ({ src }: { src?: string }) => {
+  return (
+    <View className={styles.userAvatar}>
+      <Image className="full-100" src={src || defaultAvatar} />
+      {src ? null : <Text className={styles['userAvatar-text']}>编辑</Text>}
+    </View>
+  )
+}
 interface IconCardType {
   jurisdiction?: string // 权限key值
   iconName: IconNames
@@ -196,8 +205,8 @@ const UserInfo: FC = () => {
         !!Features.length && <LayoutBlock circle>
           <View className={styles.layoutTitle}>功能特色</View>
           <View className={styles['grid-container']}>
-            {Features.map((item) => {
-              return <IconCard iconName={item.iconName} title={item.name} onClick={() => handleClickIconCard(item)}></IconCard>
+            {Features.map((item, key) => {
+              return <IconCard key={key} iconName={item.iconName} title={item.name} onClick={() => handleClickIconCard(item)}></IconCard>
             })}
           </View>
         </LayoutBlock>
@@ -206,8 +215,8 @@ const UserInfo: FC = () => {
         !!Coloring.length && <LayoutBlock circle>
           <View className={styles.layoutTitle}>布料取色</View>
           <View className={styles['grid-container']}>
-            {Coloring.map((item) => {
-              return <IconCard iconName={item.iconName} title={item.name} onClick={() => handleClickIconCard(item)}></IconCard>
+            {Coloring.map((item, key) => {
+              return <IconCard key={key} iconName={item.iconName} title={item.name} onClick={() => handleClickIconCard(item)}></IconCard>
             })}
           </View>
         </LayoutBlock>
@@ -216,8 +225,8 @@ const UserInfo: FC = () => {
         !!Statistics.length && <LayoutBlock circle>
           <View className={styles.layoutTitle}>统计分析</View>
           <View className={styles['grid-container']}>
-            {Statistics.map((item) => {
-              return <IconCard iconName={item.iconName} title={item.name} onClick={() => handleClickIconCard(item)}></IconCard>
+            {Statistics.map((item, key) => {
+              return <IconCard key={key} iconName={item.iconName} title={item.name} onClick={() => handleClickIconCard(item)}></IconCard>
             })}
           </View>
         </LayoutBlock>
@@ -226,15 +235,6 @@ const UserInfo: FC = () => {
     </>
   )
 }
-// 用户头像
-const UserAvatar = ({ src }) => {
-  return (
-    <View className={styles.userAvatar}>
-      <Image className="full-100" src={src || defaultAvatar} />
-      {src ? null : <Text className={styles['userAvatar-text']}>编辑</Text>}
-    </View>
-  )
-}
 
 // 我的
 const User = () => {
diff --git a/src/reducers/userInfo.ts b/src/reducers/userInfo.ts
index 5d61739..0b2a830 100644
--- a/src/reducers/userInfo.ts
+++ b/src/reducers/userInfo.ts
@@ -14,6 +14,7 @@ export interface UserParam {
   user_id?: string
   user_name?: number
   avatar_url?: string
+  phone?: string
 }
 
 export interface UserAdminParam {
diff --git a/src/store/index.ts b/src/store/index.ts
index c8c7122..aaa7b73 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -24,4 +24,4 @@ const enhancer = composeEnhancers(
 export default function configStore() {
   const store = createStore(rootReducer, enhancer)
   return store
-}
+}
diff --git a/src/use/BlueToothCopy.tsx b/src/use/BlueToothCopy.tsx
index a34611d..60b76b9 100644
--- a/src/use/BlueToothCopy.tsx
+++ b/src/use/BlueToothCopy.tsx
@@ -69,8 +69,10 @@ const stateObj: stateStype = {
   // 取色仪主动返回的数据
   deviceLab: null,
 }
-
-export default (props) => {
+interface PropsType {
+  children?: React.ReactNode
+}
+const BlueToothCopy = (props: PropsType) => {
   const refStatus = useRef(stateObj)
   const [state, setState] = useState(refStatus.current)
 
@@ -78,6 +80,31 @@ export default (props) => {
     refStatus.current = { ...refStatus.current, ...obj }
     setState({ ...refStatus.current })
   }
+  /** 打开蓝牙适配器 */
+  const openAdapter = () => {
+    return new Promise((resolve, reject) => {
+      Taro.openBluetoothAdapter({
+        success: resolve,
+        fail: reject,
+      })
+    })
+  }
+  const subscribe = (cb) => {
+    if (cb) {
+      changeStatus({
+        listeners: refStatus.current.listeners.add(cb),
+      })
+    }
+  }
+  /**
+   * 推送事件
+   * @param {{type: string; data: any}} event
+   */
+  const emit = (event) => {
+    refStatus.current.listeners.forEach((cb) => {
+      cb && cb(event)
+    })
+  }
 
   const init = async() => {
     try {
@@ -123,34 +150,6 @@ export default (props) => {
     })
   }
 
-  /** 打开蓝牙适配器 */
-  const openAdapter = () => {
-    return new Promise((resolve, reject) => {
-      Taro.openBluetoothAdapter({
-        success: resolve,
-        fail: reject,
-      })
-    })
-  }
-
-  /**
-   * 推送事件
-   * @param {{type: string; data: any}} event
-   */
-  const emit = (event) => {
-    refStatus.current.listeners.forEach((cb) => {
-      cb && cb(event)
-    })
-  }
-
-  const subscribe = (cb) => {
-    if (cb) {
-      changeStatus({
-        listeners: refStatus.current.listeners.add(cb),
-      })
-    }
-  }
-
   /**
    * 获取蓝牙适配器状态
    * @returns {Promise<{discovering: boolean; available: boolean}>}
@@ -164,6 +163,15 @@ export default (props) => {
     })
   }
 
+  // 获取搜索到的设备
+  const getDevices = (res) => {
+    res.devices.forEach((device) => {
+      // 排除掉已搜索到的设备和名称不合法的设备, 将新发现的设备添加到列表中
+      if (/^CM/.test(device.name) && !refStatus.current.devices.find(i => i.deviceId === device.deviceId)) {
+        changeStatus({ devices: [...refStatus.current.devices, device] })
+      }
+    })
+  }
   /**
    * 启动设备扫描
    * @param {(res: { devices: { name: string, deviceId: string, RSSI: number }[] }) => void} cb
@@ -189,17 +197,6 @@ export default (props) => {
       }
     })
   }
-
-  // 获取搜索到的设备
-  const getDevices = (res) => {
-    res.devices.forEach((device) => {
-      // 排除掉已搜索到的设备和名称不合法的设备, 将新发现的设备添加到列表中
-      if (/^CM/.test(device.name) && !refStatus.current.devices.find(i => i.deviceId === device.deviceId)) {
-        changeStatus({ devices: [...refStatus.current.devices, device] })
-      }
-    })
-  }
-
   /**
    * 连接设备
    * @param {{ name: string, deviceId: string, RSSI: number }} device
@@ -354,6 +351,7 @@ export default (props) => {
    * @returns {Promise<Uint8Array>}
    */
   function exec(command) {
+    // eslint-disable-next-line no-async-promise-executor
     return new Promise(async(resolve, reject) => {
       if (refStatus.current.command) {
         reject(new Error('正在执行其他命令'))
@@ -478,6 +476,7 @@ export default (props) => {
     />
   )
 }
+export default BlueToothCopy
 
 export const useBluetoothTwo = () => {
   const res = React.useContext<any>(Context)
diff --git a/src/use/contextBlueTooth.tsx b/src/use/contextBlueTooth.tsx
index 66f9a9e..411dd55 100644
--- a/src/use/contextBlueTooth.tsx
+++ b/src/use/contextBlueTooth.tsx
@@ -69,8 +69,7 @@ const stateObj: BluetoothStateType = {
   // 取色仪主动返回的数据
   deviceLab: null,
 }
-
-export default (props) => {
+const ContextBlueTooth = (props) => {
   const refStatus = useRef(stateObj)
   const [state, setState] = useState(refStatus.current)
 
@@ -79,50 +78,6 @@ export default (props) => {
     setState({ ...refStatus.current })
   }
 
-  const init = async() => {
-    try {
-      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) => {
-      if (ev.type === 'stateUpdate') {
-        // 蓝牙状态发生的变化
-        changeStatus({ discovering: ev.detail.discovering, available: ev.detail.available })
-      }
-      else if (ev.type === 'disconnect' && refStatus.current.connected && refStatus.current.connected.deviceId === ev.detail.deviceId) {
-        // 断开连接
-        changeStatus({
-          connected: null,
-          serviceId: null,
-          characteristicId: null,
-          deviceLab: null,
-          devices: [],
-        })
-        Taro.showToast({ icon: 'none', title: '蓝牙连接已断开' })
-      }
-      else if (ev.type === 'connected' && refStatus.current.connecting) {
-        // 连接成功
-        changeStatus({ connected: refStatus.current.connecting, connecting: null })
-        Taro.showToast({ title: '蓝牙已连接' })
-      }
-      else if (ev.type === 'measure') {
-        // 监听取色仪主动推送lab
-        await measureAndGetLab()
-      }
-    })
-  }
-
   /** 打开蓝牙适配器 */
   const openAdapter = () => {
     return new Promise((resolve, reject) => {
@@ -151,6 +106,50 @@ export default (props) => {
     }
   }
 
+  const init = async() => {
+    try {
+      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) => {
+      if (ev.type === 'stateUpdate') {
+        // 蓝牙状态发生的变化
+        changeStatus({ discovering: ev.detail.discovering, available: ev.detail.available })
+      }
+      else if (ev.type === 'disconnect' && refStatus.current.connected && refStatus.current.connected.deviceId === ev.detail.deviceId) {
+        // 断开连接
+        changeStatus({
+          connected: null,
+          serviceId: null,
+          characteristicId: null,
+          deviceLab: null,
+          devices: [],
+        })
+        Taro.showToast({ icon: 'none', title: '蓝牙连接已断开' })
+      }
+      else if (ev.type === 'connected' && refStatus.current.connecting) {
+        // 连接成功
+        changeStatus({ connected: refStatus.current.connecting, connecting: null })
+        Taro.showToast({ title: '蓝牙已连接' })
+      }
+      else if (ev.type === 'measure') {
+        // 监听取色仪主动推送lab
+        await measureAndGetLab()
+      }
+    })
+  }
+
   /**
    * 获取蓝牙适配器状态
    * @returns {Promise<{discovering: boolean; available: boolean}>}
@@ -164,6 +163,15 @@ export default (props) => {
     })
   }
 
+  // 获取搜索到的设备
+  const getDevices = (res) => {
+    res.devices.forEach((device) => {
+      // 排除掉已搜索到的设备和名称不合法的设备, 将新发现的设备添加到列表中
+      if (/^CM/.test(device.name) && !refStatus.current.devices.find(i => i.deviceId === device.deviceId)) {
+        changeStatus({ devices: [...refStatus.current.devices, device] })
+      }
+    })
+  }
   /**
    * 启动设备扫描
    * @param {(res: { devices: { name: string, deviceId: string, RSSI: number }[] }) => void} cb
@@ -189,17 +197,6 @@ export default (props) => {
       }
     })
   }
-
-  // 获取搜索到的设备
-  const getDevices = (res) => {
-    res.devices.forEach((device) => {
-      // 排除掉已搜索到的设备和名称不合法的设备, 将新发现的设备添加到列表中
-      if (/^CM/.test(device.name) && !refStatus.current.devices.find(i => i.deviceId === device.deviceId)) {
-        changeStatus({ devices: [...refStatus.current.devices, device] })
-      }
-    })
-  }
-
   /**
    * 连接设备
    * @param {{ name: string, deviceId: string, RSSI: number }} device
@@ -212,7 +209,7 @@ export default (props) => {
       await discoverService(device.deviceId)
       await discoverCharacteristic(device.deviceId)
       await notifyCharacteristicValueChange(device.deviceId)
-    }
+    }
     catch (e) {
       changeStatus({ connecting: null })
       Taro.showToast({ icon: 'none', title: '蓝牙连接失败' })
@@ -273,7 +270,7 @@ export default (props) => {
           const service = services.find(i => refStatus.current.serviceRule.test(i.uuid))
           if (!service) {
             reject(new Error('服务不可用'))
-          }
+          }
           else {
             changeStatus({ serviceId: service.uuid })
             resolve(service)
@@ -294,7 +291,7 @@ export default (props) => {
           const characteristic = characteristics.find(i => refStatus.current.characteristicRule.test(i.uuid))
           if (!characteristic) {
             reject(new Error('特征不可用'))
-          }
+          }
           else {
             changeStatus({ characteristicId: characteristic.uuid })
             resolve(characteristic)
@@ -332,13 +329,13 @@ export default (props) => {
       if (refStatus.current.command.isComplete) {
         if (refStatus.current.command.isValid && refStatus.current.responseResolve) {
           refStatus.current.responseResolve(refStatus.current.command.response)
-        }
+        }
         else if (!refStatus.current.command.isValid) {
           refStatus.current.responseReject(new Error('无效数据'))
         }
         resetCommand()
       }
-    }
+    }
     else {
       const uint8Array = new Uint8Array(buffer)
       if (uint8Array[0] === 0xBB && uint8Array[1] === 1 && uint8Array[3] === 0) {
@@ -354,10 +351,11 @@ export default (props) => {
    * @returns {Promise<Uint8Array>}
    */
   function exec(command) {
+    // eslint-disable-next-line no-async-promise-executor
     return new Promise(async(resolve, reject) => {
       if (refStatus.current.command) {
         reject(new Error('正在执行其他命令'))
-      }
+      }
       else {
         try {
           refStatus.current.command = command
@@ -369,7 +367,7 @@ export default (props) => {
           if (command.responseSize <= 0) {
             resolve(true)
             resetCommand()
-          }
+          }
           else {
             refStatus.current.responseReject = reject
             refStatus.current.responseResolve = resolve
@@ -378,7 +376,7 @@ export default (props) => {
               resetCommand()
             }, command.timeout)
           }
-        }
+        }
         catch (e) {
           reject(e)
         }
@@ -478,12 +476,13 @@ export default (props) => {
     />
   )
 }
+export default ContextBlueTooth
 
 export const useBluetooth = () => {
   const res = React.useContext<any>(Context)
   if (res) {
     return { ...res }
-  }
+  }
   else {
     return {}
   }
diff --git a/src/use/useCheckAuthorize.tsx b/src/use/useCheckAuthorize.tsx
index a5ad7c7..075cadc 100644
--- a/src/use/useCheckAuthorize.tsx
+++ b/src/use/useCheckAuthorize.tsx
@@ -23,32 +23,34 @@ interface Param {
 export default ({ scope, msg }: Param) => {
   // 这个hook微信授权检查授权
   const check = useCallback(() => {
-    return new Promise((reslove, reject) => {
+    return new Promise((resolve, reject) => {
       Taro.getSetting({
         success: (res) => {
           if (res.authSetting[scope]) {
-            reslove(true)
-          }
+            resolve(true)
+          }
           else if (res.authSetting[scope] === undefined) {
             Taro.authorize({
               scope,
               success() {
-                reslove(true)
+                resolve(true)
               },
               fail() {
                 alert.none(msg)
+                // eslint-disable-next-line prefer-promise-reject-errors
                 reject(false)
               },
             })
-          }
+          }
           else {
             Taro.openSetting({
               success(res) {
                 if (res.authSetting[scope]) {
-                  reslove(true)
-                }
+                  resolve(true)
+                }
                 else {
                   alert.none(msg)
+                  // eslint-disable-next-line prefer-promise-reject-errors
                   reject(false)
                 }
               },
diff --git a/src/use/useCommon.ts b/src/use/useCommon.ts
index 6b8168e..8c7e88b 100644
--- a/src/use/useCommon.ts
+++ b/src/use/useCommon.ts
@@ -1,6 +1,6 @@
 import { useRouter } from '@tarojs/taro'
 import dayjs from 'dayjs'
-import type { SetStateAction } from 'react'
+import type { SetStateAction } from 'react'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useSelector } from '@/reducers/hooks'
 
@@ -15,21 +15,6 @@ export const useTimeCountDown = () => {
   const [timeStatus, setTimeStatus] = useState<0 | 1 | 2>(0) // 倒计时状体  0:倒计时未开始 1:倒计时中， 2：倒计时已结束
   const timeObj: any = useRef()
   const endTime = useRef('')
-  const onStart = (val = '') => {
-    // console.log('time:::', val)
-    endTime.current = val
-    if (endTime.current) {
-      clearInterval(timeObj.current)
-      timeObj.current = setInterval(() => {
-        count_down()
-      }, 1000)
-    }
-  }
-  useEffect(() => {
-    return () => {
-      clearInterval(timeObj.current)
-    }
-  }, [])
   const count_down = () => {
     const startData = dayjs()
     const endDate = dayjs(endTime.current)
@@ -56,6 +41,22 @@ export const useTimeCountDown = () => {
     // console.log('endTime::', `${DD}-${HH}-${MM}-${SS}`)
     setShowTime(e => ({ ...e, DD, HH, MM, SS }))
   }
+  const onStart = (val = '') => {
+    // console.log('time:::', val)
+    endTime.current = val
+    if (endTime.current) {
+      clearInterval(timeObj.current)
+      timeObj.current = setInterval(() => {
+        count_down()
+      }, 1000)
+    }
+  }
+  useEffect(() => {
+    return () => {
+      clearInterval(timeObj.current)
+    }
+  }, [])
+
   return {
     showTime,
     onStart,
diff --git a/src/use/useLogin.ts b/src/use/useLogin.ts
index 5169f7f..afd4a0d 100644
--- a/src/use/useLogin.ts
+++ b/src/use/useLogin.ts
@@ -10,11 +10,21 @@ import { IMG_CND_Prefix } from '@/common/constant'
 
 export default () => {
   const { setUserInfo, setAdminUserInfo, setSortCode, userInfo } = useUserInfo()
+  // 获取分享码(右上角分享码)
+  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 })
+    setSortCode({ ...userInfo.sort_code, shareShortPage: { title: '打造面料爆品 专注客户服务', code: resPage.md5_key, img: `${IMG_CND_Prefix}/mall/share_img_01.png` } })
+  }
 
-  useDidShow(() => {
-    checkLogin()
-  })
-
+  // 获取用户信息
+  const { fetchData: FetchData } = GetAdminUserInfoApi()
+  const getAdminUserInfo = async() => {
+    const res = await FetchData()
+    setAdminUserInfo({ ...res.data })
+    getShortCode(res.data.user_id)
+  }
   // 登录请求
   const { login } = useLoginRequest()
   // const {fetchData:login} = LoginApi()
@@ -28,31 +38,24 @@ export default () => {
     }
   }
 
-  // 获取用户信息
-  const { fetchData: useFetchData } = GetAdminUserInfoApi()
-  const getAdminUserInfo = async() => {
-    const res = await useFetchData()
-    setAdminUserInfo({ ...res.data })
-    getShortCode(res.data.user_id)
-  }
-
   // 登录加checkLogin检查
   const checkLogin = () => {
-    return new Promise(async(reslove) => {
+    // eslint-disable-next-line no-async-promise-executor
+    return new Promise(async(resolve) => {
       if (!userInfo.token) {
         await wxLogin()
-        reslove(true)
+        resolve(true)
       }
       else {
         // 这个东西不要打开，checkSession有调用频率问题
         // Taro.checkSession({
         //     success: async () => {
-        //         reslove(true)
+        //         resolve(true)
         //         if(!userInfo.adminUserInfo)  getAdminUserInfo()
         //     },
         //     fail: async () =>  {
         //         await wxLogin()
-        //         reslove(true)
+        //         resolve(true)
         //     }
         // })
       }
@@ -62,9 +65,9 @@ export default () => {
   // 获取用户头像等信息数据
   const { fetchData: fetchDataUserInfo } = GetWxUserInfoApi()
   const getSelfUserInfo = async() => {
-    return new Promise((reslove, reject) => {
+    return new Promise((resolve, reject) => {
       if (userInfo.adminUserInfo?.is_authorize_name) {
-        reslove(true)
+        resolve(true)
         return true
       }
       Taro.getUserProfile({
@@ -83,7 +86,7 @@ export default () => {
           if (user_res.success) {
             setUserInfo({ ...user_res.data })
             getAdminUserInfo()
-            reslove(true)
+            resolve(true)
           }
           else {
             reject(user_res.msg)
@@ -101,9 +104,10 @@ export default () => {
   const { fetchData: fetchDataUserPhone } = GetPhoneNumberApi()
   const { fetchData: fetchBindingCompany } = BindingCompanyApi()
   const getPhoneNumber = (code) => {
-    return new Promise(async(reslove, reject) => {
+    // eslint-disable-next-line no-async-promise-executor
+    return new Promise(async(resolve, reject) => {
       if (userInfo.adminUserInfo?.is_authorize_phone) {
-        reslove(true)
+        resolve(true)
         return true
       }
       const res = await fetchDataUserPhone({ code })
@@ -111,22 +115,16 @@ export default () => {
         setUserInfo({ ...userInfo.userInfo, phone: res.data.phone_number })
         await fetchBindingCompany()
         getAdminUserInfo()
-        reslove(res.data)
+        resolve(res.data)
       }
       else {
         reject(res.msg)
       }
     })
   }
-
-  // 获取分享码(右上角分享码)
-  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 })
-    setSortCode({ ...userInfo.sort_code, shareShortPage: { title: '打造面料爆品 专注客户服务', code: resPage.md5_key, img: `${IMG_CND_Prefix}/mall/share_img_01.png` } })
-  }
-
+  useDidShow(() => {
+    checkLogin()
+  })
   return {
     checkLogin,
     wxLogin,