From bec081fa4cdf9e934e1a78abafce0b686d3fc8dc Mon Sep 17 00:00:00 2001 From: xuan Date: Wed, 8 Mar 2023 15:12:24 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(ID1001468):=20=E3=80=90?= =?UTF-8?q?=E9=9D=A2=E6=96=99=E4=BC=98=E9=80=89=E3=80=91-=E5=8A=9F?= =?UTF-8?q?=E8=83=BD{=E4=B8=8B=E5=8D=95}=EF=BC=9A=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E7=BB=84=E7=BB=87=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【【面料优选】-功能{下单}：重复校验组织名称】 https://www.tapd.cn/53459131/bugtrace/bugs/view/1153459131001001468" --- src/common/constant.ts | 4 ++-- .../components/orderCount/index.module.scss | 7 +++---- .../details/components/orderCount/index.tsx | 18 +++++++----------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/common/constant.ts b/src/common/constant.ts index 6223306..5d8465b 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` // 发 diff --git a/src/pages/details/components/orderCount/index.module.scss b/src/pages/details/components/orderCount/index.module.scss index 4a042c8..9c89fb0 100644 --- a/src/pages/details/components/orderCount/index.module.scss +++ b/src/pages/details/components/orderCount/index.module.scss @@ -234,14 +234,13 @@ width: 200px; height: 90px; font-size: $font_size_big; + padding: 0; text-align: center; line-height: 90px; border-radius: 50px; color: #fff; - background: linear-gradient(38deg, #5cabff, #7cbcfc 100%, #99ccff 100%); - } - .select_add_cart { - background: linear-gradient(38deg, $color_main, #4fa6ff 100%, #68b4ff 100%); + border: 0; + // background: linear-gradient(38deg, #5cabff, #7cbcfc 100%, #99ccff 100%); } } } diff --git a/src/pages/details/components/orderCount/index.tsx b/src/pages/details/components/orderCount/index.tsx index 74f6b84..38db442 100644 --- a/src/pages/details/components/orderCount/index.tsx +++ b/src/pages/details/components/orderCount/index.tsx @@ -24,6 +24,7 @@ import { alert, goLink, retrieval } from '@/common/common' import OrganizationNameModal from '@/components/organizationNameModal' import useLogin from '@/use/useLogin' import { companyDetailApi, companyUpdateApi } from '@/api/company' +import NormalButton from '@/components/normalButton' interface param { show?: true | false @@ -228,12 +229,11 @@ const OrderCount = ({ show = false, onClose, title = '', productId = 0, is_first }) return false } - setShowModal(true) - return // 检测是否修改过组织昵称 - // if (userInfo.adminUserInfo.first_change_name) { - // return - // } + if (userInfo.adminUserInfo.first_change_name) { + setShowModal(true) + return + } Taro.navigateTo({ url: `/pages/order/speedComfirm?sale_mode=${Number(selectIndex)}&buyList=${JSON.stringify(selectCount.color_list)}`, }) @@ -483,12 +483,8 @@ const OrderCount = ({ show = false, onClose, title = '', productId = 0, is_first 当前已选{selectCount.kindCount}种，共{selectCount.sumCount} {selectList[selectIndex].unit} - addShopCart()}> - 加入购物车 - - handShopBuy()}> - 立即购买 - + addShopCart()}>加入购物车 + handShopBuy()}>立即购买