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

🐞 fix:优化分享图片，修复我的页面无法触发用户信息授权弹窗

Browse Source
This commit is contained in:
cheng
2022-08-01 11:32:49 +08:00
parent 6ea58ad911
commit ac4cd5ddb8
6 changed files with 194 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/index.tsx
+2 -2
View File
@@ -6,7 +6,7 @@ import OrderCount from './components/orderCount'
import ShopCart from '@/components/shopCart'
import styles from './index.module.scss'
import { useCallback, useEffect, useMemo, useState } from 'react'
import { formatHashTag } from '@/common/fotmat'
import { formatHashTag, formatImgUrl } from '@/common/fotmat'
import { GetProductDetailApi } from '@/api/material'
import useLogin from '@/use/useLogin'
import { AnalysisShortCodeApi, GetShortCodeApi } from '@/api/share'
@@ -102,7 +102,7 @@ export default (props: Params) => {
type: ShareDetail.value,
product_id: parseInt(params.id),
})
const img = IMG_CND_Prefix + (productInfo.texture_url ? productInfo.texture_url.split(',')[0] : '/mall/share_img_01.png')
const img = formatImgUrl(productInfo.texture_url || '/mall/share_img_01.png', '!w400')
setSortCode({ ...userObj.sort_code, shareShortDetail: { title: productName as string, code: resDetail.md5_key, img: img } })
}
src/pages/salesAfter/components/addressInfoDetail/index.module.scss
+81 -83
View File
@@ -1,90 +1,88 @@
.address_main{
margin-top: 20px;
.address_main {
margin-top: 20px;
}
.address_title_tag{
font-size: 24px;
color: #EE7500;
background: rgba(255,230,206,0.36);
border-radius: 20px 20px 0px 0px;
height: 56px;
display: flex;
align-items: center;
position: relative;
z-index: 999;
.miconfont {
font-size: 30px;
padding: 0 20px;
}
.address_title_tag {
font-size: 24px;
color: #ee7500;
background: rgba(255, 230, 206, 0.36);
border-radius: 20px 20px 0px 0px;
height: 56px;
display: flex;
align-items: center;
position: relative;
z-index: 999;
.miconfont {
font-size: 30px;
padding: 0 20px;
}
}
.order_address{
height: 178px;
background: #ffffff;
border-radius: 0 0 20px 20px;
display: flex;
align-items: center;
padding: 30px;
.order_address {
min-height: 178px;
background: #ffffff;
border-radius: 0 0 20px 20px;
display: flex;
align-items: center;
padding: 30px;
box-sizing: border-box;
position: relative;
.order_address_icon {
font-size: 50px;
color: $color_main;
position: absolute;
top: 35px;
left: 20px;
}
.order_address_text_con {
flex: 1;
padding-left: 50px;
box-sizing: border-box;
position: relative;
.order_address_icon{
font-size: 50px;
color: $color_main;
position: absolute;
top: 35px;
left: 20px;
}
.order_address_text_con{
flex:1;
padding-left: 50px;
box-sizing: border-box;
height: 100%;
display: flex;
flex-direction: column;
justify-content: space-between;
.order_address_text_title{
font-size: $font_size_medium;
margin-top: 10px;
display: flex;
align-items: center;
justify-content: space-between;
.moreIconfont{
font-size: 20px;
}
.address_text{
word-break:break-all;
font-size: 28px;
font-weight: 700;
}
}
.order_address_text_name{
color: #707070;
align-items: center;
display: flex;
margin-top: 20px;
text{
&:nth-child(1) {
font-size: $font_size_medium;
margin-right: 40px;
}
&:nth-child(2) {
flex:1;
font-size: $font_size_medium;
}
}
}
}
.updateBtn{
width:152px;
height: 100%;
display: flex;
flex-direction: column;
justify-content: space-between;
.order_address_text_title {
font-size: $font_size_medium;
margin-top: 10px;
display: flex;
align-items: center;
justify-content: space-between;
.moreIconfont {
font-size: 20px;
}
.address_text {
word-break: break-all;
font-size: 28px;
height: 60px;
color:#007AFF;
z-index: 999;
border: 2px solid #007AFF;
border-radius: 36px;
text-align: center;
line-height: 60px;
font-weight: 700;
}
}
}
.order_address_text_name {
color: #707070;
align-items: center;
display: flex;
margin-top: 20px;
text {
&:nth-child(1) {
font-size: $font_size_medium;
margin-right: 40px;
}
&:nth-child(2) {
flex: 1;
font-size: $font_size_medium;
}
}
}
}
.updateBtn {
width: 152px;
font-size: 28px;
height: 60px;
color: #007aff;
z-index: 999;
border: 2px solid #007aff;
border-radius: 36px;
text-align: center;
line-height: 60px;
}
}
src/pages/user/index.module.scss
+24 -21
View File
@@ -1,5 +1,5 @@
.main {
background-color: #F8F8F8;
background-color: #f8f8f8;
min-height: 100vh;
display: flex;
flex-direction: column;
@@ -17,8 +17,12 @@
}
.auth-suspension {
position: absolute;
position: fixed;
left: 0;
top: 0;
z-index: 1;
width: 100vw;
height: 100vh;
inset: 0;
}
@@ -58,7 +62,7 @@
.arcd-info-left-portrait {
width: 170px;
height: 170px;
background: rgba(0, 0, 0, 0.00);
background: rgba(0, 0, 0, 0);
border: 4px solid #ffffff;
border-radius: 50%;
overflow: hidden;
@@ -138,22 +142,21 @@
border-bottom: 2px solid #dddddd;
padding: 0 5px 15px;
box-sizing: border-box;
.card_main_title_order{
flex:1;
.card_main_title_order {
flex: 1;
font-size: 28px;
font-weight: 700;
}
.order_more{
.order_more {
display: flex;
justify-content: flex-end;
align-items: center;
font-size: 25px;
color: #707070;
text{
text {
width: auto;
}
}
}
.card-main-title text {
@@ -181,7 +184,7 @@
.card-main-title-content-item Text {
font-size: 56px;
color: #3C3C3C;
color: #3c3c3c;
}
.card-main-title-content-item-badge {
@@ -215,8 +218,8 @@
grid-template-columns: repeat(2, 1fr);
}
.assets-content>view,
.assets-content>navigator {
.assets-content > view,
.assets-content > navigator {
text-align: center;
}
@@ -282,7 +285,7 @@
.card-main-list-content-item-right text {
font-size: 30px;
}
}
.card-main-list-content-item .customer {
position: absolute;
opacity: 0;
@@ -315,14 +318,14 @@
.auth-status,
.auth-status-ongoing {
color: #EE7500;
background-color: #FFE6CE;
color: #ee7500;
background-color: #ffe6ce;
}
.auth-status,
.auth-status-adopt {
color: #007AFF;
background-color: #CDE5FF;
color: #007aff;
background-color: #cde5ff;
}
.auth-tips {
@@ -334,7 +337,7 @@
.auth-tips,
.auth-tips-adopt {
color: #ABABAB;
color: #ababab;
}
.auth-tips text {
@@ -426,7 +429,7 @@
.tips-modal-button {
display: flex;
border-top: 1px solid #DDDDDD;
border-top: 1px solid #dddddd;
margin-top: 45px;
}
@@ -445,7 +448,7 @@
font-weight: 400;
color: #707070;
border-radius: 0;
border-right: 1px solid #DDDDDD;
border-right: 1px solid #dddddd;
}
.tips-modal-button button::after {
@@ -537,7 +540,7 @@
padding-left: 10px;
width: 100px;
height: 32px;
background: rgba(255, 0, 0, 0.10);
background: rgba(255, 0, 0, 0.1);
border-radius: 10px;
color: #ff0000;
}
@@ -559,4 +562,4 @@
}
}
}
}
}
src/pages/user/index.tsx
+22 -19
View File
@@ -23,6 +23,7 @@ export default () => {
const handleAuth = async () => {
console.log('授权面版')
if (adminUserInfo?.is_authorize_name) return false
getSelfUserInfo()
.then()
.catch(() => {
@@ -37,26 +38,28 @@ export default () => {
getAdminUserInfo()
Apiassets()
})
const checkGo = () => {
if (
adminUserInfo?.authentication_status === 0 ||
adminUserInfo?.authentication_status === 1 ||
adminUserInfo?.authentication_status === 2 ||
adminUserInfo?.authentication_status === 3
) {
Taro.showModal({
const checkGo = async () => {
if (adminUserInfo?.authentication_status !== 4) {
let res = await Taro.showModal({
title: '提示',
content: '你还未认证,认证后解锁更多功能',
content: '你暂未开通授信，目前仅支持线下申请，开通后可使用账期采购。',
cancelText: '稍后认证',
confirmText: '去认证',
success: function (res) {
if (res.confirm) {
Taro.navigateTo({ url: '/pages/certification/index' })
} else if (res.cancel) {
console.log('用户点击取消')
}
},
confirmText: '联系客服',
})
if (res.confirm) {
Taro.showModal({
content: '联系电话:0757-8270 6695',
cancelText: '取消',
confirmText: '拨打',
success: function (res) {
if (res.confirm) {
Taro.makePhoneCall({
phoneNumber: '(0757)82706695',
})
}
},
})
}
} else {
Taro.navigateTo({
url: '/pages/creditLine/index',
@@ -72,7 +75,7 @@ export default () => {
{/* 测试暂时添加 */}
<View style={{ fontSize: '26rpx', color: '#707070', textAlign: 'center' }}>{current_version}</View>
{current_env === 'development' && <View style={{ fontSize: '26rpx', color: '#707070', textAlign: 'center' }}>{BASE_URL}</View>}
{!adminUserInfo?.is_authorize_name && <View onClick={handleAuth} className={styles['auth-suspension']}></View>}
{!adminUserInfo?.is_authorize_name && <View onClick={handleAuth} catchMove className={styles['auth-suspension']}></View>}
</View>
)
}
@@ -133,7 +136,7 @@ const Header = memo((props: any) => {
})
}
return (
<View className={styles.header}>
<View className={styles.header} onClick={props.onClick}>
<View className={`${styles.crad} ${styles['header-card']}`}>
<View className={styles['card-info']}>
<View className={styles['arcd-info-left']}>