🐞 fix(ID1001468): 【面料优选】-功能{下单}:重复校验组织名称
【【面料优选】-功能{下单}:重复校验组织名称】 https://www.tapd.cn/53459131/bugtrace/bugs/view/1153459131001001468"
This commit is contained in:
parent
9ff8cb9671
commit
bec081fa4c
@ -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` // 发
|
||||
|
||||
@ -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%);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -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}
|
||||
</View>
|
||||
<View className={classnames(styles.add_cart, selectCount.kindCount && styles.select_add_cart)} onClick={() => addShopCart()}>
|
||||
加入购物车
|
||||
</View>
|
||||
<View className={classnames(styles.add_cart, selectCount.kindCount && styles.select_add_cart)} onClick={() => handShopBuy()}>
|
||||
立即购买
|
||||
</View>
|
||||
<NormalButton circle customClassName={styles.add_cart} round disabled={!selectCount.kindCount} onClick={() => addShopCart()}>加入购物车</NormalButton>
|
||||
<NormalButton circle customClassName={styles.add_cart} round disabled={!selectCount.kindCount} onClick={() => handShopBuy()}>立即购买</NormalButton>
|
||||
</View>
|
||||
</View>
|
||||
</View>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user