diff --git a/src/api/cms/cmsWebsiteField/model/index.ts b/src/api/cms/cmsWebsiteField/model/index.ts index d3aaaf2..dc104f6 100644 --- a/src/api/cms/cmsWebsiteField/model/index.ts +++ b/src/api/cms/cmsWebsiteField/model/index.ts @@ -55,4 +55,5 @@ export interface Config { email?: string; loginTitle?: string; sysLogo?: string; + NoticeBar?: string; } diff --git a/src/api/shop/shopDealerUser/model/index.ts b/src/api/shop/shopDealerUser/model/index.ts index 2af5f3f..9ac7ec4 100644 --- a/src/api/shop/shopDealerUser/model/index.ts +++ b/src/api/shop/shopDealerUser/model/index.ts @@ -22,6 +22,9 @@ export interface ShopDealerUser { totalMoney?: string; // 推荐人用户ID refereeId?: number; + dealerName?: string; + dealerPhone?: string; + dealerAvatar?: string; // 成员数量(一级) firstNum?: number; // 成员数量(二级) diff --git a/src/dealer/index.tsx b/src/dealer/index.tsx index 6862840..4d5b7f5 100644 --- a/src/dealer/index.tsx +++ b/src/dealer/index.tsx @@ -1,18 +1,20 @@ -import React from 'react' +import React, {useState, useEffect} from 'react' import {View, Text} from '@tarojs/components' import {ConfigProvider, Button, Grid, Avatar} from '@nutui/nutui-react-taro' import { User, Shopping, - Dongdong, + QrCode, ArrowRight, Purse, People } from '@nutui/icons-react-taro' import {useDealerUser} from '@/hooks/useDealerUser' -import { useThemeStyles } from '@/hooks/useTheme' +import {useThemeStyles} from '@/hooks/useTheme' import {businessGradients, cardGradients, gradientUtils} from '@/styles/gradients' import Taro from '@tarojs/taro' +import {getShopDealerRefereeByUserId} from "@/api/shop/shopDealerReferee"; +import {ShopDealerUser} from "@/api/shop/shopDealerUser/model"; const DealerIndex: React.FC = () => { const { @@ -20,6 +22,7 @@ const DealerIndex: React.FC = () => { error, refresh, } = useDealerUser() + const [dealer, setDealer] = useState() // 使用主题样式 const themeStyles = useThemeStyles() @@ -53,7 +56,16 @@ const DealerIndex: React.FC = () => { return userTheme.background } - console.log(getGradientBackground(),'getGradientBackground()') + + // 初始化当前用户名称 + useEffect(() => { + getShopDealerRefereeByUserId(Taro.getStorageSync('UserId')).then((data) => { + setDealer(data); + }) + }, [dealerUser]) + + + console.log(getGradientBackground(), 'getGradientBackground()') if (error) { return ( @@ -101,8 +113,7 @@ const DealerIndex: React.FC = () => { }} /> - + {dealerUser?.realName || '分销商'} { {formatMoney(dealerUser.money)} - 可提现 + 可提现 { {formatMoney(dealerUser.freezeMoney)} - 冻结中 + 冻结中 { {formatMoney(dealerUser.totalMoney)} - 累计收益 + 累计收益 @@ -225,7 +236,7 @@ const DealerIndex: React.FC = () => { - navigateToPage('/dealer/team/index')}> + navigateToPage('/pages/user/user')}> @@ -236,7 +247,7 @@ const DealerIndex: React.FC = () => { navigateToPage('/dealer/qrcode/index')}> - + @@ -284,6 +295,17 @@ const DealerIndex: React.FC = () => { {/**/} + + 我的推荐人 + + + + {dealer?.dealerName} + Taro.makePhoneCall({phoneNumber: `${dealer?.dealerPhone}`})}>{dealer?.dealerPhone} + + + {/* 底部安全区域 */} diff --git a/src/pages/cart/cart.tsx b/src/pages/cart/cart.tsx index 7a48947..5af2b1a 100644 --- a/src/pages/cart/cart.tsx +++ b/src/pages/cart/cart.tsx @@ -41,13 +41,13 @@ function Cart() { useShareTimeline(() => { return { - title: '购物车 - 网宿小店' + title: '购物车 - 唐九运售电云' }; }); useShareAppMessage(() => { return { - title: '购物车 - 网宿小店', + title: '购物车 - 唐九运售电云', success: function () { console.log('分享成功'); }, diff --git a/src/pages/index/BestSellers.tsx b/src/pages/index/BestSellers.tsx index 8e14c48..a2fef2e 100644 --- a/src/pages/index/BestSellers.tsx +++ b/src/pages/index/BestSellers.tsx @@ -86,7 +86,7 @@ const BestSellers = () => { // 分享到朋友圈 useShareTimeline(() => { return { - title: `${goods?.name || '精选商品'} - 网宿小店`, + title: `${goods?.name || '精选商品'} - 唐九运售电云`, path: `/shop/goodsDetail/index?id=${goods?.goodsId}`, imageUrl: goods?.image }; @@ -94,7 +94,7 @@ const BestSellers = () => { return ( <> - + {list?.map((item, index) => { return ( diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index 82ddb1d..65b103a 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -4,28 +4,31 @@ import Taro from '@tarojs/taro'; import {useShareAppMessage, useShareTimeline} from "@tarojs/taro" import {useEffect, useState} from "react"; import {getShopInfo} from "@/api/layout"; -import {Sticky} from '@nutui/nutui-react-taro' +import {Sticky, NoticeBar} from '@nutui/nutui-react-taro' import {View} from '@tarojs/components' import Menu from "./Menu"; import Banner from "./Banner"; import './index.scss' import Grid from "@/pages/index/Grid"; import PopUpAd from "@/pages/index/PopUpAd"; +import {configWebsiteField} from "@/api/cms/cmsWebsiteField"; +import type {Config} from "@/api/cms/cmsWebsiteField/model"; function Home() { // 吸顶状态 const [stickyStatus, setStickyStatus] = useState(false) + const [config, setConfig] = useState() useShareTimeline(() => { return { - title: '网宿小店 - 网宿软件', + title: '唐九运售电云 - 网宿软件', path: `/pages/index/index` }; }); useShareAppMessage(() => { return { - title: '网宿小店 - 网宿软件', + title: '唐九运售电云 - 网宿软件', path: `/pages/index/index`, success: function () { console.log('分享成功'); @@ -83,6 +86,10 @@ function Home() { // 获取站点信息 getShopInfo().then(() => { + }) + // 获取配置信息 + configWebsiteField({}).then(data => { + setConfig(data) }) // Taro.getSetting:获取用户的当前设置。返回值中只会出现小程序已经向用户请求过的权限。 Taro.getSetting({ @@ -115,6 +122,7 @@ function Home() { + diff --git a/src/shop/goodsDetail/index.tsx b/src/shop/goodsDetail/index.tsx index 75f8279..ef34edb 100644 --- a/src/shop/goodsDetail/index.tsx +++ b/src/shop/goodsDetail/index.tsx @@ -189,7 +189,7 @@ const GoodsDetail = () => { // 分享到朋友圈 useShareTimeline(() => { return { - title: `${goods?.name || '精选商品'} - 网宿小店`, + title: `${goods?.name || '精选商品'} - 唐九运售电云`, path: `/shop/goodsDetail/index?id=${goodsId}`, imageUrl: goods?.image };