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

🐞 fix(特色百科和删除弹窗):新增删除弹窗和特色百科判空

Browse Source
This commit is contained in:
Haiyi 2022-12-13 18:54:32 +08:00
parent ea1de11eb5
commit 5989ecd8ad
3 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/constant.ts
View File

@ -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` // 发

4
src/pages/details/components/feature/index.tsx
View File

@ -31,9 +31,9 @@ const FeaturePopup = (param: Props) => {
const res = await fetchData({ product_id: productIds })
if (res.data) {
Taro.hideLoading()
setnodes(res.data.instructions)
setlist([...res.data.product_list])
Taro.hideLoading()
}
else {
Taro.hideLoading()
@ -50,7 +50,7 @@ const FeaturePopup = (param: Props) => {
<Popup showTitle={false} show={param.showPopup} onClose={() => param.closePopup?.()}>
<ScrollView scrollY className={styles.sollBox}>
<View className={styles.main}>
<View className={styles.title}>{param.productName}</View>
<View className={styles.title}>{param?.productName}</View>
<View className={styles.line}></View>
<RichText nodes={nodes}></RichText>
<View className={styles.topFont}>推荐面料</View>

36
src/pages/searchList/search.tsx
View File

@ -141,20 +141,30 @@ export default () => {
// 删除历史搜索
const { fetchData: deleteFetch } = mallsearchHistorydelete()
const handDelete = async() => {
const res = await deleteFetch()
Taro.showLoading({
title: '请稍等...',
Taro.showModal({
title: '确定删除历史搜索记录吗？',
async success(res) {
if (res.confirm) {
const resrult = await deleteFetch()
if (resrult) {
Taro.showLoading({
title: '请稍等...',
})
alert.success('删除成功')
getSearchHistory()
setSearchData(val => ({ ...val, showIndex: 1 }))
Taro.hideLoading()
}
else {
alert.error('删除失败')
Taro.hideLoading()
}
}
else if (res.cancel) {
console.log('用户点击取消')
}
},
})
if (res) {
alert.success('删除成功')
getSearchHistory()
setSearchData(val => ({ ...val, showIndex: 1 }))
Taro.hideLoading()
}
else {
alert.error('删除失败')
Taro.hideLoading()
}
}
return (