diff --git a/src/components/SaleCodeList/index.tsx b/src/components/SaleCodeList/index.tsx
index 9dd359d..d6f50c5 100644
--- a/src/components/SaleCodeList/index.tsx
+++ b/src/components/SaleCodeList/index.tsx
@@ -9,7 +9,7 @@ import Popup from '@/components/popup'
 import useCheckAuthorize from '@/use/useCheckAuthorize'
 import { alert } from '@/common/common'
 import { GetPayCode } from '@/api/order'
-import { formatDateTime, formatWeightDiv } from '@/common/format'
+import { formatDateTime, formatRemoveHashTag, formatWeightDiv } from '@/common/format'
 import { PAY_H5_CODE_URL } from '@/common/constant'
 
 interface Props {
@@ -34,8 +34,8 @@ const CodeList = (props: Props) => {
         list.push({
           product_code: item.code,
           product_name: item.name,
-          product_color_code: it.product_color_code,
-          product_color_name: it.product_color_name,
+          product_color_code: formatRemoveHashTag(it.code),
+          product_color_name: it.name,
           num: it.roll.toString(),
           weight: formatWeightDiv(it.actual_weight).toString(),
           sale_price: (it.sale_price / 100).toString(),
@@ -51,8 +51,8 @@ const CodeList = (props: Props) => {
     const query = {
       list,
       title: '面料销售电子确认单',
-      show_qrcode: true,
-      show_barcode: true,
+      // show_qrcode: true,
+      // show_barcode: true,
       order_type: props?.obj.sale_mode_name,
       shipment_mode: props?.obj.shipment_mode_name,
       company: props?.obj.title_purchaser_name,
diff --git a/src/pages/order/index.tsx b/src/pages/order/index.tsx
index 64b0c67..9c5ffc0 100644
--- a/src/pages/order/index.tsx
+++ b/src/pages/order/index.tsx
@@ -21,7 +21,7 @@ import Search from '@/components/search'
 import { dataLoadingStatus, getFilterData } from '@/common/util'
 import Popup from '@/components/popup'
 import InfiniteScroll from '@/components/infiniteScroll'
-import { formatDateTime, formatHashTag, formatImgUrl, formatPriceDiv, formatWeightDiv } from '@/common/format'
+import { formatDateTime, formatHashTag, formatImgUrl, formatPriceDiv, formatRemoveHashTag, formatWeightDiv } from '@/common/format'
 import IconFont from '@/components/iconfont/iconfont'
 import { PAY_H5_CODE_URL } from '@/common/constant'
 
@@ -374,8 +374,8 @@ const Order = () => {
         list.push({
           product_code: item.code,
           product_name: item.name,
-          product_color_code: it.product_color_code,
-          product_color_name: it.product_color_name,
+          product_color_code: formatRemoveHashTag(it.code),
+          product_color_name: it.name,
           num: it.roll.toString(),
           weight: formatWeightDiv(it.actual_weight).toString(),
           sale_price: (it.sale_price / 100).toString(),
diff --git a/src/pages/orderDetails/index.tsx b/src/pages/orderDetails/index.tsx
index 0e95016..c2c2e08 100644
--- a/src/pages/orderDetails/index.tsx
+++ b/src/pages/orderDetails/index.tsx
@@ -29,7 +29,7 @@ import {
   OrderPaymentPreCollectOrderOrderPaymentSubmission,
 } from '@/api/order'
 import { alert, goLink } from '@/common/common'
-import { formatDateTime, formatPriceDiv, formatWeightDiv } from '@/common/format'
+import { formatDateTime, formatHashTag, formatPriceDiv, formatRemoveHashTag, formatWeightDiv } from '@/common/format'
 import IconFont from '@/components/iconfont/iconfont'
 import { PAY_H5_CODE_URL } from '@/common/constant'
 import SaleCodeList from '@/components/SaleCodeList'
@@ -100,7 +100,7 @@ const GoodsItem = (porps: PropGoods) => {
                       {/* <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.itemName}>{formatHashTag(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}>
@@ -483,8 +483,8 @@ const OrderDetails = () => {
         list.push({
           product_code: item.code,
           product_name: item.name,
-          product_color_code: it.product_color_code,
-          product_color_name: it.product_color_name,
+          product_color_code: formatRemoveHashTag(it.code),
+          product_color_name: it.name,
           num: it.roll.toString(),
           weight: formatWeightDiv(it.actual_weight).toString(),
           sale_price: (it.sale_price / 100).toString(),