From 4029a932bfb14365a5af70df9300a40a7df22d67 Mon Sep 17 00:00:00 2001
From: xuan <w1359774872@gmail.com>
Date: Fri, 10 Mar 2023 10:49:26 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(ID1001490):=20=E3=80=90?=
 =?UTF-8?q?=E5=86=85=E9=83=A8=E5=95=86=E5=9F=8E=E3=80=91-=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD{-=E8=B4=AD=E7=89=A9=E8=BD=A6}=EF=BC=9A=E8=B4=AD?=
 =?UTF-8?q?=E7=89=A9=E8=BD=A6=E9=80=89=E6=8B=A9=E9=A2=9C=E8=89=B2=EF=BC=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=BB=93=E7=AE=97=EF=BC=8C=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【【内部商城】&#45;功能{&#45;购物车}：购物车选择颜色，点击结算，图片显示不对】 https://www.tapd.cn/53459131/bugtrace/bugs/view/1153459131001001490
---
 src/common/constant.ts          |  6 +++---
 src/pages/submitOrder/index.tsx | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/common/constant.ts b/src/common/constant.ts
index 9214442..93a0f48 100644
--- a/src/common/constant.ts
+++ b/src/common/constant.ts
@@ -1,11 +1,11 @@
-export const BASE_URL = CURRENT_BASE_URL
+// export const BASE_URL = CURRENT_BASE_URL
 // export const BASE_URL = `http://192.168.0.75:50001/lymarket`
 // export const BASE_URL = `http://192.168.0.89:50001/lymarket`
 // export const BASE_URL = `http://10.0.0.5:50001/lymarket`
 // export const BASE_URL = `http://192.168.0.89:40001/lymarket`
 // export const BASE_URL = `http://192.168.1.165:40001/lymarket` // 王霞
 // export const BASE_URL = `https://test.zzfzyc.com/lymarket` // 测试环境
-// export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布
+export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布
 // export const BASE_URL = `http://192.168.1.9:40001/lymarket` // 发
 // export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发
 // export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发
@@ -15,7 +15,7 @@ export const BASE_URL = CURRENT_BASE_URL
 // export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添
 // export const BASE_URL = 'http://192.168.1.42:50002/lymarket' //  杰
 // export const BASE_URL = `http://192.168.1.95:40001/lymarket` //  华
-// export const BASE_URL = 'http://192.168.1.28:50002/lymarket' // 婷
+// export const BASE_URL = 'http://192.168.1.28:50001/lymarket' // 婷
 
 // CDN
 // 生成密钥
diff --git a/src/pages/submitOrder/index.tsx b/src/pages/submitOrder/index.tsx
index daecaff..08a4ef3 100644
--- a/src/pages/submitOrder/index.tsx
+++ b/src/pages/submitOrder/index.tsx
@@ -14,10 +14,11 @@ import {
   MpSaleOrderPreview,
 } from '@/api/order'
 import { alert } from '@/common/common'
-import { formatDateTime, formatPriceDiv, formatWeightDiv } from '@/common/format'
+import { formatDateTime, formatMeterDiv, formatPriceDiv, formatRemoveHashTag, formatWeightDiv } from '@/common/format'
 import IconFont from '@/components/iconfont/iconfont'
 import { MpPurchaserAddressList } from '@/api/addressList'
 import LabAndImg from '@/components/LabAndImg'
+import { EnumSaleMode } from '@/common/Enumerate'
 // 卡片盒子元素
 interface Obs {
   title?: string
@@ -73,26 +74,25 @@ const GoodsItem = (porps: PropGoods) => {
         list.map((item, index) => {
           return (
             <View className={styles.goodsBox} key={index}>
-              <View className={styles.goodsProduct}>{item.code}# {item.name}</View>
+              <View className={styles.goodsProduct}>{formatRemoveHashTag(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}>
-                        <LabAndImg value={labAndImgObj(item)} />
+                        <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.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 className={styles.itemName}>{formatRemoveHashTag(it.code)}# {it.name}</View>
+                          <View className={styles.itemNums}>x{obj?.sale_mode === EnumSaleMode.Bulk ? it.roll : formatMeterDiv(it.length)}{obj?.sale_mode === 0 ? '条' : 'm'}</View>
                         </View>
                         <View className={styles.item_right_Bottom}>
                           <View className={styles.flexBox}>
-                            <View className={styles.itemMoney}>¥{it.sale_price / 100}/{obj?.sale_mode === 1 ? 'm' : 'kg'}</View>
+                            <View className={styles.itemMoney}>¥{formatPriceDiv(it.sale_price)}/{obj?.sale_mode === EnumSaleMode.Plate ? 'm' : 'kg'}</View>
                             {
-                              obj?.sale_mode === 0 && it?.sale_price !== it?.standard_price && <View className={styles.lastBox}>¥{it?.standard_price / 100}/{obj?.sale_mode === 1 ? 'm' : 'kg'}</View>
+                              (obj?.sale_mode === EnumSaleMode.Bulk && it?.sale_price !== it?.standard_price) ? <View className={styles.lastBox}>¥{formatPriceDiv(it?.standard_price)}/kg</View> : null
                             }
                           </View>