xuan/TestEShopDist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐞 fix(修复剪样和色卡ui样式问题):

Browse Source
This commit is contained in:
czm 2023-02-23 19:08:21 +08:00
parent d1745a16f1
commit 94ea60ba20
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/constant.ts
View File

@ -5,14 +5,14 @@
// export const BASE_URL = `http://192.168.0.89:40001/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 = `http://192.168.1.165:40001/lymarket` // 王霞
// export const BASE_URL = 'https://test.zzfzyc.com/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:40001/lymarket` // 发
// export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发 // export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发
// export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发 // export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发
// export const BASE_URL = 'https://dev.zzfzyc.com/lymarket' // 开发环境 // export const BASE_URL = 'https://dev.zzfzyc.com/lymarket' // 开发环境
// export const BASE_URL = 'https://www.zzfzyc.com/lymarket' // 正式环境 // export const BASE_URL = 'https://www.zzfzyc.com/lymarket' // 正式环境
// export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞 // export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞
// export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添 export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添
// export const BASE_URL = 'http://192.168.1.28:50001/lymarket' // 婷 // export const BASE_URL = 'http://192.168.1.28:50001/lymarket' // 婷
// export const BASE_URL = 'http://192.168.1.42:50002/lymarket' // 杰 // export const BASE_URL = 'http://192.168.1.42:50002/lymarket' // 杰
@ -21,7 +21,6 @@ export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布
export const GET_UPLOAD_SIGN = '/upyun/getsign' // 请求签名 url export const GET_UPLOAD_SIGN = '/upyun/getsign' // 请求签名 url
export const UPLOAD_CDN_URL = 'https://v0.api.upyun.com/' export const UPLOAD_CDN_URL = 'https://v0.api.upyun.com/'
// cdn
export const IMG_CND_Prefix = CURRENT_ENV.includes('production') ? 'https://cdn.zzfzyc.com' : 'https://test.cdn.zzfzyc.com' export const IMG_CND_Prefix = CURRENT_ENV.includes('production') ? 'https://cdn.zzfzyc.com' : 'https://test.cdn.zzfzyc.com'
// export const IMG_CND_Prefix = CURRENT_ENV.includes('production') ? 'https://cdn.zzfzyc.com' : 'https://cdn.zzfzyc.com' // export const IMG_CND_Prefix = CURRENT_ENV.includes('production') ? 'https://cdn.zzfzyc.com' : 'https://cdn.zzfzyc.com'
export const SEARCH_EMPTY_IMAGE = `${IMG_CND_Prefix}/search_empty.png` export const SEARCH_EMPTY_IMAGE = `${IMG_CND_Prefix}/search_empty.png`

4
src/pages/colorCardClipping/components/cutProductItem/index.tsx
View File

@ -83,8 +83,8 @@ export default (props: Param) => {
</View> </View>
<View className={styles.card_info}> <View className={styles.card_info}>
<Text>色卡信息:</Text> <Text>剪样信息:</Text>
<Text>{value.total_fabrics}种面料，{value.total_colors}种剪样，共 {value.total_number} 份</Text> <Text>{value.total_fabrics}种面料，{value.total_colors}种颜色，共 {value.total_number} 份</Text>
</View> </View>
<View className={styles.express}>快递到付</View> <View className={styles.express}>快递到付</View>
{value.mp_cut_sample_audit_status === 1 && <View className={styles.btns} onClick={e => onCancelEven?.(e, value.order_id)}><Text>取消订单</Text></View>} {value.mp_cut_sample_audit_status === 1 && <View className={styles.btns} onClick={e => onCancelEven?.(e, value.order_id)}><Text>取消订单</Text></View>}

4
src/pages/cutSampleList/index.tsx
View File

@ -129,13 +129,13 @@ export default () => {
if (pIndex === -1) { if (pIndex === -1) {
const data: any = { ...selectItem } const data: any = { ...selectItem }
data.colors = val data.colors = val
selectProcutColors.push(data) selectProcutColors.unshift(data)
} }
else { else {
selectProcutColors[pIndex].colors = val selectProcutColors[pIndex].colors = val
} }
if (selectItem?.id && !selectProsuctIds.includes(selectItem?.id)) { if (selectItem?.id && !selectProsuctIds.includes(selectItem?.id)) {
selectProsuctIds.push(selectItem?.id) selectProsuctIds.unshift(selectItem?.id)
setSelectProsuctIds(selectProsuctIds) setSelectProsuctIds(selectProsuctIds)
} }
setSelectProcutColors(selectProcutColors) setSelectProcutColors(selectProcutColors)

2
src/pages/login/index.tsx
View File

@ -26,7 +26,7 @@ export default () => {
if (!e.detail.code) { return alert.error('请授权手机号') } if (!e.detail.code) { return alert.error('请授权手机号') }
try { try {
await getPhoneNumber(e.detail.code) await getPhoneNumber(e.detail.code)
goLink('/pages/user/index', {}, 'redirectTo') goLink('/pages/user/index', {}, 'switchTab')
} }
catch (msg) { catch (msg) {
alert.none(msg) alert.none(msg)