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

优化商城

Browse Source
This commit is contained in:
cheng
2022-07-08 15:30:30 +08:00
parent 3637447ab6
commit 757289558f
18 changed files with 107 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/collection/collectionClass/index.config.ts
+1 -1
View File
@@ -1,4 +1,4 @@
export default {
navigationBarTitleText: '我的收藏a',
navigationBarTitleText: '收藏详情',
enableShareAppMessage: true,
}
src/pages/collection/collectionClass/index.module.scss
+9
View File
@@ -26,6 +26,15 @@
.operation_check{
display: flex;
align-items: center;
position: relative;
&::after{
content: '';
height: 45px;
width: 1PX;
background-color: #ccc;
position: absolute;
right: -30px;
}
Text{
margin-left: 15px;
height: 100%;
src/pages/collection/collectionClass/index.tsx
+6 -4
View File
@@ -1,4 +1,4 @@
import { CreateFavoriteApi, DelFavoriteApi, DelFavoriteProductApi, DetailFavoriteProductApi, FavoriteListApi, MoveFavoriteProductApi, UpdateFavoriteApi } from "@/api/favorite";
import { DelFavoriteProductApi, DetailFavoriteProductApi, MoveFavoriteProductApi } from "@/api/favorite";
import { alert } from "@/common/common";
import { getFilterData } from "@/common/util";
import Product from "../components/product";
@@ -7,8 +7,6 @@ import { Text, View } from "@tarojs/components"
import Taro, { useRouter } from "@tarojs/taro";
import classnames from "classnames";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import CreatePopup from "../components/createPopup";
import UpdatePopup from "../components/updatePopup";
import styles from './index.module.scss'
import MCheckbox from "@/components/checkbox";
import AddCollection from "@/components/addCollection";
@@ -24,6 +22,9 @@ export default () => {
const getFavoriteInfo = async () => {
let res = await fetchDataDetailFavoriteProduct(searchData)
if(res.success) {
Taro.setNavigationBarTitle({
title: res.data.name
})
setColorInfo(res.data)
}
}
@@ -89,6 +90,7 @@ export default () => {
//移动面料
const {fetchData: fetchDataMoveFavoriteProduct} = MoveFavoriteProductApi()
const onAdd = async () => {
if(ids.length == 0) return alert.none('请选择要移动面料')
let res = await fetchDataMoveFavoriteProduct({favorite_id: searchData.id, product_id:ids})
if(res.success) {
getFavoriteInfo()
@@ -115,7 +117,7 @@ export default () => {
<View className={styles.operation}>
<View className={styles.operation_check}>
<MCheckbox status={allSelectStatus} onSelect={() => selectCallBack()} onClose={() => colseCallBack()}/>
<Text>全选</Text>
<Text className={styles.allSelect}>全选</Text>
</View>
<View className={styles.operation_check_right}>
<Text className={styles.operation_check_move} onClick={() => setCollectionShow(true)}>移动到</Text>
src/pages/details/components/orderCount/index.tsx
+3
View File
@@ -17,6 +17,7 @@ import { formatHashTag, formatPriceDiv } from "@/common/fotmat";
import { debounce, getFilterData } from "@/common/util";
import LabAndImg from "@/components/LabAndImg";
import VirtualList from '@tarojs/components/virtual-list'
import useCommonData from "@/use/useCommonData";
@@ -139,6 +140,7 @@ export default memo(({show = false, onClose, title = '', productId = 0}: param)
}
//添加购物车
const {getShopCount} = useCommonData()
const {getSelfUserInfo} = UseLogin()
const {fetchData:addFetchData} = AddShoppingCartApi()
const addShopCart = async () => {
@@ -167,6 +169,7 @@ export default memo(({show = false, onClose, title = '', productId = 0}: param)
Taro.showToast({
title:'添加成功'
})
getShopCount()
onClose?.()
} else {
Taro.showToast({
src/pages/details/index.tsx
+14 -15
View File
@@ -1,17 +1,17 @@
import { Button, CustomWrapper, Image, RichText, Text, View } from '@tarojs/components'
import Taro, { useDidShow, usePullDownRefresh, useRouter, useShareAppMessage } from '@tarojs/taro';
import { Button, CustomWrapper, RichText, Text, View } from '@tarojs/components'
import Taro, { useDidShow, usePullDownRefresh, useRouter } from '@tarojs/taro';
import classnames from "classnames";
import DesSwiper from './components/swiper';
import OrderCount from './components/orderCount';
import ShopCart from '@/components/shopCart';
import Preview,{colorItem} from './components/preview';
import styles from './index.module.scss'
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import {formatHashTag, formatImgUrl} from '@/common/fotmat'
import { useCallback, useEffect, useMemo, useState } from 'react';
import {formatHashTag} from '@/common/fotmat'
import {GetProductDetailApi} from '@/api/material'
import useLogin from '@/use/useLogin';
import { AnalysisShortCodeApi, BindShortCodeApi, GetShortCodeApi } from '@/api/share';
import { AnalysisShortCodeApi, GetShortCodeApi } from '@/api/share';
import { SHARE_SCENE } from '@/common/enum';
import useUserInfo from '@/use/useUserInfo';
import LabAndImg from '@/components/LabAndImg';
@@ -19,6 +19,8 @@ import { alert } from '@/common/common';
import AddCollection from '@/components/addCollection';
import { AddFavoriteApi, DelFavoriteProductApi } from '@/api/favorite';
import { GetShoppingCartApi } from '@/api/shopCart';
import { useSelector } from '@/reducers/hooks';
import useCommonData from '@/use/useCommonData';
type item = {title:string, img:string, url:string, id:number}
@@ -50,10 +52,13 @@ export default (props:Params) => {
setParams({id: res.data.product_id, share: res.data})
}
//获取购物车数据数量
const {getShopCount, commonData} = useCommonData()
useDidShow(() => {
judgeParam()
setShowCart(false)
getShoppingCart()
getShopCount()
})
useEffect(() => {
@@ -170,14 +175,8 @@ export default (props:Params) => {
}
}
//获取购物车数据数量
const [shopCount, setShopCount] = useState<number>(0)
const {fetchData: fetchDataShopCount} = GetShoppingCartApi()
const getShoppingCart = async () => {
const {data} = await fetchDataShopCount()
let color_list = data.color_list||[]
setShopCount(color_list.length)
}
//页面下拉刷新
@@ -233,7 +232,7 @@ export default (props:Params) => {
<View className={styles.buy_cart} onClick={() => setShowCart(true)}>
<View className={classnames('iconfont icon-gouwuche', styles.miconfont)}></View>
<View className={styles.text}>购物车</View>
{(shopCount > 0)&&<View className={styles.product_num}>{shopCount > 99?'99+':shopCount}</View>}
{(commonData.shopCount > 0)&&<View className={styles.product_num}>{commonData.shopCount > 99?'99+':commonData.shopCount}</View>}
</View>
{
(!userInfo.adminUserInfo?.is_authorize_phone)&&<View className={styles.buy_btn} >
src/pages/index/index.tsx
+1 -2
View File
@@ -46,7 +46,6 @@ export default () => {
}
//监听查询条件
useEffect(() => {
if (filtrate.product_kind_id)
getProductList()
}, [filtrate])
@@ -94,7 +93,7 @@ export default () => {
<View className={styles.main}>
<Banner />
<View className={styles.search}>
<View className={styles.search_collect}>我的收藏</View>
<View className={styles.search_collect} onClick={() => goLink('/pages/collection/index')}>我的收藏</View>
<View className={styles.search_input} onClick={() => goLink('/pages/searchList/search')}>
<Search disabled={true} style={{ width: '263rpx' }} />
</View>
src/pages/salesAfter/index.tsx
-11
View File
@@ -113,17 +113,6 @@ import styles from './index.module.scss'
const onShowLogistics = useCallback((val) => {
setLogisticsShow(true)
if(val != 1) setLogistics(true)
// if(val == 1) {
// setLogisticsShow(true)
// } else {
// const list = orderDetail?.accessory_url.map(item => {
// return formatImgUrl(item)
// })
// Taro.previewImage({
// current: list[0], // 当前显示
// urls: list // 需要预览的图片http链接列表
// })
// }
}, [])
const onCloseLogistics = useCallback(() => {
setLogisticsShow(false)
src/pages/subjectList/index.config.ts
+1 -1
View File
@@ -1,3 +1,3 @@
export default {
navigationBarTitleText: '分类标题'
navigationBarTitleText: '专题页面'
}
src/pages/subjectList/index.tsx
+8 -1
View File
@@ -12,11 +12,19 @@ import {GetProductListApi} from '@/api/material'
import { useRouter } from "@tarojs/taro";
import { dataLoadingStatus, getFilterData } from "@/common/util";
import LoadingCard from "@/components/loadingCard";
import Taro from '@tarojs/taro'
export default () => {
const [showPopup, setShowPopup] = useState(false)
const router = useRouter()
useEffect(() => {
Taro.setNavigationBarTitle({
title: router.params.title||'专题页面'
})
}, [router])
//搜索参数
const [searchField, setSearchField] = useState({
code_or_name: '',
@@ -47,7 +55,6 @@ export default () => {
//上拉加载数据
const pageNum = useRef({size: searchField.size, page: searchField.page})
const [hasMore, setHasMore] = useState(true)
const getScrolltolower = () => {
if(subjectList.list.length < subjectList.total) {
pageNum.current.page++