From 753906dbd596429cd71db17a9813ae6f5848e5c4 Mon Sep 17 00:00:00 2001 From: li tong bao <2903733959@qq.com> Date: Fri, 10 Jun 2022 17:39:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?--=E7=BB=91=E5=AE=9A=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/AddressList/index.tsx | 2 +- src/pages/creditUsed/index.tsx | 2 +- src/pages/depositBeforehand/index.scss | 16 ---------------- src/pages/depositBeforehand/index.tsx | 5 ++--- src/pages/user/index.tsx | 21 +++++---------------- 5 files changed, 9 insertions(+), 37 deletions(-) diff --git a/src/components/AddressList/index.tsx b/src/components/AddressList/index.tsx index 71e9827..7f71e93 100644 --- a/src/components/AddressList/index.tsx +++ b/src/components/AddressList/index.tsx @@ -102,7 +102,7 @@ const AddressList = memo((props:Params)=>{ {/* {item.address_detail} */} { - item.is_default&&{item.phone.replace(item.phone.substring(4,7), "****")} + item.is_default&&{item.phone.replace(item.phone.substring(3,7), "****")} } e.stopPropagation()} url={`/pages/addressAdd/index?type=edit&id=${item.id}`} hoverClass="none" className="address-edit"> diff --git a/src/pages/creditUsed/index.tsx b/src/pages/creditUsed/index.tsx index 17d60f3..11cdbd8 100644 --- a/src/pages/creditUsed/index.tsx +++ b/src/pages/creditUsed/index.tsx @@ -31,7 +31,7 @@ export default ()=>{ 下单 0?'green':item.amount<0?'red':''}`}> - {item.amount>0?"-":"+"}{toDecimal2(formatPriceDiv(item.amount)).toLocaleString()} + {item.trans_type==2?"-":"+"}{toDecimal2(formatPriceDiv(item.amount)).toLocaleString()} diff --git a/src/pages/depositBeforehand/index.scss b/src/pages/depositBeforehand/index.scss index d782d46..157ea4f 100644 --- a/src/pages/depositBeforehand/index.scss +++ b/src/pages/depositBeforehand/index.scss @@ -3,22 +3,6 @@ background-color: #f3f3f3; display: flex; flex-direction: column; - .deposit-beforehand-tips{ - width: 100%; - height: 66px; - background: #FFE6CE; - border: 2px solid #ffe6ce; - padding: 0 30px; - display: flex;align-items: center; - font-size: 24px; - font-weight: 400; - color: #EE7500; - margin: 0; - } - .deposit-beforehand-tips text{ - margin-right: 10px; - font-size: 30px; - } .deposit-beforehand-card{ width: 702px; diff --git a/src/pages/depositBeforehand/index.tsx b/src/pages/depositBeforehand/index.tsx index c904f4c..9636d30 100644 --- a/src/pages/depositBeforehand/index.tsx +++ b/src/pages/depositBeforehand/index.tsx @@ -6,6 +6,7 @@ import { depositInfoApi } from "@/api/deposit" import { useEffect } from "react"; import { formatPriceDiv, toDecimal2 } from "@/common/fotmat"; import { setClipboardData } from "@tarojs/taro"; +import Message from "@/components/Message"; export default ()=>{ const {fetchData, state} = depositInfoApi(); @@ -23,9 +24,7 @@ export default ()=>{ return ( - - 汇款成功后，1-5分钟自动到账。 - + 余额 (元) diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx index b4849ea..e8fd7a7 100644 --- a/src/pages/user/index.tsx +++ b/src/pages/user/index.tsx @@ -3,26 +3,15 @@ import { memo, useEffect, useState } from "react" import styles from './index.module.scss' import classnames from "classnames"; import { useSelector } from "@/reducers/hooks"; -import { GetAdminUserInfoApi } from "@/api/user"; import { alert, goLink } from "@/common/common"; import useLogin from '@/use/useLogin' export default () => { // 用户信息 - const { fetchData, state } = GetAdminUserInfoApi(); + const { getSelfUserInfo } = useLogin(); const {adminUserInfo, userInfo} = useSelector(state => state.userInfo); - const [mUserInfo, setMUserInfo] = useState({ - phone: "" - }); - const getData = ()=>{ - fetchData(); - } useEffect(()=>{ - setMUserInfo({ - ...mUserInfo, - // phone: userInfo?.phone?.replace(userInfo?.phone?.substring(3,7), "****") as string - }) - getData(); + getSelfUserInfo(); },[]); return ( @@ -69,9 +58,9 @@ const Header = memo((props:any) => { { text: "退款/售后", icon: "icon-a-tuikuanshouhou" }]; const { getPhoneNumber } = useLogin(); const mGetPhoneNumber = (ev)=>{ - try { + if(ev.detail?.code){ getPhoneNumber(ev.detail.code); - } catch (error) { + }else{ alert.none("绑定失败!"); } } @@ -90,7 +79,7 @@ const Header = memo((props:any) => { {data?.user_name} - {userInfo?.phone?.replace(userInfo?.phone?.substring(3,7), "****")||} + {data?.phone?data?.phone?.replace(data?.phone?.substring(3,7), "****"):} From c1a0866b044919dbaceef56a1c1f9c8b443a832c Mon Sep 17 00:00:00 2001 From: li tong bao <2903733959@qq.com> Date: Fri, 10 Jun 2022 17:51:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?--=E4=BF=AE=E5=A4=8D=E6=8E=88=E4=BF=A1?= =?UTF-8?q?=E9=A2=9D=E5=BA=A6=E5=9C=86=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/InfiniteScrollPaging/index.tsx | 7 ++++--- src/pages/creditLine/index.tsx | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/InfiniteScrollPaging/index.tsx b/src/components/InfiniteScrollPaging/index.tsx index 8db82b0..dc20d57 100644 --- a/src/components/InfiniteScrollPaging/index.tsx +++ b/src/components/InfiniteScrollPaging/index.tsx @@ -2,7 +2,7 @@ import InfiniteScroll from "@/components/infiniteScroll" import { ReactNode, useEffect, useMemo, useRef, useState } from "react" import { dataLoadingStatus, getFilterData } from "@/common/util"; -import { isEmptyObject } from "@/common/common"; +import { alert, isEmptyObject } from "@/common/common"; interface Params{ children?: ReactNode, @@ -36,9 +36,9 @@ export default (props: Params)=>{ page: tRefreshDataRef.page, size: tRefreshDataRef.size, }); - // 返回数据 - props.change&&props.change(result); if(result.success){ + // 返回数据 + props.change&&props.change(result); if(result.data.total<=0){ setRefreshData({ ...tRefreshDataRef, @@ -59,6 +59,7 @@ export default (props: Params)=>{ }) } }else{ + alert.none(result.msg); setRefreshData({ ...tRefreshDataRef, refreshStatus: false, diff --git a/src/pages/creditLine/index.tsx b/src/pages/creditLine/index.tsx index 2aaf9ff..6a9d4e9 100644 --- a/src/pages/creditLine/index.tsx +++ b/src/pages/creditLine/index.tsx @@ -42,7 +42,8 @@ export default ()=>{ const credit_quota_used_line = convertPrice(formatPriceDiv(result.data.credit_quota_used_line)); const credit_quota_line = convertPrice(formatPriceDiv(result.data.credit_quota_line)); const credit_quota_available_line = convertPrice(formatPriceDiv(result.data.credit_quota_available_line)); - const progress = ((credit_quota_available_line[0]??0) / (credit_quota_line[0]??0) * 100).toFixed(0); + const progress = credit_quota_available_line[0]==0&&credit_quota_line[0]==0?100:((credit_quota_available_line[0]??0) / (credit_quota_line[0]??0) * 100).toFixed(0); + switch(Number(result.data.quota_status)){ case 0://暂未开通 From 7322f1336ded31d51696f8417db3f5179a2e18c5 Mon Sep 17 00:00:00 2001 From: li tong bao <2903733959@qq.com> Date: Tue, 14 Jun 2022 15:18:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?--=E7=BC=96=E8=BE=91=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AF=B9=E6=8E=A550%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/constant.js | 6 +- src/pages/user/index.module.scss | 30 +++-- src/pages/user/index.tsx | 47 +++++--- .../userEdit/components/ModifyModal.scss | 76 ++++++++++++ src/pages/userEdit/components/ModifyModal.tsx | 49 ++++++++ src/pages/userEdit/index.scss | 109 +++++++---------- src/pages/userEdit/index.tsx | 114 ++++++++---------- src/use/useLogin.ts | 3 +- 8 files changed, 269 insertions(+), 165 deletions(-) create mode 100644 src/pages/userEdit/components/ModifyModal.scss create mode 100644 src/pages/userEdit/components/ModifyModal.tsx diff --git a/src/common/constant.js b/src/common/constant.js index dc069fb..2f4fa08 100644 --- a/src/common/constant.js +++ b/src/common/constant.js @@ -5,12 +5,12 @@ // 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 = `http://192.168.1.30:40001/lymarket` // 发 +export const BASE_URL = `http://192.168.1.30:40001/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://www.zzfzyc.com/lymarket` // 正式环境 -// export const BASE_URL = `http://192.168.1.4:40001/lymarket` // 王霞 -export const BASE_URL = `http://192.168.1.224:50001/lymarket` // 添 +// export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞 +// export const BASE_URL = `http://192.168.1.224:50001/lymarket` // 添 // export const BASE_URL = `http://192.168.1.15:50001/lymarket` // 杰 // CDN diff --git a/src/pages/user/index.module.scss b/src/pages/user/index.module.scss index 464844d..a34a08c 100644 --- a/src/pages/user/index.module.scss +++ b/src/pages/user/index.module.scss @@ -3,6 +3,7 @@ min-height: 100vh; display: flex; flex-direction: column; + position: relative; .header{ background: #68b4ff; background-size: cover; @@ -12,6 +13,10 @@ margin-top: 10px; } } + .auth-suspension{ + position: absolute; + z-index: 1;inset: 0; + } .header-card{ position: absolute;left: 50%;bottom: -18%; transform: translateX(-50%); @@ -239,12 +244,13 @@ display: flex;align-items: center;justify-content: center; } - .modal{ + .tips-modal{ background: rgba(0,0,0,0.6); position: fixed;inset: 0; display: flex;justify-content: center;align-items: center; + z-index: 2; } - .modal-content{ + .tips-modal-content{ width: 598px; background: #ffffff; border-radius: 10px; @@ -259,7 +265,7 @@ transform: scale(1); } } - .modal-title{ + .tips-modal-title{ font-size: 32px; font-weight: 700; text-align: center; @@ -267,51 +273,51 @@ margin-bottom: 58px; padding-top: 48px; } - .modal-letter{ + .tips-modal-letter{ font-size: 26px; font-weight: 400; color: #707070; padding: 0 30px; line-height: 50px; } - .modal-letter-text{ + .tips-modal-letter-text{ text-indent: 60px; } - .modal-letter-beginn{ + .tips-modal-letter-beginn{ font-size: 28px; font-weight: 400; color: #000000; margin-bottom: 25px; } - .modal-letter-end{ + .tips-modal-letter-end{ font-size: 26px; font-weight: 400; text-align: right; margin-top: 61px; } - .modal-button{ + .tips-modal-button{ display: flex; border-top: 1px solid #DDDDDD; margin-top: 45px; } - .modal-button button, .modal-button view{ + .tips-modal-button button, .tips-modal-button view{ display: flex;align-items: center;justify-content: center; width: 50%; height: 90px; background-color: white; } - .modal-button button{ + .tips-modal-button button{ font-size: 26px; font-weight: 400; color: #707070; border-radius: 0; border-right: 1px solid #DDDDDD; } - .modal-button button::after{ + .tips-modal-button button::after{ border: 0; border-radius: 0; } - .modal-button view{ + .tips-modal-button view{ font-size: 26px; font-weight: 400; color: #007aff; diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx index e8fd7a7..c9a8c35 100644 --- a/src/pages/user/index.tsx +++ b/src/pages/user/index.tsx @@ -9,20 +9,29 @@ import useLogin from '@/use/useLogin' export default () => { // 用户信息 const { getSelfUserInfo } = useLogin(); - const {adminUserInfo, userInfo} = useSelector(state => state.userInfo); + const {adminUserInfo} = useSelector(state => state.userInfo); useEffect(()=>{ - getSelfUserInfo(); + getSelfUserInfo().then().catch(()=>{ + alert.none("授权失败，请授权后再使用"); + }); },[]); + const handleAuth = async ()=>{ + getSelfUserInfo().then().catch(()=>{ + alert.none("授权失败，请授权后再使用"); + }); + } return ( -
+
+ {!adminUserInfo.is_authorize_name&&} ) } +// 提示弹窗 const Modal = memo((props:any)=>{ const {data} = props; const [modalShow, setModalShow]=useState(true); @@ -31,16 +40,16 @@ const Modal = memo((props:any)=>{ return( <> {!data?.is_authorize_phone&&modalShow&& - - e.stopPropagation()}> - 首次登录提醒 - - To: 万丰园纺织科技 - 尊敬的老朋友，欢迎你使用小程序商城；由于您是我们长期合作的伙伴，你的组织已自动为你生成，关联后可查看历史订单哟。 - 信息错误请联系客服 + + e.stopPropagation()}> + 首次登录提醒 + + To: 万丰园纺织科技 + 尊敬的老朋友，欢迎你使用小程序商城；由于您是我们长期合作的伙伴，你的组织已自动为你生成，关联后可查看历史订单哟。 + 信息错误请联系客服 - - + + setModalShow(false)}>我知道 @@ -52,10 +61,10 @@ const Modal = memo((props:any)=>{ // 头部 | 订单 const Header = memo((props:any) => { - const {data, userInfo} = props; - let menu = [{ text: "待配布", icon: "icon-daipeibu" }, { text: "待付款", icon: "icon-daifukuan" }, - { text: "待发货", icon: "icon-daifahuo" }, { text: "已发货", icon: "icon-yifahuo" }, - { text: "退款/售后", icon: "icon-a-tuikuanshouhou" }]; + const {data} = props; + let menu = [{ text: "待配布", icon: "icon-daipeibu", url: "/pages/orderList/index" }, { text: "待付款", icon: "icon-daifukuan", url: "/pages/orderList/index" }, + { text: "待发货", icon: "icon-daifahuo", url: "/pages/orderList/index" }, { text: "已发货", icon: "icon-yifahuo", url: "/pages/orderList/index" }, + { text: "退款/售后", icon: "icon-a-tuikuanshouhou", url: "/pages/orderList/index" }]; const { getPhoneNumber } = useLogin(); const mGetPhoneNumber = (ev)=>{ if(ev.detail?.code){ @@ -64,7 +73,6 @@ const Header = memo((props:any) => { alert.none("绑定失败!"); } } - return ( @@ -115,15 +123,14 @@ const Header = memo((props:any) => { { menu.map((item, index) => { return ( - + {item.text} {index==2?"99+":10} - + ) }) } - diff --git a/src/pages/userEdit/components/ModifyModal.scss b/src/pages/userEdit/components/ModifyModal.scss new file mode 100644 index 0000000..fe370e9 --- /dev/null +++ b/src/pages/userEdit/components/ModifyModal.scss @@ -0,0 +1,76 @@ + .modify-ickname-content { + margin: 0 auto; + width: 658px; + padding-bottom: 50px; + + .modify-ickname-input { + width: 658px; + height: 182px; + background: #f3f3f3; + border: 2px solid #e6e6e6; + border-radius: 10px; + padding: 15px; + box-sizing: border-box; + font-size: 22px; + font-weight: 400; + color: #ababab; + display: flex; + flex-direction: column; + align-items: flex-end; + } + + .modify-ickname-input textarea { + width: 100%; + height: 80%; + font-size: 26px; + font-weight: 400; + color: #3c3c3c; + } + + .modify-ickname-tips { + font-size: 22px; + font-weight: 400; + color: #ababab; + margin-top: 30px; + } + + .modify-ickname-operation { + width: 658px; + height: 82px; + background: #ffffff; + border: 2px solid #cde5ff; + border-radius: 40px; + display: flex; + overflow: hidden; + margin-top: 105px; + display: flex; + } + + .modify-ickname-operation button { + height: 100%; + width: 50%; + font-size: 32px; + font-weight: 400; + color: #007aff; + background-color: white; + border: none; + outline: none; + padding: 0; + border-radius: 0; + } + + .modify-ickname-operation button::after, + .user-edit-logout::after { + border-radius: 0; + border: none; + } + + .modify-ickname-operation .modify-ickname-operation-save { + background: #007aff; + color: #ffffff; + } + + .modify-ickname-operation button::after { + border-radius: 0; + } + } \ No newline at end of file diff --git a/src/pages/userEdit/components/ModifyModal.tsx b/src/pages/userEdit/components/ModifyModal.tsx new file mode 100644 index 0000000..0e51ac1 --- /dev/null +++ b/src/pages/userEdit/components/ModifyModal.tsx @@ -0,0 +1,49 @@ + +import { forwardRef, memo, useCallback, useEffect, useImperativeHandle, useState } from "react" +import Popup from "@/components/popup"; +import { Button, Image, Text, Textarea, View } from "@tarojs/components" +import "./ModifyModal.scss" + +interface Params{ + title?: string, + save: (value: any)=>void, // 确定保存 +} +export default memo(forwardRef((props:any,ref)=>{ + const {title="修改昵称"} = props; + const [value, setValue] = useState(""); + useEffect(()=>{ + setValue(props.value); + },[props.value]) + // popup输入长度 + const handleTextareaInput = (ev:any)=>{ + setValue(ev.detail.value.slice(0,20)); + } + // 重置 + const handleTextareaReset = ()=>{ + setValue(""); + } + const [textareaBottom, setTextareaBottom] = useState(0); + const handleBlur = ()=>{ + setTextareaBottom(0); + } + const handleFocus = (ev)=>{ + setTextareaBottom(ev.detail.height); + } + const [modalShow,setModalShow] = useState(false); + useImperativeHandle(ref, ()=>({setModalShow})) + return ( + setModalShow(false)} title={title} show={modalShow}> + + +