Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/EShop into dev
This commit is contained in:
commit
523946db67
1978
package-lock.json
generated
1978
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -37,6 +37,7 @@
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.7.7",
|
||||
"@tarojs/components": "3.3.10",
|
||||
"@tarojs/plugin-framework-react": "^3.4.12",
|
||||
"@tarojs/react": "3.3.10",
|
||||
"@tarojs/runtime": "3.3.10",
|
||||
"@tarojs/taro": "3.3.10",
|
||||
|
||||
@ -1,13 +1,47 @@
|
||||
{
|
||||
"miniprogramRoot": "./dist",
|
||||
"miniprogramRoot": "dist/",
|
||||
"projectname": "EShop",
|
||||
"description": "电子商城",
|
||||
"description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
|
||||
"appid": "wx68d92d7cbf0b6963",
|
||||
"setting": {
|
||||
"urlCheck": true,
|
||||
"es6": false,
|
||||
"postcss": false,
|
||||
"minified": false
|
||||
"minified": false,
|
||||
"coverView": true,
|
||||
"lazyloadPlaceholderEnable": false,
|
||||
"preloadBackgroundData": false,
|
||||
"autoAudits": false,
|
||||
"uglifyFileName": false,
|
||||
"uploadWithSourceMap": true,
|
||||
"enhance": true,
|
||||
"useMultiFrameRuntime": true,
|
||||
"showShadowRootInWxmlPanel": true,
|
||||
"packNpmManually": false,
|
||||
"packNpmRelationList": [],
|
||||
"minifyWXSS": true,
|
||||
"useStaticServer": true,
|
||||
"showES6CompileOption": false,
|
||||
"checkInvalidKey": true,
|
||||
"compileHotReLoad": true,
|
||||
"babelSetting": {
|
||||
"ignore": [],
|
||||
"disablePlugins": [],
|
||||
"outputPath": ""
|
||||
},
|
||||
"compileType": "miniprogram"
|
||||
"disableUseStrict": false,
|
||||
"useCompilerPlugins": false
|
||||
},
|
||||
"compileType": "miniprogram",
|
||||
"libVersion": "2.24.5",
|
||||
"srcMiniprogramRoot": "dist/",
|
||||
"packOptions": {
|
||||
"ignore": [],
|
||||
"include": []
|
||||
},
|
||||
"condition": {},
|
||||
"editorSetting": {
|
||||
"tabIndent": "insertSpaces",
|
||||
"tabSize": 2
|
||||
}
|
||||
}
|
||||
12
src/api/mine.ts
Normal file
12
src/api/mine.ts
Normal file
@ -0,0 +1,12 @@
|
||||
import { useRequest } from "@/use/useHttp"
|
||||
|
||||
/**
|
||||
* 获取用户资产
|
||||
* @returns
|
||||
*/
|
||||
export const userassets = () => {
|
||||
return useRequest({
|
||||
url: `/v1/mall/user/assets`,
|
||||
method: "get",
|
||||
})
|
||||
}
|
||||
@ -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:50001/lymarket` // 发
|
||||
// export const BASE_URL = `http://192.168.1.30:40001/lymarket` // 发
|
||||
// export const BASE_URL = `http://192.168.1.9:40001/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.5:40001/lymarket` // 王霞
|
||||
// export const BASE_URL = `http://192.168.1.224:50002/lymarket` // 添
|
||||
export const BASE_URL = `http://192.168.1.7:50002/lymarket` // 添
|
||||
// export const BASE_URL = `http://192.168.1.15:50001/lymarket` // 杰
|
||||
|
||||
// CDN
|
||||
|
||||
@ -55,9 +55,9 @@ export default ()=>{
|
||||
const rules = {
|
||||
name: [{
|
||||
message: "请输入正确收货人姓名",
|
||||
validator: (value:any, rule:any)=>{ // 自定义验证，返回true表示匹配到了(错误)
|
||||
return value.length>5;
|
||||
}
|
||||
// validator: (value:any, rule:any)=>{ // 自定义验证，返回true表示匹配到了(错误)
|
||||
// return value.length>5;
|
||||
// }
|
||||
}],
|
||||
phone: [{
|
||||
message: "请输入正确的电话号码", regex: /^1[3|5|6|9|2|8|7]\d{9}$/
|
||||
|
||||
@ -36,6 +36,7 @@ export default ()=>{
|
||||
business_license_url: "",
|
||||
legal_person: "",
|
||||
legal_person_identity: "",
|
||||
businessLicense: '',
|
||||
legal_person_identity_url: [],
|
||||
name: ""
|
||||
});
|
||||
@ -130,7 +131,8 @@ export default ()=>{
|
||||
{/* <FromListCertification type="select" onClick={handleSelectTypeModalShow} value={(formData as any)?.authentication_type_name} label="认证类型" placeholder="企业认证"/> */}
|
||||
<SelectEnterpriseType ref={selectTypeRef} confirm={handleSelectTypeConfirm} />
|
||||
<FromListCertification onInput={(ev: any) => setFormData({ ...formData, name: ev.detail.value })} value={formData["name"]} label="企业名称" placeholder="请输入营业执照上的企业名称" required />
|
||||
<FromListCertification type="select" style={{border: "0"}}label="企业营业执照" placeholder="注册号、统一社会信用代码、组织机构代码" required showIcon={false}/>
|
||||
{/* <FromListCertification type="select" style={{border: "0"}}label="企业营业执照" placeholder="注册号、统一社会信用代码、组织机构代码" required showIcon={false}/> */}
|
||||
<FromListCertification onInput={(ev: any) => setFormData({ ...formData, businessLicense: ev.detail.value })} value={formData["businessLicense"]} style={{ border: "0" }} label="企业营业执照" placeholder="注册号、统一社会信用代码、组织机构代码" required />
|
||||
<View onClick={() => handleUploadImage("business_license_url")} className="certification-upload">
|
||||
{(formData as any)?.business_license_url ?
|
||||
<>
|
||||
|
||||
@ -8,6 +8,7 @@ import ShopCart from '@/components/shopCart'
|
||||
import { goLink } from '@/common/common'
|
||||
import styles from './index.module.scss'
|
||||
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
|
||||
import { useSelector } from "@/reducers/hooks";
|
||||
import Taro, { Events, useDidShow, usePullDownRefresh } from '@tarojs/taro'
|
||||
import { GetProductKindListApi, GetProductListApi } from '@/api/material'
|
||||
import useLogin from '@/use/useLogin'
|
||||
@ -50,6 +51,7 @@ export default () => {
|
||||
}
|
||||
//监听查询条件
|
||||
useEffect(() => {
|
||||
|
||||
if (filtrate.product_kind_id)
|
||||
getProductList()
|
||||
}, [filtrate])
|
||||
@ -98,8 +100,67 @@ export default () => {
|
||||
return dataLoadingStatus({ list: productData.list, total: productData.total, status: productState.loading })
|
||||
}, [productData, productState.loading])
|
||||
|
||||
useEffect(() => {
|
||||
getShow()
|
||||
}, [])
|
||||
// const [time, setShow] = useState(false)
|
||||
//拿状态存储的东西判断
|
||||
const { adminUserInfo } = useSelector(state => state.userInfo);
|
||||
const getShow = () => {
|
||||
if (adminUserInfo?.authentication_status === 0 || adminUserInfo?.authentication_status === 1 || adminUserInfo?.authentication_status === 2 || adminUserInfo?.authentication_status === 3) {
|
||||
//倒计时弹出去认证
|
||||
const countTime: any = 60
|
||||
//获取倒计时的变量
|
||||
var time = parseInt(countTime);
|
||||
const countDown = setInterval(() => {
|
||||
if (time == 0) {
|
||||
Taro.showModal({
|
||||
title: '提示',
|
||||
content: '你还未认证,认证后解锁更多功能',
|
||||
cancelText: '稍后认证',
|
||||
confirmText: '去认证',
|
||||
success: function (res) {
|
||||
if (res.confirm) {
|
||||
Taro.navigateTo({ url: '/pages/certification/index' })
|
||||
} else if (res.cancel) {
|
||||
console.log('用户点击取消')
|
||||
}
|
||||
}
|
||||
})
|
||||
//清除定时器
|
||||
clearInterval(countDown);
|
||||
} else {
|
||||
time--;
|
||||
}
|
||||
}, 1000)
|
||||
}
|
||||
}
|
||||
|
||||
//检查认证是否认证
|
||||
const checkShow = () => {
|
||||
if (adminUserInfo.authentication_status === 0 || adminUserInfo.authentication_status === 1 || adminUserInfo.authentication_status === 2 || adminUserInfo.authentication_status === 3) {
|
||||
Taro.showModal({
|
||||
title: '提示',
|
||||
content: '你还未认证,认证后解锁更多功能',
|
||||
cancelText: '稍后认证',
|
||||
confirmText: '去认证',
|
||||
success: function (res) {
|
||||
if (res.confirm) {
|
||||
Taro.navigateTo({ url: '/pages/certification/index' })
|
||||
} else if (res.cancel) {
|
||||
console.log('用户点击取消')
|
||||
}
|
||||
}
|
||||
})
|
||||
} else {
|
||||
setShowShopCart(!showShopCart)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
return (
|
||||
<MoveBtn onClick={() => setShowShopCart(!showShopCart)}>
|
||||
<MoveBtn onClick={() => checkShow()}>
|
||||
<View className={styles.main}>
|
||||
<Banner />
|
||||
<View className={styles.search}>
|
||||
|
||||
@ -4,23 +4,31 @@
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
position: relative;
|
||||
|
||||
.header {
|
||||
background: #68b4ff;
|
||||
background-size: cover;
|
||||
height: 560px;
|
||||
position: relative;
|
||||
|
||||
.card-main {
|
||||
margin-top: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
.auth-suspension {
|
||||
position: absolute;
|
||||
z-index: 1;inset: 0;
|
||||
z-index: 1;
|
||||
inset: 0;
|
||||
}
|
||||
|
||||
.header-card {
|
||||
position: absolute;left: 50%;bottom: -18%;
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
bottom: -18%;
|
||||
transform: translateX(-50%);
|
||||
}
|
||||
|
||||
.crad {
|
||||
width: 702px;
|
||||
background: rgba(255, 255, 255, 0.95);
|
||||
@ -29,16 +37,24 @@
|
||||
box-sizing: border-box;
|
||||
box-shadow: 0px 6px 12px 0px rgba(0, 0, 0, 0.05);
|
||||
}
|
||||
|
||||
.card-info {
|
||||
display: flex;justify-content: space-between;
|
||||
position: absolute;top: -15%;left: 0;right: 0;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
position: absolute;
|
||||
top: -15%;
|
||||
left: 0;
|
||||
right: 0;
|
||||
width: 702px;
|
||||
padding: 0 30px;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.arcd-info-left {
|
||||
display: flex;align-items: flex-end;
|
||||
display: flex;
|
||||
align-items: flex-end;
|
||||
}
|
||||
|
||||
.arcd-info-left-portrait {
|
||||
width: 170px;
|
||||
height: 170px;
|
||||
@ -47,14 +63,17 @@
|
||||
border-radius: 50%;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.arcd-info-left-portrait image {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
object-fit: cover;
|
||||
}
|
||||
|
||||
.arcd-info-left-desc {
|
||||
margin-left: 24px;
|
||||
}
|
||||
|
||||
.arcd-info-left-nickname {
|
||||
font-size: 44px;
|
||||
font-weight: 700;
|
||||
@ -62,11 +81,13 @@
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.arcd-info-left-phone {
|
||||
font-size: 24px;
|
||||
font-weight: 400;
|
||||
color: #707070;
|
||||
}
|
||||
|
||||
.arcd-info-left-phone button {
|
||||
padding: 0 10px;
|
||||
height: 42px;
|
||||
@ -76,38 +97,49 @@
|
||||
font-size: 22px;
|
||||
font-weight: 400;
|
||||
color: #007aff;
|
||||
display: flex;align-items: center;justify-content: center;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.card-info-right {
|
||||
font-size: 26px;
|
||||
display: flex;align-items: flex-end;
|
||||
display: flex;
|
||||
align-items: flex-end;
|
||||
}
|
||||
|
||||
.setup-icon {
|
||||
position: relative;
|
||||
padding-bottom: 10px;
|
||||
}
|
||||
|
||||
.icon-wrapper {
|
||||
font-size: 60px;
|
||||
}
|
||||
|
||||
.icon-point {
|
||||
width: 8px;
|
||||
height: 8px;
|
||||
border-radius: 50%;
|
||||
background: #ff0000;
|
||||
position: absolute;
|
||||
right: 0;top: 0;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
|
||||
.card-main {
|
||||
margin: 20px auto 0;
|
||||
}
|
||||
|
||||
.card-main-title {
|
||||
display: flex;justify-content: space-between;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
border-bottom: 2px solid #dddddd;
|
||||
padding: 0 5px 15px;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.card-main-title text {
|
||||
font-size: 22px;
|
||||
font-weight: 400;
|
||||
@ -116,10 +148,12 @@
|
||||
text-align: right;
|
||||
width: 150px;
|
||||
}
|
||||
|
||||
.card-main-title-content {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(5, 1fr);
|
||||
}
|
||||
|
||||
.card-main-title-content-item {
|
||||
font-size: 24px;
|
||||
font-weight: 400;
|
||||
@ -128,10 +162,12 @@
|
||||
margin-top: 30px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.card-main-title-content-item Text {
|
||||
font-size: 56px;
|
||||
color: #3C3C3C;
|
||||
}
|
||||
|
||||
.card-main-title-content-item-badge {
|
||||
padding: 0 10px;
|
||||
height: 32px;
|
||||
@ -143,8 +179,12 @@
|
||||
font-size: 18px;
|
||||
font-weight: 700;
|
||||
color: #ffffff;
|
||||
display: flex;align-items: center;justify-content: center;
|
||||
position: absolute;top: -10px;right: 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
position: absolute;
|
||||
top: -10px;
|
||||
right: 0;
|
||||
}
|
||||
|
||||
.assets-title {
|
||||
@ -153,26 +193,34 @@
|
||||
color: #3c3c3c;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.assets-content {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(3, 1fr);
|
||||
}
|
||||
.assets-content>view,.assets-content>navigator{
|
||||
|
||||
.assets-content>view,
|
||||
.assets-content>navigator {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.assets-content-item-top {
|
||||
color: #007aff;
|
||||
font-weight: 400;
|
||||
}
|
||||
|
||||
.assets-content-item-top-before {
|
||||
font-size: 20px;
|
||||
}
|
||||
|
||||
.assets-content-item-top-content {
|
||||
font-size: 36px;
|
||||
}
|
||||
|
||||
.assets-content-item-top-after {
|
||||
font-size: 20px;
|
||||
}
|
||||
|
||||
.assets-content-item-tips {
|
||||
font-size: 24px;
|
||||
font-weight: 400;
|
||||
@ -182,26 +230,33 @@
|
||||
.main-card {
|
||||
margin: 131px auto 0;
|
||||
}
|
||||
|
||||
.card-feature {
|
||||
margin-bottom: 50px;
|
||||
}
|
||||
|
||||
.card-main-list-content-item {
|
||||
display: flex;align-items: center;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
height: 90px;
|
||||
}
|
||||
|
||||
.card-main-list-content-item-left {
|
||||
font-size: 26px;
|
||||
font-weight: 400;
|
||||
text-align: left;
|
||||
color: #707070;
|
||||
display: flex;align-items: center;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.card-main-list-content-item-left text {
|
||||
margin-right: 35px;
|
||||
font-size: 56px;
|
||||
color: #707070;
|
||||
}
|
||||
|
||||
.card-main-list-content-item-right text {
|
||||
font-size: 30px;
|
||||
}
|
||||
@ -209,39 +264,54 @@
|
||||
.auth {
|
||||
margin-top: 115px;
|
||||
}
|
||||
|
||||
.auth-top {
|
||||
display: flex;align-items: center;justify-content: space-between;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.auth-status {
|
||||
padding: 0 10px;
|
||||
height: 30px;
|
||||
background: #dddddd;
|
||||
border-radius: 10px 4px 0px 0px;
|
||||
display: flex;align-items: center;justify-content: center;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 18px;
|
||||
font-weight: 400;
|
||||
color: #707070;
|
||||
}
|
||||
.auth-status,.auth-status-ongoing{
|
||||
|
||||
.auth-status,
|
||||
.auth-status-ongoing {
|
||||
color: #EE7500;
|
||||
background-color: #FFE6CE;
|
||||
}
|
||||
.auth-status,.auth-status-adopt{
|
||||
|
||||
.auth-status,
|
||||
.auth-status-adopt {
|
||||
color: #007AFF;
|
||||
background-color: #CDE5FF;
|
||||
}
|
||||
|
||||
.auth-tips {
|
||||
font-size: 18px;
|
||||
font-weight: 400;
|
||||
color: #007aff;
|
||||
text-align: right;
|
||||
}
|
||||
.auth-tips,.auth-tips-adopt{
|
||||
|
||||
.auth-tips,
|
||||
.auth-tips-adopt {
|
||||
color: #ABABAB;
|
||||
}
|
||||
|
||||
.auth-tips text {
|
||||
font-size: 17px;
|
||||
}
|
||||
|
||||
.auth-company {
|
||||
height: 70px;
|
||||
width: 100%;
|
||||
@ -251,19 +321,27 @@
|
||||
font-size: 26px;
|
||||
font-weight: 700;
|
||||
color: #707070;
|
||||
display: flex;align-items: center;justify-content: center;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
.auth-company,.auth-company-adopt{
|
||||
|
||||
.auth-company,
|
||||
.auth-company-adopt {
|
||||
background: #ecf5ff;
|
||||
border: 2px solid #cde5ff;
|
||||
}
|
||||
|
||||
.tips-modal {
|
||||
background: rgba(0, 0, 0, 0.6);
|
||||
position: fixed;inset: 0;
|
||||
display: flex;justify-content: center;align-items: center;
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
z-index: 2;
|
||||
}
|
||||
|
||||
.tips-modal-content {
|
||||
width: 598px;
|
||||
background: #ffffff;
|
||||
@ -271,14 +349,17 @@
|
||||
animation: enlargeK 0.2s linear;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
@keyframes enlargeK {
|
||||
0% {
|
||||
transform: scale(0);
|
||||
}
|
||||
|
||||
100% {
|
||||
transform: scale(1);
|
||||
}
|
||||
}
|
||||
|
||||
.tips-modal-title {
|
||||
font-size: 32px;
|
||||
font-weight: 700;
|
||||
@ -287,6 +368,7 @@
|
||||
margin-bottom: 58px;
|
||||
padding-top: 48px;
|
||||
}
|
||||
|
||||
.tips-modal-letter {
|
||||
font-size: 26px;
|
||||
font-weight: 400;
|
||||
@ -294,32 +376,41 @@
|
||||
padding: 0 30px;
|
||||
line-height: 50px;
|
||||
}
|
||||
|
||||
.tips-modal-letter-text {
|
||||
text-indent: 60px;
|
||||
}
|
||||
|
||||
.tips-modal-letter-beginn {
|
||||
font-size: 28px;
|
||||
font-weight: 400;
|
||||
color: #000000;
|
||||
margin-bottom: 25px;
|
||||
}
|
||||
|
||||
.tips-modal-letter-end {
|
||||
font-size: 26px;
|
||||
font-weight: 400;
|
||||
text-align: right;
|
||||
margin-top: 61px;
|
||||
}
|
||||
|
||||
.tips-modal-button {
|
||||
display: flex;
|
||||
border-top: 1px solid #DDDDDD;
|
||||
margin-top: 45px;
|
||||
}
|
||||
.tips-modal-button button, .tips-modal-button view{
|
||||
display: flex;align-items: center;justify-content: center;
|
||||
|
||||
.tips-modal-button button,
|
||||
.tips-modal-button view {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 50%;
|
||||
height: 90px;
|
||||
background-color: white;
|
||||
}
|
||||
|
||||
.tips-modal-button button {
|
||||
font-size: 26px;
|
||||
font-weight: 400;
|
||||
@ -327,13 +418,116 @@
|
||||
border-radius: 0;
|
||||
border-right: 1px solid #DDDDDD;
|
||||
}
|
||||
|
||||
.tips-modal-button button::after {
|
||||
border: 0;
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
.tips-modal-button view {
|
||||
font-size: 26px;
|
||||
font-weight: 400;
|
||||
color: #007aff;
|
||||
}
|
||||
|
||||
.auth-box {
|
||||
width: 614px;
|
||||
height: 70px;
|
||||
background: #f6f6f6;
|
||||
border-radius: 10px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding-left: 18px;
|
||||
padding-right: 16px;
|
||||
|
||||
.auth-left-box {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
.auth-tag {
|
||||
width: 86px;
|
||||
height: 34px;
|
||||
background: #dddddd;
|
||||
border-radius: 10px;
|
||||
font-size: 22px;
|
||||
font-family: Microsoft YaHei, Microsoft YaHei-Regular;
|
||||
font-weight: 400;
|
||||
text-align: center;
|
||||
color: #707070;
|
||||
text-align: center;
|
||||
line-height: 34px;
|
||||
margin-right: 28px;
|
||||
}
|
||||
|
||||
.auth-tagone {
|
||||
width: 86px;
|
||||
height: 34px;
|
||||
background: #ffe6ce;
|
||||
border-radius: 10px;
|
||||
font-size: 22px;
|
||||
font-family: Microsoft YaHei, Microsoft YaHei-Regular;
|
||||
font-weight: 400;
|
||||
text-align: center;
|
||||
color: #707070;
|
||||
text-align: center;
|
||||
line-height: 34px;
|
||||
margin-right: 28px;
|
||||
}
|
||||
|
||||
.auth-tagtwo {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
overflow: hidden;
|
||||
padding-left: 10px;
|
||||
width: 100px;
|
||||
height: 32px;
|
||||
background: #cde5ff;
|
||||
border-radius: 10px;
|
||||
|
||||
.iconFont-color {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
font-size: 30px;
|
||||
margin-right: 3px;
|
||||
color: #007aff;
|
||||
}
|
||||
|
||||
.auth-font {
|
||||
font-size: 20px;
|
||||
font-family: Microsoft YaHei, Microsoft YaHei-Regular;
|
||||
font-weight: 400;
|
||||
color: #007aff;
|
||||
}
|
||||
}
|
||||
|
||||
.tagthree {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
overflow: hidden;
|
||||
padding-left: 10px;
|
||||
width: 100px;
|
||||
height: 32px;
|
||||
background: rgba(255, 0, 0, 0.10);
|
||||
border-radius: 10px;
|
||||
color: #ff0000;
|
||||
}
|
||||
|
||||
.auth-cont {
|
||||
margin-left: 16px;
|
||||
font-size: 26px;
|
||||
font-family: Microsoft YaHei, Microsoft YaHei-Bold;
|
||||
font-weight: 700;
|
||||
color: #ababab;
|
||||
}
|
||||
|
||||
.auth-contone {
|
||||
margin-left: 16px;
|
||||
font-size: 26px;
|
||||
font-family: Microsoft YaHei, Microsoft YaHei-Bold;
|
||||
font-weight: 700;
|
||||
color: #3c3c3c;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -6,7 +6,9 @@ import { useSelector } from "@/reducers/hooks";
|
||||
import { alert, goLink } from "@/common/common";
|
||||
import useLogin from '@/use/useLogin'
|
||||
import { BASE_URL } from '@/common/constant'
|
||||
|
||||
import Taro from "@tarojs/taro";
|
||||
import { userassets } from "@/api/mine"
|
||||
import { formatPriceDiv } from "@/common/fotmat"
|
||||
export default () => {
|
||||
// 用户信息
|
||||
const { getSelfUserInfo } = useLogin();
|
||||
@ -21,13 +23,16 @@ export default () => {
|
||||
alert.none("授权失败，请授权后再使用");
|
||||
});
|
||||
}
|
||||
|
||||
const { fetchData, state } = userassets()
|
||||
useEffect(() => {
|
||||
fetchData();
|
||||
}, [])
|
||||
return (
|
||||
<View className={styles.main}>
|
||||
<Header data={adminUserInfo} />
|
||||
<Assets />
|
||||
<Assets data={state} />
|
||||
<Main />
|
||||
{(adminUserInfo as any)?.authentication_status==1&&<Modal data={adminUserInfo}/>}
|
||||
{/* {(adminUserInfo as any)?.authentication_status==1&&<Modal data={adminUserInfo}/>} */}
|
||||
{/* 测试暂时添加 */}
|
||||
<View style={{ fontSize: '26rpx', textAlign: 'center' }}>{BASE_URL}</View>
|
||||
{!adminUserInfo.is_authorize_name && <View onClick={handleAuth} className={styles["auth-suspension"]}></View>}
|
||||
@ -76,6 +81,11 @@ const Header = memo((props:any) => {
|
||||
alert.none("绑定失败!");
|
||||
}
|
||||
}
|
||||
const navTo = () => {
|
||||
Taro.navigateTo({
|
||||
url: '/pages/certification/index'
|
||||
})
|
||||
}
|
||||
return (
|
||||
<View className={styles.header}>
|
||||
<View className={`${styles.crad} ${styles['header-card']}`}>
|
||||
@ -106,7 +116,62 @@ const Header = memo((props:any) => {
|
||||
</View>
|
||||
</View>
|
||||
<View className={styles['auth']}>
|
||||
<View className={`${styles['auth-top']} ${data?.authentication_status==4&&"auth-tips-adopt"}`}>
|
||||
{(data?.authentication_status == 0 || data?.authentication_status == 1) &&
|
||||
<View className={styles['auth-box']} onClick={() => navTo()}>
|
||||
<View className={styles['auth-left-box']}>
|
||||
<View className={styles['auth-tag']}>
|
||||
未认证
|
||||
</View>
|
||||
<View className={styles['auth-cont']}>
|
||||
暂未加入或注册组织
|
||||
</View>
|
||||
</View>
|
||||
<Text className="iconfont icon-a-moreback"></Text>
|
||||
</View>
|
||||
}
|
||||
{(data?.authentication_status == 3) &&
|
||||
<View className={styles['auth-box']} onClick={() => navTo()}>
|
||||
<View className={styles['auth-left-box']}>
|
||||
<View className={styles['auth-tagthree']}>
|
||||
认证失败
|
||||
</View>
|
||||
<View className={styles['auth-cont']}>
|
||||
暂未加入或注册组织
|
||||
</View>
|
||||
</View>
|
||||
<Text className="iconfont icon-a-moreback"></Text>
|
||||
</View>
|
||||
}
|
||||
{data?.authentication_status == 2 &&
|
||||
<View className={styles['auth-box']} onClick={() => navTo()}>
|
||||
<View className={styles['auth-left-box']}>
|
||||
<View className={styles['auth-tagone']}>
|
||||
认证中
|
||||
</View>
|
||||
<View className={styles['auth-contone']}>
|
||||
{data?.company_name || '暂未加入或注册组织'}
|
||||
</View>
|
||||
</View>
|
||||
<Text className="iconfont icon-a-moreback"></Text>
|
||||
</View>
|
||||
}
|
||||
{data?.authentication_status == 4 &&
|
||||
<View className={styles['auth-box']} onClick={() => navTo()}>
|
||||
<View className={styles['auth-left-box']}>
|
||||
<View className={styles['auth-tagtwo']}>
|
||||
<View className={styles['iconFont-color']}>
|
||||
<Text className="iconfont icon-xtianzhangqi"></Text>
|
||||
</View>
|
||||
<View className={styles['auth-font']}>已认证</View>
|
||||
</View>
|
||||
<View className={styles['auth-contone']}>
|
||||
{data?.company_name}
|
||||
</View>
|
||||
</View>
|
||||
<Text className="iconfont icon-a-moreback"></Text>
|
||||
</View>
|
||||
}
|
||||
{/* <View className={`${styles['auth-top']} ${data?.authentication_status==4&&"auth-tips-adopt"}`}>
|
||||
<View className={`${styles['auth-status']} ${data?.authentication_status==2&&styles['auth-status-ongoing']} ${data?.authentication_status==4&&styles['auth-status-adopt']}`}>
|
||||
<Text>1</Text>
|
||||
{data?.authentication_status==1&&"未认证"}
|
||||
@ -118,13 +183,13 @@ const Header = memo((props:any) => {
|
||||
{data?.authentication_status==2&&<Navigator hoverClass="none" url="/pages/certification/index" className={styles['auth-tips']}>1-3个工作日，审核完成 <Text className="iconfont icon-a-moreback"/></Navigator>}
|
||||
{data?.authentication_status==3&&<Navigator hoverClass="none" url="/pages/certification/index" className={styles['auth-tips']}>重新认证 <Text className="iconfont icon-a-moreback"/></Navigator>}
|
||||
{data?.authentication_status==4&&<View className={styles['auth-tips']}>认证通过，可以下单啦 <Text className="iconfont icon-a-moreback"/></View>}
|
||||
</View>
|
||||
<View className={`${styles['auth-company']} ${data?.authentication_status==4&&"auth-tips-adopt"}`}>
|
||||
</View> */}
|
||||
{/* <View className={`${styles['auth-company']} ${data?.authentication_status==4&&"auth-tips-adopt"}`}>
|
||||
{data?.authentication_status==1&&"暂未加入或注册组织"}
|
||||
{data?.authentication_status==2&&data?.company_name}
|
||||
{data?.authentication_status==3&&data?.company_name}
|
||||
{data?.authentication_status==4&&data?.company_name}
|
||||
</View>
|
||||
</View> */}
|
||||
</View>
|
||||
<View className={styles['card-main']}>
|
||||
<View className={styles['card-main-title']}>
|
||||
@ -149,9 +214,9 @@ const Header = memo((props:any) => {
|
||||
</View>
|
||||
)
|
||||
})
|
||||
|
||||
// 我的资产
|
||||
const Assets = () => {
|
||||
const Assets = (props: any) => {
|
||||
console.log(props, 'propsprops')
|
||||
return (
|
||||
<View className={`${styles.assets} ${styles.crad} ${styles['main-card']}`}>
|
||||
<View className={`${styles['assets-title']}`}>我的资产</View>
|
||||
@ -159,14 +224,14 @@ const Assets = () => {
|
||||
<Navigator hoverClass="none" url="/pages/depositBeforehand/index">
|
||||
<View className={`${styles['assets-content-item-top']}`}>
|
||||
<Text className={`${styles['assets-content-item-top-before']}`}>¥</Text>
|
||||
<Text className={`${styles['assets-content-item-top-content']}`}>0</Text>
|
||||
<Text className={`${styles['assets-content-item-top-after']}`}>.20</Text>
|
||||
<Text className={`${styles['assets-content-item-top-content']}`}>{formatPriceDiv(props.data.data.wallet_money || 0)}</Text>
|
||||
{/* <Text className={`${styles['assets-content-item-top-after']}`}>{props.wallet_money || 0}</Text> */}
|
||||
</View>
|
||||
<Text className={`${styles['assets-content-item-tips']}`}>预存款</Text>
|
||||
</Navigator>
|
||||
<View>
|
||||
<View className={`${styles['assets-content-item-top']}`}>
|
||||
<Text className={`${styles['assets-content-item-top-content']}`}>4</Text>
|
||||
<Text className={`${styles['assets-content-item-top-content']}`}>{props.data.data.coupon_count || 0}</Text>
|
||||
<Text className={`${styles['assets-content-item-top-after']}`}>张</Text>
|
||||
</View>
|
||||
<Text className={`${styles['assets-content-item-tips']}`}>优惠券</Text>
|
||||
@ -174,8 +239,8 @@ const Assets = () => {
|
||||
<Navigator hoverClass="none" url="/pages/creditLine/index">
|
||||
<View className={`${styles['assets-content-item-top']}`}>
|
||||
<Text className={`${styles['assets-content-item-top-before']}`}>¥</Text>
|
||||
<Text className={`${styles['assets-content-item-top-content']}`}>99999</Text>
|
||||
<Text className={`${styles['assets-content-item-top-after']}`}>.-00</Text>
|
||||
<Text className={`${styles['assets-content-item-top-content']}`}>{formatPriceDiv(props.data.data.credit_line || 0)}</Text>
|
||||
{/* <Text className={`${styles['assets-content-item-top-after']}`}>.-00</Text> */}
|
||||
</View>
|
||||
<Text className={`${styles['assets-content-item-tips']}`}>授信额度</Text>
|
||||
</Navigator>
|
||||
|
||||
@ -172,9 +172,9 @@ export default ()=>{
|
||||
<Text className="iconfont " /> {(formData as any)?.authentication_status == 4 ? "已认证" : "未认证"}
|
||||
</View>
|
||||
</UserEditList>
|
||||
<UserEditList label="创建人" data={(formData as any)?.founder_user_name} placeholder="完善公司/组织信息" icon=""/>
|
||||
<UserEditList label="创建人" data={(formData as any)?.founder_user_name} placeholder="完善公司/组织信息" icon="" useIcon="true" />
|
||||
</View>
|
||||
<Button hoverClass="none" className="user-edit-logout">退出当前账号</Button>
|
||||
{/* <Button hoverClass="none" className="user-edit-logout">退出当前账号</Button> */}
|
||||
|
||||
<ModifyModal title="修改昵称" ref={ModifyIcknameEl} value={(formData as any)?.user_name} save={(value) => handleTextareaSave(value, "Ickname")} />
|
||||
<ModifyModal title="修改名称" ref={ModifyCompanyNameEl} value={(formData as any)?.company_name} save={(value) => handleTextareaSave(value, "companyName")} />
|
||||
@ -197,7 +197,10 @@ const UserEditList = memo((props:any)=>{
|
||||
<View className="user-edit-list-right-placeholder">{props.placeholder}</View>
|
||||
}
|
||||
</View>
|
||||
{
|
||||
!props.useIcon &&
|
||||
<Text className="iconfont icon-a-moreback"></Text>
|
||||
}
|
||||
</View>
|
||||
</View>
|
||||
)
|
||||
|
||||
@ -41,6 +41,7 @@ export type UserAdminParam = {
|
||||
is_authorize_name?: false|true,
|
||||
is_authorize_phone?: false|true,
|
||||
phone?:string,
|
||||
authentication_status?:number
|
||||
}
|
||||
|
||||
export type SortCodeParam = {
|
||||
|
||||
63
yarn.lock
63
yarn.lock
@ -1231,6 +1231,29 @@
|
||||
"schema-utils" "^2.6.5"
|
||||
"source-map" "^0.7.3"
|
||||
|
||||
"@prefresh/babel-plugin@^0.4.0":
|
||||
"integrity" "sha512-fYAWbU1WDSLn108kKY4eDaaeUcnszFqXjgaGKYXNZ5NLulpRTpsrY+Sbfo9q8LDpWrBpqIgzjrwNnvglWI1xNQ=="
|
||||
"resolved" "https://registry.npmmirror.com/@prefresh/babel-plugin/-/babel-plugin-0.4.3.tgz"
|
||||
"version" "0.4.3"
|
||||
|
||||
"@prefresh/core@^1.3.3":
|
||||
"integrity" "sha512-s7iNsnyJ3lZEUrYIgmVIB/hKtp4U6mdD91a31Zg7Q8M49O0x2KThrbrMQYraoDDrs4STdFB8Zv6bceUguOoX1A=="
|
||||
"resolved" "https://registry.npmmirror.com/@prefresh/core/-/core-1.3.4.tgz"
|
||||
"version" "1.3.4"
|
||||
|
||||
"@prefresh/utils@^1.1.2":
|
||||
"integrity" "sha512-Mb9abhJTOV4yCfkXrMrcgFiFT7MfNOw8sDa+XyZBdq/Ai2p4Zyxqsb3EgHLOEdHpMj6J9aiZ54W8H6FTam1u+A=="
|
||||
"resolved" "https://registry.npmmirror.com/@prefresh/utils/-/utils-1.1.3.tgz"
|
||||
"version" "1.1.3"
|
||||
|
||||
"@prefresh/webpack@^3.2.3":
|
||||
"integrity" "sha512-uT+A7ZuA7fuuUPNEde6Gmzr4oFnzreW9xw6iqw01nPpDiv46o6YWq1j0oGCbdffzHl3fBpcgkPuY07vIfmZ9Lg=="
|
||||
"resolved" "https://registry.npmmirror.com/@prefresh/webpack/-/webpack-3.3.3.tgz"
|
||||
"version" "3.3.3"
|
||||
dependencies:
|
||||
"@prefresh/core" "^1.3.3"
|
||||
"@prefresh/utils" "^1.1.2"
|
||||
|
||||
"@stencil/core@2.4.0":
|
||||
"integrity" "sha512-gU6+Yyd6O0KrCSS/O6j8KKqmRo+/Dcs2fI0+APCpbAWK+nqhwDISpdnSEfGDCLMoAC08XOZCycBRk2K1VGnEcg=="
|
||||
"resolved" "https://registry.npmjs.org/@stencil/core/-/core-2.4.0.tgz"
|
||||
@ -1345,6 +1368,18 @@
|
||||
"webpack-format-messages" "^2.0.5"
|
||||
"yauzl" "2.10.0"
|
||||
|
||||
"@tarojs/plugin-framework-react@^3.4.12":
|
||||
"integrity" "sha512-kc03rvuotgQ2q7gYM9rjy7IV1tjT4ZcbdfdVs2e7olpdXcY9d4x1OqF3vYy+FT/f6WXgf/xs7cBa8Btw3J44iQ=="
|
||||
"resolved" "https://registry.npmmirror.com/@tarojs/plugin-framework-react/-/plugin-framework-react-3.4.12.tgz"
|
||||
"version" "3.4.12"
|
||||
dependencies:
|
||||
"@pmmmwh/react-refresh-webpack-plugin" "0.4.3"
|
||||
"@prefresh/webpack" "^3.2.3"
|
||||
"@tarojs/runtime" "3.4.12"
|
||||
"@tarojs/shared" "3.4.12"
|
||||
"acorn" "^8.0.4"
|
||||
"acorn-walk" "^8.0.0"
|
||||
|
||||
"@tarojs/plugin-platform-alipay@3.3.10":
|
||||
"integrity" "sha512-hbsCk++etkRsi/IQNEIY4R94dwqtTSVB/1sBfgbtuzVe0fOSbrlfwFwzJOrE131CnAXmI9sWiCF/MTy0qCKWjA=="
|
||||
"resolved" "https://registry.npmjs.org/@tarojs/plugin-platform-alipay/-/plugin-platform-alipay-3.3.10.tgz"
|
||||
@ -1436,6 +1471,16 @@
|
||||
"lodash-es" "4.17.15"
|
||||
"reflect-metadata" "^0.1.13"
|
||||
|
||||
"@tarojs/runtime@3.4.12":
|
||||
"integrity" "sha512-4bQIXoiMRQa0xzma4nm4MAmLpPtcZLOalmW/X8WtPjAVqENZ8o3FE2lZMHjhv62HhvyHf+XZWWk/V+VzAhjcGQ=="
|
||||
"resolved" "https://registry.npmmirror.com/@tarojs/runtime/-/runtime-3.4.12.tgz"
|
||||
"version" "3.4.12"
|
||||
dependencies:
|
||||
"@tarojs/shared" "3.4.12"
|
||||
"inversify" "5.1.1"
|
||||
"lodash-es" "4.17.15"
|
||||
"reflect-metadata" "^0.1.13"
|
||||
|
||||
"@tarojs/service@3.3.10":
|
||||
"integrity" "sha512-r2vcLDFfovVv2kJ1RMPGoH7pgk8kNFMCTDgoWXbZxpddmpbO7Q1QYVP3EDNykgidnMVfw2cKnEkQdyTSsh+lbA=="
|
||||
"resolved" "https://registry.npmjs.org/@tarojs/service/-/service-3.3.10.tgz"
|
||||
@ -1455,6 +1500,11 @@
|
||||
"resolved" "https://registry.npmjs.org/@tarojs/shared/-/shared-3.3.10.tgz"
|
||||
"version" "3.3.10"
|
||||
|
||||
"@tarojs/shared@3.4.12":
|
||||
"integrity" "sha512-ELpEOA7Uzr5rQujfSmVS+ugTO22ZP8j3vi2AfrwJKg7zit1kZcBnDUIsN6+3Es3Vnp1oXsyQobWrgn30xYt2Ug=="
|
||||
"resolved" "https://registry.npmmirror.com/@tarojs/shared/-/shared-3.4.12.tgz"
|
||||
"version" "3.4.12"
|
||||
|
||||
"@tarojs/taro-h5@3.3.10":
|
||||
"integrity" "sha512-hBVr0Ee7rGTD+cuK5ugPUHwbD0L9qOwMKHqMyUzqAb8LS6aYF3aIFDwVbCYx77ZgtpGZFUqXnpDCvnHofWVyTg=="
|
||||
"resolved" "https://registry.npmjs.org/@tarojs/taro-h5/-/taro-h5-3.3.10.tgz"
|
||||
@ -2030,9 +2080,9 @@
|
||||
"version" "6.4.2"
|
||||
|
||||
"acorn@^8.0.4":
|
||||
"integrity" "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="
|
||||
"resolved" "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz"
|
||||
"version" "8.7.0"
|
||||
"integrity" "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="
|
||||
"resolved" "https://registry.npmmirror.com/acorn/-/acorn-8.7.1.tgz"
|
||||
"version" "8.7.1"
|
||||
|
||||
"acorn@^8.7.0":
|
||||
"integrity" "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="
|
||||
@ -3757,7 +3807,7 @@
|
||||
|
||||
"dayjs@^1.11.3":
|
||||
"integrity" "sha512-xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A=="
|
||||
"resolved" "https://registry.npmjs.org/dayjs/-/dayjs-1.11.3.tgz"
|
||||
"resolved" "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.3.tgz"
|
||||
"version" "1.11.3"
|
||||
|
||||
"debug@^2.2.0", "debug@^2.3.3", "debug@^2.6.0", "debug@^2.6.9", "debug@2.6.9":
|
||||
@ -8229,6 +8279,11 @@
|
||||
"source-map" "^0.6.1"
|
||||
"supports-color" "^6.1.0"
|
||||
|
||||
"preact@^10.0.0", "preact@^10.4.0":
|
||||
"integrity" "sha512-AKGt0BsDSiAYzVS78jZ9qRwuorY2CoSZtf1iOC6gLb/3QyZt+fLT09aYJBjRc/BEcRc4j+j3ggERMdNE43i1LQ=="
|
||||
"resolved" "https://registry.npmmirror.com/preact/-/preact-10.8.2.tgz"
|
||||
"version" "10.8.2"
|
||||
|
||||
"prelude-ls@~1.1.2":
|
||||
"integrity" "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
|
||||
"resolved" "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user